esoftplay 0.0.108 → 0.0.109

package/_cache.ts

@@ -33,16 +33,19 @@ export default (() => {
 
     function set(ns: T | ((x: T) => T)) {
       let isChange = false
-      if (o?.listener && !isEqual(value[_idx], ns)) {
+      if (!isEqual(value[_idx], ns)) {
         isChange = true
       }
-      value[_idx] = ns instanceof Function ? ns(value[_idx]) : ns
-      fastLoop(useCacheSubscriber[_idx], (c: any) => c?.(value[_idx]))
-      if (o?.persistKey) {
-        AsyncStorage.setItem(o.persistKey, JSON.stringify(value[_idx]))
+      if (isChange) {
+        value[_idx] = ns instanceof Function ? ns(value[_idx]) : ns
+        fastLoop(useCacheSubscriber[_idx], (c: any) => c?.(value[_idx]))
+        if (o?.persistKey) {
+          AsyncStorage.setItem(o.persistKey, JSON.stringify(value[_idx]))
+        }
+        if (o?.listener) {
+          o?.listener?.(ns instanceof Function ? ns(value[_idx]) : ns)
+        }
       }
-      if (isChange)
-        o.listener(ns instanceof Function ? ns(value[_idx]) : ns)
     };
 
     function del() {

package/bin/build.js

@@ -255,26 +255,27 @@ yarn.lock\n\
 			console.log('.gitignore has been created');
 		});
 
-		const AppJS = `import React, { useEffect, useRef } from 'react';
-import { esp, LibNotification } from 'esoftplay';
-import * as ErrorReport from 'esoftplay/error'
-import * as Notifications from 'expo-notifications';
-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 />
-}`;
+		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 />
+		}`;
 		let expoLib = [
 			'@expo/vector-icons',
 			'@react-native-async-storage/async-storage',
@@ -284,7 +285,9 @@ export default function App() {
 			'@react-navigation/native',
 			'@react-navigation/stack',
 			'buffer',
+			'axios',
 			'expo-av',
+			'expo-application',
 			'expo-blur',
 			'expo-camera',
 			'expo-clipboard',
@@ -298,6 +301,7 @@ export default function App() {
 			'expo-media-library',
 			'expo-notifications',
 			'expo-status-bar',
+			'expo-secure-store',
 			'expo-updates',
 			'firebase',
 			'immhelper',
@@ -360,7 +364,7 @@ export default function App() {
 			/* 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');")
+				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 */

package/esp.ts

@@ -112,6 +112,7 @@ export default (() => {
     const _store: any = LibLocale.state().get()
     return _store.lang_id
   }
+  
   function mod(path: string): any {
     var modtast = path.split("/");
     if (modtast[1] == "") {
@@ -119,35 +120,39 @@ export default (() => {
     }
     return routers(modtast.join("/"));
   }
+
   function _config(): string {
     var msg = ''
     if (!app.hasOwnProperty('config')) {
-      msg = "app.json tidak ada config"
+      msg = "tidak ada config"
     } else if (!app.config.hasOwnProperty('domain') || app.config.domain.length == 0) {
-      msg = "app.json di config tidak ada domain"
+      msg = "config tidak ada domain"
     } else if (!app.config.hasOwnProperty('salt') || app.config.salt.length == 0) {
-      msg = "app.json di config tidak ada salt"
+      msg = "config tidak ada salt"
     }
     if (msg != '') {
       let error = new Error(msg);
       throw error;
     }
 
-    var config = app.config;
-    if (!config.hasOwnProperty('timezone') || config.timezone.length == 0) {
-      config.timezone = 'Asia/Jakarta';
-    }
-    if (!config.hasOwnProperty('protocol') || config.protocol.length == 0) {
-      config.protocol = 'http';
-    }
-    if (!config.hasOwnProperty('uri') || config.uri.length == 0) {
-      config.uri = "/";
-    }
-    if (!config.hasOwnProperty('api') || config.api.length == 0) {
-      config.api = "api";
-    }
-    if (!config.hasOwnProperty('data') || config.data.length == 0) {
-      config.data = "data";
+    var config = {
+      // default config
+      timezone: "Asia/Jakarta",
+      protocol: "http",
+      uri: "/",
+      api: "api",
+      data: "data",
+      home: {
+        member: "content/index",
+        public: "content/index"
+      },
+      group_id: 0,
+      langIds: ["id", "en"],
+      theme: ["light", "dark"],
+      comment_login: 1,
+      notification: 0,
+      isDebug: __DEV__ ? 1 : 0,
+      ...app.config
     }
     if (!config.hasOwnProperty('url') || config.url.length == 0) {
       config.url = config.protocol + "://" + config.api + "." + config.domain + config.uri;
@@ -155,44 +160,11 @@ export default (() => {
     if (!config.hasOwnProperty('content') || config.content.length == 0) {
       config.content = config.protocol + "://" + config.data + "." + config.domain + config.uri;
     }
-    if (config.hasOwnProperty('home') && config.home.length != 0) {
-      if (!config.home.hasOwnProperty('member') || config.home.member.length == 0) {
-        config.home.member = "content/index";
-      }
-      if (!config.home.hasOwnProperty('public') || config.home.public.length == 0) {
-        config.home.public = "content/index";
-      }
-    } else {
-      config.home = {};
-      config.home.member = "content/index";
-      config.home.public = "content/index";
-    }
-    if (!config.hasOwnProperty('api') || config.api.length == 0) {
-      config.api = "api";
-    }
-    if (!config.hasOwnProperty('group_id')) {
-      config.group_id = '0'
-    }
-    if (!config.hasOwnProperty('langIds')) {
-      config.langIds = ["id", "en"];
-    }
-    if (!config.hasOwnProperty('theme')) {
-      config.theme = ['light', 'dark']
-    }
-    if (!config.hasOwnProperty('comment_login')) {
-      config.comment_login = 1;
-    }
-    if (!config.hasOwnProperty('notification')) {
-      config.notification = 0;
-    }
-    if (!config.hasOwnProperty("isDebug")) {
-      config.isDebug = __DEV__ ? 1 : 0;
-    }
-
     config.webviewOpen = '<!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> <link href="' + config.content + 'user/editor_css" rel="stylesheet" /> <script type="text/javascript">var _ROOT="' + config.uri + '";var _URL="' + config.content + '";function _Bbc(a,b){var c="BS3load_func";if(!window[c+"i"]){window[c+"i"]=0};window[c+"i"]++;if(!b){b=c+"i"+window[c+"i"]};if(!window[c]){window[c]=b}else{window[c]+=","+b}window[b]=a;if(typeof BS3!="undefined"){window[b](BS3)}};</script> <style type="text/css">body {padding: 0 20px;}</style></head> <body>';
     config.webviewClose = '<script src="' + config.content + 'templates/admin/bootstrap/js/bootstrap.min.js"></script> </body> </html>';
     return config;
   }
+
   function navigations(): string[] {
     return navs;
   }

package/fast.ts

@@ -1,5 +1,5 @@
 export const fastFilter = (a: any[], fn: (v: any) => boolean) => {
-  const f = []; //final
+  let f = []; //final
   const al = a.length - 1
   for (let i = 0; i <= al; i++) {
     if (fn(a[i])) {

package/global.ts

@@ -65,12 +65,12 @@ const n = () => {
 
     function set(ns: T) {
       const isChange = !isEqual(value, ns)
-      value = ns
-      fastLoop(subscriber?.[_idx], (c) => { c?.(ns) })
-      if (o?.persistKey) {
-        AsyncStorage.setItem(o.persistKey, JSON.stringify(ns))
-      }
       if (isChange) {
+        value = ns
+        fastLoop(subscriber?.[_idx], (c) => { c?.(ns) })
+        if (o?.persistKey) {
+          AsyncStorage.setItem(o.persistKey, JSON.stringify(ns))
+        }
         if (o?.listener)
           o.listener(ns)
       }

package/modules/lib/curl.ts

@@ -1,10 +1,13 @@
 // noPage
-
 import { esp, LibCrypt, LibNet_status, LibProgress, LibUtils } from 'esoftplay';
-import { reportApiError } from "../../error";
-import moment from "../../moment";
+import { reportApiError } from "esoftplay/error";
+import moment from "esoftplay/moment";
+const axios = require('axios');
+
 
 export default class ecurl {
+  timeout = 55000;
+  timeoutContext: any = null;
   isDebug = esp.config("isDebug");
   post: any;
   header: any;
@@ -18,8 +21,8 @@ export default class ecurl {
     ok: "Coba Lagi",
     cancel: "Tutup"
   }
-  controller = new AbortController();
-  signal = this.controller.signal;
+
+  abort = axios.CancelToken.source();
 
   constructor(uri?: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) {
     this.header = {}
@@ -36,6 +39,8 @@ export default class ecurl {
     this.onError = this.onError.bind(this)
     this.setApiKey = this.setApiKey.bind(this)
     this.secure = this.secure.bind(this)
+    this.initTimeout = this.initTimeout.bind(this)
+    this.cancelTimeout = this.cancelTimeout.bind(this)
     const str: any = LibNet_status.state().get()
     if (uri && str.isOnline) {
       this.init(uri, post, onDone, onFailed, debug);
@@ -44,6 +49,22 @@ export default class ecurl {
     }
   }
 
+  initTimeout(customTimeout?: number): void {
+    this.cancelTimeout()
+    this.timeoutContext = setTimeout(() => {
+      if (this.abort?.cancel) {
+        // reportApiError(`Request timeout`, this.url + this.uri)
+        this.closeConnection()
+        LibProgress.hide()
+      }
+    }, customTimeout ?? this.timeout);
+  }
+
+  cancelTimeout(): void {
+    clearTimeout(this.timeoutContext)
+    this.timeoutContext = null;
+  }
+
   onFetchFailed(message: string): void {
 
   }
@@ -70,7 +91,7 @@ export default class ecurl {
   }
 
   closeConnection(): void {
-    this?.controller?.abort?.()
+    this?.abort?.cancel('Oops, Sepertinya ada gangguan jaringan... Silahkan coba beberapa saat lagi');
   }
 
   onDone(result: any, msg?: string): void {
@@ -105,18 +126,21 @@ export default class ecurl {
         }
         let ps = Object.keys(_post).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(_post[key])).join('&');
         var options: any = {
-          signal: this.signal,
+          url: this.url + this.uri + (token_uri || 'get_token'),
           method: "POST",
+          cancelToken: this.abort.token,
           headers: {
             ...this.header,
             ["Content-Type"]: "application/x-www-form-urlencoded;charset=UTF-8"
           },
-          body: ps,
+          data: ps,
           cache: "no-store",
           _post: _post
         }
-        fetch(this.url + this.uri + (token_uri || 'get_token'), options).then(async (res) => {
-          let resText = await res.text()
+        this.initTimeout();
+        axios(options).then(async (res: any) => {
+          this.cancelTimeout();
+          let resText = res.data;
           this.onFetched(resText,
             (res, msg) => {
               this.init(uri, { ...post, access_token: res }, onDone, onFailed, debug);
@@ -124,11 +148,10 @@ export default class ecurl {
               if (onFailed)
                 onFailed(msg, false)
             }, debug)
-        }).catch((r) => {
+        }).catch((r: string) => {
+          this.cancelTimeout();
           LibProgress.hide()
           this.onFetchFailed(r)
-          // if (onFailed)
-          //   onFailed(r, true)
         })
       }
     }
@@ -219,13 +242,14 @@ export default class ecurl {
       }
       await this.setHeader()
       var options: any = {
-        signal: this.signal,
+        url: this.url + this.uri,
         method: !this.post ? "GET" : "POST",
+        cancelToken: this.abort.token,
         headers: {
           ...this.header,
           ["Content-Type"]: "application/x-www-form-urlencoded;charset=UTF-8"
         },
-        body: this.post,
+        data: this.post,
         Cache: "no-store",
         Pragma: "no-cache",
         ['Cache-Control']: "no-store",
@@ -235,46 +259,19 @@ export default class ecurl {
       if (debug == 1)
         esp.log(this.url + this.uri, options)
       this.fetchConf = { url: this.url + this.uri, options: options }
-      fetch(this.url + this.uri, options).then(async (res) => {
-        var resText = await res.text()
-        var resJson = (resText.startsWith("{") || resText.startsWith("[")) ? JSON.parse(resText) : null
-        if (resJson) {
-          if (onDone) onDone(resJson, false)
-          this.onDone(resJson)
-        } else {
-          // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
-          //   {
-          //     text: this.alertTimeout.ok,
-          //     style: 'cancel',
-          //     onPress: () => this.custom(uri, post, onDone, debug)
-          //   },
-          //   {
-          //     text: this.alertTimeout.cancel,
-          //     style: 'destructive',
-          //     onPress: () => { }
-          //   }
-          // ])
-          this.onFetchFailed(resText)
-          LibProgress.hide()
-          this.onError(resText)
+      // this.initTimeout()
+      axios(options).then(async (res: any) => {
+        // this.cancelTimeout()
+        if (res.data) {
+          if (onDone) onDone(res.data, false)
+          this.onDone(res.data)
         }
-      }).catch((e) => {
         LibProgress.hide()
-        // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
-        //   {
-        //     text: this.alertTimeout.ok,
-        //     style: 'cancel',
-        //     onPress: () => this.custom(uri, post, onDone, debug)
-        //   },
-        //   {
-        //     text: this.alertTimeout.cancel,
-        //     style: 'destructive',
-        //     onPress: () => { }
-        //   }
-        // ])
-        this.onFetchFailed(e)
-        // if (onDone)
-        //   onDone(e, true)
+      }).catch((r: string) => {
+        // this.cancelTimeout()
+        this.onFetchFailed(r)
+        LibProgress.hide()
+        this.onError(r)
       })
     }
   }
@@ -307,10 +304,11 @@ export default class ecurl {
     if (!upload)
       this.header["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8"
     var options: any = {
-      signal: this.signal,
+      url: this.url + this.uri,
       method: !this.post ? "GET" : "POST",
       headers: this.header,
-      body: this.post,
+      data: this.post,
+      cancelToken: this.abort.token,
       cache: "no-store",
       Pragma: "no-cache",
       ["Cache-Control"]: 'no-cache, no-store, must-revalidate',
@@ -320,43 +318,18 @@ export default class ecurl {
     }
     if (debug == 1) esp.log(this.url + this.uri, options)
     this.fetchConf = { url: this.url + this.uri, options: options }
-
-    // if (Platform.OS == 'android' && Platform.Version <= 22) {
-    //   var res = await fetch(this.url + this.uri, options);
-    //   let resText = await res.text()
-    //   this.onFetched(resText, onDone, onFailed, debug)
-    // } else
-    //   if (!upload) {
-    //     LibWorker.curl(this.url + this.uri, options, async (resText) => {
-    //       if (typeof resText == 'string') {
-    //         this.onFetched(resText, onDone, onFailed, debug)
-    //       }
-    //     })
-    //   } else {
-    fetch(this.url + this.uri, options).then(async (res) => {
-      let resText = await res.text()
-      this.onFetched(resText, onDone, onFailed, debug)
-    }).catch((r) => {
-      // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
-      //   {
-      //     text: this.alertTimeout.ok,
-      //     style: 'cancel',
-      //     onPress: () => this.init(uri, post, onDone, onFailed, debug)
-      //   },
-      //   {
-      //     text: this.alertTimeout.cancel,
-      //     style: 'destructive',
-      //     onPress: () => { }
-      //   }
-      // ])
-      this.onFetchFailed(r)
-      LibProgress.hide()
+    this.initTimeout(upload ? 120000 : undefined)
+    axios(options).then(async (res: any) => {
+      this.cancelTimeout()
+      this.onFetched(res.data, onDone, onFailed, debug)
+    }).catch((e: any) => {
+      this.cancelTimeout()
+      this.onFetched(e, onDone, onFailed, debug)
     })
-    // }
   }
 
-  onFetched(resText: string, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number): void {
-    var resJson = (resText.startsWith("{") && resText.endsWith("}")) || (resText.startsWith("[") && resText.endsWith("]")) ? JSON.parse(resText) : resText
+  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)) {
         if (resJson.ok === 1) {
@@ -368,22 +341,17 @@ export default class ecurl {
         }
       }
     } else {
-      this.onFetchFailed(resText)
-      this.onError(resText)
-      // Alert.alert(this.alertTimeout.title, this.alertTimeout.message, [
-      //   {
-      //     text: this.alertTimeout.cancel,
-      //     style: 'destructive',
-      //     onPress: () => { }
-      //   }
-      // ])
+      if (typeof resText == 'string') {
+        this.onFetchFailed(resText)
+        this.onError(resText)
+      }
     }
   }
 
   onError(msg: string): void {
     esp.log("\x1b[31m", msg)
     esp.log("\x1b[0m")
-    if (esp.isDebug() && msg == '') {
+    if (esp.isDebug('') && msg == '') {
       return
     }
     reportApiError(this.fetchConf, msg)

package/modules/lib/image.tsx

@@ -107,16 +107,18 @@ class m extends LibComponent<LibImageProps, LibImageState> {
           const { status } = await ImagePicker.requestCameraPermissionsAsync();
           finalStatus = status
         }
-        const rollPermission = await ImagePicker.getMediaLibraryPermissionsAsync();
-        finalStatus = rollPermission.status
-        if (finalStatus !== 'granted') {
-          const { status } = await ImagePicker.requestMediaLibraryPermissionsAsync();
-          finalStatus = status
+        if (finalStatus === 'granted') {
+          const rollPermission = await ImagePicker.getMediaLibraryPermissionsAsync();
+          finalStatus = rollPermission.status
+          if (finalStatus !== 'granted') {
+            const { status } = await ImagePicker.requestMediaLibraryPermissionsAsync();
+            finalStatus = status
+          }
         }
         if (finalStatus != 'granted') {
           Alert.alert(esp.appjson().expo.name + " tidak dapat mengakses kamera ", "Mohon Pastikan anda memberikan izin " + esp.appjson().expo.name + " untuk dapat mengambil foto")
         }
-        ImagePicker.launchCameraAsync().then(async (result: any) => {
+        ImagePicker.launchCameraAsync({ presentationStyle: 0 }).then(async (result: any) => {
           if (!result)
             result = ImagePicker?.getPendingResultAsync()
           if (!result?.cancelled) {
@@ -141,7 +143,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
   static fromGallery(options?: LibImageGalleryOptions): Promise<string | string[]> {
     return new Promise((_r) => {
       setTimeout(async () => {
-        const { status } = await ImagePicker.getCameraPermissionsAsync();
+        const { status } = await ImagePicker.getMediaLibraryPermissionsAsync();
         var finalStatus = status
         if (finalStatus !== 'granted') {
           const { status } = await ImagePicker.requestMediaLibraryPermissionsAsync();
@@ -158,7 +160,7 @@ class m extends LibComponent<LibImageProps, LibImageState> {
           max = 1
         }
         if (max == 1) {
-          ImagePicker.launchImageLibraryAsync().then(async (x: any) => {
+          ImagePicker.launchImageLibraryAsync({ presentationStyle: 0 }).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) => {

package/modules/lib/picture.tsx

@@ -123,7 +123,9 @@ export default function m(props: LibPictureProps): any {
   }
 
   if (uri == '') {
-    return <View style={props.style} />
+    return (
+      <View style={[{ backgroundColor: '#f1f2f3', borderRadius: 10 }, props.style]} />
+    )
   }
 
   return (

package/modules/lib/tabs.tsx

@@ -30,7 +30,7 @@ export default class m extends LibComponent<LibTabsProps, LibTabsState> {
     super(props);
     this.state = { forceUpdate: 0 }
     let page = this.props.defaultIndex || 0
-    let pageOffset = props.tabOffset ? props.tabOffset : 1
+    let pageOffset = props.tabOffset != undefined ? props.tabOffset : 1
     this.buildAllIds = this.buildAllIds.bind(this);
     this.changePage = this.changePage.bind(this);
     this.arrayOfLimit = this.arrayOfLimit.bind(this);
@@ -61,7 +61,7 @@ export default class m extends LibComponent<LibTabsProps, LibTabsState> {
   componentDidUpdate(prevProps: LibTabsProps, prevState: LibTabsState): void {
     if (this.props.tabIndex != prevProps.tabIndex) {
       if (!this.allIds.includes(this.props.tabIndex)) {
-        let pageOffset = this.props.tabOffset ? this.props.tabOffset : 1
+        let pageOffset = this.props.tabOffset != undefined ? this.props.tabOffset : 1
         this.buildAllIds(this.props.tabIndex, pageOffset)
         this.setState({ forceUpdate: this.state.forceUpdate + 1 })
       }

package/modules/lib/utils.ts

@@ -129,9 +129,6 @@ export default class eutils {
     } else {
       val = parseInt(value)?.toFixed?.(0)?.replace?.(/(\d)(?=(\d{3})+$)/g, "$1,")
     }
-    if ((typeof value == "string" ? parseInt(value) : value) <= 0) {
-      val = "0"
-    }
     if (!currency) {
       currency = "Rp"
     }

package/package.json

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