esoftplay 0.0.116-a → 0.0.116-d

package/bin/router.js

@@ -588,12 +588,12 @@ function createRouter() {
       if (HookModules.includes(nav)) {
         item += "" +
           "import * as " + ucword(module) + ucword(task) + SuffixHooksProperty + " from '../../." + Modules[module][task] + "';\n" +
-          "const " + ucword(module) + ucword(task) + " = React.memo(_" + ucword(module) + ucword(task) + ", isEqual); \n" +
+          "var " + ucword(module) + ucword(task) + " = React.memo(_" + ucword(module) + ucword(task) + ", isEqual); \n" +
           "export { " + ucword(module) + ucword(task) + SuffixHooksProperty + ", " + ucword(module) + ucword(task) + " };\n"
       } else if (UseLibs.includes(nav)) {
         item += "" +
           "import * as " + ucword(module) + ucword(task) + SuffixHooksProperty + " from '../../." + Modules[module][task] + "';\n" +
-          "const " + ucword(module) + ucword(task) + " = _" + ucword(module) + ucword(task) + "; \n" +
+          "var " + ucword(module) + ucword(task) + " = _" + ucword(module) + ucword(task) + "; \n" +
           "export { " + ucword(module) + ucword(task) + SuffixHooksProperty + ", " + ucword(module) + ucword(task) + " };\n"
       } else {
         item += "export { _" + ucword(module) + ucword(task) + " as " + ucword(module) + ucword(task) + " };\n"

package/modules/lib/worker.tsx

@@ -1,9 +1,8 @@
 // noPage
 
-import { useGlobalReturn, _global } from 'esoftplay';
+import { _global } from 'esoftplay';
 import React, { Component } from "react";
 import { Platform } from 'react-native';
-import useGlobalState from '../../global';
 
 
 export interface LibWorkerInit {
@@ -23,16 +22,11 @@ _global.LibWorkerTasks = new Map()
 _global.injectedJavaScripts = []
 _global.LibWorkerReady = 0
 _global.LibWorkerCount = 0
-const state = useGlobalState?.(null)
+
 export default class m extends Component<LibWorkerProps, LibWorkerState> {
   constructor(props: LibWorkerProps) {
     super(props)
   }
-  
-  static workerState(): useGlobalReturn<any> {
-    return state
-  }
-  
   static delete(taskId: string): void {
     _global.LibWorkerTasks.delete(taskId)
   }
@@ -158,7 +152,6 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
     return (e: any) => {
       if (e.nativeEvent.data == withRefName) {
         _global.LibWorkerReady += 1
-        m.workerState().set(1)
         return
       }
       const dt = e.nativeEvent.data

package/modules/user/index.tsx

@@ -29,10 +29,17 @@ function setFonts(): Promise<void> {
 }
 
 
+function isWorkerReady(onReady: () => void): void {
+  if (_global.LibWorkerReady < 1) {
+    setTimeout(() => isWorkerReady(onReady), 30)
+  } else {
+    onReady()
+  }
+}
+
 
 export default function UserIndex(props: UserIndexProps): any {
   const [loading, setLoading] = useSafeState(true)
-  const [worker] = LibWorker.workerState().useState()
   const user = UserClass.state().useSelector(s => s)
   const ready = React.useRef(0)
   UseDeeplink()
@@ -57,11 +64,13 @@ export default function UserIndex(props: UserIndexProps): any {
         limitReady = 2
       }
 
-    if (worker == 1) {
-      ready.current += 1
-      if (ready.current >= limitReady) {
-        setLoading(false)
-      }
+    if (limitReady == 3) {
+      isWorkerReady(() => {
+        ready.current += 1
+        if (ready.current >= limitReady) {
+          setLoading(false)
+        }
+      })
     }
     (async () => {
       await setFonts()
@@ -86,7 +95,7 @@ export default function UserIndex(props: UserIndexProps): any {
       }
     }
     LibUpdaterProperty.check((isNew) => { })
-  }, [worker])
+  }, [])
 
   useEffect(() => {
     if (!loading) {

package/package.json

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