@gallop.software/studio 1.5.9 → 2.0.0

package/dist/handlers/index.js

@@ -15,8 +15,31 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 // src/handlers/utils/meta.ts
 
 
+// src/config/workspace.ts
+
+var workspacePath = null;
+function getWorkspace() {
+  if (workspacePath === null) {
+    workspacePath = process.env.STUDIO_WORKSPACE || process.cwd();
+  }
+  return workspacePath;
+}
+function getPublicPath(...segments) {
+  return _path2.default.join(getWorkspace(), "public", ...segments);
+}
+function getDataPath(...segments) {
+  return _path2.default.join(getWorkspace(), "_data", ...segments);
+}
+function getSrcAppPath(...segments) {
+  return _path2.default.join(getWorkspace(), "src", "app", ...segments);
+}
+function getWorkspacePath(...segments) {
+  return _path2.default.join(getWorkspace(), ...segments);
+}
+
+// src/handlers/utils/meta.ts
 async function loadMeta() {
-  const metaPath = _path2.default.join(process.cwd(), "_data", "_studio.json");
+  const metaPath = getDataPath("_studio.json");
   try {
     const content = await _fs.promises.readFile(metaPath, "utf-8");
     return JSON.parse(content);
@@ -25,9 +48,9 @@ async function loadMeta() {
   }
 }
 async function saveMeta(meta) {
-  const dataDir = _path2.default.join(process.cwd(), "_data");
+  const dataDir = getDataPath();
   await _fs.promises.mkdir(dataDir, { recursive: true });
-  const metaPath = _path2.default.join(dataDir, "_studio.json");
+  const metaPath = getDataPath("_studio.json");
   const ordered = {};
   if (meta._cdns) {
     ordered._cdns = meta._cdns;
@@ -123,7 +146,7 @@ async function processImage(buffer, imageKey) {
   const baseName = _path2.default.basename(keyWithoutSlash, _path2.default.extname(keyWithoutSlash));
   const ext = _path2.default.extname(keyWithoutSlash).toLowerCase();
   const imageDir = _path2.default.dirname(keyWithoutSlash);
-  const imagesPath = _path2.default.join(process.cwd(), "public", "images", imageDir === "." ? "" : imageDir);
+  const imagesPath = getPublicPath("images", imageDir === "." ? "" : imageDir);
   await _fs.promises.mkdir(imagesPath, { recursive: true });
   const isPng = ext === ".png";
   const outputExt = isPng ? ".png" : ".jpg";
@@ -131,7 +154,7 @@ async function processImage(buffer, imageKey) {
     o: { w: originalWidth, h: originalHeight }
   };
   const fullFileName = imageDir === "." ? `${baseName}${outputExt}` : `${imageDir}/${baseName}${outputExt}`;
-  const fullPath = _path2.default.join(process.cwd(), "public", "images", fullFileName);
+  const fullPath = getPublicPath("images", fullFileName);
   let fullWidth = originalWidth;
   let fullHeight = originalHeight;
   if (originalWidth > FULL_MAX_WIDTH) {
@@ -158,7 +181,7 @@ async function processImage(buffer, imageKey) {
     const newHeight = Math.round(maxWidth * ratio);
     const sizeFileName = `${baseName}${suffix}${outputExt}`;
     const sizeFilePath = imageDir === "." ? sizeFileName : `${imageDir}/${sizeFileName}`;
-    const sizePath = _path2.default.join(process.cwd(), "public", "images", sizeFilePath);
+    const sizePath = getPublicPath("images", sizeFilePath);
     if (isPng) {
       await _sharp2.default.call(void 0, buffer).resize(maxWidth, newHeight).png({ quality: 80 }).toFile(sizePath);
     } else {
@@ -173,7 +196,6 @@ async function processImage(buffer, imageKey) {
 
 // src/handlers/utils/cdn.ts
 
-
 var _clients3 = require('@aws-sdk/client-s3');
 async function purgeCloudflareCache(urls) {
   const zoneId = process.env.CLOUDFLARE_ZONE_ID;
@@ -247,7 +269,7 @@ async function uploadToCdn(imageKey) {
   if (!bucketName) throw new Error("R2 bucket not configured");
   const r2 = getR2Client();
   for (const thumbPath of _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
-    const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
+    const localPath = getPublicPath(thumbPath);
     try {
       const fileBuffer = await _fs.promises.readFile(localPath);
       await r2.send(
@@ -264,7 +286,7 @@ async function uploadToCdn(imageKey) {
 }
 async function deleteLocalThumbnails(imageKey) {
   for (const thumbPath of _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
-    const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
+    const localPath = getPublicPath(thumbPath);
     try {
       await _fs.promises.unlink(localPath);
     } catch (e3) {
@@ -295,7 +317,7 @@ async function uploadOriginalToCdn(imageKey) {
   const bucketName = process.env.CLOUDFLARE_R2_BUCKET_NAME;
   if (!bucketName) throw new Error("R2 bucket not configured");
   const r2 = getR2Client();
-  const localPath = _path2.default.join(process.cwd(), "public", imageKey);
+  const localPath = getPublicPath(imageKey);
   const fileBuffer = await _fs.promises.readFile(localPath);
   await r2.send(
     new (0, _clients3.PutObjectCommand)({
@@ -495,7 +517,7 @@ async function handleList(request) {
       }
       return _server.NextResponse.json({ items });
     }
-    const absoluteDir = _path2.default.join(process.cwd(), requestedPath);
+    const absoluteDir = getWorkspacePath(requestedPath);
     try {
       const dirEntries = await _fs.promises.readdir(absoluteDir, { withFileTypes: true });
       for (const entry of dirEntries) {
@@ -606,7 +628,7 @@ async function handleList(request) {
               hasThumbnail = true;
             }
           } else {
-            const localThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
+            const localThumbPath = getPublicPath(thumbPath);
             try {
               await _fs.promises.access(localThumbPath);
               thumbnail = thumbPath;
@@ -627,7 +649,7 @@ async function handleList(request) {
         }
         if (!isPushedToCloud) {
           try {
-            const filePath = _path2.default.join(process.cwd(), "public", key);
+            const filePath = getPublicPath(key);
             const stats = await _fs.promises.stat(filePath);
             fileSize = stats.size;
           } catch (e9) {
@@ -687,7 +709,7 @@ async function handleSearch(request) {
             hasThumbnail = true;
           }
         } else {
-          const localThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
+          const localThumbPath = getPublicPath(thumbPath);
           try {
             await _fs.promises.access(localThumbPath);
             thumbnail = thumbPath;
@@ -751,7 +773,7 @@ async function handleListFolders() {
       } catch (e11) {
       }
     }
-    const publicDir = _path2.default.join(process.cwd(), "public");
+    const publicDir = getPublicPath();
     await scanDir(publicDir, "");
     const folders = [];
     folders.push({ path: "public", name: "public", depth: 0 });
@@ -801,28 +823,27 @@ async function handleFolderImages(request) {
     const folders = foldersParam.split(",");
     const meta = await loadMeta();
     const fileEntries = getFileEntries(meta);
-    const allImages = [];
+    const allFiles = [];
     const prefixes = folders.map((f) => {
       const rel = f.replace(/^public\/?/, "");
       return rel ? `/${rel}/` : "/";
     });
     for (const [key] of fileEntries) {
-      const fileName = _path2.default.basename(key);
-      if (!isImageFile(fileName)) continue;
       for (const prefix of prefixes) {
         if (key.startsWith(prefix) || prefix === "/" && key.startsWith("/")) {
-          allImages.push(key.slice(1));
+          allFiles.push(key.slice(1));
           break;
         }
       }
     }
     return _server.NextResponse.json({
-      count: allImages.length,
-      images: allImages
+      count: allFiles.length,
+      images: allFiles
+      // Keep as 'images' for backwards compatibility
     });
   } catch (error) {
-    console.error("Failed to get folder images:", error);
-    return _server.NextResponse.json({ error: "Failed to get folder images" }, { status: 500 });
+    console.error("Failed to get folder files:", error);
+    return _server.NextResponse.json({ error: "Failed to get folder files" }, { status: 500 });
   }
 }
 
@@ -872,7 +893,7 @@ async function handleUpload(request) {
       imageKey = newKey;
     }
     const actualFileName = _path2.default.basename(imageKey);
-    const uploadDir = _path2.default.join(process.cwd(), "public", relativeDir);
+    const uploadDir = getPublicPath(relativeDir);
     await _fs.promises.mkdir(uploadDir, { recursive: true });
     await _fs.promises.writeFile(_path2.default.join(uploadDir, actualFileName), buffer);
     if (!isMedia) {
@@ -921,7 +942,7 @@ async function handleDelete(request) {
           errors.push(`Invalid path: ${itemPath}`);
           continue;
         }
-        const absolutePath = _path2.default.join(process.cwd(), itemPath);
+        const absolutePath = getWorkspacePath(itemPath);
         const imageKey = "/" + itemPath.replace(/^public\//, "");
         const entry = meta[imageKey];
         const isPushedToCloud = _optionalChain([entry, 'optionalAccess', _18 => _18.c]) !== void 0;
@@ -935,7 +956,7 @@ async function handleDelete(request) {
                 const keyEntry = meta[key];
                 if (keyEntry && keyEntry.c === void 0) {
                   for (const thumbPath of _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, key)) {
-                    const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
+                    const absoluteThumbPath = getPublicPath(thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
                     } catch (e13) {
@@ -951,7 +972,7 @@ async function handleDelete(request) {
             if (!isInImagesFolder && entry) {
               if (!isPushedToCloud) {
                 for (const thumbPath of _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
-                  const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
+                  const absoluteThumbPath = getPublicPath(thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
                   } catch (e14) {
@@ -1007,8 +1028,8 @@ async function handleCreateFolder(request) {
       return _server.NextResponse.json({ error: "Invalid folder name" }, { status: 400 });
     }
     const safePath = (parentPath || "public").replace(/\.\./g, "");
-    const folderPath = _path2.default.join(process.cwd(), safePath, sanitizedName);
-    if (!folderPath.startsWith(_path2.default.join(process.cwd(), "public"))) {
+    const folderPath = getWorkspacePath(safePath, sanitizedName);
+    if (!folderPath.startsWith(getPublicPath())) {
       return _server.NextResponse.json({ error: "Invalid path" }, { status: 400 });
     }
     try {
@@ -1034,10 +1055,10 @@ async function handleRename(request) {
       return _server.NextResponse.json({ error: "Invalid name" }, { status: 400 });
     }
     const safePath = oldPath.replace(/\.\./g, "");
-    const absoluteOldPath = _path2.default.join(process.cwd(), safePath);
+    const absoluteOldPath = getWorkspacePath(safePath);
     const parentDir = _path2.default.dirname(absoluteOldPath);
     const absoluteNewPath = _path2.default.join(parentDir, sanitizedName);
-    if (!absoluteOldPath.startsWith(_path2.default.join(process.cwd(), "public"))) {
+    if (!absoluteOldPath.startsWith(getPublicPath())) {
       return _server.NextResponse.json({ error: "Invalid path" }, { status: 400 });
     }
     try {
@@ -1065,8 +1086,8 @@ async function handleRename(request) {
         const oldThumbPaths = _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, oldKey);
         const newThumbPaths = _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, newKey);
         for (let i = 0; i < oldThumbPaths.length; i++) {
-          const oldThumbPath = _path2.default.join(process.cwd(), "public", oldThumbPaths[i]);
-          const newThumbPath = _path2.default.join(process.cwd(), "public", newThumbPaths[i]);
+          const oldThumbPath = getPublicPath(oldThumbPaths[i]);
+          const newThumbPath = getPublicPath(newThumbPaths[i]);
           await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
           try {
             await _fs.promises.rename(oldThumbPath, newThumbPath);
@@ -1107,8 +1128,8 @@ async function handleMoveStream(request) {
           return;
         }
         const safeDestination = destination.replace(/\.\./g, "");
-        const absoluteDestination = _path2.default.join(process.cwd(), safeDestination);
-        if (!absoluteDestination.startsWith(_path2.default.join(process.cwd(), "public"))) {
+        const absoluteDestination = getWorkspacePath(safeDestination);
+        if (!absoluteDestination.startsWith(getPublicPath())) {
           sendEvent({ type: "error", message: "Invalid destination" });
           controller.close();
           return;
@@ -1190,7 +1211,7 @@ async function handleMoveStream(request) {
               meta[newKey] = newEntry;
               moved.push(itemPath);
             } else {
-              const absolutePath = _path2.default.join(process.cwd(), safePath);
+              const absolutePath = getWorkspacePath(safePath);
               if (absoluteDestination.startsWith(absolutePath + _path2.default.sep)) {
                 errors.push(`Cannot move ${itemName} into itself`);
                 continue;
@@ -1213,8 +1234,8 @@ async function handleMoveStream(request) {
                 const oldThumbPaths = _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, oldKey);
                 const newThumbPaths = _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, newKey);
                 for (let j = 0; j < oldThumbPaths.length; j++) {
-                  const oldThumbPath = _path2.default.join(process.cwd(), "public", oldThumbPaths[j]);
-                  const newThumbPath = _path2.default.join(process.cwd(), "public", newThumbPaths[j]);
+                  const oldThumbPath = getPublicPath(oldThumbPaths[j]);
+                  const newThumbPath = getPublicPath(newThumbPaths[j]);
                   await _fs.promises.mkdir(_path2.default.dirname(newThumbPath), { recursive: true });
                   try {
                     await _fs.promises.rename(oldThumbPath, newThumbPath);
@@ -1320,7 +1341,7 @@ async function handleSync(request) {
           const remoteUrl = `${existingCdnUrl}${imageKey}`;
           originalBuffer = await downloadFromRemoteUrl(remoteUrl);
         } else {
-          const originalLocalPath = _path2.default.join(process.cwd(), "public", imageKey);
+          const originalLocalPath = getPublicPath(imageKey);
           try {
             originalBuffer = await _fs.promises.readFile(originalLocalPath);
           } catch (e24) {
@@ -1339,7 +1360,7 @@ async function handleSync(request) {
         urlsToPurge.push(`${publicUrl}${imageKey}`);
         if (!isRemote && _chunkVI6QG6WTjs.isProcessed.call(void 0, entry)) {
           for (const thumbPath of _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
-            const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
+            const localPath = getPublicPath(thumbPath);
             try {
               const fileBuffer = await _fs.promises.readFile(localPath);
               await r2.send(
@@ -1357,9 +1378,9 @@ async function handleSync(request) {
         }
         entry.c = cdnIndex;
         if (!isRemote) {
-          const originalLocalPath = _path2.default.join(process.cwd(), "public", imageKey);
+          const originalLocalPath = getPublicPath(imageKey);
           for (const thumbPath of _chunkVI6QG6WTjs.getAllThumbnailPaths.call(void 0, imageKey)) {
-            const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
+            const localPath = getPublicPath(thumbPath);
             try {
               await _fs.promises.unlink(localPath);
             } catch (e26) {
@@ -1413,7 +1434,7 @@ async function handleReprocess(request) {
         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);
+        const originalPath = getPublicPath(imageKey);
         try {
           buffer = await _fs.promises.readFile(originalPath);
         } catch (e28) {
@@ -1623,7 +1644,7 @@ async function handleReprocessStream(request) {
             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);
+            const originalPath = getPublicPath(imageKey);
             try {
               buffer = await _fs.promises.readFile(originalPath);
             } catch (e32) {
@@ -1646,7 +1667,7 @@ async function handleReprocessStream(request) {
             const isSvg = ext === ".svg";
             if (isSvg) {
               const imageDir = _path2.default.dirname(imageKey.slice(1));
-              const imagesPath = _path2.default.join(process.cwd(), "public", "images", imageDir === "." ? "" : imageDir);
+              const imagesPath = getPublicPath("images", imageDir === "." ? "" : imageDir);
               await _fs.promises.mkdir(imagesPath, { recursive: true });
               const fileName = _path2.default.basename(imageKey);
               const destPath = _path2.default.join(imagesPath, fileName);
@@ -1746,7 +1767,7 @@ async function handleProcessAllStream() {
         sendEvent({ type: "start", total });
         for (let i = 0; i < imagesToProcess.length; i++) {
           const { key, entry } = imagesToProcess[i];
-          const fullPath = _path2.default.join(process.cwd(), "public", key);
+          const fullPath = getPublicPath(key);
           const existingCdnIndex = entry.c;
           const existingCdnUrl = existingCdnIndex !== void 0 ? cdnUrls[existingCdnIndex] : void 0;
           const isInOurR2 = existingCdnUrl === publicUrl;
@@ -1779,7 +1800,7 @@ async function handleProcessAllStream() {
             const isSvg = ext === ".svg";
             if (isSvg) {
               const imageDir = _path2.default.dirname(key.slice(1));
-              const imagesPath = _path2.default.join(process.cwd(), "public", "images", imageDir === "." ? "" : imageDir);
+              const imagesPath = getPublicPath("images", imageDir === "." ? "" : imageDir);
               await _fs.promises.mkdir(imagesPath, { recursive: true });
               const fileName = _path2.default.basename(key);
               const destPath = _path2.default.join(imagesPath, fileName);
@@ -1851,7 +1872,7 @@ async function handleProcessAllStream() {
           } catch (e35) {
           }
         }
-        const imagesDir = _path2.default.join(process.cwd(), "public", "images");
+        const imagesDir = getPublicPath("images");
         try {
           await findOrphans(imagesDir);
         } catch (e36) {
@@ -1941,7 +1962,7 @@ async function handleDownloadStream(request) {
           }
           try {
             const imageBuffer = await downloadFromCdn(imageKey);
-            const localPath = _path2.default.join(process.cwd(), "public", imageKey.replace(/^\//, ""));
+            const localPath = getPublicPath(imageKey.replace(/^\//, ""));
             await _fs.promises.mkdir(_path2.default.dirname(localPath), { recursive: true });
             await _fs.promises.writeFile(localPath, imageBuffer);
             await deleteThumbnailsFromCdn(imageKey);
@@ -2045,7 +2066,7 @@ async function handleScanStream() {
           } catch (e39) {
           }
         }
-        const publicDir = _path2.default.join(process.cwd(), "public");
+        const publicDir = getPublicPath();
         await scanDir(publicDir);
         const total = allFiles.length;
         sendEvent({ type: "start", total });
@@ -2072,7 +2093,7 @@ async function handleScanStream() {
               newKey = `/${baseName}-${counter}${ext}`;
             }
             const newRelativePath = `${baseName}-${counter}${ext}`;
-            const newFullPath = _path2.default.join(process.cwd(), "public", newRelativePath);
+            const newFullPath = getPublicPath(newRelativePath);
             try {
               await _fs.promises.rename(fullPath, newFullPath);
               renamed.push({ from: relativePath, to: newRelativePath });
@@ -2144,7 +2165,7 @@ async function handleScanStream() {
           } catch (e41) {
           }
         }
-        const imagesDir = _path2.default.join(process.cwd(), "public", "images");
+        const imagesDir = getPublicPath("images");
         try {
           await findOrphans(imagesDir);
         } catch (e42) {
@@ -2188,7 +2209,7 @@ async function handleDeleteOrphans(request) {
         errors.push(`Invalid path: ${orphanPath}`);
         continue;
       }
-      const fullPath = _path2.default.join(process.cwd(), "public", orphanPath);
+      const fullPath = getPublicPath(orphanPath);
       try {
         await _fs.promises.unlink(fullPath);
         deleted.push(orphanPath);
@@ -2197,7 +2218,7 @@ async function handleDeleteOrphans(request) {
         errors.push(orphanPath);
       }
     }
-    const imagesDir = _path2.default.join(process.cwd(), "public", "images");
+    const imagesDir = getPublicPath("images");
     async function removeEmptyDirs(dir) {
       try {
         const entries = await _fs.promises.readdir(dir, { withFileTypes: true });
@@ -2239,8 +2260,8 @@ async function handleDeleteOrphans(request) {
 function parseImageUrl(url) {
   const parsed = new URL(url);
   const base = `${parsed.protocol}//${parsed.host}`;
-  const path10 = parsed.pathname;
-  return { base, path: path10 };
+  const path9 = parsed.pathname;
+  return { base, path: path9 };
 }
 async function processRemoteImage(url) {
   const response = await fetch(url);
@@ -2289,20 +2310,20 @@ async function handleImportUrls(request) {
             currentFile: url
           });
           try {
-            const { base, path: path10 } = parseImageUrl(url);
-            const existingEntry = getMetaEntry(meta, path10);
+            const { base, path: path9 } = parseImageUrl(url);
+            const existingEntry = getMetaEntry(meta, path9);
             if (existingEntry) {
-              skipped.push(path10);
+              skipped.push(path9);
               continue;
             }
             const cdnIndex = getOrAddCdnIndex(meta, base);
             const imageData = await processRemoteImage(url);
-            setMetaEntry(meta, path10, {
+            setMetaEntry(meta, path9, {
               o: imageData.o,
               b: imageData.b,
               c: cdnIndex
             });
-            added.push(path10);
+            added.push(path9);
           } catch (error) {
             console.error(`Failed to import ${url}:`, error);
             errors.push(url);
@@ -2385,7 +2406,7 @@ async function handleGenerateFavicon(request) {
       error: "Source file must be named favicon.png or favicon.jpg"
     }, { status: 400 });
   }
-  const sourcePath = _path2.default.join(process.cwd(), "public", imagePath.replace(/^\//, ""));
+  const sourcePath = getPublicPath(imagePath.replace(/^\//, ""));
   try {
     await _promises2.default.access(sourcePath);
   } catch (e46) {
@@ -2397,7 +2418,7 @@ async function handleGenerateFavicon(request) {
   } catch (e47) {
     return _server.NextResponse.json({ error: "Source file is not a valid image" }, { status: 400 });
   }
-  const outputDir = _path2.default.join(process.cwd(), "src", "app");
+  const outputDir = getSrcAppPath();
   try {
     await _promises2.default.access(outputDir);
   } catch (e48) {