esoftplay 0.0.112-z → 0.0.113

package/modules/lib/curl.ts

@@ -1,4 +1,4 @@
-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';
@@ -24,7 +24,7 @@ export default class ecurl {
     cancel: "Tutup"
   }
 
-  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);
@@ -49,7 +49,7 @@ 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);
     }
   }
 
@@ -135,7 +135,7 @@ export default class ecurl {
 
   }
 
-  protected onFailed(msg: string, timeout: boolean): void {
+  protected onFailed(error: any, timeout: boolean): void {
 
   }
 
@@ -143,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
@@ -192,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('.')) {
@@ -341,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();
@@ -481,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)) {
@@ -489,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 {

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

@@ -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/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-z",
+  "version": "0.0.113",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",