pangea-server 3.3.76 → 3.3.78

package/dist/router/call-controller.js

@@ -55,73 +55,49 @@ function hasInstancesAndTotalCount(obj) {
     return typeof obj === 'object' && obj !== null && 'instances' in obj && 'totalCount' in obj;
 }
 async function setFilesUrls(data) {
-    const entries = [];
+    const targets = [];
     const visited = new WeakSet();
-    function matchesSingular(key) {
+    function isTargetKey(key) {
         const k = key.toLowerCase();
-        return k === 'image' || k === 'video' || k.endsWith('image') || k.endsWith('video');
-    }
-    function matchesPlural(key) {
-        const k = key.toLowerCase();
-        return k === 'images' || k === 'videos' || k.endsWith('images') || k.endsWith('videos');
+        return k.includes('image') || k.includes('video');
     }
     function collect(node) {
         if (!node)
             return;
+        if (Array.isArray(node)) {
+            node.forEach(collect);
+            return;
+        }
         if (typeof node !== 'object')
             return;
         if (visited.has(node))
             return;
         visited.add(node);
-        if (Array.isArray(node)) {
-            node.forEach(collect);
-            return;
-        }
-        const payload = node.dataValues ? node.dataValues : node;
-        if (payload !== node) {
-            if (visited.has(payload))
-                return;
-            visited.add(payload);
-        }
-        for (const [key, value] of Object.entries(payload)) {
-            if (typeof value === 'string' && value.length > 0) {
-                if (matchesSingular(key)) {
-                    entries.push({ node: payload, field: key, type: 'singular' });
+        for (const [key, value] of Object.entries(node)) {
+            if (isTargetKey(key)) {
+                if (Array.isArray(value) && value.every((v) => typeof v === 'string')) {
+                    targets.push({ node, key, type: 'array' });
                 }
-            }
-            else if (Array.isArray(value) && value.every((v) => typeof v === 'string')) {
-                if (matchesPlural(key)) {
-                    entries.push({ node: payload, field: key, type: 'plural' });
+                else if (typeof value === 'string') {
+                    targets.push({ node, key, type: 'single' });
                 }
             }
-            if (typeof value === 'object' && value !== null) {
-                collect(value);
-            }
+            collect(value);
         }
     }
     collect(data);
-    if (!entries.length)
+    if (!targets.length)
         return;
-    const allFileKeys = new Set();
-    for (const { node, field, type } of entries) {
-        if (type === 'singular') {
-            allFileKeys.add(node[field]);
+    const allFiles = Array.from(new Set(targets.flatMap((t) => (t.type === 'array' ? t.node[t.key] : t.node[t.key] ? [t.node[t.key]] : []))));
+    const urls = await Promise.all(allFiles.map((file) => helpers_1.FileStorage.GenerateDownloadUrl(file)));
+    const map = new Map();
+    allFiles.forEach((file, i) => map.set(file, urls[i]));
+    targets.forEach((t) => {
+        if (t.type === 'array') {
+            t.node[`${t.key}Urls`] = t.node[t.key].map((file) => map.get(file) || null);
         }
         else {
-            for (const v of node[field])
-                allFileKeys.add(v);
+            t.node[`${t.key}Url`] = t.node[t.key] ? map.get(t.node[t.key]) || null : null;
         }
-    }
-    const uniqueKeys = Array.from(allFileKeys);
-    const urls = await Promise.all(uniqueKeys.map((key) => helpers_1.FileStorage.GenerateDownloadUrl(key)));
-    const urlMap = new Map();
-    uniqueKeys.forEach((key, i) => urlMap.set(key, urls[i]));
-    for (const { node, field, type } of entries) {
-        if (type === 'singular') {
-            node[`${field}Url`] = urlMap.get(node[field]) || null;
-        }
-        else {
-            node[`${field}Urls`] = node[field].map((v) => urlMap.get(v) || null);
-        }
-    }
+    });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.3.76",
+  "version": "3.3.78",
   "files": [
     "dist"
   ],