esoftplay 0.0.109 → 0.0.110

package/bin/build.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 // @ts-check
-const { spawn, execSync } = require('child_process');
+const { execSync } = require('child_process');
 const fs = require('fs');
 const DIR = "../../"
 const packjson = DIR + "package.json"
 const appjson = DIR + "app.json"
 const confjson = DIR + "config.json"
 const gitignore = DIR + ".gitignore"
+const babelconfig = DIR + "babel.config.js"
 const tsconfig = DIR + "tsconfig.json"
 const appjs = DIR + "App.js"
 const appts = DIR + "App.tsx"
-const pathScript = DIR + "node_modules/react-native-scripts/build/bin/react-native-scripts.js"
 const pathJSTimer = DIR + "node_modules/react-native/Libraries/Core/Timers/JSTimers.js"
 
 /**
@@ -22,104 +22,16 @@ const pathJSTimer = DIR + "node_modules/react-native/Libraries/Core/Timers/JSTim
 if (fs.existsSync(packjson)) {
 	let txt = fs.readFileSync(packjson, 'utf8');
 	let $package = JSON.parse(txt);
-	let rewrite = false;
 	let args = process.argv.slice(2);
 
-
 	/* ADD SCRIPTS.PRESTART AND SCRIPTS.POSTSTOP */
-	if (fs.existsSync(pathScript)) {
-		let $script = fs.readFileSync(pathScript, 'utf8');
 
-		/* Update react-native-scripts */
-		let code1 = "// the command is valid"
-		let code2 = "";
-		let match = $script.match(new RegExp(code1 + "(\s{0,}\n\s{0,}[^\n]+)\n")); // mengambil 1 baris setelah code1
-		let $script2 = $script;
-		let espCode = false;
-		if (match) {
-			if (args[0] == "install") {
-				let reg = new RegExp(/(\[.*?\),)/g) // mengambil argument ke 2 dari .sync()
-				let tag = match[1].match(reg)
-				if (tag) {
-					if (!tag[0].match(/esoftplay/)) {
-						espCode = match[1].replace(reg, "['./node_modules/.bin/esoftplay', script],") // ganti argument ke 2 menjadi milik esoftplay
-						code2 = code1 + espCode;
-						$script2 = $script.replace(code1, code2) // masukkan code ke dalam script setelah argument ke 2 di ganti ke esoftplay
-					}
-				}
-			} else
-				if (args[0] == "uninstall") {
-					if (match[1].match(/esoftplay/)) {
-						$script2 = $script.replace(match[1], code2) // hapus script dari esoftplay
-					}
-				}
-		}
-		if ($script2 != $script) {
-			fs.writeFile(pathScript, $script2, (err) => {
-				if (err) throw err;
-				console.log('react-native-scripts has been updated!!');
-			});
-		}
-	} else {
-		/* Update package.json for latest expo */
-		let stringExist = ''
-		let stringToBe = ''
-		rewrite = false
-		if (!$package.hasOwnProperty("scripts")) {
-			rewrite = true
-			$package.scripts = {
-				"start": "esp start && expo start",
-				"android": "expo start --android",
-				"ios": "expo start --ios",
-				"eject": "expo eject"
-			};
-		}
-		if (args[0] == "install") {
-			if (!$package.scripts.hasOwnProperty("start")) {
-				rewrite = true;
-				stringExist = `"start": "expo start"`
-				stringToBe = `"start": "esp start && expo start"`
-				// $package.scripts.start = "esp start && expo start"
-			} else {
-				if (!$package.scripts.start.match(/esp start/)) {
-					rewrite = true
-					stringExist = `"start": "expo start"`
-					stringToBe = `"start": "esp start && expo start"`
-					// $package.scripts.start = "esp start && " + $package.scripts.start
-				}
-			}
-		} else
-			if (args[0] == "uninstall") {
-				if ($package.scripts.start.match(/esp start/)) {
-					rewrite = true
-					stringExist = `"start": "esp start && expo start"`
-					stringToBe = `"start": "expo start"`
-					// $package.scripts.start = $package.scripts.start.replace(/esp start(\s+&&\s+)/ig, "");
-				}
-			}
-		if (rewrite) {
-			// fs.readFile(packjson, 'utf8', function (err, data) {
-			// 	if (err) {
-			// 		return console.log(err);
-			// 	}
-			// 	let result = data.replace(stringExist, stringToBe);
-
-			// 	fs.writeFile(packjson, result, 'utf8', function (err) {
-			// 		if (err) return console.log(err);
-			// 	});
-			// });
-			// console.log("Please change scripts.start in package.json into '" + $package.scripts.start + "'")
-			// spawn('node', ['./packager.js', args[0], packjson], { stdio: 'inherit' })
-			fs.writeFile(packjson, JSON.stringify($package, null, 2), (err) => {
-				if (err) throw err;
-				console.log('package.json has been updated');
-			});
-		}
-	}
-
-	/* Create esp command line */
 	if (args[0] == "install") {
-		execSync('cd ../../ && node ./node_modules/esoftplay/bin/router.js', { stdio: ['inherit', 'inherit', 'inherit'] })
+		$package.scripts.start = "esp start && expo start"
+		fs.writeFile(packjson, JSON.stringify($package, null, 2), (err) => {
+			if (err) throw err;
+			console.log('package.json has been updated');
+		});
 	}
 
 	/* Update app.json */
@@ -127,9 +39,7 @@ if (fs.existsSync(packjson)) {
 		let $config = {}
 		if (fs.existsSync(confjson))
 			$config = JSON.parse(fs.readFileSync(confjson, 'utf8')) || {};
-		rewrite = false;
 		if (!$config.hasOwnProperty('config')) {
-			rewrite = true;
 			$config.config = {
 				"domain": "domain.com",
 				"errorReport": {
@@ -146,18 +56,15 @@ if (fs.existsSync(packjson)) {
 				}
 			}
 		}
-		if (rewrite) {
-			fs.writeFile(confjson, JSON.stringify($config, null, 2), (err) => {
-				if (err) throw err;
-				console.log('config.json has been created');
-			});
-		}
+		fs.writeFile(confjson, JSON.stringify($config, null, 2), (err) => {
+			if (err) throw err;
+			console.log('config.json has been created');
+		});
+
 		let $appjson = {}
 		if (fs.existsSync(appjson))
 			$appjson = JSON.parse(fs.readFileSync(appjson, 'utf8')) || {};
-		rewrite = false;
 		if (!$appjson.expo.hasOwnProperty('android')) {
-			rewrite = true;
 			$appjson.expo.android = {
 				"useNextNotificationsApi": true,
 				"package": "com.domain",
@@ -196,12 +103,11 @@ if (fs.existsSync(packjson)) {
 					"applinks:domain.com"
 				]
 			}
-			if (rewrite) {
-				fs.writeFile(appjson, JSON.stringify($appjson, null, 2), (err) => {
-					if (err) throw err;
-					console.log('app.json has been updated');
-				});
-			}
+
+			fs.writeFile(appjson, JSON.stringify($appjson, null, 2), (err) => {
+				if (err) throw err;
+				console.log('app.json has been updated');
+			});
 		}
 		/* Fix Code android timers */
 		if (fs.existsSync(pathJSTimer)) {
@@ -210,6 +116,27 @@ if (fs.existsSync(packjson)) {
 			fs.writeFileSync(pathJSTimer, JSTimers)
 		}
 
+
+		const babelconf = `module.exports = function (api) {
+	api.cache(true);
+
+	let plugins = []
+
+	if (process.env["ENV"] === "prod") {
+		plugins.push("transform-remove-console");
+		plugins.push("transform-react-native-style-optimizer");
+	}
+	plugins.push("react-native-reanimated/plugin")
+	return {
+		presets: ["babel-preset-expo"],
+		plugins
+	};
+};
+`
+		fs.writeFile(babelconfig, babelconf, (err) => {
+			if (err) throw err;
+			console.log('babel.config.js has been updated');
+		})
 		/* Update App.js */
 		const TSconfig = `{\n\
 	"compilerOptions": {\n\
@@ -249,33 +176,56 @@ node_modules/\n\
 npm-debug.*\n\
 package-lock.json\n\
 yarn.lock\n\
+yarn-error.log\n\
 			`
 		fs.writeFile(gitignore, GitIgnore, (err) => {
 			if (err) throw err;
 			console.log('.gitignore has been created');
 		});
 
+		// 		const AppJS = `import { esp, LibNotification } from 'esoftplay';
+		// import * as ErrorReport from 'esoftplay/error';
+		// import * as Notifications from 'expo-notifications';
+		// import React, { useEffect, useRef } from 'react';
+		// import { enableFreeze, enableScreens } from 'react-native-screens';
+		// const { globalIdx } = require('esoftplay/global')
+		// enableScreens();
+		// enableFreeze(true);
+
+		// Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x))
+
+		// export default function App() {
+		// 	const Home = useRef(esp.home()).current
+
+		// 	useEffect(() => {
+		// 		globalIdx.reset()
+		// 		ErrorReport.getError()
+		// 	}, [])
+
+		// 	return <Home />
+		// }`;
+
+
 		const AppJS = `import { esp, LibNotification } from 'esoftplay';
-		import * as ErrorReport from 'esoftplay/error';
-		import * as Notifications from 'expo-notifications';
-		import React, { useEffect, useRef } from 'react';
-		import { enableFreeze, enableScreens } from 'react-native-screens';
-		const { globalIdx } = require('esoftplay/global')
-		enableScreens();
-		enableFreeze(true);
-		
-		Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x))
-		
-		export default function App() {
-			const Home = useRef(esp.home()).current
-		
-			useEffect(() => {
-				globalIdx.reset()
-				ErrorReport.getError()
-			}, [])
-		
-			return <Home />
-		}`;
+import * as ErrorReport from 'esoftplay/error';
+import * as Notifications from 'expo-notifications';
+import React, { useEffect, useRef } from 'react';
+import { enableScreens } from 'react-native-screens';
+const { globalIdx } = require('esoftplay/global');
+enableScreens();
+
+Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x));
+
+export default function App() {
+	const Home = useRef(esp.home()).current
+
+	useEffect(() => {
+		globalIdx.reset()
+		ErrorReport.getError()
+	}, [])
+
+	return <Home />
+}`;
 		let expoLib = [
 			'@expo/vector-icons',
 			'@react-native-async-storage/async-storage',
@@ -325,6 +275,8 @@ yarn.lock\n\
 		}
 		let devLibs = [
 			"@babel/core",
+			"babel-plugin-transform-react-native-style-optimizer",
+			"babel-plugin-transform-remove-console",
 			"@types/react",
 			"@types/react-native",
 			"typescript",
@@ -358,16 +310,16 @@ yarn.lock\n\
 				cmd += "&& yarn add " + installDevLibs.join(" ") + " --dev "
 			if (installExpoLibs.length > 0)
 				cmd += "&& expo install " + installExpoLibs.join(" ")
-			cmd += "&& node ./node_modules/esoftplay/bin/router.js"
-			execSync(cmd, { stdio: ['inherit', 'inherit', 'inherit'] })
+			// cmd += " && npm i -s esoftplay"
+			execSync(cmd)
 			console.log('App.js has been replace to App.tsx');
-			/* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
-			if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {
-				let firebaseText = fs.readFileSync('../@firebase/app/dist/index.rn.cjs.js', 'utf8')
-				firebaseText = firebaseText.replace("var AsyncStorage = require('react-native').AsyncStorage;", "var AsyncStorage = require('@react-native-async-storage/async-storage').default;")
-				fs.writeFileSync('../@firebase/app/dist/index.rn.cjs.js', firebaseText)
-			}
-			/* end AsyncStorage @firebase section */
+			// /* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
+			// if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {
+			// 	let firebaseText = fs.readFileSync('../@firebase/app/dist/index.rn.cjs.js', 'utf8')
+			// 	firebaseText = firebaseText.replace("var AsyncStorage = require('react-native').AsyncStorage;", "var AsyncStorage = require('@react-native-async-storage/async-storage').default;")
+			// 	fs.writeFileSync('../@firebase/app/dist/index.rn.cjs.js', firebaseText)
+			// }
+			// /* end AsyncStorage @firebase section */
 			if (fs.existsSync('../@expo/vector-icons')) {
 				let esoftplayIcon = ''
 				fs.readdir('../@expo/vector-icons/build', (err, files) => {

package/bin/router.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+// @ts-check
 /* EXECUTED ON `ESP START` TO BUILD FILE CACHES */
 const fs = require('fs');
 var checks = ['./node_modules/esoftplay/modules/', './modules/', './templates/'];
@@ -9,14 +10,29 @@ var replacer = new RegExp(/(?:\-|\.(?:ios|android))?\.(?:jsx|js|ts|tsx)$/);
 var Text = "";
 const rngh = "./node_modules/react-native-gesture-handler/react-native-gesture-handler.d.ts"
 
-const curPackjson = require('../package.json')
-const mainPackjson = require('../../../package.json')
+// const curPackjson = require('../package.json')
+// const mainPackjson = require('../../../package.json')
 
-if (!mainPackjson.dependencies.esoftplay.includes(curPackjson.version)) {
-  try {
-    console.log("\x1b[31m", "VERSI esoftplay tidak SESUAI " + mainPackjson.dependencies.esoftplay + " != " + curPackjson.version + " ✘", "\x1b[0m")
-  } catch (error) { }
-}
+// function getNestedObjectValue(obj, keys) {
+//   if (keys.length > 0) {
+//     var key = keys.shift();
+//     if (key in obj) {
+//       return getNestedObjectValue(obj[key], keys);
+//     } else {
+//       return null;
+//     }
+//   } else {
+//     return obj;
+//   }
+// }
+
+
+// const prjVersion = getNestedObjectValue(mainPackjson, ['dependencies', 'esoftplay'])
+// if (prjVersion && prjVersion.includes(curPackjson.version)) {
+//   try {
+//     console.log("\x1b[31m", "VERSI esoftplay tidak SESUAI " + mainPackjson.dependencies.esoftplay + " != " + curPackjson.version + " ✘", "\x1b[0m")
+//   } catch (error) { }
+// }
 
 if (fs.existsSync(rngh)) {
   fs.unlink(rngh, (err) => { })
@@ -247,7 +263,7 @@ checks.forEach(modules => {
                   }
                   /* REGEX All Functions */
                   if (!isHooks && !isUseLibs) {
-                    var r = /\n(\s+)((?:(?:static|public|private|async)\s+)?[a-zA-Z0-9_]{3,}\s{0,}(?:<S>|)(?:=\s{0,})?\([^{\n]+)/g; // 1=spaces 2=FunctionObject
+                    var r = /\n(\s+)((?:(?:static|public|private|protected|public async|private async|protected async|async)\s+)?[a-zA-Z0-9_]{3,}\s{0,}(?:<S>|)(?:=\s{0,})?\([^{\n]+)/g; // 1=spaces 2=FunctionObject
                     if (s = r.exec(data)) {
                       if (m = data.match(r)) {
                         /* check jika class tersebut nge replace bukan nge extends maka hapus semua fungsi bawaan dari supernya */
@@ -257,7 +273,7 @@ checks.forEach(modules => {
                           }
                         }
                         for (var i = 0; i < m.length; i++) {
-                          if (S = m[i].match(/\n([^\na-zA-Z0-9_]+)((?:(?:static|public|private|async)\s+)?[a-zA-Z0-9_]{3,})/)) {
+                          if (S = m[i].match(/\n([^\na-zA-Z0-9_]+)((?:(?:static|public|private|protected|public async|private async|protected async|async)\s+)?[a-zA-Z0-9_]{3,})/)) {
                             if (S[1] === s[1].replace(new RegExp('\n', 'g'), '')) {
                               var a = m[i].trim().replace('async ', '') + ";"
                               tmpTask[clsName]["function"][S[2]] = a;

package/esp.ts

@@ -76,11 +76,9 @@ export default (() => {
         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 = undefined;
+            out = out?.[_params[i]];
+            if (out == undefined) {
+              break;
             }
           }
       }
@@ -89,9 +87,9 @@ export default (() => {
   }
 
   function lang(moduleTask: string, langName: string, ...stringToBe: string[]): string {
-    let string = readDeepObj(esp.assets("locale/" + langId() + ".json"))(moduleTask, langName)
+    let string = esp.assets("locale/" + langId() + ".json")?.[moduleTask]?.[langName]
     if (!string) {
-      string = readDeepObj(esp.assets("locale/id.json"))(moduleTask, langName)
+      string = esp.assets("locale/id.json")?.[moduleTask]?.[langName]
     }
     function sprintf(string: string, index: number) {
       if (stringToBe[index] != undefined) {
@@ -109,10 +107,9 @@ export default (() => {
   }
 
   function langId(): string {
-    const _store: any = LibLocale.state().get()
-    return _store.lang_id
+    return LibLocale.state().get()
   }
-  
+
   function mod(path: string): any {
     var modtast = path.split("/");
     if (modtast[1] == "") {

package/global.ts

@@ -48,7 +48,10 @@ const n = () => {
 
     // rehidryte instant
     if (o?.persistKey) {
-      rehidryte(o.persistKey, (p) => { if (typeof p == 'string') set(JSON.parse(p)) })
+      rehidryte(o.persistKey, (p) => {
+        if (typeof p == 'string') set(JSON.parse(p))
+
+      })
     }
 
     /* register to userData to automatically reset state and persist */
@@ -150,12 +153,14 @@ const n = () => {
     debounce(() => {
       AsyncStorage.multiGet(Object.keys(persistKeys), (e, v) => {
         if (v && !e) {
-          Object.entries(persistKeys).forEach((item: any, idx) => {
-            item?.[1]?.(v[item?.[0]])
+          v.forEach((iv, i) => {
+            persistKeys[iv[0]]?.(iv[1])
           })
+        } else {
+          
         }
       })
-    }, 30)
+    }, 100)
   }
   return m
 }

package/modules/content/category.tsx

@@ -1,6 +1,6 @@
 // withHooks
 
-import { ContentHeader, esp, LibCurl, LibList, LibNavigation, LibPicture, LibUtils, useGlobalReturn, useGlobalState } from 'esoftplay';
+import { ContentHeader, esp, LibCurl, LibList, LibNavigation, LibPicture, useGlobalReturn, useGlobalState } from 'esoftplay';
 import React, { useEffect, useRef } from 'react';
 import { Pressable, Text, View } from 'react-native';
 
@@ -20,7 +20,7 @@ export function state(): useGlobalReturn<any> {
 
 
 export default function m(props: ContentCategoryProps): any {
-  let { url } = useRef<any>(LibUtils.getArgsAll(props)).current
+  let { url } = useRef<any>(LibNavigation.getArgsAll(props)).current
   const conf = esp.config()
   url = url || conf.content
   const data = _state.useSelector(s => s)

package/modules/content/category_list.tsx

@@ -1,6 +1,6 @@
 // withHooks
 // noPage
-import { ContentCategoryProperty, esp, LibCurl, LibNavigation, LibPicture, LibUtils } from 'esoftplay';
+import { ContentCategoryProperty, esp, LibCurl, LibNavigation, LibPicture } from 'esoftplay';
 import React, { useEffect, useRef } from 'react';
 import { Pressable, ScrollView, Text, View } from 'react-native';
 
@@ -13,7 +13,7 @@ export interface ContentCategory_listProps {
 }
 export default function m(props: ContentCategory_listProps): any {
   const { id } = props
-  let { url } = useRef<any>(LibUtils.getArgsAll(props)).current
+  let { url } = useRef<any>(LibNavigation.getArgsAll(props)).current
   const conf = esp.config()
   url = url || conf.content
   const menu = ContentCategoryProperty.state().useSelector(s => s)

package/modules/content/comment.tsx

@@ -1,6 +1,6 @@
 // withHooks
 
-import { ContentComment_item, ContentHeader, LibCurl, LibIcon, LibInfinite, LibInput, LibKeyboard_avoid, LibObject, LibSociallogin, LibStyle, LibToastProperty, LibUtils, useGlobalReturn, useGlobalState, useSafeState } from 'esoftplay';
+import { ContentComment_item, ContentHeader, LibCurl, LibIcon, LibInfinite, LibInput, LibKeyboard_avoid, LibNavigation, LibObject, LibSociallogin, LibStyle, LibToastProperty, LibUtils, useGlobalReturn, useGlobalState, useSafeState } from 'esoftplay';
 import esp from 'esoftplay/esp';
 import React, { useEffect, useRef } from 'react';
 import { Alert, Image, Pressable, Text, View } from 'react-native';
@@ -26,7 +26,7 @@ export function state(): useGlobalReturn<any> {
 export default function m(props: ContentCommentProps): any {
   const listComment = useRef<LibInfinite>(null)
   const commentInput = useRef<LibInput>(null)
-  let { url, url_post, id, par_id, header } = LibUtils.getArgsAll(props)
+  let { url, url_post, id, par_id, header } = LibNavigation.getArgsAll(props)
 
   url = useRef(url || esp.config('content') + 'user/commentlist/' + id).current
   url_post = useRef(url_post || esp.config('content') + 'user/commentpost/' + id).current
@@ -113,7 +113,7 @@ export default function m(props: ContentCommentProps): any {
       </View>
     )
   }
-  let x =(item) => <ContentComment_item url={url} url_post={url_post} {...item} />
+  let x = (item) => <ContentComment_item url={url} url_post={url_post} {...item} />
 
   return (
     <View style={{ flex: 1 }} >

package/modules/content/detail.tsx

@@ -12,7 +12,7 @@ export interface ContentDetailProps {
 
 }
 export default function m(props: ContentDetailProps): any {
-  const { id, url, title, image, created } = LibUtils.getArgsAll(props)
+  const { id, url, title, image, created } = LibNavigation.getArgsAll(props)
   const [result, setResult] = useSafeState<any>({ id, url, title, image, created })
   const [isAudioPlaying, setIsAudioPlaying] = useSafeState(false)
   const audioRef = useRef<ContentAudio>(null)

package/modules/content/gallery.tsx

@@ -1,6 +1,6 @@
 // withHooks
 
-import { LibIcon, LibNavigation, LibStyle, LibUtils } from 'esoftplay';
+import { LibIcon, LibNavigation, LibStyle } from 'esoftplay';
 import React, { useRef } from 'react';
 import { Pressable, View } from 'react-native';
 import Gallery from 'react-native-awesome-gallery';
@@ -12,9 +12,9 @@ export interface ContentGalleryProps {
 
 }
 export default function m(props: ContentGalleryProps): any {
-  let images = LibUtils.getArgs(props, "images", [])
-  const image = LibUtils.getArgs(props, "image", "")
-  const index = LibUtils.getArgs(props, "index", 0)
+  let images = LibNavigation.getArgs(props, "images", [])
+  const image = LibNavigation.getArgs(props, "image", "")
+  const index = LibNavigation.getArgs(props, "index", 0)
   let scale = useRef(1).current
 
   if (images.length == 0) {

package/modules/content/list.tsx

@@ -1,6 +1,6 @@
 // withHooks
 
-import { ContentCategory_list, ContentConfig, ContentHeader, ContentItem, ContentItem_header, esp, LibCarrousel, LibInfinite, LibObject, LibStyle, LibUtils, UserRoutes, useSafeState } from 'esoftplay';
+import { ContentCategory_list, ContentConfig, ContentHeader, ContentItem, ContentItem_header, esp, LibCarrousel, LibInfinite, LibNavigation, LibObject, LibStyle, UserRoutes, useSafeState } from 'esoftplay';
 import React, { useRef } from 'react';
 import { View } from 'react-native';
 
@@ -15,7 +15,7 @@ export default function m(props: ContentListProps): any {
 
   const routes = UserRoutes.state().get()
 
-  let { url, title, id } = useRef<any>(LibUtils.getArgsAll(props)).current
+  let { url, title, id } = useRef<any>(LibNavigation.getArgsAll(props)).current
   const conf = esp.config()
   url = url || conf.content
   id = id || 0

package/modules/lib/curl.ts

@@ -4,7 +4,6 @@ import { reportApiError } from "esoftplay/error";
 import moment from "esoftplay/moment";
 const axios = require('axios');
 
-
 export default class ecurl {
   timeout = 55000;
   timeoutContext: any = null;
@@ -14,6 +13,7 @@ export default class ecurl {
   url: any = esp.config('url')
   apiKey: any = 0
   uri: any = '';
+  isSecure: boolean = false
   fetchConf: any = ''
   alertTimeout = {
     title: "Oops..! Gagal menyambung ke server",
@@ -39,17 +39,19 @@ export default class ecurl {
     this.onError = this.onError.bind(this)
     this.setApiKey = this.setApiKey.bind(this)
     this.secure = this.secure.bind(this)
+    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);
     } else if (!str.isOnline && onFailed) {
-      onFailed("Failed to access", false);
+      onFailed(this.refineErrorMessage("Failed to access"), false);
     }
   }
 
-  initTimeout(customTimeout?: number): void {
+  protected initTimeout(customTimeout?: number): void {
     this.cancelTimeout()
     this.timeoutContext = setTimeout(() => {
       if (this.abort?.cancel) {
@@ -60,28 +62,57 @@ export default class ecurl {
     }, customTimeout ?? this.timeout);
   }
 
-  cancelTimeout(): void {
+  private cancelTimeout(): void {
     clearTimeout(this.timeoutContext)
     this.timeoutContext = null;
   }
 
-  onFetchFailed(message: string): void {
+  private onFetchFailed(message: string): void {
 
   }
 
-  setUrl(url: string): void {
+  protected setUrl(url: string): void {
     this.url = url
   }
 
-  setUri(uri: string): void {
+  protected setUri(uri: string): void {
     this.uri = uri
   }
 
-  setApiKey(apiKey: string): void {
+  //   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
   }
 
-  async setHeader(): Promise<void> {
+  protected async setHeader(): Promise<void> {
     return new Promise((r) => {
       if ((/:\/\/data.*?\/(.*)/g).test(this.url)) {
         this.header["masterkey"] = new LibCrypt().encode(this.url)
@@ -90,25 +121,26 @@ export default class ecurl {
     });
   }
 
-  closeConnection(): void {
+  protected closeConnection(): void {
     this?.abort?.cancel('Oops, Sepertinya ada gangguan jaringan... Silahkan coba beberapa saat lagi');
   }
 
-  onDone(result: any, msg?: string): void {
+  protected onDone(result: any, msg?: string): void {
 
   }
 
-  onFailed(msg: string, timeout: boolean): void {
+  protected onFailed(msg: string, timeout: boolean): void {
 
   }
 
-  onStatusCode(ok: number, status_code: number, message: string, result: any): boolean {
+  protected onStatusCode(ok: number, status_code: number, message: string, result: any): boolean {
     return true
   }
 
-  secure(token_uri?: string): (apiKey?: string) => (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) => void {
+  public secure(token_uri?: string): (apiKey?: string) => (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) => void {
     return (apiKey?: string): (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) => void => {
       return async (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) => {
+        this.isSecure = true
         await this.setHeader();
         const _apiKey = apiKey || this.apiKey
         Object.keys(post).forEach((key) => {
@@ -146,7 +178,7 @@ export default class ecurl {
               this.init(uri, { ...post, access_token: res }, onDone, onFailed, debug);
             }, (msg) => {
               if (onFailed)
-                onFailed(msg, false)
+                onFailed(this.refineErrorMessage(msg), false)
             }, debug)
         }).catch((r: string) => {
           this.cancelTimeout();
@@ -157,7 +189,12 @@ export default class ecurl {
     }
   }
 
-  upload(uri: string, postKey: string, fileUri: string, mimeType: string, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number): void {
+  public withHeader(header: any): (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) => void {
+    this.header = { ...this.header, ...header }
+    return (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) => this.init(uri, post, onDone, onFailed, debug)
+  }
+
+  public upload(uri: string, postKey: string, fileUri: string, mimeType: string, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number): void {
     postKey = postKey || "image";
     var uName = fileUri.substring(fileUri.lastIndexOf("/") + 1, fileUri.length);
     if (!uName.includes('.')) {
@@ -168,7 +205,7 @@ export default class ecurl {
     this.init(uri, post, onDone, onFailed, debug, true)
   }
 
-  urlEncode(str: string): string {
+  private urlEncode(str: string): string {
     return str
       .replace(/\!/g, '%21')
       .replace(/\'/g, '%27')
@@ -178,7 +215,7 @@ export default class ecurl {
       .replace(/%20/g, '+')
   }
 
-  encodeGetValue(_get: string): string {
+  private encodeGetValue(_get: string): string {
     if (_get != '') {
       let hashes = _get.split('&')
       let params: any = {}
@@ -200,7 +237,7 @@ export default class ecurl {
     return _get
   }
 
-  signatureBuild(): string {
+  private signatureBuild(): string {
     let signature = '';
     if (this.url.includes(esp.config('url'))) {
       let payload = '';
@@ -224,7 +261,7 @@ export default class ecurl {
     return signature
   }
 
-  async custom(uri: string, post?: any, onDone?: (res: any, timeout: boolean) => void, debug?: number): Promise<void> {
+  public async custom(uri: string, post?: any, onDone?: (res: any, timeout: boolean) => void, debug?: number): Promise<void> {
     const str: any = LibNet_status.state().get()
     if (str.isOnline) {
       if (post) {
@@ -256,8 +293,9 @@ export default class ecurl {
         mode: "cors",
         _post: post
       }
-      if (debug == 1)
-        esp.log(this.url + this.uri, options)
+      if (debug == 1) {
+        esp.log(this.url + this.uri, { ...options, cancelToken: undefined })
+      }
       this.fetchConf = { url: this.url + this.uri, options: options }
       // this.initTimeout()
       axios(options).then(async (res: any) => {
@@ -276,7 +314,7 @@ export default class ecurl {
     }
   }
 
-  async init(uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number, upload?: boolean): Promise<void> {
+  private async init(uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number, upload?: boolean): Promise<void> {
     if (post) {
       if (upload) {
         let fd = new FormData();
@@ -316,7 +354,9 @@ export default class ecurl {
       mode: "cors",
       _post: post
     }
-    if (debug == 1) esp.log(this.url + this.uri, options)
+    if (debug == 1) {
+      esp.log(this.url + this.uri, { ...options, cancelToken: undefined })
+    }
     this.fetchConf = { url: this.url + this.uri, options: options }
     this.initTimeout(upload ? 120000 : undefined)
     axios(options).then(async (res: any) => {
@@ -328,7 +368,7 @@ export default class ecurl {
     })
   }
 
-  onFetched(resText: string | Object, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number): void {
+  protected onFetched(resText: string | Object, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number): void {
     var resJson = typeof resText == 'string' && ((resText.startsWith("{") && resText.endsWith("}")) || (resText.startsWith("[") && resText.endsWith("]"))) ? JSON.parse(resText) : resText
     if (typeof resJson == "object") {
       if (!resJson.status_code || this.onStatusCode(resJson.ok, resJson.status_code, resJson.message, resJson.result)) {
@@ -336,8 +376,8 @@ export default class ecurl {
           if (onDone) onDone(resJson.result, resJson.message)
           this.onDone(resJson.result, resJson.message)
         } else {
-          if (onFailed) onFailed(resJson.message, false)
-          this.onFailed(resJson.message, false)
+          if (onFailed) onFailed(this.refineErrorMessage(resJson.message), false)
+          this.onFailed(this.refineErrorMessage(resJson.message), false)
         }
       }
     } else {
@@ -348,17 +388,29 @@ export default class ecurl {
     }
   }
 
-  onError(msg: string): void {
+  private refineErrorMessage(resText: string): string {
+    let out = resText
+    if (!esp.isDebug('')) {
+      if (resText.toLowerCase().includes('failed') || resText.toLowerCase().includes('code')) {
+        reportApiError(this.fetchConf.options, resText)
+        out = 'Terjadi kesalahan, biar ' + esp.appjson()?.expo?.name + ' bereskan, silahkan coba beberapa saat lagi.'
+      }
+    }
+    return out
+  }
+
+  private onError(msg: string): void {
     esp.log("\x1b[31m", msg)
     esp.log("\x1b[0m")
     if (esp.isDebug('') && msg == '') {
       return
     }
-    reportApiError(this.fetchConf, msg)
+    delete this.fetchConf.options.cancelToken
+    reportApiError(this.fetchConf.options, msg)
     LibProgress.hide()
   }
 
-  getTimeByTimeZone(timeZone: string): number {
+  protected getTimeByTimeZone(timeZone: string): number {
     return moment(new Date()).tz(timeZone).toMiliseconds();
   }
 }

package/modules/lib/image_crop.tsx

@@ -1,6 +1,6 @@
 // withHooks
 
-import { LibIcon, LibNavigation, LibProgress, LibStatusbar, LibStyle, LibTextstyle, LibToastProperty, LibUtils, useSafeState } from 'esoftplay';
+import { LibIcon, LibNavigation, LibProgress, LibStatusbar, LibStyle, LibTextstyle, LibToastProperty, useSafeState } from 'esoftplay';
 import * as ImageManipulator from "expo-image-manipulator";
 import React, { useEffect, useRef } from 'react';
 import { Dimensions, Image, Text, TouchableOpacity, View } from 'react-native';
@@ -13,7 +13,7 @@ export interface LibImage_cropProps {
 
 }
 export default function m(props: LibImage_cropProps): any {
-  const { image, ratio, forceCrop, message } = LibUtils.getArgsAll(props)
+  const { image, ratio, forceCrop, message } = LibNavigation.getArgsAll(props)
   const [_image, setImage] = useSafeState(image)
   const [counter, setCounter] = useSafeState(0)
   const [size, setSize] = useSafeState(LibStyle.width)

package/modules/lib/image_multi.tsx

@@ -1,6 +1,6 @@
 // withHooks
 
-import { LibIcon, LibLoading, LibNavigation, LibObject, LibStyle, LibTextstyle, LibUtils, useSafeState } from 'esoftplay';
+import { LibIcon, LibLoading, LibNavigation, LibObject, LibStyle, LibTextstyle, useSafeState } from 'esoftplay';
 import * as MediaLibrary from 'expo-media-library';
 import React, { useEffect } from 'react';
 import { FlatList, Image, TouchableOpacity, View } from 'react-native';
@@ -30,7 +30,7 @@ export default function m(props: LibImage_multiProps): any {
   const [photos, setPhotos] = useSafeState([])
   const [after, setAfter] = useSafeState(null)
   const [hasNextPage, setHasNextPage] = useSafeState(true)
-  const { max } = LibUtils.getArgsAll(props)
+  const { max } = LibNavigation.getArgsAll(props)
 
   useEffect(() => {
     MediaLibrary.getPermissionsAsync()

package/modules/lib/input_base.tsx

@@ -102,6 +102,7 @@ function unmask(name: string, text: string): string {
 }
 
 export default function m(props: LibInput_baseProps): any {
+
   LibInput_base_dataProperty.inputBaseRef[props.name] = useRef<TextInput>(null);
   LibInput_base_dataProperty.inputBaseData[props.name] = {
     mask: props.mask,
@@ -109,6 +110,7 @@ export default function m(props: LibInput_baseProps): any {
   }
 
   useEffect(() => {
+    console.warn('LibInput_base is deprecated, use LibInput with props `base={true}` instead')
     LibInput_base_dataProperty.inputBaseRef[props.name].current!.blur()
     if (props.defaultValue) {
       setTimeout(() => {

package/modules/lib/list.tsx

@@ -73,7 +73,7 @@ export default class EList extends LibComponent<LibListProps, LibListState> {
   render(): any {
     const isStatic = () => {
       if (this.props.staticHeight)
-        return { getItemLayout: (data, index) => this.props.staticHeight ? ({ length: this.props.staticHeight, offset: this.props.staticHeight, index: index }) : undefined }
+        return ({ getItemLayout: (data, index) => this.props.staticHeight ? ({ length: this.props.staticHeight, offset: this.props.staticHeight, index: index }) : undefined })
     }
     return (
       <View ref={(e) => this.view = e} style={[{ flex: 1 }]} >

package/modules/lib/locale.ts

@@ -3,19 +3,16 @@
 import { LibNavigation, useGlobalReturn, useGlobalState } from 'esoftplay';
 
 
-const initState = {
-  lang_id: "id"
-}
-const state = useGlobalState(initState, { persistKey: 'lib_locale' })
+const state = useGlobalState("id", { persistKey: 'lib_locale_lang' })
 
-export default class local {
+export default class m {
 
   static state(): useGlobalReturn<any> {
     return state
   }
 
   static setLanguage(langId: string): void {
-    state.set({ lang_id: langId })
     LibNavigation.reset()
+    state.set(langId)
   }
 }

package/modules/lib/navigation.ts

@@ -2,7 +2,7 @@
 // noPage
 
 import { CommonActions, StackActions } from '@react-navigation/native';
-import { esp, LibNavigationRoutes, LibUtils, UserClass, UserRoutes, _global } from 'esoftplay';
+import { esp, LibNavigationRoutes, UserClass, UserRoutes, _global } from 'esoftplay';
 import React from "react";
 
 export interface LibNavigationInjector {
@@ -22,6 +22,19 @@ export default (() => {
       libNavigationData._navigation = nav
     }
 
+    static getArgs(props: any, key: string, defOutput?: any): any {
+      if (defOutput == undefined) {
+        defOutput = "";
+      }
+      return props?.route?.params?.[key] || defOutput;
+    }
+    static getArgsAll<S>(props: any, defOutput?: any): S {
+      if (defOutput == undefined) {
+        defOutput = "";
+      }
+      return props?.route?.params || defOutput;
+    }
+
     static navigation(): any {
       return libNavigationData?._navigation
     }
@@ -54,7 +67,7 @@ export default (() => {
     }
 
     static getResultKey(props: any): number {
-      return LibUtils.getArgs(props, "_senderKey", 0)
+      return m.getArgs(props, "_senderKey", 0)
     }
 
     static cancelBackResult(key?: number): void {

package/modules/lib/progress.tsx

@@ -38,6 +38,7 @@ class m extends LibComponent<LibProgressProps, LibProgressState>{
 
 
 function handleBack(): boolean {
+  state.set({ show: false, message: undefined })
   return true
 }
 

package/modules/lib/sociallogin.tsx

@@ -1,7 +1,7 @@
 // noPage
 
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { esp, LibComponent, LibStyle, LibUtils } from "esoftplay";
+import { esp, LibComponent, LibNavigation, LibStyle } from "esoftplay";
 import React from "react";
 import { ActivityIndicator, View } from "react-native";
 import { WebView } from 'react-native-webview';
@@ -47,7 +47,7 @@ export default class esocialLogin extends LibComponent<LibSocialloginProps, LibS
   render(): any {
     var { url, onResult } = this.props
     if (!url) {
-      url = LibUtils.getArgs(this.props, "url");
+      url = LibNavigation.getArgs(this.props, "url");
     }
     return (
       <View style={{ flex: 1 }} >

package/modules/lib/utils.ts

@@ -60,12 +60,14 @@ export default class eutils {
   }
 
   static getArgs(props: any, key: string, defOutput?: any): any {
+    console.warn('LibUtils.getArgs is deprecated, use LibNavigation.getArgs instead')
     if (defOutput == undefined) {
       defOutput = "";
     }
     return props?.route?.params?.[key] || defOutput;
   }
   static getArgsAll<S>(props: any, defOutput?: any): S {
+    console.warn('LibUtils.getArgsAll is deprecated, use LibNavigation.getArgsAll instead')
     if (defOutput == undefined) {
       defOutput = "";
     }

package/modules/lib/version.tsx

@@ -59,7 +59,7 @@ export default class m extends LibComponent<LibVersionProps, LibVersionState> {
   }
 
   render(): any {
-    const { res: { title, version, android, ios }, msg } = LibUtils.getArgsAll(this.props)
+    const { res: { title, version, android, ios }, msg } = LibNavigation.getArgsAll(this.props)
     const link = Platform.OS == 'ios' ? ios : android
     return (
       <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center', borderStartColor: 'white', paddingHorizontal: 17 }} >

package/moment.ts

@@ -35,7 +35,7 @@ export default function moment(date?: string | Date | any) {
     locale: (locale_id: "af" | "am" | "ar-dz" | "ar-kw" | "ar-ly" | "ar-ma" | "ar-sa" | "ar-tn" | "ar" | "az" | "be" | "bg" | "bi" | "bm" | "bn" | "bo" | "br" | "bs" | "ca" | "cs" | "cv" | "cy" | "da" | "de-at" | "de-ch" | "de" | "dv" | "el" | "en-au" | "en-ca" | "en-gb" | "en-ie" | "en-il" | "en-in" | "en-nz" | "en-sg" | "en-tt" | "en" | "eo" | "es-do" | "es-pr" | "es-us" | "es" | "fi" | "fo" | "fr-ca" | "fr-ch" | "fr" | "fy" | "ga" | "gd" | "gl" | "gom-latn" | "gu" | "he" | "hi" | "hr" | "ht" | "hu" | "hy-am" | "id" | "is" | "it-ch" | "it" | "ja" | "jv" | "ka" | "kk" | "km" | "kn" | "ko" | "ku" | "ky" | "lb" | "lo" | "lt" | "lv" | "me" | "mi" | "mk" | "ml" | "mn" | "mr" | "ms-my" | "ms" | "mt" | "my" | "nb" | "ne" | "nl-be" | "nl" | "nn" | "oc-lnc" | "pa-in" | "pl" | "pt-br" | "pt" | "ro" | "ru" | "rw" | "sd" | "se" | "si" | "sk" | "sl" | "sq" | "sr-cyrl" | "sr" | "ss" | "sv-fi" | "sv" | "sw" | "ta" | "te" | "tet" | "tg" | "th" | "tk" | "tl-ph" | "tlh" | "tr" | "tzl" | "tzm-latn" | "tzm" | "ug-cn" | "uk" | "ur" | "uz-latn" | "uz" | "vi" | "x-pseudo" | "yo" | "zh-cn" | "zh-hk" | "zh-tw" | "zh" | "et" | "eu" | "fa") => {
       require('dayjs/locale/en')
       require('dayjs/locale/id')
-      const out = dayjs.locale(locale_id)
+      const out = dayjs.locale('id')
       return moment(out)
     },
     /* last chain */

package/package.json

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

package/state.ts

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react';
 
 export default function m(def?: any) {
   const r = useRef<boolean>(true)
@@ -9,7 +9,7 @@ export default function m(def?: any) {
       b(value)
     }
   }
-  
+
   useEffect(() => {
     r.current = true
     return () => { r.current = false }