@gallop.software/studio 2.3.25 → 2.3.27

package/dist/server/index.js

@@ -95,6 +95,17 @@ function getFileEntries(meta) {
 
 // src/handlers/utils/files.ts
 import path2 from "path";
+function slugifyFilename(filename) {
+  const ext = path2.extname(filename).toLowerCase();
+  const baseName = path2.basename(filename, path2.extname(filename));
+  const slugged = baseName.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "").replace(/[_\s]+/g, "-").replace(/[^a-z0-9-]/g, "").replace(/-+/g, "-").replace(/^-|-$/g, "");
+  const finalSlug = slugged || "file";
+  return finalSlug + ext;
+}
+function slugifyFolderName(name) {
+  const slugged = name.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "").replace(/[_\s]+/g, "-").replace(/[^a-z0-9-]/g, "").replace(/-+/g, "-").replace(/^-|-$/g, "");
+  return slugged || "folder";
+}
 function isImageFile(filename) {
   const ext = path2.extname(filename).toLowerCase();
   return [".jpg", ".jpeg", ".png", ".gif", ".webp", ".svg", ".ico", ".bmp", ".tiff", ".tif"].includes(ext);
@@ -375,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) {
@@ -1033,7 +1058,7 @@ async function handleUpload(request) {
     }
     const bytes = await file.arrayBuffer();
     const buffer = Buffer.from(bytes);
-    const fileName = file.name;
+    const fileName = slugifyFilename(file.name);
     const ext = path6.extname(fileName).toLowerCase();
     const isImage = isImageFile(fileName);
     const isMedia = isMediaFile(fileName);
@@ -1225,7 +1250,7 @@ async function handleCreateFolder(request) {
     if (!name || typeof name !== "string") {
       return jsonResponse({ error: "Folder name is required" }, { status: 400 });
     }
-    const sanitizedName = name.replace(/[<>:"/\\|?*]/g, "").trim();
+    const sanitizedName = slugifyFolderName(name);
     if (!sanitizedName) {
       return jsonResponse({ error: "Invalid folder name" }, { status: 400 });
     }
@@ -1252,14 +1277,8 @@ async function handleRename(request) {
     if (!oldPath || !newName) {
       return jsonResponse({ error: "Path and new name are required" }, { status: 400 });
     }
-    const sanitizedName = newName.replace(/[<>:"/\\|?*]/g, "").trim();
-    if (!sanitizedName) {
-      return jsonResponse({ error: "Invalid name" }, { status: 400 });
-    }
     const safePath = oldPath.replace(/\.\./g, "");
     const absoluteOldPath = getWorkspacePath(safePath);
-    const parentDir = path6.dirname(absoluteOldPath);
-    const absoluteNewPath = path6.join(parentDir, sanitizedName);
     if (!absoluteOldPath.startsWith(getPublicPath())) {
       return jsonResponse({ error: "Invalid path" }, { status: 400 });
     }
@@ -1268,14 +1287,20 @@ async function handleRename(request) {
     } catch {
       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);
     try {
       await fs6.access(absoluteNewPath);
       return jsonResponse({ error: "An item with this name already exists" }, { status: 400 });
     } catch {
     }
-    const stats = await fs6.stat(absoluteOldPath);
-    const isFile = stats.isFile();
-    const isImage = isFile && isImageFile(path6.basename(oldPath));
     await fs6.rename(absoluteOldPath, absoluteNewPath);
     if (isImage) {
       const meta = await loadMeta();
@@ -1903,7 +1928,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 {
@@ -2363,6 +2390,26 @@ async function handleScanStream() {
             }
             continue;
           }
+          const dirName = path8.dirname(relativePath);
+          const originalFileName = path8.basename(relativePath);
+          const sluggedFileName = slugifyFilename(originalFileName);
+          if (sluggedFileName !== originalFileName) {
+            const newRelativePath = dirName === "." ? sluggedFileName : `${dirName}/${sluggedFileName}`;
+            const newFullPath = getPublicPath(newRelativePath);
+            const newKey = "/" + newRelativePath;
+            if (!meta[newKey] && !existingKeys.has(newKey)) {
+              try {
+                await fs8.mkdir(path8.dirname(newFullPath), { recursive: true });
+                await fs8.rename(fullPath, newFullPath);
+                renamed.push({ from: relativePath, to: newRelativePath });
+                relativePath = newRelativePath;
+                fullPath = newFullPath;
+                imageKey = newKey;
+              } catch (err) {
+                console.error(`Failed to slugify ${relativePath}:`, err);
+              }
+            }
+          }
           if (meta[imageKey]) {
             const ext = path8.extname(relativePath);
             const baseName = relativePath.slice(0, -ext.length);