@xuda.io/xuda-dbs-plugin-xuda 1.0.318 → 1.0.319

package/package.json

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

package/server.mjs

@@ -515,27 +515,54 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       return raw_data();
     };
 
+    const get_mango_index_fields = function (selector) {
+      const fields = new Set();
+      const add_selector_fields = function (obj) {
+        if (!obj || typeof obj !== 'object' || Array.isArray(obj)) {
+          return;
+        }
+        for (const [key, val] of Object.entries(obj)) {
+          if (['$and', '$or', '$nor'].includes(key)) {
+            if (Array.isArray(val)) {
+              val.forEach(add_selector_fields);
+            }
+            continue;
+          }
+          if (key.startsWith('$')) {
+            continue;
+          }
+          fields.add(key);
+        }
+      };
+      add_selector_fields(selector);
+      return [...fields];
+    };
+
+    const create_mango_index_for_selector = async function () {
+      const index = get_mango_index_fields(opt.selector);
+      if (!index.length) {
+        return;
+      }
+      const index_suffix = index.join('_').replace(/[^a-zA-Z0-9_]+/g, '_').slice(0, 80) || 'selector';
+      const mango_index_obj = {
+        index: {
+          fields: index,
+        },
+        name: `index_${e.table_id}_${index_suffix}`,
+        ddoc: `mango_index_table_${e.table_id}_${index_suffix}`,
+      };
+      try {
+        await db.createIndex(mango_index_obj);
+      } catch (err) {
+        // The read already succeeded; index creation is only an optimization.
+      }
+    };
+
     try {
       try {
         const doc = await db.find(opt);
-        var mango_index_obj;
         if (doc?.warning?.includes('No matching index found')) {
-          const index_name = `index_${e.table_id}_${new Date().valueOf().toString()}`;
-          var index = [];
-
-          for (const [key, val] of Object.entries(opt.selector)) {
-            index.push(key);
-          }
-          mango_index_obj = {
-            index: {
-              fields: index,
-            },
-            name: index_name,
-            ddoc: `mango_index_table_${e.table_id}`,
-          };
-          db.createIndex(mango_index_obj).then((result) => {
-            console.log(result);
-          });
+          await create_mango_index_for_selector();
         }
         return await done(doc);
       } catch (err) {
@@ -544,7 +571,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           const _selector = _.cloneDeep(opt.selector);
           delete _selector['$and'];
           const _sort = _.cloneDeep(opt.sort);
-          mango_index_obj = {
+          const mango_index_obj = {
             index: {
               fields: Object.keys(
                 _.reduce(

package/studio.mjs

@@ -587,44 +587,66 @@ const query_db = async function (e, db, table_obj) {
     };
 
     // xuda
+    const get_mango_index_fields = function (selector) {
+      const fields = new Set();
+      const add_selector_fields = function (obj) {
+        if (!obj || typeof obj !== 'object' || Array.isArray(obj)) {
+          return;
+        }
+        for (const [key, val] of Object.entries(obj)) {
+          if (['$and', '$or', '$nor'].includes(key)) {
+            if (Array.isArray(val)) {
+              val.forEach(add_selector_fields);
+            }
+            continue;
+          }
+          if (key.startsWith('$')) {
+            continue;
+          }
+          fields.add(key);
+        }
+      };
+      add_selector_fields(selector);
+      return [...fields];
+    };
+
+    const create_mango_index_for_selector = async function () {
+      const index = get_mango_index_fields(opt.selector);
+      if (!index.length) {
+        return;
+      }
+      const index_suffix = index.join('_').replace(/[^a-zA-Z0-9_]+/g, '_').slice(0, 80) || 'selector';
+      const mango_index_obj = {
+        index: {
+          fields: index,
+        },
+        name: `index_${e.table_id}_${index_suffix}`,
+        ddoc: `mango_index_table_${e.table_id}_${index_suffix}`,
+      };
+      try {
+        await db.createIndex(mango_index_obj);
+      } catch (err) {
+        // The read already succeeded; index creation is only an optimization.
+      }
+    };
 
     try {
       try {
         // console.log("opt", opt);
 
         const doc = await db.find(opt);
-        var mango_index_obj;
         if (doc?.warning?.includes('No matching index found')) {
-          try {
-            const index_name = `index_${e.table_id}_${new Date().valueOf().toString()}`;
-            var index = [];
-
-            for (const [key, val] of Object.entries(opt.selector)) {
-              index.push(key);
-            }
-            mango_index_obj = {
-              index: {
-                fields: index,
-              },
-              name: index_name,
-              ddoc: `mango_index_table_${e.table_id}`,
-            };
-            const result = await db.createIndex(mango_index_obj);
-            // console.log("createIndex", result);
-            throw new Error('creating index in progress');
-          } catch (err) {
-            return { code: -1, data: err.message };
-          }
+          await create_mango_index_for_selector();
         }
         return await done(doc);
       } catch (err) {
-        if (err.message.includes('Cannot sort on field')) {
+        if (err?.message?.includes('Cannot sort on field')) {
           const index_name = `index_${e.table_id}_${new Date().valueOf().toString()}`;
 
           // const _selector = _.cloneDeep(opt.selector);
           let _sort = _.cloneDeep(opt.sort);
 
-          mango_index_obj = {
+          const mango_index_obj = {
             index: {
               fields: [],
             },
@@ -655,32 +677,17 @@ const query_db = async function (e, db, table_obj) {
 
           try {
             const result = await db.createIndex(mango_index_obj);
-            // const monitor_indexing = async function () {
-            //   return new Promise((resolve, reject) => {
-            //     db.on("indexing", function (event) {
-            //       // called when indexes are updated
-            //       console.log("indexes event", event);
-            //       // resolve();
-            //     });
-            //     setTimeout(() => {
-            //       resolve();
-            //     }, 5000);
-            //   });
-            // };
-            // await monitor_indexing();
-            // throw new Error({ code: -88, data: "creating index" });
-            throw new Error('creating index in progress');
-            // const doc = await db.find(opt);
-            // return await done(doc);
+            const doc = await db.find(opt);
+            return await done(doc);
           } catch (err) {
             return { code: -1, data: err.message };
           }
         } else {
-          return { code: -1, data: err.message };
+          return { code: -1, data: err?.message || err };
         }
       }
     } catch (err) {
-      return { code: -1, data: err.message };
+      return { code: -1, data: err?.message || err };
     }
   };