pangea-server 3.3.77 → 3.3.79

package/dist/router/call-controller.js

@@ -55,10 +55,12 @@ function hasInstancesAndTotalCount(obj) {
     return typeof obj === 'object' && obj !== null && 'instances' in obj && 'totalCount' in obj;
 }
 async function setFilesUrls(data) {
-    const targets = [];
     const visited = new WeakSet();
+    const singleTargets = [];
+    const arrayTargets = [];
     function isTargetKey(key) {
-        return key.toLowerCase().includes('image') || key.toLowerCase().includes('video');
+        const k = key.toLowerCase();
+        return k.includes('image') || k.includes('video');
     }
     function collect(node) {
         if (!node)
@@ -74,29 +76,42 @@ async function setFilesUrls(data) {
         visited.add(node);
         for (const [key, value] of Object.entries(node)) {
             if (isTargetKey(key)) {
-                if (typeof value === 'string' && value.length) {
-                    targets.push({ node, key, type: 'single' });
+                if (Array.isArray(value) && value.every((v) => typeof v === 'string')) {
+                    arrayTargets.push({ node, key });
                 }
-                else if (Array.isArray(value) && value.length && value.every((v) => typeof v === 'string')) {
-                    targets.push({ node, key, type: 'array' });
+                else if (typeof value === 'string') {
+                    singleTargets.push({ node, key });
                 }
             }
             collect(value);
         }
     }
     collect(data);
-    if (!targets.length)
+    const filesSet = new Set();
+    singleTargets.forEach(({ node, key }) => {
+        const val = node[key];
+        if (typeof val === 'string' && val.length)
+            filesSet.add(val);
+    });
+    arrayTargets.forEach(({ node, key }) => {
+        const arr = node[key];
+        arr.forEach((v) => {
+            if (typeof v === 'string' && v.length)
+                filesSet.add(v);
+        });
+    });
+    const files = Array.from(filesSet);
+    if (!files.length)
         return;
-    const allFiles = Array.from(new Set(targets.flatMap((t) => (t.type === 'single' ? [t.node[t.key]] : t.node[t.key]))));
-    const urls = await Promise.all(allFiles.map((file) => helpers_1.FileStorage.GenerateDownloadUrl(file)));
+    const urls = await Promise.all(files.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 === 'single') {
-            t.node[`${t.key}Url`] = map.get(t.node[t.key]) || null;
-        }
-        else {
-            t.node[`${t.key}Urls`] = t.node[t.key].map((file) => map.get(file) || null);
-        }
+    files.forEach((file, i) => map.set(file, urls[i]));
+    singleTargets.forEach(({ node, key }) => {
+        const val = node[key];
+        node[`${key}Url`] = typeof val === 'string' && val.length ? map.get(val) || null : null;
+    });
+    arrayTargets.forEach(({ node, key }) => {
+        const arr = node[key];
+        node[`${key}Urls`] = Array.isArray(arr) ? arr.map((v) => (v ? map.get(v) || null : null)) : [];
     });
 }

package/package.json

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