esoftplay 0.0.269-beta4d33991 → 0.0.269-beta6ae30d2

package/modules/lib/curl.ts

@@ -4,8 +4,8 @@
 import esp from 'esoftplay/esp';
 import { LibCrypt } from 'esoftplay/cache/lib/crypt/import';
 import { reportApiError } from "esoftplay/error";
+import { File } from 'expo-file-system';
 
-//api_logger_import
 
 /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/curl.md) untuk melihat dokumentasi*/
 export default class m {
@@ -30,7 +30,7 @@ export default class m {
   }
 
   constructor(uri?: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, timeout: boolean) => void, debug?: number) {
-    this.header = { version: esp.config()?.publish_id }
+    this.header = { version: (esp.config()?.publish_id).toString() }
     // this.maxRetry = 2;
     this.setUri = this.setUri.bind(this);
     this.setUrl = this.setUrl.bind(this);
@@ -356,11 +356,12 @@ export default class m {
     if (post) {
       if (upload) {
         let fd = new FormData();
-        Object.keys(post).map(function (key) {
+        await Promise.all(Object.keys(post).map(async (key) => {
           if (post[key] !== undefined) {
-            fd.append(key, post[key])
+            const file = new File(post[key].uri)
+            fd.append(key, file as any, post[key].name)
           }
-        });
+        }));
         this.post = fd
       } else {
         let ps = Object.keys(post).map((key) => {
@@ -383,10 +384,9 @@ export default class m {
       this.setUrl(esp.config("url"))
     }
     await this.setHeader();
-    if (upload)
-      this.header["Content-Type"] = "multipart/form-data"
-    else
+    if (!upload)
       this.header["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8"
+    
     let options: any = {
       method: !this.post ? "GET" : "POST",
       headers: this.header,

package/modules/lib/infinite.tsx

@@ -106,6 +106,8 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>
         }
       })
       page = 0
+    }
+    if (page == 0) {
       this.pages = []
     }
     var { url, post } = this.props

package/modules/lib/navigation.ts

@@ -10,7 +10,7 @@ import { UserRoutes } from 'esoftplay/cache/user/routes/import';
 
 import esp from 'esoftplay/esp';
 import useGlobalState, { useGlobalReturn } from 'esoftplay/global';
-import React, { useEffect } from "react";
+import React, { useEffect, useSyncExternalStore } from "react";
 
 export interface LibNavigationTabConfigReturn<S extends keyof EspArgsInterface> {
   activeIndex: number,
@@ -23,7 +23,44 @@ export interface LibNavigationInjector {
   children?: any
 }
 
-export const lastArgs = useGlobalState(undefined, { persistKey: "lib/navigation/lastargs" })
+interface LibNavigationState {
+  redirect: Record<number, { func: Function }>,
+  data: Record<string | number, any>,
+  ref: any,
+  isReady: boolean
+}
+
+const initialNavigationState: LibNavigationState = {
+  redirect: {},
+  data: {},
+  ref: undefined,
+  isReady: false
+}
+
+let navigationState = initialNavigationState
+const navigationSubscribers = new Set<() => void>()
+
+const navigationStore = {
+  getSnapshot: () => navigationState,
+  subscribe: (callback: () => void) => {
+    navigationSubscribers.add(callback)
+    return () => navigationSubscribers.delete(callback)
+  },
+  setState: (nextState: LibNavigationState) => {
+    navigationState = nextState
+    navigationSubscribers.forEach((callback) => callback())
+  }
+}
+
+export function useNavigationState(): LibNavigationState {
+  return useSyncExternalStore(
+    navigationStore.subscribe,
+    navigationStore.getSnapshot,
+    navigationStore.getSnapshot
+  )
+}
+
+export const lastArgs = useGlobalState(undefined, { persistKey: "lib/navigation/lastargs", inFastStorage: true, loadOnInit: true })
 
 function logArgs(params: any) {
   lastArgs.set(params)
@@ -31,17 +68,25 @@ function logArgs(params: any) {
 
 /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md) untuk melihat dokumentasi*/
 export default {
-  _redirect: {} as any,
-  _data: {} as any,
-  _ref: {} as any,
-  _isReady: false,
+  get _redirect() {
+    return navigationStore.getSnapshot().redirect
+  },
+  get _data() {
+    return navigationStore.getSnapshot().data
+  },
+  get _ref() {
+    return navigationStore.getSnapshot().ref
+  },
+  get _isReady() {
+    return navigationStore.getSnapshot().isReady
+  },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#setRef) untuk melihat dokumentasi*/
   setRef(ref: any): void {
-    this._ref = ref
+    navigationStore.setState({ ...navigationStore.getSnapshot(), ref })
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#setIsReady) untuk melihat dokumentasi*/
   setIsReady(isReady: boolean): void {
-    this._isReady = isReady;
+    navigationStore.setState({ ...navigationStore.getSnapshot(), isReady });
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#getIsReady) untuk melihat dokumentasi*/
   getIsReady(): boolean {
@@ -49,7 +94,8 @@ export default {
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#setNavigation) untuk melihat dokumentasi*/
   setNavigation(nav: any): void {
-    this._data._navigation = nav
+    const state = navigationStore.getSnapshot()
+    navigationStore.setState({ ...state, data: { ...state.data, _navigation: nav } })
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#getArgs) untuk melihat dokumentasi*/
   getArgs(props: any, key: string, defOutput?: any): any {
@@ -72,45 +118,49 @@ export default {
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#setRedirect) untuk melihat dokumentasi*/
   setRedirect(func: Function, key?: number) {
     if (!key) key = 1
-    this._redirect[key] = { func }
+    const state = navigationStore.getSnapshot()
+    navigationStore.setState({ ...state, redirect: { ...state.redirect, [key]: { func } } })
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#delRedirect) untuk melihat dokumentasi*/
   delRedirect(key?: number) {
     if (!key) key = 1
-    delete this._redirect[key]
+    const state = navigationStore.getSnapshot()
+    const redirect = { ...state.redirect }
+    delete redirect[key]
+    navigationStore.setState({ ...state, redirect })
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#redirect) untuk melihat dokumentasi*/
   redirect(key?: number) {
     if (!key) key = 1
-    if (this._redirect?.[key]) {
-      const { func } = this._redirect?.[key]
+    const redirect = navigationStore.getSnapshot().redirect
+    if (redirect?.[key]) {
+      const { func } = redirect[key]
       if (typeof func == 'function')
         func()
-      delete this._redirect[key]
+      const state = navigationStore.getSnapshot()
+      const nextRedirect = { ...state.redirect }
+      delete nextRedirect[key]
+      navigationStore.setState({ ...state, redirect: nextRedirect })
     }
   },
   /* <T  EspRouterInterface>(path: T): EspRouterInterface[T] { */
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#navigate) untuk melihat dokumentasi*/
   navigate<S extends keyof EspArgsInterface>(route: S, params?: EspArgsInterface[S]): void {
     logArgs(params)
-    doIt(() => {
-      this._ref?.navigate?.(replaceModuleByUrlParam(params, route), params)
-    })
+    this._ref?.navigate?.(replaceModuleByUrlParam(params, route), params)
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#navigateTab) untuk melihat dokumentasi*/
   navigateTab<S extends keyof EspArgsInterface>(route: S, tabIndex: number, params?: EspArgsInterface[S]): void {
     logArgs(params)
-    doIt(() => {
-      this._ref?.navigate?.(replaceModuleByUrlParam(params, route), params)
-      setTimeout(() => {
-        const TabConfig = esp.modProp(replaceModuleByUrlParam(params, route))?.TabConfig;
-        if (TabConfig) {
-          TabConfig.set(esp.mod("lib/object").set(TabConfig.get(), tabIndex)('activeIndex'))
-        } else {
-          console.error("TabConfig not found or exported in module " + route);
-        }
-      }, 100);
-    })
+    this._ref?.navigate?.(replaceModuleByUrlParam(params, route), params)
+    setTimeout(() => {
+      const TabConfig = esp.modProp(replaceModuleByUrlParam(params, route))?.TabConfig;
+      if (TabConfig) {
+        TabConfig.set(esp.mod("lib/object").set(TabConfig.get(), tabIndex)('activeIndex'))
+      } else {
+        console.error("TabConfig not found or exported in module " + route);
+      }
+    }, 100);
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#createTabConfig) untuk melihat dokumentasi*/
   createTabConfig<S extends keyof EspArgsInterface>(modules: S[], defaultIndex?: number): useGlobalReturn<LibNavigationTabConfigReturn<S>> {
@@ -147,7 +197,10 @@ export default {
       key = 1
     }
     try {
-      delete this._data[key]
+      const state = navigationStore.getSnapshot()
+      const data = { ...state.data }
+      delete data[key]
+      navigationStore.setState({ ...state, data })
     } catch (error) { }
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#sendBackResult) untuk melihat dokumentasi*/
@@ -157,7 +210,10 @@ export default {
     }
     if (this._data[key] != undefined) {
       this._data[key](result)
-      delete this._data[key]
+      const state = navigationStore.getSnapshot()
+      const data = { ...state.data }
+      delete data[key]
+      navigationStore.setState({ ...state, data })
     }
     this.back()
   },
@@ -172,13 +228,18 @@ export default {
       }
       params['_senderKey'] = key
       if (!this._data.hasOwnProperty(key) && key != undefined) {
-        this._data[key] = (value: any) => {
-          r(value)
-        };
+        const state = navigationStore.getSnapshot()
+        navigationStore.setState({
+          ...state,
+          data: {
+            ...state.data,
+            [key]: (value: any) => {
+              r(value)
+            }
+          }
+        })
       }
-      doIt(() => {
-        this.push(replaceModuleByUrlParam(params, route), params)
-      })
+      this.push(replaceModuleByUrlParam(params, route), params)
     })
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#replace) untuk melihat dokumentasi*/
@@ -191,14 +252,12 @@ export default {
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#push) untuk melihat dokumentasi*/
   push<S extends keyof EspArgsInterface>(route: S, params?: EspArgsInterface[S]): void {
     logArgs(params)
-    doIt(() => {
-      this._ref?.dispatch?.(
-        StackActions.push(
-          replaceModuleByUrlParam(params, route),
-          params
-        )
+    this._ref?.dispatch?.(
+      StackActions.push(
+        replaceModuleByUrlParam(params, route),
+        params
       )
-    })
+    )
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/modules/lib/navigation.md#reset) untuk melihat dokumentasi*/
   reset(route?: LibNavigationRoutes, ...routes: LibNavigationRoutes[]): void {
@@ -219,9 +278,7 @@ export default {
   back(deep?: number): void {
     let _deep = deep || 1
     const popAction = StackActions.pop(_deep);
-    doIt(() => {
-      this._ref?.dispatch?.(popAction)
-    })
+    this._ref?.dispatch?.(popAction)
   },
 
   /* return `root` on initialRoute otherwise return the route was active  */
@@ -244,10 +301,6 @@ export default {
   }
 }
 
-function doIt(func: Function) {
-  requestAnimationFrame(() => func())
-}
-
 
 function replaceModuleByUrlParam<S extends keyof EspArgsInterface>(params: any, defaultModule: S) {
   let module = defaultModule

package/modules/sys/global.ts

@@ -1,3 +1,4 @@
+//[moved] change
 //noPage
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import esp from 'esoftplay/esp';
@@ -5,7 +6,7 @@ import MMKV from 'esoftplay/mmkv';
 import Storage from 'esoftplay/storage';
 import * as R from 'react';
 import isEqual from 'react-fast-compare';
-import { createDebounce } from './timeout';
+import { createDebounce } from 'esoftplay/timeout';
 
 
 export interface useGlobalReturn<T> {
@@ -44,7 +45,7 @@ export interface useGlobalConnect<T> {
   render: (props: Partial<T> | T) => any,
 }
 export let userDataReset: Function[] = []
-let timeoutFinish: NodeJS.Timeout
+let timeoutFinish: ReturnType<typeof setTimeout>
 
 /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/global.md) untuk melihat dokumentasi*/
 export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
@@ -54,11 +55,17 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   }
   const STORAGE = o?.inFastStorage ? MMKV : (o?.inFile ? Storage : AsyncStorage);
   let value: T = initValue;
-  const subsSetter = new Set<(newValue: T) => void>(); // Typed Set
+  const subsSetter = new Set<() => void>(); // Typed Set
   const listener = new Set<(value: T) => void>(); // Typed Set
   let loaded = -1;
   let taskSync: any = undefined;
 
+  const useSyncStore = (R as any).useSyncExternalStore;
+  const subscribeStore = (callback: () => void) => {
+    subsSetter.add(callback)
+    return () => subsSetter.delete(callback)
+  }
+
   // Optimization: Check persistKey only once
   const hasPersistKey = !!o?.persistKey;
   const persistKey = o?.persistKey; // Store it for easier access
@@ -133,7 +140,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
               } else if (p === "true" || p === "false") {
                 set(JSON.parse(p)); // Directly parse boolean strings
               } else if (!isNaN(p as any)) {
-                set(Number(p)); // Directly convert to number
+                set((Number(p) as unknown) as T); // Directly convert to number
               } else {
                 set(p); // No need for eval if not an object or boolean or number
               }
@@ -180,14 +187,14 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
 
     if (!isEqual(value, newValue)) { // Use direct import of isEqual
       value = newValue;
-      subsSetter.forEach((c) => c(newValue)); // Directly call the callback
+      subsSetter.forEach((c) => c());
 
       if (hasPersistKey && newValue !== undefined) { // Check hasPersistKey
         const data = typeof newValue === 'object' && newValue !== null
           ? (o.jsonBeautify ? JSON.stringify(newValue, null, 2) : JSON.stringify(newValue))
           : String(newValue); // Simplified data assignment
 
-        STORAGE.setItem(persistKey, data); // Use the stored persistKey
+        STORAGE.setItem(String(persistKey), data); // Use the stored persistKey
       }
 
       if (o?.listener) {
@@ -209,26 +216,25 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
     set(initValue)
   }
 
-  function useSelector(se: (state: T) => any): Partial<T> | T {
+  function useSelector(se: (state: T) => any): any {
     loadFromDisk()
 
-    let [l, s] = R.useState<any>(se(value));
+    const getSnapshot = () => se(value)
+    const subscribe = subscribeStore
 
-    let sl = (ns: T) => {
-      let n = se(ns);
-      if (!isEqual(l, n))
-        s(n);
-    }
+    return useSyncStore ? (useSyncStore(subscribe, getSnapshot, getSnapshot)) : R.useMemo(() => se(value), [value])
+  }
 
-    R.useLayoutEffect(() => {
-      subsSetter.add(sl)
-      return () => {
-        subsSetter.delete(sl)
-      };
-    }, [sl]);
+  function useState(): [T, (newState: T | ((newState: T) => T)) => void, () => T] {
+    loadFromDisk()
 
-    return l;
-  }
+    const getSnapshot = () => value
+    const subscribe = subscribeStore
+
+    const state = useSyncStore ? useSyncStore(subscribe, getSnapshot, getSnapshot) : R.useState<T>(value)[0]
+
+    return [state, set, () => value];
+  };
 
   function useAutoSyncOnNetworkChanges() {
     esp.mod("lib/net_status").subscriber.useSubscribe(({ isInternetReachable, isOnline }) => {
@@ -253,21 +259,6 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
     return out;
   }
 
-
-  function useState(): [T, (newState: T | ((newState: T) => T)) => void, () => T] {
-    loadFromDisk()
-    let [l, s] = R.useState<T>(value);
-
-    R.useLayoutEffect(() => {
-      subsSetter.add(s)
-      return () => {
-        subsSetter.delete(s)
-      };
-    }, [s]);
-
-    return [l, set, () => value];
-  };
-
   function _connect(props: useGlobalConnect<T>): any {
     const state = props.selector ? useSelector(props.selector) : useState()[0]
     const children = props.render(state)

package/modules/use/deeplink.ts

@@ -23,7 +23,7 @@ export default function m(defaultUrl?: string): void {
           }
           return url
         }
-        new (esp.mod("lib/curl"))().custom(removeLastDot(url) + "&t=" + new Date().getTime(), null,
+        new (esp.mod("lib/curl"))().custom(removeLastDot(url) + (removeLastDot(url).includes("?") ? "&" : "?") + "t=" + new Date().getTime(), null,
           (res) => {
             if (res.ok == 1) {
               params.set(res.result.params)

package/package.json

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