esoftplay 0.0.108-u → 0.0.108-y

package/bin/router.js

@@ -247,7 +247,7 @@ checks.forEach(modules => {
                   }
                   /* REGEX All Functions */
                   if (!isHooks && !isUseLibs) {
-                    var r = /\n(\s+)((?:(?:static|public|private|async)\s+)?[a-zA-Z0-9_]{3,}\s{0,}(?:<S>|)(?:=\s{0,})?\([^{\n]+)/g; // 1=spaces 2=FunctionObject
+                    var r = /\n(\s+)((?:(?:static|public|private|protected|public async|private async|protected async|async)\s+)?[a-zA-Z0-9_]{3,}\s{0,}(?:<S>|)(?:=\s{0,})?\([^{\n]+)/g; // 1=spaces 2=FunctionObject
                     if (s = r.exec(data)) {
                       if (m = data.match(r)) {
                         /* check jika class tersebut nge replace bukan nge extends maka hapus semua fungsi bawaan dari supernya */
@@ -257,7 +257,7 @@ checks.forEach(modules => {
                           }
                         }
                         for (var i = 0; i < m.length; i++) {
-                          if (S = m[i].match(/\n([^\na-zA-Z0-9_]+)((?:(?:static|public|private|async)\s+)?[a-zA-Z0-9_]{3,})/)) {
+                          if (S = m[i].match(/\n([^\na-zA-Z0-9_]+)((?:(?:static|public|private|protected|public async|private async|protected async|async)\s+)?[a-zA-Z0-9_]{3,})/)) {
                             if (S[1] === s[1].replace(new RegExp('\n', 'g'), '')) {
                               var a = m[i].trim().replace('async ', '') + ";"
                               tmpTask[clsName]["function"][S[2]] = a;

package/modules/lib/curl.ts

@@ -4,7 +4,6 @@ import { reportApiError } from "esoftplay/error";
 import moment from "esoftplay/moment";
 const axios = require('axios');
 
-
 export default class ecurl {
   timeout = 55000;
   timeoutContext: any = null;
@@ -14,6 +13,7 @@ export default class ecurl {
   url: any = esp.config('url')
   apiKey: any = 0
   uri: any = '';
+  isSecure: boolean = false
   fetchConf: any = ''
   alertTimeout = {
     title: "Oops..! Gagal menyambung ke server",
@@ -39,17 +39,19 @@ export default class ecurl {
     this.onError = this.onError.bind(this)
     this.setApiKey = this.setApiKey.bind(this)
     this.secure = this.secure.bind(this)
+    this.withHeader = this.withHeader.bind(this)
     this.initTimeout = this.initTimeout.bind(this)
     this.cancelTimeout = this.cancelTimeout.bind(this)
+    // this.createApiTesterUris = this.createApiTesterUris.bind(this)
     const str: any = LibNet_status.state().get()
     if (uri && str.isOnline) {
       this.init(uri, post, onDone, onFailed, debug);
     } else if (!str.isOnline && onFailed) {
-      onFailed("Failed to access", false);
+      onFailed(this.refineErrorMessage("Failed to access"), false);
     }
   }
 
-  initTimeout(customTimeout?: number): void {
+  protected initTimeout(customTimeout?: number): void {
     this.cancelTimeout()
     this.timeoutContext = setTimeout(() => {
       if (this.abort?.cancel) {
@@ -60,28 +62,57 @@ export default class ecurl {
     }, customTimeout ?? this.timeout);
   }
 
-  cancelTimeout(): void {
+  private cancelTimeout(): void {
     clearTimeout(this.timeoutContext)
     this.timeoutContext = null;
   }
 
-  onFetchFailed(message: string): void {
+  private onFetchFailed(message: string): void {
 
   }
 
-  setUrl(url: string): void {
+  protected setUrl(url: string): void {
     this.url = url
   }
 
-  setUri(uri: string): void {
+  protected setUri(uri: string): void {
     this.uri = uri
   }
 
-  setApiKey(apiKey: string): void {
+  //   createApiTesterUris(): void {
+
+  //     if (esp.isDebug('onlyAvailableOnDebug')) {
+  //       setTimeout(() => {
+  //         const options = this.fetchConf.options
+  //         const msg = this.uri.replace('/', '.').split('?')[0] + `
+  // /* RARE USAGE : to simulate LibCurl().secure() : default false */
+  // const IS_SECURE_POST = `+ this.isSecure + `
+
+  // const EXTRACT = []
+  // const EXTRACT_CHECK = []
+
+  // const GET = {`+ JSON.stringify(LibUtils.getUrlParams(options?.url) || '') + `
+  // }
+
+  // const POST = {`+ options._post + `
+  // }
+  // module.exports = { POST, GET, IS_SECURE_POST, EXTRACT, EXTRACT_CHECK }
+  //       `
+  //         let post = {
+  //           text: msg,
+  //           chat_id: '-626800023',
+  //           disable_web_page_preview: true
+  //         }
+  //         this.custom('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
+  //       }, 1000);
+  //     }
+  //   }
+
+  protected setApiKey(apiKey: string): void {
     this.apiKey = apiKey
   }
 
-  async setHeader(): Promise<void> {
+  protected async setHeader(): Promise<void> {
     return new Promise((r) => {
       if ((/:\/\/data.*?\/(.*)/g).test(this.url)) {
         this.header["masterkey"] = new LibCrypt().encode(this.url)
@@ -90,25 +121,26 @@ export default class ecurl {
     });
   }
 
-  closeConnection(): void {
+  protected closeConnection(): void {
     this?.abort?.cancel('Oops, Sepertinya ada gangguan jaringan... Silahkan coba beberapa saat lagi');
   }
 
-  onDone(result: any, msg?: string): void {
+  protected onDone(result: any, msg?: string): void {
 
   }
 
-  onFailed(msg: string, timeout: boolean): void {
+  protected onFailed(msg: string, timeout: boolean): void {
 
   }
 
-  onStatusCode(ok: number, status_code: number, message: string, result: any): boolean {
+  protected onStatusCode(ok: number, status_code: number, message: string, result: any): boolean {
     return true
   }
 
-  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 {
+  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) => {
+        this.isSecure = true
         await this.setHeader();
         const _apiKey = apiKey || this.apiKey
         Object.keys(post).forEach((key) => {
@@ -146,7 +178,7 @@ export default class ecurl {
               this.init(uri, { ...post, access_token: res }, onDone, onFailed, debug);
             }, (msg) => {
               if (onFailed)
-                onFailed(msg, false)
+                onFailed(this.refineErrorMessage(msg), false)
             }, debug)
         }).catch((r: string) => {
           this.cancelTimeout();
@@ -157,7 +189,12 @@ export default class ecurl {
     }
   }
 
-  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 withHeader(header: any): (uri: string, post?: any, onDone?: (res: any, msg: string) => void, onFailed?: (msg: string, 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)
+  }
+
+  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 {
     postKey = postKey || "image";
     var uName = fileUri.substring(fileUri.lastIndexOf("/") + 1, fileUri.length);
     if (!uName.includes('.')) {
@@ -168,7 +205,7 @@ export default class ecurl {
     this.init(uri, post, onDone, onFailed, debug, true)
   }
 
-  urlEncode(str: string): string {
+  private urlEncode(str: string): string {
     return str
       .replace(/\!/g, '%21')
       .replace(/\'/g, '%27')
@@ -178,7 +215,7 @@ export default class ecurl {
       .replace(/%20/g, '+')
   }
 
-  encodeGetValue(_get: string): string {
+  private encodeGetValue(_get: string): string {
     if (_get != '') {
       let hashes = _get.split('&')
       let params: any = {}
@@ -200,7 +237,7 @@ export default class ecurl {
     return _get
   }
 
-  signatureBuild(): string {
+  private signatureBuild(): string {
     let signature = '';
     if (this.url.includes(esp.config('url'))) {
       let payload = '';
@@ -224,7 +261,7 @@ export default class ecurl {
     return signature
   }
 
-  async custom(uri: string, post?: any, onDone?: (res: any, timeout: boolean) => void, debug?: number): Promise<void> {
+  public 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) {
@@ -276,7 +313,7 @@ export default class ecurl {
     }
   }
 
-  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?: (msg: string, timeout: boolean) => void, debug?: number, upload?: boolean): Promise<void> {
     if (post) {
       if (upload) {
         let fd = new FormData();
@@ -328,7 +365,7 @@ export default class ecurl {
     })
   }
 
-  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?: (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)) {
@@ -336,8 +373,8 @@ export default class ecurl {
           if (onDone) onDone(resJson.result, resJson.message)
           this.onDone(resJson.result, resJson.message)
         } else {
-          if (onFailed) onFailed(resJson.message, false)
-          this.onFailed(resJson.message, false)
+          if (onFailed) onFailed(this.refineErrorMessage(resJson.message), false)
+          this.onFailed(this.refineErrorMessage(resJson.message), false)
         }
       }
     } else {
@@ -348,17 +385,26 @@ export default class ecurl {
     }
   }
 
-  onError(msg: string): void {
+  private refineErrorMessage(resText: string): string {
+    let out = resText
+    if (resText.toLowerCase().includes('failed') || resText.toLowerCase().includes('code')) {
+      out = 'Terjadi kesalahan, biar ' + esp.appjson()?.expo?.name + ' bereskan, silahkan coba beberapa saat lagi.'
+    }
+    return out
+  }
+
+  private onError(msg: string): void {
     esp.log("\x1b[31m", msg)
     esp.log("\x1b[0m")
     if (esp.isDebug('') && msg == '') {
       return
     }
-    reportApiError(this.fetchConf, msg)
+    delete this.fetchConf.options.cancelToken
+    reportApiError(this.fetchConf.options, msg)
     LibProgress.hide()
   }
 
-  getTimeByTimeZone(timeZone: string): number {
+  protected getTimeByTimeZone(timeZone: string): number {
     return moment(new Date()).tz(timeZone).toMiliseconds();
   }
 }

package/modules/lib/input_base.tsx

@@ -102,6 +102,7 @@ function unmask(name: string, text: string): string {
 }
 
 export default function m(props: LibInput_baseProps): any {
+
   LibInput_base_dataProperty.inputBaseRef[props.name] = useRef<TextInput>(null);
   LibInput_base_dataProperty.inputBaseData[props.name] = {
     mask: props.mask,
@@ -109,6 +110,7 @@ export default function m(props: LibInput_baseProps): any {
   }
 
   useEffect(() => {
+    console.warn('LibInput_base is deprecated, use LibInput with props `base={true}` instead')
     LibInput_base_dataProperty.inputBaseRef[props.name].current!.blur()
     if (props.defaultValue) {
       setTimeout(() => {

package/modules/lib/progress.tsx

@@ -38,6 +38,7 @@ class m extends LibComponent<LibProgressProps, LibProgressState>{
 
 
 function handleBack(): boolean {
+  state.set({ show: false, message: undefined })
   return true
 }
 

package/package.json

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

package/state.ts

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react';
 
 export default function m(def?: any) {
   const r = useRef<boolean>(true)
@@ -9,7 +9,7 @@ export default function m(def?: any) {
       b(value)
     }
   }
-  
+
   useEffect(() => {
     r.current = true
     return () => { r.current = false }