pangea-server 3.3.70 → 3.3.71

package/dist/router/call-controller.js

@@ -41,7 +41,7 @@ function callController(controller, validate, appVersion, authConfig) {
             data = result.instances;
             totalCount = result.totalCount;
         }
-        await setImageUrls(data);
+        await setFilesUrls(data);
         const jsonBody = {
             data: data || null,
             totalCount: typeof totalCount === 'number' ? totalCount : null,
@@ -54,8 +54,10 @@ function callController(controller, validate, appVersion, authConfig) {
 function hasInstancesAndTotalCount(obj) {
     return typeof obj === 'object' && obj !== null && 'instances' in obj && 'totalCount' in obj;
 }
-async function setImageUrls(data) {
-    const targets = [];
+async function setFilesUrls(data) {
+    const singularSuffixes = ['Image', 'Video'];
+    const pluralSuffixes = ['Images', 'Videos'];
+    const entries = [];
     const visited = new WeakSet();
     function collect(node) {
         if (!node)
@@ -69,16 +71,43 @@ async function setImageUrls(data) {
         if (visited.has(node))
             return;
         visited.add(node);
-        if (typeof node.image === 'string' && node.image.length)
-            targets.push(node);
+        for (const [key, value] of Object.entries(node)) {
+            if (typeof value === 'string' && value.length) {
+                if (singularSuffixes.some((s) => key === s.toLowerCase() || (key.length > s.length && key.endsWith(s)))) {
+                    entries.push({ node, field: key, type: 'singular' });
+                }
+            }
+            else if (Array.isArray(value) && value.length && value.every((v) => typeof v === 'string')) {
+                if (pluralSuffixes.some((s) => key === s.toLowerCase() || (key.length > s.length && key.endsWith(s)))) {
+                    entries.push({ node, field: key, type: 'plural' });
+                }
+            }
+        }
         Object.values(node).forEach(collect);
     }
     collect(data);
-    if (!targets.length)
+    if (!entries.length)
         return;
-    const uniqueImages = Array.from(new Set(targets.map((target) => target.image)));
-    const urls = await Promise.all(uniqueImages.map((image) => helpers_1.FileStorage.GenerateDownloadUrl(image)));
-    const map = new Map();
-    uniqueImages.forEach((image, i) => map.set(image, urls[i]));
-    targets.forEach((target) => (target.imageUrl = map.get(target.image)));
+    const allFileKeys = new Set();
+    for (const { node, field, type } of entries) {
+        if (type === 'singular') {
+            allFileKeys.add(node[field]);
+        }
+        else {
+            for (const v of node[field])
+                allFileKeys.add(v);
+        }
+    }
+    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]);
+        }
+        else {
+            node[`${field}Urls`] = node[field].map((v) => urlMap.get(v));
+        }
+    }
 }

package/package.json

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