@xuda.io/xuda-dbs-plugin-xuda 1.0.124 → 1.0.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.124",
+  "version": "1.0.125",
   "description": "Xuda Database Socket for Xuda's proprietary structure powered by CouchDB",
   "scripts": {
     "pub": "npm version patch --force && npm publish --access public"

package/server.js

@@ -1,7 +1,13 @@
 const _ = require("lodash");
 const crypto = require("node:crypto");
 
-const check_unique = async function (e, docP, table_obj, db, app_id_reference) {
+exports.check_unique = async function (
+  e,
+  docP,
+  table_obj,
+  db,
+  app_id_reference
+) {
   var len = docP.udfIndex.length;
   if (!len) {
     return { code: -11, data: "table must have primary index" };
@@ -1306,14 +1312,20 @@ exports.create = async (params, setup_doc, resolve, reject) => {
             error: {},
           },
 
-          ts: new Date().valueOf(),
-          date: new Date().valueOf(),
+          ts: Date.now(),
+          date: Date.now(),
         };
         const index_ret = await get_index_json(doc, table_obj);
         if (index_ret < 0) throw index_ret.data;
         doc.udfIndex = index_ret.data;
 
-        const ret = await check_unique(e, doc, table_obj, db, app_id_reference);
+        const ret = await module.exports.check_unique(
+          e,
+          doc,
+          table_obj,
+          db,
+          app_id_reference
+        );
         if (ret.code < 0) {
           throw ret;
         }
@@ -1341,15 +1353,21 @@ exports.create = async (params, setup_doc, resolve, reject) => {
         error: {},
       },
 
-      ts: new Date().valueOf(),
-      date: new Date().valueOf(),
+      ts: Date.now(),
+      date: Date.now(),
     };
     const index_ret = await get_index_json(doc, table_obj);
     if (index_ret.code < 0) {
       return index_ret;
     }
     doc.udfIndex = index_ret.data;
-    const ret = await check_unique(e, doc, table_obj, db, app_id_reference);
+    const ret = await module.exports.check_unique(
+      e,
+      doc,
+      table_obj,
+      db,
+      app_id_reference
+    );
     if (ret.code < 0) {
       return reject(ret.data);
     }
@@ -1445,7 +1463,13 @@ exports.update = async (params, setup_doc, resolve, reject) => {
       return index_ret;
     }
     doc.udfIndex = index_ret.data;
-    const ret = await check_unique(e, doc, table_obj, db, app_id_reference);
+    const ret = await module.exports.check_unique(
+      e,
+      doc,
+      table_obj,
+      db,
+      app_id_reference
+    );
     if (ret.code < 0) {
       return ret;
     }
@@ -1479,7 +1503,7 @@ exports.delete = async (params, setup_doc, resolve, reject) => {
         });
       } else {
         doc.stat = 4;
-        doc.ts = new Date().valueOf();
+        doc.ts = Date.now();
         docs_to_delete.push(doc);
       }
     }
@@ -1505,7 +1529,7 @@ exports.restore = async (params, setup_doc, resolve, reject) => {
 
     if (doc && doc._id) {
       doc.stat = 3;
-      doc.ts = new Date().valueOf();
+      doc.ts = Date.now();
       docs_to_restore.push(doc);
     }
   }

package/studio.mjs

@@ -1,104 +1,113 @@
 var _this = {};
 
-export const check_unique = async function (e, docP, table_obj, db) {
-  var len = docP.udfIndex.length;
-  if (!len) {
-    return { code: -11, data: "table must have primary index" };
+const check_unique = async function (e, docP, table_obj, db) {
+  if (typeof func !== "undefined") {
+    const SESSION_ID = Object.keys(SESSION_OBJ)[0];
+    const ret = await func.common.perform_rpi_request(SESSION_ID, serviceP);
+    return ret``;
   }
-  var found_unique = undefined;
-  var ret = { code: 1, data: "ok" };
-
-  for await (var val of docP.udfIndex) {
-    if (!table_obj.tableIndexes) {
-      ret = {
-        code: -14,
-        data: "table definition missing for: " + val.fileId,
-      };
-      break;
+
+  const local = async function () {
+    var len = docP.udfIndex.length;
+    if (!len) {
+      return { code: -11, data: "table must have primary index" };
     }
+    var found_unique = undefined;
+    var ret = { code: 1, data: "ok" };
+
+    for await (var val of docP.udfIndex) {
+      if (!table_obj.tableIndexes) {
+        ret = {
+          code: -14,
+          data: "table definition missing for: " + val.fileId,
+        };
+        break;
+      }
 
-    const table_index = find_item_by_key_root(
-      table_obj.tableIndexes,
-      "id",
-      val.indexId
-    );
+      const table_index = find_item_by_key_root(
+        table_obj.tableIndexes,
+        "id",
+        val.indexId
+      );
 
-    if (!table_index) {
-      ret = {
-        code: -13,
-        data: "keys definition missing for Table: " + val.fileId,
-      };
-      break;
-    }
+      if (!table_index) {
+        ret = {
+          code: -13,
+          data: "keys definition missing for Table: " + val.fileId,
+        };
+        break;
+      }
 
-    if (!table_index.data.unique) {
-      continue;
-    }
-    if (!table_index?.data?.keys || _.isEmpty(table_index.data.keys)) {
-      ret = {
-        code: -14,
-        data: "keys definition missing for index: " + val.indexId,
-      };
-      break;
-    }
+      if (!table_index.data.unique) {
+        continue;
+      }
+      if (!table_index?.data?.keys || _.isEmpty(table_index.data.keys)) {
+        ret = {
+          code: -14,
+          data: "keys definition missing for index: " + val.indexId,
+        };
+        break;
+      }
 
-    var keysArr = table_index.data.keys;
-    var keyValue = [];
+      var keysArr = table_index.data.keys;
+      var keyValue = [];
 
-    for await (const [keySegment, valSegment] of Object.entries(keysArr)) {
-      // run on key segment
-      let _fieldType = find_item_by_key(
-        table_obj.tableFields,
-        "field_id",
-        valSegment
-      ).props.fieldType;
-      let _val = await get_cast_val(
-        "check_unique",
-        valSegment,
-        _fieldType,
-        val.keyValue[Number(keySegment)]
-      );
-      keyValue.push(_val);
-    }
+      for await (const [keySegment, valSegment] of Object.entries(keysArr)) {
+        // run on key segment
+        let _fieldType = find_item_by_key(
+          table_obj.tableFields,
+          "field_id",
+          valSegment
+        ).props.fieldType;
+        let _val = await get_cast_val(
+          "check_unique",
+          valSegment,
+          _fieldType,
+          val.keyValue[Number(keySegment)]
+        );
+        keyValue.push(_val);
+      }
 
-    var key =
-      '["' +
-      val.fileId +
-      '","' +
-      val.indexId +
-      '",[' +
-      keyValue.join(",") +
-      "]]";
-    try {
-      e.view = "db_index";
-      const ret = await query_db(e, db, table_obj);
-      const json = ret.data;
-
-      // var data;
-
-      if (json.code > 0) {
-        var data = json.data;
-        if (data?.rows?.length) {
-          for await (var val of data.rows) {
-            if (val.id !== docP._id) {
-              found_unique = true;
+      var key =
+        '["' +
+        val.fileId +
+        '","' +
+        val.indexId +
+        '",[' +
+        keyValue.join(",") +
+        "]]";
+      try {
+        e.view = "db_index";
+        const ret = await query_db(e, db, table_obj);
+        const json = ret.data;
+
+        // var data;
+
+        if (json.code > 0) {
+          var data = json.data;
+          if (data?.rows?.length) {
+            for await (var val of data.rows) {
+              if (val.id !== docP._id) {
+                found_unique = true;
+              }
+            }
+            if (found_unique) {
+              throw "error checking unique:" + key;
             }
-          }
-          if (found_unique) {
-            throw "error checking unique:" + key;
           }
         }
+        // throw json.data;
+        return { code: 1, data: "ok" };
+      } catch (msg) {
+        console.error(msg);
+        ret = { code: -22, data: msg };
+        break;
       }
-      // throw json.data;
-      return { code: 1, data: "ok" };
-    } catch (msg) {
-      console.error(msg);
-      ret = { code: -22, data: msg };
-      break;
     }
-  }
 
-  return ret;
+    return ret;
+  };
+  return await local();
 };
 
 const get_index_json = async function (docInP, table_obj) {
@@ -1323,8 +1332,8 @@ export const create = async (params, resolve, reject) => {
         error: {},
       },
 
-      ts: new Date().valueOf(),
-      date: new Date().valueOf(),
+      ts: Date.now(),
+      date: Date.now(),
     };
     const index_ret = await get_index_json(doc, table_obj);
     if (index_ret.code < 0) {
@@ -1461,7 +1470,7 @@ export const del = async (params, resolve, reject) => {
         });
       } else {
         doc.stat = 4;
-        doc.ts = new Date().valueOf();
+        doc.ts = Date.now();
         docs_to_delete.push(doc);
       }
     }
@@ -1485,7 +1494,7 @@ export const restore = async (params, resolve, reject) => {
 
     if (doc && doc._id) {
       doc.stat = 3;
-      doc.ts = new Date().valueOf();
+      doc.ts = Date.now();
       docs_to_restore.push(doc);
     }
   }