Update image server to no longer spit out Airtable URLs

slmnio · Mar 9, 2023 · a2112b2 · a2112b2
1 parent 110e7a0
commit a2112b2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 19 deletions.
diff --git a/server/src/cache.js b/server/src/cache.js
@@ -162,13 +162,16 @@ async function removeAttachmentTimestamps(data) {
                     let { ending, filename } = getAutoFilename(attachment);
                     attachment._autoFilename = filename;
                     attachment.fileExtension = ending;
-                    attachments.set(attachment.id, attachment);
+                    attachments.set(attachment.id, {...attachment});
 
-                    attachment.url = generateAttachmentURL(attachment.url, attachment);
+                    // we don't want the URLs to appear in requests anymore
+                    // the data server just uses the attachment IDs
+
+                    attachment.url = null; // generateAttachmentURL(attachment.url, attachment);
 
                     for (let size in attachment.thumbnails) {
                         size = attachment.thumbnails[size];
-                        size.url = generateAttachmentURL(size.url, attachment);
+                        size.url = null; // generateAttachmentURL(size.url, attachment);
                     }
                 });
             }

diff --git a/server/src/images.js b/server/src/images.js
@@ -51,7 +51,13 @@ async function downloadImage(url, filename, size) {
             file.on("finish", () => file.close(resolve));
         }).on("error", err => {
             console.error(`[image] file error for ${filename} ${err.code} ${err.message}`);
-            fs.unlink(pathName);
+            fs.unlink(pathName, function(err) {
+                if (err) {
+                    console.error(`[image] file error for ${filename} unlink FAILED`, err);
+                } else {
+                    console.error(`[image] file error for ${filename} unlinked`);
+                }
+            });
             reject(err);
         });
     }));

diff --git a/server/src/meta.js b/server/src/meta.js
@@ -12,11 +12,12 @@ function getFileEnding(url) {
 }
 
 const dataServer = process.env.NODE_ENV === "development" ? "http://localhost:8901" : "https://data.slmn.gg";
-function getResizedImage(airtableURL, size = "s-500") {
-    // just using orig for now
-    return `${dataServer}/image.${getFileEnding(airtableURL) || "png"}?size=orig&url=${encodeURIComponent(airtableURL.replace("?", "&"))}`;
+
+function getImageURL(attachment, size = "orig") {
+    return `${dataServer}/image.${attachment.fileExtension}?id=${attachment.id}&size=${size}`;
 }
 
+
 function aImg(airtableImage, size) {
     // console.log(airtableImage);
     if (!airtableImage || !airtableImage.length) return null;
@@ -25,7 +26,7 @@ function aImg(airtableImage, size) {
         width: i.width,
         height: i.height,
         type: i.type,
-        url: getResizedImage(i.url, size)
+        url: getImageURL(i.url, size)
     };
 }
 function themeSquare(id, size = 500) {

diff --git a/website/src/components/broadcast/MapSegment.vue b/website/src/components/broadcast/MapSegment.vue
@@ -36,7 +36,7 @@
 
 <script>
 import { logoBackground } from "@/utils/theme-styles";
-import { bg, getAirtableURL, resizedImage } from "@/utils/images";
+import { bg, getNewURL, resizedImage } from "@/utils/images";
 import ThemeLogo from "@/components/website/ThemeLogo";
 
 
@@ -61,7 +61,7 @@ export default {
             if (!(image)) return {};
 
             try {
-                return bg(getAirtableURL(image));
+                return bg(getNewURL(image, "orig"));
             } catch (e) {
                 return {};
             }

diff --git a/website/src/components/broadcast/roots/AdReadOverlay.vue b/website/src/components/broadcast/roots/AdReadOverlay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { ReactiveArray, ReactiveThing } from "@/utils/reactive";
-import { bg, getAirtableURL } from "@/utils/images";
+import { bg, getNewURL } from "@/utils/images";
 
 async function wait(ms) {
     return new Promise((resolve, reject) => {
@@ -43,7 +43,7 @@ export default {
         readImage() {
             if (!this.activeRead) return {};
             try {
-                return bg(getAirtableURL(this.activeRead.image));
+                return bg(getNewURL(this.activeRead.image, "orig"));
             } catch (e) {
                 return {};
             }

diff --git a/website/src/utils/images.js b/website/src/utils/images.js
@@ -17,18 +17,14 @@ export function getNewURL(attachment, size) {
     return `${dataServer}/image.${attachment.fileExtension}?id=${attachment.id}&size=${size}`;
 }
 
-export function getAirtableURL(attachment) {
-    if (attachment?.url) return attachment.url;
-    return attachment?.[0]?.url || null;
-}
-
 function keyedImageAttachments(theme, keys) {
-    const urls = keys.map(key => theme[key]?.[0]).filter(s => s?.url);
-    if (urls.length) return urls[0];
+    const attachments = keys.map(key => theme[key]?.[0]).filter(s => s?.id);
+    if (attachments.length) return attachments[0];
     return null;
 }
 
 export function resizedImageNoWrap(theme, keys, size) {
+    // console.log("resized image", { theme, keys, size });
     if (!theme) return null;
     const imageAttachment = keyedImageAttachments(theme, keys);
     if (!imageAttachment) return null;