Upgrade to Expo 52

App.js

@@ -17,8 +17,6 @@ import * as Font from 'expo-font';
 import * as ScreenOrientation from 'expo-screen-orientation';
 import * as SplashScreen from 'expo-splash-screen';
 import { StatusBar } from 'expo-status-bar';
-import { observer } from 'mobx-react-lite';
-import { AsyncTrunk } from 'mobx-sync-lite';
 import PropTypes from 'prop-types';
 import React, { useContext, useEffect, useState } from 'react';
 import { Alert, useColorScheme } from 'react-native';
@@ -27,30 +25,94 @@ import { SafeAreaProvider } from 'react-native-safe-area-context';
 
 import ThemeSwitcher from './components/ThemeSwitcher';
 import { useStores } from './hooks/useStores';
+import DownloadModel from './models/DownloadModel';
+import ServerModel from './models/ServerModel';
 import RootNavigator from './navigation/RootNavigator';
 import { ensurePathExists } from './utils/File';
 import StaticScriptLoader from './utils/StaticScriptLoader';
 
 // Import i18n configuration
 import './i18n';
 
-const App = observer(({ skipLoadingScreen }) => {
+const App = ({ skipLoadingScreen }) => {
 	const [ isSplashReady, setIsSplashReady ] = useState(false);
-	const { rootStore } = useStores();
+	const { rootStore, downloadStore, settingStore, mediaStore, serverStore } = useStores();
 	const { theme } = useContext(ThemeContext);
 
-	rootStore.settingStore.systemThemeId = useColorScheme();
+	// Using a hook here causes a render loop; what is the point of this setting?
+	// settingStore.set({systemThemeId: useColorScheme()});
+	settingStore.systemThemeId = useColorScheme();
 
 	SplashScreen.preventAutoHideAsync();
 
-	const trunk = new AsyncTrunk(rootStore, {
-		storage: AsyncStorage
-	});
-
 	const hydrateStores = async () => {
-		await trunk.init();
+		// TODO: In release n+2 from this point, remove this conversion code.
+		const mobx_store_value = await AsyncStorage.getItem('__mobx_sync__'); // Store will be null if it's not set
+
+		if (mobx_store_value !== null) {
+			console.info('Migrating mobx store to zustand');
+			const mobx_store = JSON.parse(mobx_store_value);
+
+			// Root Store
+			for (const key of Object.keys(mobx_store).filter(k => k.search('Store') === -1)) {
+				rootStore.set({ key: mobx_store[key] });
+			}
+
+			// MediaStore
+			for (const key of Object.keys(mobx_store.mediaStore)) {
+				mediaStore.set({ key: mobx_store.mediaStore[key] });
+			}
+
+			/**
+			 * Server store & download store need some special treatment because they
+			 * are not simple key-value pair stores.  Each contains one key which is a
+			 * list of Model objects that represent the contents of their respective
+			 * stores.
+			 *
+			 * zustand requires a custom storage engine for these for proper
+			 * serialization and deserialization (written in each storage's module),
+			 * but this code is needed to get them over the hump from mobx to zustand.
+			 */
+			// DownloadStore
+			const mobxDownloads = mobx_store.downloadStore.downloads;
+			const migratedDownloads = new Map();
+			if (Object.keys(mobxDownloads).length > 0) {
+				for (const [ key, value ] of Object.getEntries(mobxDownloads)) {
+					migratedDownloads.set(key, new DownloadModel(
+						value.itemId,
+						value.serverId,
+						value.serverUrl,
+						value.apiKey,
+						value.title,
+						value.fileName,
+						value.downloadUrl
+					));
+				}
+			}
+			downloadStore.set({ downloads: migratedDownloads });
 
-		rootStore.storeLoaded = true;
+			// ServerStore
+			const mobxServers = mobx_store.serverStore.servers;
+			const migratedServers = [];
+			if (Object.keys(mobxServers).length > 0) {
+				for (const item of mobxServers) {
+					migratedServers.push(new ServerModel(item.id, new URL(item.url), item.info));
+				}
+			}
+			serverStore.set({ servers: migratedServers });
+
+			// SettingStore
+			for (const key of Object.keys(mobx_store.settingStore)) {
+				console.info('SettingStore', key);
+				settingStore.set({ key: mobx_store.settingStore[key] });
+			}
+
+			// TODO: Confirm zustand has objects in async storage
+			// TODO: Remove mobx sync item from async storage
+			// AsyncStorage.removeItem('__mobx_sync__')
+		}
+
+		rootStore.set({ storeLoaded: true });
 	};
 
 	const loadImages = () => {
@@ -79,6 +141,7 @@ const App = observer(({ skipLoadingScreen }) => {
 	};
 
 	useEffect(() => {
+		// Set base app theme
 		// Hydrate mobx data stores
 		hydrateStores();
 
@@ -87,16 +150,16 @@ const App = observer(({ skipLoadingScreen }) => {
 	}, []);
 
 	useEffect(() => {
-		console.info('rotation lock setting changed!', rootStore.settingStore.isRotationLockEnabled);
-		if (rootStore.settingStore.isRotationLockEnabled) {
+		console.info('rotation lock setting changed!', settingStore.isRotationLockEnabled);
+		if (settingStore.isRotationLockEnabled) {
 			ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.PORTRAIT_UP);
 		} else {
 			ScreenOrientation.unlockAsync();
 		}
-	}, [ rootStore.settingStore.isRotationLockEnabled ]);
+	}, [ settingStore.isRotationLockEnabled ]);
 
 	const updateScreenOrientation = async () => {
-		if (rootStore.settingStore.isRotationLockEnabled) {
+		if (settingStore.isRotationLockEnabled) {
 			if (rootStore.isFullscreen) {
 				// Lock to landscape orientation
 				// For some reason video apps on iPhone use LANDSCAPE_RIGHT ¯\_(ツ)_/¯
@@ -163,34 +226,34 @@ const App = observer(({ skipLoadingScreen }) => {
 				});
 		};
 
-		rootStore.downloadStore.downloads
+		downloadStore.downloads
 			.forEach(download => {
 				if (!download.isComplete && !download.isDownloading) {
 					downloadFile(download);
 				}
 			});
-	}, [ rootStore.deviceId, rootStore.downloadStore.downloads.size ]);
+	}, [ rootStore.deviceId, downloadStore.downloads.size ]);
 
 	if (!(isSplashReady && rootStore.storeLoaded) && !skipLoadingScreen) {
 		return null;
 	}
 
 	return (
 		<SafeAreaProvider>
-			<ThemeProvider theme={rootStore.settingStore.theme.Elements}>
+			<ThemeProvider theme={settingStore.getTheme().Elements}>
 				<ThemeSwitcher />
 				<StatusBar
 					style='light'
 					backgroundColor={theme.colors.grey0}
 					hidden={rootStore.isFullscreen}
 				/>
-				<NavigationContainer theme={rootStore.settingStore.theme.Navigation}>
+				<NavigationContainer theme={settingStore.getTheme().Navigation}>
 					<RootNavigator />
 				</NavigationContainer>
 			</ThemeProvider>
 		</SafeAreaProvider>
 	);
-});
+};
 
 App.propTypes = {
 	skipLoadingScreen: PropTypes.bool

__mocks__/zustand.ts

@@ -0,0 +1,65 @@
+// __mocks__/zustand.ts
+import { act } from '@testing-library/react';
+import type * as ZustandExportedTypes from 'zustand';
+export * from 'zustand';
+
+const { create: actualCreate, createStore: actualCreateStore } =
+  jest.requireActual<typeof ZustandExportedTypes>('zustand');
+
+// a variable to hold reset functions for all stores declared in the app
+export const storeResetFns = new Set<() => void>();
+
+const createUncurried = <T>(
+	stateCreator: ZustandExportedTypes.StateCreator<T>
+) => {
+	const store = actualCreate(stateCreator);
+	const initialState = store.getInitialState();
+	storeResetFns.add(() => {
+		store.setState(initialState, true);
+	});
+	return store;
+};
+
+// when creating a store, we get its initial state, create a reset function and add it in the set
+export const create = (<T>(
+  stateCreator: ZustandExportedTypes.StateCreator<T>
+) => {
+	console.log('zustand create mock');
+
+	// to support curried version of create
+	return typeof stateCreator === 'function'
+		? createUncurried(stateCreator)
+		: createUncurried;
+}) as typeof ZustandExportedTypes.create;
+
+const createStoreUncurried = <T>(
+	stateCreator: ZustandExportedTypes.StateCreator<T>
+) => {
+	const store = actualCreateStore(stateCreator);
+	const initialState = store.getInitialState();
+	storeResetFns.add(() => {
+		store.setState(initialState, true);
+	});
+	return store;
+};
+
+// when creating a store, we get its initial state, create a reset function and add it in the set
+export const createStore = (<T>(
+  stateCreator: ZustandExportedTypes.StateCreator<T>
+) => {
+	console.log('zustand createStore mock');
+
+	// to support curried version of createStore
+	return typeof stateCreator === 'function'
+		? createStoreUncurried(stateCreator)
+		: createStoreUncurried;
+}) as typeof ZustandExportedTypes.createStore;
+
+// reset all stores after each test run
+afterEach(() => {
+	act(() => {
+		storeResetFns.forEach((resetFn) => {
+			resetFn();
+		});
+	});
+});

app.json

@@ -1,13 +1,13 @@
 {
   "expo": {
+    "newArchEnabled": true,
     "name": "Jellyfin",
     "slug": "jellyfin-expo",
     "owner": "jellyfin",
-    "privacy": "unlisted",
     "platforms": [
       "ios"
     ],
-    "version": "1.6.0",
+    "version": "1.7.0",
     "orientation": "default",
     "primaryColor": "#00a4dc",
     "backgroundColor": "#101010",
@@ -38,6 +38,11 @@
         ]
       }
     },
-    "description": "Jellyfin Mobile"
+    "description": "Jellyfin Mobile",
+    "plugins": [
+      "expo-asset",
+      "expo-font",
+      "expo-localization"
+    ]
   }
 }

components/AudioPlayer.js

@@ -5,15 +5,14 @@
  */
 
 import { Audio, InterruptionModeAndroid, InterruptionModeIOS } from 'expo-av';
-import { observer } from 'mobx-react-lite';
 import React, { useEffect, useState } from 'react';
 
 import MediaTypes from '../constants/MediaTypes';
 import { useStores } from '../hooks/useStores';
 import { msToTicks } from '../utils/Time';
 
-const AudioPlayer = observer(() => {
-	const { rootStore } = useStores();
+const AudioPlayer = () => {
+	const { mediaStore } = useStores();
 
 	const [ player, setPlayer ] = useState();
 
@@ -57,48 +56,50 @@ const AudioPlayer = observer(() => {
 						didJustFinish === undefined ||
 						isPlaying === undefined ||
 						positionMs === undefined ||
-						rootStore.mediaStore.isFinished
+						mediaStore.isFinished
 					) {
 						return;
 					}
-					rootStore.mediaStore.isFinished = didJustFinish;
-					rootStore.mediaStore.isPlaying = isPlaying;
-					rootStore.mediaStore.positionTicks = msToTicks(positionMs);
+					mediaStore.set({
+						isFinished: didJustFinish,
+						isPlaying: isPlaying,
+						positionTicks: msToTicks(positionMs)
+					});
 				});
 				setPlayer(sound);
 			}
 		};
 
-		if (rootStore.mediaStore.type === MediaTypes.Audio) {
+		if (mediaStore.type === MediaTypes.Audio) {
 			createPlayer({
-				uri: rootStore.mediaStore.uri,
-				positionMillis: rootStore.mediaStore.positionMillis
+				uri: mediaStore.uri,
+				positionMillis: mediaStore.positionMillis
 			});
 		}
-	}, [ rootStore.mediaStore.type, rootStore.mediaStore.uri ]);
+	}, [ mediaStore.type, mediaStore.uri ]);
 
 	// Update the play/pause state when the store indicates it should
 	useEffect(() => {
-		if (rootStore.mediaStore.type === MediaTypes.Audio && rootStore.mediaStore.shouldPlayPause) {
-			if (rootStore.mediaStore.isPlaying) {
+		if (mediaStore.type === MediaTypes.Audio && mediaStore.shouldPlayPause) {
+			if (mediaStore.isPlaying) {
 				player?.pauseAsync();
 			} else {
 				player?.playAsync();
 			}
-			rootStore.mediaStore.shouldPlayPause = false;
+			mediaStore.set({ shouldPlayPause: false });
 		}
-	}, [ rootStore.mediaStore.shouldPlayPause ]);
+	}, [ mediaStore.shouldPlayPause ]);
 
 	// Stop the player when the store indicates it should stop playback
 	useEffect(() => {
-		if (rootStore.mediaStore.type === MediaTypes.Audio && rootStore.mediaStore.shouldStop) {
+		if (mediaStore.type === MediaTypes.Audio && mediaStore.shouldStop) {
 			player?.stopAsync();
 			player?.unloadAsync();
-			rootStore.mediaStore.shouldStop = false;
+			mediaStore.set({ shouldStop: false });
 		}
-	}, [ rootStore.mediaStore.shouldStop ]);
+	}, [ mediaStore.shouldStop ]);
 
 	return <></>;
-});
+};
 
 export default AudioPlayer;