esoftplay 0.0.111 → 0.0.112

package/bin/build.js

@@ -27,7 +27,7 @@ if (fs.existsSync(packjson)) {
 	/* ADD SCRIPTS.PRESTART AND SCRIPTS.POSTSTOP */
 
 	if (args[0] == "install") {
-		$package.scripts.start = "esp start && expo start --dev-client"
+		$package.scripts.start = "esp start && expo start"
 		fs.writeFile(packjson, JSON.stringify($package, null, 2), (err) => {
 			if (err) throw err;
 			console.log('package.json has been updated');
@@ -210,10 +210,9 @@ yarn-error.log\n\
 import * as ErrorReport from 'esoftplay/error';
 import * as Notifications from 'expo-notifications';
 import React, { useEffect, useRef } from 'react';
-import { enableScreens, enableFreeze } from 'react-native-screens';
+import { enableScreens } from 'react-native-screens';
 const { globalIdx } = require('esoftplay/global');
 enableScreens();
-enableFreeze(true);
 
 Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x));
 
@@ -258,7 +257,6 @@ export default function App() {
 			'dayjs',
 			'react-fast-compare',
 			'react-native-gesture-handler',
-			'react-native-fast-image',
 			'react-native-awesome-gallery',
 			'react-native-picker-scrollview',
 			'react-native-pinch-zoom-view-movable',
@@ -311,11 +309,8 @@ export default function App() {
 				cmd += "&& yarn add " + installDevLibs.join(" ") + " --dev "
 			if (installExpoLibs.length > 0)
 				cmd += "&& expo install " + installExpoLibs.join(" ")
-			cmd += " && node ./node_modules/esoftplay/bin/router.js"
+			// cmd += " && npm i -s esoftplay"
 			execSync(cmd)
-			// if (fs.existsSync("../../node_modules/esoftplay/bin/router.js")) {
-			// 	execSync("node ../../node_modules/esoftplay/bin/router.js")
-			// }
 			console.log('App.js has been replace to App.tsx');
 			// /* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
 			// if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {

package/bin/router.js

@@ -578,14 +578,12 @@ function createRouter() {
         staticImport.splice(0, 0, item)
       } else if (module == 'lib' && task == 'style') {
         staticImport.splice(0, 0, item)
-      } else if (module == 'lib' && task == 'sqlite') {
-        staticImport.splice(1, 0, item)
-      } else if (module == 'lib' && task == 'worker_data') {
-        staticImport.splice(2, 0, item)
       } else if (module == 'lib' && task == 'worker') {
         staticImport.splice(2, 0, item)
       } else if (module == 'lib' && task == 'navigation') {
         staticImport.splice(2, 0, item)
+      } else if (task == 'style') {
+        staticImport.splice(9, 0, item)
       } else {
         staticImport.push(item);
       }

package/error.ts

@@ -1,7 +1,8 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { LibCurl, UserClass, esp } from 'esoftplay';
+import { LibCurl, UserClass } from 'esoftplay';
+import esp from 'esoftplay/esp';
 import Constants from 'expo-constants';
-import { Platform } from 'react-native';
+import { Alert, Platform } from 'react-native';
 import { default as UserRoutes } from './modules/user/routes';
 let pack = require('../../package.json');
 let app = require('../../app.json');
@@ -49,16 +50,21 @@ export function reportApiError(fetch: any, error: any) {
       disable_web_page_preview: true
     }
     new LibCurl().custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
-    return
+  } 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' }])
+        }
+      })
+    })
   }
-  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)
-  })
 }
 
 export function getError() {

package/esp.ts

@@ -8,6 +8,7 @@ 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'`]);
 let app = require('../../app.json');
 let conf = require('../../config.json');
 let lconf

package/modules/lib/curl.ts

@@ -1,13 +1,14 @@
-// noPage
-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';
+
 const axios = require('axios');
 const { manifest } = Constants;
 
 export default class ecurl {
   timeout = 55000;
+  maxRetry = 2;
   timeoutContext: any = null;
   isDebug = esp.config("isDebug");
   post: any;
@@ -28,6 +29,7 @@ export default class ecurl {
 
   constructor(uri?: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, timeout: boolean) => void, debug?: number) {
     this.header = {}
+    this.maxRetry = 2;
     this.setUri = this.setUri.bind(this);
     this.setUrl = this.setUrl.bind(this);
     this.buildUri = this.buildUri.bind(this);
@@ -58,7 +60,6 @@ export default class ecurl {
     this.cancelTimeout()
     this.timeoutContext = setTimeout(() => {
       if (this.abort?.cancel) {
-        // reportApiError(`Request timeout`, this.url + this.uri)
         this.closeConnection()
         LibProgress.hide()
       }
@@ -166,32 +167,30 @@ export default class ecurl {
         }
         let ps = Object.keys(_post).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(_post[key])).join('&');
         var options: any = {
-          url: this.url + this.uri + (token_uri || 'get_token'),
+          signal: this.signal,
           method: "POST",
-          cancelToken: this.abort.token,
           headers: {
             ...this.header,
             ["Content-Type"]: "application/x-www-form-urlencoded;charset=UTF-8"
           },
-          data: ps,
+          body: ps,
           cache: "no-store",
           _post: _post
         }
-        this.initTimeout();
-        axios(options).then(async (res: any) => {
-          this.cancelTimeout();
-          let resText = res.data;
+        fetch(this.url + this.uri + (token_uri || 'get_token'), options).then(async (res) => {
+          let resText = await res.text()
           this.onFetched(resText,
             (res, msg) => {
               this.init(uri, { ...post, access_token: res }, onDone, onFailed, debug);
             }, (msg) => {
               if (onFailed)
-                onFailed(this.refineErrorMessage(msg), false)
+                onFailed(msg, false)
             }, debug)
-        }).catch((r: string) => {
-          this.cancelTimeout();
+        }).catch((r) => {
           LibProgress.hide()
           this.onFetchFailed(r)
+          // if (onFailed)
+          //   onFailed(r, true)
         })
       }
     }
@@ -269,7 +268,7 @@ export default class ecurl {
     return signature
   }
 
-  public async custom(uri: string, post?: any, onDone?: (res: any, timeout: boolean) => void, debug?: number): Promise<void> {
+  async custom(uri: string, post?: any, onDone?: (res: any, timeout: boolean) => void, debug?: number): Promise<void> {
     const str: any = LibNet_status.state().get()
     if (str.isOnline) {
       if (post) {
@@ -278,47 +277,71 @@ export default class ecurl {
         }).join('&');
         this.post = ps
       }
-      uri = this.buildUri(uri);
+      this.setUri(uri)
       if ((/^[A-z]+:\/\//g).test(uri)) {
         this.setUrl(uri)
         this.setUri("")
       } else {
-        this.setUri(uri)
         this.setUrl(esp.config("url"))
       }
       await this.setHeader()
       var options: any = {
-        url: this.url + this.uri,
+        signal: this.signal,
         method: !this.post ? "GET" : "POST",
-        cancelToken: this.abort.token,
         headers: {
           ...this.header,
           ["Content-Type"]: "application/x-www-form-urlencoded;charset=UTF-8"
         },
-        data: !this.post ? undefined : this.post,
+        body: this.post,
         Cache: "no-store",
         Pragma: "no-cache",
         ['Cache-Control']: "no-store",
         mode: "cors",
         _post: post
       }
-      if (debug == 1) {
-        esp.log(this.url + this.uri, { ...options, cancelToken: undefined })
-      }
+      if (debug == 1)
+        esp.log(this.url + this.uri, options)
       this.fetchConf = { url: this.url + this.uri, options: options }
-      // this.initTimeout()
-      axios(options).then(async (res: any) => {
-        // this.cancelTimeout()
-        if (res.data) {
-          if (onDone) onDone(res.data, false)
-          this.onDone(res.data)
+      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)
         }
+      }).catch((e) => {
         LibProgress.hide()
-      }).catch((r: string) => {
-        // this.cancelTimeout()
-        this.onFetchFailed(r)
-        LibProgress.hide()
-        this.onError(r)
+        // 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)
       })
     }
   }
@@ -352,11 +375,10 @@ export default class ecurl {
     if (!upload)
       this.header["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8"
     var options: any = {
-      url: this.url + this.uri,
+      signal: this.signal,
       method: !this.post ? "GET" : "POST",
       headers: this.header,
-      data: !this.post ? undefined : this.post,
-      cancelToken: this.abort.token,
+      body: this.post,
       cache: "no-store",
       Pragma: "no-cache",
       ["Cache-Control"]: 'no-cache, no-store, must-revalidate',
@@ -364,22 +386,46 @@ export default class ecurl {
       mode: "cors",
       _post: post
     }
-    // if (debug == 1) {
-    // console.log(this.url + this.uri, { ...options, cancelToken: undefined })
-    // }
 
-    if (esp.isDebug('apitest') && manifest?.packagerOpts?.dev && LogStateProperty) {
+
+    if (manifest?.packagerOpts?.dev && LogStateProperty) {
       const allData = LogStateProperty.state().get() || []
       const logEnable = LogStateProperty.enableLog().get()
-
-      const complete_uri = this.uri;
+      let uriOrigin = this.uri
+      if (this.uri == '' && this.url != '') {
+        uriOrigin = this.url.replace(/(https?:\/\/)/g, '')
+        let uriArray = uriOrigin.split('/')
+        let domain = uriArray[0]
+        if (!domain.startsWith('api.')) {
+          uriOrigin = ''
+        } else {
+          let uri = uriArray.slice(1, uriArray.length - 1).join('/')
+          let get = uriArray[uriArray.length - 1];
+          let newGet = '';
+          if (get && get.includes('?')) {
+            let rebuildGet = get.split('?')
+            for (let i = 0; i < rebuildGet.length; i++) {
+              const element = rebuildGet[i];
+              if (!element.includes('=')) {
+                newGet += '?id=' + element
+              } else {
+                newGet += (newGet.includes('?') ? '&' : '?') + element
+              }
+            }
+          } else {
+            newGet = get;
+          }
+          uriOrigin = uri + newGet
+        }
+      }
+      const complete_uri = uriOrigin
       const _uri = complete_uri.includes('?') ? complete_uri.split('?')[0] : complete_uri
       const _get = complete_uri.includes('?') ? complete_uri.split('?')[1].split('&').map((x: any) => x.split('=')).map((t: any) => {
         return ({ [t[0]]: [t[1]] })
       }) : []
       const get = Object.assign({}, ..._get)
       const _post = post && Object.keys(post).map((key) => {
-        return ({ [key]: [post[key]] })
+        return ({ [key]: [decodeURI(post[key])] })
       }) || []
       const postNew = Object.assign({}, ..._post)
 
@@ -387,28 +433,58 @@ export default class ecurl {
         const data = {
           [_uri]: {
             secure: this.isSecure,
+            time: moment().format('YYYY-MM-DD HH:mm:ss'),
             get: get,
-            post: postNew
+            post: postNew,
           }
         }
-        let dt = LibObject.push(allData, data)()
+        let dt = LibObject.unshift(allData, data)()
         if (logEnable) {
           LogStateProperty.state().set(dt)
         }
       }
     }
 
-    this.fetchConf = { url: this.url + this.uri, options: options }
     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)
+    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()
     })
+    // }
   }
 
+
+
   protected 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") {
@@ -451,9 +527,9 @@ export default class ecurl {
   private onError(msg: string): void {
     esp.log("\x1b[31m", msg)
     esp.log("\x1b[0m")
-    if (esp.isDebug('') && msg == '') {
-      return
-    }
+    // if (esp.isDebug('') && msg == '') {
+    //   return
+    // }
     delete this.fetchConf.options.cancelToken
     reportApiError(this.fetchConf.options, msg)
     LibProgress.hide()

package/modules/lib/image.tsx

@@ -7,7 +7,7 @@ import { SaveFormat } from 'expo-image-manipulator';
 import * as ImagePicker from 'expo-image-picker';
 import React from 'react';
 import {
-    ActivityIndicator, Alert, Image, TouchableOpacity, View
+  ActivityIndicator, Alert, Image, TouchableOpacity, View
 } from 'react-native';
 const { height, width } = LibStyle;
 

package/modules/user/class.ts

@@ -29,7 +29,7 @@ export default class eclass {
     return new Promise((r, j) => {
       AsyncStorage.getItem("user").then((user: string) => {
         if (user) {
-          const usr = user[0] == '{' && user[user.length - 1] == '}' ? JSON.parse(user) : JSON.parse(new LibCrypt().decode(user))
+          const usr = (user[0] == '{' && user[user.length - 1] == '}') ? JSON.parse(user) : JSON.parse(new LibCrypt().decode(user))
           if (usr) {
             r(usr);
             state.set(usr)

package/modules/user/index.tsx

@@ -4,7 +4,7 @@
 import { esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, UserClass, UserLoading, UserMain, UserRoutes, useSafeState, _global } from 'esoftplay';
 import * as Font from "expo-font";
 import React, { useEffect, useMemo } from "react";
-import { Alert, View } from "react-native";
+import { View } from "react-native";
 import Navs from "../../cache/navs";
 
 
@@ -46,14 +46,9 @@ export default function m(props: UserIndexProps): any {
   }
 
   useMemo(() => {
-    const timeout = setTimeout(() => {
-      Alert.alert("Yey...! Pembaharuan sudah selesai", "Silahkan mulai ulang aplikasi kamu", [
-        {
-          onPress: () => LibUpdaterProperty.install(),
-          text: "Mulai Ulang Sekarang"
-        }
-      ], { cancelable: false })
-    }, 30 * 1000);
+    // const timeout = setTimeout(() => {
+    //   setLoading(false)
+    // }, 15 * 1000);
     if (esp.config('firebase').hasOwnProperty('apiKey')) {
       try {
         const chatFirebase = require('../chatting/firebase')?.default
@@ -65,14 +60,9 @@ export default function m(props: UserIndexProps): any {
     }
     UserClass.isLogin(async () => {
       await setFonts()
-      LibUpdaterProperty.check((isNew) => {
-        if (isNew) {
-          LibUpdaterProperty.install()
-        } else {
-          clearTimeout(timeout)
-          setLoading(false)
-        }
-      })
+      LibUpdaterProperty.check((isNew) => { })
+      // clearTimeout(timeout)
+      setLoading(false)
     })
   }, [])
 

package/modules/user/login.tsx

@@ -6,7 +6,6 @@ import {
 import { StatusBar } from 'expo-status-bar';
 import React from "react";
 import { Image, KeyboardAvoidingView, Pressable, ScrollView, Text, TextInput, TouchableOpacity, View } from "react-native";
-const config = esp.config();
 
 
 
@@ -31,7 +30,7 @@ export interface UserLoginState {
   isLoading: boolean
 }
 
-export default class m extends LibComponent<UserLoginProps, UserLoginState> {
+export default class euserLogin extends LibComponent<UserLoginProps, UserLoginState> {
 
   inputUsername: any;
   inputPassword: any;

package/modules/user/notification.tsx

@@ -1,9 +1,9 @@
 //
 
 import {
-    esp, LibComponent, LibCrypt,
-    LibCurl, LibIcon, LibList, LibNotification, LibObject, LibStatusbar, LibStyle, LibUtils, useGlobalReturn, useGlobalState,
-    UserClass, UserNotification_item
+  esp, LibComponent, LibCrypt,
+  LibCurl, LibIcon, LibList, LibNotification, LibObject, LibStatusbar, LibStyle, LibUtils, useGlobalReturn, useGlobalState,
+  UserClass, UserNotification_item
 } from "esoftplay";
 import * as Notifications from 'expo-notifications';
 import React from "react";

package/package.json

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