esoftplay 0.0.121 → 0.0.122

package/_global.ts

@@ -1 +1,2 @@
-export default {}
+const x: any = {}
+export default x

package/bin/build.js

@@ -249,12 +249,14 @@ yarn-error.log\n\
 import { LibNotification } from 'esoftplay/cache/lib/notification/import';
 import { UserIndex } from 'esoftplay/cache/user/index/import';
 import * as ErrorReport from 'esoftplay/error';
+import { globalIdx } from 'esoftplay/global';
 import * as Notifications from 'expo-notifications';
 import React, { useEffect } from 'react';
 import { enableFreeze, enableScreens } from 'react-native-screens';
-const { globalIdx } = require('esoftplay/global');
-enableScreens();
-enableFreeze();
+		
+enableFreeze()
+enableScreens()
+		
 
 Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x));
 

package/bin/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 const fs = require('fs');
 const exec = require('child_process').execSync;
+const execAsync = require('child_process').exec;
 const path = require('path');
 const os = require('os')
 const readline = require('readline');
@@ -63,6 +64,14 @@ switch (args[0]) {
 	case "build":
 		build()
 		break;
+	case "bc":
+	case "build-cancel":
+		buildPrepare(false)
+		break;
+	case "bp":
+	case "build-prepare":
+		buildPrepare(true)
+		break;
 	case "vn":
 	case "version-new":
 		incrementVersion()
@@ -643,57 +652,31 @@ function devClientPos(file) {
 	}
 }
 
-function cacheBuild(include = true) {
-	// if (include) {
-	// 	if (fs.existsSync('./esoftplay')) {
-	// 		command('rm -rf ./esoftplay')
-	// 	}
-	// 	if (!fs.existsSync('./modules_ori')) {
-	// 		command('cp -r ./modules ./modules_ori')
-	// 	}
-	// 	command('cp -r ./node_modules/esoftplay ./')
-
-	
-	// 	if (fs.existsSync('./esoftplay/modules')) {
-	// 		fs.readdirSync('./esoftplay/modules').forEach((module) => {
-	// 			if (!module.startsWith('.'))
-	// 				fs.readdirSync('./esoftplay/modules/' + module).forEach((task) => {
-	// 					let file = fs.readFileSync(`./esoftplay/modules/${module}/${task}`, { encoding: 'utf8' }).replace(/esoftplay\/cache/g, "../../cache")
-	// 					fs.writeFileSync(`./esoftplay/modules/${module}/${task}`, file, { encoding: 'utf8' })
-	// 				})
-	// 		})
-	// 	}
-
-	// 	if (fs.existsSync('./modules')) {
-	// 		fs.readdirSync('./modules').forEach((module) => {
-	// 			if (!module.startsWith('.'))
-	// 				fs.readdirSync('./modules/' + module).forEach((task) => {
-	// 					let file = fs.readFileSync(`./modules/${module}/${task}`, { encoding: 'utf8' }).replace(/esoftplay\/cache/g, "../../esoftplay/cache")
-	// 					fs.writeFileSync(`./modules/${module}/${task}`, file, { encoding: 'utf8' })
-	// 				})
-	// 		})
-	// 	}
-	// 	if (fs.existsSync('./esoftplay/cache')) {
-	// 		fs.readdirSync('./esoftplay/cache').forEach((module) => {
-	// 			if (!module.startsWith('.'))
-	// 				if (fs.lstatSync('./esoftplay/cache/' + module).isDirectory()) {
-	// 					fs.readdirSync('./esoftplay/cache/' + module).forEach((task) => {
-	// 						fs.readdirSync(`./esoftplay/cache/${module}/${task}`).forEach((imprt) => {
-	// 							console.log(`./esoftplay/cache/${module}/${task}/import.js`)
-	// 							let file = fs.readFileSync(`./esoftplay/cache/${module}/${task}/import.js`, { encoding: 'utf8' }).replace(/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\//g, "../../../../")
-	// 							file = file.replace(/\.\.\/\.\.\/\.\.\/\.\.\/node_modules\/esoftplay\//g, "../../../")
-	// 							fs.writeFileSync(`./esoftplay/cache/${module}/${task}/import.js`, file, { encoding: 'utf8' })
-	// 						})
-	// 					})
-	// 				}
-	// 		})
-	// 	}
-
-	// } else {
-	// 	command('rm -rf ./esoftplay')
-	// 	command('rm -rf ./modules')
-	// 	command('mv ./modules_ori ./modules')
-	// }
+function buildPrepare(include = true) {
+	if (include) {
+		if (!fs.existsSync('./assets/esoftplaymodules')) {
+			fs.mkdirSync('./assets/esoftplaymodules')
+			command('cp -r ./modules/* ./assets/esoftplaymodules')
+		}
+
+		if (fs.existsSync('./node_modules/esoftplay/modules')) {
+			let comm = []
+			fs.readdirSync('./node_modules/esoftplay/modules').forEach((module) => {
+				if (!module.startsWith('.')) {
+					if (!fs.existsSync(`./modules/${module}`)) {
+						fs.mkdirSync(`./modules/${module}`)
+					}
+					comm.push(`cp -n ./node_modules/esoftplay/modules/${module}/* ./modules/${module}`)
+				}
+			});
+			consoleSucces("\n\nPLEASE COPY AND EXECUTE THE FOLLOWING COMMAND\n\n" + comm.join('\n') + "\n")
+		}
+	} else {
+		if (fs.existsSync('./assets/esoftplaymodules'))
+			command('rm -rf modules && mv ./assets/esoftplaymodules modules')
+		else
+			consoleError('')
+	}
 }
 
 function configAvailable(enabled) {
@@ -742,7 +725,6 @@ function build() {
 				name: "1. IOS (Development) - Simulator",
 				cmd: "eas build --platform ios --profile development",
 				pre: () => {
-					cacheBuild()
 					configAvailable(true)
 					devClientPre(appjson)
 					jsEng(appjson, false)
@@ -755,7 +737,6 @@ function build() {
 				name: "2. IOS (Preview) - Simulator",
 				cmd: "eas build --platform ios --profile preview",
 				pre: () => {
-					cacheBuild()
 					configAvailable(true)
 					devClientPos(appjson)
 					jsEng(appjson, true)
@@ -768,7 +749,6 @@ function build() {
 				name: "3. IOS (Preview) - Non Simulator",
 				cmd: "eas build --platform ios --profile preview_build",
 				pre: () => {
-					cacheBuild()
 					configAvailable(true)
 					devClientPos(appjson)
 					jsEng(appjson, true)
@@ -781,7 +761,6 @@ function build() {
 				name: "4. IOS (Production) - ipa",
 				cmd: "eas build --platform ios --profile production",
 				pre: () => {
-					cacheBuild()
 					configAvailable(true)
 					devClientPos(appjson)
 					jsEng(appjson, true)
@@ -794,7 +773,6 @@ function build() {
 				name: "5. Android (Development) - apk",
 				cmd: "eas build --platform android --profile development",
 				pre: () => {
-					cacheBuild()
 					configAvailable(true)
 					devClientPre(appjson)
 					jsEng(appjson, false)
@@ -807,7 +785,6 @@ function build() {
 				name: "6. Android (Preview) - apk",
 				cmd: "eas build --platform android --profile preview",
 				pre: () => {
-					cacheBuild()
 					configAvailable(true)
 					devClientPos(appjson)
 					jsEng(appjson, true)
@@ -820,7 +797,6 @@ function build() {
 				name: "7. Android (Production) - aab",
 				cmd: "eas build --platform android --profile production",
 				pre: () => {
-					cacheBuild()
 					configAvailable(true)
 					devClientPos(appjson)
 					jsEng(appjson, true)
@@ -850,15 +826,12 @@ function build() {
 				if (pre) pre()
 				consoleSucces("⚙⚙⚙ ... \n" + cmd)
 				command(cmd)
-				cacheBuild(false)
 				configAvailable(false)
 				devClientPos(appjson)
 			} else if (d === false) {
 				consoleError("Build Canceled")
-				cacheBuild(false)
 			} else {
 				consoleError("Build type tidak ditemukan")
-				cacheBuild(false)
 			}
 		});
 
@@ -961,6 +934,8 @@ function help() {
 		"\n - u|update all                : untuk update semua esp module ke versi terakhir",
 		"\n - start                       : start esoftplay framework",
 		"\n - b|build                     : untuk build app .ipa .apk .aab",
+		"\n - bp|build-prepare            : untuk prepare for esp b",
+		"\n - bc|build-cancel             : untuk cancel build prepare",
 		"\n - f|file                      : untuk check status file",
 		"\n - c|check                     : untuk check status",
 		"\n - create-master [moduleName]  : untuk create master module terpisah",

package/bin/router.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 // @ts-nocheck
 /* EXECUTED ON `ESP START` TO BUILD FILE CACHES */
-const { execSync } = require('child_process');
 const fs = require('fs');
 var checks = ['./node_modules/esoftplay/modules/', './modules/', './templates/'];
 var pathAsset = "./assets";
@@ -66,21 +65,25 @@ var tmpExp = ["LibCrypt"]; // nama2 class yang tidak perlu dibuat
 var Nav5 = (importer, navs) => {
   return (`
 // @ts-nocheck
-import React from 'react';
+import React, { useEffect } from 'react';
 import { NavigationContainer } from '@react-navigation/native';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
-\nimport { esp, _global } from "esoftplay";\n
+\nimport { _global } from "esoftplay";\n
+\nimport useGlobalState from "esoftplay/global";\n
 ${importer}
-\nimport { LibNavigation } from 'esoftplay/cache/lib/navigation/import';\n
 const Stack = createNativeStackNavigator();
 
-export default function m(props): any{
-  const { user, initialState, handler } = props
-  const econf = esp.config()
-  const appOrientation = econf?.orientation ? String(econf.orientation) : 'portrait'
-  return(
-    <NavigationContainer
-      ref={(r) => LibNavigation.setRef(r)}
+const config = require('../../../config.json')
+import { LibNavigation } from 'esoftplay/cache/lib/navigation/import';
+
+export default function m(props): any {
+	const { user, initialState, handler } = props
+	const econf = config.config
+	const [s] = LibNavigation.state().useState()
+	const appOrientation = econf?.orientation ? String(econf.orientation) : 'portrait'
+	return (
+		<NavigationContainer
+			ref={(r) => LibNavigation.setRef(r)}
       initialState={initialState}
       onReady={() => { _global.NavsIsReady = true }}
       onStateChange={handler} >
@@ -387,7 +390,7 @@ import { AntDesignTypes, EntypoTypes, EvilIconsTypes, FeatherTypes, FontAwesomeT
 
 declare module "esoftplay" {
   var _global: any;
-  // function useGlobalState<S>(initialState?: S, option?: useGlobalOption): useGlobalReturn<S>;
+  function useGlobalState<S>(initialState?: S, option?: useGlobalOption): useGlobalReturn<S>;
   function usePersistState<S>(key: string, initialState?: S | (() => S)): [S, (a: S | ((b: S )=> S)) => S | undefined, (a?: (x: S) => void) => void, () => void];
   function useSafeState<S>(initialState?: S | (() => S)): [S, (a: S | ((b: S )=> S)) => S | undefined];
   function applyStyle<T>(style: T): T;
@@ -716,15 +719,18 @@ function createRouter() {
   });
   let importer = []
   let screens = []
+
   Navigations.forEach((nav) => {
+    const prefix = "{s['" + nav + "'] && "
+    const suffix = "}"
     const orientation = NavsOrientation[nav]
     const [module, task] = nav.split('/')
     const comp = ucword(module) + ucword(task)
     importer.push(`import { ${comp} } from ${'"esoftplay/cache/' + module + '/' + task + '/import"'}`)
     if (orientation)
-      screens.push("\t\t\t\t<Stack.Screen name={\"" + nav + "\"} options={{ orientation: '" + orientation + "' }} component={" + comp + "} />")
+      screens.push("\t\t\t\t" + prefix + "<Stack.Screen name={\"" + nav + "\"} options={{ orientation: '" + orientation + "' }} component={" + comp + "} />" + suffix)
     else
-      screens.push("\t\t\t\t<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />")
+      screens.push("\t\t\t\t" + prefix + "<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />" + suffix)
   })
 
   let N = Nav5(importer.join("\n"), screens.join("\n"))

package/esp.ts

@@ -1,14 +1,7 @@
-import { LibLocale } from 'esoftplay/cache/lib/locale/import';
-import { UserRoutes } from 'esoftplay/cache/user/routes/import';
-import Constants from 'expo-constants';
-import { LogBox, Platform } from 'react-native';
+import { LogBox } from 'react-native';
 import 'react-native-reanimated';
-import _assets from './cache/assets';
-import navs from './cache/navigations';
-import properties from './cache/properties';
-import routers from './cache/routers';
-
 import './oneplusfixfont';
+
 const ignoreWarns = [
   "Setting a timer for a long period of time",
   "VirtualizedLists should never be nested inside plain ScrollViews with the same orientation",
@@ -48,8 +41,8 @@ try {
 
 }
 
-export default class esp {
-  static mergeDeep(target: any, ...sources: any[]) {
+const esp = {
+  mergeDeep(target: any, ...sources: any[]) {
     target = Object(target);
     for (let source of sources) {
       source = Object(source);
@@ -64,21 +57,20 @@ export default class esp {
       }
     }
     return target;
-  }
-  
-  static appjson(): any {
+  },
+  appjson(): any {
     return esp.mergeDeep(app, conf)
-  }
-
-  static assets(path: string): any {
+  },
+  assets(path: string): any {
+    const _assets = require('./cache/assets')
     return _assets(path)
-  }
-
-  static versionName(): string {
+  },
+  versionName(): string {
+    const Platform = require('react-native').Platform
+    const Constants = require('expo-constants').default
     return (Platform.OS == 'android' ? Constants?.manifest?.android?.versionCode : Constants?.manifest?.ios?.buildNumber) + '-' + esp.config('publish_id')
-  }
-
-  static config(param?: string, ...params: string[]): any {
+  },
+  config(param?: string, ...params: string[]): any {
     let out: any = esp._config();
     if (param) {
       var _params = [param, ...params]
@@ -93,16 +85,14 @@ export default class esp {
         }
     }
     return out;
-  }
-
-  static isDebug(message: string): boolean {
+  },
+  isDebug(message: string): boolean {
     if (!lconf) {
       return false
     }
     return conf.config.domain != lconf.config.domain
-  }
-
-  static readDeepObj(obj: any) {
+  },
+  readDeepObj(obj: any) {
     return function (param?: string, ...params: string[]): any {
       let out: any = obj
       if (param) {
@@ -117,9 +107,8 @@ export default class esp {
       }
       return out;
     }
-  }
-
-  static lang(moduleTask: string, langName: string, ...stringToBe: string[]): string {
+  },
+  lang(moduleTask: string, langName: string, ...stringToBe: string[]): string {
     let string = esp.assets("locale/" + esp.langId() + ".json")?.[moduleTask]?.[langName]
     if (!string) {
       string = esp.assets("locale/id.json")[moduleTask][langName]
@@ -137,28 +126,28 @@ export default class esp {
       string = sprintf(string, 0)
     }
     return string
-  }
-
-  static langId(): string {
+  },
+  langId(): string {
+    const LibLocale = esp.mod('lib/locale');
     return LibLocale.state().get()
-  }
-
-  static mod(path: string): any {
+  },
+  mod(path: string): any {
     var modtast = path.split("/");
     if (modtast[1] == "") {
       modtast[1] = "index";
     }
+    const routers = require('./cache/routers')
     return routers(modtast.join("/"));
-  }
-  static modProp(path: string): any {
+  },
+  modProp(path: string): any {
     var modtast = path.split("/");
     if (modtast[1] == "") {
       modtast[1] = "index";
     }
+    const properties = require('./cache/properties')
     return properties(modtast.join("/"));
-  }
-
-  static _config(): string {
+  },
+  _config(): string {
     app = esp.mergeDeep(app, conf)
     var msg = ''
     if (!app.hasOwnProperty('config')) {
@@ -201,23 +190,24 @@ export default class esp {
     config.webviewOpen = '<!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> <link href="' + config.content + 'user/editor_css" rel="stylesheet" /> <script type="text/javascript">var _ROOT="' + config.uri + '";var _URL="' + config.content + '";function _Bbc(a,b){var c="BS3load_func";if(!window[c+"i"]){window[c+"i"]=0};window[c+"i"]++;if(!b){b=c+"i"+window[c+"i"]};if(!window[c]){window[c]=b}else{window[c]+=","+b}window[b]=a;if(typeof BS3!="undefined"){window[b](BS3)}};</script> <style type="text/css">body {padding: 0 20px;}</style></head> <body>';
     config.webviewClose = '<script src="' + config.content + 'templates/admin/bootstrap/js/bootstrap.min.js"></script> </body> </html>';
     return config;
-  }
-
-  static navigations(): string[] {
+  },
+  navigations(): string[] {
+    const navs = require('./cache/navs').default
     return navs;
-  }
-  static home(): any {
+  },
+  home(): any {
     return esp.mod('user/index');
-  }
-  static routes(): any {
+  },
+  routes(): any {
+    const UserRoutes = esp.mod('user/routes');
     return UserRoutes.state().get();
-  }
-  static log(message?: any, ...optionalParams: any[]) {
+  },
+  log(message?: any, ...optionalParams: any[]) {
     if (esp.config("isDebug") == 1) {
       console.log(message, ...optionalParams, "\x1b[0m");
     }
-  }
-  static logColor = {
+  },
+  logColor: {
     reset: "\x1b[0m",
     black: "\x1b[30m",
     red: "\x1b[31m",
@@ -238,6 +228,8 @@ export default class esp {
   }
 }
 
+export default esp
+
 // var a = esp.assets("bacground")     // mengambil file dari folder images
 // var b = esp.config("data", "name")  // mengambil value dari config (bisa ditentukan di app.json)
 // var c = esp.mod("module/task")      // mengeksekusi module/task

package/global.ts

@@ -29,17 +29,17 @@ export interface useGlobalConnect<T> {
 _global.useGlobalUserDelete = {}
 _global.useGlobalSubscriber = {}
 
-class Context {
-  idx = 0
-  increment = () => this.idx++
-  reset = () => {
+const Context = {
+  idx: 0,
+  increment: function () { this.idx++ },
+  reset: function () {
     this.idx = 0
   }
 }
 
-export const globalIdx = new Context()
+export const globalIdx = Context
 export default function useGlobalState<T>(initValue: T, o?: useGlobalOption): useGlobalReturn<T> {
-  const STORAGE = o?.inFile ? new Storage() : AsyncStorage
+  const STORAGE = o?.inFile ? Storage : AsyncStorage
   const _idx = o?.persistKey || globalIdx.idx
   if (!_global.useGlobalSubscriber[_idx])
     _global.useGlobalSubscriber[_idx] = [];

package/import_migrator.mjs

@@ -34,9 +34,10 @@ if (fs.existsSync('./modules')) {
             })
           }
           dFile = dFile.replace(cmatch, "\nimport { " + espMod.join(", ") + " } from 'esoftplay';\n" + adder)
-          if (matchGlobal)
-            dFile = dFile.replace(matchGlobal, "")
-            dFile = dFile.replace("\n","\nimport useGlobalState from 'esoftplay/global';\n")
+          // if (matchGlobal) {
+          //   dFile = dFile.replace(matchGlobal, "")
+          //   dFile = dFile.replace("\n", "\nimport useGlobalState from 'esoftplay/global';\n")
+          // }
           fs.writeFileSync('./modules/' + module + '/' + task, dFile, { encoding: 'utf8' })
         }
       })

package/libs/worker.tsx

@@ -1,8 +1,8 @@
 import { esp } from "esoftplay";
-import React from "react";
+import _global from "esoftplay/_global";
+import React, { useRef } from "react";
 import { Platform, View } from 'react-native';
 import WebView from "react-native-webview";
-const _global = require('../_global').default
 
 _global.WorkerBase = React.createRef()
 _global.WorkerTasks = new Map()
@@ -14,6 +14,10 @@ const Worker = {
   delete(taskId: string) {
     _global.WorkerTasks.delete(taskId)
   },
+  useWorker(name: string, func: (...fparams: any[]) => Promise<any>): (params: any[], res: (data: any) => void) => void {
+    const ref = useRef(Worker.registerJobAsync(name, func)).current
+    return ref
+  },
   registerJob(name: string, func: Function): (params: any[], res: (data: any) => void) => void {
     'show source';
     const x = func.toString().replace('function', 'function ' + name)

package/modules/lib/autoreload.ts

@@ -4,8 +4,8 @@ import { InteractionManager } from 'react-native'
 
 export default (() => {
   let updater = undefined
-  return class m {
-    static set(callback: () => void, duration?: number): void {
+  return {
+    set(callback: () => void, duration?: number): void {
       if (updater != undefined) {
         clearInterval(updater)
         updater = undefined
@@ -15,8 +15,8 @@ export default (() => {
           callback()
         });
       }, duration || 6000)
-    }
-    static clear(): void {
+    },
+    clear(): void {
       if (updater != undefined) {
         clearInterval(updater)
         updater = undefined

package/modules/lib/curl.ts

@@ -9,7 +9,7 @@ import esp from 'esoftplay/esp';
 import { reportApiError } from "esoftplay/error";
 import Constants from 'expo-constants';
 
-import { LogStateProperty } from 'esoftplay';
+//api_logger_import
 
 
 const { manifest } = Constants;
@@ -350,14 +350,11 @@ export default class m {
       mode: "cors",
     }
 
-    if (LogStateProperty) {
-      LogStateProperty.doLogCurl(this.uri, this.url, post, this.isSecure)
-    }
-
+    
     this.initTimeout(upload ? 120000 : this.timeout)
     if (debug == 1) esp.log(this.url + this.uri, options)
     this.fetchConf = { url: this.url + this.uri, options: options }
-
+    //api_logger_init_time
     fetch(this.url + this.uri, options).then(async (res) => {
       this.cancelTimeout()
       this.resStatus = res.status
@@ -366,6 +363,7 @@ export default class m {
         if (onFailed) onFailed({ message: "Koneksi internet kamu tidak stabil, silahkan coba lagi" }, false)
         return
       }
+      //api_logger
       this.onFetched(resText, onDone, onFailed, debug)
     }).catch((r) => {
       // if (this.maxRetry > 0) {

package/modules/lib/image_shadow.tsx

@@ -1,5 +1,6 @@
 // withHooks
 import { LibPicture } from 'esoftplay/cache/lib/picture/import';
+import esp from 'esoftplay/esp';
 import React from 'react';
 import { Image, ImageStyle, View } from 'react-native';
 
@@ -22,7 +23,7 @@ export default function m(props: LibImage_shadowProps): any {
     <View style={{ ...props.style, height: Number(height) + extra_height, width, backgroundColor: 'orange' }} >
       <Image source={props.source} blurRadius={props.blurRadius || 8} style={{ height, width, ...props.style, marginTop: extra_height }} />
       <View style={{ position: 'absolute', bottom: 0, left: 0, right: 0, height: 0.55 * width, width }} >
-        <LibPicture source={require('../../assets/blur.png')} style={{ width: '100%', height: '100%' }} />
+        <LibPicture source={esp.mod('blur.png')} style={{ width: '100%', height: '100%' }} />
       </View>
       <LibPicture source={props.source} style={{ height, width, ...props.style, position: 'absolute' }} />
     </View>

package/modules/lib/input.tsx

@@ -222,6 +222,7 @@ export default class m extends LibComponent<LibInputProps, LibInputState>{
             allowFontScaling={false}
             {...this.props}
             style={[{
+              outlineWidth: 0,
               paddingVertical: 8,
               marginBottom: 2,
               paddingRight: suffix ? (suffix.length * 14) : 0,

package/modules/lib/navigation.ts

@@ -1,9 +1,10 @@
 // noPage
 import { CommonActions, StackActions } from '@react-navigation/native';
-import { LibNavigationRoutes } from 'esoftplay';
+import { LibNavigationRoutes, useGlobalReturn } from 'esoftplay';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import { UserRoutes } from 'esoftplay/cache/user/routes/import';
 import esp from 'esoftplay/esp';
+import useGlobalState from 'esoftplay/global';
 import _global from 'esoftplay/_global';
 import React from "react";
 
@@ -12,6 +13,22 @@ export interface LibNavigationInjector {
   children?: any
 }
 
+
+export const state = useGlobalState({ 'bigbang/index': true })
+function openNav(route: string, fun: Function) {
+  state.set(Object.assign({}, state.get(), { [route]: true }))
+  const open = () => {
+    setTimeout(() => {
+      if (state.get()[route]) {
+        fun()
+      } else {
+        open()
+      }
+    });
+  }
+  open()
+}
+
 export default (() => {
   let libNavigationData: any = {}
   let libNavigationRedirect: any = {}
@@ -20,6 +37,10 @@ export default (() => {
       _global.libNavigationRef = ref
     }
 
+    static state(): useGlobalReturn<any> {
+      return state
+    }
+
     static setNavigation(nav: any): void {
       libNavigationData._navigation = nav
     }
@@ -65,7 +86,9 @@ export default (() => {
     }
 
     static navigate<S>(route: LibNavigationRoutes, params?: S): void {
-      _global.libNavigationRef?.navigate?.(route, params)
+      openNav(route, () => {
+        _global.libNavigationRef?.navigate?.(route, params)
+      })
     }
 
     static getResultKey(props: any): number {
@@ -106,34 +129,40 @@ export default (() => {
             r(value)
           };
         }
-        m.push(route, params)
+        openNav(route, () => {
+          m.push(route, params)
+        })
       })
     }
 
-    static replace<S>(routeName: LibNavigationRoutes, params?: S): void {
-      _global.libNavigationRef.dispatch(
-        StackActions.replace(routeName, params)
-      )
+    static replace<S>(route: LibNavigationRoutes, params?: S): void {
+      openNav(route, () => {
+        _global.libNavigationRef.dispatch(
+          StackActions.replace(route, params)
+        )
+      })
     }
 
-    static push<S>(routeName: LibNavigationRoutes, params?: S): void {
-      _global.libNavigationRef?.dispatch?.(
-        StackActions.push(
-          routeName,
-          params
+    static push<S>(route: LibNavigationRoutes, params?: S): void {
+      openNav(route, () => {
+        _global.libNavigationRef?.dispatch?.(
+          StackActions.push(
+            route,
+            params
+          )
         )
-      )
+      })
     }
 
-    static reset(routeName?: LibNavigationRoutes, ...routeNames: LibNavigationRoutes[]): void {
+    static reset(route?: LibNavigationRoutes, ...routes: LibNavigationRoutes[]): void {
       const user = UserClass.state().get()
-      let _routeName = [routeName || esp.config('home', (user && (user.id || user.user_id)) ? 'member' : 'public')]
-      if (routeNames && routeNames.length > 0) {
-        _routeName = [..._routeName, ...routeNames]
+      let _route = [route || esp.config('home', (user && (user.id || user.user_id)) ? 'member' : 'public')]
+      if (routes && routes.length > 0) {
+        _route = [..._route, ...routes]
       }
       const resetAction = CommonActions.reset({
-        index: _routeName.length - 1,
-        routes: _routeName.map((rn) => ({ name: rn }))
+        index: _route.length - 1,
+        routes: _route.map((rn) => ({ name: rn }))
       });
       _global.libNavigationRef?.dispatch?.(resetAction);
     }
@@ -144,7 +173,7 @@ export default (() => {
       _global.libNavigationRef?.dispatch?.(popAction)
     }
 
-    /* return `root` on initialRoute otherwise return the routeName was active  */
+    /* return `root` on initialRoute otherwise return the route was active  */
     static getCurrentRouteName(): string {
       return UserRoutes.getCurrentRouteName()
     }

package/modules/lib/notification.ts

@@ -8,14 +8,13 @@ import { LibObject } from 'esoftplay/cache/lib/object/import';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import { UserNotification } from 'esoftplay/cache/user/notification/import';
 import esp from 'esoftplay/esp';
+import { fastFilter } from "esoftplay/fast";
 import useGlobalState from 'esoftplay/global';
+import moment from 'esoftplay/moment';
 import _global from 'esoftplay/_global';
-
-import { fastFilter } from "esoftplay/fast";
 import Constants from 'expo-constants';
 import * as Notifications from 'expo-notifications';
 import { Alert, Linking, Platform } from "react-native";
-import moment from '../../moment';
 /*
 {
   to: // exp token

package/modules/lib/notify.ts

@@ -1,4 +1,5 @@
 // useLibs
+// noPage
 import { LibCrypt } from 'esoftplay/cache/lib/crypt/import';
 import { LibObject } from 'esoftplay/cache/lib/object/import';
 import useGlobalState from 'esoftplay/global';

package/modules/lib/picture.tsx

@@ -3,11 +3,11 @@
 import { esp, useSafeState } from 'esoftplay';
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import { LibWorkloop } from 'esoftplay/cache/lib/workloop/import';
+import Worker from 'esoftplay/libs/worker';
 import * as FileSystem from 'expo-file-system';
 import React, { useLayoutEffect } from 'react';
 import { PixelRatio, Platform, View } from 'react-native';
 import FastImage from 'react-native-fast-image';
-import Worker from '../../libs/worker';
 const sh = require("shorthash")
 
 export interface LibPictureSource {
@@ -38,9 +38,10 @@ const getCacheEntry = async (uri: string, toSize: number): Promise<{ exists: boo
   return { exists, path };
 };
 
-const fetchPicture = Worker.registerJobAsync?.('lib_picture_fetch', (url: string, toSize: number) => {
+const fetchPicture = Worker.registerJobAsync('lib_picture_fetch', (url: string, toSize: number) => {
   'show source';
   return new Promise((resolve, reject) => {
+    'show source';
     fetch(url, { mode: 'cors' })
       .then(response => response.blob())
       .then(blob => {
@@ -121,7 +122,7 @@ export default function m(props: LibPictureProps): any {
         if (exists) {
           setUri(path)
         } else {
-          fetchPicture?.([b_uri, PixelRatio.getPixelSizeForLayoutSize(toSize)], (uri) => {
+          fetchPicture([b_uri, PixelRatio.getPixelSizeForLayoutSize(toSize)], (uri) => {
             setUri("data:image/png;base64," + uri)
             if (!props.noCache)
               LibWorkloop.execNextTix(FileSystem.writeAsStringAsync, [path, uri, { encoding: "base64" }])

package/modules/lib/style.ts

@@ -83,22 +83,22 @@ const defaultStyle = {
   },
 }
 
-export default class m {
-  static isIphoneX: boolean = isIphoneX();
-  static STATUSBAR_HEIGHT: number = STATUSBAR_HEIGHT;
-  static STATUSBAR_HEIGHT_MASTER: number = STATUSBAR_HEIGHT_MASTER;
-  static colorPrimary: string = colorPrimary;
-  static colorPrimaryDark: string = colorPrimaryDark;
-  static colorNavigationBar: string = colorNavigationBar;
-  static colorAccent: string = colorAccent;
-  static colorGrey: string = colorGrey;
-  static colorRed: string = colorRed;
-  static colorTextPrimary: string = colorTextPrimary;
-  static colorTextBody: string = colorTextBody;
-  static colorTextCaption: string = colorTextCaption;
-  static colorLightGrey: string = colorLightGrey;
-  static elevation(val: number): any { return elevation(val) };
-  static width: number = width;
-  static height: number = height;
-  static defaultStyle: any = defaultStyle;
-}
+export default {
+  isIphoneX: isIphoneX(),
+  STATUSBAR_HEIGHT: STATUSBAR_HEIGHT,
+  STATUSBAR_HEIGHT_MASTER: STATUSBAR_HEIGHT_MASTER,
+  colorPrimary: colorPrimary,
+  colorPrimaryDark: colorPrimaryDark,
+  colorNavigationBar: colorNavigationBar,
+  colorAccent: colorAccent,
+  colorGrey: colorGrey,
+  colorRed: colorRed,
+  colorTextPrimary: colorTextPrimary,
+  colorTextBody: colorTextBody,
+  colorTextCaption: colorTextCaption,
+  colorLightGrey: colorLightGrey,
+  elevation(val: number): any { return elevation(val) },
+  width: width,
+  height: height,
+  defaultStyle: defaultStyle,
+}

package/modules/lib/tabs.tsx

@@ -3,9 +3,9 @@ import { LibComponent } from 'esoftplay/cache/lib/component/import';
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import { LibUtils } from 'esoftplay/cache/lib/utils/import';
 
+import { fastFilter } from 'esoftplay/fast';
 import React from 'react';
 import { ScrollView, View } from 'react-native';
-import { fastFilter } from '../../fast';
 
 export interface LibTabsProps {
   tabIndex: number,

package/modules/lib/utils.ts

@@ -329,13 +329,13 @@ export default class eutils {
     });
   }
 
-  static getInstallationID(): string {
-    let out = installationId.get()
-    if (!out) {
-      if (Platform.OS == "android")
-        return Application.androidId
-      if (Platform.OS == "ios") {
-        out = (async () => {
+  static getInstallationID(): Promise<string> {
+    return new Promise(async (resolve, reject) => {
+      let out = installationId.get()
+      if (!out) {
+        if (Platform.OS == "android")
+          resolve(String(Application.androidId))
+        if (Platform.OS == "ios") {
           let code = await SecureStore.getItemAsync('installationId');
           if (!code) {
             code = ('xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -345,12 +345,11 @@ export default class eutils {
           }
           installationId.set(code);
           SecureStore.setItemAsync('installationId', String(code));
-          return code;
-        })()
-        return out
+          resolve(code);
+        }
       }
-    }
-    return out
+      resolve(out)
+    })
   }
 
   static sprintf(string: string, ...stringToBe: any[]): string {
@@ -368,6 +367,4 @@ export default class eutils {
     }
     return string
   }
-}
-
-// eutils.getInstallationID()
+}

package/modules/use/form.ts

@@ -1,9 +1,8 @@
 // useLibs
 // noPage
 import { useSafeState } from 'esoftplay';
-
+import { fastFilter } from 'esoftplay/fast';
 import { useLayoutEffect } from 'react';
-import { fastFilter } from './../../fast';
 
 export default (() => {
   let dt = {}

package/modules/user/class.ts

@@ -6,12 +6,11 @@ import { LibCurl } from 'esoftplay/cache/lib/curl/import';
 import { LibNotification } from 'esoftplay/cache/lib/notification/import';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import { UserData } from 'esoftplay/cache/user/data/import';
-
 import useGlobalState from 'esoftplay/global';
+import moment from "esoftplay/moment";
 import Constants from 'expo-constants';
 import * as Notifications from 'expo-notifications';
 import { Platform } from 'react-native';
-import moment from "../../moment";
 
 const state = useGlobalState(null, { persistKey: "user" })
 
@@ -30,9 +29,18 @@ export default class m {
   }
 
   static load(callback?: (user?: any | null) => void): Promise<any> {
-    return new Promise((r, j) => {
-      if (callback) callback(state?.get?.())
-      r((state?.get?.()))
+    return new Promise(async (r, j) => {
+      AsyncStorage.getItem('user').then((user) => {
+        if (user) {
+          let juser = JSON.parse(user)
+          if (callback) callback(state?.get?.() || juser)
+          r((state?.get?.() || juser))
+        } else {
+          if (callback) callback(null)
+          r(null)
+        }
+      })
+
     })
   }
 

package/modules/user/data.ts

@@ -1,7 +1,7 @@
 // noPage
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import { fastFilter } from 'esoftplay/fast';
 import _global from 'esoftplay/_global';
-import { fastFilter } from './../../fast';
 
 export default class m {
   static register(name: string): void {

package/modules/user/index.tsx

@@ -10,6 +10,7 @@ import { LibToast } from 'esoftplay/cache/lib/toast/import';
 import { LibUpdaterProperty } from 'esoftplay/cache/lib/updater/import';
 import { LibVersion } from 'esoftplay/cache/lib/version/import';
 import { LibWorkloop } from 'esoftplay/cache/lib/workloop/import';
+import Navs from 'esoftplay/cache/navs';
 import { UseDeeplink } from 'esoftplay/cache/use/deeplink/import';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import { UserHook } from 'esoftplay/cache/user/hook/import';
@@ -21,7 +22,6 @@ import * as Font from "expo-font";
 import React, { useEffect, useLayoutEffect } from 'react';
 import { Platform, View } from "react-native";
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import Navs from '../../cache/navs';
 
 export interface UserIndexProps {
 
@@ -112,17 +112,8 @@ export default function m(props: UserIndexProps): any {
         setLoading(false)
       }
     })
+    //esoftplay-chatting
 
-
-    if (esp.config('firebase').hasOwnProperty('apiKey')) {
-      try {
-        const ChattingFirebase = esp.mod('chatting/firebase')
-        if (ChattingFirebase)
-          ChattingFirebase?.signInAnonymously?.();
-      } catch (error) {
-
-      }
-    }
     LibUpdaterProperty.check()
   }, [])
 

package/package.json

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

package/storage.ts

@@ -17,20 +17,11 @@ const CACHE_DIR = `${FileSystem.cacheDirectory}lib-storage-cache/`;
   }
 })()
 
-export default class Storage {
-  constructor() {
-    this.getDBPath = this.getDBPath.bind(this);
-    this.setItem = this.setItem.bind(this);
-    this.getItem = this.getItem.bind(this)
-    this.removeItem = this.removeItem.bind(this);
-    this.clear = this.clear.bind(this);
-  }
-
-  private getDBPath(key: string): string {
-    const path = `${CACHE_DIR}${key.replace(/\\/g, "_")}.txt`;
+const Storage = {
+  getDBPath(key: string): string {
+    const path = `${CACHE_DIR}${key.replace(/\//g, "-")}.txt`;
     return path
-  }
-
+  },
   getItem(key: string): Promise<string | null> {
     return new Promise(async (r, j) => {
       const path = this.getDBPath(key)
@@ -46,23 +37,21 @@ export default class Storage {
         }
       })
     })
-  }
-
+  },
   setItem(key: string, value: string): Promise<string> {
     return new Promise(async (r, j) => {
       const path = this.getDBPath(key)
       FileSystem.writeAsStringAsync(path, value, { encoding: 'utf8' })
     })
-  }
-
+  },
   removeItem(key: string): Promise<string> {
     return new Promise(async (r, j) => {
       const path = this.getDBPath(key)
       try { FileSystem.deleteAsync(path) } catch (error) { }
     })
-  }
-
+  },
   clear(): void {
     FileSystem.deleteAsync(CACHE_DIR)
   }
-}
+}
+export default Storage;