esoftplay 0.0.115-r → 0.0.115-u

package/bin/cli.js

@@ -92,9 +92,9 @@ switch (args[0]) {
 		createMaster(args[1])
 		break;
 	case "start":
-		jsEng(appjson, false)
-		jsEng(appdebug, false)
-		jsEng(applive, false)
+		jsEng(appjson, true)
+		jsEng(appdebug, true)
+		jsEng(applive, true)
 		excludeModules()
 		execution();
 		break;

package/bin/router.js

@@ -570,7 +570,7 @@ function createRouter() {
   var nav = "";
   var staticImport = []
 
-  staticImport.push("const isEqual = require('react-fast-compare');\n")
+  staticImport.push("var isEqual = require('react-fast-compare');\n")
   staticImport.push("export function applyStyle(style){ return style };\n")
   staticImport.push("export { default as useGlobalState } from '../../../node_modules/esoftplay/global';\n")
   staticImport.push("export { default as usePersistState } from '../../../node_modules/esoftplay/persist';\n")
@@ -599,7 +599,7 @@ function createRouter() {
         item += "export { _" + ucword(module) + ucword(task) + " as " + ucword(module) + ucword(task) + " };\n"
       }
       if (module == 'lib' && task == 'component') {
-        staticImport.splice(0, 0, item)
+        staticImport.splice(2, 0, item)
       } else if (module == 'lib' && task == 'style') {
         staticImport.splice(4, 0, item)
       } else if (module == 'lib' && task == 'worker') {
@@ -615,9 +615,9 @@ function createRouter() {
       }
     }
   }
-  staticImport.splice(0, 0, "export { default as createCache } from '../../../node_modules/esoftplay/_cache';\n")
-  staticImport.splice(0, 0, "export { default as _global } from '../../../node_modules/esoftplay/_global';\n")
-  staticImport.splice(0, 0, "import React from 'react';\n")
+  staticImport.splice(2, 0, "export { default as createCache } from '../../../node_modules/esoftplay/_cache';\n")
+  staticImport.splice(2, 0, "export { default as _global } from '../../../node_modules/esoftplay/_global';\n")
+  staticImport.splice(2, 0, "import React from 'react';\n")
   const x = staticImport.join('')
   if (isChange(tmpDir + 'index.js', x))
     fs.writeFile(tmpDir + 'index.js', x, { flag: 'w' }, function (err) {

package/global.ts

@@ -35,134 +35,130 @@ class Context {
 
 export const globalIdx = new Context()
 
-const n = () => {
-  let subscriber = {}
-  let debouceTime
-  let persistKeys: any = {}
-
-  function m<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
-    const _idx = globalIdx.idx
-    if (!subscriber[_idx])
-      subscriber[_idx] = [];
-    let value: T = initValue;
-
-    // rehidryte instant
-    if (o?.persistKey) {
-      rehidryte(o.persistKey, (p) => {
-        if (typeof p == 'string') set(JSON.parse(p))
 
-      })
+let subscriber = {}
+let debouceTime
+let persistKeys: any = {}
+
+export default function m<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
+  const _idx = globalIdx.idx
+  if (!subscriber[_idx])
+    subscriber[_idx] = [];
+  let value: T = initValue;
+
+  // rehidryte instant
+  if (o?.persistKey) {
+    rehidryte(o.persistKey, (p) => {
+      if (typeof p == 'string') set(JSON.parse(p))
+
+    })
+  }
+
+  /* register to userData to automatically reset state and persist */
+  if (o?.isUserData) {
+    function resetFunction() {
+      set(initValue)
+    }
+    if (o?.persistKey) {
+      const UserData = require('./modules/user/data').default
+      UserData.register(o?.persistKey)
     }
+    _global.useGlobalUserDelete[_idx] = resetFunction
+  }
 
-    /* register to userData to automatically reset state and persist */
-    if (o?.isUserData) {
-      function resetFunction() {
-        set(initValue)
-      }
+  function set(ns: T) {
+    const isChange = !isEqual(value, ns)
+    if (isChange) {
+      value = ns
+      fastLoop(subscriber?.[_idx], (c) => { c?.(ns) })
       if (o?.persistKey) {
-        const UserData = require('./modules/user/data').default
-        UserData.register(o?.persistKey)
+        AsyncStorage.setItem(o.persistKey, JSON.stringify(ns))
       }
-      _global.useGlobalUserDelete[_idx] = resetFunction
+      if (o?.listener)
+        o.listener(ns)
     }
+  };
 
-    function set(ns: T) {
-      const isChange = !isEqual(value, ns)
-      if (isChange) {
-        value = ns
-        fastLoop(subscriber?.[_idx], (c) => { c?.(ns) })
-        if (o?.persistKey) {
-          AsyncStorage.setItem(o.persistKey, JSON.stringify(ns))
-        }
-        if (o?.listener)
-          o.listener(ns)
-      }
-    };
-
-    function del() {
-      if (o?.persistKey) {
-        AsyncStorage.removeItem(o.persistKey)
-      }
-      set(initValue)
+  function del() {
+    if (o?.persistKey) {
+      AsyncStorage.removeItem(o.persistKey)
     }
+    set(initValue)
+  }
 
-    function useSelector(se: (state: T) => any): void {
-      let [l, s] = R.useState<any>(se(value));
+  function useSelector(se: (state: T) => any): void {
+    let [l, s] = R.useState<any>(se(value));
 
-      let sl = R.useCallback(
-        (ns: T) => {
-          let n = se(ns);
-          !isEqual(l, n) && s(n);
-        },
-        [l]
-      );
+    let sl = R.useCallback(
+      (ns: T) => {
+        let n = se(ns);
+        !isEqual(l, n) && s(n);
+      },
+      [l]
+    );
 
-      subscribe(sl)
+    subscribe(sl)
 
-      return l;
-    }
+    return l;
+  }
 
-    function subscribe(func: any) {
-      R.useLayoutEffect(() => {
-        subscriber[_idx].push(func);
-        return () => {
-          subscriber[_idx] = fastFilter(subscriber?.[_idx], (f) => f !== func)
-        };
-      }, [func]);
-    }
+  function subscribe(func: any) {
+    R.useLayoutEffect(() => {
+      subscriber[_idx].push(func);
+      return () => {
+        subscriber[_idx] = fastFilter(subscriber?.[_idx], (f) => f !== func)
+      };
+    }, [func]);
+  }
 
-    function get(param?: string, ...params: string[]): any {
-      let out: any = value;
-      if (param) {
-        const _params = [param, ...params]
-        if (_params.length > 0)
-          for (let i = 0; i < _params.length; i++) {
-            if (out && _params[i] != undefined)
-              out = out?.[_params[i]];
-          }
-      }
-      return out;
+  function get(param?: string, ...params: string[]): any {
+    let out: any = value;
+    if (param) {
+      const _params = [param, ...params]
+      if (_params.length > 0)
+        for (let i = 0; i < _params.length; i++) {
+          if (out && _params[i] != undefined)
+            out = out?.[_params[i]];
+        }
     }
+    return out;
+  }
 
 
-    function useState(): [T, (newState: T) => void, () => void] {
-      let [l, sl] = R.useState<T>(value);
+  function useState(): [T, (newState: T) => void, () => void] {
+    let [l, sl] = R.useState<T>(value);
 
-      subscribe(sl)
+    subscribe(sl)
 
-      return [l, set, del];
-    };
+    return [l, set, del];
+  };
 
-    function _connect(props: useGlobalConnect<T>): any {
-      const [state] = useState()
-      const children = props.render(state)
-      return children ? R.cloneElement(children) : null
-    }
-
-    globalIdx.increment()
-    return { useState, get, set, useSelector, reset: del, connect: _connect };
+  function _connect(props: useGlobalConnect<T>): any {
+    const [state] = useState()
+    const children = props.render(state)
+    return children ? R.cloneElement(children) : null
   }
 
-  function debounce(func: () => any, delay: number): void {
-    clearTimeout(debouceTime)
-    debouceTime = setTimeout(() => func(), delay)
-  }
+  globalIdx.increment()
+  return { useState, get, set, useSelector, reset: del, connect: _connect };
+}
 
-  function rehidryte(key: string, func: (e: string) => void) {
-    persistKeys[key] = func
-    debounce(() => {
-      AsyncStorage.multiGet(Object.keys(persistKeys), (e, v) => {
-        if (v && !e) {
-          v.forEach((iv, i) => {
-            persistKeys[iv[0]]?.(iv[1])
-          })
-        } else {
-          
-        }
-      })
-    }, 100)
-  }
-  return m
+function debounce(func: () => any, delay: number): void {
+  clearTimeout(debouceTime)
+  debouceTime = setTimeout(() => func(), delay)
 }
 
-export default n()
+function rehidryte(key: string, func: (e: string) => void) {
+  persistKeys[key] = func
+  debounce(() => {
+    AsyncStorage.multiGet(Object.keys(persistKeys), (e, v) => {
+      if (v && !e) {
+        v.forEach((iv, i) => {
+          persistKeys[iv[0]]?.(iv[1])
+        })
+      } else {
+
+      }
+    })
+  }, 100)
+}

package/modules/lib/image_multi.tsx

@@ -71,7 +71,7 @@ export default function m(props: LibImage_multiProps): any {
           setPhotos(LibObject.set(photos, item.selected == 1 ? 0 : 1)(index, "selected"))
     }} />
   )
-  const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
+  // const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
   const List = /* !!AutoLayoutViewNativeComponent ? FlashList : */ FlatList
 
   return (

package/modules/lib/infinite.tsx

@@ -172,7 +172,7 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
   render(): any {
     const { data, error } = this.state
     const { errorView, refreshEnabled } = this.props
-    const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
+    // const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
     const List = /* !!AutoLayoutViewNativeComponent ? FlashList : */ FlatList
     return (
       <View style={{ flex: 1 }} >

package/modules/lib/list.tsx

@@ -76,7 +76,7 @@ export default class EList extends LibComponent<LibListProps, LibListState> {
       if (this.props.staticHeight)
         return ({ getItemLayout: (data, index) => this.props.staticHeight ? ({ length: this.props.staticHeight, offset: this.props.staticHeight, index: index }) : undefined })
     }
-    const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
+    // const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
     const List = /* !!AutoLayoutViewNativeComponent ? FlashList : */ FlatList
     return (
       <View ref={(e) => this.view = e} style={[{ flex: 1 }]} >

package/modules/lib/worker.tsx

@@ -1,8 +1,10 @@
 // noPage
 
-import { useGlobalReturn, useGlobalState, _global } from 'esoftplay';
+import { useGlobalReturn, _global } from 'esoftplay';
 import React, { Component } from "react";
 import { Platform } from 'react-native';
+import useGlobalState from '../../global';
+
 
 export interface LibWorkerInit {
   task: string,
@@ -21,7 +23,7 @@ _global.LibWorkerTasks = new Map()
 _global.injectedJavaScripts = []
 _global.LibWorkerReady = 0
 _global.LibWorkerCount = 0
-const state = useGlobalState(null)
+const state = useGlobalState?.(null)
 export default class m extends Component<LibWorkerProps, LibWorkerState> {
   constructor(props: LibWorkerProps) {
     super(props)

package/modules/user/class.ts

@@ -1,14 +1,14 @@
 // noPage
 
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { esp, LibCrypt, LibCurl, LibNotification, useGlobalReturn, useGlobalState, UserClass, UserData } from 'esoftplay';
+import { esp, LibCrypt, LibCurl, LibNotification, useGlobalReturn, UserClass, UserData } from 'esoftplay';
 import Constants from 'expo-constants';
 import * as Notifications from 'expo-notifications';
 import { Platform } from 'react-native';
+import useGlobalState from '../../global';
 import moment from "../../moment";
 
-
-const state = useGlobalState(undefined)
+const state = useGlobalState?.(null)
 
 export default class eclass {
   static state(): useGlobalReturn<any> {
@@ -16,7 +16,7 @@ export default class eclass {
   }
   static create(user: any): Promise<void> {
     return new Promise((r, j) => {
-      state.set(user)
+      state?.set?.(user)
       AsyncStorage.setItem("user", new LibCrypt().encode(JSON.stringify(user)))
       if (esp.config('notification') == 1) {
         UserClass.pushToken()
@@ -32,7 +32,7 @@ export default class eclass {
           const usr = (user[0] == '{' && user[user.length - 1] == '}') ? JSON.parse(user) : JSON.parse(new LibCrypt().decode(user))
           if (usr) {
             r(usr);
-            state.set(usr)
+            state?.set?.(usr)
             if (callback) callback(usr)
           } else {
             j()

package/modules/user/index.tsx

@@ -52,7 +52,7 @@ export default function m(props: UserIndexProps): any {
     // const timeout = setTimeout(() => {
     //   setLoading(false)
     // }, 15 * 1000);
-    let limitReady = 3
+    let limitReady = 2
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         limitReady = 2
@@ -72,12 +72,12 @@ export default function m(props: UserIndexProps): any {
       }
     })()
 
-    UserClass.isLogin(async () => {
-      ready.current += 1
-      if (ready.current >= limitReady) {
-        setLoading(false)
-      }
-    })
+    // UserClass.isLogin(async () => {
+    //   ready.current += 1
+    //   if (ready.current >= limitReady) {
+    //     setLoading(false)
+    //   }
+    // })
     if (esp.config('firebase').hasOwnProperty('apiKey')) {
       try {
         if (ChattingFirebase)

package/package.json

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