npm - @gallop.software/studio - Versions diffs - 2.3.26 → 2.3.28 - Mend

@gallop.software/studio 2.3.26 → 2.3.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/client/assets/index-OAEAClSN.js +79 -0
package/dist/client/index.html +1 -1
package/dist/server/index.js +99 -21
package/dist/server/index.js.map +1 -1
package/package.json +1 -1

package/dist/client/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
         font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-5mrVXxKd.js"></script>
+    <script type="module" crossorigin src="/assets/index-OAEAClSN.js"></script>
   </head>
   <body>
     <div id="root"></div>

package/dist/server/index.js CHANGED Viewed

@@ -386,6 +386,20 @@ async function deleteThumbnailsFromCdn(imageKey) {
     }
   }
 }
+async function deleteOriginalFromCdn(imageKey) {
+  const bucketName = process.env.CLOUDFLARE_R2_BUCKET_NAME;
+  if (!bucketName) throw new Error("R2 bucket not configured");
+  const r2 = getR2Client();
+  try {
+    await r2.send(
+      new DeleteObjectCommand({
+        Bucket: bucketName,
+        Key: imageKey.replace(/^\//, "")
+      })
+    );
+  } catch {
+  }
+}
 // src/handlers/utils/response.ts
 function jsonResponse(data, init) {
@@ -1258,6 +1272,7 @@ async function handleCreateFolder(request) {
   }
 }
 async function handleRename(request) {
+  const publicUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL?.replace(/\/$/, "");
   try {
     const { oldPath, newName } = await request.json();
     if (!oldPath || !newName) {
@@ -1268,48 +1283,109 @@ async function handleRename(request) {
     if (!absoluteOldPath.startsWith(getPublicPath())) {
       return jsonResponse({ error: "Invalid path" }, { status: 400 });
     }
+    const oldRelativePath = safePath.replace(/^public\//, "");
+    const oldKey = "/" + oldRelativePath;
+    const isImage = isImageFile(path6.basename(oldPath));
+    const meta = await loadMeta();
+    const cdnUrls = getCdnUrls(meta);
+    const entry = meta[oldKey];
+    const isInCloud = entry?.c !== void 0;
+    const fileCdnUrl = isInCloud && entry.c !== void 0 ? cdnUrls[entry.c] : void 0;
+    const isInOurR2 = isInCloud && fileCdnUrl === publicUrl;
+    const hasThumbnails = entry ? isProcessed(entry) : false;
+    let hasLocalFile = false;
+    let isFile = true;
     try {
-      await fs6.access(absoluteOldPath);
+      const stats = await fs6.stat(absoluteOldPath);
+      hasLocalFile = true;
+      isFile = stats.isFile();
     } catch {
-      return jsonResponse({ error: "File or folder not found" }, { status: 404 });
+      if (!isInCloud) {
+        return jsonResponse({ error: "File or folder not found" }, { status: 404 });
+      }
     }
-    const stats = await fs6.stat(absoluteOldPath);
-    const isFile = stats.isFile();
-    const isImage = isFile && isImageFile(path6.basename(oldPath));
     const sanitizedName = isFile ? slugifyFilename(newName) : slugifyFolderName(newName);
     if (!sanitizedName) {
       return jsonResponse({ error: "Invalid name" }, { status: 400 });
     }
     const parentDir = path6.dirname(absoluteOldPath);
     const absoluteNewPath = path6.join(parentDir, sanitizedName);
+    const newRelativePath = path6.join(path6.dirname(oldRelativePath), sanitizedName);
+    const newKey = "/" + newRelativePath;
+    if (meta[newKey]) {
+      return jsonResponse({ error: "An item with this name already exists" }, { status: 400 });
+    }
     try {
       await fs6.access(absoluteNewPath);
       return jsonResponse({ error: "An item with this name already exists" }, { status: 400 });
     } catch {
     }
-    await fs6.rename(absoluteOldPath, absoluteNewPath);
-    if (isImage) {
-      const meta = await loadMeta();
-      const oldRelativePath = safePath.replace(/^public\//, "");
-      const newRelativePath = path6.join(path6.dirname(oldRelativePath), sanitizedName);
-      const oldKey = "/" + oldRelativePath;
-      const newKey = "/" + newRelativePath;
-      if (meta[oldKey]) {
-        const entry = meta[oldKey];
-        const oldThumbPaths = getAllThumbnailPaths(oldKey);
+    if (isInOurR2 && !hasLocalFile && isImage) {
+      const buffer = await downloadFromCdn(oldKey);
+      await fs6.mkdir(path6.dirname(absoluteNewPath), { recursive: true });
+      await fs6.writeFile(absoluteNewPath, buffer);
+      if (hasThumbnails) {
         const newThumbPaths = getAllThumbnailPaths(newKey);
+        const oldThumbPaths = getAllThumbnailPaths(oldKey);
         for (let i = 0; i < oldThumbPaths.length; i++) {
-          const oldThumbPath = getPublicPath(oldThumbPaths[i]);
-          const newThumbPath = getPublicPath(newThumbPaths[i]);
-          await fs6.mkdir(path6.dirname(newThumbPath), { recursive: true });
           try {
-            await fs6.rename(oldThumbPath, newThumbPath);
+            const thumbBuffer = await downloadFromCdn(oldThumbPaths[i]);
+            const newThumbLocalPath = getPublicPath(newThumbPaths[i]);
+            await fs6.mkdir(path6.dirname(newThumbLocalPath), { recursive: true });
+            await fs6.writeFile(newThumbLocalPath, thumbBuffer);
           } catch {
           }
         }
-        delete meta[oldKey];
-        meta[newKey] = entry;
       }
+      await deleteFromCdn(oldKey, hasThumbnails);
+      await uploadOriginalToCdn(newKey);
+      if (hasThumbnails) {
+        await uploadToCdn(newKey);
+      }
+      try {
+        await fs6.unlink(absoluteNewPath);
+      } catch {
+      }
+      if (hasThumbnails) {
+        await deleteLocalThumbnails(newKey);
+      }
+      delete meta[oldKey];
+      meta[newKey] = entry;
+      await saveMeta(meta);
+      const newPath2 = path6.join(path6.dirname(safePath), sanitizedName);
+      return jsonResponse({ success: true, newPath: newPath2 });
+    }
+    if (hasLocalFile) {
+      await fs6.rename(absoluteOldPath, absoluteNewPath);
+    }
+    if (isImage && entry) {
+      const oldThumbPaths = getAllThumbnailPaths(oldKey);
+      const newThumbPaths = getAllThumbnailPaths(newKey);
+      for (let i = 0; i < oldThumbPaths.length; i++) {
+        const oldThumbPath = getPublicPath(oldThumbPaths[i]);
+        const newThumbPath = getPublicPath(newThumbPaths[i]);
+        await fs6.mkdir(path6.dirname(newThumbPath), { recursive: true });
+        try {
+          await fs6.rename(oldThumbPath, newThumbPath);
+        } catch {
+        }
+      }
+      if (isInOurR2) {
+        const buffer = await fs6.readFile(absoluteNewPath);
+        await fs6.mkdir(path6.dirname(absoluteNewPath), { recursive: true });
+        await deleteFromCdn(oldKey, hasThumbnails);
+        await uploadOriginalToCdn(newKey);
+        if (hasThumbnails) {
+          await uploadToCdn(newKey);
+        }
+        try {
+          await fs6.unlink(absoluteNewPath);
+        } catch {
+        }
+        await deleteLocalThumbnails(newKey);
+      }
+      delete meta[oldKey];
+      meta[newKey] = entry;
       await saveMeta(meta);
     }
     const newPath = path6.join(path6.dirname(safePath), sanitizedName);
@@ -1914,7 +1990,9 @@ async function handleReprocessStream(request) {
               const updatedEntry = await processImage(buffer, imageKey);
               if (isInOurR2) {
                 updatedEntry.c = existingCdnIndex;
+                await deleteOriginalFromCdn(imageKey);
                 await deleteThumbnailsFromCdn(imageKey);
+                await uploadOriginalToCdn(imageKey);
                 await uploadToCdn(imageKey);
                 await deleteLocalThumbnails(imageKey);
                 try {