esoftplay 0.0.113 → 0.0.114

package/bin/build.js

@@ -13,7 +13,8 @@ const tsconfig = DIR + "tsconfig.json"
 const appjs = DIR + "App.js"
 const appts = DIR + "App.tsx"
 const pathJSTimer = DIR + "node_modules/react-native/Libraries/Core/Timers/JSTimers.js"
-
+const lowercasePrompt = 'if (/^[a-z]/.test(component.name)) {'
+const pathLowercasePrompt = DIR + 'node_modules/@react-navigation/core/src/useNavigationBuilder.tsx'
 /**
  * function ini untuk mengambil name autocomplete dari @expo/vector-icons untuk library LibIcon
  * function akan di injectkan di folder @expo/vector-icons/build dengan nama file esoftplay_icons.ts
@@ -52,8 +53,8 @@ if (fs.existsSync(packjson)) {
 				"group_id": 4,
 				"salt": "CHANGE_INTO_YOUR_OWN_SALT",
 				"home": {
-					"public": "content/index",
-					"member": "content/index"
+					"public": "main/index",
+					"member": "main/index"
 				}
 			}
 		}
@@ -117,6 +118,16 @@ if (fs.existsSync(packjson)) {
 			fs.writeFileSync(pathJSTimer, JSTimers)
 		}
 
+		/* hide prompt lowercase */
+		if (fs.existsSync(pathLowercasePrompt)) {
+			console.log('Fixing lowercase prompt')
+			let useNavigationBuilder = fs.readFileSync(pathLowercasePrompt, { encoding: 'utf8' })
+			useNavigationBuilder = useNavigationBuilder.replace(lowercasePrompt, lowercasePrompt + '\nreturn;')
+			fs.writeFileSync(pathLowercasePrompt, useNavigationBuilder)
+		} else {
+			console.log('Path not exists')
+		}
+
 		const easconfg = `{
 "cli": {
 	"version": ">= 0.52.0"
@@ -213,29 +224,6 @@ yarn-error.log\n\
 			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';
@@ -271,7 +259,6 @@ export default function App() {
 			'@react-navigation/native',
 			'@react-navigation/stack',
 			'buffer',
-			'expo-av',
 			'expo-application',
 			'expo-camera',
 			'expo-clipboard',
@@ -282,7 +269,6 @@ export default function App() {
 			'expo-font',
 			'expo-image-manipulator',
 			'expo-image-picker',
-			'expo-linear-gradient',
 			'expo-media-library',
 			'expo-notifications',
 			'expo-status-bar',
@@ -295,7 +281,6 @@ export default function App() {
 			'react-native-gesture-handler',
 			'react-native-awesome-gallery',
 			'react-native-fast-image',
-			'react-native-picker-scrollview',
 			'react-native-pinch-zoom-view-movable',
 			'react-native-reanimated',
 			'react-native-safe-area-context',

package/bin/cli.js

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
-
-const { spawn } = require('child_process');
 const fs = require('fs');
 const exec = require('child_process').execSync;
 const path = require('path');
@@ -312,13 +310,15 @@ function createMaster(module_name) {
 		if (fs.existsSync("./assets"))
 			shell("rm -r ./assets")
 		shell("mkdir -p assets")
-		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")
-		shell("cp -r ../mobile/" + assetsFonts + "/* ./fonts/")
+		if (fs.existsSync('../mobile/' + assetsFonts + '/*'))
+			shell("cp -r ../mobile/" + assetsFonts + "/* ./assets/")
 		
 		/* copy lang */
 		if (fs.existsSync("../mobile/assets/locale/id.json")) {
@@ -338,7 +338,7 @@ function createMaster(module_name) {
 		
 		if (fs.existsSync("./package.json")) {
 			const packJson = require("./package.json")
-			const letterVersion = ["abcdefghijklmnopqrstuvwxyz"]
+			const letterVersion = "abcdefghijklmnopqrstuvwxyz"
 			const version = packJson.version
 			const letter = version.match(/([a-z])/g)
 			const number = version.replace(/-/g, "").replace(letter, "")
@@ -357,10 +357,11 @@ 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")
-			console.log("\\nnpm install --save esoftplay-" + moduleName + "@" + nextVersion + "\\n")
+			console.log("\nnpm install --save esoftplay-" + moduleName + "@" + nextVersion + "\n")
 		}`
 		if (!fs.existsSync(PATH + "master/")) {
 			fs.mkdirSync(PATH + "master")
@@ -787,7 +788,7 @@ function doInc(file) {
 		consoleSucces(file + " Versi yang lama " + app.expo.version)
 		app.expo.android.versionCode = lastVersion + 1
 		app.expo.ios.buildNumber = String(lastVersion + 1)
-		app.expo.runtimeVersion = String(lastVersion + 1)
+		// app.expo.runtimeVersion = String(lastVersion + 1)
 		app.expo.version = args[1] || ('0.' + String(lastVersion + 1))
 		consoleSucces(file + " Berhasil diupdate ke versi " + app.expo.version)
 		fs.writeFileSync(file, JSON.stringify(app, undefined, 2))

package/bin/router.js

@@ -584,6 +584,8 @@ function createRouter() {
         staticImport.splice(2, 0, item)
       } else if (task == 'style') {
         staticImport.splice(9, 0, item)
+      } else if (task == 'scrollpicker') {
+        staticImport.splice(10, 0, item)
       } else {
         staticImport.push(item);
       }

package/error.ts

@@ -9,12 +9,12 @@ let app = require('../../app.json');
 const { manifest } = Constants;
 
 
-const defaultErrorHandler = ErrorUtils.getGlobalHandler()
+// const defaultErrorHandler = ErrorUtils?.getGlobalHandler?.()
 
 const myErrorHandler = (e: any, isFatal: any) => {
   if (!manifest?.packagerOpts)
     setError(e)
-  defaultErrorHandler(e, isFatal)
+  // defaultErrorHandler?.(e, isFatal)
 }
 
 export function setError(error?: any) {
@@ -34,7 +34,7 @@ export function reportApiError(fetch: any, error: any) {
   const user = UserClass.state().get()
   let config = esp.config()
   let msg = [
-    'slug: ' + "#" + app.expo.slug,
+    'slug: ' + "#" + manifest?.slug,
     'dev: ' + Platform.OS + ' - ' + Constants.deviceName,
     'app/pub_id: ' + Constants.appOwnership + '/' + (config?.publish_id || '-'),
     'user_id: ' + user?.id || user?.user_id || '-',
@@ -66,24 +66,28 @@ export function getError() {
     if (e) {
       let _e = JSON.parse(e)
       let msg = [
-        'slug: ' + "#" + app.expo.slug,
-        'name: ' + app.expo.name + ' - sdk' + pack.dependencies.expo,
+        'slug: ' + "#" + manifest?.slug,
+        'name: ' + manifest?.name + ' - sdk' + pack?.dependencies?.expo,
         'domain: ' + config.domain + config.uri,
-        'package: ' + (Platform.OS == 'ios' ? app.expo.ios.bundleIdentifier : app.expo.android.package) + ' - v' + (Platform.OS == 'ios' ? app.expo.ios.buildNumber : app.expo.android.versionCode),
+        '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,
-        'app/pub_id: ' + Constants.appOwnership + '/' + (config?.publish_id || '-'),
+        'native/pub_id: ' + manifest?.sdkVersion + '/' + (config?.publish_id || '-'),
         '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) => {
-      let post = {
-        text: msg,
-        chat_id: "-1001212227631",
-        disable_web_page_preview: true
+      if (msg.includes(`Invariant Violation: "main" has not been registered. This can happen if`)) {
+        // remove error that unsolved
+      } else {
+        let post = {
+          text: msg,
+          chat_id: "-1001212227631",
+          disable_web_page_preview: true
+        }
+        new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
       }
-      new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
       // });
       AsyncStorage.removeItem(config.domain + 'error')
     }

package/esp.ts

@@ -6,9 +6,32 @@ import _assets from './cache/assets';
 import navs from './cache/navigations';
 import routers from './cache/routers';
 import './oneplusfixfont';
-LogBox.ignoreLogs(['YellowBox has been replaced with LogBox. Please call LogBox.ignoreLogs() instead.']);
-LogBox.ignoreLogs(['VirtualizedLists should never be nested inside plain ScrollViews with the same orientation - use another VirtualizedList-backed container instead.']);
-LogBox.ignoreLogs([`Got a component with the name 'm'`]);
+const ignoreWarns = [
+  "Setting a timer for a long period of time",
+  "VirtualizedLists should never be nested inside plain ScrollViews with the same orientation",
+  "ViewPropTypes will be removed",
+  "AsyncStorage has been extracted from react-native",
+  "EventEmitter.removeListener",
+  "Got a component with the name 'm'",
+  "Did not receive response to shouldStartLoad in time,"
+];
+
+const err = console.error;
+console.error = (...arg) => {
+  for (let i = 0; i < ignoreWarns.length; i++) {
+      if (arg[0].startsWith(ignoreWarns[i])) return;
+  }
+  err(...arg);
+};
+
+const warn = console.warn;
+console.warn = (...arg) => {
+  for (let i = 0; i < ignoreWarns.length; i++) {
+      if (arg[0].startsWith(ignoreWarns[i])) return;
+  }
+  warn(...arg);
+};
+LogBox.ignoreLogs(ignoreWarns);
 let app = require('../../app.json');
 let conf = require('../../config.json');
 let lconf

package/modules/lib/curl.ts

@@ -1,4 +1,4 @@
-import { esp, LibCrypt, LibNet_status, LibObject, LibProgress, LibUtils, LogStateProperty } from 'esoftplay';
+import { esp, LibCrypt, LibNet_status, LibObject, LibProgress, LibToastProperty, LibUtils, LogStateProperty } from 'esoftplay';
 import { reportApiError } from "esoftplay/error";
 import moment from "esoftplay/moment";
 import Constants from 'expo-constants';
@@ -6,7 +6,9 @@ import Constants from 'expo-constants';
 const { manifest } = Constants;
 
 export default class ecurl {
-  timeout = 55000;
+  controller = new AbortController()
+  signal = this.controller.signal
+  timeout = 30000;
   maxRetry = 2;
   timeoutContext: any = null;
   isDebug = esp.config("isDebug");
@@ -56,10 +58,11 @@ export default class ecurl {
   protected initTimeout(customTimeout?: number): void {
     this.cancelTimeout()
     this.timeoutContext = setTimeout(() => {
-      // if (this.abort?.cancel) {
-      //   this.closeConnection()
-      //   LibProgress.hide()
-      // }
+      if (typeof this?.controller?.abort == 'function') {
+        this.closeConnection()
+        LibProgress.hide()
+        LibToastProperty.show(this.refineErrorMessage('timeout exceeded'))
+      }
     }, customTimeout ?? this.timeout);
   }
 
@@ -128,6 +131,7 @@ export default class ecurl {
   }
 
   protected closeConnection(): void {
+    this.controller?.abort?.()
     // this?.abort?.cancel('Oops, Sepertinya ada gangguan jaringan... Silahkan coba beberapa saat lagi');
   }
 
@@ -165,6 +169,7 @@ export default class ecurl {
         let ps = Object.keys(_post).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(_post[key])).join('&');
         var options: any = {
           method: "POST",
+          signal: this.signal,
           headers: {
             ...this.header,
             ["Content-Type"]: "application/x-www-form-urlencoded;charset=UTF-8"
@@ -173,7 +178,9 @@ export default class ecurl {
           cache: "no-store",
           _post: _post
         }
+        this.initTimeout(this.timeout);
         fetch(this.url + this.uri + (token_uri || 'get_token'), options).then(async (res) => {
+          this.cancelTimeout()
           let resText = await res.text()
           this.onFetched(resText,
             (res, msg) => {
@@ -183,6 +190,7 @@ export default class ecurl {
                 onFailed(msg, false)
             }, debug)
         }).catch((r) => {
+          this.cancelTimeout()
           LibProgress.hide()
           this.onFetchFailed(r)
           // if (onFailed)
@@ -283,6 +291,7 @@ export default class ecurl {
       await this.setHeader()
       var options: any = {
         method: !this.post ? "GET" : "POST",
+        signal: this.signal,
         headers: {
           ...this.header,
           ["Content-Type"]: "application/x-www-form-urlencoded;charset=UTF-8"
@@ -297,7 +306,9 @@ export default class ecurl {
       if (debug == 1)
         esp.log(this.url + this.uri, options)
       this.fetchConf = { url: this.url + this.uri, options: options }
+      this.initTimeout(this.timeout);
       fetch(this.url + this.uri, options).then(async (res) => {
+        this.cancelTimeout()
         var resText = await res.text()
         var resJson = (resText.startsWith("{") || resText.startsWith("[")) ? JSON.parse(resText) : null
         if (resJson) {
@@ -321,6 +332,7 @@ export default class ecurl {
           this.onError(resText)
         }
       }).catch((e) => {
+        this.cancelTimeout()
         LibProgress.hide()
         // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
         //   {
@@ -375,6 +387,7 @@ export default class ecurl {
       method: !this.post ? "GET" : "POST",
       headers: this.header,
       body: this.post,
+      signal: this.signal,
       cache: "no-store",
       Pragma: "no-cache",
       ["Cache-Control"]: 'no-cache, no-store, must-revalidate',
@@ -441,7 +454,7 @@ export default class ecurl {
       }
     }
 
-    this.initTimeout(upload ? 120000 : undefined)
+    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 }
 
@@ -458,6 +471,7 @@ export default class ecurl {
     //     })
     //   } 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) => {
@@ -473,6 +487,12 @@ export default class ecurl {
       //     onPress: () => { }
       //   }
       // ])
+      if (this.maxRetry > 0) {
+        this.init(uri, post, onDone, onFailed, debug)
+        this.maxRetry = this.maxRetry - 1
+      } else {
+        LibToastProperty.show("Koneksi internet anda tidak stabil, silahkan coba beberapa saat lagi")
+      }
       this.onFetchFailed(r)
       LibProgress.hide()
     })

package/modules/lib/datepicker.tsx

@@ -1,11 +1,10 @@
 // withHooks
 // noPage
 
-import { LibLoading, LibStyle, LibToastProperty, useSafeState } from 'esoftplay';
+import { LibLoading, LibScrollpicker, LibStyle, LibToastProperty, useSafeState } from 'esoftplay';
 import { LinearGradient } from 'expo-linear-gradient';
 import React, { useEffect, useRef } from 'react';
 import { Text, TouchableOpacity, View } from 'react-native';
-import ScrollPicker from 'react-native-picker-scrollview';
 export interface LibDatepickerProps {
   minDate: string,
   maxDate: string,
@@ -165,7 +164,7 @@ export default function m(props: LibDatepickerProps): any {
       </View>
       <View style={{ height: 175, flexDirection: 'row' }} >
         <View style={{ width: showDateView ? undefined : 0, flex: showDateView ? 1 : 0, }} >
-          <ScrollPicker
+          <LibScrollpicker
             ref={refDate}
             dataSource={dates}
             selectedIndex={dates.indexOf(date)}
@@ -178,7 +177,7 @@ export default function m(props: LibDatepickerProps): any {
           />
         </View>
         <View style={{ width: showMonthView ? undefined : 0, flex: showMonthView ? 1 : 0, }} >
-          <ScrollPicker
+          <LibScrollpicker
             ref={refMonth}
             dataSource={months}
             selectedIndex={months.indexOf(month)}
@@ -191,7 +190,7 @@ export default function m(props: LibDatepickerProps): any {
           />
         </View>
         <View style={{ width: showYearView ? undefined : 0, flex: showYearView ? 1 : 0, }} >
-          <ScrollPicker
+          <LibScrollpicker
             ref={refYear}
             dataSource={years}
             selectedIndex={years.indexOf(year)}

package/modules/lib/document.ts

@@ -29,7 +29,7 @@ export default class m {
           },
           (msg) => {
             LibProgress.hide()
-            esp.log('Document Gagal di Upload', msg.msg)
+            esp.log('Document Gagal di Upload', msg.message)
           }
         )
       })

package/modules/{content → lib}/gallery.tsx

@@ -5,13 +5,13 @@ import React, { useRef } from 'react';
 import { Pressable, View } from 'react-native';
 import Gallery from 'react-native-awesome-gallery';
 
-export interface ContentGalleryArgs {
+export interface LibGalleryArgs {
 
 }
-export interface ContentGalleryProps {
+export interface LibGalleryProps {
 
 }
-export default function m(props: ContentGalleryProps): any {
+export default function m(props: LibGalleryProps): any {
   let images = LibNavigation.getArgs(props, "images", [])
   const image = LibNavigation.getArgs(props, "image", "")
   const index = LibNavigation.getArgs(props, "index", 0)

package/modules/lib/image.tsx

@@ -222,7 +222,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
                 }
               },
               (msg: any) => {
-                console.log(msg.msg, "NOOO")
+                console.log(msg.message, "NOOO")
                 if (x.length - 1 == i)
                   LibProgress.hide()
               }, 1)
@@ -261,7 +261,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
             },
             (msg: any) => {
               LibProgress.hide()
-              r(msg.msg);
+              r(msg.message);
             }, 1)
         }, 1);
       }

package/modules/lib/infinite.tsx

@@ -25,6 +25,7 @@ export interface LibInfiniteProps {
   ItemSeparatorComponent?: any,
   ListEmptyComponent?: any,
   ListFooterComponent?: any,
+  ListEndedComponent?: any,
   ListHeaderComponent?: any,
   columnWrapperStyle?: any,
   onScroll?: (e: any) => void,
@@ -134,12 +135,12 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
         },
         (msg) => {
           if (this.props.isDebug) {
-            esp.log(msg.msg)
+            esp.log(msg)
           }
           this.page = page
           this.isStop = true
           this.setState({
-            error: msg.msg,
+            error: msg?.message,
           })
         }, this.props.isDebug
       )
@@ -200,7 +201,7 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
               maxToRenderPerBatch={10}
               windowSize={10}
               ListFooterComponent={
-                (!this.isStop) ? <View style={{ padding: 20 }} ><LibLoading /></View> : <View style={{ height: 50 }} />
+                (!this.isStop) ? <View style={{ padding: 20 }} ><LibLoading /></View> : (this.props?.ListEndedComponent || <View style={{ height: 50 }} />)
               }
               onEndReachedThreshold={0.5}
               onEndReached={() => {

package/modules/lib/roll.tsx

@@ -74,7 +74,7 @@ export default class m extends LibComponent<LibRollProps, LibRollState>{
             })
           },
           (_msg) => {
-            this.setState({ msg: _msg.msg })
+            this.setState({ msg: _msg.message })
           }
         )
       else