fix: tauri store

Author: elibroftw

src/tauri/storage.ts

@@ -1,5 +1,5 @@
 // API for Tauri or web storage
-import { LazyStore } from '@tauri-apps/plugin-store';
+import { getStore, LazyStore, Store } from '@tauri-apps/plugin-store';
 import localforage from 'localforage';
 import { Dispatch, SetStateAction, useCallback, useEffect, useRef, useState } from 'react';
 import { useTauriContext } from './TauriProvider';
@@ -21,40 +21,40 @@ function getTauriStore(filename: string): LazyStore {
 
 // returns an API to get a item, set an item from a specific category of data
 // why? we don't to have loading variable for multiple values
-export function createStorage(storeName: string) {
+export function createStorage(storePath: string) {
 	let loading = useTauriContext().loading;
 	const [data, setData] = useState<Record<string, any>>();
 	loading = loading || data === undefined;
 	const localDataRef = useRef(null);
-	const fileStoreRef = useRef<LazyStore | null>(
-		RUNNING_IN_TAURI ? getTauriStore(storeName) : null
-	);
+	const fileStoreRef = useRef<Store | null>(null);
 	const timeoutRef = useRef<number>(undefined);
 
 	// load data
 	useEffect(() => {
 		if (RUNNING_IN_TAURI) {
-			if (fileStoreRef.current === null) console.error('fileStoreRef is undefined');
-			else {
-				fileStoreRef.current.get('data').then(
-					value => {
-						if (value === undefined || value === null) {
-							const newValue = {};
-							fileStoreRef.current!.set('data', newValue)
-								.then(() => setData(newValue));
-						} else {
-							console.log(`value is undefined? ${value === undefined}`);
-							setData(value);
-						}
+			(async () => {
+				try {
+					const store = await getStore(storePath);
+					if (store === null) throw new Error('invalid path for store');
+					fileStoreRef.current = store;
+					const value = await fileStoreRef.current.get<Record<string, any>>('data');
+					if (value === undefined) {
+						const newValue = {};
+						await fileStoreRef.current!.set('data', newValue);
+						setData(newValue);
+					} else {
+						console.log(`value is undefined? ${JSON.stringify(value)}`);
+						setData(value);
 					}
-				)
-			}
-
+				} catch (e) {
+					console.error(e);
+				}
+			})();
 		} else {
-			localforage.getItem(storeName, (err, value) => {
+			localforage.getItem(storePath, (err, value) => {
 				// make store a {} again in catch
 				if (err !== undefined && value === null || Array.isArray(value)) {
-					localforage.setItem(storeName, {}, (err, val) => {
+					localforage.setItem(storePath, {}, (err, val) => {
 						if (err !== null && err !== undefined) {
 							return alert('cannot store data, application will not work as intended');
 						}
@@ -65,7 +65,7 @@ export function createStorage(storeName: string) {
 				}
 			});
 		}
-	}, [storeName]);
+	}, [storePath]);
 
 	const setItem = useCallback((key: string, newValueOrHandler: Dispatch<SetStateAction<any>>) => {
 		if (loading) return;
@@ -87,12 +87,12 @@ export function createStorage(storeName: string) {
 							timeoutRef.current = window.setTimeout(() => fileStoreRef.current!.save(), SAVE_DELAY)
 						});
 				} else {
-					timeoutRef.current = window.setTimeout(() => localforage.setItem(storeName, newData), SAVE_DELAY);
+					timeoutRef.current = window.setTimeout(() => localforage.setItem(storePath, newData), SAVE_DELAY);
 				}
 			}
 			return newData;
 		});
-	}, [storeName, loading, fileStoreRef, localDataRef, timeoutRef]);
+	}, [storePath, loading, fileStoreRef, localDataRef, timeoutRef]);
 
 	const getItem = useCallback((key: string, defaultValue: object) => {
 		if (loading || data === undefined) return defaultValue;