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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.319",
+  "version": "1.0.320",
   "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

@@ -558,9 +558,23 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       }
     };
 
+    // A COUNT must span the WHOLE result set, not the current page. `opt` carries
+    // the page limit/skip, so counting body.docs.length under them could never
+    // exceed one page. Ask for ids only (unless count_data's index-grouping
+    // branch needs the field data) and cap the scan so a pathological table
+    // cannot stall the request.
+    const COUNT_SCAN_CAP = 100000;
+    const find_opt = e.count
+      ? Object.assign({}, opt, {
+          limit: COUNT_SCAN_CAP,
+          skip: 0,
+          fields: e.indexId ? opt.fields : ['_id'],
+        })
+      : opt;
+
     try {
       try {
-        const doc = await db.find(opt);
+        const doc = await db.find(find_opt);
         if (doc?.warning?.includes('No matching index found')) {
           await create_mango_index_for_selector();
         }
@@ -591,7 +605,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           try {
             const result = await db.createIndex(mango_index_obj);
 
-            const doc = await db.find(opt);
+            const doc = await db.find(find_opt);
             return await done(doc);
           } catch (err) {
             return { code: -1, data: err.message };
@@ -719,7 +733,31 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     return await runtime_get_query_data();
   }
 
-  if (e.count && !e.filter_from) {
+  // A COUNT must answer "how many rows match THIS query", not "how many rows are
+  // in the table". count_tables() reads the db_table_counts reduce view keyed by
+  // table_id alone, so it ignores the selector completely — and `filter_from` is
+  // only ever set for dataSourceFilterModelType==='index', so every MONGO-filtered
+  // count landed here and came back with the whole-table total. Live symptom: a
+  // filtered question list returned its correct rows while rows_found stayed 837,
+  // so the pager kept offering 168 pages over an empty/short result set.
+  // Keep the cheap view for a genuinely UNFILTERED count; anything carrying a
+  // selector is counted through Mango against that same selector.
+  const _has_filter_value = function (v) {
+    if (v === undefined || v === null || v === '') return false;
+    try {
+      const o = typeof v === 'string' ? JSON.parse(v) : v;
+      return !_.isEmpty(o);
+    } catch (err) {
+      return true; // present but unparseable — assume it filters; never over-count
+    }
+  };
+  const _count_is_filtered =
+    !!e.filter_from ||
+    _has_filter_value(e.filterModelMongo) ||
+    _has_filter_value(e.filterModelUserMongo) ||
+    _has_filter_value(e.filterModelNative);
+
+  if (e.count && !_count_is_filtered) {
     return await count_tables();
   }
 

package/studio.mjs

@@ -180,6 +180,20 @@ const get_cast_val = async function (source, attributeP, typeP, valP) {
   return xu_cast(typeP, valP, success, fail);
 };
 
+const get_json_value = function (value, fallback) {
+  if (typeof value === 'undefined' || value === null || value === '') {
+    return fallback;
+  }
+  if (typeof value === 'string') {
+    try {
+      return JSON.parse(value);
+    } catch (err) {
+      return fallback;
+    }
+  }
+  return value;
+};
+
 const get_opt = function (e, table_obj) {
   var limit = 99999;
   var skip = 0;
@@ -244,9 +258,9 @@ const get_opt = function (e, table_obj) {
     opt.sort = sort;
   }
 
-  let _sortModel = e?.sortModel || [];
-  if (typeof _sortModel === 'string') {
-    _sortModel = JSON.parse(e.sortModel);
+  let _sortModel = get_json_value(e?.sortModel, []);
+  if (!Array.isArray(_sortModel)) {
+    _sortModel = [];
   }
 
   if (_sortModel.length) {
@@ -288,7 +302,7 @@ const get_opt = function (e, table_obj) {
     opt.fields[key] = 'udfData.data.' + val;
   }
 
-  if (!e?.sortModel || !JSON.parse(e.sortModel).length) {
+  if (!e?.sortModel || !_sortModel.length) {
     // added 2021 09 10
     if (opt.sort) {
       for (const [key, val] of Object.entries(opt.sort)) {
@@ -372,14 +386,16 @@ const get_opt = function (e, table_obj) {
     return recursiveReplace(query);
   }
 
-  if (e.dataSourceFilterModelType === 'query' && e.filterModelMongo) {
-    selector_new['$and'] = [replaceRegexOptions(replaceKeysInQuery(JSON.parse(e.filterModelMongo)))];
+  const filterModelMongo = get_json_value(e.filterModelMongo, {});
+  if (e.dataSourceFilterModelType === 'query' && !_.isEmpty(filterModelMongo)) {
+    selector_new['$and'] = [replaceRegexOptions(replaceKeysInQuery(filterModelMongo))];
   }
-  if (e.filterModelUserMongo) {
+  const filterModelUserMongo = get_json_value(e.filterModelUserMongo, {});
+  if (!_.isEmpty(filterModelUserMongo)) {
     if (!selector_new['$and']) {
       selector_new['$and'] = [];
     }
-    selector_new['$and'].push(replaceRegexOptions(replaceKeysInQuery(JSON.parse(e.filterModelUserMongo))));
+    selector_new['$and'].push(replaceRegexOptions(replaceKeysInQuery(filterModelUserMongo)));
   }
 
   if (e.dataSourceFilterModelType === 'index') {