@gallop.software/studio 0.1.90 → 0.1.92

package/dist/handlers/index.d.mts

@@ -1,4 +1,4 @@
-import { F as FileItem } from '../types-DzM_J-55.mjs';
+import { F as FileItem } from '../types-C4hCz2w8.mjs';
 import { NextRequest, NextResponse } from 'next/server';
 
 /**

package/dist/handlers/index.d.ts

@@ -1,4 +1,4 @@
-import { F as FileItem } from '../types-DzM_J-55.js';
+import { F as FileItem } from '../types-C4hCz2w8.js';
 import { NextRequest, NextResponse } from 'next/server';
 
 /**

package/dist/handlers/index.js

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunkJWAAU3NNjs = require('../chunk-JWAAU3NN.js');
+var _chunkL36EH3PMjs = require('../chunk-L36EH3PM.js');
 
 // src/handlers/index.ts
 var _server = require('next/server');
@@ -156,7 +156,7 @@ async function uploadToCdn(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 _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+  for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
     const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
     try {
       const fileBuffer = await _fs.promises.readFile(localPath);
@@ -173,7 +173,7 @@ async function uploadToCdn(imageKey) {
   }
 }
 async function deleteLocalThumbnails(imageKey) {
-  for (const thumbPath of _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+  for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
     const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
     try {
       await _fs.promises.unlink(localPath);
@@ -222,13 +222,13 @@ async function handleList(request) {
       } else {
         const fileName = remaining;
         const isImage = isImageFile(fileName);
-        const isSynced = entry.c === 1;
+        const isPushedToCloud = entry.c === 1;
         let thumbnail;
         let hasThumbnail = false;
         let fileSize;
         if (isImage && (entry.w || entry.b)) {
-          const thumbPath = _chunkJWAAU3NNjs.getThumbnailPath.call(void 0, key, "sm");
-          if (isSynced) {
+          const thumbPath = _chunkL36EH3PMjs.getThumbnailPath.call(void 0, key, "sm");
+          if (isPushedToCloud) {
             const cdnUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_R2_PUBLIC_URL;
             if (cdnUrl) {
               thumbnail = `${cdnUrl}${thumbPath}`;
@@ -249,7 +249,7 @@ async function handleList(request) {
           thumbnail = key;
           hasThumbnail = false;
         }
-        if (!isSynced) {
+        if (!isPushedToCloud) {
           try {
             const filePath = _path2.default.join(process.cwd(), "public", key);
             const stats = await _fs.promises.stat(filePath);
@@ -264,7 +264,8 @@ async function handleList(request) {
           size: fileSize,
           thumbnail,
           hasThumbnail,
-          cdnSynced: isSynced,
+          isProcessed: entry.p === 1,
+          cdnPushed: isPushedToCloud,
           dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
         });
       }
@@ -289,12 +290,12 @@ async function handleSearch(request) {
       const fileName = _path2.default.basename(key);
       const relativePath = key.slice(1);
       const isImage = isImageFile(fileName);
-      const isSynced = entry.c === 1;
+      const isPushedToCloud = entry.c === 1;
       let thumbnail;
       let hasThumbnail = false;
       if (isImage && (entry.w || entry.b)) {
-        const thumbPath = _chunkJWAAU3NNjs.getThumbnailPath.call(void 0, key, "sm");
-        if (isSynced) {
+        const thumbPath = _chunkL36EH3PMjs.getThumbnailPath.call(void 0, key, "sm");
+        if (isPushedToCloud) {
           const cdnUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_R2_PUBLIC_URL;
           if (cdnUrl) {
             thumbnail = `${cdnUrl}${thumbPath}`;
@@ -321,7 +322,8 @@ async function handleSearch(request) {
         type: "file",
         thumbnail,
         hasThumbnail,
-        cdnSynced: isSynced,
+        isProcessed: entry.p === 1,
+        cdnPushed: isPushedToCloud,
         dimensions: entry.w && entry.h ? { width: entry.w, height: entry.h } : void 0
       });
     }
@@ -513,7 +515,7 @@ async function handleDelete(request) {
         const absolutePath = _path2.default.join(process.cwd(), itemPath);
         const imageKey = "/" + itemPath.replace(/^public\//, "");
         const entry = meta[imageKey];
-        const isSynced = _optionalChain([entry, 'optionalAccess', _5 => _5.c]) === 1;
+        const isPushedToCloud = _optionalChain([entry, 'optionalAccess', _5 => _5.c]) === 1;
         try {
           const stats = await _fs.promises.stat(absolutePath);
           if (stats.isDirectory()) {
@@ -522,7 +524,7 @@ async function handleDelete(request) {
             for (const key of Object.keys(meta)) {
               if (key.startsWith(prefix) || key === imageKey) {
                 if (!meta[key].c) {
-                  for (const thumbPath of _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, key)) {
+                  for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, key)) {
                     const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                     try {
                       await _fs.promises.unlink(absoluteThumbPath);
@@ -537,8 +539,8 @@ async function handleDelete(request) {
             await _fs.promises.unlink(absolutePath);
             const isInImagesFolder = itemPath.startsWith("public/images/");
             if (!isInImagesFolder && entry) {
-              if (!isSynced) {
-                for (const thumbPath of _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+              if (!isPushedToCloud) {
+                for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
                   const absoluteThumbPath = _path2.default.join(process.cwd(), "public", thumbPath);
                   try {
                     await _fs.promises.unlink(absoluteThumbPath);
@@ -650,8 +652,8 @@ async function handleRename(request) {
       const newKey = "/" + newRelativePath;
       if (meta[oldKey]) {
         const entry = meta[oldKey];
-        const oldThumbPaths = _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, oldKey);
-        const newThumbPaths = _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, newKey);
+        const oldThumbPaths = _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, oldKey);
+        const newThumbPaths = _chunkL36EH3PMjs.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]);
@@ -730,8 +732,8 @@ async function handleMove(request) {
           const newKey = "/" + newRelativePath;
           if (meta[oldKey]) {
             const entry = meta[oldKey];
-            const oldThumbPaths = _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, oldKey);
-            const newThumbPaths = _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, newKey);
+            const oldThumbPaths = _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, oldKey);
+            const newThumbPaths = _chunkL36EH3PMjs.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]);
@@ -793,7 +795,7 @@ async function handleSync(request) {
       endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
       credentials: { accessKeyId, secretAccessKey }
     });
-    const synced = [];
+    const pushed = [];
     const errors = [];
     for (const imageKey of imageKeys) {
       const entry = meta[imageKey];
@@ -802,7 +804,11 @@ async function handleSync(request) {
         continue;
       }
       if (entry.c) {
-        synced.push(imageKey);
+        pushed.push(imageKey);
+        continue;
+      }
+      if (!entry.p) {
+        errors.push(`Image not processed: ${imageKey}. Run Process Images first.`);
         continue;
       }
       try {
@@ -821,7 +827,7 @@ async function handleSync(request) {
           errors.push(`Original file not found: ${imageKey}`);
           continue;
         }
-        for (const thumbPath of _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+        for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
           const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
           try {
             const fileBuffer = await _fs.promises.readFile(localPath);
@@ -837,7 +843,7 @@ async function handleSync(request) {
           }
         }
         entry.c = 1;
-        for (const thumbPath of _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+        for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
           const localPath = _path2.default.join(process.cwd(), "public", thumbPath);
           try {
             await _fs.promises.unlink(localPath);
@@ -848,16 +854,16 @@ async function handleSync(request) {
           await _fs.promises.unlink(originalLocalPath);
         } catch (e22) {
         }
-        synced.push(imageKey);
+        pushed.push(imageKey);
       } catch (error) {
-        console.error(`Failed to sync ${imageKey}:`, error);
-        errors.push(`Failed to sync: ${imageKey}`);
+        console.error(`Failed to push ${imageKey}:`, error);
+        errors.push(`Failed to push: ${imageKey}`);
       }
     }
     await saveMeta(meta);
     return _server.NextResponse.json({
       success: true,
-      synced,
+      pushed,
       errors: errors.length > 0 ? errors : void 0
     });
   } catch (error) {
@@ -878,12 +884,12 @@ async function handleReprocess(request) {
       try {
         let buffer;
         const entry = meta[imageKey];
-        const isSynced = _optionalChain([entry, 'optionalAccess', _6 => _6.c]) === 1;
+        const isPushedToCloud = _optionalChain([entry, 'optionalAccess', _6 => _6.c]) === 1;
         const originalPath = _path2.default.join(process.cwd(), "public", imageKey);
         try {
           buffer = await _fs.promises.readFile(originalPath);
         } catch (e23) {
-          if (isSynced) {
+          if (isPushedToCloud) {
             buffer = await downloadFromCdn(imageKey);
             const dir = _path2.default.dirname(originalPath);
             await _fs.promises.mkdir(dir, { recursive: true });
@@ -893,7 +899,7 @@ async function handleReprocess(request) {
           }
         }
         const updatedEntry = await processImage(buffer, imageKey);
-        if (isSynced) {
+        if (isPushedToCloud) {
           updatedEntry.c = 1;
           await uploadToCdn(imageKey);
           await deleteLocalThumbnails(imageKey);
@@ -934,20 +940,23 @@ async function handleProcessAllStream() {
         const processed = [];
         const errors = [];
         const orphansRemoved = [];
+        let alreadyProcessed = 0;
         const imagesToProcess = [];
         for (const [key, entry] of Object.entries(meta)) {
-          if (entry.c) continue;
           const fileName = _path2.default.basename(key);
           if (!isImageFile(fileName)) continue;
-          if (!entry.b) {
+          if (!entry.p) {
             imagesToProcess.push({ key, entry });
+          } else {
+            alreadyProcessed++;
           }
         }
         const total = imagesToProcess.length;
         sendEvent({ type: "start", total });
         for (let i = 0; i < imagesToProcess.length; i++) {
-          const { key } = imagesToProcess[i];
+          const { key, entry } = imagesToProcess[i];
           const fullPath = _path2.default.join(process.cwd(), "public", key);
+          const isInCloud = entry.c === 1;
           sendEvent({
             type: "progress",
             current: i + 1,
@@ -957,7 +966,15 @@ async function handleProcessAllStream() {
             // Remove leading /
           });
           try {
-            const buffer = await _fs.promises.readFile(fullPath);
+            let buffer;
+            if (isInCloud) {
+              buffer = await downloadFromCdn(key);
+              const dir = _path2.default.dirname(fullPath);
+              await _fs.promises.mkdir(dir, { recursive: true });
+              await _fs.promises.writeFile(fullPath, buffer);
+            } else {
+              buffer = await _fs.promises.readFile(fullPath);
+            }
             const ext = _path2.default.extname(key).toLowerCase();
             const isSvg = ext === ".svg";
             if (isSvg) {
@@ -968,13 +985,27 @@ async function handleProcessAllStream() {
               const destPath = _path2.default.join(imagesPath, fileName);
               await _fs.promises.writeFile(destPath, buffer);
               meta[key] = {
+                ...entry,
                 w: 0,
                 h: 0,
-                b: ""
+                b: "",
+                p: 1
               };
             } else {
               const processedEntry = await processImage(buffer, key);
-              meta[key] = processedEntry;
+              meta[key] = {
+                ...processedEntry,
+                p: 1,
+                ...isInCloud ? { c: 1 } : {}
+              };
+            }
+            if (isInCloud) {
+              await uploadToCdn(key);
+              await deleteLocalThumbnails(key);
+              try {
+                await _fs.promises.unlink(fullPath);
+              } catch (e25) {
+              }
             }
             processed.push(key.slice(1));
           } catch (error) {
@@ -986,7 +1017,7 @@ async function handleProcessAllStream() {
         const trackedPaths = /* @__PURE__ */ new Set();
         for (const imageKey of Object.keys(meta)) {
           if (!meta[imageKey].c) {
-            for (const thumbPath of _chunkJWAAU3NNjs.getAllThumbnailPaths.call(void 0, imageKey)) {
+            for (const thumbPath of _chunkL36EH3PMjs.getAllThumbnailPaths.call(void 0, imageKey)) {
               trackedPaths.add(thumbPath);
             }
           }
@@ -1012,13 +1043,13 @@ async function handleProcessAllStream() {
                 }
               }
             }
-          } catch (e25) {
+          } catch (e26) {
           }
         }
         const imagesDir = _path2.default.join(process.cwd(), "public", "images");
         try {
           await findOrphans(imagesDir);
-        } catch (e26) {
+        } catch (e27) {
         }
         async function removeEmptyDirs(dir) {
           try {
@@ -1036,18 +1067,19 @@ async function handleProcessAllStream() {
               await _fs.promises.rmdir(dir);
             }
             return isEmpty;
-          } catch (e27) {
+          } catch (e28) {
             return true;
           }
         }
         try {
           await removeEmptyDirs(imagesDir);
-        } catch (e28) {
+        } catch (e29) {
         }
         await saveMeta(meta);
         sendEvent({
           type: "complete",
           processed: processed.length,
+          alreadyProcessed,
           orphansRemoved: orphansRemoved.length,
           errors: errors.length
         });
@@ -1102,7 +1134,7 @@ async function handleScanStream() {
                 allFiles.push({ relativePath: relPath, fullPath });
               }
             }
-          } catch (e29) {
+          } catch (e30) {
           }
         }
         const publicDir = _path2.default.join(process.cwd(), "public");
@@ -1158,7 +1190,7 @@ async function handleScanStream() {
                     w: metadata.width || 0,
                     h: metadata.height || 0
                   };
-                } catch (e30) {
+                } catch (e31) {
                   meta[imageKey] = { w: 0, h: 0 };
                 }
               }