@gallop.software/studio 1.0.5 → 1.1.0

package/dist/handlers/index.mjs

@@ -1,7 +1,8 @@
 import {
   getAllThumbnailPaths,
-  getThumbnailPath
-} from "../chunk-FDWPNRNZ.mjs";
+  getThumbnailPath,
+  isProcessed
+} from "../chunk-CIS6B4SP.mjs";
 
 // src/handlers/index.ts
 import { NextResponse as NextResponse5 } from "next/server";
@@ -15,7 +16,7 @@ import path5 from "path";
 import { promises as fs } from "fs";
 import path from "path";
 async function loadMeta() {
-  const metaPath = path.join(process.cwd(), "_data", "studio.json");
+  const metaPath = path.join(process.cwd(), "_data", "_studio.json");
   try {
     const content = await fs.readFile(metaPath, "utf-8");
     return JSON.parse(content);
@@ -26,7 +27,7 @@ async function loadMeta() {
 async function saveMeta(meta) {
   const dataDir = path.join(process.cwd(), "_data");
   await fs.mkdir(dataDir, { recursive: true });
-  const metaPath = path.join(dataDir, "studio.json");
+  const metaPath = path.join(dataDir, "_studio.json");
   const ordered = {};
   if (meta._cdns) {
     ordered._cdns = meta._cdns;
@@ -106,16 +107,18 @@ import { promises as fs2 } from "fs";
 import path3 from "path";
 import sharp from "sharp";
 import { encode } from "blurhash";
+var FULL_MAX_WIDTH = 2560;
 var DEFAULT_SIZES = {
-  small: { width: 300, suffix: "-sm" },
-  medium: { width: 700, suffix: "-md" },
-  large: { width: 1400, suffix: "-lg" }
+  small: { width: 300, suffix: "-sm", key: "sm" },
+  medium: { width: 700, suffix: "-md", key: "md" },
+  large: { width: 1400, suffix: "-lg", key: "lg" }
 };
 async function processImage(buffer, imageKey) {
   const sharpInstance = sharp(buffer);
   const metadata = await sharpInstance.metadata();
   const originalWidth = metadata.width || 0;
   const originalHeight = metadata.height || 0;
+  const ratio = originalHeight / originalWidth;
   const keyWithoutSlash = imageKey.startsWith("/") ? imageKey.slice(1) : imageKey;
   const baseName = path3.basename(keyWithoutSlash, path3.extname(keyWithoutSlash));
   const ext = path3.extname(keyWithoutSlash).toLowerCase();
@@ -124,19 +127,34 @@ async function processImage(buffer, imageKey) {
   await fs2.mkdir(imagesPath, { recursive: true });
   const isPng = ext === ".png";
   const outputExt = isPng ? ".png" : ".jpg";
+  const entry = {
+    o: [originalWidth, originalHeight]
+  };
   const fullFileName = imageDir === "." ? `${baseName}${outputExt}` : `${imageDir}/${baseName}${outputExt}`;
   const fullPath = path3.join(process.cwd(), "public", "images", fullFileName);
-  if (isPng) {
-    await sharp(buffer).png({ quality: 85 }).toFile(fullPath);
+  let fullWidth = originalWidth;
+  let fullHeight = originalHeight;
+  if (originalWidth > FULL_MAX_WIDTH) {
+    fullWidth = FULL_MAX_WIDTH;
+    fullHeight = Math.round(FULL_MAX_WIDTH * ratio);
+    if (isPng) {
+      await sharp(buffer).resize(fullWidth, fullHeight).png({ quality: 85 }).toFile(fullPath);
+    } else {
+      await sharp(buffer).resize(fullWidth, fullHeight).jpeg({ quality: 85 }).toFile(fullPath);
+    }
   } else {
-    await sharp(buffer).jpeg({ quality: 85 }).toFile(fullPath);
+    if (isPng) {
+      await sharp(buffer).png({ quality: 85 }).toFile(fullPath);
+    } else {
+      await sharp(buffer).jpeg({ quality: 85 }).toFile(fullPath);
+    }
   }
+  entry.f = [fullWidth, fullHeight];
   for (const [, sizeConfig] of Object.entries(DEFAULT_SIZES)) {
-    const { width: maxWidth, suffix } = sizeConfig;
+    const { width: maxWidth, suffix, key } = sizeConfig;
     if (originalWidth <= maxWidth) {
       continue;
     }
-    const ratio = originalHeight / originalWidth;
     const newHeight = Math.round(maxWidth * ratio);
     const sizeFileName = `${baseName}${suffix}${outputExt}`;
     const sizeFilePath = imageDir === "." ? sizeFileName : `${imageDir}/${sizeFileName}`;
@@ -146,14 +164,11 @@ async function processImage(buffer, imageKey) {
     } else {
       await sharp(buffer).resize(maxWidth, newHeight).jpeg({ quality: 80 }).toFile(sizePath);
     }
+    entry[key] = [maxWidth, newHeight];
   }
   const { data, info } = await sharp(buffer).resize(32, 32, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
-  const blurhash = encode(new Uint8ClampedArray(data), info.width, info.height, 4, 4);
-  return {
-    w: originalWidth,
-    h: originalHeight,
-    b: blurhash
-  };
+  entry.b = encode(new Uint8ClampedArray(data), info.width, info.height, 4, 4);
+  return entry;
 }
 
 // src/handlers/utils/cdn.ts
@@ -400,7 +415,8 @@ async function handleList(request) {
         let thumbnail;
         let hasThumbnail = false;
         let fileSize;
-        if (isImage && entry.p === 1) {
+        const entryIsProcessed = isProcessed(entry);
+        if (isImage && entryIsProcessed) {
           const thumbPath = getThumbnailPath(key, "sm");
           if (isPushedToCloud && entry.c !== void 0) {
             const cdnUrl = cdnUrls[entry.c];
@@ -443,12 +459,12 @@ async function handleList(request) {
           size: fileSize,
           thumbnail,
           hasThumbnail,
-          isProcessed: entry.p === 1,
+          isProcessed: entryIsProcessed,
           cdnPushed: isPushedToCloud,
           cdnBaseUrl: fileCdnUrl,
           isRemote,
           isProtected: isInsideImagesFolder,
-          dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
+          dimensions: entry.o ? { width: entry.o[0], height: entry.o[1] } : void 0
         });
       }
     }
@@ -480,7 +496,8 @@ async function handleSearch(request) {
       const isRemote = isPushedToCloud && (!r2PublicUrl || fileCdnUrl !== r2PublicUrl);
       let thumbnail;
       let hasThumbnail = false;
-      if (isImage && entry.p === 1) {
+      const entryIsProcessed = isProcessed(entry);
+      if (isImage && entryIsProcessed) {
         const thumbPath = getThumbnailPath(key, "sm");
         if (isPushedToCloud && entry.c !== void 0) {
           const cdnUrl = cdnUrls[entry.c];
@@ -514,11 +531,11 @@ async function handleSearch(request) {
         type: "file",
         thumbnail,
         hasThumbnail,
-        isProcessed: entry.p === 1,
+        isProcessed: entryIsProcessed,
         cdnPushed: isPushedToCloud,
         cdnBaseUrl: fileCdnUrl,
         isRemote,
-        dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
+        dimensions: entry.o ? { width: entry.o[0], height: entry.o[1] } : void 0
       });
     }
     return NextResponse.json({ items });
@@ -949,7 +966,7 @@ async function handleMoveStream(request) {
           const fileCdnUrl = isInCloud && entry.c !== void 0 ? cdnUrls[entry.c] : void 0;
           const isRemote = isInCloud && (!r2PublicUrl || fileCdnUrl !== r2PublicUrl);
           const isPushedToR2 = isInCloud && r2PublicUrl && fileCdnUrl === r2PublicUrl;
-          const hasProcessedThumbnails = entry?.p === 1;
+          const hasProcessedThumbnails = isProcessed(entry);
           try {
             if (isRemote && isImage) {
               const remoteUrl = `${fileCdnUrl}${oldKey}`;
@@ -957,8 +974,7 @@ async function handleMoveStream(request) {
               await fs5.mkdir(path6.dirname(newAbsolutePath), { recursive: true });
               await fs5.writeFile(newAbsolutePath, buffer);
               const newEntry = {
-                w: entry?.w,
-                h: entry?.h,
+                o: entry?.o,
                 b: entry?.b
               };
               delete meta[oldKey];
@@ -968,17 +984,13 @@ async function handleMoveStream(request) {
               const buffer = await downloadFromCdn(oldKey);
               await fs5.mkdir(path6.dirname(newAbsolutePath), { recursive: true });
               await fs5.writeFile(newAbsolutePath, buffer);
-              const newEntry = {
-                w: entry?.w,
-                h: entry?.h,
+              let newEntry = {
+                o: entry?.o,
                 b: entry?.b
               };
               if (hasProcessedThumbnails) {
                 const processedEntry = await processImage(buffer, newKey);
-                newEntry.w = processedEntry.w;
-                newEntry.h = processedEntry.h;
-                newEntry.b = processedEntry.b;
-                newEntry.p = 1;
+                newEntry = { ...newEntry, ...processedEntry };
               }
               await uploadOriginalToCdn(newKey);
               if (hasProcessedThumbnails) {
@@ -1144,7 +1156,7 @@ async function handleSync(request) {
           })
         );
         urlsToPurge.push(`${publicUrl}${imageKey}`);
-        if (!isRemote && entry.p) {
+        if (!isRemote && isProcessed(entry)) {
           for (const thumbPath of getAllThumbnailPaths(imageKey)) {
             const localPath = path7.join(process.cwd(), "public", thumbPath);
             try {
@@ -1240,7 +1252,6 @@ async function handleReprocess(request) {
           }
         }
         const updatedEntry = await processImage(buffer, imageKey);
-        updatedEntry.p = 1;
         if (isInOurR2) {
           updatedEntry.c = existingCdnIndex;
           await uploadToCdn(imageKey);
@@ -1297,7 +1308,7 @@ async function handleProcessAllStream() {
         for (const [key, entry] of getFileEntries(meta)) {
           const fileName = path7.basename(key);
           if (!isImageFile(fileName)) continue;
-          if (!entry.p) {
+          if (!isProcessed(entry)) {
             imagesToProcess.push({ key, entry });
           } else {
             alreadyProcessed++;
@@ -1347,10 +1358,10 @@ async function handleProcessAllStream() {
               await fs6.writeFile(destPath, buffer);
               meta[key] = {
                 ...entry,
-                w: 0,
-                h: 0,
+                o: [0, 0],
                 b: "",
-                p: 1
+                f: [0, 0]
+                // SVG has "full" to indicate processed
               };
               if (isRemote) {
                 delete meta[key].c;
@@ -1359,7 +1370,6 @@ async function handleProcessAllStream() {
               const processedEntry = await processImage(buffer, key);
               meta[key] = {
                 ...processedEntry,
-                p: 1,
                 ...isInOurR2 ? { c: existingCdnIndex } : {}
               };
             }
@@ -1556,7 +1566,7 @@ async function handleScanStream() {
             if (isImage) {
               const ext = path8.extname(relativePath).toLowerCase();
               if (ext === ".svg") {
-                meta[imageKey] = { w: 0, h: 0, b: "" };
+                meta[imageKey] = { o: [0, 0], b: "" };
               } else {
                 try {
                   const buffer = await fs7.readFile(fullPath);
@@ -1564,12 +1574,11 @@ async function handleScanStream() {
                   const { data, info } = await sharp3(buffer).resize(32, 32, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
                   const blurhash = encode2(new Uint8ClampedArray(data), info.width, info.height, 4, 4);
                   meta[imageKey] = {
-                    w: metadata.width || 0,
-                    h: metadata.height || 0,
+                    o: [metadata.width || 0, metadata.height || 0],
                     b: blurhash
                   };
                 } catch {
-                  meta[imageKey] = { w: 0, h: 0 };
+                  meta[imageKey] = { o: [0, 0] };
                 }
               }
             } else {
@@ -1586,7 +1595,7 @@ async function handleScanStream() {
         const expectedThumbnails = /* @__PURE__ */ new Set();
         const fileEntries = getFileEntries(meta);
         for (const [imageKey, entry] of fileEntries) {
-          if (entry.c === void 0 && entry.p === 1) {
+          if (entry.c === void 0 && isProcessed(entry)) {
             for (const thumbPath of getAllThumbnailPaths(imageKey)) {
               expectedThumbnails.add(thumbPath);
             }
@@ -1719,8 +1728,7 @@ async function processRemoteImage(url) {
   const { data, info } = await sharp4(buffer).resize(32, 32, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
   const blurhash = encode3(new Uint8ClampedArray(data), info.width, info.height, 4, 4);
   return {
-    w: metadata.width || 0,
-    h: metadata.height || 0,
+    o: [metadata.width || 0, metadata.height || 0],
     b: blurhash
   };
 }
@@ -1766,8 +1774,7 @@ async function handleImportUrls(request) {
             const cdnIndex = getOrAddCdnIndex(meta, base);
             const imageData = await processRemoteImage(url);
             setMetaEntry(meta, path9, {
-              w: imageData.w,
-              h: imageData.h,
+              o: imageData.o,
               b: imageData.b,
               c: cdnIndex
             });