esoftplay 0.0.140 → 0.0.141

package/bin/build.js

@@ -227,6 +227,7 @@ if (fs.existsSync(packjson)) {
 	"compilerOptions": {\n\
 		"allowSyntheticDefaultImports": true,\n\
 		"experimentalDecorators": true,\n\
+		"resolveJsonModule": true, \n\
 		"forceConsistentCasingInFileNames": true,\n\
 		"importHelpers": true,\n\
 		"jsx": "react-native",\n\
@@ -319,6 +320,7 @@ export default UserIndex`;
 			'react-native-gesture-handler',
 			'react-native-awesome-gallery',
 			'react-native-fast-image',
+			'react-native-keyboard-controller',
 			'react-native-mmkv',
 			'react-native-pan-pinch-view',
 			'react-native-reanimated',

package/bin/cli.js

@@ -87,6 +87,7 @@ switch (args[0]) {
 		break
 	case "b":
 	case "build":
+		buildPrepare(false)
 		buildPrepare(true)
 		build()
 		break;
@@ -540,7 +541,7 @@ function publish(notes) {
 	let ajson = readToJSON(appjson)
 	if (ajson.expo.hasOwnProperty("updates"))
 		if (ajson.expo.updates.hasOwnProperty('url') && !ajson.expo.updates.url.includes("https://u.expo.dev")) {
-			if (!fs.existsSync('./code-signing')){
+			if (!fs.existsSync('./code-signing')) {
 				consoleError("./code-signing not found!")
 				return
 			}
@@ -840,8 +841,9 @@ function devClientPre(file) {
 		}
 		let app = JSON.parse(txt)
 		app.expo.name = app.expo.name.includes("DC-") ? app.expo.name : ("DC-" + app.expo.name)
-		app.expo.extra = app.expo.updates
-		delete app.expo.updates
+		// if (!app.expo.extra && app.expo.update)
+		// 	app.expo.extra = app.expo.updates
+		// delete app.expo.updates
 		fs.writeFileSync(file, JSON.stringify(app, undefined, 2))
 	} else {
 		consoleError(file)
@@ -857,8 +859,9 @@ function devClientPos(file) {
 		}
 		let app = JSON.parse(txt)
 		app.expo.name = app.expo.name.replace("DC-", "")
-		app.expo.updates = app.expo.extra
-		delete app.expo.extra
+		// if (app.expo.extra)
+		// 	app.expo.updates = app.expo.extra
+		// delete app.expo.extra
 		fs.writeFileSync(file, JSON.stringify(app, undefined, 2))
 	} else {
 		consoleError(file)

package/bin/router.js

@@ -141,7 +141,9 @@ if (!fs.existsSync(pathAsset)) {
 listDir(pathAsset);
 var Assets = "";
 var pLength = pathAsset.length - 1;
+let dFiles = []
 assets.forEach(File => {
+  dFiles.push(File.substr(pLength))
   Assets += "\t\tcase \"" + File.substr(pLength) + "\":\n" +
     "\t\t\tOut = require(\"../../../" + File + "\");\n" +
     "\t\t\tbreak;\n";
@@ -154,12 +156,18 @@ Text = 'function assets(File) {' + "\n\t" +
   'return Out;' + "\n" +
   '}' + "\n" +
   'module.exports = assets;';
-if (isChange(tmpDir + "assets.js", Text))
+if (isChange(tmpDir + "assets.js", Text)) {
+  fs.writeFile(tmpDir + "assets.d.ts", `export type EspAssets = ${dFiles.map((x) => "\"" + x + "\"").join(" | ")}`, { flag: "w" }, (err) => {
+    if (err) {
+      return console.log(err);
+    }
+  })
   fs.writeFile(tmpDir + "assets.js", Text, { flag: 'w' }, function (err) {
     if (err) {
       return console.log(err);
     }
   });
+}
 
 /* CREATE INDEX.D.TS */
 function createIndex() {
@@ -429,4 +437,39 @@ export interface EspArgsInterface {
         return console.log(err);
       }
     });
+
+  function readToJSON(path) {
+    var txt = fs.readFileSync(path, 'utf8');
+    let isJSON = txt.startsWith('{') || txt.startsWith('[')
+    return isJSON ? JSON.parse(txt) : txt
+  }
+  const espConfig = readToJSON("./config.json")
+  const presets = {
+    timezone: "",
+    protocol: "",
+    uri: "",
+    url: "",
+    content: "",
+    webviewOpen: "",
+    webviewClose: "",
+    api: "",
+    data: "",
+    home: {
+      member: "",
+      public: ""
+    },
+    group_id: 0,
+    langIds: [],
+    theme: [],
+    comment_login: 1,
+    notification: 0,
+    ...espConfig.config
+  }
+  if (isChange(tmpDir + "config.json", JSON.stringify(presets))) {
+    fs.writeFile(tmpDir + "config.json", JSON.stringify(presets), { flag: 'w' }, function (err) {
+      if (err) {
+        return console.log(err);
+      }
+    });
+  }
 }

package/config.json

@@ -1,38 +1,40 @@
 {
   "config": {
     "timezone": "Asia/Jakarta",
-    "protocol": "http",                       // http or https
-    "domain": "esoftplay.com",                // naked domain to website
-    "api": "api",                             // optional: subdomain to access web API
-    "data": "data",                           // optional: subdomain to access web content / article
-    "uri": "/",                               // relatif path to main website
-    "home": {                                 // define the frontpage for module/task
-      "member": "content/member",             // when user has been logged in
-      "public": "content"                     // when user not login yet
+    "protocol": "http", // http or https
+    "domain": "esoftplay.com", // naked domain to website
+    "api": "api", // optional: subdomain to access web API
+    "data": "data", // optional: subdomain to access web content / article
+    "uri": "/", // relatif path to main website
+    "home": { // define the frontpage for module/task
+      "member": "content/member", // when user has been logged in
+      "public": "content" // when user not login yet
     },
-    "errorReport": {                          // add telegram ids to listenReport Error
+    "errorReport": { // add telegram ids to listenReport Error
       "telegramIds": [
         "111111111"
       ]
     },
-    "group_id":'1,2',                         // string separated comma
-    "isDebug": 1,                             // optional: display console on esp.log('any message'), don't use it for automatic detect the environment (production / development)
-    "salt": "CHANGE_INTO_YOUR_OWN_SALT",      // SALT form config.php in your website
-    "notification": 1,                        // optional: to determine is this application have notification or not
-    "exludeModules":[],                        // optional: to delete module when listed
-    "firebase": {                             // https://console.firebase.google.com - download google-services.json
-      "apiKey": "FIREBASE_Web_API_Key",       // Eg. AIzaSyAvVyNeXI3RTo7Tl5LCBSZ-mu92VpbPBK8Y
-      "authDomain": "FIREBASE_authDomain",    // Eg. project-6495177974885932998.firebaseapp.com
+    "group_id":'1,
+    2', // string separated comma
+    "isDebug": 1, // optional: display console on esp.log('any message'), don't use it for automatic detect the environment (production / development)
+    "salt": "CHANGE_INTO_YOUR_OWN_SALT", // SALT form config.php in your website
+    "notification": 1, // optional: to determine is this application have notification or not
+    "exludeModules": [],
+    "excludePackages": [], // optional: to delete module when listed
+    "firebase": { // https://console.firebase.google.com - download google-services.json
+      "apiKey": "FIREBASE_Web_API_Key", // Eg. AIzaSyAvVyNeXI3RTo7Tl5LCBSZ-mu92VpbPBK8Y
+      "authDomain": "FIREBASE_authDomain", // Eg. project-6495177974885932998.firebaseapp.com
       "databaseURL": "FIREBASE_Database_URL", // Eg. https://project-6495177974885932998.firebaseio.com/
       "storageBucket": "FIREBASE_Storage_URL" // Eg. test://project-6495177974885932998.appspot.com/
     },
-    "experienceId":"@esp/appslug",
-    "iosClientId":"Ios Client id untuk keperluan google login",
-    "facebookAppId":"APP ID dari Aplikasi yang didaftarkan di Facebook Developer",
-    "theme":[],                                // untuk custom theme jika diperlukan,silahkan lihat module LibTheme untuk cara peggunaannya
-    "fonts":{
-      "fontName":"fontName.ttf or .otf",       //  taruh file font di assets/fonts/ jika ingin custom fonts. bisa lebih dari 1
-      "fontName2":"fontName2.ttf or .otf"
+    "experienceId": "@esp/appslug",
+    "iosClientId": "Ios Client id untuk keperluan google login",
+    "facebookAppId": "APP ID dari Aplikasi yang didaftarkan di Facebook Developer",
+    "theme": [], // untuk custom theme jika diperlukan,silahkan lihat module LibTheme untuk cara peggunaannya
+    "fonts": {
+      "fontName": "fontName.ttf or .otf", //  taruh file font di assets/fonts/ jika ingin custom fonts. bisa lebih dari 1
+      "fontName2": "fontName2.ttf or .otf"
     }
   }
 }

package/error.ts

@@ -1,9 +1,9 @@
-import AsyncStorage from '@react-native-async-storage/async-storage';
 import Constants from 'expo-constants';
 import { Platform } from 'react-native';
 import { LibCurl } from './cache/lib/curl/import';
 import { UserClass } from './cache/user/class/import';
 import esp from './esp';
+import FastStorage from './mmkv';
 import { default as UserRoutes } from './modules/user/routes';
 let pack = require('../../package.json');
 let app = require('../../app.json');
@@ -35,7 +35,7 @@ export function setError(error?: any) {
     time: getTime()
   };
   try {
-    AsyncStorage.setItem(`${config?.domain}error`, JSON.stringify(_e));
+    FastStorage.setItem(`${config?.domain}error`, JSON.stringify(_e));
   } catch (e) {
     console.error(e);
   }
@@ -87,7 +87,6 @@ export function sendTm(message: string, chat_id?: string, bot?: string, res?: (r
     let config = esp?.config?.()
     _chatids = Object.values(config?.errorReport?.telegramIds)
   }
-  console.log(_chatids)
   _chatids.forEach((cid: string) => {
     let post = {
       text: message,
@@ -101,7 +100,7 @@ export function sendTm(message: string, chat_id?: string, bot?: string, res?: (r
 
 export function getError() {
   let config = esp?.config?.()
-  AsyncStorage.getItem(config?.domain + 'error').then((e: any) => {
+  FastStorage.getItem(config?.domain + 'error').then((e: any) => {
     if (e) {
       let _e = JSON.parse(e)
       let msg = [
@@ -137,7 +136,7 @@ export function getError() {
         });
       }
       // });
-      AsyncStorage.removeItem(config.domain + 'error')
+      FastStorage.removeItem(config.domain + 'error')
     }
   })
 }

package/esp.ts

@@ -1,3 +1,5 @@
+import { EspAssets } from 'esoftplay/cache/assets';
+import cacheConfig from 'esoftplay/cache/config.json';
 import { LibLocale } from 'esoftplay/cache/lib/locale/import';
 import { EspRouterPropertyInterface } from 'esoftplay/cache/properties';
 import { EspRouterInterface } from 'esoftplay/cache/routers';
@@ -6,6 +8,8 @@ import { LogBox, Platform } from 'react-native';
 import 'react-native-reanimated';
 import './oneplusfixfont';
 
+type ConfigType = typeof cacheConfig
+
 const ignoreWarns = [
   "Setting a timer for a long period of time",
   "VirtualizedLists should never be nested inside plain ScrollViews with the same orientation",
@@ -71,28 +75,28 @@ const esp = {
   appjson(): any {
     return esp.mergeDeep(app, conf)
   },
-  assets(path: string): any {
+  assets(path: EspAssets): any {
     const _assets = require('./cache/assets')
     return _assets(path)
   },
   versionName(): string {
     return (Platform.OS == 'android' ? Constants?.expoConfig?.android?.versionCode : Constants?.expoConfig?.ios?.buildNumber) + '-' + esp.config('publish_id')
   },
-  config(param?: string, ...params: string[]): any {
-    let out: any = esp._config();
+  config<T = ConfigType>(param?: keyof ConfigType, ...params: string[]): T {
+    let out: any = this._config();
     if (param) {
-      var _params = [param, ...params]
-      if (_params.length > 0)
-        for (let i = 0; i < _params.length; i++) {
-          const key = _params[i];
-          if (out?.hasOwnProperty?.(key)) {
-            out = out[key];
-          } else {
-            out = {};
-          }
+      const _params = [param, ...params];
+      for (let i = 0; i < _params.length; i++) {
+        const key = _params[i];
+        if (out && typeof out === 'object' && out.hasOwnProperty(key)) {
+          out = out[key];
+        } else {
+          return {} as T; // Return empty object if key doesn't exist
         }
+      }
     }
-    return out;
+
+    return out as T;
   },
   isDebug(message: string): boolean {
     if (!lconf) {
@@ -116,7 +120,7 @@ const esp = {
       return out;
     }
   },
-  lang(moduleTask: string, langName: string, ...stringToBe: string[]): string {
+  lang<T extends keyof EspRouterInterface>(moduleTask: T, langName: string, ...stringToBe: string[]): string {
     let string = LibLocale.stateLang().get()?.[esp.langId()]?.[moduleTask]?.[langName]
     if (!string) {
       string = esp.assets("locale/id.json")?.[moduleTask]?.[langName]
@@ -155,7 +159,7 @@ const esp = {
     const properties = require('./cache/properties')
     return properties(modtast.join("/"));
   },
-  _config(): string {
+  _config(): typeof cacheConfig {
     app = esp.mergeDeep(app, conf)
     var msg = ''
     if (!app.hasOwnProperty('config')) {
@@ -172,7 +176,7 @@ const esp = {
       throw error;
     }
 
-    var config = {
+    const config = {
       // default config
       timezone: "Asia/Jakarta",
       protocol: "http",

package/global.ts

@@ -1,5 +1,6 @@
 import esp from 'esoftplay/esp';
 import * as R from 'react';
+import { createDebounce } from './timeout';
 
 export interface useGlobalReturn<T> {
   useState: () => [T, (newState: T | ((newState: T) => T)) => void, () => T],
@@ -7,7 +8,7 @@ export interface useGlobalReturn<T> {
   set: (x: T | ((old: T) => T)) => void,
   reset: () => void,
   listen: (cb: (value: T) => void) => () => void
-  sync: () => void,
+  sync: () => () => void,
   connect: (props: useGlobalConnect<T>) => any,
   useSelector: (selector: (state: T) => any) => any;
 }
@@ -15,6 +16,7 @@ export interface useGlobalReturn<T> {
 export interface useGlobalAutoSync {
   url: string,
   post: (item: any) => Object,
+  delayInMs?: number,
   isSyncing?: (isSync: boolean) => void
 }
 
@@ -31,7 +33,8 @@ export interface useGlobalOption {
 }
 
 export interface useGlobalConnect<T> {
-  render: (props: T) => any,
+  selector?: (props: T) => any,
+  render: (props: Partial<T> | T) => any,
 }
 export let userDataReset: Function[] = []
 let timeoutFinish: NodeJS.Timeout
@@ -42,7 +45,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   let value: T = initValue;
   let listener = new Set<Function>()
   let loaded = -1
-  let sync: any = undefined
+  let taskSync: any = undefined
 
   if (o?.persistKey) {
     STORAGE = o?.inFastStorage ? require('esoftplay/mmkv').default : (o?.inFile ? (require('esoftplay/storage').default) : (require('@react-native-async-storage/async-storage').default))
@@ -52,14 +55,24 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   }
 
   function _sync() {
-    if (o?.useAutoSync && sync && Array.isArray(value))
-      sync?.(value.filter((item: any) => item.synced != 1))
+    const debounce = createDebounce()
+    if (o?.useAutoSync && taskSync && Array.isArray(value)) {
+      debounce.set(taskSync[0]?.(value.filter((item: any) => item.synced != 1)), 16)
+    }
+    return () => {
+      if (o?.useAutoSync && taskSync && Array.isArray(value)) {
+        taskSync?.[1]?.()
+        debounce.set(taskSync[0]?.(value.filter((item: any) => item.synced != 1)), 16)
+      }
+    }
   }
 
   if (o?.useAutoSync) {
     const LibCurl = esp.mod("lib/curl")
     const UseTasks = esp.mod("use/tasks")
-    sync = UseTasks()((item) => new Promise((next) => {
+    taskSync = UseTasks()((item) => new Promise((next) => {
+      const debounce = createDebounce()
+      const delayInMs = o?.useAutoSync?.delayInMs || 0
       const { isOnline, isInternetReachable } = esp.mod("lib/net_status").state().get()
       if (isOnline && isInternetReachable) {
         if (o?.useAutoSync) {
@@ -74,18 +87,18 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
                   return old
                 }
               })
-              next()
+              debounce.set(next, delayInMs)
             }, () => {
-              next()
+              debounce.set(next, delayInMs)
             }
           )
         }
       } else {
-        next()
+        debounce.set(next, delayInMs)
       }
     }), () => {
       o?.useAutoSync?.isSyncing?.(false)
-    })[0]
+    })
   }
 
   function loadFromDisk() {
@@ -159,8 +172,8 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
       }
       if (o?.listener)
         o.listener(newValue)
-      if (o?.useAutoSync && sync)
-        sync?.(newValue.filter((item: any) => item.synced != 1))
+      if (o?.useAutoSync && taskSync)
+        taskSync?.[0]?.(newValue.filter((item: any) => item.synced != 1))
       if (listener.size > 0) {
         listener.forEach((fun) => fun?.(newValue))
       }
@@ -174,7 +187,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
     set(initValue)
   }
 
-  function useSelector(se: (state: T) => any): void {
+  function useSelector(se: (state: T) => any): Partial<T> | T {
     loadFromDisk()
 
     let [l, s] = R.useState<any>(se(value));
@@ -225,7 +238,7 @@ export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): us
   };
 
   function _connect(props: useGlobalConnect<T>): any {
-    const [state] = useState()
+    const state = props.selector ? useSelector(props.selector) : useState()[0]
     const children = props.render(state)
     return children ? R.cloneElement(children) : null
   }

package/mmkv.ts

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

package/modules/lib/custom.tsx

@@ -0,0 +1,45 @@
+// withHooks
+
+import esp from 'esoftplay/esp';
+import React, { useEffect, useRef } from 'react';
+import { Linking, Pressable, Text, View } from 'react-native';
+import WebView from 'react-native-webview';
+
+
+export interface LibCustomArgs {
+
+}
+export interface LibCustomProps {
+
+}
+export default function m(props: LibCustomProps): any {
+	const LibIcon = useRef(esp.mod("lib/icon")).current
+
+  const { url, title } = esp.mod("lib/navigation").getArgsAll(props)
+
+  useEffect(() => {
+    if (!String(url).startsWith("http")) {
+      Linking.openURL(url)
+      esp.mod("lib/navigation").back()
+    }
+  }, [])
+
+  if (String(url).startsWith("http"))
+    return (
+      <View style={{ flex: 1 }} >
+        <View style={[{ height: 60 + esp.mod("lib/style").STATUSBAR_HEIGHT, paddingTop: esp.mod("lib/style").STATUSBAR_HEIGHT, backgroundColor: "#fff", flexDirection: 'row', alignItems: 'center', marginBottom: 3 }, esp.mod("lib/style").elevation(3)]} >
+          <Pressable onPress={() => esp.mod("lib/navigation").back()} style={{ height: 60, width: 60, alignItems: 'center', justifyContent: 'center' }} >
+            <LibIcon name='arrow-left' />
+          </Pressable>
+          <Text style={{ fontWeight: "bold", marginLeft: 0 }}>{title ? title : ""}</Text>
+        </View>
+        <WebView
+          style={{ flex: 1 }}
+          source={{ uri: url }}
+          startInLoadingState={true}
+        />
+      </View>
+    )
+  else
+    return null
+}

package/modules/lib/object.ts

@@ -3,10 +3,10 @@
 import { update } from "immhelper";
 
 export default class m {
-  _value = undefined
+  #value = undefined
 
   constructor(array: any) {
-    this._value = array
+    this.#value = array
     this.value = this.value.bind(this)
     this.push = this.push.bind(this)
     this.unset = this.unset.bind(this)
@@ -27,40 +27,48 @@ export default class m {
         spec = { [pathToUpdate]: [command, ...allValues] }
       else
         spec = [command, ...allValues]
-      this._value = update(array, spec)
+      this.#value = update(array, spec)
       return this
     }
   }
 
   push(value?: any, ...values: any[]): (cursor?: string | number, ...cursors: (string | number)[]) => this {
-    return this.cursorBuilder("push", this._value, value, ...values)
+    return this.cursorBuilder("push", this.#value, value, ...values)
   }
 
   unshift(value?: any, ...values: any[]): (cursor?: string | number, ...cursors: (string | number)[]) => this {
-    return this.cursorBuilder("unshift", this._value, value, ...values)
+    return this.cursorBuilder("unshift", this.#value, value, ...values)
   }
 
   splice(index: number, deleteCount: number, value?: any, ...values: any[]): (cursor?: string | number, ...cursors: (string | number)[]) => this {
-    return this.cursorBuilder("splice", this._value, index, deleteCount, value, ...values)
+    return this.cursorBuilder("splice", this.#value, index, deleteCount, value, ...values)
   }
   unset(index: number | string, ...indexs: (string | number)[]): (cursor?: string | number, ...cursors: (string | number)[]) => this {
-    return this.cursorBuilder("unset", this._value, index, ...indexs)
+    return this.cursorBuilder("unset", this.#value, index, ...indexs)
   }
 
   set(value: any): (cursor?: string | number, ...cursors: (string | number)[]) => this {
-    return this.cursorBuilder("set", this._value, value)
+    return this.cursorBuilder("set", this.#value, value)
   }
 
   update(callback: (lastValue: any) => any): (cursor?: string | number, ...cursors: (string | number)[]) => this {
-    return this.cursorBuilder("batch", this._value, callback)
+    return this.cursorBuilder("batch", this.#value, callback)
   }
 
   assign(obj1: any): (cursor?: string | number, ...cursors: (string | number)[]) => this {
-    return this.cursorBuilder("assign", this._value, deepCopy(obj1))
+    return this.cursorBuilder("assign", this.#value, deepCopy(obj1))
+  }
+
+  removeKeys(deletedItemKeys: string[]): (cursor?: string | number, ...cursors: (string | number)[]) => this {
+    return this.cursorBuilder("batch", this.#value, (arr: any) => _removeKeys(arr, deletedItemKeys))
+  }
+
+  replaceItem<T>(filter: (item: T, index: number) => boolean, newItem: T): (cursor?: string | number, ...cursors: (string | number)[]) => this {
+    return this.cursorBuilder("batch", this.#value, (arr: any) => _replaceItem(arr, filter, newItem))
   }
 
   value(): any {
-    return this._value
+    return this.#value
   }
 
   static push(array: any, value?: any, ...values: any[]): (cursor?: string | number, ...cursors: (string | number)[]) => any {
@@ -69,6 +77,12 @@ export default class m {
   static unshift(array: any, value?: any, ...values: any[]): (cursor?: string | number, ...cursors: (string | number)[]) => any {
     return cursorBuilder("unshift", array, value, ...values)
   }
+  static removeKeys(arrayOrObj: any, deletedItemKeys: string[]): (cursor?: string | number, ...cursors: (string | number)[]) => any {
+    return cursorBuilder("batch", arrayOrObj, (arrOrObj: any) => _removeKeys(arrOrObj, deletedItemKeys))
+  }
+  static replaceItem<T>(arrayOrObj: any, filter: (item: T, index: number) => boolean, newItem: T): (cursor?: string | number, ...cursors: (string | number)[]) => any {
+    return cursorBuilder("batch", arrayOrObj, (arrOrObj: any) => _replaceItem(arrOrObj, filter, newItem))
+  }
   static splice(array: any, index: number, deleteCount: number, value?: any, ...values: any[]): (cursor?: string | number, ...cursors: (string | number)[]) => any {
     return cursorBuilder("splice", array, index, deleteCount, value, ...values)
   }
@@ -84,32 +98,6 @@ export default class m {
   static assign(obj: any, obj1: any): (cursor?: string | number, ...cursors: (string | number)[]) => any {
     return cursorBuilder("assign", obj, deepCopy(obj1))
   }
-
-  //   static deepMerge(obj: any, obj1: any) {
-  //     return (cursor?: string | number, ...cursors: (string | number)[]) => {
-  //       function mergeDeep(target: any, source: any): any {
-  //         const isObject = (obj) => obj && typeof obj === 'object';
-  //         if (!isObject(target) || !isObject(source)) {
-  //           return source;
-  //         }
-  //         Object.keys(source).forEach(key => {
-  //           const targetValue = target[key];
-  //           const sourceValue = source[key];
-  //           if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
-  //             target[key] = targetValue.concat(sourceValue);
-  //           } else if (isObject(targetValue) && isObject(sourceValue)) {
-  //             target[key] = mergeDeep(Object.assign({}, targetValue), sourceValue);
-  //           } else {
-  //             target[key] = sourceValue;
-  //           }
-  //         });
-  //         return target;
-  //       }
-  //       const allCursors = [cursor, ...cursors].filter((x) => x != undefined)
-  //       let addressedObj = obj[cursor]
-  //       return mergeDeep(addressedObj, obj1)
-  //     }
-  //   }
 }
 
 function cursorBuilder(command: string, array: any, value: any, ...values: any[]): (cursor?: string | number, ...cursors: (string | number)[]) => any {
@@ -126,8 +114,46 @@ function cursorBuilder(command: string, array: any, value: any, ...values: any[]
 }
 
 
+function _removeKeys(objOrArr: any, keysToRemove: string[]) {
+  if (Array.isArray(objOrArr)) {
+    return objOrArr.map(obj => {
+      let newObj = { ...obj };
+      keysToRemove.forEach(key => {
+        delete newObj[key];
+      });
+      return newObj;
+    });
+  } else {
+    let newObj = { ...objOrArr };
+    keysToRemove.forEach(key => {
+      delete newObj[key];
+    });
+    return newObj;
+  }
+}
+
+function _replaceItem(data: any, predicate: (item: any, index: number) => boolean, newItem: any) {
+  if (Array.isArray(data)) {
+    return data.map((item, index) => {
+      if (predicate(item, index)) {
+        return newItem;
+      }
+      return item;
+    });
+  } else if (typeof data === 'object' && data !== null) {
+    let newData = { ...data };
+    Object.keys(newData).forEach((key, index) => {
+      if (predicate(newData[key], index)) {
+        newData[key] = newItem;
+      }
+    });
+    return newData;
+  } else
+    return data
+}
+
 
-function deepCopy(o) {
+function deepCopy(o: any) {
   switch (typeof o) {
     case 'object':
       if (o === null) return null;

package/package.json

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

package/persist.ts

@@ -1,43 +1,46 @@
-import AsyncStorage from '@react-native-async-storage/async-storage';
-import { useLayoutEffect, useState } from 'react';
+import FastStorage from 'esoftplay/mmkv';
+import { useCallback, useEffect, useRef, useState } from 'react';
 
+type usePersistStateReturn<T> = [T, (newState: T | ((newState: T) => T)) => void, () => T];
 
-let setter = new Set<Function>()
-export default function usePersistState(key: string, def?: any): any[] {
-  const [state, setState] = useState(def || undefined)
-
-  function set(value: any) {
-    if (value == undefined)
-      AsyncStorage.removeItem(key)
-    else
-      AsyncStorage.setItem(key, JSON.stringify(value));
-    setter.forEach((c) => c?.(value))
+export default function usePersistState<T = any>(persistKey: string, defaultValue?: T): usePersistStateReturn<T> {
+  const isMountedRef = useRef<boolean>(true);
+  const storedValue = FastStorage.getItemSync(persistKey);
+  let parsedValue: T | undefined;
+  if (storedValue) {
+    try {
+      parsedValue = JSON.parse(storedValue);
+    } catch (e) {
+      parsedValue = defaultValue;
+    }
+  } else {
+    parsedValue = defaultValue;
   }
+  const valueRef = useRef<T>(parsedValue as T);
+  const [, rerender] = useState({});
 
-  function updater(callback?: (a?: typeof def) => void) {
-    AsyncStorage.getItem(key).then((v: string | undefined) => {
-      if (v) {
-        const json = JSON.parse(v)
-        if (callback) callback(json)
-        set(json)
+  const updateState = useCallback((value: T | ((prevState: T) => T)) => {
+    if (isMountedRef.current) {
+      if (typeof value === 'function') {
+        valueRef.current = (value as (prevState: T) => T)(valueRef.current);
       } else {
-        if (callback) callback(def)
-        set(def)
+        valueRef.current = value;
       }
-    })
-  }
 
-  function del() {
-    AsyncStorage.removeItem(key)
-  }
+      if (valueRef.current != undefined)
+        FastStorage.setItem(persistKey, JSON.stringify(valueRef.current))
+      else
+        FastStorage.removeItem(persistKey)
+      rerender({});
+    }
+  }, []);
 
-  useLayoutEffect(() => {
-    setter.add(setState)
-    updater()
+  useEffect(() => {
+    isMountedRef.current = true;
     return () => {
-      setter.delete(setState)
-    }
-  }, [])
+      isMountedRef.current = false;
+    };
+  }, []);
 
-  return [state, set, updater, del]
+  return [valueRef.current, updateState, () => valueRef.current];
 }

package/subscribe.ts

@@ -22,10 +22,6 @@ export default function useGlobalSubscriber(defaultValue?: any): useGlobalSubscr
     value = defaultValue;
   }
 
-  const trigger = (newValue?: any) => {
-    notify(newValue);
-  }
-
   function useSubscribe(func: Function) {
     React.useLayoutEffect(() => {
       subscribers.add(func)
@@ -35,7 +31,7 @@ export default function useGlobalSubscriber(defaultValue?: any): useGlobalSubscr
       }
     }, [])
 
-    return trigger;
+    return notify;
   }
 
   function notify(newValue?: any) {
@@ -51,6 +47,6 @@ export default function useGlobalSubscriber(defaultValue?: any): useGlobalSubscr
     getValue,
     useSubscribe,
     reset,
-    trigger
+    trigger: notify
   };
 }