@xuda.io/account_module 1.2.1503 → 1.2.1505

package/index.mjs

@@ -3053,48 +3053,100 @@ export const save_picture_cache = async function (uid, docType, name, file, meta
   return save_ret;
 };
 
-export const get_picture_cache = async function (uid, docType, name) {
-  let opt = { selector: { docType, name }, limit: 1 };
+// export const get_picture_cache = async function (uid, docType, name) {
+//   let opt = { selector: { docType, name }, limit: 1 };
 
-  const ret = await db_module.find_couch_query('xuda_cache', opt);
+//   const ret = await db_module.find_couch_query('xuda_cache', opt);
 
-  if (ret.docs.length) {
-    return ret.docs[0].file;
-  }
+//   if (ret.docs.length) {
+//     return ret.docs[0].file;
+//   }
 
-  function findAnyThreeWords(str) {
-    // 1. Extract all words (letters + digits + underscore)
-    const words = str.match(/\b\w+\b/g) || [];
+//   function findAnyThreeWords(str) {
+//     // 1. Extract all words (letters + digits + underscore)
+//     const words = str.match(/\b\w+\b/g) || [];
 
-    // 2. If less than 3 words → no match
-    if (words.length < 3) return [];
+//     // 2. If less than 3 words → no match
+//     if (words.length < 3) return [];
 
-    // 3. Generate all possible combinations of 3 different words
-    const result = [];
+//     // 3. Generate all possible combinations of 3 different words
+//     const result = [];
 
-    for (let i = 0; i < words.length - 2; i++) {
-      for (let j = i + 1; j < words.length - 1; j++) {
-        for (let k = j + 1; k < words.length; k++) {
-          result.push([words[i], words[j], words[k]]);
-        }
+//     for (let i = 0; i < words.length - 2; i++) {
+//       for (let j = i + 1; j < words.length - 1; j++) {
+//         for (let k = j + 1; k < words.length; k++) {
+//           result.push([words[i], words[j], words[k]]);
+//         }
+//       }
+//     }
+
+//     // Optional: format as strings in any order you like
+//     return result.map((arr) => arr.join(' '));
+//   }
+//   if (name.split(' ').length < 3) return;
+//   let file;
+//   const words_combinations_arr = findAnyThreeWords(name);
+
+//   for await (const phrase of words_combinations_arr) {
+//     const words_arr = phrase.split(' ');
+//     opt.selector = { docType, $and: [{ name: { $regex: `(?i)\\b${words_arr[0]}\\b` } }, { name: { $regex: `(?i)\\b${words_arr[1]}\\b` } }, { name: { $regex: `(?i)\\b${words_arr[2]}\\b` } }] };
+//     const ret = await db_module.find_couch_query('xuda_cache', opt);
+//     if (ret.docs.length) {
+//       file = ret.docs[0].file;
+//       break;
+//     }
+//   }
+//   return file;
+// };
+
+export const get_picture_cache = async function (uid, docType, name) {
+  if (!name || typeof name !== 'string') return null;
+
+  const words = name
+    .trim()
+    .toLowerCase()
+    .split(/\s+/)
+    .filter((w) => w.length > 1); // ignore very short words
+
+  if (words.length < 3) {
+    // Direct exact match for short names
+    const ret = await db_module.find_couch_query('xuda_cache', {
+      selector: { docType, name: name.trim() },
+      limit: 1,
+    });
+
+    return ret.docs[0]?.file ?? null;
+  }
+
+  // Try combinations of 3 words — but **limit** the number of attempts
+  const MAX_ATTEMPTS = 15; // prevent explosion on long names
+  const combinations = [];
+
+  for (let i = 0; i < words.length - 2 && combinations.length < MAX_ATTEMPTS; i++) {
+    for (let j = i + 1; j < words.length - 1 && combinations.length < MAX_ATTEMPTS; j++) {
+      for (let k = j + 1; k < words.length && combinations.length < MAX_ATTEMPTS; k++) {
+        combinations.push([words[i], words[j], words[k]]);
       }
     }
-
-    // Optional: format as strings in any order you like
-    return result.map((arr) => arr.join(' '));
   }
-  if (name.split(' ').length < 3) return;
-  let file;
-  const words_combinations_arr = findAnyThreeWords(name);
-  debugger;
-  for await (const phrase of words_combinations_arr) {
-    const words_arr = phrase.split(' ');
-    opt.selector = { docType, $and: [{ name: { $regex: `(?i)\\b${words_arr[0]}}\\b` } }, { name: { $regex: `(?i)\\b${words_arr[1]}\\b` } }, { name: { $regex: `(?i)\\b${words_arr[2]}\\b` } }] };
-    const ret = await db_module.find_couch_query('xuda_cache', opt);
-    if (ret.docs.length) {
-      file = ret.docs[0].file;
-      break;
+
+  for (const threeWords of combinations) {
+    const query = {
+      selector: {
+        docType,
+        $and: threeWords.map((word) => ({
+          name: { $regex: `(?i)\\b${word}\\b` },
+        })),
+      },
+      limit: 1,
+    };
+
+    const ret = await db_module.find_couch_query('xuda_cache', query);
+
+    if (ret.docs.length > 0) {
+      return ret.docs[0].file;
     }
   }
-  return file;
+
+  return null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.1503",
+  "version": "1.2.1505",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {