merge develop'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainize-team/ainize-js",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "main": "dist/ainize.js",
   "types": "dist/ainize.d.ts",
   "scripts": {

src/constants.ts

@@ -62,7 +62,7 @@ export const defaultAppRules = (appName: string): { [type: string]: { ref: strin
           write: 
             "auth.addr === $userAddress && " +
             "(getValue(`/apps/" + `${appName}` + "/billingConfig/minCost`) === 0 || " +
-            "(getValue(`/apps/" + `${appName}` + "/balance/` + $userAddress + `/balance`)  >= getValue(`/apps/" + `${appName}` + "/billingConfig/minCost`))"
+            "(getValue(`/apps/" + `${appName}` + "/balance/` + $userAddress + `/balance`)  >= getValue(`/apps/" + `${appName}` + "/billingConfig/minCost`)))"
         },
       },
     },

src/controllers/serviceController.ts

@@ -77,20 +77,24 @@ export default class ServiceController {
     return await this.ain.getValue(creditHistoryPath) as creditHistories;
   }
 
-  async request(serviceName: string, requestData: any) : Promise<any> {
-    await this.checkRunning(serviceName);
+  async request(serviceName: string, requestData: any, requestKey?: string) : Promise<any> {
+    this.checkRunning(serviceName);
     const result = await new Promise(async (resolve, reject) => {
-      const requestKey = Date.now();
-      const requesterAddress = this.ain.getAddress();
-      const responsePath = Path.app(serviceName).response(requesterAddress, requestKey.toString());
-      await this.handler.subscribe(responsePath, resolve);
-      const requestPath = Path.app(serviceName).request(requesterAddress, requestKey);
-      const requestOp = buildSetOperation("SET_VALUE", requestPath, requestData);
-      const txBody = buildTxBody(requestOp);
-      await this.ain.sendTransaction(txBody);
-      return requestKey;
+      requestKey = requestKey || Date.now().toString();
+      try {
+        const requesterAddress = this.ain.getAddress();
+        const responsePath = Path.app(serviceName).response(requesterAddress, requestKey.toString());
+        await this.handler.subscribe(responsePath, resolve);
+        const requestPath = Path.app(serviceName).request(requesterAddress, requestKey);
+        const requestOp = buildSetOperation("SET_VALUE", requestPath, requestData);
+        const txBody = buildTxBody(requestOp);
+        await this.ain.sendTransaction(txBody);
+      } catch (e: any) {
+        if (e instanceof Error)
+          return reject(new Error(e.message));
+      }
     });
-    return result as string;
+    return result;
   }
 
   async run(serviceName: string): Promise<void> {

src/service.ts

@@ -79,9 +79,9 @@ export default class Service {
    * @param {string} requestData String data for request to service. 
    * @returns {string} Response data from service.
    */
-  async request(requestData: any) {
+  async request(requestData: any, requestKey?: string) {
     this.isLoggedIn();
-    return await this.serviceController.request(this.serviceName, requestData);
+    return await this.serviceController.request(this.serviceName, requestData, requestKey);
   }
 
   /**