@gallop.software/studio 1.3.6 → 1.4.1

package/dist/handlers/index.js

@@ -309,6 +309,22 @@ async function deleteFromCdn(imageKey, hasThumbnails) {
     }
   }
 }
+async function deleteThumbnailsFromCdn(imageKey) {
+  const bucketName = process.env.CLOUDFLARE_R2_BUCKET_NAME;
+  if (!bucketName) throw new Error("R2 bucket not configured");
+  const r2 = getR2Client();
+  for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+    try {
+      await r2.send(
+        new (0, _clients3.DeleteObjectCommand)({
+          Bucket: bucketName,
+          Key: thumbPath.replace(/^\//, "")
+        })
+      );
+    } catch (e6) {
+    }
+  }
+}
 
 // src/handlers/list.ts
 function getExistingThumbnails(originalPath, entry) {
@@ -468,7 +484,7 @@ async function handleList(request) {
           }
         }
       }
-    } catch (e6) {
+    } catch (e7) {
     }
     if (!relativePath && !seenFolders.has("images")) {
       let thumbnailCount = 0;
@@ -537,7 +553,7 @@ async function handleList(request) {
               await _fs.promises.access(localThumbPath);
               thumbnail = thumbPath;
               hasThumbnail = true;
-            } catch (e7) {
+            } catch (e8) {
               thumbnail = key;
               hasThumbnail = false;
             }
@@ -556,7 +572,7 @@ async function handleList(request) {
             const filePath = _path2.default.join(process.cwd(), "public", key);
             const stats = await _fs.promises.stat(filePath);
             fileSize = stats.size;
-          } catch (e8) {
+          } catch (e9) {
           }
         }
         items.push({
@@ -618,7 +634,7 @@ async function handleSearch(request) {
             await _fs.promises.access(localThumbPath);
             thumbnail = thumbPath;
             hasThumbnail = true;
-          } catch (e9) {
+          } catch (e10) {
             thumbnail = key;
             hasThumbnail = false;
           }
@@ -674,7 +690,7 @@ async function handleListFolders() {
             await scanDir(_path2.default.join(dir, entry.name), folderRelPath);
           }
         }
-      } catch (e10) {
+      } catch (e11) {
       }
     }
     const publicDir = _path2.default.join(process.cwd(), "public");
@@ -814,7 +830,7 @@ async function handleUpload(request) {
         meta[imageKey] = {
           o: { w: metadata.width || 0, h: metadata.height || 0 }
         };
-      } catch (e11) {
+      } catch (e12) {
         meta[imageKey] = { o: { w: 0, h: 0 } };
       }
     } else {
@@ -864,7 +880,7 @@ async function handleDelete(request) {
                     const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
-                    } catch (e12) {
+                    } catch (e13) {
                     }
                   }
                 }
@@ -880,14 +896,14 @@ async function handleDelete(request) {
                   const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
-                  } catch (e13) {
+                  } catch (e14) {
                   }
                 }
               }
               delete meta[imageKey];
             }
           }
-        } catch (e14) {
+        } catch (e15) {
           if (entry) {
             delete meta[imageKey];
           } else {
@@ -940,7 +956,7 @@ async function handleCreateFolder(request) {
     try {
       await _fs.promises.access(folderPath);
       return _server.NextResponse.json({ error: "A folder with this name already exists" }, { status: 400 });
-    } catch (e15) {
+    } catch (e16) {
     }
     await _fs.promises.mkdir(folderPath, { recursive: true });
     return _server.NextResponse.json({ success: true, path: _path2.default.join(safePath, sanitizedName) });
@@ -968,13 +984,13 @@ async function handleRename(request) {
     }
     try {
       await _fs.promises.access(absoluteOldPath);
-    } catch (e16) {
+    } catch (e17) {
       return _server.NextResponse.json({ error: "File or folder not found" }, { status: 404 });
     }
     try {
       await _fs.promises.access(absoluteNewPath);
       return _server.NextResponse.json({ error: "An item with this name already exists" }, { status: 400 });
-    } catch (e17) {
+    } catch (e18) {
     }
     const stats = await _fs.promises.stat(absoluteOldPath);
     const isFile = stats.isFile();
@@ -996,7 +1012,7 @@ async function handleRename(request) {
           await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
           try {
             await _fs.promises.rename(oldThumbPath, newThumbPath);
-          } catch (e18) {
+          } catch (e19) {
           }
         }
         delete meta[oldKey];
@@ -1106,7 +1122,7 @@ async function handleMoveStream(request) {
               await deleteFromCdn(oldKey, hasProcessedThumbnails);
               try {
                 await _fs.promises.unlink(newAbsolutePath);
-              } catch (e19) {
+              } catch (e20) {
               }
               if (hasProcessedThumbnails) {
                 await deleteLocalThumbnails(newKey);
@@ -1123,7 +1139,7 @@ async function handleMoveStream(request) {
               }
               try {
                 await _fs.promises.access(absolutePath);
-              } catch (e20) {
+              } catch (e21) {
                 errors.push(`${itemName} not found`);
                 continue;
               }
@@ -1131,7 +1147,7 @@ async function handleMoveStream(request) {
                 await _fs.promises.access(newAbsolutePath);
                 errors.push(`${itemName} already exists in destination`);
                 continue;
-              } catch (e21) {
+              } catch (e22) {
               }
               await _fs.promises.rename(absolutePath, newAbsolutePath);
               const stats = await _fs.promises.stat(newAbsolutePath);
@@ -1144,7 +1160,7 @@ async function handleMoveStream(request) {
                   await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
                   try {
                     await _fs.promises.rename(oldThumbPath, newThumbPath);
-                  } catch (e22) {
+                  } catch (e23) {
                   }
                 }
                 delete meta[oldKey];
@@ -1249,7 +1265,7 @@ async function handleSync(request) {
           const originalLocalPath = _path2.default.join(process.cwd(), "public", imageKey);
           try {
             originalBuffer = await _fs.promises.readFile(originalLocalPath);
-          } catch (e23) {
+          } catch (e24) {
             errors.push(`Original file not found: ${imageKey}`);
             continue;
           }
@@ -1277,7 +1293,7 @@ async function handleSync(request) {
                 })
               );
               urlsToPurge.push(`${publicUrl}${thumbPath}`);
-            } catch (e24) {
+            } catch (e25) {
             }
           }
         }
@@ -1288,12 +1304,12 @@ async function handleSync(request) {
             const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
             try {
               await _fs.promises.unlink(localPath);
-            } catch (e25) {
+            } catch (e26) {
             }
           }
           try {
             await _fs.promises.unlink(originalLocalPath);
-          } catch (e26) {
+          } catch (e27) {
           }
         }
         pushed.push(imageKey);
@@ -1342,7 +1358,7 @@ async function handleReprocess(request) {
         const originalPath = _path2.default.join(process.cwd(), "public", imageKey);
         try {
           buffer = await _fs.promises.readFile(originalPath);
-        } catch (e27) {
+        } catch (e28) {
           if (isInOurR2) {
             buffer = await downloadFromCdn(imageKey);
             const dir = _path2.default.dirname(originalPath);
@@ -1368,7 +1384,7 @@ async function handleReprocess(request) {
           await deleteLocalThumbnails(imageKey);
           try {
             await _fs.promises.unlink(originalPath);
-          } catch (e28) {
+          } catch (e29) {
           }
         } else if (isRemote) {
         }
@@ -1393,7 +1409,7 @@ async function handleReprocess(request) {
     return _server.NextResponse.json({ error: "Failed to reprocess images" }, { status: 500 });
   }
 }
-async function handleReprocessStream(request) {
+async function handleUnprocessStream(request) {
   const publicUrl = _optionalChain([process, 'access', _38 => _38.env, 'access', _39 => _39.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _40 => _40.replace, 'call', _41 => _41(/\/\s*$/, "")]);
   const encoder = new TextEncoder();
   let imageKeys;
@@ -1403,7 +1419,102 @@ async function handleReprocessStream(request) {
     if (!imageKeys || !Array.isArray(imageKeys) || imageKeys.length === 0) {
       return _server.NextResponse.json({ error: "No image keys provided" }, { status: 400 });
     }
-  } catch (e29) {
+  } catch (e30) {
+    return _server.NextResponse.json({ error: "Invalid request body" }, { status: 400 });
+  }
+  const stream = new ReadableStream({
+    async start(controller) {
+      const sendEvent = (data) => {
+        controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
+
+`));
+      };
+      try {
+        const meta = await loadMeta();
+        const cdnUrls = getCdnUrls(meta);
+        const unprocessed = [];
+        const errors = [];
+        const urlsToPurge = [];
+        const total = imageKeys.length;
+        sendEvent({ type: "start", total });
+        for (let i = 0; i < imageKeys.length; i++) {
+          let imageKey = imageKeys[i];
+          if (!imageKey.startsWith("/")) {
+            imageKey = `/${imageKey}`;
+          }
+          sendEvent({
+            type: "progress",
+            current: i + 1,
+            total,
+            percent: Math.round((i + 1) / total * 100),
+            message: `Removing thumbnails for ${imageKey.slice(1)}...`
+          });
+          try {
+            const entry = getMetaEntry(meta, imageKey);
+            if (!entry) {
+              errors.push(imageKey);
+              continue;
+            }
+            const existingCdnIndex = entry.c;
+            const existingCdnUrl = existingCdnIndex !== void 0 ? cdnUrls[existingCdnIndex] : void 0;
+            const isInOurR2 = existingCdnUrl === publicUrl;
+            await deleteLocalThumbnails(imageKey);
+            if (isInOurR2) {
+              await deleteThumbnailsFromCdn(imageKey);
+              for (const thumbPath of _chunkWOHZ4LYGjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+                urlsToPurge.push(`${publicUrl}${thumbPath}`);
+              }
+            }
+            meta[imageKey] = {
+              o: entry.o,
+              b: entry.b,
+              ...entry.c !== void 0 ? { c: entry.c } : {}
+            };
+            unprocessed.push(imageKey);
+          } catch (error) {
+            console.error(`Failed to unprocess ${imageKey}:`, error);
+            errors.push(imageKey);
+          }
+        }
+        sendEvent({ type: "cleanup", message: "Saving metadata..." });
+        await saveMeta(meta);
+        if (urlsToPurge.length > 0) {
+          sendEvent({ type: "cleanup", message: "Purging CDN cache..." });
+          await purgeCloudflareCache(urlsToPurge);
+        }
+        sendEvent({
+          type: "complete",
+          processed: unprocessed.length,
+          errors: errors.length,
+          message: `Removed thumbnails from ${unprocessed.length} image${unprocessed.length !== 1 ? "s" : ""}${errors.length > 0 ? `, ${errors.length} error${errors.length !== 1 ? "s" : ""}` : ""}`
+        });
+        controller.close();
+      } catch (error) {
+        console.error("Unprocess stream error:", error);
+        sendEvent({ type: "error", message: "Failed to remove thumbnails" });
+        controller.close();
+      }
+    }
+  });
+  return new Response(stream, {
+    headers: {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive"
+    }
+  });
+}
+async function handleReprocessStream(request) {
+  const publicUrl = _optionalChain([process, 'access', _42 => _42.env, 'access', _43 => _43.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _44 => _44.replace, 'call', _45 => _45(/\/\s*$/, "")]);
+  const encoder = new TextEncoder();
+  let imageKeys;
+  try {
+    const body = await request.json();
+    imageKeys = body.imageKeys;
+    if (!imageKeys || !Array.isArray(imageKeys) || imageKeys.length === 0) {
+      return _server.NextResponse.json({ error: "No image keys provided" }, { status: 400 });
+    }
+  } catch (e31) {
     return _server.NextResponse.json({ error: "Invalid request body" }, { status: 400 });
   }
   const stream = new ReadableStream({
@@ -1436,14 +1547,14 @@ async function handleReprocessStream(request) {
           try {
             let buffer;
             const entry = getMetaEntry(meta, imageKey);
-            const existingCdnIndex = _optionalChain([entry, 'optionalAccess', _42 => _42.c]);
+            const existingCdnIndex = _optionalChain([entry, 'optionalAccess', _46 => _46.c]);
             const existingCdnUrl = existingCdnIndex !== void 0 ? cdnUrls[existingCdnIndex] : void 0;
             const isInOurR2 = existingCdnUrl === publicUrl;
             const isRemote = existingCdnIndex !== void 0 && !isInOurR2;
             const originalPath = _path2.default.join(process.cwd(), "public", imageKey);
             try {
               buffer = await _fs.promises.readFile(originalPath);
-            } catch (e30) {
+            } catch (e32) {
               if (isInOurR2) {
                 buffer = await downloadFromCdn(imageKey);
                 const dir = _path2.default.dirname(originalPath);
@@ -1488,7 +1599,7 @@ async function handleReprocessStream(request) {
                 await deleteLocalThumbnails(imageKey);
                 try {
                   await _fs.promises.unlink(originalPath);
-                } catch (e31) {
+                } catch (e33) {
                 }
               }
               meta[imageKey] = updatedEntry;
@@ -1528,7 +1639,7 @@ async function handleReprocessStream(request) {
   });
 }
 async function handleProcessAllStream() {
-  const publicUrl = _optionalChain([process, 'access', _43 => _43.env, 'access', _44 => _44.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _45 => _45.replace, 'call', _46 => _46(/\/\s*$/, "")]);
+  const publicUrl = _optionalChain([process, 'access', _47 => _47.env, 'access', _48 => _48.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _49 => _49.replace, 'call', _50 => _50(/\/\s*$/, "")]);
   const encoder = new TextEncoder();
   const stream = new ReadableStream({
     async start(controller) {
@@ -1622,7 +1733,7 @@ async function handleProcessAllStream() {
               await deleteLocalThumbnails(key);
               try {
                 await _fs.promises.unlink(fullPath);
-              } catch (e32) {
+              } catch (e34) {
               }
             }
             processed.push(key.slice(1));
@@ -1661,13 +1772,13 @@ async function handleProcessAllStream() {
                 }
               }
             }
-          } catch (e33) {
+          } catch (e35) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e34) {
+        } catch (e36) {
         }
         async function removeEmptyDirs(dir) {
           try {
@@ -1685,13 +1796,13 @@ async function handleProcessAllStream() {
               await _fs.promises.rmdir(dir);
             }
             return isEmpty;
-          } catch (e35) {
+          } catch (e37) {
             return true;
           }
         }
         try {
           await removeEmptyDirs(imagesDir);
-        } catch (e36) {
+        } catch (e38) {
         }
         await saveMeta(meta);
         if (urlsToPurge.length > 0) {
@@ -1759,7 +1870,7 @@ async function handleScanStream() {
                 allFiles.push({ relativePath: relPath, fullPath });
               }
             }
-          } catch (e37) {
+          } catch (e39) {
           }
         }
         const publicDir = _path2.default.join(process.cwd(), "public");
@@ -1818,7 +1929,7 @@ async function handleScanStream() {
                     o: { w: metadata.width || 0, h: metadata.height || 0 },
                     b: blurhash
                   };
-                } catch (e38) {
+                } catch (e40) {
                   meta[imageKey] = { o: { w: 0, h: 0 } };
                 }
               }
@@ -1858,13 +1969,13 @@ async function handleScanStream() {
                 }
               }
             }
-          } catch (e39) {
+          } catch (e41) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e40) {
+        } catch (e42) {
         }
         await saveMeta(meta);
         sendEvent({
@@ -1931,13 +2042,13 @@ async function handleDeleteOrphans(request) {
           await _fs.promises.rmdir(dir);
         }
         return isEmpty;
-      } catch (e41) {
+      } catch (e43) {
         return true;
       }
     }
     try {
       await removeEmptyDirs(imagesDir);
-    } catch (e42) {
+    } catch (e44) {
     }
     return _server.NextResponse.json({
       success: true,
@@ -2122,6 +2233,9 @@ async function POST(request) {
   if (route === "reprocess-stream") {
     return handleReprocessStream(request);
   }
+  if (route === "unprocess-stream") {
+    return handleUnprocessStream(request);
+  }
   if (route === "process-all") {
     return handleProcessAllStream();
   }