@xuda.io/xuda-worker-bundle-min 1.3.352 → 1.3.354

package/index.js

@@ -266,7 +266,7 @@ func.common.db = async function (
 
     data.req_id = new Date().valueOf();
 
-    const perform_rpi_request = function (serviceP) {
+    const perform_rpi_request = async function (serviceP) {
       var url = func.common.get_url(SESSION_ID, "rpi", "");
 
       if (
@@ -278,29 +278,45 @@ func.common.db = async function (
 
       url += serviceP;
 
-      fetch(url, {
-        method: opt.type ? opt.type : "POST",
-        headers: {
-          Accept: "application/json",
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify(data),
-      })
-        .then((response) => {
-          if (!response.ok) {
-            return response.text().then((text) => {
-              throw new Error(text);
-            });
-          }
-          return response.json();
-        })
-        .then((json) => {
-          success_callback(json, true);
-        })
-        .catch((err) => {
-          error_callback(err);
-          console.error(err);
+      try {
+        const response = await fetch(url, {
+          method: opt.type ? opt.type : "POST",
+          headers: {
+            Accept: "application/json",
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(data),
         });
+        if (!response.ok) throw "";
+        const json = await response.json();
+        return json.data;
+      } catch (err) {
+        console.error(err);
+      }
+
+      // fetch(url, {
+      //   method: opt.type ? opt.type : "POST",
+      //   headers: {
+      //     Accept: "application/json",
+      //     "Content-Type": "application/json",
+      //   },
+      //   body: JSON.stringify(data),
+      // })
+      //   .then((response) => {
+      //     if (!response.ok) {
+      //       return response.text().then((text) => {
+      //         throw new Error(text);
+      //       });
+      //     }
+      //     return response.json();
+      //   })
+      //   .then((json) => {
+      //     success_callback(json, true);
+      //   })
+      //   .catch((err) => {
+      //     error_callback(err);
+      //     console.error(err);
+      //   });
     };
 
     // const perform_rpi_request_from_studio = async function (serviceP) {
@@ -348,8 +364,32 @@ func.common.db = async function (
     // };
 
     const perform_rpi_request_from_pouch = async function (serviceP) {
-      const ret = await func.db[serviceP](SESSION_ID, dataP);
-      return ret;
+      const db = await func.utils.connect_pouchdb(SESSION_ID);
+      const rep_id = JSON.stringify(dataP);
+      var ret;
+      try {
+        const doc = await db.get(rep_id);
+        if (doc.stat < 3) throw "replication not ready";
+        const json = await func.db.pouch[serviceP](SESSION_ID, dataP);
+        return success_callback(json, true);
+      } catch (err) {
+        try {
+          const json = await perform_rpi_request(serviceP);
+
+          try {
+            await db.put({
+              _id: rep_id,
+              selector: json.opt.selector,
+              stat: 1,
+              ts: Date.now(),
+            });
+          } catch (err) {}
+
+          return success_callback(json, true);
+        } catch (err) {
+          return error_callback(err);
+        }
+      }
     };
 
     if (
@@ -369,7 +409,13 @@ func.common.db = async function (
         };
         return success_callback(ret);
       }
-      return perform_rpi_request(serviceP);
+      try {
+        const json = await perform_rpi_request(serviceP);
+        return success_callback(json, true);
+      } catch (err) {
+        return error_callback(err);
+      }
+      // return perform_rpi_request(serviceP);
     }
 
     // if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle-min",
-  "version": "1.3.352",
+  "version": "1.3.354",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {