esoftplay 0.0.112-d → 0.0.112-e

package/bin/build.js

@@ -5,6 +5,7 @@ const fs = require('fs');
 const DIR = "../../"
 const packjson = DIR + "package.json"
 const appjson = DIR + "app.json"
+const easjson = DIR + "eas.json"
 const confjson = DIR + "config.json"
 const gitignore = DIR + ".gitignore"
 const babelconfig = DIR + "babel.config.js"
@@ -116,6 +117,35 @@ if (fs.existsSync(packjson)) {
 			fs.writeFileSync(pathJSTimer, JSTimers)
 		}
 
+		const easconfg = `{
+			"cli": {
+				"version": ">= 0.52.0"
+			},
+			"build": {
+				"development": {
+					"developmentClient": true,
+					"distribution": "internal",
+					"ios": {
+						"simulator": true
+					}
+				},
+				"preview": {
+					"distribution": "internal",
+					"ios": {
+						"simulator": true
+					}
+				},
+				"production": {}
+			},
+			"submit": {
+				"production": {}
+			}
+		}`
+
+		fs.writeFile(easjson, easconfg, (err) => {
+			if (err) throw err;
+			console.log('eas.json has been updated');
+		})
 
 		const babelconf = `module.exports = function (api) {
 	api.cache(true);
@@ -210,6 +240,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 } from 'react-native-screens';
 const { globalIdx } = require('esoftplay/global');
 enableScreens();
@@ -224,7 +255,11 @@ export default function App() {
 		ErrorReport.getError()
 	}, [])
 
-	return <Home />
+	return (
+		<GestureHandlerRootView style={{ flex: 1 }}>
+			<Home />
+		</GestureHandlerRootView>
+	)
 }`;
 		let expoLib = [
 			'@expo/vector-icons',
@@ -257,6 +292,7 @@ export default function App() {
 			'react-fast-compare',
 			'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',

package/bin/cli.js

@@ -5,6 +5,8 @@ const fs = require('fs');
 const exec = require('child_process').execSync;
 const path = require('path');
 const os = require('os')
+const readline = require('readline');
+
 
 const DIR = "./"
 const appjson = DIR + "app.json"
@@ -557,21 +559,109 @@ function command(command) {
 }
 
 function build() {
-	if (args[0] == "build") {
-		askPerm("Yakin akan membuild app " + (args[1] ? args[1] : "") + (args[2] ? " " + (args[2]) : "") + "?", () => {
-			if (args[1] == "debug" || args[1] == "live") {
-				switchStatus(args[1])
-				console.log('+ status ' + args[1])
+	const types = [
+		{
+			name: "1. IOS (Debug) - Simulator",
+			cmd: "eas build --platform ios --profile development",
+			pre: () => {
+				jsEng(appjson, false)
+				jsEng(appdebug, false)
+				jsEng(applive, false)
+				consoleSucces("Hermes dinonaktifkan")
 			}
-			if (args[2] == "offline" || args[2] == "online") {
-				switchMode(args[2])
-				console.log('+ mode ' + args[2])
+		},
+		{
+			name: "2. IOS (Test) - Simulator",
+			cmd: "eas build --platform ios --profile preview",
+			pre: () => {
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes diaktifkan")
 			}
-			command("expo build:android")
-			command("expo build:ios")
-			command("expo build:android -t app-bundle")
-			consoleError("silahkan cek build pada halaman https://expo.io/builds")
-		})
+		},
+		{
+			name: "3. IOS (Release) - ipa",
+			cmd: "eas build --platform ios --profile production",
+			pre: () => {
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes diaktifkan")
+			}
+		},
+		{
+			name: "4. Android (Debug) - apk",
+			cmd: "eas build --platform android --profile development",
+			pre: () => {
+				jsEng(appjson, false)
+				jsEng(appdebug, false)
+				jsEng(applive, false)
+				consoleSucces("Hermes dinonaktifkan")
+			}
+		},
+		{
+			name: "5. Android (Test) - apk",
+			cmd: "eas build --platform android --profile preview",
+			pre: () => {
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes dinonaktifkan")
+			}
+		},
+		{
+			name: "6. Android (Release) - aab",
+			cmd: "eas build --platform android --profile production",
+			pre: () => {
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes dinonaktifkan")
+			}
+		}
+	]
+
+	function jsEng(file, isHermes) {
+		if (fs.existsSync(file)) {
+			var txt = fs.readFileSync(file, 'utf8');
+			let isJSON = txt.startsWith('{') || txt.startsWith('[')
+			if (!isJSON) {
+				consoleError('app.json tidak valid')
+				return
+			}
+			let app = JSON.parse(txt)
+			app.expo.jsEngine = isHermes ? "hermes" : "jsc"
+			fs.writeFileSync(file, JSON.stringify(app, undefined, 2))
+		} else {
+			consoleError(file)
+		}
+	}
+
+	if (args[0] == "build") {
+		let d
+		const rl = readline.createInterface({
+			input: process.stdin,
+			output: process.stdout
+		});
+
+		rl.question("Pilih build type :\n\n" + types.map((x) => x.name).join("\n") + '\n\nMasukkan nomor build type: ', function (idx) {
+			d = types[idx - 1]
+			rl.close();
+		});
+
+		rl.on("close", function () {
+			if (d) {
+				let cmd = d.cmd
+				let pre = d.pre
+				if (pre) { pre() }
+				consoleSucces("⚙⚙⚙ ... \n" + cmd)
+				command(cmd);
+			} else {
+				consoleError("Build type tidak ditemukan")
+			}
+		});
+
 	}
 }
 
@@ -625,6 +715,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 = 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))
@@ -669,6 +760,7 @@ function help() {
 		"\n - u|update                    : untuk update esp module ke versi terakhir",
 		"\n - u|update all                : untuk update semua esp module ke versi terakhir",
 		"\n - start                       : start esoftplay framework",
+		"\n - b|build                     : untuk build app .ipa .apk .aab",
 		"\n - f|file                      : untuk check status file",
 		"\n - c|check                     : untuk check status",
 		"\n - create-master [moduleName]  : untuk create master module terpisah",
@@ -681,7 +773,6 @@ function help() {
 		"\n - p|publish [notes]           : untuk mempublish dan menambahkan id",
 		"\n - bcl|backup-config-live      : untuk backup config live",
 		"\n - bcd|backup-config-debug     : untuk backup config debug",
-		// "\n - b|build                     : untuk build app .ipa .apk .aab",
 		// "\n - build debug                 : untuk build app .ipa .apk .aab status DEBUG",
 		// "\n - build debug offline         : untuk build app .ipa .apk .aab status DEBUG mode OFFLINE",
 		// "\n - build debug online          : untuk build app .ipa .apk .aab status DEBUG mode ONLINE",

package/modules/lib/curl.ts

@@ -56,10 +56,10 @@ export default class ecurl {
   protected initTimeout(customTimeout?: number): void {
     this.cancelTimeout()
     this.timeoutContext = setTimeout(() => {
-      if (this.abort?.cancel) {
-        this.closeConnection()
-        LibProgress.hide()
-      }
+      // if (this.abort?.cancel) {
+      //   this.closeConnection()
+      //   LibProgress.hide()
+      // }
     }, customTimeout ?? this.timeout);
   }
 
@@ -128,7 +128,7 @@ export default class ecurl {
   }
 
   protected closeConnection(): void {
-    this?.abort?.cancel('Oops, Sepertinya ada gangguan jaringan... Silahkan coba beberapa saat lagi');
+    // this?.abort?.cancel('Oops, Sepertinya ada gangguan jaringan... Silahkan coba beberapa saat lagi');
   }
 
   protected onDone(result: any, msg?: string): void {
@@ -164,7 +164,6 @@ export default class ecurl {
         }
         let ps = Object.keys(_post).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(_post[key])).join('&');
         var options: any = {
-          signal: this.signal,
           method: "POST",
           headers: {
             ...this.header,
@@ -283,7 +282,6 @@ export default class ecurl {
       }
       await this.setHeader()
       var options: any = {
-        signal: this.signal,
         method: !this.post ? "GET" : "POST",
         headers: {
           ...this.header,
@@ -374,7 +372,6 @@ export default class ecurl {
     else
       this.header["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8"
     var options: any = {
-      signal: this.signal,
       method: !this.post ? "GET" : "POST",
       headers: this.header,
       body: this.post,

package/modules/lib/picture.tsx

@@ -4,7 +4,8 @@
 import { esp, LibStyle, LibWorker, LibWorkloop, useSafeState } from 'esoftplay';
 import * as FileSystem from 'expo-file-system';
 import React, { useMemo } from 'react';
-import { Image, PixelRatio, Platform, View } from 'react-native';
+import { PixelRatio, Platform, View } from 'react-native';
+import FastImage from 'react-native-fast-image'
 const sh = require("shorthash")
 
 export interface LibPictureSource {
@@ -86,6 +87,18 @@ export default function m(props: LibPictureProps): any {
   let { width, height } = props.style
   const valid = b_uri?.includes?.(esp.config('domain'))
 
+  let resizeMode
+  if (props?.style?.resizeMode == 'cover')
+    resizeMode = FastImage.resizeMode.cover
+  else if (props?.style?.resizeMode == 'contain')
+    resizeMode = FastImage.resizeMode.contain
+  else if (props?.resizeMode == 'cover')
+    resizeMode = FastImage.resizeMode.cover
+  else if (props?.resizeMode == 'contain')
+    resizeMode = FastImage.resizeMode.contain
+  else
+    resizeMode = FastImage.resizeMode.cover
+
   if (props.source.hasOwnProperty("uri") && (!width || !height)) {
     if (width) {
       height = width
@@ -120,11 +133,11 @@ export default function m(props: LibPictureProps): any {
     if (typeof props.source != 'number' && !b_uri) {
       return <View style={props.style} />
     }
-    return <Image {...props} />
+    return <FastImage {...props} resizeMode={resizeMode} />
   }
 
   if (!valid || (!props.source.hasOwnProperty("uri"))) {
-    return <Image {...props} />
+    return <FastImage {...props} resizeMode={resizeMode} />
   }
 
   if (uri == '') {
@@ -134,6 +147,6 @@ export default function m(props: LibPictureProps): any {
   }
 
   return (
-    <Image key={b_uri + uri} {...props} source={{ uri: uri }} style={props.style} />
+    <FastImage key={b_uri + uri} {...props} source={{ uri: uri }} style={props.style} resizeMode={resizeMode} />
   )
 }

package/package.json

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