esoftplay 0.0.136-i → 0.0.136-k

package/global.ts

@@ -17,31 +17,19 @@ export interface useGlobalAutoSync {
   post: (item: any) => Object,
   isSyncing?: (isSync: boolean) => void
 }
-interface useGlobalOptionA {
-  persistKey?: string;
-  inFastStorage?: boolean;
-  inFile?: never; // Ensures inFile is not present in useGlobalOptionA
-  listener?: (data: any) => void;
-  useAutoSync?: useGlobalAutoSync;
-  jsonBeautify?: boolean;
-  isUserData?: boolean;
-  loadOnInit?: boolean;
-  onFinish?: () => void;
-}
 
-interface useGlobalOptionB {
-  persistKey?: string;
-  inFile?: boolean;
-  inFastStorage?: never; // Ensures inFastStorage is not present in useGlobalOptionB
-  listener?: (data: any) => void;
-  useAutoSync?: useGlobalAutoSync;
-  jsonBeautify?: boolean;
-  isUserData?: boolean;
-  loadOnInit?: boolean;
-  onFinish?: () => void;
+export interface useGlobalOption {
+  persistKey?: string,
+  inFile?: boolean,
+  inFastStorage?: boolean,
+  listener?: (data: any) => void,
+  useAutoSync?: useGlobalAutoSync,
+  jsonBeautify?: boolean,
+  isUserData?: boolean,
+  loadOnInit?: boolean,
+  onFinish?: () => void
 }
 
-export type useGlobalOption = useGlobalOptionA | useGlobalOptionB;
 export interface useGlobalConnect<T> {
   render: (props: T) => any,
 }
@@ -57,10 +45,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   let sync: any = undefined
 
   if (o?.persistKey) {
-    if (o?.inFastStorage == true) {
-      STORAGE = require('esoftplay/mmkv').default
-    } else
-      STORAGE = o?.inFile ? (require('esoftplay/storage').default) : (require('@react-native-async-storage/async-storage').default)
+    STORAGE = o?.inFastStorage ? require('esoftplay/mmkv').default : (o?.inFile ? (require('esoftplay/storage').default) : (require('@react-native-async-storage/async-storage').default))
     loaded = 0
     if (o?.loadOnInit)
       loadFromDisk()
@@ -98,32 +83,33 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
     })[0]
   }
 
-  async function loadFromDisk() {
+  function loadFromDisk() {
     if (loaded == 0) {
       loaded = 1
       let persistKey = o?.persistKey
-      const p = await STORAGE.getItem(String(persistKey))
-      if (p) {
-        if (persistKey != '__globalReady')
-          if (p != undefined && typeof p == 'string' && (p.startsWith("{") || p.startsWith("[")))
-            try { set(JSON.parse(p)) } catch (error) { }
-          else {
-            if (p == "true" || p == "false") {
-              try { /* @ts-ignore */ set(eval(p)) } catch (error) { }
-            } else if (isNaN(p)) {
-              try { /* @ts-ignore */ set(p) } catch (error) { }
-            } else {
-              try { /* @ts-ignore */ set(eval(p)) } catch (error) { }
+      STORAGE.getItem(String(persistKey)).then((p: any) => {
+        if (p) {
+          if (persistKey != '__globalReady')
+            if (p != undefined && typeof p == 'string' && (p.startsWith("{") || p.startsWith("[")))
+              try { set(JSON.parse(p)) } catch (error) { }
+            else {
+              if (p == "true" || p == "false") {
+                try { /* @ts-ignore */ set(eval(p)) } catch (error) { }
+              } else if (isNaN(p)) {
+                try { /* @ts-ignore */ set(p) } catch (error) { }
+              } else {
+                try { /* @ts-ignore */ set(eval(p)) } catch (error) { }
+              }
             }
-          }
-      }
-      if (o?.onFinish) {
-        clearTimeout(timeoutFinish)
-        timeoutFinish = setTimeout(() => {
-          o.onFinish?.()
+        }
+        if (o?.onFinish) {
           clearTimeout(timeoutFinish)
-        }, 50);
-      }
+          timeoutFinish = setTimeout(() => {
+            o.onFinish?.()
+            clearTimeout(timeoutFinish)
+          }, 50);
+        }
+      })
     }
   }
 
@@ -181,7 +167,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
     set(initValue)
   }
 
-  async function useSelector(se: (state: T) => any): void {
+  function useSelector(se: (state: T) => any): void {
     loadFromDisk()
 
     let [l, s] = R.useState<any>(se(value));

package/mmkv.ts

@@ -3,8 +3,8 @@ import { MMKV } from 'react-native-mmkv';
 const storage = new MMKV()
 
 const FastStorage = {
-  getItem(key: string): string | undefined {
-    return storage.getString(key)
+  getItem(key: string): Promise<string | undefined | null> {
+    return new Promise((r) => r(storage.getString(key)))
   },
   setItem(key: string, value: string) {
     storage.set(key, value)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.136-i",
+  "version": "0.0.136-k",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",