@@ -23,17 +23,17 @@ Welcome to Streamyfin, a simple and user-friendly Jellyfin video streaming clien
## π§ͺ Experimental Features
-Streamyfin includes some exciting experimental features like media downloading and Chromecast support. These are still in development, and we appreciate your patience and feedback as we work to improve them.
+Streamyfin includes some exciting experimental features like media downloading and Chromecast support. These features are still in development, and your patience and feedback are much appreciated as we work to improve them.
-### Downloading
+### π₯ Downloading
Downloading works by using ffmpeg to convert an HLS stream into a video file on the device. This means that you can download and view any file you can stream! The file is converted by Jellyfin on the server in real time as it is downloaded. This means a **bit longer download times** but supports any file that your server can transcode.
-### Chromecast
+### π₯ Chromecast
Chromecast support is still in development, and we're working on improving it. Currently, it supports casting videos, but we're working on adding support for subtitles and other features.
-### Streamyfin Plugin
+### 𧩠Streamyfin Plugin
The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that holds all settings for the client Streamyfin. This allows you to synchronize settings across all your users, like for example:
@@ -41,21 +41,21 @@ The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that ho
- Choose the default languages
- Set download method and search provider
- Customize home screen
-- And more...
+- And much more...
[Streamyfin Plugin](https://github.com/streamyfin/jellyfin-plugin-streamyfin)
-### Jellysearch
+### π Jellysearch
[Jellysearch](https://gitlab.com/DomiStyle/jellysearch) now works with Streamyfin! π
> A fast full-text search proxy for Jellyfin. Integrates seamlessly with most Jellyfin clients.
-## Roadmap for V1
+## π£οΈ Roadmap for V1
-Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) to see what we're working on next. We are always open for feedback and suggestions, so please let us know if you have any ideas or feature requests.
+Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) To see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
-## Get it now
+## π₯ Get it now
@@ -64,7 +64,7 @@ Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) to
Or download the APKs [here on GitHub](https://github.com/streamyfin/streamyfin/releases) for Android.
-### Beta testing
+### π§ͺ Beta testing
To access the Streamyfin beta, you need to subscribe to the Member tier (or higher) on [Patreon](https://www.patreon.com/streamyfin). This will give you immediate access to the β π§ͺ-public-beta channel on Discord and I'll know that you have subscribed. This is where I post APKs and IPAs. This won't give automatic access to the TestFlight, however, so you need to send me a DM with the email you use for Apple so that I can manually add you.
@@ -81,7 +81,7 @@ To access the Streamyfin beta, you need to subscribe to the Member tier (or high
We welcome any help to make Streamyfin better. If you'd like to contribute, please fork the repository and submit a pull request. For major changes, it's best to open an issue first to discuss your ideas.
-### Development info
+### π¨βπ» Development info
1. Use node `>20`
2. Install dependencies `bun i && bun run submodule-reload`
@@ -118,7 +118,7 @@ If you have questions or need support, feel free to reach out:
- GitHub Issues: Report bugs or request features here.
- Email: [fredrik.burmester@gmail.com](mailto:fredrik.burmester@gmail.com)
-## FAQ
+## β FAQ
1. Q: Why can't I see my libraries in Streamyfin?
A: Make sure your server is running one of the latest versions and that you have at least one library that isn't audio only.
@@ -135,7 +135,7 @@ We would like to thank the Jellyfin team for their great software and awesome su
Special shoutout to the JF official clients for being an inspiration to ours.
-### Core Developers
+### π Core Developers
Thanks to the following contributors for their significant contributions:
@@ -220,6 +220,12 @@ I'd also like to thank the following people and projects for their contributions
- [Jellyseerr](https://github.com/Fallenbagel/jellyseerr) for enabling API integration with their project.
- The Jellyfin devs for always being helpful in the Discord.
-## Star History
+## β Star History
[](https://star-history.com/#streamyfin/streamyfin&Date)
+
+## β οΈ Disclaimer
+Streamyfin does not promote, support, or condone piracy in any form. The app is intended solely for streaming media that you personally own and control. It does not provide or include any media content. Any discussions or support requests related to piracy are strictly prohibited across all our channels.
+
+## π€ Sponsorship
+VPS hosting generously provided by [Hexabyte](https://hexabyte.se/en/vps/?currency=eur)
diff --git a/app.json b/app.json
index 621bac09..823f085f 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
"expo": {
"name": "Streamyfin",
"slug": "streamyfin",
- "version": "0.28.0",
+ "version": "0.28.1",
"orientation": "default",
"icon": "./assets/images/icon.png",
"scheme": "streamyfin",
diff --git a/app/(auth)/(tabs)/(home)/_layout.tsx b/app/(auth)/(tabs)/(home)/_layout.tsx
index 86ae2cbe..22a9d7da 100644
--- a/app/(auth)/(tabs)/(home)/_layout.tsx
+++ b/app/(auth)/(tabs)/(home)/_layout.tsx
@@ -64,12 +64,6 @@ export default function IndexLayout() {
title: t("home.settings.settings_title"),
}}
/>
-
Promise,
+ router: any,
+ t: any,
+) {
+ Alert.alert(
+ t("home.downloads.new_app_version_requires_re_download"),
+ undefined,
+ [
+ {
+ text: t("common.cancel"),
+ onPress: () => router.back(),
+ style: "cancel",
+ },
+ {
+ text: t("common.continue"),
+ onPress: () => deleteAllFiles(),
+ },
+ ],
+ );
+}
export default function page() {
const navigation = useNavigation();
const { t } = useTranslation();
const [queue, setQueue] = useAtom(queueAtom);
- const { removeProcess, downloadedFiles, deleteFileByType } = useDownload();
+ const { deleteFileByType, downloadedFiles, removeProcess, deleteAllFiles } = useDownload();
const router = useRouter();
const [settings] = useSettings();
const bottomSheetModalRef = useRef(null);
const movies = useMemo(() => {
- try {
- return downloadedFiles?.filter((f) => f.item.Type === "Movie") || [];
- } catch {
- migration_20241124();
- return [];
- }
+ return downloadedFiles?.filter((f) => f.item.Type === "Movie") || [];
}, [downloadedFiles]);
const groupedBySeries = useMemo(() => {
@@ -54,12 +72,12 @@ export default function page() {
});
return Object.values(series);
} catch {
- migration_20241124();
+ migration_20241124(deleteAllFiles, router, t);
return [];
}
- }, [downloadedFiles]);
+ }, [downloadedFiles, deleteAllFiles, router, t]);
- const insets = useSafeAreaInsets();
+ const _insets = useSafeAreaInsets();
useEffect(() => {
navigation.setOptions({
@@ -98,16 +116,10 @@ export default function page() {
return (
<>
-
-
-
- {settings?.downloadMethod === DownloadMethod.Remux && (
+
+
+
+
{t("home.downloads.queue")}
@@ -151,70 +163,74 @@ export default function page() {
)}
- )}
-
-
-
- {movies.length > 0 && (
-
-
-
- {t("home.downloads.movies")}
-
-
- {movies?.length}
-
-
-
-
- {movies?.map((item) => (
-
-
-
- ))}
-
-
+
- )}
- {groupedBySeries.length > 0 && (
-
-
-
- {t("home.downloads.tvseries")}
-
-
-
- {groupedBySeries?.length}
+
+ {movies.length > 0 && (
+
+
+
+ {t("home.downloads.movies")}
+
+ {movies?.length}
+
+
+
+ {movies?.map((item) => (
+
+
+
+ ))}
+
+
-
-
- {groupedBySeries?.map((items) => (
-
- i.item)}
- key={items[0].item.SeriesId}
- />
-
- ))}
+ )}
+ {groupedBySeries.length > 0 && (
+
+
+
+ {t("home.downloads.tvseries")}
+
+
+
+ {groupedBySeries?.length}
+
+
-
-
- )}
- {downloadedFiles?.length === 0 && (
-
-
- {t("home.downloads.no_downloaded_items")}
-
-
- )}
-
-
+
+
+ {groupedBySeries?.map((items) => (
+
+ i.item)}
+ key={items[0].item.SeriesId}
+ />
+
+ ))}
+
+
+
+ )}
+ {downloadedFiles?.length === 0 && (
+
+
+ {t("home.downloads.no_downloaded_items")}
+
+
+ )}
+
+
+
);
}
-
-function migration_20241124() {
- const router = useRouter();
- const { deleteAllFiles } = useDownload();
- Alert.alert(
- t("home.downloads.new_app_version_requires_re_download"),
- t("home.downloads.new_app_version_requires_re_download_description"),
- [
- {
- text: t("home.downloads.back"),
- onPress: () => router.back(),
- },
- {
- text: t("home.downloads.delete"),
- style: "destructive",
- onPress: async () => await deleteAllFiles(),
- },
- ],
- );
-}
diff --git a/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx b/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
deleted file mode 100644
index 9fbc0a23..00000000
--- a/app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Text } from "@/components/common/Text";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-import { OptimizedServerForm } from "@/components/settings/OptimizedServerForm";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getOrSetDeviceId } from "@/utils/device";
-import { getStatistics } from "@/utils/optimize-server";
-import { useMutation } from "@tanstack/react-query";
-import { useNavigation } from "expo-router";
-import { useAtom } from "jotai";
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { ActivityIndicator, TouchableOpacity, View } from "react-native";
-import { toast } from "sonner-native";
-
-export default function page() {
- const navigation = useNavigation();
-
- const { t } = useTranslation();
-
- const [api] = useAtom(apiAtom);
- const [settings, updateSettings, pluginSettings] = useSettings();
-
- const [optimizedVersionsServerUrl, setOptimizedVersionsServerUrl] =
- useState(settings?.optimizedVersionsServerUrl || "");
-
- const saveMutation = useMutation({
- mutationFn: async (newVal: string) => {
- if (newVal.length === 0 || !newVal.startsWith("http")) {
- toast.error(t("home.settings.toasts.invalid_url"));
- return;
- }
-
- const updatedUrl = newVal.endsWith("/") ? newVal : `${newVal}/`;
-
- updateSettings({
- optimizedVersionsServerUrl: updatedUrl,
- });
-
- return await getStatistics({
- url: updatedUrl,
- authHeader: api?.accessToken,
- deviceId: getOrSetDeviceId(),
- });
- },
- onSuccess: (data) => {
- if (data) {
- toast.success(t("home.settings.toasts.connected"));
- } else {
- toast.error(t("home.settings.toasts.could_not_connect"));
- }
- },
- onError: () => {
- toast.error(t("home.settings.toasts.could_not_connect"));
- },
- });
-
- const onSave = (newVal: string) => {
- saveMutation.mutate(newVal);
- };
-
- useEffect(() => {
- if (!pluginSettings?.optimizedVersionsServerUrl?.locked) {
- navigation.setOptions({
- title: t("home.settings.downloads.optimized_server"),
- headerRight: () =>
- saveMutation.isPending ? (
-
- ) : (
- onSave(optimizedVersionsServerUrl)}
- >
-
- {t("home.settings.downloads.save_button")}
-
-
- ),
- });
- }
- }, [navigation, optimizedVersionsServerUrl, saveMutation.isPending]);
-
- return (
-
-
-
- );
-}
diff --git a/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx b/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx
index b7c39f9f..81f123bf 100644
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/items/page.tsx
@@ -1,10 +1,4 @@
-import { ItemContent } from "@/components/ItemContent";
-import { Text } from "@/components/common/Text";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
import { useLocalSearchParams } from "expo-router";
-import { useAtom } from "jotai";
import type React from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
@@ -15,29 +9,18 @@ import Animated, {
useSharedValue,
withTiming,
} from "react-native-reanimated";
+import { Text } from "@/components/common/Text";
+import { ItemContent } from "@/components/ItemContent";
+import { useItemQuery } from "@/hooks/useItemQuery";
const Page: React.FC = () => {
- const [api] = useAtom(apiAtom);
- const [user] = useAtom(userAtom);
const { id } = useLocalSearchParams() as { id: string };
const { t } = useTranslation();
- const { data: item, isError } = useQuery({
- queryKey: ["item", id],
- queryFn: async () => {
- if (!api || !user || !id) return;
- const res = await getUserLibraryApi(api).getItem({
- itemId: id,
- userId: user?.Id,
- });
+ const { offline } = useLocalSearchParams() as { offline?: string };
+ const isOffline = offline === "true";
- return res.data;
- },
- staleTime: 0,
- refetchOnMount: true,
- refetchOnWindowFocus: true,
- refetchOnReconnect: true,
- });
+ const { data: item, isError } = useItemQuery(id, isOffline);
const opacity = useSharedValue(1);
const animatedStyle = useAnimatedStyle(() => {
@@ -107,7 +90,7 @@ const Page: React.FC = () => {
- {item && }
+ {item && }
);
};
diff --git a/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx b/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx
index cce1e2af..ef6bca92 100644
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx
@@ -69,10 +69,16 @@ const page: React.FC = () => {
seriesId: item?.Id!,
userId: user?.Id!,
enableUserData: true,
- fields: ["MediaSources", "MediaStreams", "Overview"],
+ // Note: Including trick play is necessary to enable trick play downloads
+ fields: ["MediaSources", "MediaStreams", "Overview", "Trickplay"],
});
return res?.data.Items || [];
},
+ select: (data) =>
+ // This needs to be sorted by parent index number and then index number, that way we can download the episodes in the correct order.
+ [...(data || [])].sort(
+ (a, b) => (a.ParentIndexNumber ?? 0) - (b.ParentIndexNumber ?? 0) || (a.IndexNumber ?? 0) - (b.IndexNumber ?? 0)
+ ),
staleTime: 60,
enabled: !!api && !!user?.Id && !!item?.Id,
});
@@ -136,7 +142,7 @@ const page: React.FC = () => {
resizeMode: "contain",
}}
/>
- ) : null
+ ) : undefined
}
>
diff --git a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
index 929c098a..63dcf453 100644
--- a/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
+++ b/app/(auth)/(tabs)/(libraries)/[libraryId].tsx
@@ -367,15 +367,7 @@ const Page = () => {
className='mr-1'
id={libraryId}
queryKey='sortBy'
- queryFn={async () =>
- sortOptions
- .filter(
- (s) =>
- library?.CollectionType !== "movies" ||
- s.key !== SortByOption.DateLastContentAdded,
- )
- .map((s) => s.key)
- }
+ queryFn={async () => sortOptions.map((s) => s.key)}
set={setSortBy}
values={sortBy}
title={t("library.filters.sort_by")}
diff --git a/app/(auth)/player/_layout.tsx b/app/(auth)/player/_layout.tsx
index 19e9a8d0..3c29bff4 100644
--- a/app/(auth)/player/_layout.tsx
+++ b/app/(auth)/player/_layout.tsx
@@ -1,33 +1,8 @@
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { useSettings } from "@/utils/atoms/settings";
import { Stack } from "expo-router";
-import React, { useLayoutEffect } from "react";
-import { Platform } from "react-native";
+import React from "react";
import { SystemBars } from "react-native-edge-to-edge";
export default function Layout() {
- const [settings] = useSettings();
-
- useLayoutEffect(() => {
- if (Platform.isTV) return;
-
- if (!settings.followDeviceOrientation && settings.defaultVideoOrientation) {
- ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
- }
-
- return () => {
- if (Platform.isTV) return;
-
- if (settings.followDeviceOrientation === true) {
- ScreenOrientation.unlockAsync();
- } else {
- ScreenOrientation.lockAsync(
- ScreenOrientation.OrientationLock.PORTRAIT_UP,
- );
- }
- };
- });
-
return (
<>
diff --git a/app/(auth)/player/direct-player.tsx b/app/(auth)/player/direct-player.tsx
index 9d8c370e..1e69985d 100644
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -1,9 +1,28 @@
+import {
+ type BaseItemDto,
+ type MediaSourceInfo,
+ PlaybackOrder,
+ PlaybackStartInfo,
+ RepeatMode,
+} from "@jellyfin/sdk/lib/generated-client";
+import {
+ getPlaystateApi,
+ getUserLibraryApi,
+} from "@jellyfin/sdk/lib/utils/api";
+import { activateKeepAwakeAsync, deactivateKeepAwake } from "expo-keep-awake";
+import { router, useGlobalSearchParams, useNavigation } from "expo-router";
+import { useAtomValue } from "jotai";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Alert, Platform, View } from "react-native";
+import { useSharedValue } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
import { BITRATES } from "@/components/BitrateSelector";
-import { Loader } from "@/components/Loader";
import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
import { Controls } from "@/components/video-player/controls/Controls";
-import { getDownloadedFileUrl } from "@/hooks/useDownloadedFileOpener";
import { useHaptic } from "@/hooks/useHaptic";
+import { usePlaybackManager } from "@/hooks/usePlaybackManager";
import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
import { useWebSocket } from "@/hooks/useWebsockets";
import { VlcPlayerView } from "@/modules";
@@ -13,42 +32,15 @@ import type {
ProgressUpdatePayload,
VlcPlayerViewRef,
} from "@/modules/VlcPlayer.types";
+import { useDownload } from "@/providers/DownloadProvider";
+import { DownloadedItem } from "@/providers/Downloads/types";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings";
import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
import { writeToLog } from "@/utils/log";
import { storage } from "@/utils/mmkv";
-import generateDeviceProfile from "@/utils/profiles/native";
+import { generateDeviceProfile } from "@/utils/profiles/native";
import { msToTicks, ticksToSeconds } from "@/utils/time";
-import {
- type BaseItemDto,
- type MediaSourceInfo,
- PlaybackOrder,
- type PlaybackProgressInfo,
- PlaybackStartInfo,
- RepeatMode,
-} from "@jellyfin/sdk/lib/generated-client";
-import {
- getPlaystateApi,
- getUserLibraryApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { activateKeepAwakeAsync, deactivateKeepAwake } from "expo-keep-awake";
-import { useGlobalSearchParams, useNavigation } from "expo-router";
-import { useAtomValue } from "jotai";
-import React, {
- useCallback,
- useEffect,
- useMemo,
- useRef,
- useState,
-} from "react";
-import { useTranslation } from "react-i18next";
-import { Alert, Platform, View } from "react-native";
-import { useSharedValue } from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-const downloadProvider = !Platform.isTV
- ? require("@/providers/DownloadProvider")
- : null;
const IGNORE_SAFE_AREAS_KEY = "video_player_ignore_safe_areas";
@@ -79,10 +71,7 @@ export default function page() {
? null
: require("react-native-volume-manager");
- let getDownloadedItem = null;
- if (!Platform.isTV) {
- getDownloadedItem = downloadProvider.useDownload();
- }
+ const downloadUtils = useDownload();
const revalidateProgressCache = useInvalidatePlaybackProgressCache();
@@ -105,6 +94,7 @@ export default function page() {
mediaSourceId,
bitrateValue: bitrateValueStr,
offline: offlineStr,
+ playbackPosition: playbackPositionFromUrl,
} = useGlobalSearchParams<{
itemId: string;
audioIndex: string;
@@ -112,10 +102,13 @@ export default function page() {
mediaSourceId: string;
bitrateValue: string;
offline: string;
+ /** Playback position in ticks. */
+ playbackPosition?: string;
}>();
const [settings] = useSettings();
const insets = useSafeAreaInsets();
const offline = offlineStr === "true";
+ const playbackManager = usePlaybackManager();
const audioIndex = audioIndexStr
? Number.parseInt(audioIndexStr, 10)
@@ -128,19 +121,33 @@ export default function page() {
: BITRATES[0].value;
const [item, setItem] = useState(null);
+ const [downloadedItem, setDownloadedItem] = useState(
+ null,
+ );
const [itemStatus, setItemStatus] = useState({
isLoading: true,
isError: false,
});
+ /** Gets the initial playback position from the URL. */
+ const getInitialPlaybackTicks = useCallback((): number => {
+ if (playbackPositionFromUrl) {
+ return Number.parseInt(playbackPositionFromUrl, 10);
+ }
+ return 0;
+ }, [playbackPositionFromUrl]);
+
useEffect(() => {
const fetchItemData = async () => {
setItemStatus({ isLoading: true, isError: false });
try {
let fetchedItem: BaseItemDto | null = null;
if (offline && !Platform.isTV) {
- const data = await getDownloadedItem.getDownloadedItem(itemId);
- if (data) fetchedItem = data.item as BaseItemDto;
+ const data = downloadUtils.getDownloadedItemById(itemId);
+ if (data) {
+ fetchedItem = data.item as BaseItemDto;
+ setDownloadedItem(data);
+ }
} else {
const res = await getUserLibraryApi(api!).getItem({
itemId,
@@ -176,27 +183,31 @@ export default function page() {
useEffect(() => {
const fetchStreamData = async () => {
setStreamStatus({ isLoading: true, isError: false });
- const native = await generateDeviceProfile();
try {
let result: Stream | null = null;
- if (offline && !Platform.isTV) {
- const data = await getDownloadedItem.getDownloadedItem(itemId);
- if (!data?.mediaSource) return;
- const url = await getDownloadedFileUrl(data.item.Id!);
+ if (offline && downloadedItem) {
+ if (!downloadedItem?.mediaSource) return;
+ const url = downloadedItem.videoFilePath;
if (item) {
- result = { mediaSource: data.mediaSource, sessionId: "", url };
+ result = {
+ mediaSource: downloadedItem.mediaSource,
+ sessionId: "",
+ url: url,
+ };
}
} else {
+ const native = await generateDeviceProfile();
+ const transcoding = await generateDeviceProfile({ transcode: true });
const res = await getStreamUrl({
api,
item,
- startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
+ startTimeTicks: getInitialPlaybackTicks(),
userId: user?.Id,
audioStreamIndex: audioIndex,
maxStreamingBitrate: bitrateValue,
mediaSourceId: mediaSourceId,
subtitleStreamIndex: subtitleIndex,
- deviceProfile: native,
+ deviceProfile: bitrateValue ? transcoding : native,
});
if (!res) return;
const { mediaSource, sessionId, url } = res;
@@ -217,26 +228,36 @@ export default function page() {
}
};
fetchStreamData();
- }, [itemId, mediaSourceId, bitrateValue, api, item, user?.Id]);
+ }, [
+ itemId,
+ mediaSourceId,
+ bitrateValue,
+ api,
+ item,
+ user?.Id,
+ downloadedItem,
+ ]);
useEffect(() => {
- if (!stream) return;
-
+ if (!stream || !api) return;
const reportPlaybackStart = async () => {
- await getPlaystateApi(api!).reportPlaybackStart({
+ console.log("reporting playback start", currentPlayStateInfo());
+ await getPlaystateApi(api).reportPlaybackStart({
playbackStartInfo: currentPlayStateInfo() as PlaybackStartInfo,
});
};
-
reportPlaybackStart();
- }, [stream]);
+ }, [stream, api]);
const togglePlay = async () => {
lightHapticFeedback();
setIsPlaying(!isPlaying);
if (isPlaying) {
await videoRef.current?.pause();
- reportPlaybackProgress();
+ playbackManager.reportPlaybackProgress(
+ item?.Id!,
+ msToTicks(progress.get()),
+ );
} else {
videoRef.current?.play();
await getPlaystateApi(api!).reportPlaybackStart({
@@ -246,7 +267,6 @@ export default function page() {
};
const reportPlaybackStopped = useCallback(async () => {
- if (offline) return;
const currentTimeInTicks = msToTicks(progress.get());
await getPlaystateApi(api!).onPlaybackStopped({
itemId: item?.Id!,
@@ -254,8 +274,6 @@ export default function page() {
positionTicks: currentTimeInTicks,
playSessionId: stream?.sessionId!,
});
-
- revalidateProgressCache();
}, [
api,
item,
@@ -270,6 +288,7 @@ export default function page() {
reportPlaybackStopped();
setIsPlaybackStopped(true);
videoRef.current?.stop();
+ revalidateProgressCache();
}, [videoRef, reportPlaybackStopped]);
useEffect(() => {
@@ -308,11 +327,21 @@ export default function page() {
progress.set(currentTime);
- if (offline) return;
+ // Update the playback position in the URL.
+ router.setParams({
+ playbackPosition: msToTicks(currentTime).toString(),
+ });
- if (!item?.Id || !stream) return;
+ if (!item?.Id) return;
- reportPlaybackProgress();
+ playbackManager.reportPlaybackProgress(
+ item.Id,
+ msToTicks(progress.get()),
+ {
+ AudioStreamIndex: audioIndex ?? -1,
+ SubtitleStreamIndex: subtitleIndex ?? -1,
+ },
+ );
},
[
item?.Id,
@@ -332,29 +361,10 @@ export default function page() {
setIsPipStarted(pipStarted);
}, []);
- const reportPlaybackProgress = useCallback(async () => {
- if (!api || offline || !stream) return;
- await getPlaystateApi(api).reportPlaybackProgress({
- playbackProgressInfo: currentPlayStateInfo() as PlaybackProgressInfo,
- });
- }, [
- api,
- isPlaying,
- offline,
- stream,
- item?.Id,
- audioIndex,
- subtitleIndex,
- mediaSourceId,
- progress,
- ]);
-
+ /** Gets the initial playback position in seconds. */
const startPosition = useMemo(() => {
- if (offline) return 0;
- return item?.UserData?.PlaybackPositionTicks
- ? ticksToSeconds(item.UserData.PlaybackPositionTicks)
- : 0;
- }, [item, offline]);
+ return ticksToSeconds(getInitialPlaybackTicks());
+ }, [getInitialPlaybackTicks]);
const volumeUpCb = useCallback(async () => {
if (Platform.isTV) return;
@@ -439,14 +449,24 @@ export default function page() {
const { state, isBuffering, isPlaying } = e.nativeEvent;
if (state === "Playing") {
setIsPlaying(true);
- reportPlaybackProgress();
+ if (item?.Id) {
+ playbackManager.reportPlaybackProgress(
+ item.Id,
+ msToTicks(progress.get()),
+ );
+ }
if (!Platform.isTV) await activateKeepAwakeAsync();
return;
}
if (state === "Paused") {
setIsPlaying(false);
- reportPlaybackProgress();
+ if (item?.Id) {
+ playbackManager.reportPlaybackProgress(
+ item.Id,
+ msToTicks(progress.get()),
+ );
+ }
if (!Platform.isTV) await deactivateKeepAwake();
return;
}
@@ -458,7 +478,7 @@ export default function page() {
setIsBuffering(true);
}
},
- [reportPlaybackProgress],
+ [playbackManager, item?.Id, progress],
);
const allAudio =
@@ -476,25 +496,29 @@ export default function page() {
.filter((sub: any) => sub.DeliveryMethod === "External")
.map((sub: any) => ({
name: sub.DisplayTitle,
- DeliveryUrl: api?.basePath + sub.DeliveryUrl,
+ DeliveryUrl: offline ? sub.DeliveryUrl : api?.basePath + sub.DeliveryUrl,
}));
-
+ /** The text based subtitle tracks */
const textSubs = allSubs.filter((sub) => sub.IsTextSubtitleStream);
-
+ /** The user chosen subtitle track from the server */
const chosenSubtitleTrack = allSubs.find(
(sub) => sub.Index === subtitleIndex,
);
+ /** The user chosen audio track from the server */
const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
-
+ /** Whether the stream we're playing is not transcoding*/
const notTranscoding = !stream?.mediaSource.TranscodingUrl;
+ /** The initial options to pass to the VLC Player */
const initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
if (
chosenSubtitleTrack &&
(notTranscoding || chosenSubtitleTrack.IsTextSubtitleStream)
) {
+ // If not transcoding, we can the index as normal.
+ // If transcoding, we need to reverse the text based subtitles, because VLC reverses the HLS subtitles.
const finalIndex = notTranscoding
? allSubs.indexOf(chosenSubtitleTrack)
- : textSubs.indexOf(chosenSubtitleTrack);
+ : [...textSubs].reverse().indexOf(chosenSubtitleTrack);
initOptions.push(`--sub-track=${finalIndex}`);
}
@@ -510,7 +534,7 @@ export default function page() {
return () => setIsMounted(false);
}, []);
- if (itemStatus.isLoading || streamStatus.isLoading) {
+ if (itemStatus.isLoading || streamStatus.isLoading || !item || !stream) {
return (
@@ -544,7 +568,7 @@ export default function page() {
source={{
uri: stream?.url || "",
autoplay: true,
- isNetwork: true,
+ isNetwork: !offline,
startPosition,
externalSubtitles,
initOptions,
diff --git a/app/_layout.tsx b/app/_layout.tsx
index 2d5c14fa..f6cec9b6 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -7,7 +7,6 @@ import {
getOrSetDeviceId,
getTokenFromStorage,
} from "@/providers/JellyfinProvider";
-import { JobQueueProvider } from "@/providers/JobQueueProvider";
import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider";
import { WebSocketProvider } from "@/providers/WebSocketProvider";
import { type Settings, useSettings } from "@/utils/atoms/settings";
@@ -23,7 +22,6 @@ import {
writeToLog,
} from "@/utils/log";
import { storage } from "@/utils/mmkv";
-import { cancelJobById, getAllJobsByDeviceId } from "@/utils/optimize-server";
import { ActionSheetProvider } from "@expo/react-native-action-sheet";
import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
@@ -137,16 +135,13 @@ if (!Platform.isTV) {
TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
console.log("TaskManager ~ trigger");
- const now = Date.now();
-
const settingsData = storage.getString("settings");
if (!settingsData) return BackgroundFetch.BackgroundFetchResult.NoData;
const settings: Partial = JSON.parse(settingsData);
- const url = settings?.optimizedVersionsServerUrl;
- if (!settings?.autoDownload || !url)
+ if (!settings?.autoDownload)
return BackgroundFetch.BackgroundFetchResult.NoData;
const token = getTokenFromStorage();
@@ -156,74 +151,6 @@ if (!Platform.isTV) {
if (!token || !deviceId || !baseDirectory)
return BackgroundFetch.BackgroundFetchResult.NoData;
- const jobs = await getAllJobsByDeviceId({
- deviceId,
- authHeader: token,
- url,
- });
-
- console.log("TaskManager ~ Active jobs: ", jobs.length);
-
- for (const job of jobs) {
- if (job.status === "completed") {
- const downloadUrl = `${url}download/${job.id}`;
- const tasks = await BackGroundDownloader.checkForExistingDownloads();
-
- if (tasks.find((task: { id: string }) => task.id === job.id)) {
- console.log("TaskManager ~ Download already in progress: ", job.id);
- continue;
- }
-
- BackGroundDownloader.download({
- id: job.id,
- url: downloadUrl,
- destination: `${baseDirectory}${job.item.Id}.mp4`,
- headers: {
- Authorization: token,
- },
- })
- .begin(() => {
- console.log("TaskManager ~ Download started: ", job.id);
- })
- .done(() => {
- console.log("TaskManager ~ Download completed: ", job.id);
- saveDownloadedItemInfo(job.item);
- BackGroundDownloader.completeHandler(job.id);
- cancelJobById({
- authHeader: token,
- id: job.id,
- url: url,
- });
- Notifications.scheduleNotificationAsync({
- content: {
- title: job.item.Name,
- body: "Download completed",
- data: {
- url: "/downloads",
- },
- },
- trigger: null,
- });
- })
- .error((error: any) => {
- console.log("TaskManager ~ Download error: ", job.id, error);
- BackGroundDownloader.completeHandler(job.id);
- Notifications.scheduleNotificationAsync({
- content: {
- title: job.item.Name,
- body: "Download failed",
- data: {
- url: "/downloads",
- },
- },
- trigger: null,
- });
- });
- }
- }
-
- console.log(`Auto download started: ${new Date(now).toISOString()}`);
-
// Be sure to return the successful result type!
return BackgroundFetch.BackgroundFetchResult.NewData;
});
@@ -414,21 +341,32 @@ function Layout() {
}, []);
useEffect(() => {
- if (Platform.isTV) return;
- if (segments.includes("direct-player" as never)) {
+ if (Platform.isTV) {
+ return;
+ }
+
+ if (segments.includes("direct-player" as never)) {
+ if (
+ !settings.followDeviceOrientation &&
+ settings.defaultVideoOrientation
+ ) {
+ ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
+ }
return;
}
- // If the user has auto rotate enabled, unlock the orientation
if (settings.followDeviceOrientation === true) {
ScreenOrientation.unlockAsync();
} else {
- // If the user has auto rotate disabled, lock the orientation to portrait
ScreenOrientation.lockAsync(
ScreenOrientation.OrientationLock.PORTRAIT_UP,
);
}
- }, [settings.followDeviceOrientation, segments]);
+ }, [
+ settings.followDeviceOrientation,
+ settings.defaultVideoOrientation,
+ segments,
+ ]);
useEffect(() => {
const subscription = AppState.addEventListener(
@@ -453,64 +391,62 @@ function Layout() {
return (
-
-
-
-
-
-
-
-
-
-
- null,
- }}
- />
- null,
- }}
- />
-
-
-
-
+
+
+
+
+
+
+
+
+ null,
}}
- closeButton
/>
-
-
-
-
-
-
-
-
+ null,
+ }}
+ />
+
+
+
+
+
+
+
+
+
+
+
);
}
diff --git a/biome.json b/biome.json
index f9fd721d..dc9714d5 100644
--- a/biome.json
+++ b/biome.json
@@ -1,16 +1,14 @@
{
- "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
- "organizeImports": {
- "enabled": true
- },
+ "$schema": "https://biomejs.dev/schemas/2.0.5/schema.json",
"files": {
- "ignore": [
- "node_modules",
- "ios",
- "android",
- "Streamyfin.app",
- "utils/jellyseerr",
- ".expo"
+ "includes": [
+ "**/*",
+ "!node_modules/**",
+ "!ios/**",
+ "!android/**",
+ "!Streamyfin.app/**",
+ "!utils/jellyseerr/**",
+ "!.expo/**"
]
},
"linter": {
diff --git a/bun.lock b/bun.lock
index 2c066585..fcb2422f 100644
--- a/bun.lock
+++ b/bun.lock
@@ -4,7 +4,7 @@
"": {
"name": "streamyfin",
"dependencies": {
- "@bottom-tabs/react-navigation": "0.8.6",
+ "@bottom-tabs/react-navigation": "0.9.2",
"@expo/config-plugins": "~9.0.15",
"@expo/react-native-action-sheet": "^4.1.1",
"@expo/vector-icons": "^14.0.4",
@@ -21,36 +21,36 @@
"@tanstack/react-query": "^5.66.0",
"add": "^2.0.6",
"axios": "^1.7.9",
- "expo": "^52.0.31",
- "expo-asset": "~11.0.3",
- "expo-background-fetch": "~13.0.5",
+ "expo": "~52.0.47",
+ "expo-asset": "~11.0.5",
+ "expo-background-fetch": "~13.0.6",
"expo-blur": "~14.0.3",
"expo-brightness": "~13.0.3",
- "expo-build-properties": "~0.13.2",
- "expo-constants": "~17.0.5",
+ "expo-build-properties": "~0.13.3",
+ "expo-constants": "~17.0.8",
"expo-crypto": "~14.0.2",
- "expo-dev-client": "~5.0.11",
- "expo-device": "~7.0.2",
+ "expo-dev-client": "~5.0.20",
+ "expo-device": "~7.0.3",
"expo-font": "~13.0.3",
"expo-haptics": "~14.0.1",
- "expo-image": "~2.0.4",
+ "expo-image": "~2.0.7",
"expo-keep-awake": "~14.0.2",
"expo-linear-gradient": "~14.0.2",
"expo-linking": "~7.0.5",
"expo-localization": "~16.0.1",
"expo-network": "~7.0.5",
- "expo-notifications": "~0.29.13",
- "expo-router": "~4.0.17",
+ "expo-notifications": "~0.29.14",
+ "expo-router": "~4.0.21",
"expo-screen-orientation": "~8.0.4",
"expo-sensors": "~14.0.2",
"expo-sharing": "~13.0.1",
- "expo-splash-screen": "~0.29.22",
+ "expo-splash-screen": "~0.29.24",
"expo-status-bar": "~2.0.1",
- "expo-system-ui": "~4.0.8",
- "expo-task-manager": "~12.0.5",
- "expo-updates": "~0.26.17",
+ "expo-system-ui": "~4.0.9",
+ "expo-task-manager": "~12.0.6",
+ "expo-updates": "~0.27.4",
"expo-web-browser": "~14.0.2",
- "i18next": "^24.2.2",
+ "i18next": "^25.0.0",
"jotai": "^2.11.3",
"lodash": "^4.17.21",
"nativewind": "^2.0.11",
@@ -59,27 +59,27 @@
"react-i18next": "^15.4.0",
"react-native": "npm:react-native-tvos@~0.77.2-0",
"react-native-awesome-slider": "^2.9.0",
- "react-native-bottom-tabs": "0.8.6",
+ "react-native-bottom-tabs": "0.9.2",
"react-native-circular-progress": "^1.4.1",
"react-native-collapsible": "^1.6.2",
"react-native-compressor": "^1.10.3",
"react-native-country-flag": "^2.0.2",
"react-native-device-info": "^14.0.4",
"react-native-edge-to-edge": "^1.4.3",
- "react-native-gesture-handler": "2.22.0",
+ "react-native-gesture-handler": "~2.24.0",
"react-native-get-random-values": "^1.11.0",
"react-native-google-cast": "^4.8.3",
"react-native-image-colors": "^2.4.0",
"react-native-ios-context-menu": "^3.1.0",
"react-native-ios-utilities": "5.1.1",
"react-native-mmkv": "^2.12.2",
- "react-native-pager-view": "6.5.1",
+ "react-native-pager-view": "6.6.0",
"react-native-progress": "^5.0.1",
"react-native-reanimated": "~3.16.7",
"react-native-reanimated-carousel": "3.5.1",
- "react-native-safe-area-context": "5.1.0",
- "react-native-screens": "~4.5.0",
- "react-native-svg": "15.11.1",
+ "react-native-safe-area-context": "5.2.0",
+ "react-native-screens": "4.10.0",
+ "react-native-svg": "15.11.2",
"react-native-tab-view": "^4.0.5",
"react-native-udp": "^4.1.7",
"react-native-uitextview": "^1.4.0",
@@ -88,7 +88,7 @@
"react-native-video": "6.10.0",
"react-native-volume-manager": "^2.0.8",
"react-native-web": "~0.19.13",
- "react-native-webview": "13.13.2",
+ "react-native-webview": "13.13.0",
"sonner-native": "^0.17.0",
"tailwindcss": "3.3.2",
"use-debounce": "^10.0.4",
@@ -98,10 +98,10 @@
},
"devDependencies": {
"@babel/core": "^7.26.8",
- "@biomejs/biome": "^1.9.4",
- "@react-native-community/cli": "15.1.3",
+ "@biomejs/biome": "^2.0.0",
+ "@react-native-community/cli": "18.0.0",
"@react-native-tvos/config-tv": "^0.1.1",
- "@types/jest": "^29.5.14",
+ "@types/jest": "^30.0.0",
"@types/lodash": "^4.17.15",
"@types/react": "~18.3.12",
"@types/react-native-vector-icons": "^6.4.18",
@@ -109,7 +109,7 @@
"@types/uuid": "^10.0.0",
"cross-env": "^7.0.3",
"husky": "^9.1.7",
- "lint-staged": "^15.5.0",
+ "lint-staged": "^16.1.2",
"postinstall-postinstall": "^2.1.0",
"react-test-renderer": "19.0.0",
"typescript": "~5.7.3",
@@ -369,7 +369,7 @@
"@babel/register": ["@babel/register@7.25.9", "", { "dependencies": { "clone-deep": "^4.0.1", "find-cache-dir": "^2.0.0", "make-dir": "^2.1.0", "pirates": "^4.0.6", "source-map-support": "^0.5.16" }, "peerDependencies": { "@babel/core": "^7.0.0-0" } }, "sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA=="],
- "@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+ "@babel/runtime": ["@babel/runtime@7.27.6", "", {}, "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q=="],
"@babel/template": ["@babel/template@7.26.9", "", { "dependencies": { "@babel/code-frame": "^7.26.2", "@babel/parser": "^7.26.9", "@babel/types": "^7.26.9" } }, "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA=="],
@@ -379,25 +379,25 @@
"@babel/types": ["@babel/types@7.26.9", "", { "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" } }, "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw=="],
- "@biomejs/biome": ["@biomejs/biome@1.9.4", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "1.9.4", "@biomejs/cli-darwin-x64": "1.9.4", "@biomejs/cli-linux-arm64": "1.9.4", "@biomejs/cli-linux-arm64-musl": "1.9.4", "@biomejs/cli-linux-x64": "1.9.4", "@biomejs/cli-linux-x64-musl": "1.9.4", "@biomejs/cli-win32-arm64": "1.9.4", "@biomejs/cli-win32-x64": "1.9.4" }, "bin": { "biome": "bin/biome" } }, "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog=="],
+ "@biomejs/biome": ["@biomejs/biome@2.0.5", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.0.5", "@biomejs/cli-darwin-x64": "2.0.5", "@biomejs/cli-linux-arm64": "2.0.5", "@biomejs/cli-linux-arm64-musl": "2.0.5", "@biomejs/cli-linux-x64": "2.0.5", "@biomejs/cli-linux-x64-musl": "2.0.5", "@biomejs/cli-win32-arm64": "2.0.5", "@biomejs/cli-win32-x64": "2.0.5" }, "bin": { "biome": "bin/biome" } }, "sha512-MztFGhE6cVjf3QmomWu83GpTFyWY8KIcskgRf2AqVEMSH4qI4rNdBLdpAQ11TNK9pUfLGz3IIOC1ZYwgBePtig=="],
- "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@1.9.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw=="],
+ "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.0.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-VIIWQv9Rcj9XresjCf3isBFfWjFStsdGZvm8SmwJzKs/22YQj167ge7DkxuaaZbNf2kmYif0AcjAKvtNedEoEw=="],
- "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@1.9.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg=="],
+ "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.0.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-DRpGxBgf5Z7HUFcNUB6n66UiD4VlBlMpngNf32wPraxX8vYU6N9cb3xQWOXIQVBBQ64QfsSLJnjNu79i/LNmSg=="],
- "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@1.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g=="],
+ "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.0.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-FQTfDNMXOknf8+g9Eede2daaduRjTC2SNbfWPNFMadN9K3UKjeZ62jwiYxztPaz9zQQsZU8VbddQIaeQY5CmIA=="],
- "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@1.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA=="],
+ "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.0.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-OpflTCOw/ElEs7QZqN/HFaSViPHjAsAPxFJ22LhWUWvuJgcy/Z8+hRV0/3mk/ZRWy5A6fCDKHZqAxU+xB6W4mA=="],
- "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@1.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg=="],
+ "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.0.5", "", { "os": "linux", "cpu": "x64" }, "sha512-znpfydUDPuDkyBTulnODrQVK2FaG/4hIOPcQSsF2GeauQOYrBAOplj0etGB0NUrr0dFsvaQ15nzDXYb60ACoiw=="],
- "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@1.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg=="],
+ "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.0.5", "", { "os": "linux", "cpu": "x64" }, "sha512-9lmjCnajAzpZXbav2P6D87ugkhnaDpJtDvOH5uQbY2RXeW6Rq18uOUltxgacGBP+d8GusTr+s3IFOu7SN0Ok8g=="],
- "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@1.9.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg=="],
+ "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.0.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-CP2wKQB+gh8HdJTFKYRFETqReAjxlcN9AlYDEoye8v2eQp+L9v+PUeDql/wsbaUhSsLR0sjj3PtbBtt+02AN3A=="],
- "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@1.9.4", "", { "os": "win32", "cpu": "x64" }, "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA=="],
+ "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.0.5", "", { "os": "win32", "cpu": "x64" }, "sha512-Sw3rz2m6bBADeQpr3+MD7Ch4E1l15DTt/+dfqKnwkm3cn4BrYwnArmvKeZdVsFRDjMyjlKIP88bw1r7o+9aqzw=="],
- "@bottom-tabs/react-navigation": ["@bottom-tabs/react-navigation@0.8.6", "", { "dependencies": { "color": "^4.2.3" }, "peerDependencies": { "@react-navigation/native": ">=7", "react": "*", "react-native": "*", "react-native-bottom-tabs": "*" } }, "sha512-hLlyBAUz4ahaVK2Op2VcJeAkCSpm3KKho4IojkPyXsos4WEHtO44EYWC71TDbVGeOP5HQ9k7FSwAW3IiZs0wHw=="],
+ "@bottom-tabs/react-navigation": ["@bottom-tabs/react-navigation@0.9.2", "", { "dependencies": { "color": "^4.2.3" }, "peerDependencies": { "@react-navigation/native": ">=7", "react": "*", "react-native": "*", "react-native-bottom-tabs": "*" } }, "sha512-IZZKllcaqCGsKIgeXmYFGU95IXxbBpXtwKws4Lg2GJw/qqAYYsPFEl0JBvnymSD7G1zkHYEilg5UHuTd0NmX7A=="],
"@dominicstop/ts-event-emitter": ["@dominicstop/ts-event-emitter@1.1.0", "", {}, "sha512-CcxmJIvUb1vsFheuGGVSQf4KdPZC44XolpUT34+vlal+LyQoBUOn31pjFET5M9ctOxEpt8xa0M3/2M7uUiAoJw=="],
@@ -405,11 +405,11 @@
"@expo/bunyan": ["@expo/bunyan@4.0.1", "", { "dependencies": { "uuid": "^8.0.0" } }, "sha512-+Lla7nYSiHZirgK+U/uYzsLv/X+HaJienbD5AKX1UQZHYfWaP+9uuQluRB4GrEVWF0GZ7vEVp/jzaOT9k/SQlg=="],
- "@expo/cli": ["@expo/cli@0.22.18", "", { "dependencies": { "@0no-co/graphql.web": "^1.0.8", "@babel/runtime": "^7.20.0", "@expo/code-signing-certificates": "^0.0.5", "@expo/config": "~10.0.10", "@expo/config-plugins": "~9.0.15", "@expo/devcert": "^1.1.2", "@expo/env": "~0.4.2", "@expo/image-utils": "^0.6.5", "@expo/json-file": "^9.0.2", "@expo/metro-config": "~0.19.11", "@expo/osascript": "^2.1.6", "@expo/package-manager": "^1.7.2", "@expo/plist": "^0.2.2", "@expo/prebuild-config": "^8.0.28", "@expo/rudder-sdk-node": "^1.1.1", "@expo/spawn-async": "^1.7.2", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.3.0", "@react-native/dev-middleware": "0.76.7", "@urql/core": "^5.0.6", "@urql/exchange-retry": "^1.3.0", "accepts": "^1.3.8", "arg": "^5.0.2", "better-opn": "~3.0.2", "bplist-creator": "0.0.7", "bplist-parser": "^0.3.1", "cacache": "^18.0.2", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "env-editor": "^0.4.1", "fast-glob": "^3.3.2", "form-data": "^3.0.1", "freeport-async": "^2.0.0", "fs-extra": "~8.1.0", "getenv": "^1.0.0", "glob": "^10.4.2", "internal-ip": "^4.3.0", "is-docker": "^2.0.0", "is-wsl": "^2.1.1", "lodash.debounce": "^4.0.8", "minimatch": "^3.0.4", "node-forge": "^1.3.1", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^3.0.1", "pretty-bytes": "^5.6.0", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "qrcode-terminal": "0.11.0", "require-from-string": "^2.0.2", "requireg": "^0.2.2", "resolve": "^1.22.2", "resolve-from": "^5.0.0", "resolve.exports": "^2.0.3", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "source-map-support": "~0.5.21", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "tar": "^6.2.1", "temp-dir": "^2.0.0", "tempy": "^0.7.1", "terminal-link": "^2.1.1", "undici": "^6.18.2", "unique-string": "~2.0.0", "wrap-ansi": "^7.0.0", "ws": "^8.12.1" }, "bin": { "expo-internal": "build/bin/cli" } }, "sha512-TWGKHWTYU9xE7YETPk2zQzLPl+bldpzZCa0Cqg0QeENpu03ZEnMxUqrgHwrbWGTf7ONTYC1tODBkFCFw/qgPGA=="],
+ "@expo/cli": ["@expo/cli@0.22.26", "", { "dependencies": { "@0no-co/graphql.web": "^1.0.8", "@babel/runtime": "^7.20.0", "@expo/code-signing-certificates": "^0.0.5", "@expo/config": "~10.0.11", "@expo/config-plugins": "~9.0.17", "@expo/devcert": "^1.1.2", "@expo/env": "~0.4.2", "@expo/image-utils": "^0.6.5", "@expo/json-file": "^9.0.2", "@expo/metro-config": "~0.19.12", "@expo/osascript": "^2.1.6", "@expo/package-manager": "^1.7.2", "@expo/plist": "^0.2.2", "@expo/prebuild-config": "~8.2.0", "@expo/rudder-sdk-node": "^1.1.1", "@expo/spawn-async": "^1.7.2", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.3.0", "@react-native/dev-middleware": "0.76.9", "@urql/core": "^5.0.6", "@urql/exchange-retry": "^1.3.0", "accepts": "^1.3.8", "arg": "^5.0.2", "better-opn": "~3.0.2", "bplist-creator": "0.0.7", "bplist-parser": "^0.3.1", "cacache": "^18.0.2", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "env-editor": "^0.4.1", "fast-glob": "^3.3.2", "form-data": "^3.0.1", "freeport-async": "^2.0.0", "fs-extra": "~8.1.0", "getenv": "^1.0.0", "glob": "^10.4.2", "internal-ip": "^4.3.0", "is-docker": "^2.0.0", "is-wsl": "^2.1.1", "lodash.debounce": "^4.0.8", "minimatch": "^3.0.4", "node-forge": "^1.3.1", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^3.0.1", "pretty-bytes": "^5.6.0", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "qrcode-terminal": "0.11.0", "require-from-string": "^2.0.2", "requireg": "^0.2.2", "resolve": "^1.22.2", "resolve-from": "^5.0.0", "resolve.exports": "^2.0.3", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "source-map-support": "~0.5.21", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "tar": "^6.2.1", "temp-dir": "^2.0.0", "tempy": "^0.7.1", "terminal-link": "^2.1.1", "undici": "^6.18.2", "unique-string": "~2.0.0", "wrap-ansi": "^7.0.0", "ws": "^8.12.1" }, "bin": { "expo-internal": "build/bin/cli" } }, "sha512-I689wc8Fn/AX7aUGiwrh3HnssiORMJtR2fpksX+JIe8Cj/EDleblYMSwRPd0025wrwOV9UN1KM/RuEt/QjCS3Q=="],
"@expo/code-signing-certificates": ["@expo/code-signing-certificates@0.0.5", "", { "dependencies": { "node-forge": "^1.2.1", "nullthrows": "^1.1.1" } }, "sha512-BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw=="],
- "@expo/config": ["@expo/config@10.0.10", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "@expo/config-plugins": "~9.0.15", "@expo/config-types": "^52.0.4", "@expo/json-file": "^9.0.2", "deepmerge": "^4.3.1", "getenv": "^1.0.0", "glob": "^10.4.2", "require-from-string": "^2.0.2", "resolve-from": "^5.0.0", "resolve-workspace-root": "^2.0.0", "semver": "^7.6.0", "slugify": "^1.3.4", "sucrase": "3.35.0" } }, "sha512-wI9/iam3Irk99ADGM/FyD7YrrEibIZXR4huSZiU5zt9o3dASOKhqepiNJex4YPiktLfKhYrpSEJtwno1g0SrgA=="],
+ "@expo/config": ["@expo/config@10.0.11", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "@expo/config-plugins": "~9.0.17", "@expo/config-types": "^52.0.5", "@expo/json-file": "^9.0.2", "deepmerge": "^4.3.1", "getenv": "^1.0.0", "glob": "^10.4.2", "require-from-string": "^2.0.2", "resolve-from": "^5.0.0", "resolve-workspace-root": "^2.0.0", "semver": "^7.6.0", "slugify": "^1.3.4", "sucrase": "3.35.0" } }, "sha512-nociJ4zr/NmbVfMNe9j/+zRlt7wz/siISu7PjdWE4WE+elEGxWWxsGzltdJG0llzrM+khx8qUiFK5aiVcdMBww=="],
"@expo/config-plugins": ["@expo/config-plugins@9.0.15", "", { "dependencies": { "@expo/config-types": "^52.0.4", "@expo/json-file": "~9.0.1", "@expo/plist": "^0.2.1", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^1.0.0", "glob": "^10.4.2", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slash": "^3.0.0", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-elKY/zIpAJ40RH26iwfyp+hwgeyPgIXX0SrCSOcjeJLsMsCmMac9ewvb+AN8y4k+N7m5lD/dMZupsaateKTFwA=="],
@@ -425,7 +425,7 @@
"@expo/json-file": ["@expo/json-file@9.0.2", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "json5": "^2.2.3", "write-file-atomic": "^2.3.0" } }, "sha512-yAznIUrybOIWp3Uax7yRflB0xsEpvIwIEqIjao9SGi2Gaa+N0OamWfe0fnXBSWF+2zzF4VvqwT4W5zwelchfgw=="],
- "@expo/metro-config": ["@expo/metro-config@0.19.11", "", { "dependencies": { "@babel/core": "^7.20.0", "@babel/generator": "^7.20.5", "@babel/parser": "^7.20.0", "@babel/types": "^7.20.0", "@expo/config": "~10.0.10", "@expo/env": "~0.4.2", "@expo/json-file": "~9.0.2", "@expo/spawn-async": "^1.7.2", "chalk": "^4.1.0", "debug": "^4.3.2", "fs-extra": "^9.1.0", "getenv": "^1.0.0", "glob": "^10.4.2", "jsc-safe-url": "^0.2.4", "lightningcss": "~1.27.0", "minimatch": "^3.0.4", "postcss": "~8.4.32", "resolve-from": "^5.0.0" } }, "sha512-XaobHTcsoHQdKEH7PI/DIpr2QiugkQmPYolbfzkpSJMplNWfSh+cTRjrm4//mS2Sb78qohtu0u2CGJnFqFUGag=="],
+ "@expo/metro-config": ["@expo/metro-config@0.19.12", "", { "dependencies": { "@babel/core": "^7.20.0", "@babel/generator": "^7.20.5", "@babel/parser": "^7.20.0", "@babel/types": "^7.20.0", "@expo/config": "~10.0.11", "@expo/env": "~0.4.2", "@expo/json-file": "~9.0.2", "@expo/spawn-async": "^1.7.2", "chalk": "^4.1.0", "debug": "^4.3.2", "fs-extra": "^9.1.0", "getenv": "^1.0.0", "glob": "^10.4.2", "jsc-safe-url": "^0.2.4", "lightningcss": "~1.27.0", "minimatch": "^3.0.4", "postcss": "~8.4.32", "resolve-from": "^5.0.0" } }, "sha512-fhT3x1ikQWHpZgw7VrEghBdscFPz1laRYa8WcVRB18nTTqorF6S8qPYslkJu1faEziHZS7c2uyDzTYnrg/CKbg=="],
"@expo/metro-runtime": ["@expo/metro-runtime@4.0.1", "", { "peerDependencies": { "react-native": "*" } }, "sha512-CRpbLvdJ1T42S+lrYa1iZp1KfDeBp4oeZOK3hdpiS5n0vR0nhD6sC1gGF0sTboCTp64tLteikz5Y3j53dvgOIw=="],
@@ -435,7 +435,7 @@
"@expo/plist": ["@expo/plist@0.2.2", "", { "dependencies": { "@xmldom/xmldom": "~0.7.7", "base64-js": "^1.2.3", "xmlbuilder": "^14.0.0" } }, "sha512-ZZGvTO6vEWq02UAPs3LIdja+HRO18+LRI5QuDl6Hs3Ps7KX7xU6Y6kjahWKY37Rx2YjNpX07dGpBFzzC+vKa2g=="],
- "@expo/prebuild-config": ["@expo/prebuild-config@8.0.28", "", { "dependencies": { "@expo/config": "~10.0.10", "@expo/config-plugins": "~9.0.15", "@expo/config-types": "^52.0.4", "@expo/image-utils": "^0.6.5", "@expo/json-file": "^9.0.2", "@react-native/normalize-colors": "0.76.7", "debug": "^4.3.1", "fs-extra": "^9.0.0", "resolve-from": "^5.0.0", "semver": "^7.6.0", "xml2js": "0.6.0" } }, "sha512-SDDgCKKS1wFNNm3de2vBP8Q5bnxcabuPDE9Mnk9p7Gb4qBavhwMbAtrLcAyZB+WRb4QM+yan3z3K95vvCfI/+A=="],
+ "@expo/prebuild-config": ["@expo/prebuild-config@8.2.0", "", { "dependencies": { "@expo/config": "~10.0.11", "@expo/config-plugins": "~9.0.17", "@expo/config-types": "^52.0.5", "@expo/image-utils": "^0.6.5", "@expo/json-file": "^9.0.2", "@react-native/normalize-colors": "0.76.9", "debug": "^4.3.1", "fs-extra": "^9.0.0", "resolve-from": "^5.0.0", "semver": "^7.6.0", "xml2js": "0.6.0" } }, "sha512-CxiPpd980s0jyxi7eyN3i/7YKu3XL+8qPjBZUCYtc0+axpGweqIkq2CslyLSKHyqVyH/zlPkbVgWdyiYavFS5Q=="],
"@expo/react-native-action-sheet": ["@expo/react-native-action-sheet@4.1.1", "", { "dependencies": { "@types/hoist-non-react-statics": "^3.3.1", "hoist-non-react-statics": "^3.3.0" }, "peerDependencies": { "react": ">=18.0.0" } }, "sha512-4KRaba2vhqDRR7ObBj6nrD5uJw8ePoNHdIOMETTpgGTX7StUbrF4j/sfrP1YUyaPEa1P8FXdwG6pB+2WtrJd1A=="],
@@ -443,7 +443,7 @@
"@expo/sdk-runtime-versions": ["@expo/sdk-runtime-versions@1.0.0", "", {}, "sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="],
- "@expo/server": ["@expo/server@0.5.1", "", { "dependencies": { "@remix-run/node": "^2.12.0", "abort-controller": "^3.0.0", "debug": "^4.3.4", "source-map-support": "~0.5.21" } }, "sha512-lk8pKKw0eVP6rqkDR46vQB3vLA46z4KNGrqHpjD/SvMu1cGaRmQG2cQdX44mQtG8WyO9EYau+fBMHQQS2OTFKg=="],
+ "@expo/server": ["@expo/server@0.5.3", "", { "dependencies": { "abort-controller": "^3.0.0", "debug": "^4.3.4", "source-map-support": "~0.5.21", "undici": "^6.18.2" } }, "sha512-WXsWzeBs5v/h0PUfHyNLLz07rwwO5myQ1A5DGYewyyGLmsyl61yVCe8AgAlp1wkiMsqhj2hZqI2u3K10QnCMrQ=="],
"@expo/spawn-async": ["@expo/spawn-async@1.7.2", "", { "dependencies": { "cross-spawn": "^7.0.3" } }, "sha512-QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew=="],
@@ -485,13 +485,19 @@
"@jest/create-cache-key-function": ["@jest/create-cache-key-function@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3" } }, "sha512-4QqS3LY5PBmTRHj9sAg1HLoPzqAI0uOX6wI/TRqHIcOxlFidy6YEmCQJk6FSZjNLGCeubDMfmkWL+qaLKhSGQA=="],
+ "@jest/diff-sequences": ["@jest/diff-sequences@30.0.1", "", {}, "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw=="],
+
"@jest/environment": ["@jest/environment@29.7.0", "", { "dependencies": { "@jest/fake-timers": "^29.7.0", "@jest/types": "^29.6.3", "@types/node": "*", "jest-mock": "^29.7.0" } }, "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw=="],
- "@jest/expect-utils": ["@jest/expect-utils@29.7.0", "", { "dependencies": { "jest-get-type": "^29.6.3" } }, "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA=="],
+ "@jest/expect-utils": ["@jest/expect-utils@30.0.2", "", { "dependencies": { "@jest/get-type": "30.0.1" } }, "sha512-FHF2YdtFBUQOo0/qdgt+6UdBFcNPF/TkVzcc+4vvf8uaBzUlONytGBeeudufIHHW1khRfM1sBbRT1VCK7n/0dQ=="],
"@jest/fake-timers": ["@jest/fake-timers@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", "jest-message-util": "^29.7.0", "jest-mock": "^29.7.0", "jest-util": "^29.7.0" } }, "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ=="],
- "@jest/schemas": ["@jest/schemas@29.6.3", "", { "dependencies": { "@sinclair/typebox": "^0.27.8" } }, "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA=="],
+ "@jest/get-type": ["@jest/get-type@30.0.1", "", {}, "sha512-AyYdemXCptSRFirI5EPazNxyPwAL0jXt3zceFjaj8NFiKP9pOi0bfXonf6qkf82z2t3QWPeLCWWw4stPBzctLw=="],
+
+ "@jest/pattern": ["@jest/pattern@30.0.1", "", { "dependencies": { "@types/node": "*", "jest-regex-util": "30.0.1" } }, "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA=="],
+
+ "@jest/schemas": ["@jest/schemas@30.0.1", "", { "dependencies": { "@sinclair/typebox": "^0.34.0" } }, "sha512-+g/1TKjFuGrf1Hh0QPCv0gISwBxJ+MQSNXmG9zjHy7BmFhtoJ9fdNhWJp3qUKRi93AOZHXtdxZgJ1vAtz6z65w=="],
"@jest/transform": ["@jest/transform@29.7.0", "", { "dependencies": { "@babel/core": "^7.11.6", "@jest/types": "^29.6.3", "@jridgewell/trace-mapping": "^0.3.18", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", "convert-source-map": "^2.0.0", "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.9", "jest-haste-map": "^29.7.0", "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", "micromatch": "^4.0.4", "pirates": "^4.0.4", "slash": "^3.0.0", "write-file-atomic": "^4.0.2" } }, "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw=="],
@@ -593,31 +599,29 @@
"@radix-ui/rect": ["@radix-ui/rect@1.1.0", "", {}, "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg=="],
- "@react-native-community/cli": ["@react-native-community/cli@15.1.3", "", { "dependencies": { "@react-native-community/cli-clean": "15.1.3", "@react-native-community/cli-config": "15.1.3", "@react-native-community/cli-debugger-ui": "15.1.3", "@react-native-community/cli-doctor": "15.1.3", "@react-native-community/cli-server-api": "15.1.3", "@react-native-community/cli-tools": "15.1.3", "@react-native-community/cli-types": "15.1.3", "chalk": "^4.1.2", "commander": "^9.4.1", "deepmerge": "^4.3.0", "execa": "^5.0.0", "find-up": "^5.0.0", "fs-extra": "^8.1.0", "graceful-fs": "^4.1.3", "prompts": "^2.4.2", "semver": "^7.5.2" }, "bin": { "rnc-cli": "build/bin.js" } }, "sha512-+ih/WYUkJsEV2CMAnOHvVoSIz/Ahg5UJk+sqSIOmY79mWAglQzfLP71o7b0neJCnJWLmWiO6G6/S+kmULefD5g=="],
+ "@react-native-community/cli": ["@react-native-community/cli@18.0.0", "", { "dependencies": { "@react-native-community/cli-clean": "18.0.0", "@react-native-community/cli-config": "18.0.0", "@react-native-community/cli-doctor": "18.0.0", "@react-native-community/cli-server-api": "18.0.0", "@react-native-community/cli-tools": "18.0.0", "@react-native-community/cli-types": "18.0.0", "chalk": "^4.1.2", "commander": "^9.4.1", "deepmerge": "^4.3.0", "execa": "^5.0.0", "find-up": "^5.0.0", "fs-extra": "^8.1.0", "graceful-fs": "^4.1.3", "prompts": "^2.4.2", "semver": "^7.5.2" }, "bin": { "rnc-cli": "build/bin.js" } }, "sha512-DyKptlG78XPFo7tDod+we5a3R+U9qjyhaVFbOPvH4pFNu5Dehewtol/srl44K6Cszq0aEMlAJZ3juk0W4WnOJA=="],
- "@react-native-community/cli-clean": ["@react-native-community/cli-clean@15.1.3", "", { "dependencies": { "@react-native-community/cli-tools": "15.1.3", "chalk": "^4.1.2", "execa": "^5.0.0", "fast-glob": "^3.3.2" } }, "sha512-3s9NGapIkONFoCUN2s77NYI987GPSCdr74rTf0TWyGIDf4vTYgKoWKKR+Ml3VTa1BCj51r4cYuHEKE1pjUSc0w=="],
+ "@react-native-community/cli-clean": ["@react-native-community/cli-clean@18.0.0", "", { "dependencies": { "@react-native-community/cli-tools": "18.0.0", "chalk": "^4.1.2", "execa": "^5.0.0", "fast-glob": "^3.3.2" } }, "sha512-+k64EnJaMI5U8iNDF9AftHBJW+pO/isAhncEXuKRc6IjRtIh6yoaUIIf5+C98fgjfux7CNRZAMQIkPbZodv2Gw=="],
- "@react-native-community/cli-config": ["@react-native-community/cli-config@15.1.3", "", { "dependencies": { "@react-native-community/cli-tools": "15.1.3", "chalk": "^4.1.2", "cosmiconfig": "^9.0.0", "deepmerge": "^4.3.0", "fast-glob": "^3.3.2", "joi": "^17.2.1" } }, "sha512-fJ9MrWp+/SszEVg5Wja8A57Whl5EfjRCHWFNkvFBtfjVUfi2hWvSTW3VBxzJuCHnPIIwpQafwjEgOrIRUI8y6w=="],
+ "@react-native-community/cli-config": ["@react-native-community/cli-config@18.0.0", "", { "dependencies": { "@react-native-community/cli-tools": "18.0.0", "chalk": "^4.1.2", "cosmiconfig": "^9.0.0", "deepmerge": "^4.3.0", "fast-glob": "^3.3.2", "joi": "^17.2.1" } }, "sha512-GUGvyek06JRF4mfd9zXao9YQW4+H8ny69HznqNXVRtVSIIekFyjOpKQeSEzdcyqJEEa5gej22GOz1JCHMKBccg=="],
- "@react-native-community/cli-config-android": ["@react-native-community/cli-config-android@15.1.3", "", { "dependencies": { "@react-native-community/cli-tools": "15.1.3", "chalk": "^4.1.2", "fast-glob": "^3.3.2", "fast-xml-parser": "^4.4.1" } }, "sha512-v9okV/WQfMJEWRddI0S6no2v9Lvk54KgFkw1mvMYhJKVqloCNsIWzoqme0u7zIuYSzwsjXUQXVlGiDzbbwdkBw=="],
+ "@react-native-community/cli-config-android": ["@react-native-community/cli-config-android@18.0.0", "", { "dependencies": { "@react-native-community/cli-tools": "18.0.0", "chalk": "^4.1.2", "fast-glob": "^3.3.2", "fast-xml-parser": "^4.4.1" } }, "sha512-pgnhEO2cmOeb+bBFEBZFYjeFjDTqWoV0JTorTiugj9bb4RQRCl8cr35baVlBGhxAuaio3722CsJ9GRF1oHjP8w=="],
- "@react-native-community/cli-config-apple": ["@react-native-community/cli-config-apple@15.1.3", "", { "dependencies": { "@react-native-community/cli-tools": "15.1.3", "chalk": "^4.1.2", "execa": "^5.0.0", "fast-glob": "^3.3.2" } }, "sha512-Qv6jaEaycv+7s8wR9l9bdpIeSNFCeVANfGCX1x76SgOmGfZNIa7J3l1HaeF/5ktERMYsw/hm4u3rUn4Ks0YV1g=="],
+ "@react-native-community/cli-config-apple": ["@react-native-community/cli-config-apple@18.0.0", "", { "dependencies": { "@react-native-community/cli-tools": "18.0.0", "chalk": "^4.1.2", "execa": "^5.0.0", "fast-glob": "^3.3.2" } }, "sha512-6edjTt3mlNMFBuB/Xd6u0O7GEkhJiKvQgmcoBH18FsNy5cpiHDwQsG8EWM5cHeINp1gMK845qq9fFsTko6gqyQ=="],
- "@react-native-community/cli-debugger-ui": ["@react-native-community/cli-debugger-ui@15.1.3", "", { "dependencies": { "serve-static": "^1.13.1" } }, "sha512-m+fb9iAUNb9WiDdokCBLh0InJvollcgAM3gLjCT8DGTP6bH/jxtZ3DszzyIRqN9cMamItVrvDM0vkIg48xK7rQ=="],
+ "@react-native-community/cli-doctor": ["@react-native-community/cli-doctor@18.0.0", "", { "dependencies": { "@react-native-community/cli-config": "18.0.0", "@react-native-community/cli-platform-android": "18.0.0", "@react-native-community/cli-platform-apple": "18.0.0", "@react-native-community/cli-platform-ios": "18.0.0", "@react-native-community/cli-tools": "18.0.0", "chalk": "^4.1.2", "command-exists": "^1.2.8", "deepmerge": "^4.3.0", "envinfo": "^7.13.0", "execa": "^5.0.0", "node-stream-zip": "^1.9.1", "ora": "^5.4.1", "semver": "^7.5.2", "wcwidth": "^1.0.1", "yaml": "^2.2.1" } }, "sha512-cD3LJfu2h2QSFmZai+fl7RrORKodd5XHSuB7Y9oF1zkebpRYN720vaUtK+GsepqBOElwKk5gl8uVolJ3j+xm8A=="],
- "@react-native-community/cli-doctor": ["@react-native-community/cli-doctor@15.1.3", "", { "dependencies": { "@react-native-community/cli-config": "15.1.3", "@react-native-community/cli-platform-android": "15.1.3", "@react-native-community/cli-platform-apple": "15.1.3", "@react-native-community/cli-platform-ios": "15.1.3", "@react-native-community/cli-tools": "15.1.3", "chalk": "^4.1.2", "command-exists": "^1.2.8", "deepmerge": "^4.3.0", "envinfo": "^7.13.0", "execa": "^5.0.0", "node-stream-zip": "^1.9.1", "ora": "^5.4.1", "semver": "^7.5.2", "strip-ansi": "^5.2.0", "wcwidth": "^1.0.1", "yaml": "^2.2.1" } }, "sha512-WC9rawobuITAtJjyZ68E1M0geRt+b9A2CGB354L/tQp+XMKobGGVI4Y0DsattK83Wdg59GPyldE8C0Wevfgm/A=="],
+ "@react-native-community/cli-platform-android": ["@react-native-community/cli-platform-android@18.0.0", "", { "dependencies": { "@react-native-community/cli-config-android": "18.0.0", "@react-native-community/cli-tools": "18.0.0", "chalk": "^4.1.2", "execa": "^5.0.0", "logkitty": "^0.7.1" } }, "sha512-3Y3RleN/des1C3oRS6s6fDvFYKN0KwsLrYFRpVx9vzdDnH1OGyFJOy4DbrruSPtdNiHUpvvHnOOxeLMj0+/tmw=="],
- "@react-native-community/cli-platform-android": ["@react-native-community/cli-platform-android@15.1.3", "", { "dependencies": { "@react-native-community/cli-config-android": "15.1.3", "@react-native-community/cli-tools": "15.1.3", "chalk": "^4.1.2", "execa": "^5.0.0", "logkitty": "^0.7.1" } }, "sha512-ZwrBK0UK4DRHoQm2v5m8+PlNHBK5gmibBU6rqNFLo4aZJ2Rufalbv3SF+DukgSyoI9/kI8UVrzSNj17e+HhN5A=="],
+ "@react-native-community/cli-platform-apple": ["@react-native-community/cli-platform-apple@18.0.0", "", { "dependencies": { "@react-native-community/cli-config-apple": "18.0.0", "@react-native-community/cli-tools": "18.0.0", "chalk": "^4.1.2", "execa": "^5.0.0", "fast-xml-parser": "^4.4.1" } }, "sha512-zD18gdP5Wr8BSLJ79xtHuPYcg2Vi/nL+WsGsPm7TZjzR5ZU2WbY/tZ+qTGVTQYhQaah+92sU+Dam7gStMrF/fA=="],
- "@react-native-community/cli-platform-apple": ["@react-native-community/cli-platform-apple@15.1.3", "", { "dependencies": { "@react-native-community/cli-config-apple": "15.1.3", "@react-native-community/cli-tools": "15.1.3", "chalk": "^4.1.2", "execa": "^5.0.0", "fast-xml-parser": "^4.4.1" } }, "sha512-awotqCGVcTdeRmTlE3wlsZgNxZUDGojUhPYOVMKejgdCzNM2bvzF8fqhETH2sc64Hbw/tQJg8pYeD4MZR0bHxw=="],
+ "@react-native-community/cli-platform-ios": ["@react-native-community/cli-platform-ios@18.0.0", "", { "dependencies": { "@react-native-community/cli-platform-apple": "18.0.0" } }, "sha512-05Nvkkre/4Gao1TYqyP1wGet8td1dAH0CLJKqLNl9Te6ihnrQ8/8OhjIna5xw0iEFr9An8VdLfaPu1Dgv2qAnQ=="],
- "@react-native-community/cli-platform-ios": ["@react-native-community/cli-platform-ios@15.1.3", "", { "dependencies": { "@react-native-community/cli-platform-apple": "15.1.3" } }, "sha512-DxM8GYkqjrlGuuGiGjrcvUmKC2xv9zDzHbsc4+S160Nn0zbF2OH1DhMlnIuUeCmQnAO6QFMqU99O120iEzCAug=="],
+ "@react-native-community/cli-server-api": ["@react-native-community/cli-server-api@18.0.0", "", { "dependencies": { "@react-native-community/cli-tools": "18.0.0", "body-parser": "^1.20.3", "compression": "^1.7.1", "connect": "^3.6.5", "errorhandler": "^1.5.1", "nocache": "^3.0.1", "open": "^6.2.0", "pretty-format": "^26.6.2", "serve-static": "^1.13.1", "ws": "^6.2.3" } }, "sha512-tdmGV7ZntYmzrXWheZNpAy6dVI2yrsX4sQH+xAzU7lCfKHk6J8GucxedduXnB5qBB4JgSrrbzg2RLNxv5v0S/Q=="],
- "@react-native-community/cli-server-api": ["@react-native-community/cli-server-api@15.1.3", "", { "dependencies": { "@react-native-community/cli-debugger-ui": "15.1.3", "@react-native-community/cli-tools": "15.1.3", "compression": "^1.7.1", "connect": "^3.6.5", "errorhandler": "^1.5.1", "nocache": "^3.0.1", "pretty-format": "^26.6.2", "serve-static": "^1.13.1", "ws": "^6.2.3" } }, "sha512-kXZ0evedluLt6flWQiI3JqwnW8rSBspOoQ7JVTQYiG5lDHAeL3Om9PjAyiQBg1EZRMjiWZDV7nDxhR+m+6NX5Q=="],
+ "@react-native-community/cli-tools": ["@react-native-community/cli-tools@18.0.0", "", { "dependencies": { "@vscode/sudo-prompt": "^9.0.0", "appdirsjs": "^1.2.4", "chalk": "^4.1.2", "execa": "^5.0.0", "find-up": "^5.0.0", "launch-editor": "^2.9.1", "mime": "^2.4.1", "ora": "^5.4.1", "prompts": "^2.4.2", "semver": "^7.5.2" } }, "sha512-oR6FcDEcSDYos79vZy4+Tj8jgAE0Xf5HEiRXMJFGISYLRx7tvslSaK8SodUOW9TZe2bCZOb5QSvj8zeMpORmxg=="],
- "@react-native-community/cli-tools": ["@react-native-community/cli-tools@15.1.3", "", { "dependencies": { "appdirsjs": "^1.2.4", "chalk": "^4.1.2", "execa": "^5.0.0", "find-up": "^5.0.0", "mime": "^2.4.1", "open": "^6.2.0", "ora": "^5.4.1", "prompts": "^2.4.2", "semver": "^7.5.2", "shell-quote": "^1.7.3", "sudo-prompt": "^9.0.0" } }, "sha512-2RzoUKR+Y03ijBeeSoCSQihyN6dxy3fbHjraO4MheZZUzt/Yd1VMEDd0R5aa6rtiRDoknbHt45RL2GMa8MSaEA=="],
-
- "@react-native-community/cli-types": ["@react-native-community/cli-types@15.1.3", "", { "dependencies": { "joi": "^17.2.1" } }, "sha512-0ZaM8LMsa7z7swBN+ObL2ysc6aA3AdS698Q6uEukym6RyX1uLbiofUdlvFSMpWSEL3D8f9OTymmL4RkCH8k6dw=="],
+ "@react-native-community/cli-types": ["@react-native-community/cli-types@18.0.0", "", { "dependencies": { "joi": "^17.2.1" } }, "sha512-J84+4IRXl8WlVdoe1maTD5skYZZO9CbQ6LNXEHx1kaZcFmvPZKfjsaxuyQ+8BsSqZnM2izOw8dEWnAp/Zuwb0w=="],
"@react-native-community/netinfo": ["@react-native-community/netinfo@11.4.1", "", { "peerDependencies": { "react-native": ">=0.59" } }, "sha512-B0BYAkghz3Q2V09BF88RA601XursIEA111tnc2JOaN7axJWmNefmfjZqw/KdSxKZp7CZUuPpjBmz/WCR9uaHYg=="],
@@ -629,17 +633,17 @@
"@react-native/assets-registry": ["@react-native/assets-registry@0.77.2", "", {}, "sha512-AcEhFjndzBWVVhaHaASk36vhA83iDVkQbFYb0D0vATzjuJ67vhhHVLae0+JtHl5jhghotUFDg4Vj/1QbZNDyyQ=="],
- "@react-native/babel-plugin-codegen": ["@react-native/babel-plugin-codegen@0.76.7", "", { "dependencies": { "@react-native/codegen": "0.76.7" } }, "sha512-+8H4DXJREM4l/pwLF/wSVMRzVhzhGDix5jLezNrMD9J1U1AMfV2aSkWA1XuqR7pjPs/Vqf6TaPL7vJMZ4LU05Q=="],
+ "@react-native/babel-plugin-codegen": ["@react-native/babel-plugin-codegen@0.76.9", "", { "dependencies": { "@react-native/codegen": "0.76.9" } }, "sha512-vxL/vtDEIYHfWKm5oTaEmwcnNGsua/i9OjIxBDBFiJDu5i5RU3bpmDiXQm/bJxrJNPRp5lW0I0kpGihVhnMAIQ=="],
- "@react-native/babel-preset": ["@react-native/babel-preset@0.76.7", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-transform-arrow-functions": "^7.24.7", "@babel/plugin-transform-async-generator-functions": "^7.25.4", "@babel/plugin-transform-async-to-generator": "^7.24.7", "@babel/plugin-transform-block-scoping": "^7.25.0", "@babel/plugin-transform-class-properties": "^7.25.4", "@babel/plugin-transform-classes": "^7.25.4", "@babel/plugin-transform-computed-properties": "^7.24.7", "@babel/plugin-transform-destructuring": "^7.24.8", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-for-of": "^7.24.7", "@babel/plugin-transform-function-name": "^7.25.1", "@babel/plugin-transform-literals": "^7.25.2", "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", "@babel/plugin-transform-numeric-separator": "^7.24.7", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-optional-catch-binding": "^7.24.7", "@babel/plugin-transform-optional-chaining": "^7.24.8", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-react-display-name": "^7.24.7", "@babel/plugin-transform-react-jsx": "^7.25.2", "@babel/plugin-transform-react-jsx-self": "^7.24.7", "@babel/plugin-transform-react-jsx-source": "^7.24.7", "@babel/plugin-transform-regenerator": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/plugin-transform-shorthand-properties": "^7.24.7", "@babel/plugin-transform-spread": "^7.24.7", "@babel/plugin-transform-sticky-regex": "^7.24.7", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/plugin-transform-unicode-regex": "^7.24.7", "@babel/template": "^7.25.0", "@react-native/babel-plugin-codegen": "0.76.7", "babel-plugin-syntax-hermes-parser": "^0.25.1", "babel-plugin-transform-flow-enums": "^0.0.2", "react-refresh": "^0.14.0" } }, "sha512-/c5DYZ6y8tyg+g8tgXKndDT7mWnGmkZ9F+T3qNDfoE3Qh7ucrNeC2XWvU9h5pk8eRtj9l4SzF4aO1phzwoibyg=="],
+ "@react-native/babel-preset": ["@react-native/babel-preset@0.76.9", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-transform-arrow-functions": "^7.24.7", "@babel/plugin-transform-async-generator-functions": "^7.25.4", "@babel/plugin-transform-async-to-generator": "^7.24.7", "@babel/plugin-transform-block-scoping": "^7.25.0", "@babel/plugin-transform-class-properties": "^7.25.4", "@babel/plugin-transform-classes": "^7.25.4", "@babel/plugin-transform-computed-properties": "^7.24.7", "@babel/plugin-transform-destructuring": "^7.24.8", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-for-of": "^7.24.7", "@babel/plugin-transform-function-name": "^7.25.1", "@babel/plugin-transform-literals": "^7.25.2", "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", "@babel/plugin-transform-numeric-separator": "^7.24.7", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-optional-catch-binding": "^7.24.7", "@babel/plugin-transform-optional-chaining": "^7.24.8", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-react-display-name": "^7.24.7", "@babel/plugin-transform-react-jsx": "^7.25.2", "@babel/plugin-transform-react-jsx-self": "^7.24.7", "@babel/plugin-transform-react-jsx-source": "^7.24.7", "@babel/plugin-transform-regenerator": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/plugin-transform-shorthand-properties": "^7.24.7", "@babel/plugin-transform-spread": "^7.24.7", "@babel/plugin-transform-sticky-regex": "^7.24.7", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/plugin-transform-unicode-regex": "^7.24.7", "@babel/template": "^7.25.0", "@react-native/babel-plugin-codegen": "0.76.9", "babel-plugin-syntax-hermes-parser": "^0.25.1", "babel-plugin-transform-flow-enums": "^0.0.2", "react-refresh": "^0.14.0" } }, "sha512-TbSeCplCM6WhL3hR2MjC/E1a9cRnMLz7i767T7mP90oWkklEjyPxWl+0GGoVGnJ8FC/jLUupg/HvREKjjif6lw=="],
"@react-native/codegen": ["@react-native/codegen@0.77.2", "", { "dependencies": { "@babel/parser": "^7.25.3", "glob": "^7.1.1", "hermes-parser": "0.25.1", "invariant": "^2.2.4", "jscodeshift": "^17.0.0", "nullthrows": "^1.1.1", "yargs": "^17.6.2" }, "peerDependencies": { "@babel/preset-env": "^7.1.6" } }, "sha512-uJSGm9Sp9K5XAhb17cty6iOc2lZpORQKMpS61/B3gYwe9LNz9TJpcfq1L2+3Mv6lppqsulOH9+fslapo0OTfSQ=="],
"@react-native/community-cli-plugin": ["@react-native/community-cli-plugin@0.77.2", "", { "dependencies": { "@react-native/dev-middleware": "0.77.2", "@react-native/metro-babel-transformer": "0.77.2", "chalk": "^4.0.0", "debug": "^2.2.0", "invariant": "^2.2.4", "metro": "^0.81.3", "metro-config": "^0.81.3", "metro-core": "^0.81.3", "readline": "^1.3.0", "semver": "^7.1.3" }, "peerDependencies": { "@react-native-community/cli": "*" }, "optionalPeers": ["@react-native-community/cli"] }, "sha512-Dc93eXHhzhnRy+vF3wOdM8C4dplLpT7ItpUpYrDeA1ffHUImwWpcupB6vpX9+l3UaaJ1cPfdxTjB2d1ACVKOaA=="],
- "@react-native/debugger-frontend": ["@react-native/debugger-frontend@0.76.7", "", {}, "sha512-89ZtZXt7ZxE94i7T94qzZMhp4Gfcpr/QVpGqEaejAxZD+gvDCH21cYSF+/Rz2ttBazm0rk5MZ0mFqb0Iqp1jmw=="],
+ "@react-native/debugger-frontend": ["@react-native/debugger-frontend@0.76.9", "", {}, "sha512-0Ru72Bm066xmxFuOXhhvrryxvb57uI79yDSFf+hxRpktkC98NMuRenlJhslMrbJ6WjCu1vOe/9UjWNYyxXTRTA=="],
- "@react-native/dev-middleware": ["@react-native/dev-middleware@0.76.7", "", { "dependencies": { "@isaacs/ttlcache": "^1.4.1", "@react-native/debugger-frontend": "0.76.7", "chrome-launcher": "^0.15.2", "chromium-edge-launcher": "^0.2.0", "connect": "^3.6.5", "debug": "^2.2.0", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "open": "^7.0.3", "selfsigned": "^2.4.1", "serve-static": "^1.13.1", "ws": "^6.2.3" } }, "sha512-Jsw8g9DyLPnR9yHEGuT09yHZ7M88/GL9CtU9WmyChlBwdXSeE3AmRqLegsV3XcgULQ1fqdemokaOZ/MwLYkjdA=="],
+ "@react-native/dev-middleware": ["@react-native/dev-middleware@0.76.9", "", { "dependencies": { "@isaacs/ttlcache": "^1.4.1", "@react-native/debugger-frontend": "0.76.9", "chrome-launcher": "^0.15.2", "chromium-edge-launcher": "^0.2.0", "connect": "^3.6.5", "debug": "^2.2.0", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "open": "^7.0.3", "selfsigned": "^2.4.1", "serve-static": "^1.13.1", "ws": "^6.2.3" } }, "sha512-xkd3C3dRcmZLjFTEAOvC14q3apMLouIvJViCZY/p1EfCMrNND31dgE1dYrLTiI045WAWMt5bD15i6f7dE2/QWA=="],
"@react-native/gradle-plugin": ["@react-native/gradle-plugin@0.77.2", "", {}, "sha512-M3kU6xnn/06CGdezd31wn64v/BuKdw19K3GjOcRe1L+zKYEeezRovEVgzCNsXLcNtXUfJvmrIN4uYnqmgrJGfg=="],
@@ -647,7 +651,7 @@
"@react-native/metro-babel-transformer": ["@react-native/metro-babel-transformer@0.77.2", "", { "dependencies": { "@babel/core": "^7.25.2", "@react-native/babel-preset": "0.77.2", "hermes-parser": "0.25.1", "nullthrows": "^1.1.1" } }, "sha512-vSG1/d5peUo50aqaBbNnVGE5QxQTSY3j0OWmixfJqiX11wwO3tR2niKxH8OjB3WuSsROgJzosMe9kMsQJQ3ONA=="],
- "@react-native/normalize-colors": ["@react-native/normalize-colors@0.76.7", "", {}, "sha512-ST1xxBuYVIXPdD81dR6+tzIgso7m3pa9+6rOBXTh5Xm7KEEFik7tnQX+GydXYMp3wr1gagJjragdXkPnxK6WNg=="],
+ "@react-native/normalize-colors": ["@react-native/normalize-colors@0.76.8", "", {}, "sha512-FRjRvs7RgsXjkbGSOjYSxhX5V70c0IzA/jy3HXeYpATMwD9fOR1DbveLW497QGsVdCa0vThbJUtR8rIzAfpHQA=="],
"@react-navigation/bottom-tabs": ["@react-navigation/bottom-tabs@7.2.0", "", { "dependencies": { "@react-navigation/elements": "^2.2.5", "color": "^4.2.3" }, "peerDependencies": { "@react-navigation/native": "^7.0.14", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-1LxjgnbPyFINyf9Qr5d1YE0pYhuJayg5TCIIFQmbcX4PRhX7FKUXV7cX8OzrKXEdZi/UE/VNXugtozPAR9zgvA=="],
@@ -663,22 +667,6 @@
"@react-navigation/routers": ["@react-navigation/routers@7.1.2", "", { "dependencies": { "nanoid": "3.3.8" } }, "sha512-emdEjpVDK8zbiu2GChC8oYIAub9i/OpNuQJekVsbyFCBz4/TzaBzms38Q53YaNhdIFNmiYLfHv/Y1Ub7KYfm3w=="],
- "@remix-run/node": ["@remix-run/node@2.15.3", "", { "dependencies": { "@remix-run/server-runtime": "2.15.3", "@remix-run/web-fetch": "^4.4.2", "@web3-storage/multipart-parser": "^1.0.0", "cookie-signature": "^1.1.0", "source-map-support": "^0.5.21", "stream-slice": "^0.1.2", "undici": "^6.11.1" }, "peerDependencies": { "typescript": "^5.1.0" }, "optionalPeers": ["typescript"] }, "sha512-TYfS6BPhbABBpSRZ6WBA4qIWSwWvJhRVQGXCHUtgOwkuW863rcFmjh9g2Xj/IHyTmbOYPdcjHsIgZ9el4CHOKQ=="],
-
- "@remix-run/router": ["@remix-run/router@1.22.0", "", {}, "sha512-MBOl8MeOzpK0HQQQshKB7pABXbmyHizdTpqnrIseTbsv0nAepwC2ENZa1aaBExNQcpLoXmWthhak8SABLzvGPw=="],
-
- "@remix-run/server-runtime": ["@remix-run/server-runtime@2.15.3", "", { "dependencies": { "@remix-run/router": "1.22.0", "@types/cookie": "^0.6.0", "@web3-storage/multipart-parser": "^1.0.0", "cookie": "^0.6.0", "set-cookie-parser": "^2.4.8", "source-map": "^0.7.3", "turbo-stream": "2.4.0" }, "peerDependencies": { "typescript": "^5.1.0" }, "optionalPeers": ["typescript"] }, "sha512-taHBe1DEqxZNjjj6OfkSYbup+sZPjbTgUhykaI+nHqrC2NDQuTiisBXhLwtx60GctONR/x0lWhF7R9ZGC5WsHw=="],
-
- "@remix-run/web-blob": ["@remix-run/web-blob@3.1.0", "", { "dependencies": { "@remix-run/web-stream": "^1.1.0", "web-encoding": "1.1.5" } }, "sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g=="],
-
- "@remix-run/web-fetch": ["@remix-run/web-fetch@4.4.2", "", { "dependencies": { "@remix-run/web-blob": "^3.1.0", "@remix-run/web-file": "^3.1.0", "@remix-run/web-form-data": "^3.1.0", "@remix-run/web-stream": "^1.1.0", "@web3-storage/multipart-parser": "^1.0.0", "abort-controller": "^3.0.0", "data-uri-to-buffer": "^3.0.1", "mrmime": "^1.0.0" } }, "sha512-jgKfzA713/4kAW/oZ4bC3MoLWyjModOVDjFPNseVqcJKSafgIscrYL9G50SurEYLswPuoU3HzSbO0jQCMYWHhA=="],
-
- "@remix-run/web-file": ["@remix-run/web-file@3.1.0", "", { "dependencies": { "@remix-run/web-blob": "^3.1.0" } }, "sha512-dW2MNGwoiEYhlspOAXFBasmLeYshyAyhIdrlXBi06Duex5tDr3ut2LFKVj7tyHLmn8nnNwFf1BjNbkQpygC2aQ=="],
-
- "@remix-run/web-form-data": ["@remix-run/web-form-data@3.1.0", "", { "dependencies": { "web-encoding": "1.1.5" } }, "sha512-NdeohLMdrb+pHxMQ/Geuzdp0eqPbea+Ieo8M8Jx2lGC6TBHsgHzYcBvr0LyPdPVycNRDEpWpiDdCOdCryo3f9A=="],
-
- "@remix-run/web-stream": ["@remix-run/web-stream@1.1.0", "", { "dependencies": { "web-streams-polyfill": "^3.1.1" } }, "sha512-KRJtwrjRV5Bb+pM7zxcTJkhIqWWSy+MYsIxHK+0m5atcznsf15YwUBWHWulZerV2+vvHH1Lp1DD7pw6qKW8SgA=="],
-
"@segment/loosely-validate-event": ["@segment/loosely-validate-event@2.0.0", "", { "dependencies": { "component-type": "^1.2.1", "join-component": "^1.1.0" } }, "sha512-ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="],
"@shopify/flash-list": ["@shopify/flash-list@1.7.3", "", { "dependencies": { "recyclerlistview": "4.2.1", "tslib": "2.8.1" }, "peerDependencies": { "@babel/runtime": "*", "react": "*", "react-native": "*" } }, "sha512-RLhNptm02aqpqZvjj9pJPcU+EVYxOAJhPRCmDOaUbUP86+636w+plsbjpBPSYGvPZhPj56RtZ9FBlvolPeEmYA=="],
@@ -689,7 +677,7 @@
"@sideway/pinpoint": ["@sideway/pinpoint@2.0.0", "", {}, "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="],
- "@sinclair/typebox": ["@sinclair/typebox@0.27.8", "", {}, "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="],
+ "@sinclair/typebox": ["@sinclair/typebox@0.34.36", "", {}, "sha512-JFHFhF6MqqRE49JDAGX/EPlHwxIukrKMhNwlMoB/wIJBkvu3+ciO335yDYPP3soI01FkhVXWnyNPKEl+EsC4Zw=="],
"@sinonjs/commons": ["@sinonjs/commons@3.0.1", "", { "dependencies": { "type-detect": "4.0.8" } }, "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ=="],
@@ -709,8 +697,6 @@
"@types/babel__traverse": ["@types/babel__traverse@7.20.6", "", { "dependencies": { "@babel/types": "^7.20.7" } }, "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg=="],
- "@types/cookie": ["@types/cookie@0.6.0", "", {}, "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="],
-
"@types/graceful-fs": ["@types/graceful-fs@4.1.9", "", { "dependencies": { "@types/node": "*" } }, "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ=="],
"@types/hammerjs": ["@types/hammerjs@2.0.46", "", {}, "sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw=="],
@@ -723,7 +709,7 @@
"@types/istanbul-reports": ["@types/istanbul-reports@3.0.4", "", { "dependencies": { "@types/istanbul-lib-report": "*" } }, "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ=="],
- "@types/jest": ["@types/jest@29.5.14", "", { "dependencies": { "expect": "^29.0.0", "pretty-format": "^29.0.0" } }, "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ=="],
+ "@types/jest": ["@types/jest@30.0.0", "", { "dependencies": { "expect": "^30.0.0", "pretty-format": "^30.0.0" } }, "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA=="],
"@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
@@ -755,12 +741,10 @@
"@urql/exchange-retry": ["@urql/exchange-retry@1.3.0", "", { "dependencies": { "@urql/core": "^5.0.0", "wonka": "^6.3.2" } }, "sha512-FLt+d81gP4oiHah4hWFDApimc+/xABWMU1AMYsZ1PVB0L0YPtrMCjbOp9WMM7hBzy4gbTDrG24sio0dCfSh/HQ=="],
- "@web3-storage/multipart-parser": ["@web3-storage/multipart-parser@1.0.0", "", {}, "sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw=="],
+ "@vscode/sudo-prompt": ["@vscode/sudo-prompt@9.3.1", "", {}, "sha512-9ORTwwS74VaTn38tNbQhsA5U44zkJfcb0BdTSyyG6frP4e8KMtHuTXYmwefe5dpL8XB1aGSIVTaLjD3BbWb5iA=="],
"@xmldom/xmldom": ["@xmldom/xmldom@0.7.13", "", {}, "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g=="],
- "@zxing/text-encoding": ["@zxing/text-encoding@0.9.0", "", {}, "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA=="],
-
"abort-controller": ["abort-controller@3.0.0", "", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="],
"accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="],
@@ -845,7 +829,7 @@
"babel-preset-current-node-syntax": ["babel-preset-current-node-syntax@1.1.0", "", { "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-import-attributes": "^7.24.7", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-numeric-separator": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw=="],
- "babel-preset-expo": ["babel-preset-expo@12.0.9", "", { "dependencies": { "@babel/plugin-proposal-decorators": "^7.12.9", "@babel/plugin-transform-export-namespace-from": "^7.22.11", "@babel/plugin-transform-object-rest-spread": "^7.12.13", "@babel/plugin-transform-parameters": "^7.22.15", "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.0", "@react-native/babel-preset": "0.76.7", "babel-plugin-react-native-web": "~0.19.13", "react-refresh": "^0.14.2" }, "peerDependencies": { "babel-plugin-react-compiler": "^19.0.0-beta-9ee70a1-20241017", "react-compiler-runtime": "^19.0.0-beta-8a03594-20241020" }, "optionalPeers": ["babel-plugin-react-compiler", "react-compiler-runtime"] }, "sha512-1c+ysrTavT49WgVAj0OX/TEzt1kU2mfPhDaDajstshNHXFKPenMPWSViA/DHrJKVIMwaqr+z3GbUOD9GtKgpdg=="],
+ "babel-preset-expo": ["babel-preset-expo@12.0.11", "", { "dependencies": { "@babel/plugin-proposal-decorators": "^7.12.9", "@babel/plugin-transform-export-namespace-from": "^7.22.11", "@babel/plugin-transform-object-rest-spread": "^7.12.13", "@babel/plugin-transform-parameters": "^7.22.15", "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.0", "@react-native/babel-preset": "0.76.9", "babel-plugin-react-native-web": "~0.19.13", "react-refresh": "^0.14.2" }, "peerDependencies": { "babel-plugin-react-compiler": "^19.0.0-beta-9ee70a1-20241017", "react-compiler-runtime": "^19.0.0-beta-8a03594-20241020" }, "optionalPeers": ["babel-plugin-react-compiler", "react-compiler-runtime"] }, "sha512-4m6D92nKEieg+7DXa8uSvpr0GjfuRfM/G0t0I/Q5hF8HleEv5ms3z4dJ+p52qXSJsm760tMqLdO93Ywuoi7cCQ=="],
"babel-preset-jest": ["babel-preset-jest@29.6.3", "", { "dependencies": { "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA=="],
@@ -865,6 +849,8 @@
"bmp-js": ["bmp-js@0.1.0", "", {}, "sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="],
+ "body-parser": ["body-parser@1.20.3", "", { "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" } }, "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g=="],
+
"boolbase": ["boolbase@1.0.0", "", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="],
"bplist-creator": ["bplist-creator@0.0.7", "", { "dependencies": { "stream-buffers": "~2.2.0" } }, "sha512-xp/tcaV3T5PCiaY04mXga7o/TE+t95gqeLmADeBI1CvZtdWTbgBt3uLpvh4UWtenKeBhCV6oVxGk38yZr2uYEA=="],
@@ -975,12 +961,10 @@
"connect": ["connect@3.7.0", "", { "dependencies": { "debug": "2.6.9", "finalhandler": "1.1.2", "parseurl": "~1.3.3", "utils-merge": "1.0.1" } }, "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="],
+ "content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="],
+
"convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="],
- "cookie": ["cookie@0.6.0", "", {}, "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="],
-
- "cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
-
"core-js-compat": ["core-js-compat@3.40.0", "", { "dependencies": { "browserslist": "^4.24.3" } }, "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ=="],
"cosmiconfig": ["cosmiconfig@9.0.0", "", { "dependencies": { "env-paths": "^2.2.1", "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", "parse-json": "^5.2.0" }, "peerDependencies": { "typescript": ">=4.9.5" }, "optionalPeers": ["typescript"] }, "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg=="],
@@ -1013,8 +997,6 @@
"csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
- "data-uri-to-buffer": ["data-uri-to-buffer@3.0.1", "", {}, "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="],
-
"dayjs": ["dayjs@1.11.13", "", {}, "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="],
"debug": ["debug@4.4.0", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA=="],
@@ -1051,8 +1033,6 @@
"didyoumean": ["didyoumean@1.2.2", "", {}, "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="],
- "diff-sequences": ["diff-sequences@29.6.3", "", {}, "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q=="],
-
"dir-glob": ["dir-glob@3.0.1", "", { "dependencies": { "path-type": "^4.0.0" } }, "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="],
"dlv": ["dlv@1.1.3", "", {}, "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="],
@@ -1135,45 +1115,45 @@
"exif-parser": ["exif-parser@0.1.12", "", {}, "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="],
- "expect": ["expect@29.7.0", "", { "dependencies": { "@jest/expect-utils": "^29.7.0", "jest-get-type": "^29.6.3", "jest-matcher-utils": "^29.7.0", "jest-message-util": "^29.7.0", "jest-util": "^29.7.0" } }, "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw=="],
+ "expect": ["expect@30.0.2", "", { "dependencies": { "@jest/expect-utils": "30.0.2", "@jest/get-type": "30.0.1", "jest-matcher-utils": "30.0.2", "jest-message-util": "30.0.2", "jest-mock": "30.0.2", "jest-util": "30.0.2" } }, "sha512-YN9Mgv2mtTWXVmifQq3QT+ixCL/uLuLJw+fdp8MOjKqu8K3XQh3o5aulMM1tn+O2DdrWNxLZTeJsCY/VofUA0A=="],
- "expo": ["expo@52.0.37", "", { "dependencies": { "@babel/runtime": "^7.20.0", "@expo/cli": "0.22.18", "@expo/config": "~10.0.10", "@expo/config-plugins": "~9.0.15", "@expo/fingerprint": "0.11.11", "@expo/metro-config": "0.19.11", "@expo/vector-icons": "^14.0.0", "babel-preset-expo": "~12.0.9", "expo-asset": "~11.0.4", "expo-constants": "~17.0.7", "expo-file-system": "~18.0.11", "expo-font": "~13.0.4", "expo-keep-awake": "~14.0.3", "expo-modules-autolinking": "2.0.8", "expo-modules-core": "2.2.2", "fbemitter": "^3.0.0", "web-streams-polyfill": "^3.3.2", "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "@expo/dom-webview": "*", "@expo/metro-runtime": "*", "react": "*", "react-native": "*", "react-native-webview": "*" }, "optionalPeers": ["@expo/dom-webview", "@expo/metro-runtime", "react-native-webview"], "bin": { "expo": "bin/cli" } }, "sha512-fo37ClqjNLOVInerm7BU27H8lfPfeTC7Pmu72roPzq46DnJfs+KzTxTzE34GcJ0b6hMUx9FRSSGyTQqxzo2TVQ=="],
+ "expo": ["expo@52.0.47", "", { "dependencies": { "@babel/runtime": "^7.20.0", "@expo/cli": "0.22.26", "@expo/config": "~10.0.11", "@expo/config-plugins": "~9.0.17", "@expo/fingerprint": "0.11.11", "@expo/metro-config": "0.19.12", "@expo/vector-icons": "~14.0.4", "babel-preset-expo": "~12.0.11", "expo-asset": "~11.0.5", "expo-constants": "~17.0.8", "expo-file-system": "~18.0.12", "expo-font": "~13.0.4", "expo-keep-awake": "~14.0.3", "expo-modules-autolinking": "2.0.8", "expo-modules-core": "2.2.3", "fbemitter": "^3.0.0", "web-streams-polyfill": "^3.3.2", "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "@expo/dom-webview": "*", "@expo/metro-runtime": "*", "react": "*", "react-native": "*", "react-native-webview": "*" }, "optionalPeers": ["@expo/dom-webview", "@expo/metro-runtime", "react-native-webview"], "bin": { "expo": "bin/cli", "fingerprint": "bin/fingerprint", "expo-modules-autolinking": "bin/autolinking" } }, "sha512-Mkvl7Qi2k+V3FdNRUD+yDj8GqU4IiYulLfl36BmSZs8lh/kCYPhTiyBLiEGPfz7d25QKbPWG727ESozbkbvatw=="],
"expo-application": ["expo-application@6.0.2", "", { "peerDependencies": { "expo": "*" } }, "sha512-qcj6kGq3mc7x5yIb5KxESurFTJCoEKwNEL34RdPEvTB/xhl7SeVZlu05sZBqxB1V4Ryzq/LsCb7NHNfBbb3L7A=="],
- "expo-asset": ["expo-asset@11.0.4", "", { "dependencies": { "@expo/image-utils": "^0.6.5", "expo-constants": "~17.0.7", "invariant": "^2.2.4", "md5-file": "^3.2.3" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-CdIywU0HrR3wsW5c3n0cT3jW9hccZdnqGsRqY+EY/RWzJbDXtDfAQVEiFHO3mDK7oveUwrP2jK/6ZRNek41/sg=="],
+ "expo-asset": ["expo-asset@11.0.5", "", { "dependencies": { "@expo/image-utils": "^0.6.5", "expo-constants": "~17.0.8", "invariant": "^2.2.4", "md5-file": "^3.2.3" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-TL60LmMBGVzs3NQcO8ylWqBumMh4sx0lmeJsn7+9C88fylGDhyyVnKZ1PyTXo9CVDBkndutZx2JUEQWM9BaiXw=="],
- "expo-background-fetch": ["expo-background-fetch@13.0.5", "", { "dependencies": { "expo-task-manager": "~12.0.5" }, "peerDependencies": { "expo": "*" } }, "sha512-rLRM+rYDRT0fA0Oaet5ibJK3nKVRkfdjXjISHxjUvIE4ktD9pE+UjAPPdjTXZ5CkNb3JyNNhQGJEGpdJC2HLKw=="],
+ "expo-background-fetch": ["expo-background-fetch@13.0.6", "", { "dependencies": { "expo-task-manager": "~12.0.6" }, "peerDependencies": { "expo": "*" } }, "sha512-fhSpPA7U/CIuBwYbMVSbfPxczsvHKF8MWmFumfMgriDqop6bp/ccLbnpU1vPLQDPmRPS5dMdTz04KYIMdTpD9w=="],
"expo-blur": ["expo-blur@14.0.3", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-BL3xnqBJbYm3Hg9t/HjNjdeY7N/q8eK5tsLYxswWG1yElISWZmMvrXYekl7XaVCPfyFyz8vQeaxd7q74ZY3Wrw=="],
"expo-brightness": ["expo-brightness@13.0.3", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-yR6+mM1hYEtt9ygbUNIOgsvsRxNReMr0cSZReu14rlTktq4K73bDuDs8oGuYl0c68wIVNK0AAfIJAF9RBePPMw=="],
- "expo-build-properties": ["expo-build-properties@0.13.2", "", { "dependencies": { "ajv": "^8.11.0", "semver": "^7.6.0" }, "peerDependencies": { "expo": "*" } }, "sha512-ML2GwBgn0Bo4yPgnSGb7h3XVxCigS/KFdid3xPC2HldEioTP3UewB/2Qa4WBsam9Fb7lAuRyVHAfRoA3swpDzg=="],
+ "expo-build-properties": ["expo-build-properties@0.13.3", "", { "dependencies": { "ajv": "^8.11.0", "semver": "^7.6.0" }, "peerDependencies": { "expo": "*" } }, "sha512-gw7AYP+YF50Gr912BedelRDTfR4GnUEn9p5s25g4nv0hTJGWpBZdCYR5/Oi2rmCHJXxBqhPjxzV7JRh72fntLg=="],
- "expo-constants": ["expo-constants@17.0.7", "", { "dependencies": { "@expo/config": "~10.0.10", "@expo/env": "~0.4.2" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-sp5NUiV17I3JblVPIBDgoxgt7JIZS30vcyydCYHxsEoo+aKaeRYXxGYilCvb9lgI6BBwSL24sQ6ZjWsCWoF1VA=="],
+ "expo-constants": ["expo-constants@17.0.8", "", { "dependencies": { "@expo/config": "~10.0.11", "@expo/env": "~0.4.2" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-XfWRyQAf1yUNgWZ1TnE8pFBMqGmFP5Gb+SFSgszxDdOoheB/NI5D4p7q86kI2fvGyfTrxAe+D+74nZkfsGvUlg=="],
"expo-crypto": ["expo-crypto@14.0.2", "", { "dependencies": { "base64-js": "^1.3.0" }, "peerDependencies": { "expo": "*" } }, "sha512-WRc9PBpJraJN29VD5Ef7nCecxJmZNyRKcGkNiDQC1nhY5agppzwhqh7zEzNFarE/GqDgSiaDHS8yd5EgFhP9AQ=="],
- "expo-dev-client": ["expo-dev-client@5.0.12", "", { "dependencies": { "expo-dev-launcher": "5.0.29", "expo-dev-menu": "6.0.19", "expo-dev-menu-interface": "1.9.3", "expo-manifests": "~0.15.5", "expo-updates-interface": "~1.0.0" }, "peerDependencies": { "expo": "*" } }, "sha512-F8Pz3ppxq0vhwVK2XgzmDUfxW1MEFpUdTLl+Pjwp9FDB+Br1wqyIz1yKshD7Hv1i/SR2BwjlJcriOPWt9NREuA=="],
+ "expo-dev-client": ["expo-dev-client@5.0.20", "", { "dependencies": { "expo-dev-launcher": "5.0.35", "expo-dev-menu": "6.0.25", "expo-dev-menu-interface": "1.9.3", "expo-manifests": "~0.15.8", "expo-updates-interface": "~1.0.0" }, "peerDependencies": { "expo": "*" } }, "sha512-bLNkHdU7V3I4UefgJbJnIDUBUL0LxIal/xYEx9BbgDd3B7wgQKY//+BpPIxBOKCQ22lkyiHY8y9tLhO903sAgg=="],
- "expo-dev-launcher": ["expo-dev-launcher@5.0.29", "", { "dependencies": { "ajv": "8.11.0", "expo-dev-menu": "6.0.19", "expo-manifests": "~0.15.5", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*" } }, "sha512-wb48vIXUwuqD0Z2xvdkNt+o7OLT7FtMoSwYVkx28linG+9Sn2Zgjbs4SVnJYkpRfZZh9unOIRqB9EsJhM12Lzg=="],
+ "expo-dev-launcher": ["expo-dev-launcher@5.0.35", "", { "dependencies": { "ajv": "8.11.0", "expo-dev-menu": "6.0.25", "expo-manifests": "~0.15.8", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*" } }, "sha512-hEQr0ZREnUMxZ6wtQgfK1lzYnbb0zar3HqYZhmANzXmE6UEPbQ4GByLzhpfz/d+xxdBVQZsrHdtiV28KPG2sog=="],
- "expo-dev-menu": ["expo-dev-menu@6.0.19", "", { "dependencies": { "expo-dev-menu-interface": "1.9.3" }, "peerDependencies": { "expo": "*" } }, "sha512-CzjsiUne/Zwr7/AqI5JwcocV2NKQ3lZ3GteVc7ksORU7UZr0a0uTgcmA4ogqbBnFebBRVntxPR6zKXYlsvUGow=="],
+ "expo-dev-menu": ["expo-dev-menu@6.0.25", "", { "dependencies": { "expo-dev-menu-interface": "1.9.3" }, "peerDependencies": { "expo": "*" } }, "sha512-K2m4z/I+CPWbMtHlDzU68lHaQs52De0v5gbsjAmA5ig8FrYh4MKZvPxSVANaiKENzgmtglu8qaFh7ua9Gt2TfA=="],
"expo-dev-menu-interface": ["expo-dev-menu-interface@1.9.3", "", { "peerDependencies": { "expo": "*" } }, "sha512-KY/dWTBE1l47i9V366JN5rC6YIdOc9hz8yAmZzkl5DrPia5l3M2WIjtnpHC9zUkNjiSiG2urYoOAq4H/uLdmyg=="],
- "expo-device": ["expo-device@7.0.2", "", { "dependencies": { "ua-parser-js": "^0.7.33" }, "peerDependencies": { "expo": "*" } }, "sha512-0PkTixE4Qi8VQBjixnj4aw2f6vE4tUZH7GK8zHROGKlBypZKcWmsA+W/Vp3RC5AyREjX71pO/hjKTSo/vF0E2w=="],
+ "expo-device": ["expo-device@7.0.3", "", { "dependencies": { "ua-parser-js": "^0.7.33" }, "peerDependencies": { "expo": "*" } }, "sha512-uNGhDYmpDj/3GySWZmRiYSt52Phdim11p0pXfgpCq/nMks0+UPZwl3D0vin5N8/gpVe5yzb13GYuFxiVoDyniw=="],
- "expo-eas-client": ["expo-eas-client@0.13.2", "", {}, "sha512-2RAAGtkO9vseoJZuW4mhJkiNQ6+FfLrX66OTMq4Qj9mRKZV2Uq/ZquxUGIeJyYqBy4vNYeKbuPd2oJtsV9LBGQ=="],
+ "expo-eas-client": ["expo-eas-client@0.13.3", "", {}, "sha512-t+1F1tiDocSot8iSnrn/CjTUMvVvPV2DpafSVcticpbSzMGybEN7wcamO1t18fK7WxGXpZE9gxtd80qwv/LLqQ=="],
- "expo-file-system": ["expo-file-system@18.0.11", "", { "dependencies": { "web-streams-polyfill": "^3.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-yDwYfEzWgPXsBZHJW2RJ8Q66ceiFN9Wa5D20pp3fjXVkzPBDwxnYwiPWk4pVmCa5g4X5KYMoMne1pUrsL4OEpg=="],
+ "expo-file-system": ["expo-file-system@18.0.12", "", { "dependencies": { "web-streams-polyfill": "^3.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-HAkrd/mb8r+G3lJ9MzmGeuW2B+BxQR1joKfeCyY4deLl1zoZ48FrAWjgZjHK9aHUVhJ0ehzInu/NQtikKytaeg=="],
"expo-font": ["expo-font@13.0.4", "", { "dependencies": { "fontfaceobserver": "^2.1.0" }, "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-eAP5hyBgC8gafFtprsz0HMaB795qZfgJWqTmU0NfbSin1wUuVySFMEPMOrTkTgmazU73v4Cb4x7p86jY1XXYUw=="],
"expo-haptics": ["expo-haptics@14.0.1", "", { "peerDependencies": { "expo": "*" } }, "sha512-V81FZ7xRUfqM6uSI6FA1KnZ+QpEKnISqafob/xEfcx1ymwhm4V3snuLWWFjmAz+XaZQTqlYa8z3QbqEXz7G63w=="],
- "expo-image": ["expo-image@2.0.6", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-NHpIZmGnrPbyDadil6eK+sUgyFMQfapEVb7YaGgxSFWBUQ1rSpjqdIQrCD24IZTO9uSH8V+hMh2ROxrAjAixzQ=="],
+ "expo-image": ["expo-image@2.0.7", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-kv40OIJOkItwznhdqFmKxTMC5O8GkpyTf8ng7Py4Hy6IBiH59dkeP6vUZQhzPhJOm5v1kZK4XldbskBosqzOug=="],
"expo-json-utils": ["expo-json-utils@0.14.0", "", {}, "sha512-xjGfK9dL0B1wLnOqNkX0jM9p48Y0I5xEPzHude28LY67UmamUyAACkqhZGaPClyPNfdzczk7Ej6WaRMT3HfXvw=="],
@@ -1185,17 +1165,17 @@
"expo-localization": ["expo-localization@16.0.1", "", { "dependencies": { "rtl-detect": "^1.0.2" }, "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-kUrXiV/Pq9r7cG+TMt+Qa49IUQ9Y/czVwen4hmiboTclTopcWdIeCzYZv6JGtufoPpjEO9vVx1QJrXYl9V2u0Q=="],
- "expo-manifests": ["expo-manifests@0.15.6", "", { "dependencies": { "@expo/config": "~10.0.9", "expo-json-utils": "~0.14.0" }, "peerDependencies": { "expo": "*" } }, "sha512-z+TFICrijMaqBvcJkVx8WzgmOsV6ZJGvaPNQKZr4DA6uqugFMtvAQVikDjIq7SEc3n7IgPk0GR4ZN3/KnnkeVA=="],
+ "expo-manifests": ["expo-manifests@0.15.8", "", { "dependencies": { "@expo/config": "~10.0.11", "expo-json-utils": "~0.14.0" }, "peerDependencies": { "expo": "*" } }, "sha512-VuIyaMfRfLZeETNsRohqhy1l7iZ7I+HKMPfZXVL2Yn17TT0WkOhZoq1DzYwPbOHPgp1Uk6phNa86EyaHrD2DLw=="],
"expo-modules-autolinking": ["expo-modules-autolinking@2.0.8", "", { "dependencies": { "@expo/spawn-async": "^1.7.2", "chalk": "^4.1.0", "commander": "^7.2.0", "fast-glob": "^3.2.5", "find-up": "^5.0.0", "fs-extra": "^9.1.0", "require-from-string": "^2.0.2", "resolve-from": "^5.0.0" }, "bin": { "expo-modules-autolinking": "bin/expo-modules-autolinking.js" } }, "sha512-DezgnEYFQYic8hKGhkbztBA3QUmSftjaNDIKNAtS2iGJmzCcNIkatjN2slFDSWjSTNo8gOvPQyMKfyHWFvLpOQ=="],
- "expo-modules-core": ["expo-modules-core@2.2.2", "", { "dependencies": { "invariant": "^2.2.4" } }, "sha512-SgjK86UD89gKAscRK3bdpn6Ojfs/KU4GujtuFx1wm4JaBjmXH4aakWkItkPlAV2pjIiHJHWQbENL9xjbw/Qr/g=="],
+ "expo-modules-core": ["expo-modules-core@2.2.3", "", { "dependencies": { "invariant": "^2.2.4" } }, "sha512-01QqZzpP/wWlxnNly4G06MsOBUTbMDj02DQigZoXfDh80vd/rk3/uVXqnZgOdLSggTs6DnvOgAUy0H2q30XdUg=="],
"expo-network": ["expo-network@7.0.5", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-5dlowKAimhIDN1/lBRnN6SSH6c07f12R3QrfLf3b3GEr6D+EijH2wE537mmwPh1p+254LAkm0Z5ZEXxbwII4sA=="],
- "expo-notifications": ["expo-notifications@0.29.13", "", { "dependencies": { "@expo/image-utils": "^0.6.4", "@ide/backoff": "^1.0.0", "abort-controller": "^3.0.0", "assert": "^2.0.0", "badgin": "^1.1.5", "expo-application": "~6.0.2", "expo-constants": "~17.0.5" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-GHye6XeI1uEeVttJO/hGwUyA5cgQsxR3mi5q37yOE7cZN3cMj36pIfEEmjXEr0nWIWSzoJ0w8c2QxNj5xfP1pA=="],
+ "expo-notifications": ["expo-notifications@0.29.14", "", { "dependencies": { "@expo/image-utils": "^0.6.5", "@ide/backoff": "^1.0.0", "abort-controller": "^3.0.0", "assert": "^2.0.0", "badgin": "^1.1.5", "expo-application": "~6.0.2", "expo-constants": "~17.0.8" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-AVduNx9mKOgcAqBfrXS1OHC9VAQZrDQLbVbcorMjPDGXW7m0Q5Q+BG6FYM/saVviF2eO8fhQRsTT40yYv5/bhQ=="],
- "expo-router": ["expo-router@4.0.17", "", { "dependencies": { "@expo/metro-runtime": "4.0.1", "@expo/server": "^0.5.1", "@radix-ui/react-slot": "1.0.1", "@react-navigation/bottom-tabs": "^7.2.0", "@react-navigation/native": "^7.0.14", "@react-navigation/native-stack": "^7.2.0", "client-only": "^0.0.1", "react-helmet-async": "^1.3.0", "react-native-helmet-async": "2.0.4", "react-native-is-edge-to-edge": "^1.1.6", "schema-utils": "^4.0.1", "semver": "~7.6.3", "server-only": "^0.0.1" }, "peerDependencies": { "@react-navigation/drawer": "^7.1.1", "expo": "*", "expo-constants": "*", "expo-linking": "*", "react-native-reanimated": "*", "react-native-safe-area-context": "*", "react-native-screens": "*" }, "optionalPeers": ["@react-navigation/drawer", "react-native-reanimated"] }, "sha512-8ybo6bVwdG1S9hafh9BTOjX1hpCgomdUvs6hKHMM01koo8mQ7zocH/+zxQeaMVDxGhboz2dO5GiDchWJ0OheRA=="],
+ "expo-router": ["expo-router@4.0.21", "", { "dependencies": { "@expo/metro-runtime": "4.0.1", "@expo/server": "^0.5.3", "@radix-ui/react-slot": "1.0.1", "@react-navigation/bottom-tabs": "^7.2.0", "@react-navigation/native": "^7.0.14", "@react-navigation/native-stack": "^7.2.0", "client-only": "^0.0.1", "react-helmet-async": "^1.3.0", "react-native-helmet-async": "2.0.4", "react-native-is-edge-to-edge": "^1.1.6", "schema-utils": "^4.0.1", "semver": "~7.6.3", "server-only": "^0.0.1" }, "peerDependencies": { "@react-navigation/drawer": "^7.1.1", "expo": "*", "expo-constants": "~17.0.8", "expo-linking": "~7.0.5", "react-native-reanimated": "*", "react-native-safe-area-context": "*", "react-native-screens": "*" }, "optionalPeers": ["@react-navigation/drawer", "react-native-reanimated"] }, "sha512-z1U9cGZbgL+ZSHp533VMobOqdkUpFBlDXBpd9/JH+Q0wW49is0G2PrJVUYMzdwr30HSUltdO/19W8rRwjfOnFw=="],
"expo-screen-orientation": ["expo-screen-orientation@8.0.4", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-kJrIZ/44+Gs5D5nyP6SXqTUbJEOsRgzk+nUcKeVZ0Vmx0szGrvSvhzdus7853xT/sqyAARsqBMlx626jAMu/Jg=="],
@@ -1203,17 +1183,17 @@
"expo-sharing": ["expo-sharing@13.0.1", "", { "peerDependencies": { "expo": "*" } }, "sha512-qych3Nw65wlFcnzE/gRrsdtvmdV0uF4U4qVMZBJYPG90vYyWh2QM9rp1gVu0KWOBc7N8CC2dSVYn4/BXqJy6Xw=="],
- "expo-splash-screen": ["expo-splash-screen@0.29.22", "", { "dependencies": { "@expo/prebuild-config": "^8.0.27" }, "peerDependencies": { "expo": "*" } }, "sha512-f+bPpF06bqiuW1Fbrd3nxeaSsmTVTBEKEYe3epYt4IE6y4Ulli3qEUamMLlRQiDGuIXPU6zQlscpy2mdBUI5cA=="],
+ "expo-splash-screen": ["expo-splash-screen@0.29.24", "", { "dependencies": { "@expo/prebuild-config": "~8.2.0" }, "peerDependencies": { "expo": "*" } }, "sha512-k2rdjbb3Qeg4g104Sdz6+qXXYba8QgiuZRSxHX8IpsSYiiTU48BmCCGy12sN+O1B+sD1/+WPL4duCa1Fy6+Y4g=="],
"expo-status-bar": ["expo-status-bar@2.0.1", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-AkIPX7jWHRPp83UBZ1iXtVvyr0g+DgBVvIXTtlmPtmUsm8Vq9Bb5IGj86PW8osuFlgoTVAg7HI/+Ok7yEYwiRg=="],
"expo-structured-headers": ["expo-structured-headers@4.0.0", "", {}, "sha512-uPiwZjWq3AdFGgY52+I2nGPrNa6izxAglymPXHUZLekZW290GqIUOk7MBNDD4sg4JwUbSi3gdxEurpEvuq+FSg=="],
- "expo-system-ui": ["expo-system-ui@4.0.8", "", { "dependencies": { "@react-native/normalize-colors": "0.76.7", "debug": "^4.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-0AmWXJ3ObwMYxi2YGagwRQikydoUZJXLeK4A0FY1PsZpnlorSQ4IAfEVS38JmA54tf5CpP4TjBp5ZVEjRyv1rw=="],
+ "expo-system-ui": ["expo-system-ui@4.0.9", "", { "dependencies": { "@react-native/normalize-colors": "0.76.8", "debug": "^4.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-hqBc0EWeK/BTB8i4H84vqNjje8GgxhapYrcWdg5qriaRA/u+bNNxhmpZXdAjFuhonOP4SmAbF+gjoJJWsTrhUg=="],
- "expo-task-manager": ["expo-task-manager@12.0.5", "", { "dependencies": { "unimodules-app-loader": "~5.0.1" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-tDHOBYORA6wuO32NWwz/Egrvn+N6aANHAa0DFs+01VK/IJZfU9D05ZN6M5XYIlZv5ll4GSX1wJZyTCY0HZGapw=="],
+ "expo-task-manager": ["expo-task-manager@12.0.6", "", { "dependencies": { "unimodules-app-loader": "~5.0.1" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-yGbS64OL95z7tAQAvryy0sGHuQgrcpvnJsdyuGL8MA9bcPtr+kytLZ4dOCDac7foQS7+FLDGgtiAR6v/64B5Pg=="],
- "expo-updates": ["expo-updates@0.26.19", "", { "dependencies": { "@expo/code-signing-certificates": "0.0.5", "@expo/config": "~10.0.10", "@expo/config-plugins": "~9.0.15", "@expo/spawn-async": "^1.7.2", "arg": "4.1.0", "chalk": "^4.1.2", "expo-eas-client": "~0.13.2", "expo-manifests": "~0.15.6", "expo-structured-headers": "~4.0.0", "expo-updates-interface": "~1.0.0", "fast-glob": "^3.3.2", "fbemitter": "^3.0.0", "ignore": "^5.3.1", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*", "react": "*" }, "bin": { "expo-updates": "bin/cli.js" } }, "sha512-h40UrG0n1nCb2na1ffz+mNQtsnr7/BxxK+EtXJSqCaD9PIGaTGe20tasmo1oVskv3s37zfv0x93+6uTjanieQg=="],
+ "expo-updates": ["expo-updates@0.27.4", "", { "dependencies": { "@expo/code-signing-certificates": "0.0.5", "@expo/config": "~10.0.11", "@expo/config-plugins": "~9.0.17", "@expo/spawn-async": "^1.7.2", "arg": "4.1.0", "chalk": "^4.1.2", "expo-eas-client": "~0.13.3", "expo-manifests": "~0.15.7", "expo-structured-headers": "~4.0.0", "expo-updates-interface": "~1.0.0", "fast-glob": "^3.3.2", "fbemitter": "^3.0.0", "ignore": "^5.3.1", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*", "react": "*" }, "bin": { "expo-updates": "bin/cli.js" } }, "sha512-0rg4L2fFPEjTR/qnZ9Te4Q4irVC8uvNcTZW1pWnWbadG1SLv2PKjS1MYX5BboKzC3ao0H7m++5TP3hWhNg9org=="],
"expo-updates-interface": ["expo-updates-interface@1.0.0", "", { "peerDependencies": { "expo": "*" } }, "sha512-93oWtvULJOj+Pp+N/lpTcFfuREX1wNeHtp7Lwn8EbzYYmdn37MvZU3TPW2tYYCZuhzmKEXnUblYcruYoDu7IrQ=="],
@@ -1353,7 +1333,9 @@
"hyphenate-style-name": ["hyphenate-style-name@1.1.0", "", {}, "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw=="],
- "i18next": ["i18next@24.2.2", "", { "dependencies": { "@babel/runtime": "^7.23.2" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ=="],
+ "i18next": ["i18next@25.2.1", "", { "dependencies": { "@babel/runtime": "^7.27.1" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-+UoXK5wh+VlE1Zy5p6MjcvctHXAhRwQKCxiJD8noKZzIXmnAX8gdHX5fLPA3MEVxEN4vbZkQFy8N0LyD9tUqPw=="],
+
+ "iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
"ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
@@ -1443,7 +1425,7 @@
"jackspeak": ["jackspeak@3.4.3", "", { "dependencies": { "@isaacs/cliui": "^8.0.2" }, "optionalDependencies": { "@pkgjs/parseargs": "^0.11.0" } }, "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="],
- "jest-diff": ["jest-diff@29.7.0", "", { "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", "jest-get-type": "^29.6.3", "pretty-format": "^29.7.0" } }, "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw=="],
+ "jest-diff": ["jest-diff@30.0.2", "", { "dependencies": { "@jest/diff-sequences": "30.0.1", "@jest/get-type": "30.0.1", "chalk": "^4.1.2", "pretty-format": "30.0.2" } }, "sha512-2UjrNvDJDn/oHFpPrUTVmvYYDNeNtw2DlY3er8bI6vJJb9Fb35ycp/jFLd5RdV59tJ8ekVXX3o/nwPcscgXZJQ=="],
"jest-environment-node": ["jest-environment-node@29.7.0", "", { "dependencies": { "@jest/environment": "^29.7.0", "@jest/fake-timers": "^29.7.0", "@jest/types": "^29.6.3", "@types/node": "*", "jest-mock": "^29.7.0", "jest-util": "^29.7.0" } }, "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw=="],
@@ -1451,15 +1433,15 @@
"jest-haste-map": ["jest-haste-map@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "graceful-fs": "^4.2.9", "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", "jest-worker": "^29.7.0", "micromatch": "^4.0.4", "walker": "^1.0.8" }, "optionalDependencies": { "fsevents": "^2.3.2" } }, "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA=="],
- "jest-matcher-utils": ["jest-matcher-utils@29.7.0", "", { "dependencies": { "chalk": "^4.0.0", "jest-diff": "^29.7.0", "jest-get-type": "^29.6.3", "pretty-format": "^29.7.0" } }, "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g=="],
+ "jest-matcher-utils": ["jest-matcher-utils@30.0.2", "", { "dependencies": { "@jest/get-type": "30.0.1", "chalk": "^4.1.2", "jest-diff": "30.0.2", "pretty-format": "30.0.2" } }, "sha512-1FKwgJYECR8IT93KMKmjKHSLyru0DqguThov/aWpFccC0wbiXGOxYEu7SScderBD7ruDOpl7lc5NG6w3oxKfaA=="],
- "jest-message-util": ["jest-message-util@29.7.0", "", { "dependencies": { "@babel/code-frame": "^7.12.13", "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" } }, "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w=="],
+ "jest-message-util": ["jest-message-util@30.0.2", "", { "dependencies": { "@babel/code-frame": "^7.27.1", "@jest/types": "30.0.1", "@types/stack-utils": "^2.0.3", "chalk": "^4.1.2", "graceful-fs": "^4.2.11", "micromatch": "^4.0.8", "pretty-format": "30.0.2", "slash": "^3.0.0", "stack-utils": "^2.0.6" } }, "sha512-vXywcxmr0SsKXF/bAD7t7nMamRvPuJkras00gqYeB1V0WllxZrbZ0paRr3XqpFU2sYYjD0qAaG2fRyn/CGZ0aw=="],
- "jest-mock": ["jest-mock@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "jest-util": "^29.7.0" } }, "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw=="],
+ "jest-mock": ["jest-mock@30.0.2", "", { "dependencies": { "@jest/types": "30.0.1", "@types/node": "*", "jest-util": "30.0.2" } }, "sha512-PnZOHmqup/9cT/y+pXIVbbi8ID6U1XHRmbvR7MvUy4SLqhCbwpkmXhLbsWbGewHrV5x/1bF7YDjs+x24/QSvFA=="],
"jest-regex-util": ["jest-regex-util@29.6.3", "", {}, "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg=="],
- "jest-util": ["jest-util@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" } }, "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA=="],
+ "jest-util": ["jest-util@30.0.2", "", { "dependencies": { "@jest/types": "30.0.1", "@types/node": "*", "chalk": "^4.1.2", "ci-info": "^4.2.0", "graceful-fs": "^4.2.11", "picomatch": "^4.0.2" } }, "sha512-8IyqfKS4MqprBuUpZNlFB5l+WFehc8bfCe1HSZFHzft2mOuND8Cvi9r1musli+u6F3TqanCZ/Ik4H4pXUolZIg=="],
"jest-validate": ["jest-validate@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", "jest-get-type": "^29.6.3", "leven": "^3.1.0", "pretty-format": "^29.7.0" } }, "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw=="],
@@ -1503,6 +1485,8 @@
"kleur": ["kleur@3.0.3", "", {}, "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="],
+ "launch-editor": ["launch-editor@2.10.0", "", { "dependencies": { "picocolors": "^1.0.0", "shell-quote": "^1.8.1" } }, "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA=="],
+
"leven": ["leven@3.1.0", "", {}, "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="],
"lighthouse-logger": ["lighthouse-logger@1.4.2", "", { "dependencies": { "debug": "^2.6.9", "marky": "^1.2.2" } }, "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g=="],
@@ -1533,9 +1517,9 @@
"lines-and-columns": ["lines-and-columns@1.2.4", "", {}, "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="],
- "lint-staged": ["lint-staged@15.5.0", "", { "dependencies": { "chalk": "^5.4.1", "commander": "^13.1.0", "debug": "^4.4.0", "execa": "^8.0.1", "lilconfig": "^3.1.3", "listr2": "^8.2.5", "micromatch": "^4.0.8", "pidtree": "^0.6.0", "string-argv": "^0.3.2", "yaml": "^2.7.0" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-WyCzSbfYGhK7cU+UuDDkzUiytbfbi0ZdPy2orwtM75P3WTtQBzmG40cCxIa8Ii2+XjfxzLH6Be46tUfWS85Xfg=="],
+ "lint-staged": ["lint-staged@16.1.2", "", { "dependencies": { "chalk": "^5.4.1", "commander": "^14.0.0", "debug": "^4.4.1", "lilconfig": "^3.1.3", "listr2": "^8.3.3", "micromatch": "^4.0.8", "nano-spawn": "^1.0.2", "pidtree": "^0.6.0", "string-argv": "^0.3.2", "yaml": "^2.8.0" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-sQKw2Si2g9KUZNY3XNvRuDq4UJqpHwF0/FQzZR2M7I5MvtpWvibikCjUVJzZdGE0ByurEl3KQNvsGetd1ty1/Q=="],
- "listr2": ["listr2@8.2.5", "", { "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", "log-update": "^6.1.0", "rfdc": "^1.4.1", "wrap-ansi": "^9.0.0" } }, "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ=="],
+ "listr2": ["listr2@8.3.3", "", { "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", "log-update": "^6.1.0", "rfdc": "^1.4.1", "wrap-ansi": "^9.0.0" } }, "sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ=="],
"load-bmfont": ["load-bmfont@1.4.2", "", { "dependencies": { "buffer-equal": "0.0.1", "mime": "^1.3.4", "parse-bmfont-ascii": "^1.0.3", "parse-bmfont-binary": "^1.0.5", "parse-bmfont-xml": "^1.1.4", "phin": "^3.7.1", "xhr": "^2.0.1", "xtend": "^4.0.0" } }, "sha512-qElWkmjW9Oq1F9EI5Gt7aD9zcdHb9spJCW1L/dmPf7KzCCEJxq8nhHz5eCgI9aMf7vrG/wyaCqdsI+Iy9ZTlog=="],
@@ -1571,6 +1555,8 @@
"mdn-data": ["mdn-data@2.0.14", "", {}, "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="],
+ "media-typer": ["media-typer@0.3.0", "", {}, "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="],
+
"memoize-one": ["memoize-one@5.2.1", "", {}, "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="],
"merge-stream": ["merge-stream@2.0.0", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="],
@@ -1635,12 +1621,12 @@
"mkdirp": ["mkdirp@0.5.6", "", { "dependencies": { "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="],
- "mrmime": ["mrmime@1.0.1", "", {}, "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw=="],
-
"ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
"mz": ["mz@2.7.0", "", { "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", "thenify-all": "^1.0.0" } }, "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="],
+ "nano-spawn": ["nano-spawn@1.0.2", "", {}, "sha512-21t+ozMQDAL/UGgQVBbZ/xXvNO10++ZPuTmKRO8k9V3AClVRht49ahtDjfY8l1q6nSHOrE5ASfthzH3ol6R/hg=="],
+
"nanoid": ["nanoid@3.3.8", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w=="],
"nativewind": ["nativewind@2.0.11", "", { "dependencies": { "@babel/generator": "^7.18.7", "@babel/helper-module-imports": "7.18.6", "@babel/types": "7.19.0", "css-mediaquery": "^0.1.2", "css-to-react-native": "^3.0.0", "micromatch": "^4.0.5", "postcss": "^8.4.12", "postcss-calc": "^8.2.4", "postcss-color-functional-notation": "^4.2.2", "postcss-css-variables": "^0.18.0", "postcss-nested": "^5.0.6", "react-is": "^18.1.0", "use-sync-external-store": "^1.1.0" }, "peerDependencies": { "tailwindcss": "~3" } }, "sha512-qCEXUwKW21RYJ33KRAJl3zXq2bCq82WoI564fI21D/TiqhfmstZOqPN53RF8qK1NDK6PGl56b2xaTxgObEePEg=="],
@@ -1801,7 +1787,7 @@
"pretty-bytes": ["pretty-bytes@5.6.0", "", {}, "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="],
- "pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="],
+ "pretty-format": ["pretty-format@30.0.2", "", { "dependencies": { "@jest/schemas": "30.0.1", "ansi-styles": "^5.2.0", "react-is": "^18.3.1" } }, "sha512-yC5/EBSOrTtqhCKfLHqoUIAXVRZnukHPwWBJWR7h84Q3Be1DRQZLncwcfLoPA5RPQ65qfiCMqgYwdUuQ//eVpg=="],
"proc-log": ["proc-log@4.2.0", "", {}, "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA=="],
@@ -1823,7 +1809,7 @@
"qrcode-terminal": ["qrcode-terminal@0.11.0", "", { "bin": { "qrcode-terminal": "./bin/qrcode-terminal.js" } }, "sha512-Uu7ii+FQy4Qf82G4xu7ShHhjhGahEpCWc3x8UavY3CTcWV+ufmmCtwkr7ZKsX42jdL0kr1B5FKUeqJvAn51jzQ=="],
- "qs": ["qs@6.14.0", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w=="],
+ "qs": ["qs@6.13.0", "", { "dependencies": { "side-channel": "^1.0.6" } }, "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="],
"query-string": ["query-string@7.1.3", "", { "dependencies": { "decode-uri-component": "^0.2.2", "filter-obj": "^1.1.0", "split-on-first": "^1.0.0", "strict-uri-encode": "^2.0.0" } }, "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg=="],
@@ -1833,6 +1819,8 @@
"range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="],
+ "raw-body": ["raw-body@2.5.2", "", { "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" } }, "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="],
+
"rc": ["rc@1.2.8", "", { "dependencies": { "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" }, "bin": { "rc": "./cli.js" } }, "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="],
"react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="],
@@ -1855,7 +1843,7 @@
"react-native-awesome-slider": ["react-native-awesome-slider@2.9.0", "", { "peerDependencies": { "react": "*", "react-native": "*", "react-native-gesture-handler": ">=2.0.0", "react-native-reanimated": ">=3.0.0" } }, "sha512-sc5qgX4YtM6IxjtosjgQLdsal120MvU+YWs0F2MdgQWijps22AXLDCUoBnZZ8vxVhVyJ2WnnIPrmtVBvVJjSuQ=="],
- "react-native-bottom-tabs": ["react-native-bottom-tabs@0.8.6", "", { "dependencies": { "sf-symbols-typescript": "^2.0.0", "use-latest-callback": "^0.2.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-N5b3MoSfsEqlmvFyIyL0X0bd+QAtB+cXH1rl/+R2Kr0BefBTC7ZldGcPhgK3FhBbt0vJDpd3kLb/dvmqZd+Eag=="],
+ "react-native-bottom-tabs": ["react-native-bottom-tabs@0.9.2", "", { "dependencies": { "react-freeze": "^1.0.0", "sf-symbols-typescript": "^2.0.0", "use-latest-callback": "^0.2.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-kwLx9OM6v5P10TdmNhlEgb8nmwBOpwy3ULIxEv1v6cYjzuRkeYtA2dqYeFhJAn1rmWMrl3MnL3xzW5Q3IQyfAg=="],
"react-native-circular-progress": ["react-native-circular-progress@1.4.1", "", { "dependencies": { "prop-types": "^15.8.1" }, "peerDependencies": { "react": ">=16.0.0", "react-native": ">=0.50.0", "react-native-svg": ">=7.0.0" } }, "sha512-HEzvI0WPuWvsCgWE3Ff2HBTMgAEQB2GvTFw0KHyD/t1STAlDDRiolu0mEGhVvihKR3jJu3v3V4qzvSklY/7XzQ=="],
@@ -1869,7 +1857,7 @@
"react-native-edge-to-edge": ["react-native-edge-to-edge@1.4.3", "", { "peerDependencies": { "react": ">=18.2.0", "react-native": ">=0.74.0" } }, "sha512-fYchwiQ2D/8NzcvJK1sD9Cm25GFQfsLgYmGpohoSpRxwBwR5UCL0wUf4scoQgYncRh9Hmc2t8ml/sikTwMM3ng=="],
- "react-native-gesture-handler": ["react-native-gesture-handler@2.22.0", "", { "dependencies": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-m5Ps1cOSxSiMP4re+XsbeWcC9DNJuIEjMSmtUxBdyfYEJtdu5iAAiX7KlHHrf2mnK4I/56Ncy4PvPKWBwSpWpQ=="],
+ "react-native-gesture-handler": ["react-native-gesture-handler@2.24.0", "", { "dependencies": { "@egjs/hammerjs": "^2.0.17", "hoist-non-react-statics": "^3.3.0", "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-ZdWyOd1C8axKJHIfYxjJKCcxjWEpUtUWgTOVY2wynbiveSQDm8X/PDyAKXSer/GOtIpjudUbACOndZXCN3vHsw=="],
"react-native-get-random-values": ["react-native-get-random-values@1.11.0", "", { "dependencies": { "fast-base64-decode": "^1.0.0" }, "peerDependencies": { "react-native": ">=0.56" } }, "sha512-4BTbDbRmS7iPdhYLRcz3PGFIpFJBwNZg9g42iwa2P6FOv9vZj/xJc678RZXnLNZzd0qd7Q3CCF6Yd+CU2eoXKQ=="],
@@ -1887,7 +1875,7 @@
"react-native-mmkv": ["react-native-mmkv@2.12.2", "", { "peerDependencies": { "react": "*", "react-native": ">=0.71.0" } }, "sha512-6058Aq0p57chPrUutLGe9fYoiDVDNMU2PKV+lLFUJ3GhoHvUrLdsS1PDSCLr00yqzL4WJQ7TTzH+V8cpyrNcfg=="],
- "react-native-pager-view": ["react-native-pager-view@6.5.1", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-YdX7bP+rPYvATMU7HzlMq9JaG3ui/+cVRbFZFGW+QshDULANFg9ECR1BA7H7JTIcO/ZgWCwF+1aVmYG5yBA9Og=="],
+ "react-native-pager-view": ["react-native-pager-view@6.6.0", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-LmgZs9ihypMEot82u22n98nKGP4E3ixg6Q/VwS7lbrpVZw7pmC9cdplh10PqlyGMBwPHYt875y5n+3sIzQvUkg=="],
"react-native-progress": ["react-native-progress@5.0.1", "", { "dependencies": { "prop-types": "^15.7.2" }, "peerDependencies": { "react-native-svg": "*" } }, "sha512-TYfJ4auAe5vubDma2yfFvt7ktSI+UCfysqJnkdHEcLXqAitRFOozgF/cLgN5VNi/iLdaf3ga1ETi2RF4jVZ/+g=="],
@@ -1895,11 +1883,11 @@
"react-native-reanimated-carousel": ["react-native-reanimated-carousel@3.5.1", "", { "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.6.0", "react-native-gesture-handler": ">=2.0.0", "react-native-reanimated": ">=3.0.0" } }, "sha512-9BBQV6JAYSQm2lV7MFtT4mzapXmW4IZO6s38gfiJL84Jg23ivGB1UykcNQauKgtHyhtW2NuZJzItb1s42lM+hA=="],
- "react-native-safe-area-context": ["react-native-safe-area-context@5.1.0", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-Y4vyJX+0HPJUQNVeIJTj2/UOjbSJcB09OEwirAWDrOZ67Lz5p43AmjxSy8nnZft1rMzoh3rcPuonB6jJyHTfCw=="],
+ "react-native-safe-area-context": ["react-native-safe-area-context@5.2.0", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-QpcGA6MRKe8Zbpf1hirCBudNQYGsMv0n/CTTROMOFcXbqRUoEXLCsYxUmYKi7JJb3ziL2DbyzWXyH2/gw4Tkfw=="],
- "react-native-screens": ["react-native-screens@4.5.0", "", { "dependencies": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-yBWeN5EHNeew9f0ia9VE7JSlUQzCZEwkb87r7A7/Sg41OJHuRKHNRhmdCOiMBUqwwQi3F+b4NZGywjeM/gWMyg=="],
+ "react-native-screens": ["react-native-screens@4.10.0", "", { "dependencies": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-Tw21NGuXm3PbiUGtZd0AnXirUixaAbPXDjNR0baBH7/WJDaDTTELLcQ7QRXuqAWbmr/EVCrKj1348ei1KFIr8A=="],
- "react-native-svg": ["react-native-svg@15.11.1", "", { "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3", "warn-once": "0.1.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-Qmwx/yJKt+AHUr4zjxx/Q69qwKtRfr1+uIfFMQoq3WFRhqU76aL9db1DyvPiY632DAsVGba1pHf92OZPkpjrdQ=="],
+ "react-native-svg": ["react-native-svg@15.11.2", "", { "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3", "warn-once": "0.1.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-+YfF72IbWQUKzCIydlijV1fLuBsQNGMT6Da2kFlo1sh+LE3BIm/2Q7AR1zAAR6L0BFLi1WaQPLfFUC9bNZpOmw=="],
"react-native-tab-view": ["react-native-tab-view@4.0.5", "", { "dependencies": { "use-latest-callback": "^0.2.1" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*", "react-native-pager-view": ">= 6.0.0" } }, "sha512-Xn3TpYo4yvKRC/f4+cOcvsXlitdnSaYkacshckrEI3JiDmFKNFIRVNxtZFggm4MwbJafq2RzuzR6xrgKoxgkTw=="],
@@ -1917,7 +1905,7 @@
"react-native-web": ["react-native-web@0.19.13", "", { "dependencies": { "@babel/runtime": "^7.18.6", "@react-native/normalize-colors": "^0.74.1", "fbjs": "^3.0.4", "inline-style-prefixer": "^6.0.1", "memoize-one": "^6.0.0", "nullthrows": "^1.1.1", "postcss-value-parser": "^4.2.0", "styleq": "^0.1.3" }, "peerDependencies": { "react": "^18.0.0", "react-dom": "^18.0.0" } }, "sha512-etv3bN8rJglrRCp/uL4p7l8QvUNUC++QwDbdZ8CB7BvZiMvsxfFIRM1j04vxNldG3uo2puRd6OSWR3ibtmc29A=="],
- "react-native-webview": ["react-native-webview@13.13.2", "", { "dependencies": { "escape-string-regexp": "^4.0.0", "invariant": "2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-zACPDTF0WnaEnKZ9mA/r/UpcOpV2gQM06AAIrOOexnO8UJvXL8Pjso0b/wTqKFxUZZnmjKuwd8gHVUosVOdVrw=="],
+ "react-native-webview": ["react-native-webview@13.13.0", "", { "dependencies": { "escape-string-regexp": "^4.0.0", "invariant": "2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-lSbFuEZ0uGN/yCIt4+nulbH7WuZlClGlqJ16E6KVl4hOZMGCPoikbNReNs5OsVb6LIGYeQnYxKwPkMwYmJpBqg=="],
"react-refresh": ["react-refresh@0.14.2", "", {}, "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA=="],
@@ -1991,6 +1979,8 @@
"safe-regex-test": ["safe-regex-test@1.1.0", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-regex": "^1.2.1" } }, "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw=="],
+ "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
+
"sax": ["sax@1.4.1", "", {}, "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="],
"scheduler": ["scheduler@0.25.0", "", {}, "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA=="],
@@ -2011,8 +2001,6 @@
"set-blocking": ["set-blocking@2.0.0", "", {}, "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="],
- "set-cookie-parser": ["set-cookie-parser@2.7.1", "", {}, "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="],
-
"set-function-length": ["set-function-length@1.2.2", "", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2" } }, "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="],
"setimmediate": ["setimmediate@1.0.5", "", {}, "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="],
@@ -2079,8 +2067,6 @@
"stream-buffers": ["stream-buffers@2.2.0", "", {}, "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg=="],
- "stream-slice": ["stream-slice@0.1.2", "", {}, "sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA=="],
-
"strict-uri-encode": ["strict-uri-encode@2.0.0", "", {}, "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="],
"string-argv": ["string-argv@0.3.2", "", {}, "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="],
@@ -2091,7 +2077,7 @@
"string_decoder": ["string_decoder@1.3.0", "", { "dependencies": { "safe-buffer": "~5.2.0" } }, "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="],
- "strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="],
+ "strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
"strip-ansi-cjs": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
@@ -2111,7 +2097,7 @@
"sucrase": ["sucrase@3.35.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", "glob": "^10.3.10", "lines-and-columns": "^1.1.6", "mz": "^2.7.0", "pirates": "^4.0.1", "ts-interface-checker": "^0.1.9" }, "bin": { "sucrase": "bin/sucrase", "sucrase-node": "bin/sucrase-node" } }, "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA=="],
- "sudo-prompt": ["sudo-prompt@9.2.1", "", {}, "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="],
+ "sudo-prompt": ["sudo-prompt@8.2.5", "", {}, "sha512-rlBo3HU/1zAJUrkY6jNxDOC9eVYliG6nS4JA8u8KAshITd07tafMc/Br7xQwCSseXwJ2iCcHCE8SNWX3q8Z+kw=="],
"supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
@@ -2169,12 +2155,12 @@
"tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
- "turbo-stream": ["turbo-stream@2.4.0", "", {}, "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g=="],
-
"type-detect": ["type-detect@4.0.8", "", {}, "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="],
"type-fest": ["type-fest@0.7.1", "", {}, "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="],
+ "type-is": ["type-is@1.6.18", "", { "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" } }, "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="],
+
"typescript": ["typescript@5.7.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw=="],
"ua-parser-js": ["ua-parser-js@0.7.40", "", { "bin": { "ua-parser-js": "script/cli.js" } }, "sha512-us1E3K+3jJppDBa3Tl0L3MOJiGhe1C6P0+nIvQAFYbxlMAx0h81eOwLmU57xgqToduDDPx3y5QsdjPfDu+FgOQ=="],
@@ -2241,8 +2227,6 @@
"wcwidth": ["wcwidth@1.0.1", "", { "dependencies": { "defaults": "^1.0.3" } }, "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="],
- "web-encoding": ["web-encoding@1.1.5", "", { "dependencies": { "util": "^0.12.3" }, "optionalDependencies": { "@zxing/text-encoding": "0.9.0" } }, "sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA=="],
-
"web-streams-polyfill": ["web-streams-polyfill@3.3.3", "", {}, "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="],
"webidl-conversions": ["webidl-conversions@5.0.0", "", {}, "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="],
@@ -2287,7 +2271,7 @@
"yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],
- "yaml": ["yaml@2.7.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA=="],
+ "yaml": ["yaml@2.8.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ=="],
"yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],
@@ -2311,12 +2295,14 @@
"@babel/plugin-transform-runtime/babel-plugin-polyfill-corejs3": ["babel-plugin-polyfill-corejs3@0.10.6", "", { "dependencies": { "@babel/helper-define-polyfill-provider": "^0.6.2", "core-js-compat": "^3.38.0" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA=="],
- "@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
-
"@expo/bunyan/uuid": ["uuid@8.3.2", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="],
+ "@expo/cli/@expo/config-plugins": ["@expo/config-plugins@9.0.17", "", { "dependencies": { "@expo/config-types": "^52.0.5", "@expo/json-file": "~9.0.2", "@expo/plist": "^0.2.2", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^1.0.0", "glob": "^10.4.2", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slash": "^3.0.0", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-m24F1COquwOm7PBl5wRbkT9P9DviCXe0D7S7nQsolfbhdCWuvMkfXeoWmgjtdhy7sDlOyIgBrAdnB6MfsWKqIg=="],
+
"@expo/cli/arg": ["arg@5.0.2", "", {}, "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="],
+ "@expo/cli/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
+
"@expo/cli/form-data": ["form-data@3.0.3", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "mime-types": "^2.1.35" } }, "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w=="],
"@expo/cli/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
@@ -2325,6 +2311,8 @@
"@expo/cli/picomatch": ["picomatch@3.0.1", "", {}, "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="],
+ "@expo/cli/pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="],
+
"@expo/cli/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
"@expo/cli/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
@@ -2333,14 +2321,16 @@
"@expo/config/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="],
+ "@expo/config/@expo/config-plugins": ["@expo/config-plugins@9.0.17", "", { "dependencies": { "@expo/config-types": "^52.0.5", "@expo/json-file": "~9.0.2", "@expo/plist": "^0.2.2", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^1.0.0", "glob": "^10.4.2", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slash": "^3.0.0", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-m24F1COquwOm7PBl5wRbkT9P9DviCXe0D7S7nQsolfbhdCWuvMkfXeoWmgjtdhy7sDlOyIgBrAdnB6MfsWKqIg=="],
+
+ "@expo/config/@expo/config-types": ["@expo/config-types@52.0.5", "", {}, "sha512-AMDeuDLHXXqd8W+0zSjIt7f37vUd/BP8p43k68NHpyAvQO+z8mbQZm3cNQVAMySeayK2XoPigAFB1JF2NFajaA=="],
+
"@expo/config/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
"@expo/config-plugins/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
"@expo/devcert/debug": ["debug@3.2.7", "", { "dependencies": { "ms": "^2.1.1" } }, "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="],
- "@expo/devcert/sudo-prompt": ["sudo-prompt@8.2.5", "", {}, "sha512-rlBo3HU/1zAJUrkY6jNxDOC9eVYliG6nS4JA8u8KAshITd07tafMc/Br7xQwCSseXwJ2iCcHCE8SNWX3q8Z+kw=="],
-
"@expo/fingerprint/arg": ["arg@5.0.2", "", {}, "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="],
"@expo/fingerprint/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
@@ -2353,6 +2343,8 @@
"@expo/json-file/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="],
+ "@expo/metro-config/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
+
"@expo/metro-config/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="],
"@expo/metro-config/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
@@ -2365,12 +2357,22 @@
"@expo/package-manager/sudo-prompt": ["sudo-prompt@9.1.1", "", {}, "sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA=="],
+ "@expo/prebuild-config/@expo/config-plugins": ["@expo/config-plugins@9.0.17", "", { "dependencies": { "@expo/config-types": "^52.0.5", "@expo/json-file": "~9.0.2", "@expo/plist": "^0.2.2", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^1.0.0", "glob": "^10.4.2", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slash": "^3.0.0", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-m24F1COquwOm7PBl5wRbkT9P9DviCXe0D7S7nQsolfbhdCWuvMkfXeoWmgjtdhy7sDlOyIgBrAdnB6MfsWKqIg=="],
+
+ "@expo/prebuild-config/@expo/config-types": ["@expo/config-types@52.0.5", "", {}, "sha512-AMDeuDLHXXqd8W+0zSjIt7f37vUd/BP8p43k68NHpyAvQO+z8mbQZm3cNQVAMySeayK2XoPigAFB1JF2NFajaA=="],
+
+ "@expo/prebuild-config/@react-native/normalize-colors": ["@react-native/normalize-colors@0.76.9", "", {}, "sha512-TUdMG2JGk72M9d8DYbubdOlrzTYjw+YMe/xOnLU4viDgWRHsCbtRS9x0IAxRjs3amj/7zmK3Atm8jUPvdAc8qw=="],
+
+ "@expo/prebuild-config/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
+
"@expo/prebuild-config/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="],
"@expo/prebuild-config/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
"@expo/rudder-sdk-node/uuid": ["uuid@8.3.2", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="],
+ "@expo/server/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
+
"@expo/xcpretty/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="],
"@isaacs/cliui/string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="],
@@ -2385,14 +2387,52 @@
"@istanbuljs/load-nyc-config/js-yaml": ["js-yaml@3.14.1", "", { "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="],
+ "@jest/environment/jest-mock": ["jest-mock@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "jest-util": "^29.7.0" } }, "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw=="],
+
+ "@jest/fake-timers/jest-message-util": ["jest-message-util@29.7.0", "", { "dependencies": { "@babel/code-frame": "^7.12.13", "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" } }, "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w=="],
+
+ "@jest/fake-timers/jest-mock": ["jest-mock@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "jest-util": "^29.7.0" } }, "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw=="],
+
+ "@jest/fake-timers/jest-util": ["jest-util@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" } }, "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA=="],
+
+ "@jest/pattern/@types/node": ["@types/node@16.9.1", "", {}, "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="],
+
+ "@jest/pattern/jest-regex-util": ["jest-regex-util@30.0.1", "", {}, "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA=="],
+
+ "@jest/transform/jest-util": ["jest-util@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" } }, "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA=="],
+
"@jest/transform/write-file-atomic": ["write-file-atomic@4.0.2", "", { "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" } }, "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="],
+ "@jest/types/@jest/schemas": ["@jest/schemas@29.6.3", "", { "dependencies": { "@sinclair/typebox": "^0.27.8" } }, "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA=="],
+
+ "@jimp/bmp/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/core/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/custom/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/gif/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/jpeg/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/plugin-resize/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/png/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/tiff/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/types/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "@jimp/utils/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
"@npmcli/fs/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
"@radix-ui/react-collection/@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw=="],
"@radix-ui/react-collection/@radix-ui/react-slot": ["@radix-ui/react-slot@1.1.2", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.1" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ=="],
+ "@radix-ui/react-compose-refs/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
"@radix-ui/react-dismissable-layer/@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw=="],
"@radix-ui/react-dropdown-menu/@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw=="],
@@ -2411,6 +2451,8 @@
"@radix-ui/react-roving-focus/@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw=="],
+ "@radix-ui/react-slot/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
"@react-native-community/cli/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
"@react-native-community/cli-doctor/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
@@ -2419,7 +2461,7 @@
"@react-native-community/cli-tools/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
- "@react-native/babel-plugin-codegen/@react-native/codegen": ["@react-native/codegen@0.76.7", "", { "dependencies": { "@babel/parser": "^7.25.3", "glob": "^7.1.1", "hermes-parser": "0.23.1", "invariant": "^2.2.4", "jscodeshift": "^0.14.0", "mkdirp": "^0.5.1", "nullthrows": "^1.1.1", "yargs": "^17.6.2" }, "peerDependencies": { "@babel/preset-env": "^7.1.6" } }, "sha512-FAn585Ll65YvkSrKDyAcsdjHhhAGiMlSTUpHh0x7J5ntudUns+voYms0xMP+pEPt0XuLdjhD7zLIIlAWP407+g=="],
+ "@react-native/babel-plugin-codegen/@react-native/codegen": ["@react-native/codegen@0.76.9", "", { "dependencies": { "@babel/parser": "^7.25.3", "glob": "^7.1.1", "hermes-parser": "0.23.1", "invariant": "^2.2.4", "jscodeshift": "^0.14.0", "mkdirp": "^0.5.1", "nullthrows": "^1.1.1", "yargs": "^17.6.2" }, "peerDependencies": { "@babel/preset-env": "^7.1.6" } }, "sha512-AzlCHMTKrAVC2709V4ZGtBXmGVtWTpWm3Ruv5vXcd3/anH4mGucfJ4rjbWKdaYQJMpXa3ytGomQrsIsT/s8kgA=="],
"@react-native/codegen/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
@@ -2437,16 +2479,18 @@
"@react-navigation/core/react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
- "@remix-run/server-runtime/source-map": ["source-map@0.7.4", "", {}, "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="],
-
"accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="],
"ansi-fragments/colorette": ["colorette@1.4.0", "", {}, "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="],
"ansi-fragments/slice-ansi": ["slice-ansi@2.1.0", "", { "dependencies": { "ansi-styles": "^3.2.0", "astral-regex": "^1.0.0", "is-fullwidth-code-point": "^2.0.0" } }, "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="],
+ "ansi-fragments/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="],
+
"better-opn/open": ["open@8.4.2", "", { "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", "is-wsl": "^2.2.0" } }, "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="],
+ "body-parser/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
+
"cacache/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
"caller-callsite/callsites": ["callsites@2.0.0", "", {}, "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ=="],
@@ -2457,8 +2501,6 @@
"cli-truncate/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],
- "cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
"cliui/wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
"compressible/mime-db": ["mime-db@1.53.0", "", {}, "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg=="],
@@ -2473,16 +2515,24 @@
"error-ex/is-arrayish": ["is-arrayish@0.2.1", "", {}, "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="],
+ "expo/@expo/config-plugins": ["@expo/config-plugins@9.0.17", "", { "dependencies": { "@expo/config-types": "^52.0.5", "@expo/json-file": "~9.0.2", "@expo/plist": "^0.2.2", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^1.0.0", "glob": "^10.4.2", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slash": "^3.0.0", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-m24F1COquwOm7PBl5wRbkT9P9DviCXe0D7S7nQsolfbhdCWuvMkfXeoWmgjtdhy7sDlOyIgBrAdnB6MfsWKqIg=="],
+
"expo-build-properties/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
"expo-dev-launcher/ajv": ["ajv@8.11.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", "uri-js": "^4.2.2" } }, "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="],
+ "expo-linking/expo-constants": ["expo-constants@17.0.7", "", { "dependencies": { "@expo/config": "~10.0.10", "@expo/env": "~0.4.2" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-sp5NUiV17I3JblVPIBDgoxgt7JIZS30vcyydCYHxsEoo+aKaeRYXxGYilCvb9lgI6BBwSL24sQ6ZjWsCWoF1VA=="],
+
"expo-modules-autolinking/commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="],
"expo-modules-autolinking/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="],
"expo-router/semver": ["semver@7.6.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="],
+ "expo-system-ui/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
+
+ "expo-updates/@expo/config-plugins": ["@expo/config-plugins@9.0.17", "", { "dependencies": { "@expo/config-types": "^52.0.5", "@expo/json-file": "~9.0.2", "@expo/plist": "^0.2.2", "@expo/sdk-runtime-versions": "^1.0.0", "chalk": "^4.1.2", "debug": "^4.3.5", "getenv": "^1.0.0", "glob": "^10.4.2", "resolve-from": "^5.0.0", "semver": "^7.5.4", "slash": "^3.0.0", "slugify": "^1.6.6", "xcode": "^3.0.1", "xml2js": "0.6.0" } }, "sha512-m24F1COquwOm7PBl5wRbkT9P9DviCXe0D7S7nQsolfbhdCWuvMkfXeoWmgjtdhy7sDlOyIgBrAdnB6MfsWKqIg=="],
+
"fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
"fbjs/promise": ["promise@7.3.1", "", { "dependencies": { "asap": "~2.0.3" } }, "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="],
@@ -2507,6 +2557,32 @@
"import-fresh/resolve-from": ["resolve-from@4.0.0", "", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="],
+ "jest-environment-node/jest-mock": ["jest-mock@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "jest-util": "^29.7.0" } }, "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw=="],
+
+ "jest-environment-node/jest-util": ["jest-util@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" } }, "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA=="],
+
+ "jest-haste-map/jest-util": ["jest-util@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" } }, "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA=="],
+
+ "jest-message-util/@babel/code-frame": ["@babel/code-frame@7.27.1", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg=="],
+
+ "jest-message-util/@jest/types": ["@jest/types@30.0.1", "", { "dependencies": { "@jest/pattern": "30.0.1", "@jest/schemas": "30.0.1", "@types/istanbul-lib-coverage": "^2.0.6", "@types/istanbul-reports": "^3.0.4", "@types/node": "*", "@types/yargs": "^17.0.33", "chalk": "^4.1.2" } }, "sha512-HGwoYRVF0QSKJu1ZQX0o5ZrUrrhj0aOOFA8hXrumD7SIzjouevhawbTjmXdwOmURdGluU9DM/XvGm3NyFoiQjw=="],
+
+ "jest-mock/@jest/types": ["@jest/types@30.0.1", "", { "dependencies": { "@jest/pattern": "30.0.1", "@jest/schemas": "30.0.1", "@types/istanbul-lib-coverage": "^2.0.6", "@types/istanbul-reports": "^3.0.4", "@types/node": "*", "@types/yargs": "^17.0.33", "chalk": "^4.1.2" } }, "sha512-HGwoYRVF0QSKJu1ZQX0o5ZrUrrhj0aOOFA8hXrumD7SIzjouevhawbTjmXdwOmURdGluU9DM/XvGm3NyFoiQjw=="],
+
+ "jest-mock/@types/node": ["@types/node@16.9.1", "", {}, "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="],
+
+ "jest-util/@jest/types": ["@jest/types@30.0.1", "", { "dependencies": { "@jest/pattern": "30.0.1", "@jest/schemas": "30.0.1", "@types/istanbul-lib-coverage": "^2.0.6", "@types/istanbul-reports": "^3.0.4", "@types/node": "*", "@types/yargs": "^17.0.33", "chalk": "^4.1.2" } }, "sha512-HGwoYRVF0QSKJu1ZQX0o5ZrUrrhj0aOOFA8hXrumD7SIzjouevhawbTjmXdwOmURdGluU9DM/XvGm3NyFoiQjw=="],
+
+ "jest-util/@types/node": ["@types/node@16.9.1", "", {}, "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="],
+
+ "jest-util/ci-info": ["ci-info@4.2.0", "", {}, "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg=="],
+
+ "jest-util/picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="],
+
+ "jest-validate/pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="],
+
+ "jest-worker/jest-util": ["jest-util@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" } }, "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA=="],
+
"jest-worker/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="],
"jscodeshift/tmp": ["tmp@0.2.3", "", {}, "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w=="],
@@ -2517,9 +2593,9 @@
"lint-staged/chalk": ["chalk@5.4.1", "", {}, "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="],
- "lint-staged/commander": ["commander@13.1.0", "", {}, "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw=="],
+ "lint-staged/commander": ["commander@14.0.0", "", {}, "sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA=="],
- "lint-staged/execa": ["execa@8.0.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^8.0.1", "human-signals": "^5.0.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", "onetime": "^6.0.0", "signal-exit": "^4.1.0", "strip-final-newline": "^3.0.0" } }, "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg=="],
+ "lint-staged/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
"load-bmfont/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
@@ -2547,6 +2623,8 @@
"metro-file-map/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
+ "metro-runtime/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
"minipass-flush/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="],
"minipass-pipeline/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="],
@@ -2565,8 +2643,6 @@
"open/is-wsl": ["is-wsl@1.1.0", "", {}, "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw=="],
- "ora/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
"parse-bmfont-xml/xml2js": ["xml2js@0.5.0", "", { "dependencies": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" } }, "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA=="],
"password-prompt/ansi-escapes": ["ansi-escapes@4.3.2", "", { "dependencies": { "type-fest": "^0.21.3" } }, "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="],
@@ -2581,6 +2657,8 @@
"postcss-css-variables/escape-string-regexp": ["escape-string-regexp@1.0.5", "", {}, "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="],
+ "postcss-load-config/yaml": ["yaml@2.7.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA=="],
+
"pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
"pretty-format/react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
@@ -2591,16 +2669,24 @@
"react-dom/scheduler": ["scheduler@0.23.2", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ=="],
+ "react-helmet-async/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
+ "react-i18next/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
"react-native/@react-native/normalize-colors": ["@react-native/normalize-colors@0.77.2", "", {}, "sha512-knKStQKX4KM8GkieeayotcSTO7I7PIZxwI71nhK/zBeRPqhDTJMNJQh5TnZJ63fO1Y+EZclWkRIKEj+aFRsssw=="],
"react-native/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
"react-native/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
+ "react-native/pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="],
+
"react-native/scheduler": ["scheduler@0.24.0-canary-efb381bbf-20230505", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-ABvovCDe/k9IluqSh4/ISoq8tIJnW8euVAWYt5j/bg6dRnqwQwiGO1F/V4AyK96NGF/FB04FhOUDuWj8IKfABA=="],
"react-native/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
+ "react-native-web/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
"react-native-web/@react-native/normalize-colors": ["@react-native/normalize-colors@0.74.89", "", {}, "sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg=="],
"react-native-web/memoize-one": ["memoize-one@6.0.0", "", {}, "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="],
@@ -2609,6 +2695,8 @@
"recast/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
+ "regenerator-transform/@babel/runtime": ["@babel/runtime@7.26.9", "", { "dependencies": { "regenerator-runtime": "^0.14.0" } }, "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg=="],
+
"regjsparser/jsesc": ["jsesc@3.0.2", "", { "bin": { "jsesc": "bin/jsesc" } }, "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="],
"requireg/resolve": ["resolve@1.7.1", "", { "dependencies": { "path-parse": "^1.0.5" } }, "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="],
@@ -2633,12 +2721,6 @@
"stack-utils/escape-string-regexp": ["escape-string-regexp@2.0.0", "", {}, "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="],
- "string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
- "string-width-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
- "strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="],
-
"sucrase/commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="],
"tailwindcss/arg": ["arg@5.0.2", "", {}, "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="],
@@ -2669,6 +2751,8 @@
"url/punycode": ["punycode@1.4.1", "", {}, "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="],
+ "url/qs": ["qs@6.14.0", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w=="],
+
"whatwg-url/webidl-conversions": ["webidl-conversions@3.0.1", "", {}, "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="],
"wrap-ansi/ansi-styles": ["ansi-styles@6.2.1", "", {}, "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="],
@@ -2677,8 +2761,6 @@
"wrap-ansi/strip-ansi": ["strip-ansi@7.1.0", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="],
- "wrap-ansi-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
"xcode/uuid": ["uuid@7.0.3", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="],
"xml2js/xmlbuilder": ["xmlbuilder@11.0.1", "", {}, "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="],
@@ -2689,6 +2771,8 @@
"@babel/highlight/chalk/supports-color": ["supports-color@5.5.0", "", { "dependencies": { "has-flag": "^3.0.0" } }, "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="],
+ "@expo/cli/@expo/config-plugins/@expo/config-types": ["@expo/config-types@52.0.5", "", {}, "sha512-AMDeuDLHXXqd8W+0zSjIt7f37vUd/BP8p43k68NHpyAvQO+z8mbQZm3cNQVAMySeayK2XoPigAFB1JF2NFajaA=="],
+
"@expo/cli/minimatch/brace-expansion": ["brace-expansion@1.1.11", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="],
"@expo/cli/ora/chalk": ["chalk@2.4.2", "", { "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="],
@@ -2697,7 +2781,15 @@
"@expo/cli/ora/log-symbols": ["log-symbols@2.2.0", "", { "dependencies": { "chalk": "^2.0.1" } }, "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="],
- "@expo/cli/wrap-ansi/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
+ "@expo/cli/ora/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="],
+
+ "@expo/cli/pretty-format/@jest/schemas": ["@jest/schemas@29.6.3", "", { "dependencies": { "@sinclair/typebox": "^0.27.8" } }, "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA=="],
+
+ "@expo/cli/pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
+
+ "@expo/cli/pretty-format/react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
+
+ "@expo/config/@expo/config-plugins/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
"@expo/fingerprint/minimatch/brace-expansion": ["brace-expansion@1.1.11", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="],
@@ -2719,6 +2811,8 @@
"@expo/package-manager/ora/log-symbols": ["log-symbols@2.2.0", "", { "dependencies": { "chalk": "^2.0.1" } }, "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="],
+ "@expo/package-manager/ora/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="],
+
"@expo/prebuild-config/fs-extra/jsonfile": ["jsonfile@6.1.0", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="],
"@expo/prebuild-config/fs-extra/universalify": ["universalify@2.0.1", "", {}, "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="],
@@ -2733,8 +2827,38 @@
"@istanbuljs/load-nyc-config/js-yaml/argparse": ["argparse@1.0.10", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="],
+ "@jest/environment/jest-mock/jest-util": ["jest-util@29.7.0", "", { "dependencies": { "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" } }, "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA=="],
+
+ "@jest/fake-timers/jest-message-util/pretty-format": ["pretty-format@29.7.0", "", { "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" } }, "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ=="],
+
+ "@jest/types/@jest/schemas/@sinclair/typebox": ["@sinclair/typebox@0.27.8", "", {}, "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="],
+
+ "@jimp/bmp/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/core/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/custom/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/gif/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/jpeg/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/plugin-resize/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/png/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/tiff/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/types/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@jimp/utils/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "@radix-ui/react-compose-refs/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
"@radix-ui/react-primitive/@radix-ui/react-slot/@radix-ui/react-compose-refs": ["@radix-ui/react-compose-refs@1.1.1", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw=="],
+ "@radix-ui/react-slot/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
"@react-native-community/cli-server-api/pretty-format/@jest/types": ["@jest/types@26.6.2", "", { "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="],
"@react-native-community/cli-server-api/pretty-format/react-is": ["react-is@17.0.2", "", {}, "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="],
@@ -2761,6 +2885,10 @@
"ansi-fragments/slice-ansi/is-fullwidth-code-point": ["is-fullwidth-code-point@2.0.0", "", {}, "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="],
+ "ansi-fragments/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="],
+
+ "body-parser/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
+
"cli-truncate/string-width/emoji-regex": ["emoji-regex@10.4.0", "", {}, "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw=="],
"cli-truncate/string-width/strip-ansi": ["strip-ansi@7.1.0", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="],
@@ -2777,30 +2905,40 @@
"default-gateway/execa/npm-run-path": ["npm-run-path@2.0.2", "", { "dependencies": { "path-key": "^2.0.0" } }, "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="],
+ "expo-linking/expo-constants/@expo/config": ["@expo/config@10.0.10", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "@expo/config-plugins": "~9.0.15", "@expo/config-types": "^52.0.4", "@expo/json-file": "^9.0.2", "deepmerge": "^4.3.1", "getenv": "^1.0.0", "glob": "^10.4.2", "require-from-string": "^2.0.2", "resolve-from": "^5.0.0", "resolve-workspace-root": "^2.0.0", "semver": "^7.6.0", "slugify": "^1.3.4", "sucrase": "3.35.0" } }, "sha512-wI9/iam3Irk99ADGM/FyD7YrrEibIZXR4huSZiU5zt9o3dASOKhqepiNJex4YPiktLfKhYrpSEJtwno1g0SrgA=="],
+
"expo-modules-autolinking/fs-extra/jsonfile": ["jsonfile@6.1.0", "", { "dependencies": { "universalify": "^2.0.0" }, "optionalDependencies": { "graceful-fs": "^4.1.6" } }, "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="],
"expo-modules-autolinking/fs-extra/universalify": ["universalify@2.0.1", "", {}, "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="],
+ "expo-updates/@expo/config-plugins/@expo/config-types": ["@expo/config-types@52.0.5", "", {}, "sha512-AMDeuDLHXXqd8W+0zSjIt7f37vUd/BP8p43k68NHpyAvQO+z8mbQZm3cNQVAMySeayK2XoPigAFB1JF2NFajaA=="],
+
+ "expo-updates/@expo/config-plugins/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
+
+ "expo-updates/@expo/config-plugins/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
+
+ "expo/@expo/config-plugins/@expo/config-types": ["@expo/config-types@52.0.5", "", {}, "sha512-AMDeuDLHXXqd8W+0zSjIt7f37vUd/BP8p43k68NHpyAvQO+z8mbQZm3cNQVAMySeayK2XoPigAFB1JF2NFajaA=="],
+
+ "expo/@expo/config-plugins/debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
+
+ "expo/@expo/config-plugins/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
+
"finalhandler/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
+ "jest-message-util/@babel/code-frame/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.27.1", "", {}, "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="],
+
+ "jest-message-util/@jest/types/@types/node": ["@types/node@16.9.1", "", {}, "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="],
+
+ "jest-validate/pretty-format/@jest/schemas": ["@jest/schemas@29.6.3", "", { "dependencies": { "@sinclair/typebox": "^0.27.8" } }, "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA=="],
+
+ "jest-validate/pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
+
+ "jest-validate/pretty-format/react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
+
"jscodeshift/write-file-atomic/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],
"lighthouse-logger/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
- "lint-staged/execa/get-stream": ["get-stream@8.0.1", "", {}, "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA=="],
-
- "lint-staged/execa/human-signals": ["human-signals@5.0.0", "", {}, "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ=="],
-
- "lint-staged/execa/is-stream": ["is-stream@3.0.0", "", {}, "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="],
-
- "lint-staged/execa/npm-run-path": ["npm-run-path@5.3.0", "", { "dependencies": { "path-key": "^4.0.0" } }, "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ=="],
-
- "lint-staged/execa/onetime": ["onetime@6.0.0", "", { "dependencies": { "mimic-fn": "^4.0.0" } }, "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ=="],
-
- "lint-staged/execa/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],
-
- "lint-staged/execa/strip-final-newline": ["strip-final-newline@3.0.0", "", {}, "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="],
-
"log-update/cli-cursor/restore-cursor": ["restore-cursor@5.1.0", "", { "dependencies": { "onetime": "^7.0.0", "signal-exit": "^4.1.0" } }, "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA=="],
"log-update/slice-ansi/ansi-styles": ["ansi-styles@6.2.1", "", {}, "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="],
@@ -2825,6 +2963,8 @@
"metro-file-map/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
+ "metro-runtime/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
"metro/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
"minipass-flush/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
@@ -2839,10 +2979,24 @@
"pkg-dir/find-up/locate-path": ["locate-path@3.0.0", "", { "dependencies": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="],
+ "react-helmet-async/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "react-i18next/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
+ "react-native-web/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
"react-native/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
+ "react-native/pretty-format/@jest/schemas": ["@jest/schemas@29.6.3", "", { "dependencies": { "@sinclair/typebox": "^0.27.8" } }, "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA=="],
+
+ "react-native/pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
+
+ "react-native/pretty-format/react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
+
"readable-web-to-node-stream/readable-stream/buffer": ["buffer@6.0.3", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="],
+ "regenerator-transform/@babel/runtime/regenerator-runtime": ["regenerator-runtime@0.14.1", "", {}, "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="],
+
"rimraf/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
"send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
@@ -2871,6 +3025,10 @@
"@expo/cli/ora/cli-cursor/restore-cursor": ["restore-cursor@2.0.0", "", { "dependencies": { "onetime": "^2.0.0", "signal-exit": "^3.0.2" } }, "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="],
+ "@expo/cli/ora/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="],
+
+ "@expo/cli/pretty-format/@jest/schemas/@sinclair/typebox": ["@sinclair/typebox@0.27.8", "", {}, "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="],
+
"@expo/image-utils/fs-extra/jsonfile/universalify": ["universalify@2.0.1", "", {}, "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="],
"@expo/package-manager/ora/chalk/ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="],
@@ -2881,8 +3039,16 @@
"@expo/package-manager/ora/cli-cursor/restore-cursor": ["restore-cursor@2.0.0", "", { "dependencies": { "onetime": "^2.0.0", "signal-exit": "^3.0.2" } }, "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="],
+ "@expo/package-manager/ora/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="],
+
"@istanbuljs/load-nyc-config/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="],
+ "@jest/fake-timers/jest-message-util/pretty-format/@jest/schemas": ["@jest/schemas@29.6.3", "", { "dependencies": { "@sinclair/typebox": "^0.27.8" } }, "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA=="],
+
+ "@jest/fake-timers/jest-message-util/pretty-format/ansi-styles": ["ansi-styles@5.2.0", "", {}, "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="],
+
+ "@jest/fake-timers/jest-message-util/pretty-format/react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],
+
"@react-native-community/cli-server-api/pretty-format/@jest/types/@types/yargs": ["@types/yargs@15.0.19", "", { "dependencies": { "@types/yargs-parser": "*" } }, "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA=="],
"@react-native/babel-plugin-codegen/@react-native/codegen/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
@@ -2907,16 +3073,16 @@
"default-gateway/execa/npm-run-path/path-key": ["path-key@2.0.1", "", {}, "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="],
- "lint-staged/execa/npm-run-path/path-key": ["path-key@4.0.0", "", {}, "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ=="],
+ "expo-linking/expo-constants/@expo/config/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="],
- "lint-staged/execa/onetime/mimic-fn": ["mimic-fn@4.0.0", "", {}, "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="],
+ "expo-linking/expo-constants/@expo/config/semver": ["semver@7.7.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA=="],
+
+ "jest-validate/pretty-format/@jest/schemas/@sinclair/typebox": ["@sinclair/typebox@0.27.8", "", {}, "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="],
"log-update/cli-cursor/restore-cursor/onetime": ["onetime@7.0.0", "", { "dependencies": { "mimic-function": "^5.0.0" } }, "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ=="],
"log-update/cli-cursor/restore-cursor/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],
- "logkitty/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
"logkitty/yargs/cliui/wrap-ansi": ["wrap-ansi@6.2.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="],
"logkitty/yargs/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],
@@ -2933,6 +3099,8 @@
"react-native/glob/minimatch/brace-expansion": ["brace-expansion@1.1.11", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="],
+ "react-native/pretty-format/@jest/schemas/@sinclair/typebox": ["@sinclair/typebox@0.27.8", "", {}, "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="],
+
"rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.11", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="],
"temp/rimraf/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
@@ -2953,6 +3121,8 @@
"@istanbuljs/load-nyc-config/find-up/locate-path/p-locate/p-limit": ["p-limit@2.3.0", "", { "dependencies": { "p-try": "^2.0.0" } }, "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="],
+ "@jest/fake-timers/jest-message-util/pretty-format/@jest/schemas/@sinclair/typebox": ["@sinclair/typebox@0.27.8", "", {}, "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="],
+
"@react-native/babel-plugin-codegen/@react-native/codegen/glob/minimatch/brace-expansion": ["brace-expansion@1.1.11", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="],
"@react-native/babel-plugin-codegen/@react-native/codegen/jscodeshift/recast/ast-types": ["ast-types@0.15.2", "", { "dependencies": { "tslib": "^2.0.1" } }, "sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg=="],
diff --git a/components/ContinueWatchingPoster.tsx b/components/ContinueWatchingPoster.tsx
index c15495ce..c0f4a265 100644
--- a/components/ContinueWatchingPoster.tsx
+++ b/components/ContinueWatchingPoster.tsx
@@ -1,11 +1,12 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
import { Ionicons } from "@expo/vector-icons";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { Image } from "expo-image";
import { useAtomValue } from "jotai";
-import { useMemo } from "react";
import type React from "react";
+import { useMemo } from "react";
import { View } from "react-native";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { ProgressBar } from "./common/ProgressBar";
import { WatchedIndicator } from "./WatchedIndicator";
type ContinueWatchingPosterProps = {
@@ -62,18 +63,6 @@ const ContinueWatchingPoster: React.FC = ({
return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
}, [item]);
- const progress = useMemo(() => {
- if (item.Type === "Program") {
- const startDate = new Date(item.StartDate || "");
- const endDate = new Date(item.EndDate || "");
- const now = new Date();
- const total = endDate.getTime() - startDate.getTime();
- const elapsed = now.getTime() - startDate.getTime();
- return (elapsed / total) * 100;
- }
- return item.UserData?.PlayedPercentage || 0;
- }, [item]);
-
if (!url)
return ;
@@ -101,22 +90,8 @@ const ContinueWatchingPoster: React.FC = ({
)}
- {!progress && }
- {progress > 0 && (
- <>
-
-
-
- )}
+ {!item.UserData?.Played && }
+
);
};
diff --git a/components/DownloadItem.tsx b/components/DownloadItem.tsx
index d7939684..77c3fa42 100644
--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -1,11 +1,3 @@
-import { useDownload } from "@/providers/DownloadProvider";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { queueActions, queueAtom } from "@/utils/atoms/queue";
-import { DownloadMethod, useSettings } from "@/utils/atoms/settings";
-import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import { saveDownloadItemInfoToDiskTmp } from "@/utils/optimize-server";
-import download from "@/utils/profiles/download";
import Ionicons from "@expo/vector-icons/Ionicons";
import {
BottomSheetBackdrop,
@@ -22,17 +14,23 @@ import { t } from "i18next";
import { useAtom } from "jotai";
import type React from "react";
import { useCallback, useMemo, useRef, useState } from "react";
-import { Alert, Platform, View, type ViewProps } from "react-native";
+import { Alert, Platform, Switch, View, type ViewProps } from "react-native";
import { toast } from "sonner-native";
+import { useDownload } from "@/providers/DownloadProvider";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { queueAtom } from "@/utils/atoms/queue";
+import { useSettings } from "@/utils/atoms/settings";
+import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
+import { getDownloadUrl } from "@/utils/jellyfin/media/getDownloadUrl";
import { AudioTrackSelector } from "./AudioTrackSelector";
import { type Bitrate, BitrateSelector } from "./BitrateSelector";
import { Button } from "./Button";
+import { Text } from "./common/Text";
import { Loader } from "./Loader";
import { MediaSourceSelector } from "./MediaSourceSelector";
import ProgressCircle from "./ProgressCircle";
import { RoundButton } from "./RoundButton";
import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
-import { Text } from "./common/Text";
interface DownloadProps extends ViewProps {
items: BaseItemDto[];
@@ -54,11 +52,11 @@ export const DownloadItems: React.FC = ({
}) => {
const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom);
- const [queue, setQueue] = useAtom(queueAtom);
+ const [queue, _setQueue] = useAtom(queueAtom);
const [settings] = useSettings();
+ const [downloadUnwatchedOnly, setDownloadUnwatchedOnly] = useState(false);
const { processes, startBackgroundDownload, downloadedFiles } = useDownload();
- //const { startRemuxing } = useRemuxHlsToMp4();
const [selectedMediaSource, setSelectedMediaSource] = useState<
MediaSourceInfo | undefined | null
@@ -77,10 +75,6 @@ export const DownloadItems: React.FC = ({
() => user?.Policy?.EnableContentDownloading,
[user],
);
- const usingOptimizedServer = useMemo(
- () => settings?.downloadMethod === DownloadMethod.Optimized,
- [settings],
- );
const bottomSheetModalRef = useRef(null);
@@ -88,7 +82,7 @@ export const DownloadItems: React.FC = ({
bottomSheetModalRef.current?.present();
}, []);
- const handleSheetChanges = useCallback((index: number) => {}, []);
+ const handleSheetChanges = useCallback((_index: number) => { }, []);
const closeModal = useCallback(() => {
bottomSheetModalRef.current?.dismiss();
@@ -102,6 +96,13 @@ export const DownloadItems: React.FC = ({
[items, downloadedFiles],
);
+ const itemsToDownload = useMemo(() => {
+ if (downloadUnwatchedOnly) {
+ return itemsNotDownloaded.filter((item) => !item.UserData?.Played);
+ }
+ return itemsNotDownloaded;
+ }, [itemsNotDownloaded, downloadUnwatchedOnly]);
+
const allItemsDownloaded = useMemo(() => {
if (items.length === 0) return false;
return itemsNotDownloaded.length === 0;
@@ -136,39 +137,14 @@ export const DownloadItems: React.FC = ({
firstItem.Type !== "Episode"
? "/downloads"
: ({
- pathname: `/downloads/${firstItem.SeriesId}`,
- params: {
- episodeSeasonIndex: firstItem.ParentIndexNumber,
- },
- } as Href),
+ pathname: `/downloads/${firstItem.SeriesId}`,
+ params: {
+ episodeSeasonIndex: firstItem.ParentIndexNumber,
+ },
+ } as Href),
);
};
- const acceptDownloadOptions = useCallback(() => {
- if (userCanDownload === true) {
- if (itemsNotDownloaded.some((i) => !i.Id)) {
- throw new Error("No item id");
- }
- closeModal();
-
- initiateDownload(...itemsNotDownloaded);
- } else {
- toast.error(
- t("home.downloads.toasts.you_are_not_allowed_to_download_files"),
- );
- }
- }, [
- queue,
- setQueue,
- itemsNotDownloaded,
- usingOptimizedServer,
- userCanDownload,
- maxBitrate,
- selectedMediaSource,
- selectedAudioStream,
- selectedSubtitleStream,
- ]);
-
const initiateDownload = useCallback(
async (...items: BaseItemDto[]) => {
if (
@@ -181,46 +157,53 @@ export const DownloadItems: React.FC = ({
"DownloadItem ~ initiateDownload: No api or user or item",
);
}
- let mediaSource = selectedMediaSource;
- let audioIndex: number | undefined = selectedAudioStream;
- let subtitleIndex: number | undefined = selectedSubtitleStream;
+ const downloadDetailsPromises = items.map(async (item) => {
+ const { mediaSource, audioIndex, subtitleIndex } =
+ itemsNotDownloaded.length > 1
+ ? getDefaultPlaySettings(item, settings!)
+ : {
+ mediaSource: selectedMediaSource,
+ audioIndex: selectedAudioStream,
+ subtitleIndex: selectedSubtitleStream,
+ };
- for (const item of items) {
- if (itemsNotDownloaded.length > 1) {
- const defaults = getDefaultPlaySettings(item, settings!);
- mediaSource = defaults.mediaSource;
- audioIndex = defaults.audioIndex;
- subtitleIndex = defaults.subtitleIndex;
- }
-
- const res = await getStreamUrl({
+ const downloadDetails = await getDownloadUrl({
api,
item,
- startTimeTicks: 0,
- userId: user?.Id,
- audioStreamIndex: audioIndex,
- maxStreamingBitrate: maxBitrate.value,
- mediaSourceId: mediaSource?.Id,
- subtitleStreamIndex: subtitleIndex,
- deviceProfile: download,
- download: true,
- // deviceId: mediaSource?.Id,
+ userId: user.Id!,
+ mediaSource: mediaSource!,
+ audioStreamIndex: audioIndex ?? -1,
+ subtitleStreamIndex: subtitleIndex ?? -1,
+ maxBitrate,
+ deviceId: api.deviceInfo.id,
});
- if (!res) {
+ return {
+ url: downloadDetails?.url,
+ item,
+ mediaSource: downloadDetails?.mediaSource,
+ };
+ });
+
+ const downloadDetails = await Promise.all(downloadDetailsPromises);
+ for (const { url, item, mediaSource } of downloadDetails) {
+ if (!url) {
Alert.alert(
t("home.downloads.something_went_wrong"),
t("home.downloads.could_not_get_stream_url_from_jellyfin"),
);
continue;
}
-
- const { mediaSource: source, url } = res;
-
- if (!url || !source) throw new Error("No url");
-
- saveDownloadItemInfoToDiskTmp(item, source, url);
- await startBackgroundDownload(url, item, source, maxBitrate);
+ if (!mediaSource) {
+ console.error(`Could not get download URL for ${item.Name}`);
+ toast.error(
+ t("Could not get download URL for {{itemName}}", {
+ itemName: item.Name,
+ }),
+ );
+ continue;
+ }
+ await startBackgroundDownload(url, item, mediaSource, maxBitrate);
}
},
[
@@ -232,11 +215,25 @@ export const DownloadItems: React.FC = ({
selectedSubtitleStream,
settings,
maxBitrate,
- usingOptimizedServer,
startBackgroundDownload,
],
);
+ const acceptDownloadOptions = useCallback(() => {
+ if (userCanDownload === true) {
+ if (itemsToDownload.some((i) => !i.Id)) {
+ throw new Error("No item id");
+ }
+ closeModal();
+
+ initiateDownload(...itemsToDownload);
+ } else {
+ toast.error(
+ t("home.downloads.toasts.you_are_not_allowed_to_download_files"),
+ );
+ }
+ }, [closeModal, initiateDownload, itemsToDownload, userCanDownload]);
+
const renderBackdrop = useCallback(
(props: BottomSheetBackdropProps) => (
= ({
if (itemsNotDownloaded.length !== 1) return;
const { bitrate, mediaSource, audioIndex, subtitleIndex } =
getDefaultPlaySettings(items[0], settings);
-
setSelectedMediaSource(mediaSource ?? undefined);
setSelectedAudioStream(audioIndex ?? 0);
setSelectedSubtitleStream(subtitleIndex ?? -1);
@@ -327,7 +323,7 @@ export const DownloadItems: React.FC = ({
{subtitle ||
t("item_card.download.download_x_item", {
- item_count: itemsNotDownloaded.length,
+ item_count: itemsToDownload.length,
})}
@@ -337,6 +333,15 @@ export const DownloadItems: React.FC = ({
onChange={setMaxBitrate}
selected={maxBitrate}
/>
+ {itemsNotDownloaded.length > 1 && (
+
+ {t("item_card.download.download_unwatched_only")}
+
+
+ )}
{itemsNotDownloaded.length === 1 && (
<>
= ({
)}
+
-
-
- {usingOptimizedServer
- ? t("item_card.download.using_optimized_server")
- : t("item_card.download.using_default_method")}
-
-
diff --git a/components/ItemContent.tsx b/components/ItemContent.tsx
index 33fd305a..b53417f9 100644
--- a/components/ItemContent.tsx
+++ b/components/ItemContent.tsx
@@ -1,25 +1,3 @@
-import { AudioTrackSelector } from "@/components/AudioTrackSelector";
-import { type Bitrate, BitrateSelector } from "@/components/BitrateSelector";
-import { DownloadSingleItem } from "@/components/DownloadItem";
-import { OverviewText } from "@/components/OverviewText";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-// const PlayButton = !Platform.isTV ? require("@/components/PlayButton") : null;
-import { PlayButton } from "@/components/PlayButton";
-import { PlayedStatus } from "@/components/PlayedStatus";
-import { SimilarItems } from "@/components/SimilarItems";
-import { SubtitleTrackSelector } from "@/components/SubtitleTrackSelector";
-import { ItemImage } from "@/components/common/ItemImage";
-import { CastAndCrew } from "@/components/series/CastAndCrew";
-import { CurrentSeries } from "@/components/series/CurrentSeries";
-import { SeasonEpisodesCarousel } from "@/components/series/SeasonEpisodesCarousel";
-import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
-import { useImageColors } from "@/hooks/useImageColors";
-import { useOrientation } from "@/hooks/useOrientation";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
import type {
BaseItemDto,
MediaSourceInfo,
@@ -30,12 +8,35 @@ import { useAtom } from "jotai";
import React, { useEffect, useMemo, useState } from "react";
import { Platform, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { AudioTrackSelector } from "@/components/AudioTrackSelector";
+import { type Bitrate, BitrateSelector } from "@/components/BitrateSelector";
+import { ItemImage } from "@/components/common/ItemImage";
+import { DownloadSingleItem } from "@/components/DownloadItem";
+import { OverviewText } from "@/components/OverviewText";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+// const PlayButton = !Platform.isTV ? require("@/components/PlayButton") : null;
+import { PlayButton } from "@/components/PlayButton";
+import { PlayedStatus } from "@/components/PlayedStatus";
+import { SimilarItems } from "@/components/SimilarItems";
+import { SubtitleTrackSelector } from "@/components/SubtitleTrackSelector";
+import { CastAndCrew } from "@/components/series/CastAndCrew";
+import { CurrentSeries } from "@/components/series/CurrentSeries";
+import { SeasonEpisodesCarousel } from "@/components/series/SeasonEpisodesCarousel";
+import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
+import { useImageColors } from "@/hooks/useImageColors";
+import { useItemQuery } from "@/hooks/useItemQuery";
+import { useOrientation } from "@/hooks/useOrientation";
+import * as ScreenOrientation from "@/packages/expo-screen-orientation";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
import { AddToFavorites } from "./AddToFavorites";
import { ItemHeader } from "./ItemHeader";
import { ItemTechnicalDetails } from "./ItemTechnicalDetails";
import { MediaSourceSelector } from "./MediaSourceSelector";
import { MoreMoviesWithActor } from "./MoreMoviesWithActor";
import { PlayInRemoteSessionButton } from "./PlayInRemoteSession";
+
const Chromecast = !Platform.isTV ? require("./Chromecast") : null;
export type SelectedOptions = {
@@ -45,8 +46,13 @@ export type SelectedOptions = {
subtitleIndex: number;
};
-export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
- ({ item }) => {
+interface ItemContentProps {
+ item: BaseItemDto;
+ isOffline: boolean;
+}
+
+export const ItemContent: React.FC = React.memo(
+ ({ item, isOffline }) => {
const [api] = useAtom(apiAtom);
const [settings] = useSettings();
const { orientation } = useOrientation();
@@ -68,66 +74,75 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
defaultBitrate,
defaultMediaSource,
defaultSubtitleIndex,
- } = useDefaultPlaySettings(item, settings);
+ } = useDefaultPlaySettings(item!, settings);
+
+ const logoUrl = useMemo(
+ () => (item ? getLogoImageUrlById({ api, item }) : null),
+ [api, item],
+ );
+
+ const loading = useMemo(() => {
+ return Boolean(logoUrl && loadingLogo);
+ }, [loadingLogo, logoUrl]);
// Needs to automatically change the selected to the default values for default indexes.
useEffect(() => {
- setSelectedOptions(() => ({
- bitrate: defaultBitrate,
- mediaSource: defaultMediaSource,
- subtitleIndex: defaultSubtitleIndex ?? -1,
- audioIndex: defaultAudioIndex,
- }));
+ if (item) {
+ setSelectedOptions(() => ({
+ bitrate: defaultBitrate,
+ mediaSource: defaultMediaSource,
+ subtitleIndex: defaultSubtitleIndex ?? -1,
+ audioIndex: defaultAudioIndex,
+ }));
+ }
}, [
defaultAudioIndex,
defaultBitrate,
defaultSubtitleIndex,
defaultMediaSource,
+ item,
]);
- if (!Platform.isTV) {
- useEffect(() => {
- navigation.setOptions({
- headerRight: () =>
- item && (
-
-
- {item.Type !== "Program" && (
-
- {!Platform.isTV && (
-
- )}
- {user?.Policy?.IsAdministrator && (
-
- )}
-
-
-
-
- )}
-
- ),
- });
- }, [item]);
- }
+ useEffect(() => {
+ if (Platform.isTV) {
+ return;
+ }
+ navigation.setOptions({
+ headerRight: () =>
+ item && (
+
+
+ {item.Type !== "Program" && (
+
+ {!Platform.isTV && !isOffline && (
+
+ )}
+ {user?.Policy?.IsAdministrator && !isOffline && (
+
+ )}
+
+ {!isOffline && }
+
+ )}
+
+ ),
+ });
+ }, [item, navigation, isOffline, user]);
useEffect(() => {
- if (orientation !== ScreenOrientation.OrientationLock.PORTRAIT_UP)
- setHeaderHeight(230);
- else if (item.Type === "Movie") setHeaderHeight(500);
- else setHeaderHeight(350);
- }, [item.Type, orientation]);
+ if (item) {
+ if (orientation !== ScreenOrientation.OrientationLock.PORTRAIT_UP)
+ setHeaderHeight(230);
+ else if (item.Type === "Movie") setHeaderHeight(500);
+ else setHeaderHeight(350);
+ }
+ }, [item, orientation]);
- const logoUrl = useMemo(() => getLogoImageUrlById({ api, item }), [item]);
-
- const loading = useMemo(() => {
- return Boolean(logoUrl && loadingLogo);
- }, [loadingLogo, logoUrl]);
- if (!selectedOptions) return null;
+ if (!item || !selectedOptions) return null;
return (
= React.memo(
onLoad={() => setLoadingLogo(false)}
onError={() => setLoadingLogo(false)}
/>
- ) : null
+ ) : undefined
}
>
- {item.Type !== "Program" && !Platform.isTV && (
+ {item.Type !== "Program" && !Platform.isTV && !isOffline && (
= React.memo(
className='grow'
selectedOptions={selectedOptions}
item={item}
+ isOffline={isOffline}
/>
{item.Type === "Episode" && (
-
+
)}
-
+ {!isOffline && (
+
+ )}
{item.Type !== "Program" && (
<>
- {item.Type === "Episode" && (
+ {item.Type === "Episode" && !isOffline && (
)}
-
+ {!isOffline && (
+
+ )}
- {item.People && item.People.length > 0 && (
+ {item.People && item.People.length > 0 && !isOffline && (
{item.People.slice(0, 3).map((person, idx) => (
= React.memo(
)}
-
+ {!isOffline && }
)}
diff --git a/components/PlayButton.tsx b/components/PlayButton.tsx
index fb706fff..e013a826 100644
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -1,13 +1,3 @@
-import { useHaptic } from "@/hooks/useHaptic";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { itemThemeColorAtom } from "@/utils/atoms/primaryColor";
-import { useSettings } from "@/utils/atoms/settings";
-import { getParentBackdropImageUrl } from "@/utils/jellyfin/image/getParentBackdropImageUrl";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import { chromecast } from "@/utils/profiles/chromecast";
-import { chromecasth265 } from "@/utils/profiles/chromecasth265";
-import { runtimeTicksToMinutes } from "@/utils/time";
import { useActionSheet } from "@expo/react-native-action-sheet";
import { Feather, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
@@ -15,7 +5,6 @@ import { useRouter } from "expo-router";
import { useAtom, useAtomValue } from "jotai";
import { useCallback, useEffect } from "react";
import { useTranslation } from "react-i18next";
-import { Platform, Pressable } from "react-native";
import { Alert, TouchableOpacity, View } from "react-native";
import CastContext, {
CastButton,
@@ -33,12 +22,23 @@ import Animated, {
useSharedValue,
withTiming,
} from "react-native-reanimated";
+import { useHaptic } from "@/hooks/useHaptic";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { itemThemeColorAtom } from "@/utils/atoms/primaryColor";
+import { useSettings } from "@/utils/atoms/settings";
+import { getParentBackdropImageUrl } from "@/utils/jellyfin/image/getParentBackdropImageUrl";
+import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import { chromecast } from "@/utils/profiles/chromecast";
+import { chromecasth265 } from "@/utils/profiles/chromecasth265";
+import { runtimeTicksToMinutes } from "@/utils/time";
import type { Button } from "./Button";
import type { SelectedOptions } from "./ItemContent";
interface Props extends React.ComponentProps {
item: BaseItemDto;
selectedOptions: SelectedOptions;
+ isOffline?: boolean;
}
const ANIMATION_DURATION = 500;
@@ -47,6 +47,7 @@ const MIN_PLAYBACK_WIDTH = 15;
export const PlayButton: React.FC = ({
item,
selectedOptions,
+ isOffline,
...props
}: Props) => {
const { showActionSheetWithOptions } = useActionSheet();
@@ -76,7 +77,7 @@ export const PlayButton: React.FC = ({
}
router.push(`/player/direct-player?${q}`);
},
- [router],
+ [router, isOffline],
);
const onPress = useCallback(async () => {
@@ -91,6 +92,8 @@ export const PlayButton: React.FC = ({
subtitleIndex: selectedOptions.subtitleIndex?.toString() ?? "",
mediaSourceId: selectedOptions.mediaSource?.Id ?? "",
bitrateValue: selectedOptions.bitrate?.value?.toString() ?? "",
+ playbackPosition: item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+ offline: isOffline ? "true" : "false",
});
const queryString = queryParams.toString();
diff --git a/components/PlayedStatus.tsx b/components/PlayedStatus.tsx
index 00beb18f..93b91ae9 100644
--- a/components/PlayedStatus.tsx
+++ b/components/PlayedStatus.tsx
@@ -1,50 +1,22 @@
-import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useQueryClient } from "@tanstack/react-query";
import type React from "react";
import { View, type ViewProps } from "react-native";
+import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
import { RoundButton } from "./RoundButton";
interface Props extends ViewProps {
items: BaseItemDto[];
+ isOffline?: boolean;
size?: "default" | "large";
}
-export const PlayedStatus: React.FC = ({ items, ...props }) => {
- const queryClient = useQueryClient();
-
- const invalidateQueries = () => {
- items.forEach((item) => {
- queryClient.invalidateQueries({
- queryKey: ["item", item.Id],
- });
- });
- queryClient.invalidateQueries({
- queryKey: ["resumeItems"],
- });
- queryClient.invalidateQueries({
- queryKey: ["continueWatching"],
- });
- queryClient.invalidateQueries({
- queryKey: ["nextUp-all"],
- });
- queryClient.invalidateQueries({
- queryKey: ["nextUp"],
- });
- queryClient.invalidateQueries({
- queryKey: ["episodes"],
- });
- queryClient.invalidateQueries({
- queryKey: ["seasons"],
- });
- queryClient.invalidateQueries({
- queryKey: ["home"],
- });
- };
-
+export const PlayedStatus: React.FC = ({
+ items,
+ isOffline = false,
+ ...props
+}) => {
const allPlayed = items.every((item) => item.UserData?.Played);
-
- const markAsPlayedStatus = useMarkAsPlayed(items);
+ const toggle = useMarkAsPlayed(items, isOffline);
return (
@@ -52,8 +24,7 @@ export const PlayedStatus: React.FC = ({ items, ...props }) => {
fillColor={allPlayed ? "primary" : undefined}
icon={allPlayed ? "checkmark" : "checkmark"}
onPress={async () => {
- console.log(allPlayed);
- await markAsPlayedStatus(!allPlayed);
+ await toggle(!allPlayed);
}}
size={props.size}
/>
diff --git a/components/SubtitleTrackSelector.tsx b/components/SubtitleTrackSelector.tsx
index 1e74bbb6..25d60ce9 100644
--- a/components/SubtitleTrackSelector.tsx
+++ b/components/SubtitleTrackSelector.tsx
@@ -18,7 +18,7 @@ export const SubtitleTrackSelector: React.FC = ({
selected,
...props
}) => {
- if (Platform.isTV) return null;
+ const { t } = useTranslation();
const subtitleStreams = useMemo(() => {
return source?.MediaStreams?.filter((x) => x.Type === "Subtitle");
}, [source]);
@@ -28,9 +28,7 @@ export const SubtitleTrackSelector: React.FC = ({
[subtitleStreams, selected],
);
- if (subtitleStreams?.length === 0) return null;
-
- const { t } = useTranslation();
+ if (Platform.isTV || subtitleStreams?.length === 0) return null;
return (
= ({ item }) => {
+ const progress = useMemo(() => {
+ if (item.Type === "Program") {
+ if (!item.StartDate || !item.EndDate) {
+ return 0;
+ }
+ const startDate = new Date(item.StartDate);
+ const endDate = new Date(item.EndDate);
+ const now = new Date();
+ const total = endDate.getTime() - startDate.getTime();
+ if (total <= 0) {
+ return 0;
+ }
+ const elapsed = now.getTime() - startDate.getTime();
+ return (elapsed / total) * 100;
+ }
+ return item.UserData?.PlayedPercentage || 0;
+ }, [item]);
+
+ if (progress <= 0) {
+ return null;
+ }
+
+ return (
+ <>
+
+
+
+ );
+};
diff --git a/components/common/TouchableItemRouter.tsx b/components/common/TouchableItemRouter.tsx
index 23cb6dd7..5c44ab4f 100644
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -1,5 +1,3 @@
-import { useFavorite } from "@/hooks/useFavorite";
-import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
import { useActionSheet } from "@expo/react-native-action-sheet";
import type {
BaseItemDto,
@@ -8,9 +6,12 @@ import type {
import { useRouter, useSegments } from "expo-router";
import { type PropsWithChildren, useCallback } from "react";
import { TouchableOpacity, type TouchableOpacityProps } from "react-native";
+import { useFavorite } from "@/hooks/useFavorite";
+import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
interface Props extends TouchableOpacityProps {
item: BaseItemDto;
+ isOffline?: boolean;
}
export const itemRouter = (
@@ -50,6 +51,7 @@ export const itemRouter = (
export const TouchableItemRouter: React.FC> = ({
item,
+ isOffline = false,
children,
...props
}) => {
@@ -105,7 +107,10 @@ export const TouchableItemRouter: React.FC> = ({
{
- const url = itemRouter(item, from);
+ let url = itemRouter(item, from);
+ if (isOffline) {
+ url += `&offline=true`;
+ }
// @ts-expect-error
router.push(url);
}}
@@ -114,4 +119,6 @@ export const TouchableItemRouter: React.FC> = ({
{children}
);
+
+ return null;
};
diff --git a/components/downloads/ActiveDownloads.tsx b/components/downloads/ActiveDownloads.tsx
index 3f19f7cd..c922b0e8 100644
--- a/components/downloads/ActiveDownloads.tsx
+++ b/components/downloads/ActiveDownloads.tsx
@@ -1,9 +1,3 @@
-import { Text } from "@/components/common/Text";
-import { useDownload } from "@/providers/DownloadProvider";
-import { DownloadMethod, useSettings } from "@/utils/atoms/settings";
-import { storage } from "@/utils/mmkv";
-import type { JobStatus } from "@/utils/optimize-server";
-import { formatTimeString } from "@/utils/time";
import { Ionicons } from "@expo/vector-icons";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { Image } from "expo-image";
@@ -19,12 +13,22 @@ import {
type ViewProps,
} from "react-native";
import { toast } from "sonner-native";
+import { Text } from "@/components/common/Text";
+import { useDownload } from "@/providers/DownloadProvider";
+import { JobStatus } from "@/providers/Downloads/types";
+import { storage } from "@/utils/mmkv";
+import { formatTimeString } from "@/utils/time";
import { Button } from "../Button";
+
const BackGroundDownloader = !Platform.isTV
? require("@kesha-antonov/react-native-background-downloader")
: null;
-interface Props extends ViewProps {}
+interface Props extends ViewProps { }
+
+const bytesToMB = (bytes: number) => {
+ return bytes / 1024 / 1024;
+};
export const ActiveDownloads: React.FC = ({ ...props }) => {
const { processes } = useDownload();
@@ -59,32 +63,18 @@ interface DownloadCardProps extends TouchableOpacityProps {
}
const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
- const { processes, startDownload } = useDownload();
+ const { startDownload, removeProcess } = useDownload();
const router = useRouter();
- const { removeProcess, setProcesses } = useDownload();
- const [settings] = useSettings();
const queryClient = useQueryClient();
const cancelJobMutation = useMutation({
mutationFn: async (id: string) => {
if (!process) throw new Error("No active download");
-
- try {
- const tasks = await BackGroundDownloader.checkForExistingDownloads();
- for (const task of tasks) {
- if (task.id === id) {
- task.stop();
- }
- }
- } finally {
- await removeProcess(id);
- if (settings?.downloadMethod === DownloadMethod.Optimized) {
- await queryClient.refetchQueries({ queryKey: ["jobs"] });
- }
- }
+ removeProcess(id);
},
onSuccess: () => {
toast.success(t("home.downloads.toasts.download_cancelled"));
+ queryClient.invalidateQueries({ queryKey: ["downloads"] });
},
onError: (e) => {
console.error(e);
@@ -93,11 +83,14 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
});
const eta = (p: JobStatus) => {
- if (!p.speed || !p.progress) return null;
+ if (!p.speed || p.speed <= 0 || !p.estimatedTotalSizeBytes) return null;
- const length = p?.item?.RunTimeTicks || 0;
- const timeLeft = (length - length * (p.progress / 100)) / p.speed;
- return formatTimeString(timeLeft, "tick");
+ const bytesRemaining = p.estimatedTotalSizeBytes - (p.bytesDownloaded || 0);
+ if (bytesRemaining <= 0) return null;
+
+ const secondsRemaining = bytesRemaining / p.speed;
+
+ return formatTimeString(secondsRemaining, "s");
};
const base64Image = useMemo(() => {
@@ -110,8 +103,7 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
className='relative bg-neutral-900 border border-neutral-800 rounded-2xl overflow-hidden'
{...props}
>
- {(process.status === "optimizing" ||
- process.status === "downloading") && (
+ {process.status === "downloading" && (
{
) : (
{process.progress.toFixed(0)}%
)}
- {process.speed && (
- {process.speed?.toFixed(2)}x
+ {process.speed && process.speed > 0 && (
+
+ {bytesToMB(process.speed).toFixed(2)} MB/s
+
)}
{eta(process) && (
diff --git a/components/downloads/EpisodeCard.tsx b/components/downloads/EpisodeCard.tsx
index 97a9308f..7811954e 100644
--- a/components/downloads/EpisodeCard.tsx
+++ b/components/downloads/EpisodeCard.tsx
@@ -1,25 +1,16 @@
-import { useHaptic } from "@/hooks/useHaptic";
import {
ActionSheetProvider,
useActionSheet,
} from "@expo/react-native-action-sheet";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models/base-item-dto";
import type React from "react";
-import { useCallback, useMemo } from "react";
-import {
- TouchableOpacity,
- type TouchableOpacityProps,
- View,
-} from "react-native";
-
+import { useCallback } from "react";
+import { type TouchableOpacityProps, View } from "react-native";
import { Text } from "@/components/common/Text";
import { DownloadSize } from "@/components/downloads/DownloadSize";
-import { useDownloadedFileOpener } from "@/hooks/useDownloadedFileOpener";
+import { useHaptic } from "@/hooks/useHaptic";
import { useDownload } from "@/providers/DownloadProvider";
-import { storage } from "@/utils/mmkv";
import { runtimeTicksToSeconds } from "@/utils/time";
-import { Ionicons } from "@expo/vector-icons";
-import { Image } from "expo-image";
import ContinueWatchingPoster from "../ContinueWatchingPoster";
import { TouchableItemRouter } from "../common/TouchableItemRouter";
@@ -27,26 +18,17 @@ interface EpisodeCardProps extends TouchableOpacityProps {
item: BaseItemDto;
}
-export const EpisodeCard: React.FC = ({ item, ...props }) => {
+export const EpisodeCard: React.FC = ({ item }) => {
const { deleteFile } = useDownload();
- const { openFile } = useDownloadedFileOpener();
const { showActionSheetWithOptions } = useActionSheet();
const successHapticFeedback = useHaptic("success");
- const base64Image = useMemo(() => {
- return storage.getString(item.Id!);
- }, [item]);
-
- const handleOpenFile = useCallback(() => {
- openFile(item);
- }, [item, openFile]);
-
/**
* Handles deleting the file with haptic feedback.
*/
const handleDeleteFile = useCallback(() => {
if (item.Id) {
- deleteFile(item.Id);
+ deleteFile(item.Id, "Episode");
successHapticFeedback();
}
}, [deleteFile, item.Id]);
@@ -77,10 +59,10 @@ export const EpisodeCard: React.FC = ({ item, ...props }) => {
}, [showActionSheetWithOptions, handleDeleteFile]);
return (
-
@@ -104,7 +86,7 @@ export const EpisodeCard: React.FC = ({ item, ...props }) => {
{item.Overview}
-
+
);
};
diff --git a/components/downloads/MovieCard.tsx b/components/downloads/MovieCard.tsx
index e15fd003..c193d562 100644
--- a/components/downloads/MovieCard.tsx
+++ b/components/downloads/MovieCard.tsx
@@ -1,19 +1,18 @@
-import { useHaptic } from "@/hooks/useHaptic";
import {
ActionSheetProvider,
useActionSheet,
} from "@expo/react-native-action-sheet";
+import { Ionicons } from "@expo/vector-icons";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { Image } from "expo-image";
import type React from "react";
import { useCallback, useMemo } from "react";
-import { TouchableOpacity, View } from "react-native";
-
+import { View } from "react-native";
import { DownloadSize } from "@/components/downloads/DownloadSize";
-import { useDownloadedFileOpener } from "@/hooks/useDownloadedFileOpener";
import { useDownload } from "@/providers/DownloadProvider";
import { storage } from "@/utils/mmkv";
-import { Ionicons } from "@expo/vector-icons";
-import { Image } from "expo-image";
+import { ProgressBar } from "../common/ProgressBar";
+import { TouchableItemRouter } from "../common/TouchableItemRouter";
import { ItemCardText } from "../ItemCardText";
interface MovieCardProps {
@@ -27,16 +26,10 @@ interface MovieCardProps {
*/
export const MovieCard: React.FC = ({ item }) => {
const { deleteFile } = useDownload();
- const { openFile } = useDownloadedFileOpener();
const { showActionSheetWithOptions } = useActionSheet();
- const successHapticFeedback = useHaptic("success");
-
- const handleOpenFile = useCallback(() => {
- openFile(item);
- }, [item, openFile]);
const base64Image = useMemo(() => {
- return storage.getString(item.Id!);
+ return storage.getString(item?.Id!);
}, []);
/**
@@ -44,8 +37,7 @@ export const MovieCard: React.FC = ({ item }) => {
*/
const handleDeleteFile = useCallback(() => {
if (item.Id) {
- deleteFile(item.Id);
- successHapticFeedback();
+ deleteFile(item.Id, "Movie");
}
}, [deleteFile, item.Id]);
@@ -75,9 +67,9 @@ export const MovieCard: React.FC = ({ item }) => {
}, [showActionSheetWithOptions, handleDeleteFile]);
return (
-
+
{base64Image ? (
-
+
= ({ item }) => {
resizeMode: "cover",
}}
/>
+
) : (
-
+
+
)}
-
+
);
};
diff --git a/components/home/ScrollingCollectionList.tsx b/components/home/ScrollingCollectionList.tsx
index a77085de..dc18b464 100644
--- a/components/home/ScrollingCollectionList.tsx
+++ b/components/home/ScrollingCollectionList.tsx
@@ -1,5 +1,3 @@
-import { Text } from "@/components/common/Text";
-import MoviePoster from "@/components/posters/MoviePoster";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import {
type QueryFunction,
@@ -8,9 +6,11 @@ import {
} from "@tanstack/react-query";
import { useTranslation } from "react-i18next";
import { ScrollView, View, type ViewProps } from "react-native";
+import { Text } from "@/components/common/Text";
+import MoviePoster from "@/components/posters/MoviePoster";
import ContinueWatchingPoster from "../ContinueWatchingPoster";
-import { ItemCardText } from "../ItemCardText";
import { TouchableItemRouter } from "../common/TouchableItemRouter";
+import { ItemCardText } from "../ItemCardText";
import SeriesPoster from "../posters/SeriesPoster";
interface Props extends ViewProps {
@@ -20,6 +20,7 @@ interface Props extends ViewProps {
queryKey: QueryKey;
queryFn: QueryFunction;
hideIfEmpty?: boolean;
+ isOffline?: boolean;
}
export const ScrollingCollectionList: React.FC = ({
@@ -29,6 +30,7 @@ export const ScrollingCollectionList: React.FC = ({
queryFn,
queryKey,
hideIfEmpty = false,
+ isOffline = false,
...props
}) => {
const { data, isLoading } = useQuery({
@@ -90,6 +92,7 @@ export const ScrollingCollectionList: React.FC = ({
= ({ item }) => {
width: "100%",
}}
/>
- {}
);
};
diff --git a/components/series/SeasonEpisodesCarousel.tsx b/components/series/SeasonEpisodesCarousel.tsx
index 1c1ec80b..092472a0 100644
--- a/components/series/SeasonEpisodesCarousel.tsx
+++ b/components/series/SeasonEpisodesCarousel.tsx
@@ -1,30 +1,35 @@
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getTvShowsApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { router } from "expo-router";
import { useAtom } from "jotai";
import { useEffect, useMemo, useRef } from "react";
-import { TouchableOpacity, View, type ViewProps } from "react-native";
+import { TouchableOpacity, type ViewProps } from "react-native";
+import { useDownload } from "@/providers/DownloadProvider";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
import ContinueWatchingPoster from "../ContinueWatchingPoster";
-import { ItemCardText } from "../ItemCardText";
import {
HorizontalScroll,
type HorizontalScrollRef,
} from "../common/HorrizontalScroll";
+import { ItemCardText } from "../ItemCardText";
interface Props extends ViewProps {
item?: BaseItemDto | null;
loading?: boolean;
+ isOffline?: boolean;
}
export const SeasonEpisodesCarousel: React.FC = ({
item,
loading,
+ isOffline,
...props
}) => {
const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom);
+ const { downloadedFiles } = useDownload();
const scrollRef = useRef(null);
@@ -41,24 +46,28 @@ export const SeasonEpisodesCarousel: React.FC = ({
isLoading,
isFetching,
} = useQuery({
- queryKey: ["episodes", seasonId],
+ queryKey: ["episodes", seasonId, isOffline],
queryFn: async () => {
- if (!api || !user?.Id) return [];
- const response = await api.axiosInstance.get(
- `${api.basePath}/Shows/${item?.Id}/Episodes`,
- {
- params: {
- userId: user?.Id,
- seasonId,
- Fields:
- "ItemCounts,PrimaryImageAspectRatio,CanDelete,MediaSourceCount,Overview",
- },
- headers: {
- Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
- },
- },
- );
-
+ if (isOffline) {
+ return downloadedFiles
+ ?.filter(
+ (f) => f.item.Type === "Episode" && f.item.SeasonId === seasonId,
+ )
+ .map((f) => f.item);
+ }
+ if (!api || !user?.Id || !item?.SeriesId) return [];
+ const response = await getTvShowsApi(api).getEpisodes({
+ userId: user.Id,
+ seasonId: seasonId || undefined,
+ seriesId: item.SeriesId,
+ fields: [
+ "ItemCounts",
+ "PrimaryImageAspectRatio",
+ "CanDelete",
+ "MediaSourceCount",
+ "Overview",
+ ],
+ });
return response.data.Items as BaseItemDto[];
},
enabled: !!api && !!user?.Id && !!seasonId,
@@ -123,7 +132,7 @@ export const SeasonEpisodesCarousel: React.FC = ({
data={episodes}
extraData={item}
loading={loading || isLoading || isFetching}
- renderItem={(_item, idx) => (
+ renderItem={(_item, _idx) => (
{
diff --git a/components/series/SeasonPicker.tsx b/components/series/SeasonPicker.tsx
index f6f697aa..8459fa3f 100644
--- a/components/series/SeasonPicker.tsx
+++ b/components/series/SeasonPicker.tsx
@@ -86,7 +86,8 @@ export const SeasonPicker: React.FC = ({ item, initialSeasonIndex }) => {
userId: user.Id,
seasonId: selectedSeasonId,
enableUserData: true,
- fields: ["MediaSources", "MediaStreams", "Overview"],
+ // Note: Including trick play is necessary to enable trick play downloads
+ fields: ["MediaSources", "MediaStreams", "Overview", "Trickplay"],
});
if (res.data.TotalRecordCount === 0)
@@ -97,6 +98,10 @@ export const SeasonPicker: React.FC = ({ item, initialSeasonIndex }) => {
return res.data.Items;
},
+ select: (data) =>
+ [...(data || [])].sort(
+ (a, b) => (a.IndexNumber ?? 0) - (b.IndexNumber ?? 0),
+ ),
enabled: !!api && !!user?.Id && !!item.Id && !!selectedSeasonId,
});
diff --git a/components/settings/DownloadSettings.tsx b/components/settings/DownloadSettings.tsx
index ca0c655b..0cbbc89d 100644
--- a/components/settings/DownloadSettings.tsx
+++ b/components/settings/DownloadSettings.tsx
@@ -1,32 +1,20 @@
import { Stepper } from "@/components/inputs/Stepper";
-import { useDownload } from "@/providers/DownloadProvider";
import {
- DownloadMethod,
type Settings,
useSettings,
} from "@/utils/atoms/settings";
-import { Ionicons } from "@expo/vector-icons";
-import { useQueryClient } from "@tanstack/react-query";
-import { useRouter } from "expo-router";
import React, { useMemo } from "react";
-import { Platform, Switch, TouchableOpacity } from "react-native";
-const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
import DisabledSetting from "@/components/settings/DisabledSetting";
import { useTranslation } from "react-i18next";
-import { Text } from "../common/Text";
import { ListGroup } from "../list/ListGroup";
import { ListItem } from "../list/ListItem";
export default function DownloadSettings({ ...props }) {
const [settings, updateSettings, pluginSettings] = useSettings();
- const { setProcesses } = useDownload();
- const router = useRouter();
- const queryClient = useQueryClient();
const { t } = useTranslation();
const allDisabled = useMemo(
() =>
- pluginSettings?.downloadMethod?.locked === true &&
pluginSettings?.remuxConcurrentLimit?.locked === true &&
pluginSettings?.autoDownload.locked === true,
[pluginSettings],
@@ -37,69 +25,10 @@ export default function DownloadSettings({ ...props }) {
return (
-
-
-
-
-
- {settings.downloadMethod === DownloadMethod.Remux
- ? t("home.settings.downloads.default")
- : t("home.settings.downloads.optimized")}
-
-
-
-
-
-
- {t("home.settings.downloads.download_method")}
-
- {
- updateSettings({ downloadMethod: DownloadMethod.Remux });
- setProcesses([]);
- }}
- >
-
- {t("home.settings.downloads.default")}
-
-
- {
- updateSettings({ downloadMethod: DownloadMethod.Optimized });
- setProcesses([]);
- queryClient.invalidateQueries({ queryKey: ["search"] });
- }}
- >
-
- {t("home.settings.downloads.optimized")}
-
-
-
-
-
-
-
-
- updateSettings({ autoDownload: value })}
- />
-
-
- router.push("/settings/optimized-server/page")}
- showArrow
- title={t("home.settings.downloads.optimized_versions_server")}
- />
);
diff --git a/components/settings/HomeIndex.tsx b/components/settings/HomeIndex.tsx
index 4915c3b9..6efedd0c 100644
--- a/components/settings/HomeIndex.tsx
+++ b/components/settings/HomeIndex.tsx
@@ -1,15 +1,3 @@
-import { Button } from "@/components/Button";
-import { Loader } from "@/components/Loader";
-import { Text } from "@/components/common/Text";
-import { LargeMovieCarousel } from "@/components/home/LargeMovieCarousel";
-import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
-import { MediaListSection } from "@/components/medialists/MediaListSection";
-import { Colors } from "@/constants/Colors";
-import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import { useDownload } from "@/providers/DownloadProvider";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { eventBus } from "@/utils/eventBus";
import { Feather, Ionicons } from "@expo/vector-icons";
import type { Api } from "@jellyfin/sdk";
import type {
@@ -25,12 +13,7 @@ import {
} from "@jellyfin/sdk/lib/utils/api";
import NetInfo from "@react-native-community/netinfo";
import { type QueryFunction, useQuery } from "@tanstack/react-query";
-import {
- useNavigation,
- usePathname,
- useRouter,
- useSegments,
-} from "expo-router";
+import { useNavigation, useRouter, useSegments } from "expo-router";
import { useAtomValue } from "jotai";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -43,6 +26,18 @@ import {
View,
} from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Button } from "@/components/Button";
+import { Text } from "@/components/common/Text";
+import { LargeMovieCarousel } from "@/components/home/LargeMovieCarousel";
+import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
+import { Loader } from "@/components/Loader";
+import { MediaListSection } from "@/components/medialists/MediaListSection";
+import { Colors } from "@/constants/Colors";
+import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
+import { useDownload } from "@/providers/DownloadProvider";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { eventBus } from "@/utils/eventBus";
type ScrollingCollectionListSection = {
type: "ScrollingCollectionList";
@@ -71,9 +66,9 @@ export const HomeIndex = () => {
const [loading, setLoading] = useState(false);
const [
settings,
- updateSettings,
- pluginSettings,
- setPluginSettings,
+ _updateSettings,
+ _pluginSettings,
+ _setPluginSettings,
refreshStreamyfinPluginSettings,
] = useSettings();
@@ -87,6 +82,17 @@ export const HomeIndex = () => {
const scrollViewRef = useRef(null);
const { downloadedFiles, cleanCacheDirectory } = useDownload();
+ const prevIsConnected = useRef(false);
+ const invalidateCache = useInvalidatePlaybackProgressCache();
+ useEffect(() => {
+ // Only invalidate cache when transitioning from offline to online
+ if (isConnected && !prevIsConnected.current) {
+ invalidateCache();
+ }
+ // Update the ref to the current state for the next render
+ prevIsConnected.current = isConnected;
+ }, [isConnected, invalidateCache]);
+
useEffect(() => {
if (Platform.isTV) {
navigation.setOptions({
@@ -114,7 +120,7 @@ export const HomeIndex = () => {
}, [downloadedFiles, navigation, router]);
useEffect(() => {
- cleanCacheDirectory().catch((e) =>
+ cleanCacheDirectory().catch((_e) =>
console.error("Something went wrong cleaning cache directory"),
);
}, []);
@@ -149,10 +155,6 @@ export const HomeIndex = () => {
setIsConnected(state.isConnected);
});
- // cleanCacheDirectory().catch((e) =>
- // console.error("Something went wrong cleaning cache directory")
- // );
-
return () => {
unsubscribe();
};
@@ -193,8 +195,6 @@ export const HomeIndex = () => {
);
}, [userViews]);
- const invalidateCache = useInvalidatePlaybackProgressCache();
-
const refetch = async () => {
setLoading(true);
await refreshStreamyfinPluginSettings();
@@ -213,209 +213,187 @@ export const HomeIndex = () => {
queryKey,
queryFn: async () => {
if (!api) return [];
-
- const response = await getItemsApi(api).getItems({
- userId: user?.Id,
- limit: 40,
- recursive: true,
- includeItemTypes,
- sortBy: ["DateCreated"],
- sortOrder: ["Descending"],
- fields: ["PrimaryImageAspectRatio", "Path"],
- parentId,
- enableImageTypes: ["Primary", "Backdrop", "Thumb"],
- });
-
- let items = response.data.Items || [];
-
- if (includeItemTypes.includes("Episode")) {
- // Removes individual episodes from the list if they are part of a series
- // and only keeps the series item
- // Note: The 'Latest' API endpoint does not work well with combining batch episode imports
- // and will either only show the series or the episodes, not both.
- // This is a workaround to filter out the episodes from the list
- const seriesIds = new Set(
- items.filter((i) => i.Type === "Series").map((i) => i.Id),
- );
-
- items = items.filter(
- (i) =>
- i.Type === "Series" ||
- (i.Type === "Episode" && !seriesIds.has(i.SeriesId!)),
- );
- }
-
- if (items.length > 20) {
- items = items.slice(0, 20);
- }
-
- return items;
+ return (
+ (
+ await getUserLibraryApi(api).getLatestMedia({
+ userId: user?.Id,
+ limit: 20,
+ fields: ["PrimaryImageAspectRatio", "Path"],
+ imageTypeLimit: 1,
+ enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+ includeItemTypes,
+ parentId,
+ })
+ ).data || []
+ );
},
type: "ScrollingCollectionList",
}),
[api, user?.Id],
);
- let sections: Section[] = [];
- if (!settings?.home || !settings?.home?.sections) {
- sections = useMemo(() => {
- if (!api || !user?.Id) return [];
+ const defaultSections = useMemo(() => {
+ if (!api || !user?.Id) return [];
- const latestMediaViews = collections.map((c) => {
- const includeItemTypes: BaseItemKind[] =
- c.CollectionType === "tvshows" ? ["Episode", "Series"] : ["Movie"];
- const title = t("home.recently_added_in", { libraryName: c.Name });
- const queryKey = [
- "home",
- `recentlyAddedIn${c.CollectionType}`,
- user?.Id!,
- c.Id!,
- ];
- return createCollectionConfig(
- title || "",
- queryKey,
- includeItemTypes,
- c.Id,
- );
- });
-
- const ss: Section[] = [
- {
- title: t("home.continue_watching"),
- queryKey: ["home", "resumeItems"],
- queryFn: async () =>
- (
- await getItemsApi(api).getResumeItems({
- userId: user.Id,
- enableImageTypes: ["Primary", "Backdrop", "Thumb"],
- includeItemTypes: ["Movie", "Series", "Episode"],
- })
- ).data.Items || [],
- type: "ScrollingCollectionList",
- orientation: "horizontal",
- },
- {
- title: t("home.next_up"),
- queryKey: ["home", "nextUp-all"],
- queryFn: async () =>
- (
- await getTvShowsApi(api).getNextUp({
- userId: user?.Id,
- fields: ["MediaSourceCount"],
- limit: 20,
- enableImageTypes: ["Primary", "Backdrop", "Thumb"],
- enableResumable: false,
- })
- ).data.Items || [],
- type: "ScrollingCollectionList",
- orientation: "horizontal",
- },
- ...latestMediaViews,
- // ...(mediaListCollections?.map(
- // (ml) =>
- // ({
- // title: ml.Name,
- // queryKey: ["home", "mediaList", ml.Id!],
- // queryFn: async () => ml,
- // type: "MediaListSection",
- // orientation: "vertical",
- // } as Section)
- // ) || []),
- {
- title: t("home.suggested_movies"),
- queryKey: ["home", "suggestedMovies", user?.Id],
- queryFn: async () =>
- (
- await getSuggestionsApi(api).getSuggestions({
- userId: user?.Id,
- limit: 10,
- mediaType: ["Video"],
- type: ["Movie"],
- })
- ).data.Items || [],
- type: "ScrollingCollectionList",
- orientation: "vertical",
- },
- {
- title: t("home.suggested_episodes"),
- queryKey: ["home", "suggestedEpisodes", user?.Id],
- queryFn: async () => {
- try {
- const suggestions = await getSuggestions(api, user.Id);
- const nextUpPromises = suggestions.map((series) =>
- getNextUp(api, user.Id, series.Id),
- );
- const nextUpResults = await Promise.all(nextUpPromises);
-
- return nextUpResults.filter((item) => item !== null) || [];
- } catch (error) {
- console.error("Error fetching data:", error);
- return [];
- }
- },
- type: "ScrollingCollectionList",
- orientation: "horizontal",
- },
+ const latestMediaViews = collections.map((c) => {
+ const includeItemTypes: BaseItemKind[] =
+ c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
+ const title = t("home.recently_added_in", { libraryName: c.Name });
+ const queryKey = [
+ "home",
+ `recentlyAddedIn${c.CollectionType}`,
+ user?.Id!,
+ c.Id!,
];
- return ss;
- }, [api, user?.Id, collections]);
- } else {
- sections = useMemo(() => {
- if (!api || !user?.Id) return [];
- const ss: Section[] = [];
+ return createCollectionConfig(
+ title || "",
+ queryKey,
+ includeItemTypes,
+ c.Id,
+ );
+ });
- for (const key in settings.home?.sections) {
- // @ts-expect-error
- const section = settings.home?.sections[key];
- const id = section.title || key;
- ss.push({
- title: id,
- queryKey: ["home", id],
- queryFn: async () => {
- if (section.items) {
- const response = await getItemsApi(api).getItems({
- userId: user?.Id,
- limit: section.items?.limit || 25,
- recursive: true,
- includeItemTypes: section.items?.includeItemTypes,
- sortBy: section.items?.sortBy,
- sortOrder: section.items?.sortOrder,
- filters: section.items?.filters,
- parentId: section.items?.parentId,
- });
- return response.data.Items || [];
- }
- if (section.nextUp) {
- const response = await getTvShowsApi(api).getNextUp({
- userId: user?.Id,
- fields: ["MediaSourceCount"],
- limit: section.nextUp?.limit || 25,
- enableImageTypes: ["Primary", "Backdrop", "Thumb"],
- enableResumable: section.nextUp?.enableResumable,
- enableRewatching: section.nextUp?.enableRewatching,
- });
- return response.data.Items || [];
- }
+ const ss: Section[] = [
+ {
+ title: t("home.continue_watching"),
+ queryKey: ["home", "resumeItems"],
+ queryFn: async () =>
+ (
+ await getItemsApi(api).getResumeItems({
+ userId: user.Id,
+ enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+ includeItemTypes: ["Movie", "Series", "Episode"],
+ })
+ ).data.Items || [],
+ type: "ScrollingCollectionList",
+ orientation: "horizontal",
+ },
+ {
+ title: t("home.next_up"),
+ queryKey: ["home", "nextUp-all"],
+ queryFn: async () =>
+ (
+ await getTvShowsApi(api).getNextUp({
+ userId: user?.Id,
+ fields: ["MediaSourceCount"],
+ limit: 20,
+ enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+ enableResumable: false,
+ })
+ ).data.Items || [],
+ type: "ScrollingCollectionList",
+ orientation: "horizontal",
+ },
+ ...latestMediaViews,
+ // ...(mediaListCollections?.map(
+ // (ml) =>
+ // ({
+ // title: ml.Name,
+ // queryKey: ["home", "mediaList", ml.Id!],
+ // queryFn: async () => ml,
+ // type: "MediaListSection",
+ // orientation: "vertical",
+ // } as Section)
+ // ) || []),
+ {
+ title: t("home.suggested_movies"),
+ queryKey: ["home", "suggestedMovies", user?.Id],
+ queryFn: async () =>
+ (
+ await getSuggestionsApi(api).getSuggestions({
+ userId: user?.Id,
+ limit: 10,
+ mediaType: ["Video"],
+ type: ["Movie"],
+ })
+ ).data.Items || [],
+ type: "ScrollingCollectionList",
+ orientation: "vertical",
+ },
+ {
+ title: t("home.suggested_episodes"),
+ queryKey: ["home", "suggestedEpisodes", user?.Id],
+ queryFn: async () => {
+ try {
+ const suggestions = await getSuggestions(api, user.Id);
+ const nextUpPromises = suggestions.map((series) =>
+ getNextUp(api, user.Id, series.Id),
+ );
+ const nextUpResults = await Promise.all(nextUpPromises);
- if (section.latest) {
- const response = await getUserLibraryApi(api).getLatestMedia({
- userId: user?.Id,
- includeItemTypes: section.latest?.includeItemTypes,
- limit: section.latest?.limit || 25,
- isPlayed: section.latest?.isPlayed,
- groupItems: section.latest?.groupItems,
- });
- return response.data || [];
- }
+ return nextUpResults.filter((item) => item !== null) || [];
+ } catch (error) {
+ console.error("Error fetching data:", error);
return [];
- },
- type: "ScrollingCollectionList",
- orientation: section?.orientation || "vertical",
- });
- }
- return ss;
- }, [api, user?.Id, settings.home?.sections]);
- }
+ }
+ },
+ type: "ScrollingCollectionList",
+ orientation: "horizontal",
+ },
+ ];
+ return ss;
+ }, [api, user?.Id, collections, createCollectionConfig, t]);
+
+ const customSections = useMemo(() => {
+ if (!api || !user?.Id) return [];
+ const ss: Section[] = [];
+
+ for (const key in settings.home?.sections) {
+ // @ts-expect-error
+ const section = settings.home?.sections[key];
+ const id = section.title || key;
+ ss.push({
+ title: id,
+ queryKey: ["home", id],
+ queryFn: async () => {
+ if (section.items) {
+ const response = await getItemsApi(api).getItems({
+ userId: user?.Id,
+ limit: section.items?.limit || 25,
+ recursive: true,
+ includeItemTypes: section.items?.includeItemTypes,
+ sortBy: section.items?.sortBy,
+ sortOrder: section.items?.sortOrder,
+ filters: section.items?.filters,
+ parentId: section.items?.parentId,
+ });
+ return response.data.Items || [];
+ }
+ if (section.nextUp) {
+ const response = await getTvShowsApi(api).getNextUp({
+ userId: user?.Id,
+ fields: ["MediaSourceCount"],
+ limit: section.items?.limit || 25,
+ enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+ enableResumable: section.items?.enableResumable,
+ enableRewatching: section.items?.enableRewatching,
+ });
+ return response.data.Items || [];
+ }
+
+ if (section.latest) {
+ const response = await getUserLibraryApi(api).getLatestMedia({
+ userId: user?.Id,
+ includeItemTypes: section.latest?.includeItemTypes,
+ limit: section.latest?.limit || 25,
+ isPlayed: section.latest?.isPlayed,
+ groupItems: section.latest?.groupItems,
+ });
+ return response.data || [];
+ }
+ return [];
+ },
+ type: "ScrollingCollectionList",
+ orientation: section?.orientation || "vertical",
+ });
+ }
+ return ss;
+ }, [api, user?.Id, settings.home?.sections]);
+
+ const sections: Section[] =
+ !settings?.home || !settings?.home?.sections
+ ? defaultSections
+ : customSections;
if (isConnected === false) {
return (
diff --git a/components/settings/OptimizedServerForm.tsx b/components/settings/OptimizedServerForm.tsx
deleted file mode 100644
index f4f75791..00000000
--- a/components/settings/OptimizedServerForm.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { Linking, TextInput, View } from "react-native";
-import { Text } from "../common/Text";
-
-interface Props {
- value: string;
- onChangeValue: (value: string) => void;
-}
-
-export const OptimizedServerForm: React.FC = ({
- value,
- onChangeValue,
-}) => {
- const handleOpenLink = () => {
- Linking.openURL("https://github.com/streamyfin/optimized-versions-server");
- };
-
- const { t } = useTranslation();
-
- return (
-
-
-
- {t("home.settings.downloads.url")}
- onChangeValue(text)}
- />
-
-
-
- {t("home.settings.downloads.optimized_version_hint")}{" "}
-
- {t("home.settings.downloads.read_more_about_optimized_server")}
-
-
-
- );
-};
diff --git a/components/settings/StorageSettings.tsx b/components/settings/StorageSettings.tsx
index a62c2316..13b906ea 100644
--- a/components/settings/StorageSettings.tsx
+++ b/components/settings/StorageSettings.tsx
@@ -1,12 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import { toast } from "sonner-native";
import { Text } from "@/components/common/Text";
import { Colors } from "@/constants/Colors";
import { useHaptic } from "@/hooks/useHaptic";
import { useDownload } from "@/providers/DownloadProvider";
-import { useQuery } from "@tanstack/react-query";
-import * as FileSystem from "expo-file-system";
-import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-import { toast } from "sonner-native";
import { ListGroup } from "../list/ListGroup";
import { ListItem } from "../list/ListItem";
@@ -17,22 +16,15 @@ export const StorageSettings = () => {
const errorHapticFeedback = useHaptic("error");
const { data: size, isLoading: appSizeLoading } = useQuery({
- queryKey: ["appSize", appSizeUsage],
- queryFn: async () => {
- const app = await appSizeUsage;
-
- const remaining = await FileSystem.getFreeDiskStorageAsync();
- const total = await FileSystem.getTotalDiskCapacityAsync();
-
- return { app, remaining, total, used: (total - remaining) / total };
- },
+ queryKey: ["appSize"],
+ queryFn: appSizeUsage,
});
const onDeleteClicked = async () => {
try {
await deleteAllFiles();
successHapticFeedback();
- } catch (e) {
+ } catch (_e) {
errorHapticFeedback();
toast.error(t("home.settings.toasts.error_deleting_files"));
}
@@ -67,10 +59,7 @@ export const StorageSettings = () => {
/>
diff --git a/components/video-player/controls/Controls.tsx b/components/video-player/controls/Controls.tsx
index e02c3975..54248f85 100644
--- a/components/video-player/controls/Controls.tsx
+++ b/components/video-player/controls/Controls.tsx
@@ -1,25 +1,3 @@
-import { Loader } from "@/components/Loader";
-import { Text } from "@/components/common/Text";
-import ContinueWatchingOverlay from "@/components/video-player/controls/ContinueWatchingOverlay";
-import { useAdjacentItems } from "@/hooks/useAdjacentEpisodes";
-import { useCreditSkipper } from "@/hooks/useCreditSkipper";
-import { useHaptic } from "@/hooks/useHaptic";
-import { useIntroSkipper } from "@/hooks/useIntroSkipper";
-import { useTrickplay } from "@/hooks/useTrickplay";
-import type { TrackInfo, VlcPlayerViewRef } from "@/modules/VlcPlayer.types";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { VideoPlayer, useSettings } from "@/utils/atoms/settings";
-import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
-import { getItemById } from "@/utils/jellyfin/user-library/getItemById";
-import { writeToLog } from "@/utils/log";
-import {
- formatTimeString,
- msToTicks,
- secondsToMs,
- ticksToMs,
- ticksToSeconds,
-} from "@/utils/time";
import { Ionicons, MaterialIcons } from "@expo/vector-icons";
import type {
BaseItemDto,
@@ -29,7 +7,7 @@ import { Image } from "expo-image";
import { useLocalSearchParams, useRouter } from "expo-router";
import { useAtom } from "jotai";
import { debounce } from "lodash";
-import React, {
+import {
type Dispatch,
type FC,
type MutableRefObject,
@@ -42,27 +20,48 @@ import React, {
import {
Platform,
TouchableOpacity,
- View,
useWindowDimensions,
+ View,
} from "react-native";
import { Slider } from "react-native-awesome-slider";
import {
- type SharedValue,
runOnJS,
+ type SharedValue,
useAnimatedReaction,
useSharedValue,
} from "react-native-reanimated";
import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
+import ContinueWatchingOverlay from "@/components/video-player/controls/ContinueWatchingOverlay";
+import { useAdjacentItems } from "@/hooks/useAdjacentEpisodes";
+import { useCreditSkipper } from "@/hooks/useCreditSkipper";
+import { useHaptic } from "@/hooks/useHaptic";
+import { useIntroSkipper } from "@/hooks/useIntroSkipper";
+import { useTrickplay } from "@/hooks/useTrickplay";
+import type { TrackInfo, VlcPlayerViewRef } from "@/modules/VlcPlayer.types";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
+import { getItemById } from "@/utils/jellyfin/user-library/getItemById";
+import { writeToLog } from "@/utils/log";
+import {
+ formatTimeString,
+ msToTicks,
+ secondsToMs,
+ ticksToMs,
+ ticksToSeconds,
+} from "@/utils/time";
import AudioSlider from "./AudioSlider";
import BrightnessSlider from "./BrightnessSlider";
-import { EpisodeList } from "./EpisodeList";
-import NextEpisodeCountDownButton from "./NextEpisodeCountDownButton";
-import SkipButton from "./SkipButton";
-import { VideoTouchOverlay } from "./VideoTouchOverlay";
import { ControlProvider } from "./contexts/ControlContext";
import { VideoProvider } from "./contexts/VideoContext";
import DropdownView from "./dropdown/DropdownView";
+import { EpisodeList } from "./EpisodeList";
+import NextEpisodeCountDownButton from "./NextEpisodeCountDownButton";
+import SkipButton from "./SkipButton";
import { useControlsTimeout } from "./useControlsTimeout";
+import { VideoTouchOverlay } from "./VideoTouchOverlay";
interface Props {
item: BaseItemDto;
@@ -119,7 +118,6 @@ export const Controls: FC = ({
setSubtitleTrack,
setAudioTrack,
offline = false,
- enableTrickplay = true,
isVlc = false,
}) => {
const [settings, updateSettings] = useSettings();
@@ -134,13 +132,16 @@ export const Controls: FC = ({
const [showAudioSlider, setShowAudioSlider] = useState(false);
const { height: screenHeight, width: screenWidth } = useWindowDimensions();
- const { previousItem, nextItem } = useAdjacentItems({ item });
+ const { previousItem, nextItem } = useAdjacentItems({
+ item,
+ isOffline: offline,
+ });
const {
trickPlayUrl,
calculateTrickplayUrl,
trickplayInfo,
prefetchAllTrickplayImages,
- } = useTrickplay(item, !offline && enableTrickplay);
+ } = useTrickplay(item);
const [currentTime, setCurrentTime] = useState(0);
const [remainingTime, setRemainingTime] = useState(Number.POSITIVE_INFINITY);
@@ -175,19 +176,21 @@ export const Controls: FC = ({
}>();
const { showSkipButton, skipIntro } = useIntroSkipper(
- offline ? undefined : item.Id,
+ item?.Id!,
currentTime,
seek,
play,
isVlc,
+ offline,
);
const { showSkipCreditButton, skipCredit } = useCreditSkipper(
- offline ? undefined : item.Id,
+ item?.Id!,
currentTime,
seek,
play,
isVlc,
+ offline,
);
const goToItemCommon = useCallback(
@@ -195,9 +198,7 @@ export const Controls: FC = ({
if (!item || !settings) {
return;
}
-
lightHapticFeedback();
-
const previousIndexes = {
subtitleIndex: subtitleIndex
? Number.parseInt(subtitleIndex)
@@ -215,15 +216,18 @@ export const Controls: FC = ({
previousIndexes,
mediaSource ?? undefined,
);
-
const queryParams = new URLSearchParams({
itemId: item.Id ?? "",
audioIndex: defaultAudioIndex?.toString() ?? "",
subtitleIndex: defaultSubtitleIndex?.toString() ?? "",
mediaSourceId: newMediaSource?.Id ?? "",
bitrateValue: bitrateValue?.toString(),
+ playbackPosition:
+ item.UserData?.PlaybackPositionTicks?.toString() ?? "",
}).toString();
+ console.log("queryParams", queryParams);
+
// @ts-expect-error
router.replace(`player/direct-player?${queryParams}`);
},
@@ -241,7 +245,10 @@ export const Controls: FC = ({
({
isAutoPlay,
resetWatchCount,
- }: { isAutoPlay?: boolean; resetWatchCount?: boolean }) => {
+ }: {
+ isAutoPlay?: boolean;
+ resetWatchCount?: boolean;
+ }) => {
if (!nextItem) {
return;
}
@@ -303,10 +310,18 @@ export const Controls: FC = ({
const goToItem = useCallback(
async (itemId: string) => {
- const gotoItem = await getItemById(api, itemId);
- if (!gotoItem) {
+ if (offline) {
+ const queryParams = new URLSearchParams({
+ itemId: itemId,
+ playbackPosition:
+ item.UserData?.PlaybackPositionTicks?.toString() ?? "",
+ }).toString();
+ // @ts-expect-error
+ router.replace(`player/direct-player?${queryParams}`);
return;
}
+ const gotoItem = await getItemById(api, itemId);
+ if (!gotoItem) return;
goToItemCommon(gotoItem);
},
[goToItemCommon, api],
@@ -522,9 +537,6 @@ export const Controls: FC = ({
const onClose = async () => {
lightHapticFeedback();
- await ScreenOrientation.lockAsync(
- ScreenOrientation.OrientationLock.PORTRAIT_UP,
- );
router.back();
};
@@ -563,8 +575,8 @@ export const Controls: FC = ({
pointerEvents={showControls ? "auto" : "none"}
className={"flex flex-row w-full pt-2"}
>
- {!Platform.isTV && (
-
+
+ {!Platform.isTV && (!offline || !mediaSource?.TranscodingUrl) && (
= ({
>
-
- )}
+ )}
+
- {!Platform.isTV &&
- settings.defaultPlayer === VideoPlayer.VLC_4 && (
-
-
-
- )}
+ {false && (
+
+
+
+ )}
- {item?.Type === "Episode" && !offline && (
+ {item?.Type === "Episode" && (
{
switchOnEpisodeMode();
@@ -632,16 +643,14 @@ export const Controls: FC = ({
color='white'
/>
- {/* )} */}
-
({});
export const EpisodeList: React.FC = ({ item, close, goToItem }) => {
const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom);
- const insets = useSafeAreaInsets(); // Get safe area insets
const [seasonIndexState, setSeasonIndexState] = useAtom(seasonIndexAtom);
const scrollViewRef = useRef(null); // Reference to the HorizontalScroll
const scrollToIndex = (index: number) => {
scrollViewRef.current?.scrollToIndex(index, 100);
};
+ const { offline } = useGlobalSearchParams<{
+ offline: string;
+ }>();
+ const isOffline = offline === "true";
// Set the initial season index
useEffect(() => {
@@ -50,23 +57,35 @@ export const EpisodeList: React.FC = ({ item, close, goToItem }) => {
}
}, []);
- const seasonIndex = seasonIndexState[item.SeriesId ?? ""];
- const [seriesItem, setSeriesItem] = useState(null);
+ const { downloadedFiles } = useDownload();
- // This effect fetches the series item data/
- useEffect(() => {
- if (item.SeriesId) {
- getUserItemData({ api, userId: user?.Id, itemId: item.SeriesId }).then(
- (res) => {
- setSeriesItem(res);
- },
- );
- }
- }, [item.SeriesId]);
+ const seasonIndex = seasonIndexState[item.SeriesId ?? ""];
+ const { data: seriesItem } = useItemQuery(item.SeriesId!, isOffline);
const { data: seasons } = useQuery({
queryKey: ["seasons", item.SeriesId],
queryFn: async () => {
+ if (isOffline) {
+ if (!item.SeriesId) return [];
+ const seriesEpisodes = downloadedFiles?.filter(
+ (f: DownloadedItem) => f.item.SeriesId === item.SeriesId,
+ );
+ const seasonNumbers = [
+ ...new Set(
+ seriesEpisodes
+ ?.map((f: DownloadedItem) => f.item.ParentIndexNumber)
+ .filter(Boolean),
+ ),
+ ];
+ // Create fake season objects
+ return seasonNumbers.map((seasonNumber) => ({
+ Id: seasonNumber,
+ IndexNumber: seasonNumber,
+ Name: `Season ${seasonNumber}`,
+ SeriesId: item.SeriesId,
+ }));
+ }
+
if (!api || !user?.Id || !item.SeriesId) return [];
const response = await api.axiosInstance.get(
`${api.basePath}/Shows/${item.SeriesId}/Seasons`,
@@ -93,9 +112,19 @@ export const EpisodeList: React.FC = ({ item, close, goToItem }) => {
[seasons, seasonIndex],
);
- const { data: episodes, isFetching } = useQuery({
+ const { data: episodes } = useQuery({
queryKey: ["episodes", item.SeriesId, selectedSeasonId],
queryFn: async () => {
+ if (isOffline) {
+ if (!item.SeriesId) return [];
+ return downloadedFiles
+ ?.filter(
+ (f: DownloadedItem) =>
+ f.item.SeriesId === item.SeriesId &&
+ f.item.ParentIndexNumber === seasonIndex,
+ )
+ .map((f: DownloadedItem) => f.item);
+ }
if (!api || !user?.Id || !item.Id || !selectedSeasonId) return [];
const res = await getTvShowsApi(api).getEpisodes({
seriesId: item.SeriesId || "",
@@ -112,7 +141,7 @@ export const EpisodeList: React.FC = ({ item, close, goToItem }) => {
useEffect(() => {
if (item?.Type === "Episode" && item.Id) {
- const index = episodes?.findIndex((ep) => ep.Id === item.Id);
+ const index = episodes?.findIndex((ep: BaseItemDto) => ep.Id === item.Id);
if (index !== undefined && index !== -1) {
setTimeout(() => {
scrollToIndex(index);
@@ -155,7 +184,7 @@ export const EpisodeList: React.FC = ({ item, close, goToItem }) => {
}
return (
- = ({ item, close, goToItem }) => {
width: "100%",
}}
>
- <>
-
- {seriesItem && (
- {
- setSeasonIndexState((prev) => ({
- ...prev,
- [item.SeriesId ?? ""]: season.IndexNumber,
- }));
- }}
- />
- )}
- {
- close();
+
+ {seriesItem && (
+ {
+ setSeasonIndexState((prev) => ({
+ ...prev,
+ [item.SeriesId ?? ""]: season.IndexNumber,
+ }));
}}
- className='aspect-square flex flex-col bg-neutral-800/90 rounded-xl items-center justify-center p-2'
- >
-
-
-
+ />
+ )}
+
+
+
+
- (
- (
+
+ {
+ goToItem(_item.Id);
+ }}
>
- {
- goToItem(_item.Id);
+
+
+
+
-
-
-
-
- {_item.Name}
-
-
- {`S${_item.ParentIndexNumber?.toString()}:E${_item.IndexNumber?.toString()}`}
-
-
- {runtimeTicksToSeconds(_item.RunTimeTicks)}
-
-
-
-
-
-
- {_item.Overview}
+ {_item.Name}
+
+
+ {`S${_item.ParentIndexNumber?.toString()}:E${_item.IndexNumber?.toString()}`}
+
+
+ {runtimeTicksToSeconds(_item.RunTimeTicks)}
- )}
- keyExtractor={(e: BaseItemDto) => e.Id ?? ""}
- estimatedItemSize={200}
- showsHorizontalScrollIndicator={false}
- />
-
-
+
+ {_item.Overview}
+
+
+ )}
+ keyExtractor={(e: BaseItemDto) => e.Id ?? ""}
+ estimatedItemSize={200}
+ showsHorizontalScrollIndicator={false}
+ />
+
);
};
diff --git a/components/video-player/controls/contexts/VideoContext.tsx b/components/video-player/controls/contexts/VideoContext.tsx
index a7417c79..ae194669 100644
--- a/components/video-player/controls/contexts/VideoContext.tsx
+++ b/components/video-player/controls/contexts/VideoContext.tsx
@@ -1,15 +1,16 @@
-import type { TrackInfo } from "@/modules/VlcPlayer.types";
-import { VideoPlayer, useSettings } from "@/utils/atoms/settings";
+import { SubtitleDeliveryMethod } from "@jellyfin/sdk/lib/generated-client";
import { router, useLocalSearchParams } from "expo-router";
import type React from "react";
import {
- type ReactNode,
createContext,
+ type ReactNode,
useContext,
useEffect,
useMemo,
useState,
} from "react";
+import type { TrackInfo } from "@/modules/VlcPlayer.types";
+import { useSettings } from "@/utils/atoms/settings";
import type { Track } from "../types";
import { useControlContext } from "./ControlContext";
@@ -48,7 +49,7 @@ export const VideoProvider: React.FC = ({
}) => {
const [audioTracks, setAudioTracks] = useState(null);
const [subtitleTracks, setSubtitleTracks] = useState(null);
- const [settings] = useSettings();
+ const [_settings] = useSettings();
const ControlContext = useControlContext();
const isVideoLoaded = ControlContext?.isVideoLoaded;
@@ -57,22 +58,27 @@ export const VideoProvider: React.FC = ({
const allSubs =
mediaSource?.MediaStreams?.filter((s) => s.Type === "Subtitle") || [];
- const { itemId, audioIndex, bitrateValue, subtitleIndex } =
+ const { itemId, audioIndex, bitrateValue, subtitleIndex, playbackPosition } =
useLocalSearchParams<{
itemId: string;
audioIndex: string;
subtitleIndex: string;
mediaSourceId: string;
bitrateValue: string;
+ playbackPosition: string;
}>();
- const onTextBasedSubtitle = useMemo(
- () =>
+ const onTextBasedSubtitle = useMemo(() => {
+ return (
allSubs.find(
- (s) => s.Index?.toString() === subtitleIndex && s.IsTextSubtitleStream,
- ) || subtitleIndex === "-1",
- [allSubs, subtitleIndex],
- );
+ (s) =>
+ s.Index?.toString() === subtitleIndex &&
+ (s.DeliveryMethod === SubtitleDeliveryMethod.Embed ||
+ s.DeliveryMethod === SubtitleDeliveryMethod.Hls ||
+ s.DeliveryMethod === SubtitleDeliveryMethod.External),
+ ) || subtitleIndex === "-1"
+ );
+ }, [allSubs, subtitleIndex]);
const setPlayerParams = ({
chosenAudioIndex = audioIndex,
@@ -88,6 +94,7 @@ export const VideoProvider: React.FC = ({
subtitleIndex: chosenSubtitleIndex,
mediaSourceId: mediaSource?.Id ?? "",
bitrateValue: bitrateValue,
+ playbackPosition: playbackPosition,
}).toString();
//@ts-ignore
@@ -126,30 +133,32 @@ export const VideoProvider: React.FC = ({
useEffect(() => {
const fetchTracks = async () => {
if (getSubtitleTracks) {
- const subtitleData = await getSubtitleTracks();
+ let subtitleData = await getSubtitleTracks();
+ // Only FOR VLC 3, If we're transcoding, we need to reverse the subtitle data, because VLC reverses the HLS subtitles.
+ if (
+ mediaSource?.TranscodingUrl &&
+ subtitleData &&
+ subtitleData.length > 1
+ ) {
+ subtitleData = [subtitleData[0], ...subtitleData.slice(1).reverse()];
+ }
- // Step 1: Move external subs to the end, because VLC puts external subs at the end
- const sortedSubs = allSubs.sort(
- (a, b) => Number(a.IsExternal) - Number(b.IsExternal),
- );
-
- // Step 2: Apply VLC indexing logic
- let textSubIndex = settings.defaultPlayer === VideoPlayer.VLC_4 ? 0 : 1;
- const processedSubs: Track[] = sortedSubs?.map((sub) => {
- // Always increment for non-transcoding subtitles
- // Only increment for text-based subtitles when transcoding
+ let embedSubIndex = 1;
+ const processedSubs: Track[] = allSubs?.map((sub) => {
+ /** A boolean value determining if we should increment the embedSubIndex, currently only Embed and Hls subtitles are automatically added into VLC Player */
const shouldIncrement =
- !mediaSource?.TranscodingUrl || sub.IsTextSubtitleStream;
- const vlcIndex = subtitleData?.at(textSubIndex)?.index ?? -1;
- const finalIndex = shouldIncrement ? vlcIndex : (sub.Index ?? -1);
-
- if (shouldIncrement) textSubIndex++;
+ sub.DeliveryMethod === SubtitleDeliveryMethod.Embed ||
+ sub.DeliveryMethod === SubtitleDeliveryMethod.Hls ||
+ sub.DeliveryMethod === SubtitleDeliveryMethod.External;
+ /** The index of subtitle inside VLC Player Itself */
+ const vlcIndex = subtitleData?.at(embedSubIndex)?.index ?? -1;
+ if (shouldIncrement) embedSubIndex++;
return {
name: sub.DisplayTitle || "Undefined Subtitle",
index: sub.Index ?? -1,
setTrack: () =>
shouldIncrement
- ? setTrackParams("subtitle", finalIndex, sub.Index ?? -1)
+ ? setTrackParams("subtitle", vlcIndex, sub.Index ?? -1)
: setPlayerParams({
chosenSubtitleIndex: sub.Index?.toString(),
}),
diff --git a/components/video-player/controls/dropdown/DropdownView.tsx b/components/video-player/controls/dropdown/DropdownView.tsx
index 3168e942..ac7501c7 100644
--- a/components/video-player/controls/dropdown/DropdownView.tsx
+++ b/components/video-player/controls/dropdown/DropdownView.tsx
@@ -1,9 +1,11 @@
import { Ionicons } from "@expo/vector-icons";
-import React, { useCallback } from "react";
+import { useCallback } from "react";
import { Platform, TouchableOpacity } from "react-native";
+
const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-import { BITRATES } from "@/components/BitrateSelector";
+
import { useLocalSearchParams, useRouter } from "expo-router";
+import { BITRATES } from "@/components/BitrateSelector";
import { useControlContext } from "../contexts/ControlContext";
import { useVideoContext } from "../contexts/VideoContext";
@@ -17,13 +19,18 @@ const DropdownView = () => {
];
const router = useRouter();
- const { subtitleIndex, audioIndex, bitrateValue } = useLocalSearchParams<{
- itemId: string;
- audioIndex: string;
- subtitleIndex: string;
- mediaSourceId: string;
- bitrateValue: string;
- }>();
+ const { subtitleIndex, audioIndex, bitrateValue, playbackPosition, offline } =
+ useLocalSearchParams<{
+ itemId: string;
+ audioIndex: string;
+ subtitleIndex: string;
+ mediaSourceId: string;
+ bitrateValue: string;
+ playbackPosition: string;
+ offline: string;
+ }>();
+
+ const isOffline = offline === "true";
const changeBitrate = useCallback(
(bitrate: string) => {
@@ -33,11 +40,12 @@ const DropdownView = () => {
subtitleIndex: subtitleIndex.toString() ?? "",
mediaSourceId: mediaSource?.Id ?? "",
bitrateValue: bitrate.toString(),
+ playbackPosition: playbackPosition,
}).toString();
// @ts-expect-error
router.replace(`player/direct-player?${queryParams}`);
},
- [item, mediaSource, subtitleIndex, audioIndex],
+ [item, mediaSource, subtitleIndex, audioIndex, playbackPosition],
);
return (
@@ -56,32 +64,34 @@ const DropdownView = () => {
collisionPadding={8}
sideOffset={8}
>
-
-
- Quality
-
-
- {BITRATES?.map((bitrate, idx: number) => (
-
- changeBitrate(bitrate.value?.toString() ?? "")
- }
- >
-
- {bitrate.key}
-
-
- ))}
-
-
+ {!isOffline && (
+
+
+ Quality
+
+
+ {BITRATES?.map((bitrate, idx: number) => (
+
+ changeBitrate(bitrate.value?.toString() ?? "")
+ }
+ >
+
+ {bitrate.key}
+
+
+ ))}
+
+
+ )}
Subtitle
diff --git a/eas.json b/eas.json
index f0d75187..a51b7f46 100644
--- a/eas.json
+++ b/eas.json
@@ -47,14 +47,14 @@
},
"production": {
"environment": "production",
- "channel": "0.28.0",
+ "channel": "0.28.1",
"android": {
"image": "latest"
}
},
"production-apk": {
"environment": "production",
- "channel": "0.28.0",
+ "channel": "0.28.1",
"android": {
"buildType": "apk",
"image": "latest"
@@ -62,7 +62,7 @@
},
"production-apk-tv": {
"environment": "production",
- "channel": "0.28.0",
+ "channel": "0.28.1",
"android": {
"buildType": "apk",
"image": "latest"
diff --git a/hooks/useAdjacentEpisodes.ts b/hooks/useAdjacentEpisodes.ts
index 4c5a6e2b..0bf3f8fa 100644
--- a/hooks/useAdjacentEpisodes.ts
+++ b/hooks/useAdjacentEpisodes.ts
@@ -1,21 +1,63 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import { getTvShowsApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query";
import { useAtomValue } from "jotai";
import { useMemo } from "react";
+import { useDownload } from "@/providers/DownloadProvider";
+import { apiAtom } from "@/providers/JellyfinProvider";
interface AdjacentEpisodesProps {
item?: BaseItemDto | null;
+ isOffline?: boolean;
}
-export const useAdjacentItems = ({ item }: AdjacentEpisodesProps) => {
+export const useAdjacentItems = ({
+ item,
+ isOffline = false,
+}: AdjacentEpisodesProps) => {
const api = useAtomValue(apiAtom);
+ const { downloadedFiles } = useDownload();
const { data: adjacentItems } = useQuery({
- queryKey: ["adjacentItems", item?.Id, item?.SeriesId],
+ queryKey: ["adjacentItems", item?.Id, item?.SeriesId, isOffline],
queryFn: async (): Promise => {
- if (!api || !item || !item.SeriesId) {
+ if (!item || !item.SeriesId) {
+ return null;
+ }
+
+ if (isOffline) {
+ if (!downloadedFiles) return null;
+ const seriesEpisodes = downloadedFiles
+ .filter((f) => f.item.SeriesId === item.SeriesId)
+ .map((f) => f.item);
+
+ seriesEpisodes.sort((a, b) => {
+ if (a.ParentIndexNumber !== b.ParentIndexNumber) {
+ return (a.ParentIndexNumber ?? 0) - (b.ParentIndexNumber ?? 0);
+ }
+ return (a.IndexNumber ?? 0) - (b.IndexNumber ?? 0);
+ });
+
+ const currentIndex = seriesEpisodes.findIndex(
+ (ep) => ep.Id === item.Id,
+ );
+
+ if (currentIndex === -1) {
+ return null;
+ }
+
+ const result: BaseItemDto[] = [];
+ if (currentIndex > 0) {
+ result.push(seriesEpisodes[currentIndex - 1]);
+ }
+ result.push(seriesEpisodes[currentIndex]);
+ if (currentIndex < seriesEpisodes.length - 1) {
+ result.push(seriesEpisodes[currentIndex + 1]);
+ }
+ return result;
+ }
+
+ if (!api) {
return null;
}
@@ -29,7 +71,7 @@ export const useAdjacentItems = ({ item }: AdjacentEpisodesProps) => {
return res.data.Items || null;
},
enabled:
- !!api &&
+ (isOffline || !!api) &&
!!item?.Id &&
!!item?.SeriesId &&
(item?.Type === "Episode" || item?.Type === "Audio"),
diff --git a/hooks/useCreditSkipper.ts b/hooks/useCreditSkipper.ts
index 0317f66b..ddbd2713 100644
--- a/hooks/useCreditSkipper.ts
+++ b/hooks/useCreditSkipper.ts
@@ -1,33 +1,16 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
-import { writeToLog } from "@/utils/log";
-import { msToSeconds, secondsToMs } from "@/utils/time";
-import { useQuery } from "@tanstack/react-query";
-import { useAtom } from "jotai";
import { useCallback, useEffect, useState } from "react";
+import { useSegments } from "@/utils/segments";
+import { msToSeconds, secondsToMs } from "@/utils/time";
import { useHaptic } from "./useHaptic";
-interface CreditTimestamps {
- Introduction: {
- Start: number;
- End: number;
- Valid: boolean;
- };
- Credits: {
- Start: number;
- End: number;
- Valid: boolean;
- };
-}
-
export const useCreditSkipper = (
- itemId: string | undefined,
+ itemId: string,
currentTime: number,
seek: (time: number) => void,
play: () => void,
isVlc = false,
+ isOffline = false,
) => {
- const [api] = useAtom(apiAtom);
const [showSkipCreditButton, setShowSkipCreditButton] = useState(false);
const lightHapticFeedback = useHaptic("light");
@@ -43,50 +26,28 @@ export const useCreditSkipper = (
seek(seconds);
};
- const { data: creditTimestamps } = useQuery({
- queryKey: ["creditTimestamps", itemId],
- queryFn: async () => {
- if (!itemId) {
- return null;
- }
-
- const res = await api?.axiosInstance.get(
- `${api.basePath}/Episode/${itemId}/Timestamps`,
- {
- headers: getAuthHeaders(api),
- },
- );
-
- if (res?.status !== 200) {
- return null;
- }
-
- return res?.data;
- },
- enabled: !!itemId,
- retry: false,
- });
+ const { data: segments } = useSegments(itemId, isOffline);
+ const creditTimestamps = segments?.creditSegments?.[0];
useEffect(() => {
if (creditTimestamps) {
setShowSkipCreditButton(
- currentTime > creditTimestamps.Credits.Start &&
- currentTime < creditTimestamps.Credits.End,
+ currentTime > creditTimestamps.startTime &&
+ currentTime < creditTimestamps.endTime,
);
}
}, [creditTimestamps, currentTime]);
const skipCredit = useCallback(() => {
if (!creditTimestamps) return;
- console.log(`Skipping credits to ${creditTimestamps.Credits.End}`);
try {
lightHapticFeedback();
- wrappedSeek(creditTimestamps.Credits.End);
+ wrappedSeek(creditTimestamps.endTime);
setTimeout(() => {
play();
}, 200);
} catch (error) {
- writeToLog("ERROR", "Error skipping intro", error);
+ console.error("Error skipping credit", error);
}
}, [creditTimestamps]);
diff --git a/hooks/useDefaultPlaySettings.ts b/hooks/useDefaultPlaySettings.ts
index 0991def0..c49aff1f 100644
--- a/hooks/useDefaultPlaySettings.ts
+++ b/hooks/useDefaultPlaySettings.ts
@@ -1,10 +1,7 @@
-import { BITRATES, Bitrate } from "@/components/BitrateSelector";
-import type { Settings } from "@/utils/atoms/settings";
-import {
- type BaseItemDto,
- MediaSourceInfo,
-} from "@jellyfin/sdk/lib/generated-client";
+import { type BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import { useMemo } from "react";
+import { BITRATES } from "@/components/BitrateSelector";
+import type { Settings } from "@/utils/atoms/settings";
// Used only for initial play settings.
const useDefaultPlaySettings = (
@@ -33,10 +30,10 @@ const useDefaultPlaySettings = (
return {
defaultAudioIndex:
- preferedAudioIndex || defaultAudioIndex || firstAudioIndex || undefined,
- defaultSubtitleIndex: mediaSource?.DefaultSubtitleStreamIndex || -1,
- defaultMediaSource: mediaSource || undefined,
- defaultBitrate: bitrate || undefined,
+ preferedAudioIndex ?? defaultAudioIndex ?? firstAudioIndex ?? undefined,
+ defaultSubtitleIndex: mediaSource?.DefaultSubtitleStreamIndex ?? -1,
+ defaultMediaSource: mediaSource ?? undefined,
+ defaultBitrate: bitrate ?? undefined,
};
}, [
item.MediaSources,
diff --git a/hooks/useDownloadedFileOpener.ts b/hooks/useDownloadedFileOpener.ts
index 398bf448..732ae36c 100644
--- a/hooks/useDownloadedFileOpener.ts
+++ b/hooks/useDownloadedFileOpener.ts
@@ -1,31 +1,8 @@
-import { usePlaySettings } from "@/providers/PlaySettingsProvider";
-import { writeToLog } from "@/utils/log";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import * as FileSystem from "expo-file-system";
import { useRouter } from "expo-router";
import { useCallback } from "react";
-
-export const getDownloadedFileUrl = async (itemId: string): Promise => {
- const directory = FileSystem.documentDirectory;
-
- if (!directory) {
- throw new Error("Document directory is not available");
- }
-
- if (!itemId) {
- throw new Error("Item ID is not available");
- }
-
- const files = await FileSystem.readDirectoryAsync(directory);
- const path = itemId!;
- const matchingFile = files.find((file) => file.startsWith(path));
-
- if (!matchingFile) {
- throw new Error(`No file found for item ${path}`);
- }
-
- return `${directory}${matchingFile}`;
-};
+import { usePlaySettings } from "@/providers/PlaySettingsProvider";
+import { writeToLog } from "@/utils/log";
export const useDownloadedFileOpener = () => {
const router = useRouter();
@@ -33,9 +10,19 @@ export const useDownloadedFileOpener = () => {
const openFile = useCallback(
async (item: BaseItemDto) => {
+ if (!item.Id) {
+ writeToLog("ERROR", "Attempted to open a file without an ID.");
+ console.error("Attempted to open a file without an ID.");
+ return;
+ }
+ const queryParams = new URLSearchParams({
+ itemId: item.Id,
+ offline: "true",
+ playbackPosition:
+ item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+ });
try {
- // @ts-expect-error
- router.push(`/player/direct-player?offline=true&itemId=${item.Id}`);
+ router.push(`/player/direct-player?${queryParams.toString()}`);
} catch (error) {
writeToLog("ERROR", "Error opening file", error);
console.error("Error opening file:", error);
diff --git a/hooks/useIntroSkipper.ts b/hooks/useIntroSkipper.ts
index ab38148c..b9275f51 100644
--- a/hooks/useIntroSkipper.ts
+++ b/hooks/useIntroSkipper.ts
@@ -1,34 +1,21 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
-import { writeToLog } from "@/utils/log";
-import { msToSeconds, secondsToMs } from "@/utils/time";
-import { useQuery } from "@tanstack/react-query";
-import { useAtom } from "jotai";
import { useCallback, useEffect, useState } from "react";
+import { useSegments } from "@/utils/segments";
+import { msToSeconds, secondsToMs } from "@/utils/time";
import { useHaptic } from "./useHaptic";
-interface IntroTimestamps {
- EpisodeId: string;
- HideSkipPromptAt: number;
- IntroEnd: number;
- IntroStart: number;
- ShowSkipPromptAt: number;
- Valid: boolean;
-}
-
/**
* Custom hook to handle skipping intros in a media player.
*
* @param {number} currentTime - The current playback time in seconds.
*/
export const useIntroSkipper = (
- itemId: string | undefined,
+ itemId: string,
currentTime: number,
seek: (ticks: number) => void,
play: () => void,
isVlc = false,
+ isOffline = false,
) => {
- const [api] = useAtom(apiAtom);
const [showSkipButton, setShowSkipButton] = useState(false);
if (isVlc) {
currentTime = msToSeconds(currentTime);
@@ -43,35 +30,14 @@ export const useIntroSkipper = (
seek(seconds);
};
- const { data: introTimestamps } = useQuery({
- queryKey: ["introTimestamps", itemId],
- queryFn: async () => {
- if (!itemId) {
- return null;
- }
-
- const res = await api?.axiosInstance.get(
- `${api.basePath}/Episode/${itemId}/IntroTimestamps`,
- {
- headers: getAuthHeaders(api),
- },
- );
-
- if (res?.status !== 200) {
- return null;
- }
-
- return res?.data;
- },
- enabled: !!itemId,
- retry: false,
- });
+ const { data: segments } = useSegments(itemId, isOffline);
+ const introTimestamps = segments?.introSegments?.[0];
useEffect(() => {
if (introTimestamps) {
setShowSkipButton(
- currentTime > introTimestamps.ShowSkipPromptAt &&
- currentTime < introTimestamps.HideSkipPromptAt,
+ currentTime > introTimestamps.startTime &&
+ currentTime < introTimestamps.endTime,
);
}
}, [introTimestamps, currentTime]);
@@ -80,12 +46,12 @@ export const useIntroSkipper = (
if (!introTimestamps) return;
try {
lightHapticFeedback();
- wrappedSeek(introTimestamps.IntroEnd);
+ wrappedSeek(introTimestamps.endTime);
setTimeout(() => {
play();
}, 200);
} catch (error) {
- writeToLog("ERROR", "Error skipping intro", error);
+ console.error("Error skipping intro", error);
}
}, [introTimestamps]);
diff --git a/hooks/useItemQuery.ts b/hooks/useItemQuery.ts
new file mode 100644
index 00000000..9448b9b5
--- /dev/null
+++ b/hooks/useItemQuery.ts
@@ -0,0 +1,30 @@
+import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { useAtom } from "jotai";
+import { useDownload } from "@/providers/DownloadProvider";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+
+export const useItemQuery = (itemId: string, isOffline: boolean) => {
+ const [api] = useAtom(apiAtom);
+ const [user] = useAtom(userAtom);
+ const { downloadedFiles } = useDownload();
+
+ return useQuery({
+ queryKey: ["item", itemId],
+ queryFn: async () => {
+ if (isOffline) {
+ const downloadedItem = downloadedFiles?.find((item) => item.item.Id === itemId);
+ if (downloadedItem) return downloadedItem.item;
+ return null;
+ }
+ if (!api || !user || !itemId) return null;
+ const res = await getUserLibraryApi(api).getItem({ itemId: itemId, userId: user?.Id });
+ return res.data;
+ },
+ staleTime: 0,
+ refetchOnMount: true,
+ refetchOnWindowFocus: true,
+ refetchOnReconnect: true,
+ networkMode: "always",
+ });
+};
diff --git a/hooks/useMarkAsPlayed.ts b/hooks/useMarkAsPlayed.ts
index 34d1d545..fc19c2dc 100644
--- a/hooks/useMarkAsPlayed.ts
+++ b/hooks/useMarkAsPlayed.ts
@@ -1,102 +1,39 @@
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { markAsNotPlayed } from "@/utils/jellyfin/playstate/markAsNotPlayed";
-import { markAsPlayed } from "@/utils/jellyfin/playstate/markAsPlayed";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useQueryClient } from "@tanstack/react-query";
-import { useAtom } from "jotai";
+import { QueryKey, useQueryClient } from "@tanstack/react-query";
import { useHaptic } from "./useHaptic";
+import { usePlaybackManager } from "./usePlaybackManager";
+import { useInvalidatePlaybackProgressCache } from "./useRevalidatePlaybackProgressCache";
export const useMarkAsPlayed = (items: BaseItemDto[]) => {
- const [api] = useAtom(apiAtom);
- const [user] = useAtom(userAtom);
const queryClient = useQueryClient();
const lightHapticFeedback = useHaptic("light");
-
- const invalidateQueries = () => {
- const queriesToInvalidate = [
- ["resumeItems"],
- ["continueWatching"],
- ["nextUp-all"],
- ["nextUp"],
- ["episodes"],
- ["seasons"],
- ["home"],
- ];
-
+ const { markItemPlayed, markItemUnplayed } = usePlaybackManager();
+ const invalidatePlaybackProgressCache = useInvalidatePlaybackProgressCache();
+ const invalidateQueries = async () => {
+ const queriesToInvalidate: QueryKey[] = [];
items.forEach((item) => {
if (!item.Id) return;
queriesToInvalidate.push(["item", item.Id]);
});
-
- queriesToInvalidate.forEach((queryKey) => {
- queryClient.invalidateQueries({ queryKey });
- });
+ await Promise.all(
+ queriesToInvalidate.map((queryKey) =>
+ queryClient.invalidateQueries({ queryKey }),
+ ),
+ );
};
- const markAsPlayedStatus = async (played: boolean) => {
+ const toggle = async (played: boolean) => {
lightHapticFeedback();
-
- items.forEach((item) => {
- // Optimistic update
- queryClient.setQueryData(
- ["item", item.Id],
- (oldData: BaseItemDto | undefined) => {
- if (oldData) {
- return {
- ...oldData,
- UserData: {
- ...oldData.UserData,
- Played: played,
- },
- };
- }
- return oldData;
- },
- );
- });
-
- try {
- // Process all items
- await Promise.all(
- items.map((item) =>
- played
- ? markAsPlayed({ api, item, userId: user?.Id })
- : markAsNotPlayed({ api, itemId: item?.Id, userId: user?.Id }),
- ),
- );
-
- // Bulk invalidate
- queryClient.invalidateQueries({
- queryKey: [
- "resumeItems",
- "continueWatching",
- "nextUp-all",
- "nextUp",
- "episodes",
- "seasons",
- "home",
- ...items.map((item) => ["item", item.Id]),
- ].flat(),
- });
- } catch (error) {
- // Revert all optimistic updates on any failure
- items.forEach((item) => {
- queryClient.setQueryData(
- ["item", item.Id],
- (oldData: BaseItemDto | undefined) =>
- oldData
- ? {
- ...oldData,
- UserData: { ...oldData.UserData, Played: played },
- }
- : oldData,
- );
- });
- console.error("Error updating played status:", error);
- }
-
+ // Process all items
+ await Promise.all(
+ items.map((item) => {
+ if (!item.Id) return Promise.resolve();
+ return played ? markItemPlayed(item.Id) : markItemUnplayed(item.Id);
+ }),
+ );
+ invalidatePlaybackProgressCache();
invalidateQueries();
};
- return markAsPlayedStatus;
+ return toggle;
};
diff --git a/hooks/usePlaybackManager.ts b/hooks/usePlaybackManager.ts
new file mode 100644
index 00000000..c51699c4
--- /dev/null
+++ b/hooks/usePlaybackManager.ts
@@ -0,0 +1,213 @@
+import { getPlaystateApi } from "@jellyfin/sdk/lib/utils/api";
+import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api/user-library-api";
+import { useNetInfo } from "@react-native-community/netinfo";
+import { useAtomValue } from "jotai";
+import { useDownload } from "@/providers/DownloadProvider";
+import { DownloadedItem } from "@/providers/Downloads/types";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+
+/**
+ * A hook to manage playback state, abstracting away the complexities of
+ * online/offline and local/remote state management.
+ *
+ * This provides a simple facade for player components to report playback
+ * without needing to know the underlying details of data syncing.
+ */
+export const usePlaybackManager = () => {
+ const api = useAtomValue(apiAtom);
+ const user = useAtomValue(userAtom);
+ const netInfo = useNetInfo();
+ const { getDownloadedItemById, updateDownloadedItem } = useDownload();
+
+ /** Whether the device is online. actually it's connected to the internet. */
+ const isOnline = netInfo.isConnected;
+
+ /**
+ * Fetches the latest state of an item from the server and updates the local
+ * downloaded version to match. This ensures the local item has the
+ * canonical state from the server.
+ */
+ const _syncRemoteToLocal = async (localItem: DownloadedItem) => {
+ if (!isOnline || !api || !user) return;
+
+ try {
+ const remoteItem = (
+ await getUserLibraryApi(api).getItem({
+ itemId: localItem.item.Id!,
+ userId: user.Id,
+ })
+ ).data;
+ if (remoteItem) {
+ updateDownloadedItem(localItem.item.Id!, {
+ ...localItem,
+ item: {
+ ...localItem.item,
+ UserData: { ...remoteItem.UserData },
+ },
+ });
+ }
+ } catch (error) {
+ console.error("Failed to sync remote item state to local", error);
+ }
+ };
+
+ /**
+ * Reports playback progress.
+ *
+ * - If offline and the item is downloaded, updates are saved locally.
+ * - If online and the item is downloaded, it updates locally and syncs with the server.
+ * - If online and streaming, it reports directly to the server.
+ *
+ * @param itemId The ID of the item.
+ * @param positionTicks The current playback position in ticks.
+ */
+ const reportPlaybackProgress = async (
+ itemId: string,
+ positionTicks: number,
+ metadata?: {
+ AudioStreamIndex: number;
+ SubtitleStreamIndex: number;
+ },
+ ) => {
+ const localItem = getDownloadedItemById(itemId);
+
+ // Handle local state update for downloaded items
+ if (localItem) {
+ const isItemConsideredPlayed =
+ (localItem.item.UserData?.PlayedPercentage ?? 0) > 90;
+ updateDownloadedItem(itemId, {
+ ...localItem,
+ item: {
+ ...localItem.item,
+ UserData: {
+ ...localItem.item.UserData,
+ PlaybackPositionTicks: isItemConsideredPlayed ? 0 : positionTicks,
+ Played: isItemConsideredPlayed,
+ LastPlayedDate: new Date().toISOString(),
+ PlayedPercentage: isItemConsideredPlayed
+ ? 0
+ : (positionTicks / localItem.item.RunTimeTicks!) * 100,
+ },
+ },
+ });
+ }
+
+ // Handle remote state update if online
+ if (isOnline && api) {
+ try {
+ await getPlaystateApi(api).reportPlaybackProgress({
+ playbackProgressInfo: {
+ ItemId: itemId,
+ PositionTicks: positionTicks,
+ ...(metadata && { AudioStreamIndex: metadata.AudioStreamIndex }),
+ ...(metadata && {
+ SubtitleStreamIndex: metadata.SubtitleStreamIndex,
+ }),
+ },
+ });
+ } catch (error) {
+ console.error("Failed to report playback progress on server", error);
+ }
+ // If it was a downloaded item, re-sync with the server for the latest state.
+ // This is crucial because the server might have marked the item as "Played"
+ // based on its own rules (e.g., >95% progress).
+ if (localItem) {
+ await _syncRemoteToLocal(localItem);
+ }
+ }
+ };
+
+ /**
+ * Marks an item as played.
+ *
+ * - If offline and downloaded, it marks as played locally.
+ * - If online, it marks as played on the server and syncs the state back to the local item if it exists.
+ *
+ * @param itemId The ID of the item.
+ */
+ const markItemPlayed = async (itemId: string) => {
+ const localItem = getDownloadedItemById(itemId);
+
+ // Handle local state update for downloaded items
+ if (localItem) {
+ updateDownloadedItem(itemId, {
+ ...localItem,
+ item: {
+ ...localItem.item,
+ UserData: {
+ ...localItem.item.UserData,
+ Played: true,
+ PlaybackPositionTicks: 0,
+ PlayedPercentage: 0,
+ LastPlayedDate: new Date().toISOString(),
+ },
+ },
+ });
+ }
+
+ // Handle remote state update if online
+ if (isOnline && api && user) {
+ try {
+ await getPlaystateApi(api).markPlayedItem({
+ itemId,
+ userId: user.Id,
+ });
+
+ // If it was a downloaded item, re-sync with server for the latest state
+ if (localItem) {
+ await _syncRemoteToLocal(localItem);
+ }
+ } catch (error) {
+ console.error("Failed to mark item as played on server", error);
+ }
+ }
+ };
+
+ /**
+ * Marks an item as unplayed.
+ *
+ * - If offline and downloaded, it marks as unplayed locally.
+ * - If online, it marks as unplayed on the server and syncs the state back to the local item if it exists.
+ *
+ * @param itemId The ID of the item.
+ */
+ const markItemUnplayed = async (itemId: string) => {
+ const localItem = getDownloadedItemById(itemId);
+
+ // Handle local state update for downloaded items
+ if (localItem) {
+ updateDownloadedItem(itemId, {
+ ...localItem,
+ item: {
+ ...localItem.item,
+ UserData: {
+ ...localItem.item.UserData,
+ Played: false,
+ PlaybackPositionTicks: 0,
+ PlayedPercentage: 0,
+ LastPlayedDate: new Date().toISOString(), // Keep track of when it was marked unplayed
+ },
+ },
+ });
+ }
+
+ // Handle remote state update if online
+ if (isOnline && api && user) {
+ try {
+ await getPlaystateApi(api).markUnplayedItem({
+ itemId,
+ userId: user.Id,
+ });
+
+ // If it was a downloaded item, re-sync with server for the latest state
+ if (localItem) {
+ await _syncRemoteToLocal(localItem);
+ }
+ } catch (error) {
+ console.error("Failed to mark item as unplayed on server", error);
+ }
+ }
+ };
+
+ return { reportPlaybackProgress, markItemPlayed, markItemUnplayed };
+};
diff --git a/hooks/useRevalidatePlaybackProgressCache.ts b/hooks/useRevalidatePlaybackProgressCache.ts
index 9cda914d..d215bcc6 100644
--- a/hooks/useRevalidatePlaybackProgressCache.ts
+++ b/hooks/useRevalidatePlaybackProgressCache.ts
@@ -1,10 +1,14 @@
import { useQueryClient } from "@tanstack/react-query";
+import { useDownload } from "@/providers/DownloadProvider";
+import { useTwoWaySync } from "./useTwoWaySync";
/**
* useRevalidatePlaybackProgressCache invalidates queries related to playback progress.
*/
export function useInvalidatePlaybackProgressCache() {
const queryClient = useQueryClient();
+ const { downloadedFiles } = useDownload();
+ const { syncPlaybackState } = useTwoWaySync();
const revalidate = async () => {
// List of all the queries to invalidate
@@ -17,11 +21,33 @@ export function useInvalidatePlaybackProgressCache() {
["episodes"],
["seasons"],
["home"],
+ ["downloadedItems"],
];
- // Invalidate each query
- for (const queryKey of queriesToInvalidate) {
- await queryClient.invalidateQueries({ queryKey });
+ // We Invalidate all the queries to the latest server versions
+ await Promise.all(
+ queriesToInvalidate.map((queryKey) =>
+ queryClient.invalidateQueries({ queryKey }),
+ ),
+ );
+
+ // Sync playback state for downloaded items
+ if (downloadedFiles) {
+ // We sync the playback state for the downloaded items
+ const syncResults = await Promise.all(
+ downloadedFiles.map((downloadedItem) =>
+ syncPlaybackState(downloadedItem.item.Id!),
+ ),
+ );
+ // We invalidate the queries again in case we have updated a server's playback progress.
+ const shouldInvalidate = syncResults.some((result) => result);
+
+ console.log("shouldInvalidate", shouldInvalidate);
+ if (shouldInvalidate) {
+ queriesToInvalidate.map((queryKey) =>
+ queryClient.invalidateQueries({ queryKey }),
+ );
+ }
}
};
diff --git a/hooks/useTrickplay.ts b/hooks/useTrickplay.ts
index e221b49e..24c6929e 100644
--- a/hooks/useTrickplay.ts
+++ b/hooks/useTrickplay.ts
@@ -1,11 +1,69 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { ticksToMs } from "@/utils/time";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import { Image } from "expo-image";
-import { useAtom } from "jotai";
import { useCallback, useMemo, useRef, useState } from "react";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { store } from "@/utils/store";
+import { ticksToMs } from "@/utils/time";
+import { useDownload } from "@/providers/DownloadProvider";
+import { useGlobalSearchParams } from "expo-router";
-interface TrickplayData {
+interface TrickplayUrl {
+ x: number;
+ y: number;
+ url: string;
+}
+
+/** Hook to handle trickplay logic for a given item. */
+export const useTrickplay = (item: BaseItemDto) => {
+ const [trickPlayUrl, setTrickPlayUrl] = useState(null);
+ const { getDownloadedItemById } = useDownload();
+ const lastCalculationTime = useRef(0);
+ const throttleDelay = 200;
+ const isOffline = useGlobalSearchParams().offline === "true";
+ const trickplayInfo = useMemo(() => getTrickplayInfo(item), [item]);
+
+ /** Generates the trickplay URL for the given item and sheet index.
+ * We change between offline and online trickplay URLs depending on the state of the app. */
+ const getTrickplayUrl = useCallback((item: BaseItemDto, sheetIndex: number) => {
+ // If we are offline, we can use the downloaded item's trickplay data path
+ const downloadedItem = getDownloadedItemById(item.Id!);
+ if (isOffline && downloadedItem?.trickPlayData?.path) {
+ return `${downloadedItem.trickPlayData.path}${sheetIndex}.jpg`;
+ }
+ return generateTrickplayUrl(item, sheetIndex);
+ }, [trickplayInfo]);
+
+ /** Calculates the trickplay URL for the current progress. */
+ const calculateTrickplayUrl = useCallback(
+ (progress: number) => {
+ const now = Date.now();
+ if (!trickplayInfo || !item.Id || now - lastCalculationTime.current < throttleDelay) return;
+ lastCalculationTime.current = now;
+ const { sheetIndex, x, y } = calculateTrickplayTile(progress, trickplayInfo);
+ const url = getTrickplayUrl(item, sheetIndex);
+ if (url) setTrickPlayUrl({ x, y, url });
+ },
+ [trickplayInfo, item, throttleDelay, getTrickplayUrl],
+ );
+
+ /** Prefetches all the trickplay images for the item. */
+ const prefetchAllTrickplayImages = useCallback(() => {
+ if (!trickplayInfo || !item.Id) return;
+ for (let index = 0; index < trickplayInfo.totalImageSheets; index++) {
+ const url = getTrickplayUrl(item, index);
+ if (url) Image.prefetch(url);
+ }
+ }, [trickplayInfo, item, getTrickplayUrl]);
+
+ return {
+ trickPlayUrl,
+ calculateTrickplayUrl,
+ prefetchAllTrickplayImages,
+ trickplayInfo,
+ };
+};
+
+export interface TrickplayData {
Interval?: number;
TileWidth?: number;
TileHeight?: number;
@@ -14,141 +72,93 @@ interface TrickplayData {
ThumbnailCount?: number;
}
-interface TrickplayInfo {
+export interface TrickplayInfo {
resolution: string;
aspectRatio: number;
data: TrickplayData;
+ totalImageSheets: number;
}
-interface TrickplayUrl {
- x: number;
- y: number;
- url: string;
-}
+/** Generates a trickplay URL based on the item, resolution, and sheet index. */
+export const generateTrickplayUrl = (item: BaseItemDto, sheetIndex: number) => {
+ const api = store.get(apiAtom);
+ const resolution = getTrickplayInfo(item)?.resolution;
+ if (!resolution || !api) return null;
+ return `${api.basePath}/Videos/${item.Id}/Trickplay/${resolution}/${sheetIndex}.jpg?api_key=${api.accessToken}`;
+};
-export const useTrickplay = (item: BaseItemDto, enabled = true) => {
- const [api] = useAtom(apiAtom);
- const [trickPlayUrl, setTrickPlayUrl] = useState(null);
- const lastCalculationTime = useRef(0);
- const throttleDelay = 200; // 200ms throttle
+/**
+ * Parses the trickplay metadata from a BaseItemDto.
+ * @param item The Jellyfin media item.
+ * @returns Parsed trickplay information or null if not available.
+ */
+export const getTrickplayInfo = (item: BaseItemDto): TrickplayInfo | null => {
+ if (!item.Id || !item.Trickplay) return null;
- const trickplayInfo = useMemo(() => {
- if (!enabled || !item.Id || !item.Trickplay) {
- return null;
- }
+ const mediaSourceId = item.Id;
+ const trickplayDataForSource = item.Trickplay[mediaSourceId];
- const mediaSourceId = item.Id;
- const trickplayData = item.Trickplay[mediaSourceId];
+ if (!trickplayDataForSource) {
+ return null;
+ }
- if (!trickplayData) {
- return null;
- }
+ const firstResolution = Object.keys(trickplayDataForSource)[0];
+ if (!firstResolution) {
+ return null;
+ }
- // Get the first available resolution
- const firstResolution = Object.keys(trickplayData)[0];
- return firstResolution
- ? {
- resolution: firstResolution,
- aspectRatio:
- trickplayData[firstResolution].Width! /
- trickplayData[firstResolution].Height!,
- data: trickplayData[firstResolution],
- }
- : null;
- }, [item, enabled]);
+ const data = trickplayDataForSource[firstResolution];
+ const { Interval, TileWidth, TileHeight, Width, Height } = data;
- // Takes in ticks.
- const calculateTrickplayUrl = useCallback(
- (progress: number) => {
- if (!enabled) {
- return null;
- }
+ if (
+ !Interval ||
+ !TileWidth ||
+ !TileHeight ||
+ !Width ||
+ !Height ||
+ !item.RunTimeTicks
+ ) {
+ return null;
+ }
- const now = Date.now();
- if (now - lastCalculationTime.current < throttleDelay) {
- return null;
- }
- lastCalculationTime.current = now;
-
- if (!trickplayInfo || !api || !item.Id) {
- return null;
- }
-
- const { data, resolution } = trickplayInfo;
- const { Interval, TileWidth, TileHeight, Width, Height } = data;
-
- if (
- !Interval ||
- !TileWidth ||
- !TileHeight ||
- !resolution ||
- !Width ||
- !Height
- ) {
- throw new Error("Invalid trickplay data");
- }
-
- const currentTimeMs = Math.max(0, ticksToMs(progress));
- const currentTile = Math.floor(currentTimeMs / Interval);
-
- const tileSize = TileWidth * TileHeight;
- const tileOffset = currentTile % tileSize;
- const index = Math.floor(currentTile / tileSize);
-
- const tileOffsetX = tileOffset % TileWidth;
- const tileOffsetY = Math.floor(tileOffset / TileWidth);
-
- const newTrickPlayUrl = {
- x: tileOffsetX,
- y: tileOffsetY,
- url: `${api.basePath}/Videos/${item.Id}/Trickplay/${resolution}/${index}.jpg?api_key=${api.accessToken}`,
- };
-
- setTrickPlayUrl(newTrickPlayUrl);
- return newTrickPlayUrl;
- },
- [trickplayInfo, item, api, enabled],
- );
-
- const prefetchAllTrickplayImages = useCallback(() => {
- if (!api || !enabled || !trickplayInfo || !item.Id || !item.RunTimeTicks) {
- return;
- }
-
- const { data, resolution } = trickplayInfo;
- const { Interval, TileWidth, TileHeight, Width, Height } = data;
-
- if (
- !Interval ||
- !TileWidth ||
- !TileHeight ||
- !resolution ||
- !Width ||
- !Height
- ) {
- throw new Error("Invalid trickplay data");
- }
-
- // Calculate tiles per sheet
- const tilesPerRow = TileWidth;
- const tilesPerColumn = TileHeight;
- const tilesPerSheet = tilesPerRow * tilesPerColumn;
- const totalTiles = Math.ceil(ticksToMs(item.RunTimeTicks) / Interval);
- const totalIndexes = Math.ceil(totalTiles / tilesPerSheet);
-
- // Prefetch all trickplay images
- for (let index = 0; index < totalIndexes; index++) {
- const url = `${api.basePath}/Videos/${item.Id}/Trickplay/${resolution}/${index}.jpg?api_key=${api.accessToken}`;
- Image.prefetch(url);
- }
- }, [trickplayInfo, item, api, enabled]);
+ const tilesPerSheet = TileWidth * TileHeight;
+ const totalTiles = Math.ceil(ticksToMs(item.RunTimeTicks) / Interval);
+ const totalImageSheets = Math.ceil(totalTiles / tilesPerSheet);
return {
- trickPlayUrl: enabled ? trickPlayUrl : null,
- calculateTrickplayUrl: enabled ? calculateTrickplayUrl : () => null,
- prefetchAllTrickplayImages: enabled
- ? prefetchAllTrickplayImages
- : () => null,
- trickplayInfo: enabled ? trickplayInfo : null,
+ resolution: firstResolution,
+ aspectRatio: Width / Height,
+ data,
+ totalImageSheets,
};
};
+
+/**
+ * Calculates the specific image sheet and tile offset for a given time.
+ * @param progressTicks The current playback time in ticks.
+ * @param trickplayInfo The parsed trickplay information object.
+ * @returns An object with the image sheet index, and the X/Y coordinates for the tile.
+ */
+const calculateTrickplayTile = (
+ progressTicks: number,
+ trickplayInfo: TrickplayInfo,
+) => {
+ const { data } = trickplayInfo;
+ const { Interval, TileWidth, TileHeight } = data;
+
+ if (!Interval || !TileWidth || !TileHeight) {
+ throw new Error("Invalid trickplay data provided to calculateTile");
+ }
+
+ const currentTimeMs = Math.max(0, ticksToMs(progressTicks));
+ const currentTile = Math.floor(currentTimeMs / Interval);
+
+ const tilesPerSheet = TileWidth * TileHeight;
+ const sheetIndex = Math.floor(currentTile / tilesPerSheet);
+ const tileIndexInSheet = currentTile % tilesPerSheet;
+
+ const x = tileIndexInSheet % TileWidth;
+ const y = Math.floor(tileIndexInSheet / TileWidth);
+
+ return { sheetIndex, x, y };
+};
diff --git a/hooks/useTwoWaySync.ts b/hooks/useTwoWaySync.ts
new file mode 100644
index 00000000..8ee2ff2b
--- /dev/null
+++ b/hooks/useTwoWaySync.ts
@@ -0,0 +1,81 @@
+import { getItemsApi, getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
+import { useNetInfo } from "@react-native-community/netinfo";
+import { useAtomValue } from "jotai";
+import { useDownload } from "@/providers/DownloadProvider";
+import { apiAtom, userAtom } from "../providers/JellyfinProvider";
+import { usePlaybackManager } from "./usePlaybackManager";
+
+/**
+ * This hook is used to sync the playback state of a downloaded item with the server
+ * when the application comes back online after being used offline.
+ */
+export const useTwoWaySync = () => {
+ const api = useAtomValue(apiAtom);
+ const user = useAtomValue(userAtom);
+ const netInfo = useNetInfo();
+ const { getDownloadedItemById, updateDownloadedItem } = useDownload();
+ const { reportPlaybackProgress, markItemUnplayed, markItemPlayed } =
+ usePlaybackManager();
+
+ /**
+ * Syncs the playback state of an offline item with the server.
+ * It determines if the local or remote state is more recent and applies the necessary update.
+ *
+ * @returns A Promise indicating whether a server update was made (true) or not (false).
+ */
+ const syncPlaybackState = async (itemId: string): Promise => {
+ if (!api || !user || !netInfo.isConnected) {
+ // Cannot sync if offline or not logged in
+ return false;
+ }
+
+ const localItem = getDownloadedItemById(itemId);
+ if (!localItem) return false;
+
+ const remoteItem = (
+ await getUserLibraryApi(api).getItem({ itemId, userId: user.Id })
+ ).data;
+ if (!remoteItem) return false;
+
+ const localLastPlayed = localItem.item.UserData?.LastPlayedDate
+ ? new Date(localItem.item.UserData.LastPlayedDate)
+ : new Date(0);
+ const remoteLastPlayed = remoteItem.UserData?.LastPlayedDate
+ ? new Date(remoteItem.UserData.LastPlayedDate)
+ : new Date(0);
+
+ // If the remote item has been played more recently, we take the server's version as the source of truth.
+ if (remoteLastPlayed > localLastPlayed) {
+ updateDownloadedItem(itemId, {
+ ...localItem,
+ item: {
+ ...localItem.item,
+ UserData: {
+ ...localItem.item.UserData,
+ LastPlayedDate: remoteItem.UserData?.LastPlayedDate,
+ PlaybackPositionTicks: remoteItem.UserData?.PlaybackPositionTicks,
+ Played: remoteItem.UserData?.Played,
+ PlayedPercentage: remoteItem.UserData?.PlayedPercentage,
+ },
+ },
+ });
+ return false;
+ } else if (remoteLastPlayed < localLastPlayed) {
+ // Since we're this is the source of truth, essentially need to make sure the played status matches the local item.
+ await getItemsApi(api).updateItemUserData({
+ itemId: localItem.item.Id!,
+ userId: user.Id,
+ updateUserItemDataDto: {
+ Played: localItem.item.UserData?.Played,
+ PlaybackPositionTicks: localItem.item.UserData?.PlaybackPositionTicks,
+ PlayedPercentage: localItem.item.UserData?.PlayedPercentage,
+ LastPlayedDate: localItem.item.UserData?.LastPlayedDate,
+ },
+ });
+ return true;
+ }
+ return false;
+ };
+
+ return { syncPlaybackState };
+};
diff --git a/i18n.ts b/i18n.ts
index 2a7a92a9..160185b9 100644
--- a/i18n.ts
+++ b/i18n.ts
@@ -1,7 +1,6 @@
+import { getLocales } from "expo-localization";
import i18n from "i18next";
import { initReactI18next } from "react-i18next";
-
-import { getLocales } from "expo-localization";
import de from "./translations/de.json";
import en from "./translations/en.json";
import eo from "./translations/eo.json";
diff --git a/modules/VlcPlayer.types.ts b/modules/VlcPlayer.types.ts
index 85de4348..9bdd0afd 100644
--- a/modules/VlcPlayer.types.ts
+++ b/modules/VlcPlayer.types.ts
@@ -41,10 +41,10 @@ export type VlcPlayerSource = {
type?: string;
isNetwork?: boolean;
autoplay?: boolean;
- externalSubtitles: { name: string; DeliveryUrl: string }[];
+ startPosition?: number;
+ externalSubtitles?: { name: string; DeliveryUrl: string }[];
initOptions?: any[];
mediaOptions?: { [key: string]: any };
- startPosition?: number;
};
export type TrackInfo = {
@@ -94,5 +94,5 @@ export interface VlcPlayerViewRef {
getChapters: () => Promise;
setVideoCropGeometry: (geometry: string | null) => Promise;
getVideoCropGeometry: () => Promise;
- setSubtitleURL: (url: string, name: string) => Promise;
+ setSubtitleURL: (url: string) => Promise;
}
diff --git a/modules/VlcPlayerView.tsx b/modules/VlcPlayerView.tsx
index 70775876..cdc40f6e 100644
--- a/modules/VlcPlayerView.tsx
+++ b/modules/VlcPlayerView.tsx
@@ -1,8 +1,6 @@
import { requireNativeViewManager } from "expo-modules-core";
import * as React from "react";
-
-import { VideoPlayer, useSettings } from "@/utils/atoms/settings";
-import { Platform, ViewStyle } from "react-native";
+import { ViewStyle } from "react-native";
import type {
VlcPlayerSource,
VlcPlayerViewProps,
@@ -13,22 +11,12 @@ interface NativeViewRef extends VlcPlayerViewRef {
setNativeProps?: (props: Partial) => void;
}
-const VLCViewManager = requireNativeViewManager("VlcPlayer");
const VLC3ViewManager = requireNativeViewManager("VlcPlayer3");
// Create a forwarded ref version of the native view
const NativeView = React.forwardRef(
(props, ref) => {
- const [settings] = useSettings();
-
- if (Platform.OS === "ios" || Platform.isTVOS) {
- if (settings.defaultPlayer === VideoPlayer.VLC_3) {
- console.log("[Apple] Using Vlc Player 3");
- return ;
- }
- }
- console.log("Using default Vlc Player");
- return ;
+ return ;
},
);
@@ -95,8 +83,8 @@ const VlcPlayerView = React.forwardRef(
const geometry = await nativeRef.current?.getVideoCropGeometry();
return geometry ?? null;
},
- setSubtitleURL: async (url: string, name: string) => {
- await nativeRef.current?.setSubtitleURL(url, name);
+ setSubtitleURL: async (url: string) => {
+ await nativeRef.current?.setSubtitleURL(url);
},
}));
diff --git a/modules/vlc-player-3/ios/VlcPlayer3Module.swift b/modules/vlc-player-3/ios/VlcPlayer3Module.swift
index c0e32606..fd7ff179 100644
--- a/modules/vlc-player-3/ios/VlcPlayer3Module.swift
+++ b/modules/vlc-player-3/ios/VlcPlayer3Module.swift
@@ -54,6 +54,10 @@ public class VlcPlayer3Module: Module {
return view.getAudioTracks()
}
+ AsyncFunction("setSubtitleURL") { (view: VlcPlayer3View, url: String, name: String) in
+ view.setSubtitleURL(url, name: name)
+ }
+
AsyncFunction("setSubtitleTrack") { (view: VlcPlayer3View, trackIndex: Int) in
view.setSubtitleTrack(trackIndex)
}
@@ -61,11 +65,6 @@ public class VlcPlayer3Module: Module {
AsyncFunction("getSubtitleTracks") { (view: VlcPlayer3View) -> [[String: Any]]? in
return view.getSubtitleTracks()
}
-
- AsyncFunction("setSubtitleURL") {
- (view: VlcPlayer3View, url: String, name: String) in
- view.setSubtitleURL(url, name: name)
- }
}
}
}
diff --git a/modules/vlc-player-3/ios/VlcPlayer3View.swift b/modules/vlc-player-3/ios/VlcPlayer3View.swift
index 50882734..40bf9156 100644
--- a/modules/vlc-player-3/ios/VlcPlayer3View.swift
+++ b/modules/vlc-player-3/ios/VlcPlayer3View.swift
@@ -22,6 +22,8 @@ class VlcPlayer3View: ExpoView {
private var isStopping: Bool = false // Define isStopping here
private var lastProgressCall = Date().timeIntervalSince1970
var hasSource = false
+ var isTranscoding = false
+ private var initialSeekPerformed: Bool = false
// MARK: - Initialization
@@ -88,7 +90,6 @@ class VlcPlayer3View: ExpoView {
// If the specified time is greater than the duration, seek to the end
let seekTime = time > duration ? duration - 1000 : time
player.time = VLCTime(int: seekTime)
-
if wasPlaying {
self.play()
}
@@ -110,13 +111,18 @@ class VlcPlayer3View: ExpoView {
var initOptions = source["initOptions"] as? [Any] ?? []
self.startPosition = source["startPosition"] as? Int32 ?? 0
self.externalSubtitles = source["externalSubtitles"] as? [[String: String]]
- initOptions.append("--start-time=\(self.startPosition)")
guard let uri = source["uri"] as? String, !uri.isEmpty else {
print("Error: Invalid or empty URI")
self.onVideoError?(["error": "Invalid or empty URI"])
return
}
+
+ self.isTranscoding = uri.contains("m3u8")
+
+ if !self.isTranscoding, self.startPosition > 0 {
+ initOptions.append("--start-time=\(self.startPosition)")
+ }
let autoplay = source["autoplay"] as? Bool ?? false
let isNetwork = source["isNetwork"] as? Bool ?? false
@@ -126,6 +132,7 @@ class VlcPlayer3View: ExpoView {
self.mediaPlayer?.delegate = self
self.mediaPlayer?.drawable = self.videoView
self.mediaPlayer?.scaleFactor = 0
+ self.initialSeekPerformed = false
let media: VLCMedia
if isNetwork {
@@ -287,9 +294,14 @@ class VlcPlayer3View: ExpoView {
let currentTimeMs = player.time.intValue
let durationMs = player.media?.length.intValue ?? 0
+
print("Debug: Current time: \(currentTimeMs)")
if currentTimeMs >= 0 && currentTimeMs < durationMs {
+ if self.isTranscoding, !self.initialSeekPerformed, self.startPosition > 0 {
+ player.time = VLCTime(int: self.startPosition * 1000)
+ self.initialSeekPerformed = true
+ }
self.onVideoProgress?([
"currentTime": currentTimeMs,
"duration": durationMs,
diff --git a/modules/vlc-player/android/build.gradle b/modules/vlc-player/android/build.gradle
index 3077d202..b2695833 100644
--- a/modules/vlc-player/android/build.gradle
+++ b/modules/vlc-player/android/build.gradle
@@ -29,7 +29,7 @@ if (useManagedAndroidSdkVersions) {
mavenCentral()
}
dependencies {
- classpath "com.android.tools.build:gradle:7.1.3"
+ classpath "com.android.tools.build:gradle:8.11.0"
}
}
project.android {
diff --git a/modules/vlc-player/ios/VlcPlayerView.swift b/modules/vlc-player/ios/VlcPlayerView.swift
index f02478d2..599166fd 100644
--- a/modules/vlc-player/ios/VlcPlayerView.swift
+++ b/modules/vlc-player/ios/VlcPlayerView.swift
@@ -137,10 +137,7 @@ extension VLCPlayerWrapper: VLCMediaPlayerDelegate {
}
}
-// MARK: - VLCMediaDelegate
-extension VLCPlayerWrapper: VLCMediaDelegate {
- // Implement VLCMediaDelegate methods if needed
-}
+
class VlcPlayerView: ExpoView {
let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "VlcPlayerView")
@@ -154,6 +151,10 @@ class VlcPlayerView: ExpoView {
private var isStopping: Bool = false // Define isStopping here
private var externalSubtitles: [[String: String]]?
var hasSource = false
+ var initialSeekPerformed = false
+ // A flag variable determinging if we should perform the initial seek. Its either transcoding or offline playback. that makes
+ var shouldPerformInitialSeek: Bool = false
+
// MARK: - Initialization
required init(appContext: AppContext? = nil) {
@@ -172,6 +173,19 @@ class VlcPlayerView: ExpoView {
)
}
+ // Workaround: When playing an HLS video for the first time, seeking to a specific time immediately can cause a crash.
+ // To avoid this, we wait until the video has started playing before performing the initial seek.
+ func performInitialSeek() {
+ guard !initialSeekPerformed,
+ startPosition > 0,
+ shouldPerformInitialSeek,
+ vlc.player.isSeekable else { return }
+
+ initialSeekPerformed = true
+ logger.debug("First time update, performing initial seek to \(self.startPosition) seconds")
+ vlc.player.time = VLCTime(int: startPosition * 1000)
+ }
+
private func setupNotifications() {
NotificationCenter.default.addObserver(
self, selector: #selector(applicationWillResignActive),
@@ -254,6 +268,8 @@ class VlcPlayerView: ExpoView {
let autoplay = source["autoplay"] as? Bool ?? false
let isNetwork = source["isNetwork"] as? Bool ?? false
+ // Set shouldPeformIntial based on isTranscoding and is not a network stream
+ self.shouldPerformInitialSeek = uri.contains("m3u8") || !isNetwork
self.onVideoLoadStart?(["target": self.reactTag ?? NSNull()])
let media: VLCMedia!
@@ -277,8 +293,11 @@ class VlcPlayerView: ExpoView {
self.hasSource = true
if autoplay {
logger.info("Playing...")
+ // The Video is not transcoding so it its safe to seek to the start position.
+ if !self.shouldPerformInitialSeek {
+ self.vlc.player.time = VLCTime(number: NSNumber(value: self.startPosition * 1000))
+ }
self.play()
- self.vlc.player.time = VLCTime(number: NSNumber(value: self.startPosition * 1000))
}
}
}
@@ -415,6 +434,9 @@ class VlcPlayerView: ExpoView {
private func updatePlayerState() {
let player = self.vlc.player
+ if player.isPlaying {
+ performInitialSeek()
+ }
self.onVideoStateChange?([
"target": self.reactTag ?? NSNull(),
"currentTime": player.time.intValue,
diff --git a/package.json b/package.json
index 079f547c..a1eed56a 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"lint": "biome check --write --unsafe"
},
"dependencies": {
- "@bottom-tabs/react-navigation": "0.8.6",
+ "@bottom-tabs/react-navigation": "0.9.2",
"@expo/config-plugins": "~9.0.15",
"@expo/react-native-action-sheet": "^4.1.1",
"@expo/vector-icons": "^14.0.4",
@@ -35,36 +35,36 @@
"@tanstack/react-query": "^5.66.0",
"add": "^2.0.6",
"axios": "^1.7.9",
- "expo": "^52.0.31",
- "expo-asset": "~11.0.3",
- "expo-background-fetch": "~13.0.5",
+ "expo": "~52.0.47",
+ "expo-asset": "~11.0.5",
+ "expo-background-fetch": "~13.0.6",
"expo-blur": "~14.0.3",
"expo-brightness": "~13.0.3",
- "expo-build-properties": "~0.13.2",
- "expo-constants": "~17.0.5",
+ "expo-build-properties": "~0.13.3",
+ "expo-constants": "~17.0.8",
"expo-crypto": "~14.0.2",
- "expo-dev-client": "~5.0.11",
- "expo-device": "~7.0.2",
+ "expo-dev-client": "~5.0.20",
+ "expo-device": "~7.0.3",
"expo-font": "~13.0.3",
"expo-haptics": "~14.0.1",
- "expo-image": "~2.0.4",
+ "expo-image": "~2.0.7",
"expo-keep-awake": "~14.0.2",
"expo-linear-gradient": "~14.0.2",
"expo-linking": "~7.0.5",
"expo-localization": "~16.0.1",
"expo-network": "~7.0.5",
- "expo-notifications": "~0.29.13",
- "expo-router": "~4.0.17",
+ "expo-notifications": "~0.29.14",
+ "expo-router": "~4.0.21",
"expo-screen-orientation": "~8.0.4",
"expo-sensors": "~14.0.2",
"expo-sharing": "~13.0.1",
- "expo-splash-screen": "~0.29.22",
+ "expo-splash-screen": "~0.29.24",
"expo-status-bar": "~2.0.1",
- "expo-system-ui": "~4.0.8",
- "expo-task-manager": "~12.0.5",
- "expo-updates": "~0.26.17",
+ "expo-system-ui": "~4.0.9",
+ "expo-task-manager": "~12.0.6",
+ "expo-updates": "~0.27.4",
"expo-web-browser": "~14.0.2",
- "i18next": "^24.2.2",
+ "i18next": "^25.0.0",
"jotai": "^2.11.3",
"lodash": "^4.17.21",
"nativewind": "^2.0.11",
@@ -73,27 +73,27 @@
"react-i18next": "^15.4.0",
"react-native": "npm:react-native-tvos@~0.77.2-0",
"react-native-awesome-slider": "^2.9.0",
- "react-native-bottom-tabs": "0.8.6",
+ "react-native-bottom-tabs": "0.9.2",
"react-native-circular-progress": "^1.4.1",
"react-native-collapsible": "^1.6.2",
"react-native-compressor": "^1.10.3",
"react-native-country-flag": "^2.0.2",
"react-native-device-info": "^14.0.4",
"react-native-edge-to-edge": "^1.4.3",
- "react-native-gesture-handler": "2.22.0",
+ "react-native-gesture-handler": "~2.24.0",
"react-native-get-random-values": "^1.11.0",
"react-native-google-cast": "^4.8.3",
"react-native-image-colors": "^2.4.0",
"react-native-ios-context-menu": "^3.1.0",
"react-native-ios-utilities": "5.1.1",
"react-native-mmkv": "^2.12.2",
- "react-native-pager-view": "6.5.1",
+ "react-native-pager-view": "6.6.0",
"react-native-progress": "^5.0.1",
"react-native-reanimated": "~3.16.7",
"react-native-reanimated-carousel": "3.5.1",
- "react-native-safe-area-context": "5.1.0",
- "react-native-screens": "~4.5.0",
- "react-native-svg": "15.11.1",
+ "react-native-safe-area-context": "5.2.0",
+ "react-native-screens": "4.10.0",
+ "react-native-svg": "15.11.2",
"react-native-tab-view": "^4.0.5",
"react-native-udp": "^4.1.7",
"react-native-uitextview": "^1.4.0",
@@ -102,7 +102,7 @@
"react-native-video": "6.10.0",
"react-native-volume-manager": "^2.0.8",
"react-native-web": "~0.19.13",
- "react-native-webview": "13.13.2",
+ "react-native-webview": "13.13.0",
"sonner-native": "^0.17.0",
"tailwindcss": "3.3.2",
"use-debounce": "^10.0.4",
@@ -112,10 +112,10 @@
},
"devDependencies": {
"@babel/core": "^7.26.8",
- "@biomejs/biome": "^1.9.4",
- "@react-native-community/cli": "15.1.3",
+ "@biomejs/biome": "^2.0.0",
+ "@react-native-community/cli": "18.0.0",
"@react-native-tvos/config-tv": "^0.1.1",
- "@types/jest": "^29.5.14",
+ "@types/jest": "^30.0.0",
"@types/lodash": "^4.17.15",
"@types/react": "~18.3.12",
"@types/react-native-vector-icons": "^6.4.18",
@@ -123,7 +123,7 @@
"@types/uuid": "^10.0.0",
"cross-env": "^7.0.3",
"husky": "^9.1.7",
- "lint-staged": "^15.5.0",
+ "lint-staged": "^16.1.2",
"postinstall-postinstall": "^2.1.0",
"react-test-renderer": "19.0.0",
"typescript": "~5.7.3"
@@ -131,11 +131,17 @@
"private": true,
"expo": {
"install": {
- "exclude": ["react-native"]
+ "exclude": [
+ "react-native"
+ ]
}
},
"lint-staged": {
- "*.{js,jsx,ts,tsx}": ["biome check --write --unsafe"],
- "*.{json}": ["biome format --write"]
+ "*.{js,jsx,ts,tsx}": [
+ "biome check --write --unsafe --no-errors-on-unmatched"
+ ],
+ "*.json": [
+ "biome format --write"
+ ]
}
}
diff --git a/providers/DownloadProvider.tsx b/providers/DownloadProvider.tsx
index c1ea7b6f..b2311717 100644
--- a/providers/DownloadProvider.tsx
+++ b/providers/DownloadProvider.tsx
@@ -1,36 +1,15 @@
-import { useHaptic } from "@/hooks/useHaptic";
-import useImageStorage from "@/hooks/useImageStorage";
-import { useInterval } from "@/hooks/useInterval";
-import { DownloadMethod, useSettings } from "@/utils/atoms/settings";
-import { getOrSetDeviceId } from "@/utils/device";
-import useDownloadHelper from "@/utils/download";
-import { getItemImage } from "@/utils/getItemImage";
-import { useLog, writeToLog } from "@/utils/log";
-import { storage } from "@/utils/mmkv";
-import {
- type JobStatus,
- cancelAllJobs,
- cancelJobById,
- deleteDownloadItemInfoFromDiskTmp,
- getAllJobsByDeviceId,
- getDownloadItemInfoFromDiskTmp,
-} from "@/utils/optimize-server";
import type {
BaseItemDto,
MediaSourceInfo,
} from "@jellyfin/sdk/lib/generated-client/models";
-import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
import BackGroundDownloader from "@kesha-antonov/react-native-background-downloader";
-import { focusManager, useQuery, useQueryClient } from "@tanstack/react-query";
-import axios from "axios";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
import * as Application from "expo-application";
import * as FileSystem from "expo-file-system";
-import type { FileInfo } from "expo-file-system";
-import Notifications from "expo-notifications";
-import { useRouter } from "expo-router";
+import { router } from "expo-router";
import { atom, useAtom } from "jotai";
-import type React from "react";
-import {
+import { throttle } from "lodash";
+import React, {
createContext,
useCallback,
useContext,
@@ -38,21 +17,62 @@ import {
useMemo,
} from "react";
import { useTranslation } from "react-i18next";
-import { AppState, type AppStateStatus, Platform } from "react-native";
import { toast } from "sonner-native";
+import { useHaptic } from "@/hooks/useHaptic";
+import useImageStorage from "@/hooks/useImageStorage";
+import { useInterval } from "@/hooks/useInterval";
+import { generateTrickplayUrl, getTrickplayInfo } from "@/hooks/useTrickplay";
+import { useSettings } from "@/utils/atoms/settings";
+import { getOrSetDeviceId } from "@/utils/device";
+import useDownloadHelper from "@/utils/download";
+import { getItemImage } from "@/utils/getItemImage";
+import { writeToLog } from "@/utils/log";
+import { storage } from "@/utils/mmkv";
+import { fetchAndParseSegments } from "@/utils/segments";
import { Bitrate } from "../components/BitrateSelector";
+import {
+ DownloadedItem,
+ DownloadsDatabase,
+ JobStatus,
+ TrickPlayData,
+} from "./Downloads/types";
import { apiAtom } from "./JellyfinProvider";
-export type DownloadedItem = {
- item: Partial;
- mediaSource: MediaSourceInfo;
+const calculateEstimatedSize = (p: JobStatus): number => {
+ let size = p.mediaSource.Size;
+ const maxBitrate = p.maxBitrate.value;
+ if (
+ maxBitrate &&
+ size &&
+ p.mediaSource.Bitrate &&
+ maxBitrate < p.mediaSource.Bitrate
+ ) {
+ size = (size / p.mediaSource.Bitrate) * maxBitrate;
+ }
+ // This function is for estimated size, so just return the adjusted size
+ return size ?? 0;
+};
+
+// Helper to calculate download speed
+const calculateSpeed = (
+ process: JobStatus,
+ newBytesDownloaded: number,
+): number | undefined => {
+ const { bytesDownloaded: oldBytes = 0, lastProgressUpdateTime } = process;
+ const deltaBytes = newBytesDownloaded - oldBytes;
+
+ if (lastProgressUpdateTime && deltaBytes > 0) {
+ const deltaTimeInSeconds =
+ (Date.now() - new Date(lastProgressUpdateTime).getTime()) / 1000;
+ if (deltaTimeInSeconds > 0) {
+ return deltaBytes / deltaTimeInSeconds;
+ }
+ }
+ return undefined;
};
export const processesAtom = atom([]);
-
-function onAppStateChange(status: AppStateStatus) {
- focusManager.setFocused(status === "active");
-}
+const DOWNLOADS_DATABASE_KEY = "downloads.v2.json";
const DownloadContext = createContext(processesAtom);
-
+ const [processes, setProcesses] = useAtom(processesAtom);
+ const [settings] = useSettings();
const successHapticFeedback = useHaptic("success");
+ /// Cant use the background downloader callback. As its not triggered if size is unknown.
+ const updateProgress = async () => {
+ const tasks = await BackGroundDownloader.checkForExistingDownloads();
+ if (!tasks) {
+ return;
+ }
+ // check if processes are missing
+ setProcesses((processes) => {
+ const missingProcesses = tasks
+ .filter((t) => t.metadata && !processes.some((p) => p.id === t.id))
+ .map((t) => {
+ return t.metadata as JobStatus;
+ });
+
+ const currentProcesses = [...processes, ...missingProcesses];
+ const updatedProcesses = currentProcesses.map((p) => {
+ // fallback. Doesn't really work for transcodes as they may be a lot smaller.
+ // We make an wild guess by comparing bitrates
+ const task = tasks.find((s) => s.id === p.id);
+ if (task && p.status === "downloading") {
+ const estimatedSize = calculateEstimatedSize(p);
+ let progress = p.progress;
+ if (estimatedSize > 0) {
+ progress = (100 / estimatedSize) * task.bytesDownloaded;
+ }
+ if (progress >= 100) {
+ progress = 99;
+ }
+ const speed = calculateSpeed(p, task.bytesDownloaded);
+ return {
+ ...p,
+ progress,
+ speed,
+ bytesDownloaded: task.bytesDownloaded,
+ lastProgressUpdateTime: new Date(),
+ estimatedTotalSizeBytes: estimatedSize,
+ };
+ }
+ return p;
+ });
+
+ return updatedProcesses;
+ });
+ };
+
+ useInterval(updateProgress, 2000);
+
+ const getDownloadedItemById = (id: string): DownloadedItem | undefined => {
+ const db = getDownloadsDatabase();
+
+ // Check movies first
+ if (db.movies[id]) {
+ return db.movies[id];
+ }
+
+ // If not in movies, check episodes
+ for (const series of Object.values(db.series)) {
+ for (const season of Object.values(series.seasons)) {
+ for (const episode of Object.values(season.episodes)) {
+ if (episode.item.Id === id) {
+ return episode;
+ }
+ }
+ }
+ }
+
+ return undefined;
+ };
+
+ const updateProcess = useCallback(
+ (
+ processId: string,
+ updater:
+ | Partial
+ | ((current: JobStatus) => Partial),
+ ) => {
+ setProcesses((prev) =>
+ prev.map((p) => {
+ if (p.id !== processId) return p;
+ const newStatus =
+ typeof updater === "function" ? updater(p) : updater;
+ return {
+ ...p,
+ ...newStatus,
+ };
+ }),
+ );
+ },
+ [setProcesses],
+ );
+
const authHeader = useMemo(() => {
return api?.accessToken;
}, [api]);
- const usingOptimizedServer = useMemo(
- () => settings?.downloadMethod === DownloadMethod.Optimized,
- [settings],
- );
-
- const getDownloadUrl = (process: JobStatus) => {
- return usingOptimizedServer
- ? `${settings.optimizedVersionsServerUrl}download/${process.id}`
- : process.inputUrl;
- };
-
- const { data: downloadedFiles, refetch } = useQuery({
+ const { data: downloadedItems } = useQuery({
queryKey: ["downloadedItems"],
- queryFn: getAllDownloadedItems,
+ queryFn: async () => {
+ const db = getDownloadsDatabase();
+ const allItems = [
+ ...Object.values(db.movies),
+ ...Object.values(db.series).flatMap((series) =>
+ Object.values(series.seasons).flatMap((season) =>
+ Object.values(season.episodes),
+ ),
+ ),
+ ];
+ return allItems;
+ },
staleTime: 0,
refetchOnMount: true,
refetchOnReconnect: true,
refetchOnWindowFocus: true,
+
+ // We always want fetch, even if there is no internet.
+ networkMode: "always",
});
- useEffect(() => {
- const subscription = AppState.addEventListener("change", onAppStateChange);
-
- return () => subscription.remove();
- }, []);
-
- useQuery({
- queryKey: ["jobs"],
- queryFn: async () => {
- const deviceId = await getOrSetDeviceId();
- const url = settings?.optimizedVersionsServerUrl;
-
- if (
- settings?.downloadMethod !== DownloadMethod.Optimized ||
- !url ||
- !deviceId ||
- !authHeader
- )
- return [];
-
- const jobs = await getAllJobsByDeviceId({
- deviceId,
- authHeader,
- url,
- });
-
- const downloadingProcesses = processes
- .filter((p) => p.status === "downloading")
- .filter((p) => jobs.some((j) => j.id === p.id));
-
- const updatedProcesses = jobs.filter(
- (j) => !downloadingProcesses.some((p) => p.id === j.id),
- );
-
- setProcesses([...updatedProcesses, ...downloadingProcesses]);
-
- for (const job of jobs) {
- const process = processes.find((p) => p.id === job.id);
- if (
- process &&
- process.status === "optimizing" &&
- job.status === "completed"
- ) {
- if (settings.autoDownload) {
- startDownload(job);
- } else {
- toast.info(
- t("home.downloads.toasts.item_is_ready_to_be_downloaded", {
- item: job.item.Name,
- }),
- {
- action: {
- label: t("home.downloads.toasts.go_to_downloads"),
- onClick: () => {
- router.push("/downloads");
- toast.dismiss();
- },
- },
- },
- );
- Notifications.scheduleNotificationAsync({
- content: {
- title: job.item.Name,
- body: `${job.item.Name} is ready to be downloaded`,
- data: {
- url: "/downloads",
- },
- },
- trigger: null,
- });
- }
- }
- }
-
- return jobs;
- },
- staleTime: 0,
- refetchInterval: 2000,
- enabled: settings?.downloadMethod === DownloadMethod.Optimized,
- });
-
- /// Cant use the background downloader callback. As its not triggered if size is unknown.
- const updateProgress = async () => {
- if (settings?.downloadMethod === DownloadMethod.Optimized) {
- return;
- }
-
- // const response = await getSessionApi(api).getSessions({
- // activeWithinSeconds: 300,
- // });
-
- const tasks = await BackGroundDownloader.checkForExistingDownloads();
-
- // check if processes are missing
- const missingProcesses = tasks
- .filter((t) => !processes.some((p) => p.id === t.id))
- .map((t) => {
- return t.metadata;
- });
-
- processes = [...processes, ...missingProcesses];
-
- const updatedProcesses = processes.map((p) => {
- // const result = response.data.find((s) => s.Id == p.sessionId);
- // if (result) {
- // return {
- // ...p,
- // progress: result.TranscodingInfo?.CompletionPercentage,
- // };
- // }
-
- // fallback. Doesn't really work for transcodes as they may be a lot smaller.
- // We make an wild guess by comparing bitrates
- const task = tasks.find((s) => s.id === p.id);
- if (task) {
- let progress = p.progress;
- let size = p.mediaSource.Size;
- const maxBitrate = p.maxBitrate.value;
- if (maxBitrate && maxBitrate < p.mediaSource.Bitrate) {
- size = (size / p.mediaSource.Bitrate) * maxBitrate;
- }
- progress = (100 / size) * task.bytesDownloaded;
- if (progress >= 100) {
- progress = 99;
- }
-
- return {
- ...p,
- progress,
- };
- }
- return p;
- });
-
- setProcesses(updatedProcesses);
- };
-
- useInterval(updateProgress, 2000);
-
- useEffect(() => {
- const checkIfShouldStartDownload = async () => {
- if (processes.length === 0) return;
- await BackGroundDownloader?.checkForExistingDownloads();
- };
-
- checkIfShouldStartDownload();
- }, [settings, processes]);
-
- const removeProcess = useCallback(
- async (id: string) => {
- const deviceId = await getOrSetDeviceId();
- if (!deviceId || !authHeader) return;
-
- if (usingOptimizedServer) {
- try {
- await cancelJobById({
- authHeader,
- id,
- url: settings?.optimizedVersionsServerUrl,
- });
- } catch (error) {
- console.error(error);
- }
- }
-
- setProcesses((prev: any[]) => {
- return prev.filter(
- (process: { itemId: string | undefined }) => process.id !== id,
- );
- });
- },
- [settings?.optimizedVersionsServerUrl, authHeader],
- );
-
const APP_CACHE_DOWNLOAD_DIRECTORY = `${FileSystem.cacheDirectory}${Application.applicationId}/Downloads/`;
+ const getDownloadsDatabase = (): DownloadsDatabase => {
+ const file = storage.getString(DOWNLOADS_DATABASE_KEY);
+ if (file) {
+ return JSON.parse(file) as DownloadsDatabase;
+ }
+ return { movies: {}, series: {} };
+ };
+
+ const saveDownloadsDatabase = async (db: DownloadsDatabase) => {
+ storage.set(DOWNLOADS_DATABASE_KEY, JSON.stringify(db));
+ queryClient.invalidateQueries({ queryKey: ["downloadedItems"] });
+ };
+
+ /** Generates a filename for a given item */
+ const generateFilename = (item: BaseItemDto): string => {
+ let rawFilename = "";
+ if (item.Type === "Movie" && item.Name) {
+ rawFilename = `${item.Name}`;
+ } else if (
+ item.Type === "Episode" &&
+ item.SeriesName &&
+ item.ParentIndexNumber !== undefined &&
+ item.IndexNumber !== undefined
+ ) {
+ const season = String(item.ParentIndexNumber).padStart(2, "0");
+ const episode = String(item.IndexNumber).padStart(2, "0");
+ rawFilename = `${item.SeriesName} S${season}E${episode} ${item.Name}`;
+ } else {
+ // Fallback to a unique name if data is missing
+ rawFilename = `${item.Name || "video"} ${item.Id}`;
+ }
+ // Sanitize the entire string to remove illegal characters
+ return rawFilename.replace(/[\\/:*?"<>|\s]/g, "_");
+ };
+
+ /**
+ * Downloads the trickplay images for a given item.
+ * @param item - The item to download the trickplay images for.
+ * @returns The path to the trickplay images.
+ */
+ const downloadTrickplayImages = async (
+ item: BaseItemDto,
+ ): Promise => {
+ const trickplayInfo = getTrickplayInfo(item);
+ if (!api || !trickplayInfo || !item.Id) {
+ return undefined;
+ }
+
+ const filename = generateFilename(item);
+ const trickplayDir = `${FileSystem.documentDirectory}${filename}_trickplay/`;
+ await FileSystem.makeDirectoryAsync(trickplayDir, { intermediates: true });
+ let totalSize = 0;
+
+ for (let index = 0; index < trickplayInfo.totalImageSheets; index++) {
+ const url = generateTrickplayUrl(item, index);
+ if (!url) continue;
+ const destination = `${trickplayDir}${index}.jpg`;
+ try {
+ await FileSystem.downloadAsync(url, destination);
+ const fileInfo = await FileSystem.getInfoAsync(destination);
+ if (fileInfo.exists) {
+ totalSize += fileInfo.size;
+ }
+ } catch (e) {
+ console.error(
+ `Failed to download trickplay image ${index} for item ${item.Id}`,
+ e,
+ );
+ }
+ }
+
+ return { path: trickplayDir, size: totalSize };
+ };
+
+ /**
+ * Downloads and links external subtitles to the media source.
+ * @param mediaSource - The media source to download the subtitles for.
+ */
+ const downloadAndLinkSubtitles = async (
+ mediaSource: MediaSourceInfo,
+ item: BaseItemDto,
+ ) => {
+ const externalSubtitles = mediaSource.MediaStreams?.filter(
+ (stream) =>
+ stream.Type === "Subtitle" && stream.DeliveryMethod === "External",
+ );
+ if (externalSubtitles && api) {
+ await Promise.all(
+ externalSubtitles.map(async (subtitle) => {
+ const url = api.basePath + subtitle.DeliveryUrl;
+ const filename = generateFilename(item);
+ const destination = `${FileSystem.documentDirectory}${filename}_subtitle_${subtitle.Index}`;
+ await FileSystem.downloadAsync(url, destination);
+ subtitle.DeliveryUrl = destination;
+ }),
+ );
+ }
+ };
+
+ /**
+ * Starts a download for a given process.
+ * @param process - The process to start the download for.
+ */
const startDownload = useCallback(
async (process: JobStatus) => {
if (!process?.item.Id || !authHeader) throw new Error("No item id");
- setProcesses((prev) =>
- prev.map((p) =>
- p.id === process.id
- ? {
- ...p,
- speed: undefined,
- status: "downloading",
- progress: 0,
- }
- : p,
- ),
- );
+ updateProcess(process.id, {
+ speed: undefined,
+ status: "downloading",
+ progress: 0,
+ });
BackGroundDownloader?.setConfig({
- isLogsEnabled: true,
+ isLogsEnabled: false,
progressInterval: 500,
headers: {
Authorization: authHeader,
},
});
-
- toast.info(
- t("home.downloads.toasts.download_stated_for_item", {
- item: process.item.Name,
- }),
- {
- action: {
- label: t("home.downloads.toasts.go_to_downloads"),
- onClick: () => {
- router.push("/downloads");
- toast.dismiss();
- },
- },
- },
- );
-
- const baseDirectory = FileSystem.documentDirectory;
-
+ const filename = generateFilename(process.item);
+ const videoFilePath = `${FileSystem.documentDirectory}${filename}.mp4`;
BackGroundDownloader?.download({
id: process.id,
- url: getDownloadUrl(process),
- destination: `${baseDirectory}/${process.item.Id}.mp4`,
+ url: process.inputUrl,
+ destination: videoFilePath,
metadata: process,
})
.begin(() => {
- setProcesses((prev) =>
- prev.map((p) =>
- p.id === process.id
- ? {
- ...p,
- speed: undefined,
- status: "downloading",
- progress: 0,
- }
- : p,
- ),
- );
+ updateProcess(process.id, {
+ status: "downloading",
+ progress: 0,
+ bytesDownloaded: 0,
+ lastProgressUpdateTime: new Date(),
+ });
})
- .progress((data) => {
- if (!usingOptimizedServer) {
- return;
+ .progress(
+ throttle((data) => {
+ updateProcess(process.id, (currentProcess) => {
+ const percent = (data.bytesDownloaded / data.bytesTotal) * 100;
+ return {
+ speed: calculateSpeed(currentProcess, data.bytesDownloaded),
+ status: "downloading",
+ progress: percent,
+ bytesDownloaded: data.bytesDownloaded,
+ lastProgressUpdateTime: new Date(),
+ };
+ });
+ }, 500),
+ )
+ .done(async () => {
+ const trickPlayData = await downloadTrickplayImages(process.item);
+ const videoFileInfo = await FileSystem.getInfoAsync(videoFilePath);
+ if (!videoFileInfo.exists) {
+ throw new Error("Downloaded file does not exist");
}
- const percent = (data.bytesDownloaded / data.bytesTotal) * 100;
- setProcesses((prev) =>
- prev.map((p) =>
- p.id === process.id
- ? {
- ...p,
- speed: undefined,
- status: "downloading",
- progress: percent,
- }
- : p,
- ),
- );
- })
- .done(async (doneHandler) => {
- await saveDownloadedItemInfo(
- process.item,
- doneHandler.bytesDownloaded,
+ const videoFileSize = videoFileInfo.size;
+ const db = getDownloadsDatabase();
+ const { item, mediaSource } = process;
+ // Only download external subtitles for non-transcoded streams.
+ if (!mediaSource.TranscodingUrl) {
+ await downloadAndLinkSubtitles(mediaSource, item);
+ }
+ const { introSegments, creditSegments } = await fetchAndParseSegments(
+ item.Id!,
+ api!,
);
+ const downloadedItem: DownloadedItem = {
+ item,
+ mediaSource,
+ videoFilePath,
+ videoFileSize,
+ trickPlayData,
+ userData: {
+ audioStreamIndex: 0,
+ subtitleStreamIndex: 0,
+ },
+ introSegments,
+ creditSegments,
+ };
+
+ if (item.Type === "Movie" && item.Id) {
+ db.movies[item.Id] = downloadedItem;
+ } else if (
+ item.Type === "Episode" &&
+ item.SeriesId &&
+ item.ParentIndexNumber !== undefined &&
+ item.ParentIndexNumber !== null &&
+ item.IndexNumber !== undefined &&
+ item.IndexNumber !== null
+ ) {
+ if (!db.series[item.SeriesId]) {
+ const seriesInfo: Partial = {
+ Id: item.SeriesId,
+ Name: item.SeriesName,
+ Type: "Series",
+ };
+ db.series[item.SeriesId] = {
+ seriesInfo: seriesInfo as BaseItemDto,
+ seasons: {},
+ };
+ }
+
+ const seasonNumber = item.ParentIndexNumber;
+ if (!db.series[item.SeriesId].seasons[seasonNumber]) {
+ db.series[item.SeriesId].seasons[seasonNumber] = {
+ episodes: {},
+ };
+ }
+
+ const episodeNumber = item.IndexNumber;
+ db.series[item.SeriesId].seasons[seasonNumber].episodes[
+ episodeNumber
+ ] = downloadedItem;
+ }
+ await saveDownloadsDatabase(db);
+
toast.success(
t("home.downloads.toasts.download_completed_for_item", {
item: process.item.Name,
}),
- {
- duration: 3000,
- action: {
- label: t("home.downloads.toasts.go_to_downloads"),
- onClick: () => {
- router.push("/downloads");
- toast.dismiss();
- },
- },
- },
);
- setTimeout(() => {
- BackGroundDownloader.completeHandler(process.id);
- removeProcess(process.id);
- }, 1000);
- })
- .error(async (error) => {
removeProcess(process.id);
- BackGroundDownloader.completeHandler(process.id);
- let errorMsg = "";
- if (error.errorCode === 1000) {
- errorMsg = "No space left";
- }
- if (error.errorCode === 404) {
- errorMsg = "File not found on server";
- }
+ })
+ .error((error) => {
+ console.error("Download error:", error);
toast.error(
t("home.downloads.toasts.download_failed_for_item", {
item: process.item.Name,
- error: errorMsg,
}),
);
- writeToLog("ERROR", `Download failed for ${process.item.Name}`, {
- error,
- processDetails: {
- id: process.id,
- itemName: process.item.Name,
- itemId: process.item.Id,
- },
- });
- console.error("Error details:", {
- errorCode: error.errorCode,
- });
+ removeProcess(process.id);
});
},
- [queryClient, settings?.optimizedVersionsServerUrl, authHeader],
+ [authHeader, queryClient],
);
+ const manageDownloadQueue = useCallback(() => {
+ const activeDownloads = processes.filter(
+ (p) => p.status === "downloading",
+ ).length;
+ const concurrentLimit = settings?.remuxConcurrentLimit || 1;
+ if (activeDownloads < concurrentLimit) {
+ const queuedDownload = processes.find((p) => p.status === "queued");
+ if (queuedDownload) {
+ startDownload(queuedDownload);
+ }
+ }
+ }, [processes, settings?.remuxConcurrentLimit, startDownload]);
+
+ const removeProcess = useCallback(
+ async (id: string) => {
+ const tasks = await BackGroundDownloader.checkForExistingDownloads();
+ const task = tasks?.find((t) => t.id === id);
+ task?.stop();
+ BackGroundDownloader.completeHandler(id);
+ setProcesses((prev) => prev.filter((process) => process.id !== id));
+ manageDownloadQueue();
+ },
+ [setProcesses, manageDownloadQueue],
+ );
+
+ useEffect(() => {
+ manageDownloadQueue();
+ }, [processes, manageDownloadQueue]);
+
+ /**
+ * Cleans the cache directory.
+ */
+ const cleanCacheDirectory = async (): Promise => {
+ try {
+ await FileSystem.deleteAsync(APP_CACHE_DOWNLOAD_DIRECTORY, {
+ idempotent: true,
+ });
+ await FileSystem.makeDirectoryAsync(APP_CACHE_DOWNLOAD_DIRECTORY, {
+ intermediates: true,
+ });
+ } catch (_error) {
+ toast.error(t("Failed to clean cache directory."));
+ }
+ };
+
const startBackgroundDownload = useCallback(
async (
url: string,
item: BaseItemDto,
mediaSource: MediaSourceInfo,
- maxBitrate?: Bitrate,
+ maxBitrate: Bitrate,
) => {
if (!api || !item.Id || !authHeader)
throw new Error("startBackgroundDownload ~ Missing required params");
-
try {
- const fileExtension = mediaSource.TranscodingContainer;
- const deviceId = await getOrSetDeviceId();
-
+ const deviceId = getOrSetDeviceId();
await saveSeriesPrimaryImage(item);
const itemImage = getItemImage({
item,
@@ -433,46 +510,21 @@ function useDownloadProvider() {
width: 500,
});
await saveImage(item.Id, itemImage?.uri);
- if (usingOptimizedServer) {
- const response = await axios.post(
- `${settings?.optimizedVersionsServerUrl}optimize-version`,
- {
- url,
- fileExtension,
- deviceId,
- itemId: item.Id,
- item,
- },
- {
- headers: {
- "Content-Type": "application/json",
- Authorization: authHeader,
- },
- },
- );
-
- if (response.status !== 201) {
- throw new Error("Failed to start optimization job");
- }
- } else {
- const job: JobStatus = {
- id: item.Id!,
- deviceId: deviceId,
- inputUrl: url,
- item: item,
- itemId: item.Id!,
- mediaSource,
- progress: 0,
- maxBitrate,
- status: "downloading",
- timestamp: new Date(),
- };
- setProcesses([...processes, job]);
- startDownload(job);
- }
-
+ const job: JobStatus = {
+ id: item.Id!,
+ deviceId: deviceId,
+ maxBitrate,
+ inputUrl: url,
+ item: item,
+ itemId: item.Id!,
+ mediaSource,
+ progress: 0,
+ status: "queued",
+ timestamp: new Date(),
+ };
+ setProcesses((prev) => [...prev, job]);
toast.success(
- t("home.downloads.toasts.queued_item_for_optimization", {
+ t("home.downloads.toasts.download_stated_for_item", {
item: item.Name,
}),
{
@@ -487,394 +539,197 @@ function useDownloadProvider() {
);
} catch (error) {
writeToLog("ERROR", "Error in startBackgroundDownload", error);
- console.error("Error in startBackgroundDownload:", error);
- if (axios.isAxiosError(error)) {
- console.error("Axios error details:", {
- message: error.message,
- response: error.response?.data,
- status: error.response?.status,
- headers: error.response?.headers,
- });
- toast.error(
- t("home.downloads.toasts.failed_to_start_download_for_item", {
- item: item.Name,
- message: error.message,
- }),
- );
- if (error.response) {
- toast.error(
- t("home.downloads.toasts.server_responded_with_status", {
- statusCode: error.response.status,
- }),
- );
- } else if (error.request) {
- t("home.downloads.toasts.no_response_received_from_server");
- } else {
- toast.error("Error setting up the request");
- }
- } else {
- console.error("Non-Axios error:", error);
- toast.error(
- t(
- "home.downloads.toasts.failed_to_start_download_for_item_unexpected_error",
- { item: item.Name },
- ),
- );
- }
}
},
- [settings?.optimizedVersionsServerUrl, authHeader],
+ [authHeader, startDownload, queryClient],
);
- const deleteAllFiles = async (): Promise => {
- Promise.all([
- deleteLocalFiles(),
- removeDownloadedItemsFromStorage(),
- cancelAllServerJobs(),
- queryClient.invalidateQueries({ queryKey: ["downloadedItems"] }),
- ])
- .then(() =>
- toast.success(
- t(
- "home.downloads.toasts.all_files_folders_and_jobs_deleted_successfully",
- ),
- ),
- )
- .catch((reason) => {
- console.error("Failed to delete all files, folders, and jobs:", reason);
- toast.error(
- t(
- "home.downloads.toasts.an_error_occured_while_deleting_files_and_jobs",
- ),
- );
- });
- };
+ const deleteFile = async (id: string, type: "Movie" | "Episode") => {
+ const db = getDownloadsDatabase();
+ let downloadedItem: DownloadedItem | undefined;
- const forEveryDocumentDirFile = async (
- includeMMKV: boolean,
- ignoreList: string[],
- callback: (file: FileInfo) => void,
- ) => {
- const baseDirectory = FileSystem.documentDirectory;
- if (!baseDirectory) {
- throw new Error("Base directory not found");
- }
-
- const dirContents = await FileSystem.readDirectoryAsync(baseDirectory);
- for (const item of dirContents) {
- // Exclude mmkv directory.
- // Deleting this deletes all user information as well. Logout should handle this.
- if (
- (item === "mmkv" && !includeMMKV) ||
- ignoreList.some((i) => item.includes(i))
- ) {
- continue;
+ if (type === "Movie") {
+ downloadedItem = db.movies[id];
+ if (downloadedItem) {
+ delete db.movies[id];
}
- await FileSystem.getInfoAsync(`${baseDirectory}${item}`)
- .then((itemInfo) => {
- if (itemInfo.exists && !itemInfo.isDirectory) {
- callback(itemInfo);
+ } else if (type === "Episode") {
+ const cleanUpEmptyParents = (
+ series: any,
+ seasonNumber: string,
+ seriesId: string,
+ ) => {
+ if (!Object.keys(series.seasons[seasonNumber].episodes).length) {
+ delete series.seasons[seasonNumber];
+ }
+ if (!Object.keys(series.seasons).length) {
+ delete db.series[seriesId];
+ }
+ };
+
+ for (const [seriesId, series] of Object.entries(db.series)) {
+ for (const [seasonNumber, season] of Object.entries(series.seasons)) {
+ for (const [episodeNumber, episode] of Object.entries(
+ season.episodes,
+ )) {
+ if (episode.item.Id === id) {
+ downloadedItem = episode;
+ delete season.episodes[Number(episodeNumber)];
+ cleanUpEmptyParents(series, seasonNumber, seriesId);
+ break;
+ }
}
- })
- .catch((e) => console.error(e));
- }
- };
-
- const deleteLocalFiles = async (): Promise => {
- await forEveryDocumentDirFile(false, [], (file) => {
- console.warn("Deleting file", file.uri);
- FileSystem.deleteAsync(file.uri, { idempotent: true });
- });
- };
-
- const removeDownloadedItemsFromStorage = async () => {
- // delete any saved images first
- Promise.all([deleteFileByType("Movie"), deleteFileByType("Episode")])
- .then(() => storage.delete("downloadedItems"))
- .catch((reason) => {
- console.error("Failed to remove downloadedItems from storage:", reason);
- throw reason;
- });
- };
-
- const cancelAllServerJobs = async (): Promise => {
- if (!authHeader) {
- throw new Error("No auth header available");
- }
- if (!settings?.optimizedVersionsServerUrl) {
- console.error("No server URL configured");
- return;
- }
-
- const deviceId = await getOrSetDeviceId();
- if (!deviceId) {
- throw new Error("Failed to get device ID");
- }
-
- try {
- await cancelAllJobs({
- authHeader,
- url: settings.optimizedVersionsServerUrl,
- deviceId,
- });
- } catch (error) {
- console.error("Failed to cancel all server jobs:", error);
- throw error;
- }
- };
-
- const deleteFile = async (id: string): Promise => {
- if (!id) {
- console.error("Invalid file ID");
- return;
- }
-
- try {
- const directory = FileSystem.documentDirectory;
-
- if (!directory) {
- console.error("Document directory not found");
- return;
+ if (downloadedItem) break;
+ }
+ if (downloadedItem) break;
}
- const dirContents = await FileSystem.readDirectoryAsync(directory);
+ }
- for (const item of dirContents) {
- const itemNameWithoutExtension = item.split(".")[0];
- if (itemNameWithoutExtension === id) {
- const filePath = `${directory}${item}`;
- await FileSystem.deleteAsync(filePath, { idempotent: true });
- break;
+ if (downloadedItem?.videoFilePath) {
+ await FileSystem.deleteAsync(downloadedItem.videoFilePath, {
+ idempotent: true,
+ });
+ }
+
+ if (downloadedItem?.mediaSource?.MediaStreams) {
+ for (const stream of downloadedItem.mediaSource.MediaStreams) {
+ if (
+ stream.Type === "Subtitle" &&
+ stream.DeliveryMethod === "External"
+ ) {
+ await FileSystem.deleteAsync(stream.DeliveryUrl!, {
+ idempotent: true,
+ });
}
}
-
- const downloadedItems = storage.getString("downloadedItems");
- if (downloadedItems) {
- let items = JSON.parse(downloadedItems) as DownloadedItem[];
- items = items.filter((item) => item.item.Id !== id);
- storage.set("downloadedItems", JSON.stringify(items));
- }
-
- queryClient.invalidateQueries({ queryKey: ["downloadedItems"] });
- } catch (error) {
- console.error(
- `Failed to delete file and storage entry for ID ${id}:`,
- error,
- );
}
+
+ if (downloadedItem?.trickPlayData?.path) {
+ await FileSystem.deleteAsync(downloadedItem.trickPlayData.path, {
+ idempotent: true,
+ });
+ }
+
+ await saveDownloadsDatabase(db);
+ successHapticFeedback();
};
const deleteItems = async (items: BaseItemDto[]) => {
- Promise.all(
- items.map((i) => {
- if (i.Id) return deleteFile(i.Id);
- return;
- }),
- ).then(() => successHapticFeedback());
- };
-
- const cleanCacheDirectory = async () => {
- const cacheDir = await FileSystem.getInfoAsync(
- APP_CACHE_DOWNLOAD_DIRECTORY,
- );
- if (cacheDir.exists) {
- const cachedFiles = await FileSystem.readDirectoryAsync(
- APP_CACHE_DOWNLOAD_DIRECTORY,
- );
- let position = 0;
- const batchSize = 3;
-
- // batching promise.all to avoid OOM
- while (position < cachedFiles.length) {
- const itemsForBatch = cachedFiles.slice(position, position + batchSize);
- await Promise.all(
- itemsForBatch.map(async (file) => {
- const info = await FileSystem.getInfoAsync(
- `${APP_CACHE_DOWNLOAD_DIRECTORY}${file}`,
- );
- if (info.exists) {
- await FileSystem.deleteAsync(info.uri, { idempotent: true });
- return Promise.resolve(file);
- }
- return Promise.reject();
- }),
- );
-
- position += batchSize;
+ for (const item of items) {
+ if (item.Id && (item.Type === "Movie" || item.Type === "Episode")) {
+ await deleteFile(item.Id, item.Type);
}
}
};
+ /** Deletes all files */
+ const deleteAllFiles = async (): Promise => {
+ await deleteFileByType("Movie");
+ await deleteFileByType("Episode");
+ toast.success(
+ t(
+ "home.downloads.toasts.all_files_folders_and_jobs_deleted_successfully",
+ ),
+ );
+ };
+
+ /** Deletes all files of a given type. */
const deleteFileByType = async (type: BaseItemDto["Type"]) => {
- await Promise.all(
- downloadedFiles
- ?.filter((file) => file.item.Type === type)
- ?.flatMap((file) => {
- const promises = [];
- if (type === "Episode" && file.item.SeriesId)
- promises.push(deleteFile(file.item.SeriesId));
- promises.push(deleteFile(file.item.Id!));
- return promises;
- }) || [],
+ const itemsToDelete = downloadedItems?.filter(
+ (file) => file.item.Type === type,
);
+ if (itemsToDelete) await deleteItems(itemsToDelete.map((i) => i.item));
};
- const appSizeUsage = useMemo(async () => {
- const sizes: number[] =
- downloadedFiles?.map((d) => {
- return getDownloadedItemSize(d.item.Id!);
- }) || [];
+ /** Returns the size of a downloaded item. */
+ const getDownloadedItemSize = (itemId: string): number => {
+ const downloadedItem = getDownloadedItemById(itemId);
+ if (!downloadedItem) return 0;
- await forEveryDocumentDirFile(
- true,
- getAllDownloadedItems().map((d) => d.item.Id!),
- (file) => {
- if (file.exists) {
- sizes.push(file.size);
+ const trickplaySize = downloadedItem.trickPlayData?.size || 0;
+ return downloadedItem.videoFileSize + trickplaySize;
+ };
+
+ /** Updates a downloaded item. */
+ const updateDownloadedItem = (
+ itemId: string,
+ updatedItem: DownloadedItem,
+ ) => {
+ const db = getDownloadsDatabase();
+ if (db.movies[itemId]) {
+ db.movies[itemId] = updatedItem;
+ } else {
+ for (const series of Object.values(db.series)) {
+ for (const season of Object.values(series.seasons)) {
+ for (const episode of Object.values(season.episodes)) {
+ if (episode.item.Id === itemId) {
+ season.episodes[episode.item.IndexNumber as number] = updatedItem;
+ }
+ }
}
- },
- ).catch((e) => {
- console.error(e);
- });
-
- return sizes.reduce((sum, size) => sum + size, 0);
- }, [logs, downloadedFiles, forEveryDocumentDirFile]);
-
- function getDownloadedItem(itemId: string): DownloadedItem | null {
- try {
- const downloadedItems = storage.getString("downloadedItems");
- if (downloadedItems) {
- const items: DownloadedItem[] = JSON.parse(downloadedItems);
- const item = items.find((i) => i.item.Id === itemId);
- return item || null;
}
- return null;
- } catch (error) {
- console.error(`Failed to retrieve item with ID ${itemId}:`, error);
- return null;
}
- }
+ saveDownloadsDatabase(db);
+ };
- function getAllDownloadedItems(): DownloadedItem[] {
- try {
- const downloadedItems = storage.getString("downloadedItems");
- if (downloadedItems) {
- return JSON.parse(downloadedItems) as DownloadedItem[];
- }
- return [];
- } catch (error) {
- console.error("Failed to retrieve downloaded items:", error);
- return [];
- }
- }
+ /**
+ * Returns the size of the app and the remaining space on the device.
+ * @returns The size of the app and the remaining space on the device.
+ */
+ const appSizeUsage = async () => {
+ const [total, remaining] = await Promise.all([
+ FileSystem.getTotalDiskCapacityAsync(),
+ FileSystem.getFreeDiskStorageAsync(),
+ ]);
- function saveDownloadedItemInfo(item: BaseItemDto, size = 0) {
- try {
- const downloadedItems = storage.getString("downloadedItems");
- const items: DownloadedItem[] = downloadedItems
- ? JSON.parse(downloadedItems)
- : [];
-
- const existingItemIndex = items.findIndex((i) => i.item.Id === item.Id);
-
- const data = getDownloadItemInfoFromDiskTmp(item.Id!);
-
- if (!data?.mediaSource)
- throw new Error(
- "Media source not found in tmp storage. Did you forget to save it before starting download?",
- );
-
- const newItem = { item, mediaSource: data.mediaSource };
-
- if (existingItemIndex !== -1) {
- items[existingItemIndex] = newItem;
- } else {
- items.push(newItem);
- }
-
- deleteDownloadItemInfoFromDiskTmp(item.Id!);
-
- storage.set("downloadedItems", JSON.stringify(items));
- storage.set(`downloadedItemSize-${item.Id}`, size.toString());
-
- queryClient.invalidateQueries({ queryKey: ["downloadedItems"] });
- refetch();
- } catch (error) {
- console.error(
- "Failed to save downloaded item information with media source:",
- error,
+ let appSize = 0;
+ const downloadedFiles = await FileSystem.readDirectoryAsync(
+ `${FileSystem.documentDirectory!}`,
+ );
+ for (const file of downloadedFiles) {
+ const fileInfo = await FileSystem.getInfoAsync(
+ `${FileSystem.documentDirectory!}${file}`,
);
+ if (fileInfo.exists) {
+ appSize += fileInfo.size;
+ }
}
- }
-
- function getDownloadedItemSize(itemId: string): number {
- const size = storage.getString(`downloadedItemSize-${itemId}`);
- return size ? Number.parseInt(size) : 0;
- }
+ return { total, remaining, app: appSize };
+ };
return {
processes,
startBackgroundDownload,
- downloadedFiles,
+ downloadedFiles: downloadedItems,
+ getDownloadsDatabase,
deleteAllFiles,
deleteFile,
deleteItems,
- saveDownloadedItemInfo,
removeProcess,
- setProcesses,
startDownload,
- getDownloadedItem,
deleteFileByType,
- appSizeUsage,
getDownloadedItemSize,
+ getDownloadedItemById,
APP_CACHE_DOWNLOAD_DIRECTORY,
cleanCacheDirectory,
+ updateDownloadedItem,
+ appSizeUsage,
};
}
-export function DownloadProvider({ children }: { children: React.ReactNode }) {
- const downloadProviderValue = useDownloadProvider();
-
- return (
-
- {children}
-
- );
-}
-
export function useDownload() {
- if (Platform.isTV) {
- // Since tv doesn't do downloads, just return no-op functions for everything
- return {
- processes: [],
- startBackgroundDownload: useCallback(
- async (
- _url: string,
- _item: BaseItemDto,
- _mediaSource: MediaSourceInfo,
- _maxBitrate?: Bitrate,
- ) => {},
- [],
- ),
- downloadedFiles: [],
- deleteAllFiles: async (): Promise => {},
- deleteFile: async (id: string): Promise => {},
- deleteItems: async (items: BaseItemDto[]) => {},
- saveDownloadedItemInfo: (item: BaseItemDto, size?: number) => {},
- removeProcess: (id: string) => {},
- setProcesses: () => {},
- startDownload: async (_process: JobStatus): Promise => {},
- getDownloadedItem: (itemId: string) => {},
- deleteFileByType: async (_type: BaseItemDto["Type"]) => {},
- appSizeUsage: async () => 0,
- getDownloadedItemSize: (itemId: string) => {},
- APP_CACHE_DOWNLOAD_DIRECTORY: "",
- cleanCacheDirectory: async (): Promise => {},
- };
- }
-
const context = useContext(DownloadContext);
if (context === null) {
throw new Error("useDownload must be used within a DownloadProvider");
}
return context;
}
+
+export function DownloadProvider({ children }: { children: React.ReactNode }) {
+ const downloadUtils = useDownloadProvider();
+ return (
+
+ {children}
+
+ );
+}
diff --git a/providers/Downloads/types.ts b/providers/Downloads/types.ts
new file mode 100644
index 00000000..9f823879
--- /dev/null
+++ b/providers/Downloads/types.ts
@@ -0,0 +1,117 @@
+import type {
+ BaseItemDto,
+ MediaSourceInfo,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { Bitrate } from "@/components/BitrateSelector";
+
+/**
+ * Represents the data for downloaded trickplay files.
+ */
+export interface TrickPlayData {
+ /** The local directory path where trickplay image sheets are stored. */
+ path: string;
+ /** The total size of all trickplay images in bytes. */
+ size: number;
+}
+
+/**
+ * Represents the user data for a downloaded item.
+ */
+interface UserData {
+ subtitleStreamIndex: number;
+ /** The last known audio stream index. */
+ audioStreamIndex: number;
+}
+
+/** Represents a segment of time in a media item, used for intro/credit skipping. */
+export interface MediaTimeSegment {
+ startTime: number;
+ endTime: number;
+ text: string;
+}
+
+export interface Segment {
+ startTime: number;
+ endTime: number;
+ text: string;
+}
+
+/** Represents a single downloaded media item with all necessary metadata for offline playback. */
+export interface DownloadedItem {
+ /** The Jellyfin item DTO. */
+ item: BaseItemDto;
+ /** The media source information. */
+ mediaSource: MediaSourceInfo;
+ /** The local file path of the downloaded video. */
+ videoFilePath: string;
+ /** The size of the video file in bytes. */
+ videoFileSize: number;
+ /** The local file path of the downloaded trickplay images. */
+ trickPlayData?: TrickPlayData;
+ /** The intro segments for the item. */
+ introSegments?: MediaTimeSegment[];
+ /** The credit segments for the item. */
+ creditSegments?: MediaTimeSegment[];
+ /** The user data for the item. */
+ userData: UserData;
+}
+/**
+ * Represents a downloaded Season, containing a map of its episodes.
+ */
+export interface DownloadedSeason {
+ /** A map of episode numbers to their downloaded item data. */
+ episodes: Record;
+}
+
+/**
+ * Represents a downloaded series, containing seasons and their episodes.
+ */
+export interface DownloadedSeries {
+ /** The Jellyfin item DTO for the series. */
+ seriesInfo: BaseItemDto;
+ /** A map of season numbers to their downloaded season data. */
+ seasons: Record<
+ number,
+ {
+ /** A map of episode numbers to their downloaded episode data. */
+ episodes: Record;
+ }
+ >;
+}
+
+/**
+ * The main structure for all downloaded content stored locally.
+ * This object is what will be saved to your local storage.
+ */
+export interface DownloadsDatabase {
+ /** A map of movie IDs to their downloaded movie data. */
+ movies: Record;
+ /** A map of series IDs to their downloaded series data. */
+ series: Record;
+}
+
+/**
+ * Represents the status of a download job.
+ */
+export type JobStatus = {
+ id: string;
+ inputUrl: string;
+ item: BaseItemDto;
+ itemId: string;
+ deviceId: string;
+ progress: number;
+ status:
+ | "downloading"
+ | "paused"
+ | "error"
+ | "pending"
+ | "completed"
+ | "queued";
+ timestamp: Date;
+ mediaSource: MediaSourceInfo;
+ maxBitrate: Bitrate;
+ bytesDownloaded?: number;
+ lastProgressUpdateTime?: Date;
+ speed?: number;
+ estimatedTotalSizeBytes?: number;
+};
diff --git a/providers/JellyfinProvider.tsx b/providers/JellyfinProvider.tsx
index 339eeae2..f720a700 100644
--- a/providers/JellyfinProvider.tsx
+++ b/providers/JellyfinProvider.tsx
@@ -1,22 +1,16 @@
import "@/augmentations";
-import { useInterval } from "@/hooks/useInterval";
-import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
-import { useSettings } from "@/utils/atoms/settings";
-import { writeErrorLog, writeInfoLog } from "@/utils/log";
-import { storage } from "@/utils/mmkv";
-import { store } from "@/utils/store";
import { type Api, Jellyfin } from "@jellyfin/sdk";
import type { UserDto } from "@jellyfin/sdk/lib/generated-client/models";
import { getUserApi } from "@jellyfin/sdk/lib/utils/api";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
import axios, { AxiosError } from "axios";
import { router, useSegments } from "expo-router";
import * as SplashScreen from "expo-splash-screen";
import { atom, useAtom } from "jotai";
import type React from "react";
import {
- type ReactNode,
createContext,
+ type ReactNode,
useCallback,
useContext,
useEffect,
@@ -27,6 +21,12 @@ import { useTranslation } from "react-i18next";
import { Platform } from "react-native";
import { getDeviceName } from "react-native-device-info";
import uuid from "react-native-uuid";
+import { useInterval } from "@/hooks/useInterval";
+import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
+import { useSettings } from "@/utils/atoms/settings";
+import { writeErrorLog, writeInfoLog } from "@/utils/log";
+import { storage } from "@/utils/mmkv";
+import { store } from "@/utils/store";
interface Server {
address: string;
@@ -64,7 +64,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
setJellyfin(
() =>
new Jellyfin({
- clientInfo: { name: "Streamyfin", version: "0.28.0" },
+ clientInfo: { name: "Streamyfin", version: "0.28.1" },
deviceInfo: {
name: deviceName,
id,
@@ -80,9 +80,9 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
const [isPolling, setIsPolling] = useState(false);
const [secret, setSecret] = useState(null);
const [
- settings,
- updateSettings,
- pluginSettings,
+ _settings,
+ _updateSettings,
+ _pluginSettings,
setPluginSettings,
refreshStreamyfinPluginSettings,
] = useSettings();
@@ -91,9 +91,8 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
const headers = useMemo(() => {
if (!deviceId) return {};
return {
- authorization: `MediaBrowser Client="Streamyfin", Device=${
- Platform.OS === "android" ? "Android" : "iOS"
- }, DeviceId="${deviceId}", Version="0.28.0"`,
+ authorization: `MediaBrowser Client="Streamyfin", Device=${Platform.OS === "android" ? "Android" : "iOS"
+ }, DeviceId="${deviceId}", Version="0.28.1"`,
};
}, [deviceId]);
@@ -287,8 +286,8 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
mutationFn: async () => {
api
?.delete(`/Streamyfin/device/${deviceId}`)
- .then((r) => writeInfoLog("Deleted expo push token for device"))
- .catch((e) =>
+ .then((_r) => writeInfoLog("Deleted expo push token for device"))
+ .catch((_e) =>
writeErrorLog("Failed to delete expo push token for device"),
);
@@ -380,8 +379,6 @@ function useProtectedRoute(user: UserDto | null, loaded = false) {
useEffect(() => {
if (loaded === false) return;
- console.log("Loaded", user);
-
const inAuthGroup = segments[0] === "(auth)";
if (!user?.Id && inAuthGroup) {
diff --git a/providers/JobQueueProvider.tsx b/providers/JobQueueProvider.tsx
deleted file mode 100644
index 232a5f02..00000000
--- a/providers/JobQueueProvider.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useJobProcessor } from "@/utils/atoms/queue";
-import type React from "react";
-import { createContext } from "react";
-
-const JobQueueContext = createContext(null);
-
-export const JobQueueProvider: React.FC<{ children: React.ReactNode }> = ({
- children,
-}) => {
- useJobProcessor();
-
- return (
- {children}
- );
-};
diff --git a/providers/PlaySettingsProvider.tsx b/providers/PlaySettingsProvider.tsx
index cf61248d..1cdc2821 100644
--- a/providers/PlaySettingsProvider.tsx
+++ b/providers/PlaySettingsProvider.tsx
@@ -1,21 +1,14 @@
-import type { Bitrate } from "@/components/BitrateSelector";
-import { settingsAtom } from "@/utils/atoms/settings";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import generateDeviceProfile from "@/utils/profiles/native";
import type {
BaseItemDto,
MediaSourceInfo,
} from "@jellyfin/sdk/lib/generated-client";
-import { getSessionApi } from "@jellyfin/sdk/lib/utils/api";
import { useAtomValue } from "jotai";
import type React from "react";
-import {
- createContext,
- useCallback,
- useContext,
- useEffect,
- useState,
-} from "react";
+import { createContext, useCallback, useContext, useState } from "react";
+import type { Bitrate } from "@/components/BitrateSelector";
+import { settingsAtom } from "@/utils/atoms/settings";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import { generateDeviceProfile } from "@/utils/profiles/native";
import { apiAtom, userAtom } from "./JellyfinProvider";
export type PlaybackType = {
diff --git a/translations/en.json b/translations/en.json
index 7b8faad5..ffbb8f41 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -408,6 +408,7 @@
"download_episode": "Download Episode",
"download_movie": "Download Movie",
"download_x_item": "Download {{item_count}} items",
+ "download_unwatched_only": "Unwatched Only",
"download_button": "Download",
"using_optimized_server": "Using optimized server",
"using_default_method": "Using default method"
diff --git a/utils/atoms/filters.ts b/utils/atoms/filters.ts
index 4ce23122..df9c5c78 100644
--- a/utils/atoms/filters.ts
+++ b/utils/atoms/filters.ts
@@ -8,7 +8,6 @@ export enum SortByOption {
CommunityRating = "CommunityRating",
CriticRating = "CriticRating",
DateCreated = "DateCreated",
- DateLastContentAdded = "DateLastContentAdded",
DatePlayed = "DatePlayed",
PlayCount = "PlayCount",
ProductionYear = "ProductionYear",
@@ -38,7 +37,6 @@ export const sortOptions: {
{ key: SortByOption.CommunityRating, value: "Community Rating" },
{ key: SortByOption.CriticRating, value: "Critics Rating" },
{ key: SortByOption.DateCreated, value: "Date Added" },
- { key: SortByOption.DateLastContentAdded, value: "Date Episode Added" },
{ key: SortByOption.DatePlayed, value: "Date Played" },
{ key: SortByOption.PlayCount, value: "Play Count" },
{ key: SortByOption.ProductionYear, value: "Production Year" },
diff --git a/utils/atoms/queue.ts b/utils/atoms/queue.ts
index 573d964f..f681ea2d 100644
--- a/utils/atoms/queue.ts
+++ b/utils/atoms/queue.ts
@@ -1,9 +1,9 @@
-import { processesAtom } from "@/providers/DownloadProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import type { JobStatus } from "@/utils/optimize-server";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { atom, useAtom } from "jotai";
import { useEffect } from "react";
+import { processesAtom } from "@/providers/DownloadProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { JobStatus } from "@/providers/Downloads/types";
export interface Job {
id: string;
@@ -68,5 +68,5 @@ export const useJobProcessor = () => {
console.info("Processing queue", queue);
queueActions.processJob(queue, setQueue, setRunning);
}
- }, [processes, queue, running, setQueue, setRunning]);
+ }, [processes, queue, running, setQueue, setRunning, settings]);
};
diff --git a/utils/atoms/settings.ts b/utils/atoms/settings.ts
index d21d3839..54f94db8 100644
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -1,8 +1,3 @@
-import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { Video } from "@/utils/jellyseerr/server/models/Movie";
-import { writeInfoLog } from "@/utils/log";
import {
type BaseItemKind,
type CultureDto,
@@ -14,9 +9,13 @@ import {
import { atom, useAtom, useAtomValue } from "jotai";
import { useCallback, useEffect, useMemo } from "react";
import { Platform } from "react-native";
+import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
+import * as ScreenOrientation from "@/packages/expo-screen-orientation";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { writeInfoLog } from "@/utils/log";
import { storage } from "../mmkv";
-const STREAMYFIN_PLUGIN_ID = "1e9e5d386e6746158719e98a5c34f004";
+const _STREAMYFIN_PLUGIN_ID = "1e9e5d386e6746158719e98a5c34f004";
const STREAMYFIN_PLUGIN_SETTINGS = "STREAMYFIN_PLUGIN_SETTINGS";
export type DownloadQuality = "original" | "high" | "low";
@@ -82,7 +81,6 @@ export type DefaultLanguageOption = {
export enum DownloadMethod {
Remux = "remux",
- Optimized = "optimized",
}
export type Home = {
@@ -156,7 +154,6 @@ export type Settings = {
defaultVideoOrientation: ScreenOrientation.OrientationLock;
forwardSkipTime: number;
rewindSkipTime: number;
- optimizedVersionsServerUrl?: string | null;
downloadMethod: DownloadMethod;
autoDownload: boolean;
showCustomMenuLinks: boolean;
@@ -213,7 +210,6 @@ const defaultValues: Settings = {
defaultVideoOrientation: ScreenOrientation.OrientationLock.DEFAULT,
forwardSkipTime: 30,
rewindSkipTime: 10,
- optimizedVersionsServerUrl: null,
downloadMethod: DownloadMethod.Remux,
autoDownload: false,
showCustomMenuLinks: false,
@@ -224,7 +220,7 @@ const defaultValues: Settings = {
jellyseerrServerUrl: undefined,
hiddenLibraries: [],
enableH265ForChromecast: false,
- defaultPlayer: VideoPlayer.VLC_3, // ios-only setting. does not matter what this is for android
+ defaultPlayer: VideoPlayer.VLC_4, // ios-only setting. does not matter what this is for android
maxAutoPlayEpisodeCount: { key: "3", value: 3 },
autoPlayEpisodeCount: 0,
};
@@ -288,7 +284,7 @@ export const useSettings = () => {
writeInfoLog("Got plugin settings", data?.settings);
return data?.settings;
},
- (err) => undefined,
+ (_err) => undefined,
);
setPluginSettings(settings);
return settings;
diff --git a/utils/jellyfin/getDefaultPlaySettings.ts b/utils/jellyfin/getDefaultPlaySettings.ts
index 2c32b615..db3d97c9 100644
--- a/utils/jellyfin/getDefaultPlaySettings.ts
+++ b/utils/jellyfin/getDefaultPlaySettings.ts
@@ -1,10 +1,11 @@
// utils/getDefaultPlaySettings.ts
-import { BITRATES } from "@/components/BitrateSelector";
+
import type {
BaseItemDto,
MediaSourceInfo,
} from "@jellyfin/sdk/lib/generated-client";
-import { type Settings, useSettings } from "../atoms/settings";
+import { BITRATES } from "@/components/BitrateSelector";
+import { type Settings } from "../atoms/settings";
import {
AudioStreamRanker,
StreamRanker,
@@ -50,18 +51,9 @@ export function getDefaultPlaySettings(
const mediaSource = item.MediaSources?.[0];
- // 2. Get default or preferred audio
- const defaultAudioIndex = mediaSource?.DefaultAudioStreamIndex;
- const preferedAudioIndex = mediaSource?.MediaStreams?.find(
- (x) => x.Type === "Audio" && x.Language === settings?.defaultAudioLanguage,
- )?.Index;
- const firstAudioIndex = mediaSource?.MediaStreams?.find(
- (x) => x.Type === "Audio",
- )?.Index;
-
// We prefer the previous track over the default track.
const trackOptions: TrackOptions = {
- DefaultAudioStreamIndex: defaultAudioIndex ?? -1,
+ DefaultAudioStreamIndex: mediaSource?.DefaultAudioStreamIndex ?? -1,
DefaultSubtitleStreamIndex: mediaSource?.DefaultSubtitleStreamIndex ?? -1,
};
diff --git a/utils/jellyfin/media/getDownloadUrl.ts b/utils/jellyfin/media/getDownloadUrl.ts
new file mode 100644
index 00000000..7812123f
--- /dev/null
+++ b/utils/jellyfin/media/getDownloadUrl.ts
@@ -0,0 +1,68 @@
+import type { Api } from "@jellyfin/sdk";
+import type {
+ BaseItemDto,
+ MediaSourceInfo,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { Bitrate } from "@/components/BitrateSelector";
+import { generateDeviceProfile } from "@/utils/profiles/native";
+import { getDownloadStreamUrl, getStreamUrl } from "./getStreamUrl";
+
+export const getDownloadUrl = async ({
+ api,
+ item,
+ userId,
+ mediaSource,
+ maxBitrate,
+ audioStreamIndex,
+ subtitleStreamIndex,
+ deviceId,
+}: {
+ api: Api;
+ item: BaseItemDto;
+ userId: string;
+ mediaSource: MediaSourceInfo;
+ maxBitrate: Bitrate;
+ audioStreamIndex: number;
+ subtitleStreamIndex: number;
+ deviceId: string;
+}): Promise<{
+ url: string | null;
+ mediaSource: MediaSourceInfo | null;
+} | null> => {
+ const streamDetails = await getStreamUrl({
+ api,
+ item,
+ userId,
+ startTimeTicks: 0,
+ mediaSourceId: mediaSource.Id,
+ maxStreamingBitrate: maxBitrate.value,
+ audioStreamIndex,
+ subtitleStreamIndex,
+ deviceId,
+ deviceProfile: await generateDeviceProfile(),
+ });
+
+ if (maxBitrate.key === "Max" && !streamDetails?.mediaSource?.TranscodingUrl) {
+ console.log("Downloading item directly");
+ return {
+ url: `${api.basePath}/Items/${item.Id}/Download?api_key=${api.accessToken}`,
+ mediaSource: streamDetails?.mediaSource ?? null,
+ };
+ }
+
+ const downloadStreamDetails = await getDownloadStreamUrl({
+ api,
+ item,
+ userId,
+ mediaSourceId: mediaSource.Id,
+ deviceId,
+ maxStreamingBitrate: maxBitrate.value,
+ audioStreamIndex,
+ subtitleStreamIndex,
+ });
+
+ return {
+ url: downloadStreamDetails?.url ?? null,
+ mediaSource: downloadStreamDetails?.mediaSource ?? null,
+ };
+};
diff --git a/utils/jellyfin/media/getStreamUrl.ts b/utils/jellyfin/media/getStreamUrl.ts
index 6960c388..bb2be0d3 100644
--- a/utils/jellyfin/media/getStreamUrl.ts
+++ b/utils/jellyfin/media/getStreamUrl.ts
@@ -1,12 +1,10 @@
-import generateDeviceProfile from "@/utils/profiles/native";
import type { Api } from "@jellyfin/sdk";
import type {
BaseItemDto,
MediaSourceInfo,
- PlaybackInfoResponse,
} from "@jellyfin/sdk/lib/generated-client/models";
import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
-import { Alert } from "react-native";
+import download from "@/utils/profiles/download";
export const getStreamUrl = async ({
api,
@@ -15,11 +13,10 @@ export const getStreamUrl = async ({
startTimeTicks = 0,
maxStreamingBitrate,
playSessionId,
- deviceProfile = generateDeviceProfile(),
+ deviceProfile,
audioStreamIndex = 0,
subtitleStreamIndex = undefined,
mediaSourceId,
- download = false,
deviceId,
}: {
api: Api | null | undefined;
@@ -28,12 +25,11 @@ export const getStreamUrl = async ({
startTimeTicks: number;
maxStreamingBitrate?: number;
playSessionId?: string | null;
- deviceProfile?: any;
+ deviceProfile: any;
audioStreamIndex?: number;
subtitleStreamIndex?: number;
height?: number;
mediaSourceId?: string | null;
- download?: bool;
deviceId?: string | null;
}): Promise<{
url: string | null;
@@ -73,12 +69,16 @@ export const getStreamUrl = async ({
}
sessionId = res.data.PlaySessionId || null;
- mediaSource = res.data.MediaSources[0];
- let transcodeUrl = mediaSource.TranscodingUrl;
+ mediaSource = res.data.MediaSources?.[0];
+ let transcodeUrl = mediaSource?.TranscodingUrl;
if (transcodeUrl) {
- if (download) {
- transcodeUrl = transcodeUrl.replace("master.m3u8", "stream");
+ // We need to change the subtitle method to hls for the transcoded url.
+ if (subtitleStreamIndex === -1) {
+ transcodeUrl = transcodeUrl.replace(
+ "SubtitleMethod=Encode",
+ "SubtitleMethod=Hls",
+ );
}
console.log("Video is being transcoded:", transcodeUrl);
return {
@@ -88,21 +88,6 @@ export const getStreamUrl = async ({
};
}
- let downloadParams = {};
-
- if (download) {
- // We need to disable static so we can have a remux with subtitle.
- downloadParams = {
- subtitleMethod: "Embed",
- enableSubtitlesInManifest: true,
- static: "false",
- allowVideoStreamCopy: true,
- allowAudioStreamCopy: true,
- playSessionId: sessionId || "",
- container: "ts",
- };
- }
-
const streamParams = new URLSearchParams({
static: "true",
container: "mp4",
@@ -114,7 +99,6 @@ export const getStreamUrl = async ({
startTimeTicks: startTimeTicks.toString(),
maxStreamingBitrate: maxStreamingBitrate?.toString() || "",
userId: userId || "",
- ...downloadParams,
});
const directPlayUrl = `${
@@ -125,7 +109,113 @@ export const getStreamUrl = async ({
return {
url: directPlayUrl,
- sessionId: sessionId || playSessionId,
+ sessionId: sessionId || playSessionId || null,
+ mediaSource,
+ };
+};
+
+export const getDownloadStreamUrl = async ({
+ api,
+ item,
+ userId,
+ maxStreamingBitrate,
+ audioStreamIndex = 0,
+ subtitleStreamIndex = undefined,
+ mediaSourceId,
+ deviceId,
+}: {
+ api: Api | null | undefined;
+ item: BaseItemDto | null | undefined;
+ userId: string | null | undefined;
+ maxStreamingBitrate?: number;
+ audioStreamIndex?: number;
+ subtitleStreamIndex?: number;
+ mediaSourceId?: string | null;
+ deviceId?: string | null;
+}): Promise<{
+ url: string | null;
+ sessionId: string | null;
+ mediaSource: MediaSourceInfo | undefined;
+} | null> => {
+ if (!api || !userId || !item?.Id) {
+ console.warn("Missing required parameters for getStreamUrl");
+ return null;
+ }
+
+ let mediaSource: MediaSourceInfo | undefined;
+ let sessionId: string | null | undefined;
+
+ const res = await getMediaInfoApi(api).getPlaybackInfo(
+ {
+ itemId: item.Id!,
+ },
+ {
+ method: "POST",
+ data: {
+ userId,
+ deviceProfile: download,
+ subtitleStreamIndex,
+ startTimeTicks: 0,
+ isPlayback: true,
+ autoOpenLiveStream: true,
+ maxStreamingBitrate,
+ audioStreamIndex,
+ mediaSourceId,
+ },
+ },
+ );
+
+ if (res.status !== 200) {
+ console.error("Error getting playback info:", res.status, res.statusText);
+ }
+
+ sessionId = res.data.PlaySessionId || null;
+ mediaSource = res.data.MediaSources?.[0];
+ let transcodeUrl = mediaSource?.TranscodingUrl;
+
+ if (transcodeUrl) {
+ transcodeUrl = transcodeUrl.replace("master.m3u8", "stream");
+ console.log("Video is being transcoded:", transcodeUrl);
+ return {
+ url: `${api.basePath}${transcodeUrl}`,
+ sessionId,
+ mediaSource,
+ };
+ }
+
+ const downloadParams = {
+ // We need to disable static so we can have a remux with subtitle.
+ subtitleMethod: "Embed",
+ enableSubtitlesInManifest: true,
+ allowVideoStreamCopy: true,
+ allowAudioStreamCopy: true,
+ playSessionId: sessionId || "",
+ };
+
+ const streamParams = new URLSearchParams({
+ static: "false",
+ container: "ts",
+ mediaSourceId: mediaSource?.Id || "",
+ subtitleStreamIndex: subtitleStreamIndex?.toString() || "",
+ audioStreamIndex: audioStreamIndex?.toString() || "",
+ deviceId: deviceId || api.deviceInfo.id,
+ api_key: api.accessToken,
+ startTimeTicks: "0",
+ maxStreamingBitrate: maxStreamingBitrate?.toString() || "",
+ userId: userId || "",
+ });
+
+ Object.entries(downloadParams).forEach(([key, value]) => {
+ streamParams.append(key, value.toString());
+ });
+
+ const directPlayUrl = `${
+ api.basePath
+ }/Videos/${item.Id}/stream?${streamParams.toString()}`;
+
+ return {
+ url: directPlayUrl,
+ sessionId: sessionId || null,
mediaSource,
};
};
diff --git a/utils/jellyfin/playstate/markAsNotPlayed.ts b/utils/jellyfin/playstate/markAsNotPlayed.ts
deleted file mode 100644
index 1478c965..00000000
--- a/utils/jellyfin/playstate/markAsNotPlayed.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { Api } from "@jellyfin/sdk";
-import type { AxiosError } from "axios";
-
-interface MarkAsNotPlayedParams {
- api: Api | null | undefined;
- itemId: string | null | undefined;
- userId: string | null | undefined;
-}
-
-/**
- * Marks a media item as not played for a specific user.
- *
- * @param params - The parameters for marking an item as not played
- * @returns A promise that resolves to true if the operation was successful, false otherwise
- */
-export const markAsNotPlayed = async ({
- api,
- itemId,
- userId,
-}: MarkAsNotPlayedParams): Promise => {
- if (!api || !itemId || !userId) {
- console.error("Invalid parameters for markAsNotPlayed");
- return;
- }
-
- try {
- await api.axiosInstance.delete(
- `${api.basePath}/UserPlayedItems/${itemId}`,
- {
- params: { userId },
- headers: {
- Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
- },
- },
- );
- } catch (error) {
- const axiosError = error as AxiosError;
- console.error(
- "Failed to mark item as not played:",
- axiosError.message,
- axiosError.response?.status,
- );
- return;
- }
-};
diff --git a/utils/jellyfin/playstate/markAsPlayed.ts b/utils/jellyfin/playstate/markAsPlayed.ts
deleted file mode 100644
index e17638ec..00000000
--- a/utils/jellyfin/playstate/markAsPlayed.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { Api } from "@jellyfin/sdk";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { getPlaystateApi } from "@jellyfin/sdk/lib/utils/api";
-
-interface MarkAsPlayedParams {
- api: Api | null | undefined;
- item: BaseItemDto | null | undefined;
- userId: string | null | undefined;
-}
-
-/**
- * Marks a media item as played and updates its progress to completion.
- *
- * @param params - The parameters for marking an item as playedβ
- * @returns A promise that resolves to true if the operation was successful, false otherwise
- */
-export const markAsPlayed = async ({
- api,
- item,
- userId,
-}: MarkAsPlayedParams): Promise => {
- if (!api || !item?.Id || !userId || !item.RunTimeTicks) {
- console.error("Invalid parameters for markAsPlayed");
- return false;
- }
-
- try {
- const response = await getPlaystateApi(api).markPlayedItem({
- itemId: item.Id,
- datePlayed: new Date().toISOString(),
- });
-
- return response.status === 200;
- } catch (error) {
- return false;
- }
-};
diff --git a/utils/jellyfin/playstate/reportPlaybackProgress.ts b/utils/jellyfin/playstate/reportPlaybackProgress.ts
deleted file mode 100644
index 76e27c25..00000000
--- a/utils/jellyfin/playstate/reportPlaybackProgress.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { getOrSetDeviceId } from "@/providers/JellyfinProvider";
-import type { Settings } from "@/utils/atoms/settings";
-import old from "@/utils/profiles/old";
-import type { Api } from "@jellyfin/sdk";
-import { DeviceProfile } from "@jellyfin/sdk/lib/generated-client";
-import {
- getMediaInfoApi,
- getPlaystateApi,
- getSessionApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { getAuthHeaders } from "../jellyfin";
-import { postCapabilities } from "../session/capabilities";
-
-interface ReportPlaybackProgressParams {
- api?: Api | null;
- sessionId?: string | null;
- itemId?: string | null;
- positionTicks?: number | null;
- IsPaused?: boolean;
- deviceProfile?: Settings["deviceProfile"];
-}
-
-/**
- * Reports playback progress to the Jellyfin server.
- *
- * @param params - The parameters for reporting playback progress
- * @throws {Error} If any required parameter is missing
- */
-export const reportPlaybackProgress = async ({
- api,
- sessionId,
- itemId,
- positionTicks,
- IsPaused = false,
- deviceProfile,
-}: ReportPlaybackProgressParams): Promise => {
- if (!api || !sessionId || !itemId || !positionTicks) {
- return;
- }
-
- console.info("reportPlaybackProgress ~ IsPaused", IsPaused);
-
- try {
- await getPlaystateApi(api).onPlaybackProgress({
- itemId,
- audioStreamIndex: 0,
- subtitleStreamIndex: 0,
- mediaSourceId: itemId,
- positionTicks: Math.round(positionTicks),
- isPaused: IsPaused,
- isMuted: false,
- playMethod: "Transcode",
- });
- // await api.axiosInstance.post(
- // `${api.basePath}/Sessions/Playing/Progress`,
- // {
- // ItemId: itemId,
- // PlaySessionId: sessionId,
- // IsPaused,
- // PositionTicks: Math.round(positionTicks),
- // CanSeek: true,
- // MediaSourceId: itemId,
- // EventName: "timeupdate",
- // },
- // { headers: getAuthHeaders(api) }
- // );
- } catch (error) {
- console.error(error);
- }
-};
diff --git a/utils/jellyfin/session/capabilities.ts b/utils/jellyfin/session/capabilities.ts
index 50e8bcbd..c6f327e6 100644
--- a/utils/jellyfin/session/capabilities.ts
+++ b/utils/jellyfin/session/capabilities.ts
@@ -1,7 +1,7 @@
-import type { Settings } from "@/utils/atoms/settings";
-import generateDeviceProfile from "@/utils/profiles/native";
import type { Api } from "@jellyfin/sdk";
import type { AxiosResponse } from "axios";
+import type { Settings } from "@/utils/atoms/settings";
+import { generateDeviceProfile } from "@/utils/profiles/native";
import { getAuthHeaders } from "../jellyfin";
interface PostCapabilitiesParams {
@@ -43,14 +43,14 @@ export const postCapabilities = async ({
],
supportsMediaControl: true,
id: sessionId,
- DeviceProfile: generateDeviceProfile(),
+ DeviceProfile: await generateDeviceProfile(),
},
{
headers: getAuthHeaders(api),
},
);
return d;
- } catch (error) {
+ } catch (_error) {
throw new Error("Failed to mark as not played");
}
};
diff --git a/utils/optimize-server.ts b/utils/optimize-server.ts
deleted file mode 100644
index 45186ec7..00000000
--- a/utils/optimize-server.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { itemRouter } from "@/components/common/TouchableItemRouter";
-import { DownloadedItem } from "@/providers/DownloadProvider";
-import type {
- BaseItemDto,
- MediaSourceInfo,
-} from "@jellyfin/sdk/lib/generated-client";
-import axios from "axios";
-import { MMKV } from "react-native-mmkv";
-import { writeToLog } from "./log";
-
-interface IJobInput {
- deviceId?: string | null;
- authHeader?: string | null;
- url?: string | null;
-}
-
-export interface JobStatus {
- id: string;
- status:
- | "queued"
- | "optimizing"
- | "completed"
- | "failed"
- | "cancelled"
- | "downloading";
- progress: number;
- outputPath: string;
- inputUrl: string;
- deviceId: string;
- itemId: string;
- item: BaseItemDto;
- speed?: number;
- timestamp: Date;
- base64Image?: string;
-}
-
-/**
- * Fetches all jobs for a specific device.
- *
- * @param {IGetAllDeviceJobs} params - The parameters for the API request.
- * @param {string} params.deviceId - The ID of the device to fetch jobs for.
- * @param {string} params.authHeader - The authorization header for the API request.
- * @param {string} params.url - The base URL for the API endpoint.
- *
- * @returns {Promise} A promise that resolves to an array of job statuses.
- *
- * @throws {Error} Throws an error if the API request fails or returns a non-200 status code.
- */
-export async function getAllJobsByDeviceId({
- deviceId,
- authHeader,
- url,
-}: IJobInput): Promise {
- const statusResponse = await axios.get(`${url}all-jobs`, {
- headers: {
- Authorization: authHeader,
- },
- params: {
- deviceId,
- },
- });
- if (statusResponse.status !== 200) {
- console.error(
- statusResponse.status,
- statusResponse.data,
- statusResponse.statusText,
- );
- throw new Error("Failed to fetch job status");
- }
-
- return statusResponse.data;
-}
-
-interface ICancelJob {
- authHeader: string;
- url: string;
- id: string;
-}
-
-export async function cancelJobById({
- authHeader,
- url,
- id,
-}: ICancelJob): Promise {
- const statusResponse = await axios.delete(`${url}cancel-job/${id}`, {
- headers: {
- Authorization: authHeader,
- },
- });
- if (statusResponse.status !== 200) {
- throw new Error("Failed to cancel process");
- }
-
- return true;
-}
-
-export async function cancelAllJobs({ authHeader, url, deviceId }: IJobInput) {
- if (!deviceId) return false;
- if (!authHeader) return false;
- if (!url) return false;
-
- try {
- await getAllJobsByDeviceId({
- deviceId,
- authHeader,
- url,
- }).then((jobs) => {
- for (const job of jobs) {
- cancelJobById({
- authHeader,
- url,
- id: job.id,
- });
- }
- });
- } catch (error) {
- writeToLog("ERROR", "Failed to cancel all jobs", error);
- console.error(error);
- return false;
- }
-
- return true;
-}
-
-/**
- * Fetches statistics for a specific device.
- *
- * @param {IJobInput} params - The parameters for the API request.
- * @param {string} params.deviceId - The ID of the device to fetch statistics for.
- * @param {string} params.authHeader - The authorization header for the API request.
- * @param {string} params.url - The base URL for the API endpoint.
- *
- * @returns {Promise} A promise that resolves to the statistics data or null if the request fails.
- *
- * @throws {Error} Throws an error if any required parameter is missing.
- */
-export async function getStatistics({
- authHeader,
- url,
- deviceId,
-}: IJobInput): Promise {
- if (!deviceId || !authHeader || !url) {
- return null;
- }
-
- try {
- const statusResponse = await axios.get(`${url}statistics`, {
- headers: {
- Authorization: authHeader,
- },
- params: {
- deviceId,
- },
- });
-
- return statusResponse.data;
- } catch (error) {
- console.error("Failed to fetch statistics:", error);
- return null;
- }
-}
-
-/**
- * Saves the download item info to disk - this data is used temporarily to fetch additional download information
- * in combination with the optimize server. This is used to not have to send all item info to the optimize server.
- *
- * @param {BaseItemDto} item - The item to save.
- * @param {MediaSourceInfo} mediaSource - The media source of the item.
- * @param {string} url - The URL of the item.
- * @return {boolean} A promise that resolves when the item info is saved.
- */
-export function saveDownloadItemInfoToDiskTmp(
- item: BaseItemDto,
- mediaSource: MediaSourceInfo,
- url: string,
-): boolean {
- try {
- const storage = new MMKV();
-
- const downloadInfo = JSON.stringify({
- item,
- mediaSource,
- url,
- });
-
- storage.set(`tmp_download_info_${item.Id}`, downloadInfo);
-
- return true;
- } catch (error) {
- console.error("Failed to save download item info to disk:", error);
- throw error;
- }
-}
-
-/**
- * Retrieves the download item info from disk.
- *
- * @param {string} itemId - The ID of the item to retrieve.
- * @return {{
- * item: BaseItemDto;
- * mediaSource: MediaSourceInfo;
- * url: string;
- * } | null} The retrieved download item info or null if not found.
- */
-export function getDownloadItemInfoFromDiskTmp(itemId: string): {
- item: BaseItemDto;
- mediaSource: MediaSourceInfo;
- url: string;
-} | null {
- try {
- const storage = new MMKV();
- const rawInfo = storage.getString(`tmp_download_info_${itemId}`);
-
- if (rawInfo) {
- return JSON.parse(rawInfo);
- }
- return null;
- } catch (error) {
- console.error("Failed to retrieve download item info from disk:", error);
- return null;
- }
-}
-
-/**
- * Deletes the download item info from disk.
- *
- * @param {string} itemId - The ID of the item to delete.
- * @return {boolean} True if the item info was successfully deleted, false otherwise.
- */
-export function deleteDownloadItemInfoFromDiskTmp(itemId: string): boolean {
- try {
- const storage = new MMKV();
- storage.delete(`tmp_download_info_${itemId}`);
- return true;
- } catch (error) {
- console.error("Failed to delete download item info from disk:", error);
- return false;
- }
-}
diff --git a/utils/profiles/download.js b/utils/profiles/download.js
index 4f0d4d4d..9e9d8fdc 100644
--- a/utils/profiles/download.js
+++ b/utils/profiles/download.js
@@ -59,80 +59,55 @@ export default {
],
SubtitleProfiles: [
// Official foramts
- { Format: "vtt", Method: "Embed" },
{ Format: "vtt", Method: "Encode" },
- { Format: "webvtt", Method: "Embed" },
{ Format: "webvtt", Method: "Encode" },
- { Format: "srt", Method: "Embed" },
{ Format: "srt", Method: "Encode" },
- { Format: "subrip", Method: "Embed" },
{ Format: "subrip", Method: "Encode" },
- { Format: "ttml", Method: "Embed" },
{ Format: "ttml", Method: "Encode" },
- { Format: "dvbsub", Method: "Embed" },
{ Format: "dvdsub", Method: "Encode" },
- { Format: "ass", Method: "Embed" },
{ Format: "ass", Method: "Encode" },
- { Format: "idx", Method: "Embed" },
{ Format: "idx", Method: "Encode" },
- { Format: "pgs", Method: "Embed" },
{ Format: "pgs", Method: "Encode" },
- { Format: "pgssub", Method: "Embed" },
{ Format: "pgssub", Method: "Encode" },
- { Format: "ssa", Method: "Embed" },
{ Format: "ssa", Method: "Encode" },
// Other formats
- { Format: "microdvd", Method: "Embed" },
{ Format: "microdvd", Method: "Encode" },
- { Format: "mov_text", Method: "Embed" },
{ Format: "mov_text", Method: "Encode" },
- { Format: "mpl2", Method: "Embed" },
{ Format: "mpl2", Method: "Encode" },
- { Format: "pjs", Method: "Embed" },
{ Format: "pjs", Method: "Encode" },
- { Format: "realtext", Method: "Embed" },
{ Format: "realtext", Method: "Encode" },
- { Format: "scc", Method: "Embed" },
{ Format: "scc", Method: "Encode" },
- { Format: "smi", Method: "Embed" },
{ Format: "smi", Method: "Encode" },
- { Format: "stl", Method: "Embed" },
{ Format: "stl", Method: "Encode" },
- { Format: "sub", Method: "Embed" },
{ Format: "sub", Method: "Encode" },
- { Format: "subviewer", Method: "Embed" },
{ Format: "subviewer", Method: "Encode" },
- { Format: "teletext", Method: "Embed" },
{ Format: "teletext", Method: "Encode" },
- { Format: "text", Method: "Embed" },
{ Format: "text", Method: "Encode" },
- { Format: "vplayer", Method: "Embed" },
{ Format: "vplayer", Method: "Encode" },
- { Format: "xsub", Method: "Embed" },
{ Format: "xsub", Method: "Encode" },
],
};
diff --git a/utils/profiles/native.js b/utils/profiles/native.js
index 909a9971..6d343e44 100644
--- a/utils/profiles/native.js
+++ b/utils/profiles/native.js
@@ -6,6 +6,7 @@ import DeviceInfo from "react-native-device-info";
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
import MediaTypes from "../../constants/MediaTypes";
+import { getSubtitleProfiles } from "./subtitles";
// Helper function to detect Dolby Vision support
const supportsDolbyVision = async () => {
@@ -27,13 +28,14 @@ const supportsDolbyVision = async () => {
return false;
};
-export const generateDeviceProfile = async () => {
+export const generateDeviceProfile = async ({ transcode = false } = {}) => {
+ console.log("generating device profile", { transcode });
const dolbyVisionSupported = await supportsDolbyVision();
/**
* Device profile for Native video player
*/
const profile = {
- Name: "1. Vlc Player",
+ Name: `1. Vlc Player${transcode ? " (Transcoding)" : ""}`,
MaxStaticBitrate: 999_999_999,
MaxStreamingBitrate: 999_999_999,
CodecProfiles: [
@@ -62,7 +64,7 @@ export const generateDeviceProfile = async () => {
DirectPlayProfiles: [
{
Type: MediaTypes.Video,
- Container: "mp4,mkv,avi,mov,flv,ts,m2ts,webm,ogv,3gp,hls",
+ Container: "mkv,avi,mov,flv,ts,m2ts,webm,ogv,3gp,hls",
VideoCodec:
"h264,hevc,mpeg4,divx,xvid,wmv,vc1,vp8,vp9,av1,avi,mpeg,mpeg2video",
AudioCodec: "aac,ac3,eac3,mp3,flac,alac,opus,vorbis,wma,dts",
@@ -79,7 +81,7 @@ export const generateDeviceProfile = async () => {
Type: MediaTypes.Video,
Context: "Streaming",
Protocol: "hls",
- Container: "mp4",
+ Container: transcode ? "fmp4" : "ts",
VideoCodec: "h264, hevc",
AudioCodec: "aac,mp3,ac3,dts",
},
@@ -92,84 +94,7 @@ export const generateDeviceProfile = async () => {
MaxAudioChannels: "2",
},
],
- SubtitleProfiles: [
- // Official formats
- { Format: "vtt", Method: "Embed" },
- { Format: "vtt", Method: "External" },
-
- { Format: "webvtt", Method: "Embed" },
- { Format: "webvtt", Method: "External" },
-
- { Format: "srt", Method: "Embed" },
- { Format: "srt", Method: "External" },
-
- { Format: "subrip", Method: "Embed" },
- { Format: "subrip", Method: "External" },
-
- { Format: "ttml", Method: "Embed" },
- { Format: "ttml", Method: "External" },
-
- { Format: "dvbsub", Method: "Embed" },
- { Format: "dvdsub", Method: "Encode" },
-
- { Format: "ass", Method: "Embed" },
- { Format: "ass", Method: "External" },
-
- { Format: "idx", Method: "Embed" },
- { Format: "idx", Method: "Encode" },
-
- { Format: "pgs", Method: "Embed" },
- { Format: "pgs", Method: "Encode" },
-
- { Format: "pgssub", Method: "Embed" },
- { Format: "pgssub", Method: "Encode" },
-
- { Format: "ssa", Method: "Embed" },
- { Format: "ssa", Method: "External" },
-
- // Other formats
- { Format: "microdvd", Method: "Embed" },
- { Format: "microdvd", Method: "External" },
-
- { Format: "mov_text", Method: "Embed" },
- { Format: "mov_text", Method: "External" },
-
- { Format: "mpl2", Method: "Embed" },
- { Format: "mpl2", Method: "External" },
-
- { Format: "pjs", Method: "Embed" },
- { Format: "pjs", Method: "External" },
-
- { Format: "realtext", Method: "Embed" },
- { Format: "realtext", Method: "External" },
-
- { Format: "scc", Method: "Embed" },
- { Format: "scc", Method: "External" },
-
- { Format: "smi", Method: "Embed" },
- { Format: "smi", Method: "External" },
-
- { Format: "stl", Method: "Embed" },
- { Format: "stl", Method: "External" },
-
- { Format: "sub", Method: "Embed" },
- { Format: "sub", Method: "External" },
-
- { Format: "subviewer", Method: "Embed" },
- { Format: "subviewer", Method: "External" },
-
- { Format: "teletext", Method: "Embed" },
- { Format: "teletext", Method: "Encode" },
-
- { Format: "text", Method: "Embed" },
- { Format: "text", Method: "External" },
-
- { Format: "vplayer", Method: "Embed" },
- { Format: "vplayer", Method: "External" },
-
- { Format: "xsub", Method: "Embed" },
- { Format: "xsub", Method: "External" },
- ],
+ SubtitleProfiles: getSubtitleProfiles(transcode ? "hls" : "External"),
};
// Add Dolby Vision restriction if not supported
@@ -192,5 +117,5 @@ export const generateDeviceProfile = async () => {
};
export default async () => {
- return await generateDeviceProfile();
+ return await generateDeviceProfile({ transcode: false });
};
diff --git a/utils/profiles/subtitles.js b/utils/profiles/subtitles.js
new file mode 100644
index 00000000..7defa380
--- /dev/null
+++ b/utils/profiles/subtitles.js
@@ -0,0 +1,56 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+const COMMON_SUBTITLE_PROFILES = [
+ // Official formats
+
+ { Format: "dvdsub", Method: "Embed" },
+ { Format: "dvdsub", Method: "Encode" },
+
+ { Format: "idx", Method: "Embed" },
+ { Format: "idx", Method: "Encode" },
+
+ { Format: "pgs", Method: "Embed" },
+ { Format: "pgs", Method: "Encode" },
+
+ { Format: "pgssub", Method: "Embed" },
+ { Format: "pgssub", Method: "Encode" },
+
+ { Format: "teletext", Method: "Embed" },
+ { Format: "teletext", Method: "Encode" },
+];
+
+const VARYING_SUBTITLE_FORMATS = [
+ "webvtt",
+ "vtt",
+ "srt",
+ "subrip",
+ "ttml",
+ "ass",
+ "ssa",
+ "microdvd",
+ "mov_text",
+ "mpl2",
+ "pjs",
+ "realtext",
+ "scc",
+ "smi",
+ "stl",
+ "sub",
+ "subviewer",
+ "text",
+ "vplayer",
+ "xsub",
+];
+
+export const getSubtitleProfiles = (secondaryMethod) => {
+ const profiles = [...COMMON_SUBTITLE_PROFILES];
+ for (const format of VARYING_SUBTITLE_FORMATS) {
+ profiles.push({ Format: format, Method: "Embed" });
+ profiles.push({ Format: format, Method: secondaryMethod });
+ }
+ return profiles;
+};
diff --git a/utils/segments.ts b/utils/segments.ts
new file mode 100644
index 00000000..5c36de78
--- /dev/null
+++ b/utils/segments.ts
@@ -0,0 +1,114 @@
+import { Api } from "@jellyfin/sdk";
+import { useQuery } from "@tanstack/react-query";
+import { useAtom } from "jotai";
+import { useDownload } from "@/providers/DownloadProvider";
+import { DownloadedItem, MediaTimeSegment } from "@/providers/Downloads/types";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { getAuthHeaders } from "./jellyfin/jellyfin";
+
+interface IntroTimestamps {
+ EpisodeId: string;
+ HideSkipPromptAt: number;
+ IntroEnd: number;
+ IntroStart: number;
+ ShowSkipPromptAt: number;
+ Valid: boolean;
+}
+
+interface CreditTimestamps {
+ Introduction: {
+ Start: number;
+ End: number;
+ Valid: boolean;
+ };
+ Credits: {
+ Start: number;
+ End: number;
+ Valid: boolean;
+ };
+}
+
+export const useSegments = (itemId: string, isOffline: boolean) => {
+ const [api] = useAtom(apiAtom);
+ const { downloadedFiles } = useDownload();
+ const downloadedItem = downloadedFiles?.find(
+ (d: DownloadedItem) => d.item.Id === itemId,
+ );
+
+ return useQuery({
+ queryKey: ["segments", itemId, isOffline],
+ queryFn: async () => {
+ if (isOffline && downloadedItem) {
+ return getSegmentsForItem(downloadedItem);
+ }
+ if (!api) {
+ throw new Error("API client is not available");
+ }
+ return fetchAndParseSegments(itemId, api);
+ },
+ enabled: !!api,
+ });
+};
+
+export const getSegmentsForItem = (
+ item: DownloadedItem,
+): {
+ introSegments: MediaTimeSegment[];
+ creditSegments: MediaTimeSegment[];
+} => {
+ return {
+ introSegments: item.introSegments || [],
+ creditSegments: item.creditSegments || [],
+ };
+};
+
+export const fetchAndParseSegments = async (
+ itemId: string,
+ api: Api,
+): Promise<{
+ introSegments: MediaTimeSegment[];
+ creditSegments: MediaTimeSegment[];
+}> => {
+ const introSegments: MediaTimeSegment[] = [];
+ const creditSegments: MediaTimeSegment[] = [];
+
+ try {
+ const [introRes, creditRes] = await Promise.allSettled([
+ api.axiosInstance.get(
+ `${api.basePath}/Episode/${itemId}/IntroTimestamps`,
+ {
+ headers: getAuthHeaders(api),
+ },
+ ),
+ api.axiosInstance.get(
+ `${api.basePath}/Episode/${itemId}/Timestamps`,
+ {
+ headers: getAuthHeaders(api),
+ },
+ ),
+ ]);
+
+ if (introRes.status === "fulfilled" && introRes.value.data.Valid) {
+ introSegments.push({
+ startTime: introRes.value.data.IntroStart,
+ endTime: introRes.value.data.IntroEnd,
+ text: "Intro",
+ });
+ }
+
+ if (
+ creditRes.status === "fulfilled" &&
+ creditRes.value.data.Credits.Valid
+ ) {
+ creditSegments.push({
+ startTime: creditRes.value.data.Credits.Start,
+ endTime: creditRes.value.data.Credits.End,
+ text: "Credits",
+ });
+ }
+ } catch (error) {
+ console.error("Failed to fetch segments", error);
+ }
+
+ return { introSegments, creditSegments };
+};
