esoftplay 0.0.129-a → 0.0.129-c

package/bin/router.js

@@ -447,6 +447,7 @@ declare module "esoftplay" {
     persistKey?: string,
     inFile?: boolean,
     listener?: (data: any) => void,
+    loadOnInit?: boolean,
     isUserData?: boolean
   }
   

package/global.ts

@@ -21,6 +21,7 @@ export interface useGlobalOption {
   listener?: (data: any) => void,
   jsonBeautify?: boolean,
   isUserData?: boolean,
+  loadOnInit?: boolean,
   onFinish?: () => void
 }
 
@@ -46,31 +47,42 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   if (!_global.useGlobalSubscriber[_idx])
     _global.useGlobalSubscriber[_idx] = [];
   let value: T = initValue;
+  let loaded = -1
 
   if (o?.persistKey) {
-    let persistKey = o?.persistKey
-    STORAGE.getItem(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) { }
+    loaded = 0
+    if (o?.loadOnInit)
+      loadFromDisk()
+  }
+
+
+  function loadFromDisk() {
+    if (loaded == 0) {
+      loaded = 1
+      let persistKey = o?.persistKey
+      STORAGE.getItem(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?.()
-        }, 50);
-      }
-    })
+        }
+        if (o?.onFinish) {
+          clearTimeout(timeoutFinish)
+          timeoutFinish = setTimeout(() => {
+            o.onFinish?.()
+          }, 50);
+        }
+      })
+    }
   }
 
 
@@ -116,6 +128,8 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   }
 
   function useSelector(se: (state: T) => any): void {
+    loadFromDisk()
+
     let [l, s] = R.useState<any>(se(value));
 
     let sl = R.useCallback(
@@ -141,6 +155,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   }
 
   function get(param?: string, ...params: string[]): any {
+    loadFromDisk()
     let out: any = value;
     if (param) {
       const _params = [param, ...params]
@@ -155,6 +170,8 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
 
 
   function useState(): [T, (newState: T) => void, () => T] {
+    loadFromDisk()
+    
     let [l, s] = R.useState<T>(value);
 
     let sl = R.useCallback((ns: T) => { s(ns) }, []);

package/package.json

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