wip

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Streamyfin",
     "slug": "streamyfin",
-    "version": "0.17.0",
+    "version": "0.18.0",
     "orientation": "default",
     "icon": "./assets/images/icon.png",
     "scheme": "streamyfin",
@@ -33,7 +33,7 @@
     },
     "android": {
       "jsEngine": "hermes",
-      "versionCode": 43,
+      "versionCode": 46,
       "adaptiveIcon": {
         "foregroundImage": "./assets/images/adaptive_icon.png"
       },

app/(auth)/(tabs)/(home)/_layout.tsx

@@ -2,7 +2,7 @@ import { Chromecast } from "@/components/Chromecast";
 import { HeaderBackButton } from "@/components/common/HeaderBackButton";
 import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
 import { useDownload } from "@/providers/DownloadProvider";
-import { Feather } from "@expo/vector-icons";
+import { Feather, Ionicons } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
 import { Platform, TouchableOpacity, View } from "react-native";
 
@@ -45,6 +45,18 @@ export default function IndexLayout() {
         name="settings"
         options={{
           title: "Settings",
+          headerRight: () => (
+            <View className="">
+              <Ionicons
+                name="file-tray-full-outline"
+                size={22}
+                color="white"
+                onPress={() => {
+                  router.push("/logs");
+                }}
+              />
+            </View>
+          ),
         }}
       />
       {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (

app/(auth)/(tabs)/(home)/settings.tsx

@@ -20,12 +20,6 @@ export default function settings() {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
 
-  const { data: logs } = useQuery({
-    queryKey: ["logs"],
-    queryFn: async () => readFromLog(),
-    refetchInterval: 1000,
-  });
-
   const insets = useSafeAreaInsets();
 
   const openQuickConnectAuthCodeInput = () => {
@@ -129,30 +123,6 @@ export default function settings() {
             </Button>
           </View>
         </View>
-        <View>
-          <Text className="font-bold text-lg mb-2">Logs</Text>
-          <View className="flex flex-col space-y-2">
-            {logs?.map((log, index) => (
-              <View key={index} className="bg-neutral-900 rounded-xl p-3">
-                <Text
-                  className={`
-                  mb-1
-              ${log.level === "INFO" && "text-blue-500"}
-              ${log.level === "ERROR" && "text-red-500"}
-                `}
-                >
-                  {log.level}
-                </Text>
-                <Text uiTextView selectable className="text-xs">
-                  {log.message}
-                </Text>
-              </View>
-            ))}
-            {logs?.length === 0 && (
-              <Text className="opacity-50">No logs available</Text>
-            )}
-          </View>
-        </View>
       </View>
     </ScrollView>
   );

app/(auth)/(tabs)/(libraries)/[libraryId].tsx

@@ -32,7 +32,6 @@ import {
   tagsFilterAtom,
   yearFilterAtom,
 } from "@/utils/atoms/filters";
-import { orientationAtom } from "@/utils/atoms/orientation";
 import {
   BaseItemDto,
   BaseItemDtoQueryResult,
@@ -44,6 +43,7 @@ import {
 } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useOrientation } from "@/hooks/useOrientation";
 
 const MemoizedTouchableItemRouter = React.memo(TouchableItemRouter);
 
@@ -60,12 +60,13 @@ const Page = () => {
   const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
   const [sortBy, _setSortBy] = useAtom(sortByAtom);
   const [sortOrder, _setSortOrder] = useAtom(sortOrderAtom);
-  const [orientation] = useAtom(orientationAtom);
   const [sortByPreference, setSortByPreference] = useAtom(sortByPreferenceAtom);
   const [sortOrderPreference, setOderByPreference] = useAtom(
     sortOrderPreferenceAtom
   );
 
+  const { orientation } = useOrientation();
+
   useEffect(() => {
     const sop = getSortOrderPreference(libraryId, sortOrderPreference);
     if (sop) {
@@ -106,11 +107,12 @@ const Page = () => {
     [libraryId, sortOrderPreference]
   );
 
-  const getNumberOfColumns = useCallback(() => {
+  const nrOfCols = useMemo(() => {
-    if (orientation === ScreenOrientation.Orientation.PORTRAIT_UP) return 3;
+    if (screenWidth < 300) return 2;
-    if (screenWidth < 600) return 5;
+    if (screenWidth < 500) return 3;
-    if (screenWidth < 960) return 6;
+    if (screenWidth < 800) return 5;
-    if (screenWidth < 1280) return 7;
+    if (screenWidth < 1000) return 6;
+    if (screenWidth < 1500) return 7;
     return 6;
   }, [screenWidth, orientation]);
 
@@ -219,7 +221,7 @@ const Page = () => {
 
   const renderItem = useCallback(
     ({ item, index }: { item: BaseItemDto; index: number }) => (
-      <MemoizedTouchableItemRouter
+      <TouchableItemRouter
         key={item.Id}
         style={{
           width: "100%",
@@ -230,10 +232,10 @@ const Page = () => {
         <View
           style={{
             alignSelf:
-              orientation === ScreenOrientation.Orientation.PORTRAIT_UP
+              orientation === ScreenOrientation.OrientationLock.PORTRAIT_UP
-                ? index % 3 === 0
+                ? index % nrOfCols === 0
                   ? "flex-end"
-                  : (index + 1) % 3 === 0
+                  : (index + 1) % nrOfCols === 0
                   ? "flex-start"
                   : "center"
                 : "center",
@@ -244,7 +246,7 @@ const Page = () => {
           <ItemPoster item={item} />
           <ItemCardText item={item} />
         </View>
-      </MemoizedTouchableItemRouter>
+      </TouchableItemRouter>
     ),
     [orientation]
   );
@@ -429,6 +431,7 @@ const Page = () => {
 
   return (
     <FlashList
+      key={orientation}
       ListEmptyComponent={
         <View className="flex flex-col items-center justify-center h-full">
           <Text className="font-bold text-xl text-neutral-500">No results</Text>
@@ -437,10 +440,10 @@ const Page = () => {
       contentInsetAdjustmentBehavior="automatic"
       data={flatData}
       renderItem={renderItem}
-      extraData={orientation}
+      extraData={[orientation, nrOfCols]}
       keyExtractor={keyExtractor}
       estimatedItemSize={244}
-      numColumns={getNumberOfColumns()}
+      numColumns={nrOfCols}
       onEndReached={() => {
         if (hasNextPage) {
           fetchNextPage();

app/(auth)/play-video.tsx

@@ -22,11 +22,9 @@ import { Dimensions, Pressable, StatusBar, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
 import Video, {
   OnProgressData,
-  VideoRef,
-  SelectedTrack,
   SelectedTrackType,
+  VideoRef,
 } from "react-native-video";
-import { WithDefault } from "react-native/Libraries/Types/CodegenTypes";
 
 export default function page() {
   const { playSettings, playUrl, playSessionId } = usePlaySettings();
@@ -216,18 +214,28 @@ export default function page() {
   return (
     <View
       style={{
+        flex: 1,
+        flexDirection: "column",
+        justifyContent: "center",
+        alignItems: "center",
         width: screenDimensions.width,
         height: screenDimensions.height,
         position: "relative",
       }}
-      className="flex flex-col items-center justify-center"
     >
       <StatusBar hidden />
       <Pressable
         onPress={() => {
           setShowControls(!showControls);
         }}
-        className="absolute z-0 h-full w-full"
+        style={{
+          position: "absolute",
+          top: 0,
+          left: 0,
+          width: screenDimensions.width,
+          height: screenDimensions.height,
+          zIndex: 0,
+        }}
       >
         <Video
           ref={videoRef}

app/_layout.tsx

@@ -345,6 +345,13 @@ function Layout() {
                             animation: "fade",
                           }}
                         />
+                        <Stack.Screen
+                          name="logs"
+                          options={{
+                            presentation: "modal",
+                            title: "Logs",
+                          }}
+                        />
                         <Stack.Screen
                           name="(auth)/play-offline-video"
                           options={{

app/login.tsx

@@ -2,11 +2,12 @@ import { Button } from "@/components/Button";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
 import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
+import { writeToLog } from "@/utils/log";
 import { Ionicons } from "@expo/vector-icons";
 import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
 import { getSystemApi } from "@jellyfin/sdk/lib/utils/api";
 import { Image } from "expo-image";
-import { useLocalSearchParams } from "expo-router";
+import { useLocalSearchParams, useRouter } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useEffect, useState } from "react";
 import {
@@ -27,6 +28,7 @@ const Login: React.FC = () => {
   const { setServer, login, removeServer, initiateQuickConnect } =
     useJellyfin();
   const [api] = useAtom(apiAtom);
+  const router = useRouter();
   const params = useLocalSearchParams();
 
   const {
@@ -72,7 +74,17 @@ const Login: React.FC = () => {
     try {
       const result = CredentialsSchema.safeParse(credentials);
       if (result.success) {
-        await login(credentials.username, credentials.password);
+        try {
+          await login(credentials.username, credentials.password);
+        } catch (loginError) {
+          if (loginError instanceof Error) {
+            setError(loginError.message);
+          } else {
+            setError("An unexpected error occurred during login");
+          }
+        }
+      } else {
+        setError("Invalid credentials format");
       }
     } catch (error) {
       if (error instanceof Error) {
@@ -105,37 +117,72 @@ const Login: React.FC = () => {
   async function checkUrl(url: string) {
     url = url.endsWith("/") ? url.slice(0, -1) : url;
     setLoadingServerCheck(true);
+    writeToLog("INFO", `Checking URL: ${url}`);
 
-    const protocols = ["https://", "http://"];
+    const timeout = 5000; // 5 seconds timeout
-    const timeout = 2000; // 2 seconds timeout for long 404 responses
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), timeout);
 
     try {
-      for (const protocol of protocols) {
+      // Try HTTPS first
-        const controller = new AbortController();
+      const httpsUrl = `https://${url}/System/Info/Public`;
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
+      try {
-
+        const response = await fetch(httpsUrl, {
-        try {
+          mode: "cors",
-          const response = await fetch(`${protocol}${url}/System/Info/Public`, {
+          signal: controller.signal,
-            mode: "cors",
+        });
-            signal: controller.signal,
+        if (response.ok) {
-          });
+          const data = (await response.json()) as PublicSystemInfo;
-          clearTimeout(timeoutId);
+          setServerName(data.ServerName || "");
-          if (response.ok) {
+          return `https://${url}`;
-            const data = (await response.json()) as PublicSystemInfo;
+        } else {
-            setServerName(data.ServerName || "");
+          writeToLog(
-            return `${protocol}${url}`;
+            "WARN",
-          }
+            `HTTPS connection failed with status: ${response.status}`
-        } catch (e) {
+          );
-          const error = e as Error;
-          if (error.name === "AbortError") {
-            console.log(`Request to ${protocol}${url} timed out`);
-          } else {
-            console.log(`Error checking ${protocol}${url}:`, error);
-          }
         }
+      } catch (e) {
+        writeToLog("WARN", "HTTPS connection failed - trying HTTP", e);
+      }
+
+      // If HTTPS didn't work, try HTTP
+      const httpUrl = `http://${url}/System/Info/Public`;
+      try {
+        const response = await fetch(httpUrl, {
+          mode: "cors",
+          signal: controller.signal,
+        });
+        writeToLog("INFO", `HTTP response status: ${response.status}`);
+        if (response.ok) {
+          const data = (await response.json()) as PublicSystemInfo;
+          setServerName(data.ServerName || "");
+          return `http://${url}`;
+        } else {
+          writeToLog(
+            "WARN",
+            `HTTP connection failed with status: ${response.status}`
+          );
+        }
+      } catch (e) {
+        writeToLog("ERROR", "HTTP connection failed", e);
+      }
+
+      // If neither worked, return undefined
+      writeToLog(
+        "ERROR",
+        `Failed to connect to ${url} using both HTTPS and HTTP`
+      );
+      return undefined;
+    } catch (e) {
+      const error = e as Error;
+      if (error.name === "AbortError") {
+        writeToLog("ERROR", `Request to ${url} timed out`, error);
+      } else {
+        writeToLog("ERROR", `Unexpected error checking ${url}`, error);
       }
       return undefined;
     } finally {
+      clearTimeout(timeoutId);
       setLoadingServerCheck(false);
     }
   }
@@ -197,6 +244,16 @@ const Login: React.FC = () => {
           style={{ flex: 1, height: "100%" }}
         >
           <View className="flex flex-col w-full h-full relative items-center justify-center">
+            <View className="absolute top-4 right-4">
+              <Ionicons
+                name="file-tray-full-outline"
+                size={22}
+                color="white"
+                onPress={() => {
+                  router.push("/logs");
+                }}
+              />
+            </View>
             <View className="px-4 -mt-20">
               <View className="mb-4">
                 <Text className="text-3xl font-bold mb-1">

app/logs.tsx

@@ -0,0 +1,58 @@
+import { Text } from "@/components/common/Text";
+import { readFromLog } from "@/utils/log";
+import { useQuery } from "@tanstack/react-query";
+import { ScrollView, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+const Logs: React.FC = () => {
+  const { data: logs } = useQuery({
+    queryKey: ["logs"],
+    queryFn: async () => (await readFromLog()).reverse(),
+    refetchOnReconnect: true,
+    refetchOnWindowFocus: true,
+    refetchOnMount: true,
+  });
+
+  const insets = useSafeAreaInsets();
+
+  return (
+    <ScrollView
+      className="flex-1 p-4"
+      contentContainerStyle={{ gap: 10, paddingBottom: insets.top }}
+    >
+      <View className="flex flex-col">
+        {logs?.map((log, index) => (
+          <View key={index} className="border-b-neutral-800 border py-3">
+            <View className="flex flex-row justify-between items-center mb-2">
+              <Text
+                className={`
+                    text-xs
+                ${log.level === "INFO" && "text-blue-500"}
+                ${log.level === "ERROR" && "text-red-500"}
+                  `}
+              >
+                {log.level}
+              </Text>
+              <Text className="text-xs text-neutral-500">
+                {new Date(log.timestamp).toLocaleString()}
+              </Text>
+            </View>
+            <Text uiTextView selectable className="text-xs mb-1">
+              {log.message}
+            </Text>
+            {log.data && (
+              <Text uiTextView selectable className="text-xs">
+                {log.data}
+              </Text>
+            )}
+          </View>
+        ))}
+        {logs?.length === 0 && (
+          <Text className="opacity-50">No logs available</Text>
+        )}
+      </View>
+    </ScrollView>
+  );
+};
+
+export default Logs;

components/ItemContent.tsx

@@ -26,7 +26,7 @@ import { useFocusEffect, useNavigation } from "expo-router";
 import * as ScreenOrientation from "expo-screen-orientation";
 import { useAtom } from "jotai";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { View } from "react-native";
+import { Alert, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Chromecast } from "./Chromecast";
 import { ItemHeader } from "./ItemHeader";
@@ -59,6 +59,11 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
           audioIndex,
           subtitleIndex,
         });
+
+        if (!mediaSource) {
+          Alert.alert("Error", "No media source found for this item.");
+          navigation.goBack();
+        }
       }, [item, settings])
     );
 

components/video-player/Controls.tsx

@@ -123,17 +123,6 @@ export const Controls: React.FC<Props> = ({
 
   const wasPlayingRef = useRef(false);
 
-  const updateTimes = useCallback(
-    (currentProgress: number, maxValue: number) => {
-      const current = ticksToSeconds(currentProgress);
-      const remaining = ticksToSeconds(maxValue - currentProgress);
-
-      setCurrentTime(current);
-      setRemainingTime(remaining);
-    },
-    []
-  );
-
   const { showSkipButton, skipIntro } = useIntroSkipper(
     item.Id,
     currentTime,
@@ -180,6 +169,23 @@ export const Controls: React.FC<Props> = ({
     router.replace("/play-video");
   }, [nextItem, settings]);
 
+  const updateTimes = useCallback(
+    (currentProgress: number, maxValue: number) => {
+      const current = ticksToSeconds(currentProgress);
+      const remaining = ticksToSeconds(maxValue - currentProgress);
+
+      setCurrentTime(current);
+      setRemainingTime(remaining);
+
+      if (currentProgress === maxValue) {
+        setShowControls(true);
+        // Automatically play the next item if it exists
+        goToNextItem();
+      }
+    },
+    [goToNextItem]
+  );
+
   useAnimatedReaction(
     () => ({
       progress: progress.value,

eas.json

@@ -22,13 +22,13 @@
       }
     },
     "production": {
-      "channel": "0.17.0",
+      "channel": "0.18.0",
       "android": {
         "image": "latest"
       }
     },
     "production-apk": {
-      "channel": "0.17.0",
+      "channel": "0.18.0",
       "android": {
         "buildType": "apk",
         "image": "latest"

providers/JellyfinProvider.tsx

@@ -1,4 +1,5 @@
 import { useInterval } from "@/hooks/useInterval";
+import { writeToLog } from "@/utils/log";
 import { Api, Jellyfin } from "@jellyfin/sdk";
 import { UserDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getUserApi } from "@jellyfin/sdk/lib/utils/api";
@@ -52,7 +53,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
       setJellyfin(
         () =>
           new Jellyfin({
-            clientInfo: { name: "Streamyfin", version: "0.17.0" },
+            clientInfo: { name: "Streamyfin", version: "0.18.0" },
             deviceInfo: { name: Platform.OS === "ios" ? "iOS" : "Android", id },
           })
       );
@@ -86,7 +87,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
     return {
       authorization: `MediaBrowser Client="Streamyfin", Device=${
         Platform.OS === "android" ? "Android" : "iOS"
-      }, DeviceId="${deviceId}", Version="0.17.0"`,
+      }, DeviceId="${deviceId}", Version="0.18.0"`,
     };
   }, [deviceId]);
 
@@ -212,20 +213,35 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
         if (axios.isAxiosError(error)) {
           switch (error.response?.status) {
             case 401:
+              writeToLog("ERROR", "Invalid username or password");
               throw new Error("Invalid username or password");
             case 403:
+              writeToLog("ERROR", "User does not have permission to log in");
               throw new Error("User does not have permission to log in");
             case 408:
+              writeToLog(
+                "WARN",
+                "Server is taking too long to respond, try again later"
+              );
               throw new Error(
                 "Server is taking too long to respond, try again later"
               );
             case 429:
+              writeToLog(
+                "WARN",
+                "Server received too many requests, try again later"
+              );
               throw new Error(
                 "Server received too many requests, try again later"
               );
             case 500:
+              writeToLog("ERROR", "There is a server error");
               throw new Error("There is a server error");
             default:
+              writeToLog(
+                "ERROR",
+                "An unexpected error occurred. Did you enter the server URL correctly?"
+              );
               throw new Error(
                 "An unexpected error occurred. Did you enter the server URL correctly?"
               );
@@ -312,6 +328,9 @@ function useProtectedRoute(user: UserDto | null, loading = false) {
     if (loading) return;
 
     const inAuthGroup = segments[0] === "(auth)";
+    const inLogs = segments[0] === "logs";
+
+    if (inLogs) return;
 
     if (!user?.Id && inAuthGroup) {
       router.replace("/login");

utils/jellyfin/getDefaultPlaySettings.ts

@@ -9,7 +9,7 @@ import { Settings } from "../atoms/settings";
 interface PlaySettings {
   item: BaseItemDto;
   bitrate: (typeof BITRATES)[0];
-  mediaSource: MediaSourceInfo | undefined;
+  mediaSource?: MediaSourceInfo | null;
   audioIndex?: number | null;
   subtitleIndex?: number | null;
 }
@@ -29,9 +29,8 @@ export function getDefaultPlaySettings(
   }
 
   // 1. Get first media source
-  const mediaSource = item.MediaSources?.[0];
 
-  if (!mediaSource) throw new Error("No media source found");
+  const mediaSource = item.MediaSources?.[0];
 
   // 2. Get default or preferred audio
   const defaultAudioIndex = mediaSource?.DefaultAudioStreamIndex;

utils/log.ts

@@ -29,7 +29,7 @@ export const writeToLog = async (
   const logs: LogEntry[] = currentLogs ? JSON.parse(currentLogs) : [];
   logs.push(newEntry);
 
-  const maxLogs = 100;
+  const maxLogs = 1000;
   const recentLogs = logs.slice(Math.max(logs.length - maxLogs, 0));
 
   await AsyncStorage.setItem("logs", JSON.stringify(recentLogs));