esoftplay 0.0.129-e → 0.0.129-g

package/modules/lib/curl.ts

@@ -10,7 +10,7 @@ import { reportApiError } from "esoftplay/error";
 import esp from 'esoftplay/esp';
 import Constants from 'expo-constants';
 
-//api_logger_import
+import { LogStateProperty } from 'esoftplay/cache/log/state/import';
 
 
 const { manifest } = Constants;
@@ -127,6 +127,22 @@ export default class m {
     return true
   }
 
+  private objectToURLParams(obj: any, parentKey = ''): string[] {
+    let urlParams: string[] = [];
+
+    for (const key in obj) {
+      if (typeof obj[key] === 'object') {
+        const newKey = parentKey ? `${parentKey}[${key}]` : key;
+        urlParams.push(...this.objectToURLParams(obj[key], newKey));
+      } else {
+        const paramKey = parentKey ? `${parentKey}[${key}]` : key;
+        const paramValue = encodeURIComponent(obj[key]);
+        urlParams.push(`${paramKey}=${paramValue}`);
+      }
+    }
+    return urlParams;
+  }
+
   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) => {
@@ -146,7 +162,7 @@ export default class m {
           _post.api_key = _apiKey
           post.api_key = _apiKey
         }
-        let ps = Object.keys(_post).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(_post[key])).join('&');
+        let ps = this.objectToURLParams(_post).join('&')
         var options: any = {
           method: "POST",
           signal: this.signal,
@@ -258,9 +274,7 @@ export default class m {
     const str: any = LibNet_status.state().get()
     if (str.isOnline) {
       if (post) {
-        let ps = Object.keys(post).map((key) => {
-          return encodeURIComponent(key) + '=' + encodeURIComponent(post[key]);
-        }).join('&');
+        let ps = this.objectToURLParams(post).join('&')
         this.post = ps
       }
       this.setUri(uri)
@@ -302,7 +316,10 @@ export default class m {
           LibProgress.hide()
           this.onError(resText)
         }
-        //api_logger
+        if (LogStateProperty) {
+        var resJson = typeof resText == 'string' && ((resText.startsWith("{") && resText.endsWith("}")) || (resText.startsWith("[") && resText.endsWith("]"))) ? JSON.parse(resText) : resText
+        LogStateProperty.doLogCurl(this.uri, this.url, post, this.isSecure, resJson)
+      }
       }).catch((e) => {
         this.cancelTimeout()
         LibProgress.hide()
@@ -322,9 +339,7 @@ export default class m {
         });
         this.post = fd
       } else {
-        let ps = Object.keys(post).map((key) => {
-          return encodeURIComponent(key) + '=' + encodeURIComponent(post[key]);
-        }).join('&');
+        let ps = this.objectToURLParams(post).join('&')
         this.post = ps
       }
     }
@@ -366,7 +381,10 @@ export default class m {
         if (onFailed) onFailed({ message: esp.lang("lib/curl", "msg_failed") }, false)
         return
       }
-      //api_logger
+      if (LogStateProperty) {
+        var resJson = typeof resText == 'string' && ((resText.startsWith("{") && resText.endsWith("}")) || (resText.startsWith("[") && resText.endsWith("]"))) ? JSON.parse(resText) : resText
+        LogStateProperty.doLogCurl(this.uri, this.url, post, this.isSecure, resJson)
+      }
       this.onFetched(resText, onDone, onFailed, debug)
     }).catch((r) => {
       // if (this.maxRetry > 0) {

package/package.json

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