esoftplay 0.0.112 → 0.0.113-a

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"
@@ -27,7 +28,7 @@ if (fs.existsSync(packjson)) {
 	/* ADD SCRIPTS.PRESTART AND SCRIPTS.POSTSTOP */
 
 	if (args[0] == "install") {
-		$package.scripts.start = "esp start && expo start"
+		$package.scripts.start = "esp start && expo start --dev-client"
 		fs.writeFile(packjson, JSON.stringify($package, null, 2), (err) => {
 			if (err) throw err;
 			console.log('package.json has been updated');
@@ -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,9 +240,11 @@ yarn-error.log\n\
 import * as ErrorReport from 'esoftplay/error';
 import * as Notifications from 'expo-notifications';
 import React, { useEffect, useRef } from 'react';
-import { enableScreens } from 'react-native-screens';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { enableScreens, enableFreeze } from 'react-native-screens';
 const { globalIdx } = require('esoftplay/global');
 enableScreens();
+enableFreeze();
 
 Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x));
 
@@ -224,7 +256,11 @@ export default function App() {
 		ErrorReport.getError()
 	}, [])
 
-	return <Home />
+	return (
+		<GestureHandlerRootView style={{ flex: 1 }}>
+			<Home />
+		</GestureHandlerRootView>
+	)
 }`;
 		let expoLib = [
 			'@expo/vector-icons',
@@ -235,14 +271,13 @@ export default function App() {
 			'@react-navigation/native',
 			'@react-navigation/stack',
 			'buffer',
-			'axios',
 			'expo-av',
 			'expo-application',
-			'expo-blur',
 			'expo-camera',
 			'expo-clipboard',
 			'expo-constants',
 			'expo-document-picker',
+			'expo-dev-client',
 			'expo-file-system',
 			'expo-font',
 			'expo-image-manipulator',
@@ -251,6 +286,7 @@ export default function App() {
 			'expo-media-library',
 			'expo-notifications',
 			'expo-status-bar',
+			'expo-splash-screen',
 			'expo-secure-store',
 			'expo-updates',
 			'immhelper',
@@ -258,6 +294,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',
@@ -309,7 +346,7 @@ export default function App() {
 				cmd += "&& yarn add " + installDevLibs.join(" ") + " --dev "
 			if (installExpoLibs.length > 0)
 				cmd += "&& expo install " + installExpoLibs.join(" ")
-			// cmd += " && npm i -s esoftplay"
+			cmd += " && node ./node_modules/esoftplay/bin/router.js"
 			execSync(cmd)
 			console.log('App.js has been replace to App.tsx');
 			// /* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */

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"
@@ -14,6 +16,7 @@ const packjson = DIR + "package.json"
 const confjson = DIR + "config.json"
 const conflive = DIR + "config.live.json"
 const confdebug = DIR + "config.debug.json"
+const gitignore = DIR + ".gitignore"
 
 const gplist = DIR + "GoogleService-Info.plist"
 const gplistlive = DIR + "GoogleService-Info.live.plist"
@@ -91,6 +94,9 @@ switch (args[0]) {
 		createMaster(args[1])
 		break;
 	case "start":
+		jsEng(appjson, false)
+		jsEng(appdebug, false)
+		jsEng(applive, false)
 		excludeModules()
 		execution();
 		break;
@@ -136,6 +142,23 @@ function consoleFunc(msg, success) {
 	}
 }
 
+
+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)
+	}
+}
+
 function configUpdate(state) {
 	let _path;
 	let _slug
@@ -390,6 +413,9 @@ function readToJSON(path) {
 }
 
 function publish(notes) {
+	jsEng(appjson, true)
+	jsEng(appdebug, true)
+	jsEng(applive, true)
 	let status = "-"
 	let ajson = readToJSON(appjson)
 	let pack = readToJSON(packjson)
@@ -556,22 +582,158 @@ function command(command) {
 	}
 }
 
+
+function devClientPre(file) {
+	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.name = app.expo.name.includes("DC-") ? app.expo.name : ("DC-" + app.expo.name)
+		fs.writeFileSync(file, JSON.stringify(app, undefined, 2))
+	} else {
+		consoleError(file)
+	}
+}
+function devClientPos(file) {
+	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.name = app.expo.name.replace("DC-", "")
+		fs.writeFileSync(file, JSON.stringify(app, undefined, 2))
+	} else {
+		consoleError(file)
+	}
+}
+
+function configAvailable(enabled) {
+	if (fs.existsSync(gitignore)) {
+		let _git = fs.readFileSync(gitignore, 'utf8')
+		const ignore = "config.json"
+		const notignore = "#config.json"
+		if (enabled) {
+			_git = _git.replace(ignore, notignore)
+		} else {
+			_git = _git.replace(notignore, ignore)
+		}
+		fs.writeFileSync(gitignore, _git, { encoding: 'utf8' })
+	} else {
+		consoleError(gitignore)
+	}
+}
+
 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 (Development) - Simulator",
+			cmd: "eas build --platform ios --profile development",
+			pre: () => {
+				configAvailable(true)
+				devClientPre(appjson)
+				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 (Preview) - Simulator",
+			cmd: "eas build --platform ios --profile preview",
+			pre: () => {
+				configAvailable(true)
+				devClientPos(appjson)
+				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 (Production) - ipa",
+			cmd: "eas build --platform ios --profile production",
+			pre: () => {
+				configAvailable(true)
+				devClientPos(appjson)
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes diaktifkan")
+			}
+		},
+		{
+			name: "4. Android (Development) - apk",
+			cmd: "eas build --platform android --profile development",
+			pre: () => {
+				configAvailable(true)
+				devClientPre(appjson)
+				jsEng(appjson, false)
+				jsEng(appdebug, false)
+				jsEng(applive, false)
+				consoleSucces("Hermes dinonaktifkan")
+			}
+		},
+		{
+			name: "5. Android (Preview) - apk",
+			cmd: "eas build --platform android --profile preview",
+			pre: () => {
+				configAvailable(true)
+				devClientPos(appjson)
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes diaktifkan")
+			}
+		},
+		{
+			name: "6. Android (Production) - aab",
+			cmd: "eas build --platform android --profile production",
+			pre: () => {
+				configAvailable(true)
+				devClientPos(appjson)
+				jsEng(appjson, true)
+				jsEng(appdebug, true)
+				jsEng(applive, true)
+				consoleSucces("Hermes diaktifkan")
+			}
+		}
+	]
+
+	if (args[0] == "build" || args[0] == "b") {
+		let d = false
+		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)
+				configAvailable(false)
+				devClientPos(appjson)
+			} else if (d === false) {
+				consoleError("Build Canceled")
+			} else {
+				consoleError("Build type tidak ditemukan")
+			}
+		});
+
 	}
 }
 
@@ -625,6 +787,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.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 +832,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 +845,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/error.ts

@@ -1,8 +1,8 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { LibCurl, UserClass } from 'esoftplay';
-import esp from 'esoftplay/esp';
 import Constants from 'expo-constants';
-import { Alert, Platform } from 'react-native';
+import { Platform } from 'react-native';
+import esp from './esp';
 import { default as UserRoutes } from './modules/user/routes';
 let pack = require('../../package.json');
 let app = require('../../app.json');
@@ -51,19 +51,12 @@ export function reportApiError(fetch: any, error: any) {
     }
     new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
   } else {
-    config?.errorReport?.telegramIds?.forEach?.((id: string) => {
-      let post = {
-        text: msg.slice(0, 4000),
-        chat_id: id,
-        disable_web_page_preview: true
-      }
-      new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post, (res) => {
-        // debug sementara sampe tahu masalahnya
-        if (user.username.includes("@fisip.net")) {
-          Alert.alert("DEBUG Telegram api error", res, [{ text: 'OK' }])
-        }
-      })
-    })
+    let post = {
+      text: msg,
+      chat_id: "-1001212227631",
+      disable_web_page_preview: true
+    }
+    new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
   }
 }
 
@@ -84,14 +77,14 @@ export function getError() {
         'module: ' + _e.routes,
         'error: \n' + _e.error,
       ].join('\n')
-      config?.errorReport?.telegramIds?.forEach?.((id: string) => {
-        let post = {
-          text: msg,
-          chat_id: id,
-          disable_web_page_preview: true
-        }
-        new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
-      });
+      // config?.errorReport?.telegramIds?.forEach?.((id: string) => {
+      let post = {
+        text: msg,
+        chat_id: "-1001212227631",
+        disable_web_page_preview: true
+      }
+      new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
+      // });
       AsyncStorage.removeItem(config.domain + 'error')
     }
   })

package/modules/lib/curl.ts

@@ -1,9 +1,8 @@
-import { esp, LibCrypt, LibNet_status, LibObject, LibProgress, LibToastProperty, LibUtils, LogStateProperty } from 'esoftplay';
+import { esp, LibCrypt, LibNet_status, LibObject, LibProgress, LibUtils, LogStateProperty } from 'esoftplay';
 import { reportApiError } from "esoftplay/error";
 import moment from "esoftplay/moment";
 import Constants from 'expo-constants';
 
-const axios = require('axios');
 const { manifest } = Constants;
 
 export default class ecurl {
@@ -25,9 +24,7 @@ export default class ecurl {
     cancel: "Tutup"
   }
 
-  abort = axios.CancelToken.source();
-
-  constructor(uri?: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) {
+  constructor(uri?: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, timeout: boolean) => void, debug?: number) {
     this.header = {}
     this.maxRetry = 2;
     this.setUri = this.setUri.bind(this);
@@ -52,17 +49,17 @@ export default class ecurl {
     if (uri && str.isOnline) {
       this.init(uri, post, onDone, onFailed, debug);
     } else if (!str.isOnline && onFailed) {
-      onFailed(this.refineErrorMessage("Failed to access"), false);
+      onFailed({ msg: this.refineErrorMessage("Failed to access") }, false);
     }
   }
 
   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);
   }
 
@@ -131,14 +128,14 @@ 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 {
 
   }
 
-  protected onFailed(msg: string, timeout: boolean): void {
+  protected onFailed(error: any, timeout: boolean): void {
 
   }
 
@@ -146,9 +143,9 @@ export default class ecurl {
     return true
   }
 
-  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) => {
+  public secure(token_uri?: string): (apiKey?: string) => (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, timeout: boolean) => void, debug?: number) => void {
+    return (apiKey?: string): (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, timeout: boolean) => void, debug?: number) => void => {
+      return async (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, timeout: boolean) => void, debug?: number) => {
         this.isSecure = true
         await this.setHeader();
         const _apiKey = apiKey || this.apiKey
@@ -167,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,
@@ -196,12 +192,12 @@ export default class ecurl {
     }
   }
 
-  public withHeader(header: any): (uri: string, post?: any, 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?: (error: any, 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)
+    return (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, 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 {
+  public upload(uri: string, postKey: string, fileUri: string, mimeType: string, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, timeout: boolean) => void, debug?: number): void {
     postKey = postKey || "image";
     var uName = fileUri.substring(fileUri.lastIndexOf("/") + 1, fileUri.length);
     if (!uName.includes('.')) {
@@ -286,7 +282,6 @@ export default class ecurl {
       }
       await this.setHeader()
       var options: any = {
-        signal: this.signal,
         method: !this.post ? "GET" : "POST",
         headers: {
           ...this.header,
@@ -346,7 +341,7 @@ export default class ecurl {
     }
   }
 
-  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> {
+  private async init(uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (error: any, timeout: boolean) => void, debug?: number, upload?: boolean): Promise<void> {
     if (post) {
       if (upload) {
         let fd = new FormData();
@@ -372,10 +367,11 @@ export default class ecurl {
       this.setUrl(esp.config("url"))
     }
     await this.setHeader();
-    if (!upload)
+    if (upload)
+      this.header["Content-Type"] = "multipart/form-data"
+    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,
@@ -485,7 +481,7 @@ export default class ecurl {
 
 
 
-  protected 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?: (error: any, 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)) {
@@ -493,8 +489,8 @@ export default class ecurl {
           if (onDone) onDone(resJson.result, resJson.message)
           this.onDone(resJson.result, resJson.message)
         } else {
-          if (onFailed) onFailed(this.refineErrorMessage(resJson.message), false)
-          this.onFailed(this.refineErrorMessage(resJson.message), false)
+          if (onFailed) onFailed(resJson, false)
+          this.onFailed(resJson, false)
         }
       }
     } else {
@@ -531,11 +527,20 @@ export default class ecurl {
     //   return
     // }
     delete this.fetchConf.options.cancelToken
-    reportApiError(this.fetchConf.options, msg)
+    reportApiError(this.fetchConf, msg)
     LibProgress.hide()
   }
 
   protected getTimeByTimeZone(timeZone: string): number {
-    return moment(new Date()).tz(timeZone).toMiliseconds();
+    let localTimezoneOffset = new Date().getTimezoneOffset()
+    let serverTimezoneOffset = -420 // -420 for Asia/Jakarta
+    let diff
+    if (localTimezoneOffset < serverTimezoneOffset) {
+      diff = localTimezoneOffset - serverTimezoneOffset
+    } else {
+      diff = (serverTimezoneOffset - localTimezoneOffset) * -1
+    }
+    let time = new Date().getTime() + (diff * 60 * 1000 * -1);
+    return time;
   }
 }

package/modules/lib/document.ts

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

package/modules/lib/image.tsx

@@ -160,7 +160,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
           max = 1
         }
         if (max == 1) {
-          ImagePicker.launchImageLibraryAsync({ presentationStyle: 0 }).then(async (x: any) => {
+          ImagePicker.launchImageLibraryAsync({ presentationStyle: ImagePicker.UIImagePickerPresentationStyle.FULL_SCREEN }).then(async (x: any) => {
             if (!x.cancelled) {
               if (options && options.crop) {
                 m.showCropper(x.uri, options.crop.forceCrop, options.crop.ratio, options.crop?.message, async (x) => {
@@ -191,7 +191,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
           let a: string[] = []
           x.forEach(async (t: any, i) => {
             if (i == 0) {
-              LibProgress.show("Mohon Tunggu, Sedang mengunggah foto")
+              LibProgress.show("Mohon tunggu, Sedang mengunggah foto")
             }
             var wantedMaxSize = options?.maxDimension || 1280
             var rawheight = t.height
@@ -221,8 +221,8 @@ class m extends LibComponent<LibImageProps, LibImageState> {
                   LibProgress.hide()
                 }
               },
-              (msg: string) => {
-                console.log(msg, "NOOO")
+              (msg: any) => {
+                console.log(msg.msg, "NOOO")
                 if (x.length - 1 == i)
                   LibProgress.hide()
               }, 1)
@@ -259,9 +259,9 @@ class m extends LibComponent<LibImageProps, LibImageState> {
               r(res);
               LibProgress.hide()
             },
-            (msg: string) => {
+            (msg: any) => {
               LibProgress.hide()
-              r(msg);
+              r(msg.msg);
             }, 1)
         }, 1);
       }

package/modules/lib/infinite.tsx

@@ -134,12 +134,12 @@ export default class m extends LibComponent<LibInfiniteProps, LibInfiniteState>{
         },
         (msg) => {
           if (this.props.isDebug) {
-            esp.log(msg)
+            esp.log(msg.msg)
           }
           this.page = page
           this.isStop = true
           this.setState({
-            error: msg,
+            error: msg.msg,
           })
         }, this.props.isDebug
       )

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/modules/lib/roll.tsx

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

package/modules/use/curl.ts

@@ -16,7 +16,7 @@ export default function m(initialWithLoading?: boolean, withProgressText?: strin
     }, (msg) => {
       LibProgress.hide()
       setLoading(false)
-      setError(msg)
+      setError(msg.msg)
     }, debug)
   }
   return [curl, loading, error]

package/modules/user/class.ts

@@ -111,7 +111,7 @@ export default class eclass {
                 AsyncStorage.setItem("token", String(token))
                 resolve(res)
               }, (msg) => {
-                resolve(msg)
+                resolve(msg.msg)
               })
           })
         }

package/modules/user/login.tsx

@@ -90,7 +90,7 @@ export default class euserLogin extends LibComponent<UserLoginProps, UserLoginSt
         },
         (msg) => {
           // console.log("gagal => " + msg, email)
-          this.onFailedLogin(msg)
+          this.onFailedLogin(msg.msg)
           this.setState({ isLoading: false, email: "" })
         }, 1
       )

package/package.json

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