esoftplay 0.0.114 → 0.0.115

package/bin/build.js

@@ -228,8 +228,7 @@ yarn-error.log\n\
 import * as ErrorReport from 'esoftplay/error';
 import * as Notifications from 'expo-notifications';
 import React, { useEffect, useRef } from 'react';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import { enableScreens, enableFreeze } from 'react-native-screens';
+import { enableFreeze, enableScreens } from 'react-native-screens';
 const { globalIdx } = require('esoftplay/global');
 enableScreens();
 enableFreeze();
@@ -244,11 +243,7 @@ export default function App() {
 		ErrorReport.getError()
 	}, [])
 
-	return (
-		<GestureHandlerRootView style={{ flex: 1 }}>
-			<Home />
-		</GestureHandlerRootView>
-	)
+	return (<Home />)
 }`;
 		let expoLib = [
 			'@expo/vector-icons',

package/bin/cli.js

@@ -211,7 +211,7 @@ function createMaster(module_name) {
 		} else {
 			throw "Mohon install esoftplay package terlebih dahulu"
 		}
-		
+
 		function injectConfig(configPath) {
 			if (fs.existsSync(configPath)) {
 				const exsConf = require(configPath)
@@ -220,12 +220,12 @@ function createMaster(module_name) {
 				fs.writeFileSync(configPath, JSON.stringify({..._cf}, undefined, 2))
 			}
 		}
-		
+
 		/* injectConfig */
 		injectConfig("../../config.json")
 		injectConfig("../../config.live.json")
 		injectConfig("../../config.debug.json")
-		
+
 		/* move assets */
 		if (fs.existsSync("./assets/")) {
 			if (!fs.existsSync("../../assets/" + moduleName))
@@ -234,7 +234,7 @@ function createMaster(module_name) {
 				shell("cp -r -n ./assets/* ../../assets/" + moduleName + "/")
 			} catch (error) { }
 		}
-		
+
 		if (fs.existsSync("./fonts/")) {
 			if (!fs.existsSync("../../" + assetsFonts))
 				shell("mkdir -p ../../" + assetsFonts)
@@ -242,18 +242,18 @@ function createMaster(module_name) {
 				shell("cp -r -n ./fonts/* ../../" + assetsFonts + "/")
 			} catch (error) { }
 		}
-		
+
 		/* inject lang */
 		if (fs.existsSync("./id.json")) {
 			let moduleLang = require("./id.json")
 			if (fs.existsSync("../../assets/locale/id.json")) {
 				let projectLang = require("../../assets/locale/id.json")
-				let _lg = merge(moduleLang, projectLang) 
+				let _lg = merge(moduleLang, projectLang)
 				moduleLang = {..._lg}
 			}
 			fs.writeFileSync("../../assets/locale/id.json", JSON.stringify(moduleLang, undefined, 2))
 		}
-		
+
 		/* inject libs */
 		if (fs.existsSync("./libs.json")) {
 			let libs = require("./libs.json")
@@ -300,33 +300,33 @@ function createMaster(module_name) {
 		const shell = require('child_process').execSync;
 		const assetsModule = "assets/" + moduleName
 		const assetsFonts = "assets/fonts"
-		
+
 		/* copy module */
 		if (fs.existsSync("./" + moduleName))
 			shell("rm -r ./" + moduleName)
 		shell("cp -r ../mobile/modules/" + moduleName + " ./")
-		
+
 		/* copy assets */
 		if (fs.existsSync("./assets"))
 			shell("rm -r ./assets")
 		shell("mkdir -p assets")
-		if (fs.existsSync('../mobile/' + assetsModule + '/*'))
-			shell("cp -r ../mobile/" + assetsModule + "/* ./assets/")
-		
+		if (fs.existsSync('../mobile/' + assetsModule + '/'))
+			shell("cp -r ../mobile/" + assetsModule + "/ ./assets/")
+
 		/* copy fonts */
 		if (fs.existsSync("./fonts"))
 			shell("rm -r ./fonts")
 		shell("mkdir -p fonts")
-		if (fs.existsSync('../mobile/' + assetsFonts + '/*'))
-			shell("cp -r ../mobile/" + assetsFonts + "/* ./assets/")
-		
+		if (fs.existsSync('../mobile/' + assetsFonts + '/'))
+			shell("cp -r ../mobile/" + assetsFonts + "/* ./fonts/")
+
 		/* copy lang */
 		if (fs.existsSync("../mobile/assets/locale/id.json")) {
 			if (fs.existsSync("./id.json"))
 				shell("rm ./id.json")
 			shell("cp ../mobile/assets/locale/id.json .")
 		}
-		
+
 		/* copy config */
 		if (fs.existsSync("../mobile/config.json")) {
 			const confMobile = require("../mobile/config.json")
@@ -334,8 +334,14 @@ function createMaster(module_name) {
 				const confMaster = { [moduleName]: confMobile.config[moduleName] }
 				fs.writeFileSync("./config.json", JSON.stringify(confMaster, undefined, 2))
 			}
+			/* copy config font */
+			if (confMobile.config.hasOwnProperty("fonts")) {
+				const config = require("./config.json")
+				const confMaster = { ['fonts']: confMobile.config['fonts'] }
+				fs.writeFileSync("./config.json", JSON.stringify(Object.assign(config, confMaster), undefined, 2))
+			}
 		}
-		
+
 		if (fs.existsSync("./package.json")) {
 			const packJson = require("./package.json")
 			const letterVersion = "abcdefghijklmnopqrstuvwxyz"
@@ -357,7 +363,7 @@ function createMaster(module_name) {
 				nextNumber = Number(nextNumber) + 1
 				nextVersion += nextNumber
 			}
-		
+
 			const newPackJson = { ...packJson, version: nextVersion }
 			fs.writeFileSync("./package.json", JSON.stringify(newPackJson, undefined, 2))
 			shell("npm publish")
@@ -368,7 +374,8 @@ function createMaster(module_name) {
 			fs.mkdirSync(PATH + "master/assets")
 			fs.mkdirSync(PATH + "master/" + module_name)
 			fs.writeFileSync(PATH + "master/index.js", index)
-			fs.writeFileSync(PATH + "master/libs.js", libs)
+			fs.writeFileSync(PATH + "master/config.json", `{}`)
+			fs.writeFileSync(PATH + "master/libs.json", libs)
 			fs.writeFileSync(PATH + "master/mover.js", mover)
 			fs.writeFileSync(PATH + "master/package.json", packjson)
 			fs.writeFileSync(PATH + "master/publisher.js", publisher)

package/bin/router.js

@@ -55,6 +55,7 @@ var SuffixHooksProperty = ('Property').trim()
 var Persistor = {};
 var Extender = {};
 var NavsExclude = {};
+var NavsOrientation = {};
 var grabClass = null;
 var delReducer = true;
 var countLoop = 0; // jumlah file yang telah dihitung
@@ -74,6 +75,7 @@ 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)}
@@ -83,7 +85,7 @@ export default function m(props): any{
       <Stack.Navigator
         headerMode="none"
         initialRouteName={(user?.id || user?.user_id) ? econf.home.member : econf.home.public}
-        screenOptions={{ headerShown: false, contentStyle: { backgroundColor: 'white' }, stackAnimation: 'default', stackPresentation: 'push' }}>
+        screenOptions={{ orientation: appOrientation, headerShown: false, contentStyle: { backgroundColor: 'white' }, stackAnimation: 'default', stackPresentation: 'push' }}>
 `+ navs + `
       </Stack.Navigator>
     </NavigationContainer>
@@ -127,11 +129,14 @@ checks.forEach(modules => {
                 var isHooks = false
                 var isUseLibs = false
                 /* REGEX HOOKS */
-                if (n = (/\n?(?:(?:\/\/\s{0,})|(?:\/\*\s{0,}))noPage/).exec(data)) {
+                if ((/\n?(?:(?:\/\/\s{0,})|(?:\/\*\s{0,}))noPage/).exec(data)) {
                   NavsExclude[module + '/' + file.slice(0, file.lastIndexOf('.'))] = true
                 } else {
                   NavsExclude[module + '/' + file.slice(0, file.lastIndexOf('.'))] = false
                 }
+                if (m = (/\n?(?:(?:\/\/\s{0,})|(?:\/\*\s{0,}))orientation:([a-zAZ_]+)/).exec(data)) {
+                  NavsOrientation[module + '/' + file.slice(0, file.lastIndexOf('.'))] = m?.[1]
+                }
                 if (isIndexed) {
                   if (n = (/\n?(?:(?:\/\/\s{0,})|(?:\/\*\s{0,}))useLibs/).exec(data)) {
                     isUseLibs = true
@@ -401,6 +406,25 @@ declare module "esoftplay" {
     function home(): any;
     function log(message?: any, ...optionalParams: any[]): void;
     function routes(): any;
+    const logColor : {
+      reset: string,
+      black: string,
+      red: string,
+      green: string,
+      yellow: string,
+      blue: string,
+      magenta: string,
+      cyan: string,
+      white: string,
+      backgroundBlack: string,
+      backgroundRed: string,
+      backgroundGreen: string,
+      backgroundYellow: string,
+      backgroundBlue: string,
+      backgroundMagenta: string,
+      backgroundCyan: string,
+      backgroundWhite: string,
+    }
   }
   interface useGlobalReturn<T> {
     useState: () => [T, (newState: T | ((a:T) => T)) => T | undefined, () => void],
@@ -627,10 +651,14 @@ function createRouter() {
   let importer = []
   let screens = []
   Navigations.forEach((nav) => {
+    const orientation = NavsOrientation[nav]
     const [module, task] = nav.split('/')
     const comp = ucword(module) + ucword(task)
     importer.push(comp)
-    screens.push("\t\t\t\t<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />")
+    if (orientation)
+      screens.push("\t\t\t\t<Stack.Screen name={\"" + nav + "\"} options={{ orientation: '" + orientation + "' }} component={" + comp + "} />")
+    else
+      screens.push("\t\t\t\t<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />")
   })
 
   let N = Nav5(importer.join(", "), screens.join("\n"))

package/error.ts

@@ -30,17 +30,19 @@ export function setError(error?: any) {
 }
 
 export function reportApiError(fetch: any, error: any) {
-
+  let routes = UserRoutes.state().get()
+  let lastIndex = routes?.routes?.length - 1 ?? 0
   const user = UserClass.state().get()
   let config = esp.config()
   let msg = [
     'slug: ' + "#" + manifest?.slug,
-    'dev: ' + Platform.OS + ' - ' + Constants.deviceName,
+    'error: ' + error,
+    '\n\n\ndev: ' + Platform.OS + ' - ' + Constants.deviceName,
     'app/pub_id: ' + Constants.appOwnership + '/' + (config?.publish_id || '-'),
     'user_id: ' + user?.id || user?.user_id || '-',
     'username: ' + user?.username || '-',
+    'module:' + routes?.routes?.[lastIndex]?.name,
     'fetch: ' + String(JSON.stringify(fetch || {}, undefined, 2)).replace(/[\[\]\{\}\"]+/g, ''),
-    'error: ' + error
   ].join('\n')
 
   if (manifest?.packagerOpts) {
@@ -67,7 +69,8 @@ export function getError() {
       let _e = JSON.parse(e)
       let msg = [
         'slug: ' + "#" + manifest?.slug,
-        'name: ' + manifest?.name + ' - sdk' + pack?.dependencies?.expo,
+        'error: \n' + _e.error,
+        '\n\nname: ' + manifest?.name + ' - sdk' + pack?.dependencies?.expo,
         'domain: ' + config.domain + config.uri,
         'package: ' + (Platform.OS == 'ios' ? manifest?.ios?.bundleIdentifier : manifest?.android?.package) + ' - v' + (Platform.OS == 'ios' ? app.expo.ios.buildNumber : app.expo.android.versionCode),
         'device: ' + Platform.OS + ' | ' + Constants.deviceName,
@@ -75,11 +78,12 @@ export function getError() {
         'user_id: ' + _e?.user?.id || _e?.user?.user_id || '-',
         'username: ' + _e?.user?.username || '-',
         'module: ' + _e.routes,
-        'error: \n' + _e.error,
       ].join('\n')
       // config?.errorReport?.telegramIds?.forEach?.((id: string) => {
       if (msg.includes(`Invariant Violation: "main" has not been registered. This can happen if`)) {
         // remove error that unsolved
+      } else if (msg.includes(`deleteAdsCache`)) {
+        // remove error that unsolved
       } else {
         let post = {
           text: msg,

package/esp.ts

@@ -13,13 +13,14 @@ const ignoreWarns = [
   "AsyncStorage has been extracted from react-native",
   "EventEmitter.removeListener",
   "Got a component with the name 'm'",
-  "Did not receive response to shouldStartLoad in time,"
+  "Did not receive response to shouldStartLoad in time",
+  "startLoadWithResult invoked with invalid lockldentifier",
 ];
 
 const err = console.error;
 console.error = (...arg) => {
   for (let i = 0; i < ignoreWarns.length; i++) {
-      if (arg[0].startsWith(ignoreWarns[i])) return;
+    if (arg[0].startsWith(ignoreWarns[i])) return;
   }
   err(...arg);
 };
@@ -27,11 +28,14 @@ console.error = (...arg) => {
 const warn = console.warn;
 console.warn = (...arg) => {
   for (let i = 0; i < ignoreWarns.length; i++) {
-      if (arg[0].startsWith(ignoreWarns[i])) return;
+    if (arg[0].startsWith(ignoreWarns[i])) return;
   }
   warn(...arg);
 };
 LogBox.ignoreLogs(ignoreWarns);
+
+
+
 let app = require('../../app.json');
 let conf = require('../../config.json');
 let lconf
@@ -200,10 +204,29 @@ export default (() => {
   }
   function log(message?: any, ...optionalParams: any[]) {
     if (config("isDebug") == 1) {
-      console.log(message, ...optionalParams);
+      console.log(message, ...optionalParams, "\x1b[0m");
     }
   }
-  return { appjson, log, home, isDebug, navigations, langId, lang, config, assets, routes, mod, versionName }
+  const logColor = {
+    reset: "\x1b[0m",
+    black: "\x1b[30m",
+    red: "\x1b[31m",
+    green: "\x1b[32m",
+    yellow: "\x1b[33m",
+    blue: "\x1b[34m",
+    magenta: "\x1b[35m",
+    cyan: "\x1b[36m",
+    white: "\x1b[37m",
+    backgroundBlack: "\x1b[40m",
+    backgroundRed: "\x1b[41m",
+    backgroundGreen: "\x1b[42m",
+    backgroundYellow: "\x1b[43m",
+    backgroundBlue: "\x1b[44m",
+    backgroundMagenta: "\x1b[45m",
+    backgroundCyan: "\x1b[46m",
+    backgroundWhite: "\x1b[47m",
+  }
+  return { appjson, log, home, isDebug, navigations, langId, lang, config, assets, routes, mod, versionName, logColor }
 })()
 
 // var a = esp.assets("bacground")     // mengambil file dari folder images

package/global.ts

@@ -103,7 +103,7 @@ const n = () => {
     }
 
     function subscribe(func: any) {
-      R.useEffect(() => {
+      R.useLayoutEffect(() => {
         subscriber[_idx].push(func);
         return () => {
           subscriber[_idx] = fastFilter(subscriber?.[_idx], (f) => f !== func)

package/modules/lib/curl.ts

@@ -1,6 +1,5 @@
-import { esp, LibCrypt, LibNet_status, LibObject, LibProgress, LibToastProperty, LibUtils, LogStateProperty } from 'esoftplay';
+import { esp, LibCrypt, LibNet_status, LibProgress, LibToastProperty, LibUtils, LogStateProperty } from 'esoftplay';
 import { reportApiError } from "esoftplay/error";
-import moment from "esoftplay/moment";
 import Constants from 'expo-constants';
 
 const { manifest } = Constants;
@@ -9,7 +8,7 @@ export default class ecurl {
   controller = new AbortController()
   signal = this.controller.signal
   timeout = 30000;
-  maxRetry = 2;
+  maxRetry = 3;
   timeoutContext: any = null;
   isDebug = esp.config("isDebug");
   post: any;
@@ -46,7 +45,6 @@ export default class ecurl {
     this.withHeader = this.withHeader.bind(this);
     this.initTimeout = this.initTimeout.bind(this);
     this.cancelTimeout = this.cancelTimeout.bind(this);
-    // this.createApiTesterUris = this.createApiTesterUris.bind(this)
     const str: any = LibNet_status.state().get();
     if (uri && str.isOnline) {
       this.init(uri, post, onDone, onFailed, debug);
@@ -88,35 +86,6 @@ export default class ecurl {
     this.uri = uri
   }
 
-  //   createApiTesterUris(): void {
-
-  //     if (esp.isDebug('onlyAvailableOnDebug')) {
-  //       setTimeout(() => {
-  //         const options = this.fetchConf.options
-  //         const msg = this.uri.replace('/', '.').split('?')[0] + `
-  // /* RARE USAGE : to simulate LibCurl().secure() : default false */
-  // const IS_SECURE_POST = `+ this.isSecure + `
-
-  // const EXTRACT = []
-  // const EXTRACT_CHECK = []
-
-  // const GET = {`+ JSON.stringify(LibUtils.getUrlParams(options?.url) || '') + `
-  // }
-
-  // const POST = {`+ options._post + `
-  // }
-  // module.exports = { POST, GET, IS_SECURE_POST, EXTRACT, EXTRACT_CHECK }
-  //       `
-  //         let post = {
-  //           text: msg,
-  //           chat_id: '-626800023',
-  //           disable_web_page_preview: true
-  //         }
-  //         this.custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
-  //       }, 1000);
-  //     }
-  //   }
-
   protected setApiKey(apiKey: string): void {
     this.apiKey = apiKey
   }
@@ -132,7 +101,6 @@ export default class ecurl {
 
   protected closeConnection(): void {
     this.controller?.abort?.()
-    // this?.abort?.cancel('Oops, Sepertinya ada gangguan jaringan... Silahkan coba beberapa saat lagi');
   }
 
   protected onDone(result: any, msg?: string): void {
@@ -192,9 +160,8 @@ export default class ecurl {
         }).catch((r) => {
           this.cancelTimeout()
           LibProgress.hide()
+          LibToastProperty.show('Koneksi internet kamu tidak stabil, silahkan coba beberapa saat lagi')
           this.onFetchFailed(r)
-          // if (onFailed)
-          //   onFailed(r, true)
         })
       }
     }
@@ -266,7 +233,6 @@ export default class ecurl {
         payload = this.encodeGetValue(_uri.includes('?') ? _uri.substring(_uri.indexOf('?') + 1, _uri.length) : '');
         _uri = _uri.includes('?') ? _uri.substring(0, _uri.indexOf('?')) : _uri;
       }
-      // console.log("HASH", method, _uri, payload, typeof payload == 'string' ? this.urlEncode(payload) : payload)
       signature = method + ':' + _uri + ':' + LibUtils.shorten(typeof payload == 'string' ? this.urlEncode(payload) : payload);
     }
     return signature
@@ -315,18 +281,6 @@ export default class ecurl {
           if (onDone) onDone(resJson, false)
           this.onDone(resJson)
         } else {
-          // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
-          //   {
-          //     text: this.alertTimeout.ok,
-          //     style: 'cancel',
-          //     onPress: () => this.custom(uri, post, onDone, debug)
-          //   },
-          //   {
-          //     text: this.alertTimeout.cancel,
-          //     style: 'destructive',
-          //     onPress: () => { }
-          //   }
-          // ])
           this.onFetchFailed(resText)
           LibProgress.hide()
           this.onError(resText)
@@ -334,21 +288,7 @@ export default class ecurl {
       }).catch((e) => {
         this.cancelTimeout()
         LibProgress.hide()
-        // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
-        //   {
-        //     text: this.alertTimeout.ok,
-        //     style: 'cancel',
-        //     onPress: () => this.custom(uri, post, onDone, debug)
-        //   },
-        //   {
-        //     text: this.alertTimeout.cancel,
-        //     style: 'destructive',
-        //     onPress: () => { }
-        //   }
-        // ])
         this.onFetchFailed(e)
-        // if (onDone)
-        //   onDone(e, true)
       })
     }
   }
@@ -396,107 +336,31 @@ export default class ecurl {
       _post: post
     }
 
-
-    if (manifest?.packagerOpts?.dev && LogStateProperty) {
-      const allData = LogStateProperty.state().get() || []
-      const logEnable = LogStateProperty.enableLog().get()
-      let uriOrigin = this.uri
-      if (this.uri == '' && this.url != '') {
-        uriOrigin = this.url.replace(/(https?:\/\/)/g, '')
-        let uriArray = uriOrigin.split('/')
-        let domain = uriArray[0]
-        if (!domain.startsWith('api.')) {
-          uriOrigin = ''
-        } else {
-          let uri = uriArray.slice(1, uriArray.length - 1).join('/')
-          let get = uriArray[uriArray.length - 1];
-          let newGet = '';
-          if (get && get.includes('?')) {
-            let rebuildGet = get.split('?')
-            for (let i = 0; i < rebuildGet.length; i++) {
-              const element = rebuildGet[i];
-              if (!element.includes('=')) {
-                newGet += '?id=' + element
-              } else {
-                newGet += (newGet.includes('?') ? '&' : '?') + element
-              }
-            }
-          } else {
-            newGet = get;
-          }
-          uriOrigin = uri + newGet
-        }
-      }
-      const complete_uri = uriOrigin
-      const _uri = complete_uri.includes('?') ? complete_uri.split('?')[0] : complete_uri
-      const _get = complete_uri.includes('?') ? complete_uri.split('?')[1].split('&').map((x: any) => x.split('=')).map((t: any) => {
-        return ({ [t[0]]: [t[1]] })
-      }) : []
-      const get = Object.assign({}, ..._get)
-      const _post = post && Object.keys(post).map((key) => {
-        return ({ [key]: [decodeURI(post[key])] })
-      }) || []
-      const postNew = Object.assign({}, ..._post)
-
-      if (_uri != '') {
-        const data = {
-          [_uri]: {
-            secure: this.isSecure,
-            time: moment().format('YYYY-MM-DD HH:mm:ss'),
-            get: get,
-            post: postNew,
-          }
-        }
-        let dt = LibObject.unshift(allData, data)()
-        if (logEnable) {
-          LogStateProperty.state().set(dt)
-        }
-      }
+    //api_logger
+    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 }
 
-    // if (Platform.OS == 'android' && Platform.Version <= 22) {
-    //   var res = await fetch(this.url + this.uri, options);
-    //   let resText = await res.text()
-    //   this.onFetched(resText, onDone, onFailed, debug)
-    // } else
-    //   if (!upload) {
-    //     LibWorker.curl(this.url + this.uri, options, async (resText) => {
-    //       if (typeof resText == 'string') {
-    //         this.onFetched(resText, onDone, onFailed, debug)
-    //       }
-    //     })
-    //   } else {
     fetch(this.url + this.uri, options).then(async (res) => {
       this.cancelTimeout()
       let resText = await res.text()
       this.onFetched(resText, onDone, onFailed, debug)
     }).catch((r) => {
-      // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
-      //   {
-      //     text: this.alertTimeout.ok,
-      //     style: 'cancel',
-      //     onPress: () => this.init(uri, post, onDone, onFailed, debug)
-      //   },
-      //   {
-      //     text: this.alertTimeout.cancel,
-      //     style: 'destructive',
-      //     onPress: () => { }
-      //   }
-      // ])
       if (this.maxRetry > 0) {
-        this.init(uri, post, onDone, onFailed, debug)
-        this.maxRetry = this.maxRetry - 1
+        setTimeout(() => {
+          this.init(uri, post, onDone, onFailed, debug)
+          this.maxRetry = this.maxRetry - 1
+        }, 100);
       } else {
-        LibToastProperty.show("Koneksi internet anda tidak stabil, silahkan coba beberapa saat lagi")
+        LibToastProperty.show("Koneksi internet kamu tidak stabil, silahkan coba beberapa saat lagi")
       }
       this.onFetchFailed(r)
       LibProgress.hide()
     })
-    // }
   }
 
 
@@ -534,7 +398,7 @@ export default class ecurl {
         out = 'Terjadi kesalahan, biar ' + esp.appjson()?.expo?.name + ' bereskan, silahkan coba beberapa saat lagi atau kembali ke halaman utama'
       }
       if (ltext.includes('timeout exceeded')) {
-        out = 'Koneksi internet anda tidak stabil, silahkan coba beberapa saat lagi'
+        out = 'Koneksi internet kamu tidak stabil, silahkan coba beberapa saat lagi'
       }
     }
     return out
@@ -543,9 +407,6 @@ export default class ecurl {
   private onError(msg: string): void {
     esp.log("\x1b[31m", msg)
     esp.log("\x1b[0m")
-    // if (esp.isDebug('') && msg == '') {
-    //   return
-    // }
     delete this.fetchConf.options.cancelToken
     reportApiError(this.fetchConf, msg)
     LibProgress.hide()

package/modules/lib/image_shadow.tsx

@@ -0,0 +1,29 @@
+// withHooks
+
+import { LibPicture } from 'esoftplay';
+import { Image, ImageStyle, View } from 'react-native';
+export interface LibImage_shadowArgs {
+
+}
+export interface LibImage_shadowProps {
+  style: ImageStyle,
+  source: any,
+  shadowRadius?: number,
+  blurRadius?: number
+}
+export default function m(props: LibImage_shadowProps): any {
+  let { height, width }: any = props.style
+  if (!height || !width) throw new Error("width and height is required")
+
+  const extra_height = (props.shadowRadius || 0.15) * (Number(height) || 1)
+  
+  return (
+    <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%' }} />
+      </View>
+      <LibPicture source={props.source} style={{ height, width, ...props.style, position: 'absolute' }} />
+    </View>
+  )
+}

package/modules/lib/notification.ts

@@ -1,6 +1,8 @@
+import { useGlobalReturn } from 'esoftplay';
 // noPage
 
-import { esp, LibCrypt, LibCurl, LibNavigation, UserClass, UserNotification, _global } from "esoftplay";
+import { esp, LibCrypt, LibCurl, LibNavigation, LibObject, useGlobalState, UserClass, UserNotification, _global } from "esoftplay";
+import { fastFilter } from "esoftplay/fast";
 import Constants from 'expo-constants';
 import * as Notifications from 'expo-notifications';
 import { Alert, Linking, Platform } from "react-native";
@@ -28,7 +30,6 @@ import moment from '../../moment';
 
 Notifications.setNotificationHandler({
   handleNotification: async (notif) => {
-    UserNotification.user_notification_loadData();
     return ({
       shouldShowAlert: true,
       shouldPlaySound: true,
@@ -38,10 +39,151 @@ Notifications.setNotificationHandler({
   },
 });
 
+const lastUrlState = useGlobalState<any>(undefined)
+
+function mainUrl(): string {
+  const { protocol, domain, uri } = esp.config()
+  return protocol + "://" + domain + uri;
+}
+
+function readAll(ids: (string | number)[]) {
+  let url = mainUrl() + "user/push-read";
+  const { salt } = esp.config()
+  let post: any = {
+    notif_id: ids.join(','),
+    user_id: "",
+    secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
+  }
+  new LibCurl(url, post)
+}
+
+function splitArray(array: any[], maxLength: number): any[] {
+  const parts = maxLength // items per chunk    
+  const splitedArray = array.reduce((resultArray: any, item, index) => {
+    const chunkIndex = Math.floor(index / parts)
+    if (!resultArray[chunkIndex]) {
+      resultArray[chunkIndex] = [] // start a new chunk
+    }
+    resultArray[chunkIndex].push(item)
+    return resultArray
+  }, [])
+  return splitedArray
+}
+
 export default class m {
 
+  static state(): useGlobalReturn<any> {
+    return lastUrlState
+  }
+
+  static loadData(isFirst?: boolean): void {
+    // console.log('LOADDATA', isFirst)
+    let _uri = mainUrl() + "user/push-notif/desc"
+    const lastUrl = lastUrlState.get()
+    if (lastUrl == -1) {
+      return
+    }
+    if (lastUrl && !isFirst) {
+      _uri = lastUrl
+    }
+    const user = UserClass.state().get()
+    if (!user?.id) {
+      Notifications.setBadgeCountAsync(0)
+    }
+    const { salt } = esp.config()
+    let post: any = {
+      user_id: "",
+      secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
+    }
+    if (user) {
+      post["user_id"] = user.id || user.user_id
+      post["group_id"] = user.group_id || esp.config('group_id')
+    }
+
+    // console.log(esp.logColor.cyan, 'curl: ' + _uri, esp.logColor.reset)
+    new LibCurl(_uri, post,
+      (res: any) => {
+        // console.log(esp.logColor.green, 'next: ' + res.next, '\n length: ' + res?.list?.length, res.list[0].message, esp.logColor.reset)
+        if (res?.list?.length > 0) {
+          const urls: string[] = UserNotification.state().get().urls
+          // console.log(urls)
+          if (urls && urls.indexOf(_uri) < 0) {
+            let { data, unread } = UserNotification.state().get()
+            // console.log(nUnread+" => nUnread")
+            let nUnread
+            if (isFirst) {
+              nUnread = fastFilter(res.list, (row) => row.status != 2).length
+              UserNotification.state().set({
+                data: res.list,
+                urls: [],
+                unread: nUnread
+              })
+            } else {
+              nUnread = unread + fastFilter(res.list, (row) => row.status != 2).length
+              data.push(...res.list)
+              UserNotification.state().set({
+                data: data,
+                urls: [_uri, ...urls],
+                unread: nUnread
+              })
+            }
+            Notifications.setBadgeCountAsync(nUnread)
+          }
+        }
+        if (res.next) {
+          lastUrlState.set(res.next)
+        } else {
+          lastUrlState.set(-1)
+        }
+      }, (msg) => {
+
+      }
+    )
+  }
+
+  static add(id: number, user_id: number, group_id: number, title: string, message: string, params: string, status: 0 | 1 | 2, created?: string, updated?: string): void {
+    const item = { id, user_id, group_id, title, message, params, status, created, updated }
+    let data = UserNotification.state().get().data
+    data.unshift(item)
+    UserNotification.state().set({
+      ...UserNotification.state().get(),
+      data: data
+    })
+  }
+
+  static drop(): void {
+    UserNotification.state().reset()
+  }
+
+  static markRead(id?: string | number, ..._ids: (string | number)[]): void {
+    // console.log("markRead")
+    let { data, unread, urls } = UserNotification.state().get()
+    let nUnread = unread > 0 ? unread - 1 : 0
+    let ids = [id, ..._ids]
+    // console.log(ids)
+    ids.forEach((id) => {
+      const index = data.findIndex((row) => String(row.id) == String(id))
+      if (index > -1) {
+        data = LibObject.set(data, 2)(index, 'status')
+        nUnread = unread > 0 ? unread - 1 : 0
+      }
+    })
+    // console.log(JSON.stringify(data))
+    UserNotification.state().set({
+      urls,
+      data: data,
+      unread: nUnread
+    })
+    Notifications.setBadgeCountAsync(nUnread)
+    const idsToPush = splitArray(ids, 200)
+    idsToPush.forEach((ids) => {
+      readAll(ids)
+    })
+  }
+
+
   static onAction(notification: any): void {
-    UserNotification.user_notification_loadData()
+    m.loadData(true)
     const data = m.getData(notification)
     function doOpen(data: any) {
       if (!_global.NavsIsReady) {
@@ -62,7 +204,7 @@ export default class m {
     return x?.notification?.request?.content?.data
   }
 
-  static listen(dataRef: any): () => void {
+  static listen(dataRef: any): void {
     if (esp.config('notification') == 1) {
       if (Platform.OS == 'android')
         Notifications.setNotificationChannelAsync(
@@ -70,7 +212,7 @@ export default class m {
           {
             sound: 'default',
             enableLights: true,
-            description: "this is description",
+            description: "Please enable notifications permissions",
             name: esp.appjson().expo.name,
             importance: Notifications.AndroidImportance.MAX,
             showBadge: true,
@@ -79,11 +221,8 @@ export default class m {
           }
         )
       UserClass.pushToken();
-      dataRef.receive = Notifications.addNotificationReceivedListener((x) => {
-        UserNotification.user_notification_loadData()
-      })
+      dataRef.receive = Notifications.addNotificationReceivedListener(() => { })
     }
-    else return () => { }
   }
 
   static requestPermission(callback?: (token: any) => void): Promise<any> {
@@ -130,18 +269,7 @@ export default class m {
     if (!data) return
     if (typeof data == 'string')
       data = JSON.parse(data)
-    const crypt = new LibCrypt();
-    const salt = esp.config("salt");
-    const config = esp.config();
-    let uri = config.protocol + "://" + config.domain + config.uri + "user/push-read"
-    new LibCurl(uri, {
-      notif_id: data.id,
-      secretkey: crypt.encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
-    }, () => {
-      UserNotification.user_notification_loadData();
-    }, () => {
-
-    })
+    m.markRead(data.id)
     let param = data;
     if (param.action)
       switch (param.action) {
@@ -175,17 +303,7 @@ export default class m {
   }
 
   static openNotif(data: any): void {
-    const salt = esp.config("salt");
-    const config = esp.config();
-    let uri = config.protocol + "://" + config.domain + config.uri + "user/push-read"
-    new LibCurl(uri, {
-      notif_id: data.id,
-      secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
-    }, () => {
-      UserNotification.user_notification_setRead(data.id)
-    }, () => {
-      // esp.log(msg)
-    })
+    m.markRead(data.id)
     let param = JSON.parse(data.params)
     switch (param.action) {
       case "alert":

package/modules/lib/picture.tsx

@@ -3,9 +3,9 @@
 
 import { esp, LibStyle, LibWorker, LibWorkloop, useSafeState } from 'esoftplay';
 import * as FileSystem from 'expo-file-system';
-import React, { useMemo } from 'react';
+import { useLayoutEffect } from 'react';
 import { PixelRatio, Platform, View } from 'react-native';
-import FastImage from 'react-native-fast-image'
+import FastImage from 'react-native-fast-image';
 const sh = require("shorthash")
 
 export interface LibPictureSource {
@@ -99,7 +99,7 @@ export default function m(props: LibPictureProps): any {
   else
     resizeMode = FastImage.resizeMode.cover
 
-  if (props.source.hasOwnProperty("uri") && (!width || !height)) {
+  if (!width || !height) {
     if (width) {
       height = width
     } else {
@@ -108,7 +108,7 @@ export default function m(props: LibPictureProps): any {
     console.warn("Width and Height is Required");
   }
 
-  useMemo(() => {
+  useLayoutEffect(() => {
     if (!valid || (Platform.OS == 'android' && Platform.Version <= 22)) {
       return
     }

package/modules/lib/workloop.tsx

@@ -1,6 +1,6 @@
 // noPage
 
-import { LibComponent } from 'esoftplay';
+import { esp, LibComponent, LibNotification, UserClass } from 'esoftplay';
 import React from 'react';
 import { InteractionManager, View } from 'react-native';
 import { WebView } from 'react-native-webview';
@@ -73,6 +73,15 @@ export default (() => {
         })
       }
     }
+    componentDidMount(): void {
+      super.componentDidMount(); 
+      const user = UserClass.state().get()
+      if (user){
+        if(esp.config().notification == 1){
+          LibNotification.loadData(true)
+        }
+      }
+    }
 
     render(): any {
       return (

package/modules/use/form.ts

@@ -2,7 +2,7 @@
 // noPage
 
 import { useSafeState } from 'esoftplay';
-import { useEffect } from 'react';
+import { useLayoutEffect } from 'react';
 import { fastFilter } from './../../fast';
 
 export default (() => {
@@ -20,7 +20,7 @@ export default (() => {
       });
     }
 
-    useEffect(() => {
+    useLayoutEffect(() => {
       if (!dt['setter-' + formName]) {
         dt['setter-' + formName] = []
       }

package/modules/user/index.tsx

@@ -1,13 +1,13 @@
 // withHooks
 // noPage
 
-import { esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, UserClass, UserLoading, UserMain, UserRoutes, useSafeState, _global } from 'esoftplay';
+import { ChattingFirebase, esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, UserClass, UserLoading, UserMain, UserRoutes, useSafeState, _global } from 'esoftplay';
 import * as Font from "expo-font";
-import React, { useEffect } from "react";
+import React, { useEffect, useLayoutEffect } from "react";
 import { View } from "react-native";
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import Navs from "../../cache/navs";
 
-
 export interface UserIndexProps {
 
 }
@@ -47,7 +47,7 @@ export default function m(props: UserIndexProps): any {
     UserRoutes.set(currentState)
   }
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     // const timeout = setTimeout(() => {
     //   setLoading(false)
     // }, 15 * 1000);
@@ -58,23 +58,22 @@ export default function m(props: UserIndexProps): any {
         setLoading(false)
       }
     })()
-    
+
     UserClass.isLogin(async () => {
       ready.current += 1
       if (ready.current >= 2) {
         setLoading(false)
       }
-      LibUpdaterProperty.check((isNew) => { })
     })
     if (esp.config('firebase').hasOwnProperty('apiKey')) {
       try {
-        const chatFirebase = require('../chatting/firebase')?.default
-        if (chatFirebase)
-          chatFirebase?.signInAnonymously?.();
+        if (ChattingFirebase)
+          ChattingFirebase?.signInAnonymously?.();
       } catch (error) {
 
       }
     }
+    LibUpdaterProperty.check((isNew) => { })
   }, [])
 
   useEffect(() => {
@@ -87,7 +86,7 @@ export default function m(props: UserIndexProps): any {
 
   if (loading) return <UserLoading />
   return (
-    <>
+    <GestureHandlerRootView style={{ flex: 1 }}>
       <View style={{ flex: 1 }}>
         <LibWorker />
         <LibWorkview />
@@ -101,7 +100,7 @@ export default function m(props: UserIndexProps): any {
         <LibToast />
       </View>
       <View style={{ backgroundColor: LibStyle.colorNavigationBar || 'white', height: LibStyle.isIphoneX ? 35 : 0 }} />
-    </>
+    </GestureHandlerRootView>
   )
 }
 

package/modules/user/notifbadge.tsx

@@ -1,8 +1,7 @@
 // noPage
 
 
-import { LibComponent, LibStyle, UserNotification } from "esoftplay";
-import React from "react";
+import { LibComponent, LibStyle } from "esoftplay";
 import { Text, TouchableOpacity, View } from "react-native";
 
 export interface UserNotifbadgeProps {
@@ -25,7 +24,6 @@ export default class Enotifbadge extends LibComponent<UserNotifbadgeProps, UserN
 
   componentDidMount(): void {
     super.componentDidMount()
-    UserNotification.user_notification_loadData()
   }
 
   render(): any {

package/modules/user/notification.tsx

@@ -1,16 +1,8 @@
 //
 
-import {
-  esp, LibComponent, LibCrypt,
-  LibCurl, LibIcon, LibList, LibNotification, LibObject, LibStatusbar, LibStyle, LibUtils, useGlobalReturn, useGlobalState,
-  UserClass, UserNotification_item
-} from "esoftplay";
-import * as Notifications from 'expo-notifications';
-import React from "react";
+import { LibComponent, LibIcon, LibList, LibNotification, LibStatusbar, LibStyle, useGlobalReturn, useGlobalState, UserNotification_item } from "esoftplay";
 import { Pressable, Text, TouchableOpacity, View } from "react-native";
-import { fastFilter } from "../../fast";
 //@ts-ignore
-import moment from "../../moment";
 export interface UserNotificationProps {
   navigation: any,
   data: any[]
@@ -26,109 +18,13 @@ const initState = {
   unread: 0
 };
 
-const state = useGlobalState(initState, { persistKey: 'user_notification', isUserData: true })
-
+const state = useGlobalState<any>(initState, { persistKey: "user_notification_data", isUserData: true })
 class m extends LibComponent<UserNotificationProps, UserNotificationState> {
 
   static state(): useGlobalReturn<any> {
     return state
   }
 
-  static add(id: number, user_id: number, group_id: number, title: string, message: string, params: string, status: 0 | 1 | 2, created?: string, updated?: string): void {
-    const item = { id, user_id, group_id, title, message, params, status, created, updated }
-    let data = state.get().data
-    data.unshift(item)
-    state.set({
-      ...state.get(),
-      data: data
-    })
-  }
-
-  static drop(): void {
-    state.set(initState)
-  }
-
-  static user_notification_loadData(): void {
-    const { protocol, domain, uri, salt } = esp.config()
-    let _uri = protocol + "://" + domain + uri + "user/push-notif"
-    let data = state.get().data
-    const user = UserClass.state().get()
-    if (!user?.id) {
-      Notifications.setBadgeCountAsync(0)
-    }
-    /* hapus yang lebih lama dari 3 bulan */
-    const d = new Date();
-    d.setMonth(d.getMonth() - 3);
-    const created = LibUtils.moment(String(d.getDate())).format('YYYY-MM-DD HH:mm:ss')
-    let cdata = fastFilter(data, (row) => row.created > created)
-    if (cdata.length != data.length) {
-      /* jika data tidak sama artinya ada yang expired > 3 bulan */
-      state.set(LibObject.set(state.get(), cdata)('data'))
-    }
-    if (data && data.length > 0) {
-      const lastData = data[0]
-      if (lastData.id)
-        _uri += "?last_id=" + lastData.id || 0
-    }
-    let post: any = {
-      user_id: "",
-      secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
-    }
-    if (user) {
-      post["user_id"] = user.id || user.user_id
-      post["group_id"] = user.group_id || esp.config('group_id')
-    }
-    m.user_notification_fetchData(_uri, post);
-  }
-
-  static user_notification_fetchData(uri: string, post: any): void {
-    new LibCurl(uri, post,
-      (res: any) => {
-        m.user_notification_parseData(res.list, uri)
-        if (res.next != "") {
-          m.user_notification_fetchData(res.next, post)
-        }
-      }, (msg) => {
-      }
-    )
-  }
-
-  static user_notification_parseData(res: any[], uri: string): void {
-    if (res.length > 0) {
-      const urls = state.get().urls
-      if (urls && urls.indexOf(uri) < 0) {
-        let { data, urls, unread } = state.get()
-        const nUnread = unread + fastFilter(res, (row) => row.status != 2).length
-        state.set({
-          data: [...res.reverse(), ...data],
-          urls: [uri, ...urls],
-          unread: nUnread
-        })
-        Notifications.setBadgeCountAsync(nUnread)
-      }
-    }
-  }
-
-  static user_notification_setRead(id: string | number): void {
-    let { data, unread, urls } = state.get()
-    const index = data.findIndex((row) => row.id == String(id))
-    if (index > -1) {
-      const nUnread = unread > 0 ? unread - 1 : 0
-      state.set({
-        urls,
-        data: LibObject.set(data, 2)(index, 'status'),
-        unread: nUnread
-      })
-      Notifications.setBadgeCountAsync(nUnread)
-    }
-  }
-
-  componentDidMount(): void {
-    super.componentDidMount()
-    moment().locale(esp.langId());
-    m.user_notification_loadData()
-  }
-
   render(): any {
     const { colorPrimary, colorAccent, STATUSBAR_HEIGHT } = LibStyle;
     const { goBack } = this.props.navigation
@@ -152,7 +48,7 @@ class m extends LibComponent<UserNotificationProps, UserNotificationState> {
               </View>
               <LibList
                 data={data}
-                onRefresh={() => m.user_notification_loadData()}
+                onRefresh={() => LibNotification.loadData(true)}
                 renderItem={(item: any) => (
                   <TouchableOpacity onPress={() => LibNotification.openNotif(item)} >
                     <UserNotification_item {...item} />

package/modules/user/notification_item.tsx

@@ -1,11 +1,10 @@
 // noPage
 
 import { LibStyle, LibUtils } from 'esoftplay';
-import React from 'react';
 import { Text, View } from 'react-native';
 
 
-export interface UserNotificationProps {
+export interface UserNotification_itemProps {
   created: string,
   id: number,
   message: string,
@@ -17,7 +16,7 @@ export interface UserNotificationProps {
   updated: string,
   user_id: number,
 }
-export default function m(props: UserNotificationProps): any {
+export default function m(props: UserNotification_itemProps): any {
   return (
     <View style={[{ padding: 16, flexDirection: "row", backgroundColor: "white", marginBottom: 3, marginHorizontal: 0, width: LibStyle.width }, LibStyle.elevation(1.5)]} >
       <View style={{}} >

package/package.json

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

package/persist.ts

@@ -1,29 +1,30 @@
-import AsyncStorage from '@react-native-async-storage/async-storage'
-import { useEffect, useMemo, useRef, useState } from 'react'
-import { fastFilter, fastLoop } from './fast'
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { fastFilter, fastLoop } from './fast';
 
 export default (() => {
   let obj: any = {}
   let setter = {}
   return (key: string, def?: any): any[] => {
     const r = useRef(true)
-    const [a, b] = useState(def)
+    const [state, setState] = useState(def)
 
     useMemo(() => { if (!setter[key]) setter[key] = [] }, [])
 
-    function c(value: any) {
+    function set(value: any) {
       if (r.current) {
         if (value != undefined)
           AsyncStorage.setItem(key, JSON.stringify(value));
         else
-          d()
+          del()
         fastLoop(setter[key], (cc) => cc(value))
       }
     }
 
-    function e(callback?: (a?: typeof def) => void) {
+    function updater(callback?: (a?: typeof def) => void) {
       if (obj[key]) {
         clearTimeout(obj[key])
+        delete obj[key]
       }
       obj[key] = setTimeout(() => {
         if (r.current)
@@ -32,28 +33,28 @@ export default (() => {
             if (x) {
               const xx = JSON.parse(x)
               if (callback) callback(xx)
-              c(xx)
+              set(xx)
             } else {
               if (callback) callback(def)
-              c(def)
+              set(def)
             }
           })
       }, 100);
     }
 
-    function d() {
+    function del() {
       AsyncStorage.removeItem(key)
     }
 
-    useEffect(() => {
-      setter[key].push(b)
-      e()
+    useLayoutEffect(() => {
+      setter[key].push(setState)
+      updater()
       return () => {
         r.current = false
-        setter[key] = fastFilter(setter[key], (x) => x !== b);
+        setter[key] = fastFilter(setter[key], (x) => x !== setState);
       }
     }, [])
 
-    return [a, c, e, d]
+    return [state, set, updater, del]
   }
 })()