esoftplay 0.0.138 → 0.0.139-b

package/bin/build.js

@@ -28,7 +28,7 @@ if (fs.existsSync(packjson)) {
 	/* ADD SCRIPTS.PRESTART AND SCRIPTS.POSTSTOP */
 
 	if (args[0] == "install") {
-		$package.scripts.start = "esp start && npx expo start --dev-client"
+		$package.scripts.start = "esp start && bunx expo start --dev-client"
 		$package.trustedDependencies = [
 			"esoftplay",
 			"esoftplay-android-print",
@@ -162,6 +162,7 @@ if (fs.existsSync(packjson)) {
 	},
 	"build": {
 		"development": {
+			"bun": "1.1.0",
 			"developmentClient": true,
 			"distribution": "internal",
 			"ios": {
@@ -170,11 +171,13 @@ if (fs.existsSync(packjson)) {
 			"channel": "default"
 		},
 		"development_build": {
+			"bun": "1.1.0",
 			"developmentClient": true,
 			"distribution": "internal",
 			"channel": "default"
 		},
 		"preview": {
+			"bun": "1.1.0",
 			"distribution": "internal",
 			"ios": {
 				"simulator": true
@@ -182,6 +185,7 @@ if (fs.existsSync(packjson)) {
 			"channel": "default"
 		},
 		"preview_build": {
+			"bun": "1.1.0",
 			"distribution": "internal",
 			"android": {
 				"buildType": "apk"
@@ -189,6 +193,7 @@ if (fs.existsSync(packjson)) {
 			"channel": "default"
 		},
 		"production": {
+			"bun": "1.1.0",
 			"channel": "default"
 		}
 	},
@@ -360,24 +365,29 @@ export default UserIndex`;
 			if (!fs.existsSync(DIR + 'modules'))
 				fs.mkdirSync(DIR + 'modules')
 			let cmd = "cd ../../ "
-			if (installDevLibs.length > 0)
+			if (installDevLibs.length > 0) {
+				// console.log(installDevLibs)
 				cmd += "&& bun add " + installDevLibs.join(" ") + " --dev "
-			if (installExpoLibs.length > 0)
-				cmd += "&& expo install " + installExpoLibs.join(" ")
+			}
+			if (installExpoLibs.length > 0) {
+				// console.log(installExpoLibs)
+				cmd += "&& bunx expo install " + installExpoLibs.join(" ")
+			}
+			console.log((JSON.stringify({ cmd }, undefined, 2)))
 			execSync(cmd + "|| true")
-			execSync("cd ../../ && bun install || true")
+			// execSync("cd ../../ && bun install --verbose || true")
 			execSync("cd ../../ && bun ./node_modules/esoftplay/bin/router.js || true")
 			execSync("cd ../../ && bun ./node_modules/esoftplay/bin/locale.js || true")
 			// execSync("cd ../../ && eas update:configure || true")
 			console.log('App.js has been replace to App.tsx');
-			if (appjson)
-				/* 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 (appjson)
+			// /* 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/cli.js

@@ -81,6 +81,10 @@ switch (args[0]) {
 	case "check":
 		doctor()
 		break
+	case "cm":
+	case "connect-module":
+		command('bun ./node_modules/esoftplay/bin/connector.js')
+		break
 	case "b":
 	case "build":
 		buildPrepare(true)
@@ -677,6 +681,7 @@ Pastikan data sudah benar sebelum anda melanjutkan, lanjut publish ketikkan runt
 					esplibs.forEach((key) => {
 						stringBuilder += ("\n" + key + ": " + pack.dependencies[key])
 					})
+					stringBuilder += "\n\nversionName: " + (ajson.expo.ios.buildNumber || ajson.expo.android.versionCode) + '-' + (last_id + 1) + ""
 					const { exec } = require('child_process');
 					exec("publisher=$(npx expo whoami &); echo $publisher;", (error, stdout, stderr) => {
 						if (error) {
@@ -717,6 +722,7 @@ Pastikan data sudah benar sebelum anda melanjutkan, lanjut publish ketikkan runt
 			esplibs.forEach((key) => {
 				stringBuilder += ("\n" + key + ": " + pack.dependencies[key])
 			})
+			stringBuilder += "\n\nversionName: " + (ajson.expo.ios.buildNumber || ajson.expo.android.versionCode) + '-' + (last_id + 1) + ""
 			const { exec } = require('child_process');
 			exec("publisher=$(npx expo whoami &); echo $publisher;", (error, stdout, stderr) => {
 				if (error) {
@@ -1210,7 +1216,7 @@ function switchStatus(status) {
 		if (cjson.hasOwnProperty('config')) {
 			if (cjson.config.hasOwnProperty('build')) {
 				const [usr, pwd] = cjson.config.build
-				command(`expo logout && expo login -u ${usr} -p ${pwd}`)
+				command(`eas logout && expect -c 'spawn eas login; expect "Email or username"; send "${usr}\r"; expect "Password"; send "${pwd}\r"; expect eof;'`)
 			}
 		}
 	}
@@ -1250,6 +1256,7 @@ function help() {
 		"\n - bc|build-cancel             : untuk cancel build prepare",
 		"\n - f|file                      : untuk check status file",
 		"\n - c|check                     : untuk check status",
+		"\n - cm|connect-module           : untuk update module berdasarkan source",
 		"\n - create-master [moduleName]  : untuk create master module terpisah",
 		"\n - d|debug                     : untuk ubah status DEBUG",
 		"\n - l|live                      : untuk ubah status LIVE",

package/bin/connector.js

@@ -0,0 +1,38 @@
+const fs = require('fs')
+
+if (fs.existsSync('./raw/connected.json')) {
+  const { source, modules } = JSON.parse(fs.readFileSync('./raw/connected.json'))
+  const currentProject = './modules/';
+
+  if (source) {
+    if (modules.length > 0) {
+      modules.forEach((module) => {
+        const ext = [
+          '.ts',
+          '.tsx',
+          '.js',
+          '.debug.ts',
+          '.debug.tsx',
+          '.debug.js',
+          '.live.ts',
+          '.live.tsx',
+          '.live.js',
+        ]
+        ext.forEach((fext) => {
+          const _source = source + "/modules/" + module + fext;
+          const _destination = currentProject + module + fext;
+
+          if (fs.existsSync(_source)) {
+            const file = fs.readFileSync(_source, { encoding: 'utf8' })
+            const [mod] = module.split('/')
+            if (!fs.existsSync(currentProject + mod)) {
+              fs.mkdirSync(currentProject + mod)
+            }
+            fs.writeFileSync(_destination, file, { encoding: 'utf8' })
+            console.log('>_ ' + module + fext + ' connected!')
+          }
+        })
+      })
+    }
+  }
+}

package/bin/router.js

@@ -248,7 +248,7 @@ function createRouter() {
   for (const module in Modules) {
     for (const task in Modules[module]) {
       nav = module + '/' + task;
-      if (NavsExclude[nav] == false) {
+      if (NavsExclude[nav] == false && !task.includes(".debug") && !task.includes(".live")) {
         Navigations.push(nav);
       }
       AllRoutes.push(nav)
@@ -412,11 +412,13 @@ export interface EspArgsInterface {
     const orientation = NavsOrientation[nav]
     const [module, task] = nav.split('/')
     const comp = ucword(module) + ucword(task)
-    importer.push(`import { ${comp} } from ${'"esoftplay/cache/' + module + '/' + task + '/import"'} `)
-    if (orientation)
-      screens.push("\t\t\t\t" + "<Stack.Screen name={\"" + nav + "\"} options={{ orientation: '" + orientation + "' }} component={" + comp + "} />")
-    else
-      screens.push("\t\t\t\t" + "<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />")
+    if (!task.includes(".debug") && !task.includes(".live")) {
+      importer.push(`import { ${comp} } from ${'"esoftplay/cache/' + module + '/' + task + '/import"'} `)
+      if (orientation)
+        screens.push("\t\t\t\t" + "<Stack.Screen name={\"" + nav + "\"} options={{ orientation: '" + orientation + "' }} component={" + comp + "} />")
+      else
+        screens.push("\t\t\t\t" + "<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />")
+    }
   })
 
   let N = Nav5(importer.join("\n"), screens.join("\n"))

package/modules/lib/curl.ts

@@ -323,6 +323,10 @@ export default class m {
     if ((/^[A-z]+:\/\//g).test(uri)) {
       this.setUrl(uri)
       this.setUri("")
+      const protocol = uri.split("://")[0]
+      if (protocol != esp.config("protocol")) {
+        reportApiError(uri, `INCONSISTENCY PROTOCOL ${protocol} != ${esp.config("protocol")} at config`)
+      }
     } else {
       this.setUri(uri)
       this.setUrl(esp.config("url"))

package/modules/lib/infinite.tsx

@@ -17,6 +17,8 @@ export interface LibInfiniteProps {
   isDebug?: 0 | 1,
   initialData?: any[],
   injectData?: any,
+  onRefresh?: () => void
+  onResponseEdit?: (res: any) => any,
   onDataChange?: (data: any, page: number) => void
   onResult?: (res: any, uri: string) => void,
   filterData?: (item: any, index: number, array: any[]) => boolean,
@@ -61,7 +63,7 @@ export interface LibInfiniteState {
   error: string
 }
 
-export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
+export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState> {
 
   isStop: boolean = false
   page: number | undefined = 0
@@ -106,16 +108,17 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
     if (!this.pages.includes(page)) {
       this.pages.push(page)
       new LibCurl().withHeader(this.props?.customHeader || {})(url, post,
-        (res, msg) => {
+        (_res, msg) => {
+          const data = this.props.onResponseEdit ? this.props.onResponseEdit(_res) : _res
           if (this.props.isDebug) {
-            esp.log(res);
+            esp.log(data);
           }
-          this.props.onResult && this.props.onResult(res, url)
+          this.props.onResult && this.props.onResult(data, url)
           const update = () => {
             this.props.onDataChange && this.props.onDataChange(this.state.data || [], this.page)
           }
-          let mainIndex: any = this.props.mainIndex && res[this.props.mainIndex] || res
-          if (mainIndex.list.length == 0 || res.list == '') {
+          let mainIndex: any = this.props.mainIndex && data[this.props.mainIndex] || data
+          if (mainIndex.list.length == 0 || data.list == '') {
             this.page = page
             this.isStop = true
             this.setState((state: LibInfiniteState, props: LibInfiniteProps) => {
@@ -132,6 +135,7 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
             this.setState((state: LibInfiniteState, props: LibInfiniteProps) => {
               const latestData = [...state.data, ...mainIndex.list]
               return {
+                error: '',
                 data: page == 0
                   ? (typeof this.props?.filterData == 'function' ? mainIndex.list.filter(this.props.filterData) : mainIndex.list)
                   : (typeof this.props?.filterData == 'function' ? latestData.filter(this.props.filterData) : latestData),
@@ -146,6 +150,7 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
           this.page = page
           this.isStop = true
           this.setState({
+            data: [],
             error: msg?.message,
           })
         }, this.props.isDebug
@@ -155,10 +160,10 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
 
   componentDidUpdate(prevProps: LibInfiniteProps, prevState: LibInfiniteState): void {
     if (this.props.initialData != undefined && prevProps.initialData != this.props.initialData && this.props.initialData.length != 0 && this.state.data.length == 0) {
-      this.setState({ data: this.props.initialData })
+      this.setState({ data: this.props.initialData, error: "" })
     }
     if (this.props.injectData !== undefined && !isEqual(this.props.injectData, this.state.data)) {
-      this.setState({ data: this.props.injectData })
+      this.setState({ data: this.props.injectData, error: "" })
     }
   }
 
@@ -179,17 +184,22 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
     const { data, error } = this.state
     const { errorView, refreshEnabled } = this.props
     // const AutoLayoutViewNativeComponent = require("@shopify/flash-list/src/native/auto-layout/AutoLayoutViewNativeComponent")
-    const List = /* !!AutoLayoutViewNativeComponent ? FlashList : */ FlashList
     return (
       <View style={{ flex: 1 }} >
         {
           (!data || data.length) == 0 && !this.isStop ?
             this.props.LoadingView || <LibLoading />
             :
-            <List
+            <FlashList
               ref={this.flatlist}
               data={data || []}
-              onRefresh={((refreshEnabled == undefined) || refreshEnabled) && (() => this.loadData())}
+              onRefresh={
+                ((refreshEnabled == undefined) || refreshEnabled)
+                  ? () => {
+                    this.loadData()
+                    this.props?.onRefresh?.()
+                  }
+                  : () => { }}
               refreshing={false}
               keyExtractor={this._keyExtractor}
               nestedScrollEnabled
@@ -207,8 +217,6 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
               showsVerticalScrollIndicator={false}
               estimatedItemSize={this.props.staticHeight || 100}
               initialNumToRender={5}
-              maxToRenderPerBatch={10}
-              windowSize={10}
               ListFooterComponent={
                 (!this.isStop) ? <View style={{ padding: 20 }} ><LibLoading /></View> : (this.props?.ListEndedComponent || <View style={{ height: 50 }} />)
               }

package/modules/lib/slidingup.tsx

@@ -13,7 +13,7 @@ export interface LibSlidingupProps {
 export interface LibSlidingupState {
   show: boolean,
 }
-export default class m extends LibComponent<LibSlidingupProps, LibSlidingupState>{
+export default class m extends LibComponent<LibSlidingupProps, LibSlidingupState> {
 
   _show: boolean = false
   animValue: any = new Animated.Value(LibStyle.height)
@@ -46,7 +46,7 @@ export default class m extends LibComponent<LibSlidingupProps, LibSlidingupState
     Keyboard.dismiss()
     if (this.props.children) {
       this.setState({ show: true }, () => {
-       const timer = setTimeout(() => {
+        const timer = setTimeout(() => {
           this._toggleSubview(true)
           clearTimeout(timer)
         }, 1);
@@ -83,8 +83,8 @@ export default class m extends LibComponent<LibSlidingupProps, LibSlidingupState
     const { show } = this.state
     if (!show) return null
     return (
-      <LibKeyboard_avoid style={{ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0 }}>
-        <View style={{ flex: 1, backgroundColor: 'rgba(0,0,0,0.5)', justifyContent: 'flex-end', zIndex: 999999 }}>
+      <LibKeyboard_avoid style={{ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, zIndex: 999999 }}>
+        <View style={{ flex: 1, backgroundColor: 'rgba(0,0,0,0.5)', justifyContent: 'flex-end', }}>
           <TouchableOpacity style={{ flex: 1 }} activeOpacity={1} onPress={() => this.hide()} />
           <Animated.View style={{ transform: [{ translateY: this.animValue }] }} >
             {this.props.children}

package/modules/lib/worker.tsx

@@ -3,7 +3,7 @@ import esp from 'esoftplay/esp';
 import useGlobalSubscriber from 'esoftplay/subscribe';
 import { createTimeout } from 'esoftplay/timeout';
 import React, { useEffect, useRef } from 'react';
-import { AppState, View } from 'react-native';
+import { View } from 'react-native';
 import WebView from 'react-native-webview';
 
 export interface LibUseworkerArgs {
@@ -50,11 +50,6 @@ export default function m(props: LibUseworkerProps): any {
 
   useEffect(() => {
     ref.current?.injectJavaScript(`\n${require('./out')}\n`)
-    const c = AppState.addEventListener('focus', (status) => {
-      if (status == 'active')
-        ref.current?.injectJavaScript(`\n${require('./out')}\n`)
-    })
-    return () => c.remove()
   }, [])
 
   subs.useSubscribe(() => {

package/package.json

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