@gallop.software/studio 2.3.85 → 2.3.87

package/dist/server/index.js

@@ -148,13 +148,16 @@ var DEFAULT_SIZES = {
   large: { width: 1400, suffix: "-lg", key: "lg" }
 };
 async function processImage(buffer, imageKey) {
-  const sharpInstance = sharp(buffer);
-  const metadata = await sharpInstance.metadata();
+  const rotatedBuffer = await sharp(buffer).rotate().toBuffer();
+  const metadata = await sharp(rotatedBuffer).metadata();
   const originalWidth = metadata.width || 0;
   const originalHeight = metadata.height || 0;
   const ratio = originalHeight / originalWidth;
   const keyWithoutSlash = imageKey.startsWith("/") ? imageKey.slice(1) : imageKey;
-  const baseName = path3.basename(keyWithoutSlash, path3.extname(keyWithoutSlash));
+  const baseName = path3.basename(
+    keyWithoutSlash,
+    path3.extname(keyWithoutSlash)
+  );
   const ext = path3.extname(keyWithoutSlash).toLowerCase();
   const imageDir = path3.dirname(keyWithoutSlash);
   const imagesPath = getPublicPath("images", imageDir === "." ? "" : imageDir);
@@ -172,15 +175,15 @@ async function processImage(buffer, imageKey) {
     fullWidth = FULL_MAX_WIDTH;
     fullHeight = Math.round(FULL_MAX_WIDTH * ratio);
     if (isPng) {
-      await sharp(buffer).resize(fullWidth, fullHeight).png({ quality: 85 }).toFile(fullPath);
+      await sharp(rotatedBuffer).resize(fullWidth, fullHeight).png({ quality: 85 }).toFile(fullPath);
     } else {
-      await sharp(buffer).resize(fullWidth, fullHeight).jpeg({ quality: 85 }).toFile(fullPath);
+      await sharp(rotatedBuffer).resize(fullWidth, fullHeight).jpeg({ quality: 85 }).toFile(fullPath);
     }
   } else {
     if (isPng) {
-      await sharp(buffer).png({ quality: 85 }).toFile(fullPath);
+      await sharp(rotatedBuffer).png({ quality: 85 }).toFile(fullPath);
     } else {
-      await sharp(buffer).jpeg({ quality: 85 }).toFile(fullPath);
+      await sharp(rotatedBuffer).jpeg({ quality: 85 }).toFile(fullPath);
     }
   }
   entry.f = { w: fullWidth, h: fullHeight };
@@ -194,9 +197,9 @@ async function processImage(buffer, imageKey) {
     const sizeFilePath = imageDir === "." ? sizeFileName : `${imageDir}/${sizeFileName}`;
     const sizePath = getPublicPath("images", sizeFilePath);
     if (isPng) {
-      await sharp(buffer).resize(maxWidth, newHeight).png({ quality: 80 }).toFile(sizePath);
+      await sharp(rotatedBuffer).resize(maxWidth, newHeight).png({ quality: 80 }).toFile(sizePath);
     } else {
-      await sharp(buffer).resize(maxWidth, newHeight).jpeg({ quality: 80 }).toFile(sizePath);
+      await sharp(rotatedBuffer).resize(maxWidth, newHeight).jpeg({ quality: 80 }).toFile(sizePath);
     }
     entry[key] = { w: maxWidth, h: newHeight };
   }
@@ -1158,7 +1161,11 @@ async function cleanupEmptyFoldersRecursive(dir) {
 // src/handlers/images.ts
 import { promises as fs6 } from "fs";
 import path6 from "path";
-import { S3Client as S3Client2, PutObjectCommand as PutObjectCommand2, DeleteObjectCommand as DeleteObjectCommand2 } from "@aws-sdk/client-s3";
+import {
+  S3Client as S3Client2,
+  PutObjectCommand as PutObjectCommand2,
+  DeleteObjectCommand as DeleteObjectCommand2
+} from "@aws-sdk/client-s3";
 var cancelledOperations = /* @__PURE__ */ new Set();
 function cancelOperation(operationId) {
   cancelledOperations.add(operationId);
@@ -1178,7 +1185,9 @@ async function handleSync(request) {
   const publicUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL?.replace(/\/\s*$/, "");
   if (!accountId || !accessKeyId || !secretAccessKey || !bucketName || !publicUrl) {
     return jsonResponse(
-      { error: "R2 not configured. Set CLOUDFLARE_R2_* environment variables." },
+      {
+        error: "R2 not configured. Set CLOUDFLARE_R2_* environment variables."
+      },
       { status: 400 }
     );
   }
@@ -1303,15 +1312,20 @@ async function handleSyncStream(request) {
     async start(controller) {
       const sendEvent = (data) => {
         try {
-          controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
+          controller.enqueue(
+            encoder.encode(`data: ${JSON.stringify(data)}
 
-`));
+`)
+          );
         } catch {
         }
       };
       try {
         if (!accountId || !accessKeyId || !secretAccessKey || !bucketName || !publicUrl) {
-          sendEvent({ type: "error", message: "R2 not configured. Set CLOUDFLARE_R2_* environment variables." });
+          sendEvent({
+            type: "error",
+            message: "R2 not configured. Set CLOUDFLARE_R2_* environment variables."
+          });
           controller.close();
           return;
         }
@@ -1360,7 +1374,9 @@ async function handleSyncStream(request) {
           }
           const entry = getMetaEntry(meta, imageKey);
           if (!entry) {
-            errors.push(`Image not found in meta: ${imageKey}. Run Scan first.`);
+            errors.push(
+              `Image not found in meta: ${imageKey}. Run Scan first.`
+            );
             sendEvent({
               type: "progress",
               current: i + 1,
@@ -1495,7 +1511,7 @@ async function handleSyncStream(request) {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      "Connection": "keep-alive"
+      Connection: "keep-alive"
     }
   });
 }
@@ -1534,7 +1550,13 @@ async function handleUnprocessStream(request) {
           if (isCancelled()) {
             await saveMeta(meta);
             if (operationId) clearCancelledOperation(operationId);
-            sendEvent({ type: "complete", processed: removed.length, errors: errors.length, message: `Stopped. Removed thumbnails for ${removed.length} image${removed.length !== 1 ? "s" : ""}.`, cancelled: true });
+            sendEvent({
+              type: "complete",
+              processed: removed.length,
+              errors: errors.length,
+              message: `Stopped. Removed thumbnails for ${removed.length} image${removed.length !== 1 ? "s" : ""}.`,
+              cancelled: true
+            });
             controller.close();
             return;
           }
@@ -1676,7 +1698,13 @@ async function handleReprocessStream(request) {
           if (isCancelled()) {
             await saveMeta(meta);
             if (operationId) clearCancelledOperation(operationId);
-            sendEvent({ type: "complete", processed: processed.length, errors: errors.length, message: `Stopped. Generated thumbnails for ${processed.length} image${processed.length !== 1 ? "s" : ""}.`, cancelled: true });
+            sendEvent({
+              type: "complete",
+              processed: processed.length,
+              errors: errors.length,
+              message: `Stopped. Generated thumbnails for ${processed.length} image${processed.length !== 1 ? "s" : ""}.`,
+              cancelled: true
+            });
             controller.close();
             return;
           }
@@ -1714,7 +1742,10 @@ async function handleReprocessStream(request) {
             const isSvg = ext === ".svg";
             if (isSvg) {
               const imageDir = path6.dirname(imageKey.slice(1));
-              const imagesPath = getPublicPath("images", imageDir === "." ? "" : imageDir);
+              const imagesPath = getPublicPath(
+                "images",
+                imageDir === "." ? "" : imageDir
+              );
               await fs6.mkdir(imagesPath, { recursive: true });
               const fileName = path6.basename(imageKey);
               const destPath = path6.join(imagesPath, fileName);
@@ -1805,9 +1836,11 @@ async function handleDownloadStream(request) {
       const encoder = new TextEncoder();
       const sendEvent = (data) => {
         try {
-          controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
+          controller.enqueue(
+            encoder.encode(`data: ${JSON.stringify(data)}
 
-`));
+`)
+          );
         } catch {
         }
       };
@@ -1920,7 +1953,7 @@ async function handleDownloadStream(request) {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      "Connection": "keep-alive"
+      Connection: "keep-alive"
     }
   });
 }
@@ -1944,8 +1977,8 @@ async function handlePushUpdatesStream(request) {
           controller.close();
           return;
         }
-        const { paths, operationId } = await request.json();
-        if (!paths || !Array.isArray(paths) || paths.length === 0) {
+        const { paths: inputPaths, operationId } = await request.json();
+        if (!inputPaths || !Array.isArray(inputPaths) || inputPaths.length === 0) {
           sendEvent({ type: "error", message: "No paths provided" });
           controller.close();
           return;
@@ -1959,16 +1992,45 @@ async function handlePushUpdatesStream(request) {
         const meta = await loadMeta();
         const cdnUrls = getCdnUrls(meta);
         const r2PublicUrl = publicUrl.replace(/\/$/, "");
+        const paths = [];
+        for (const inputPath of inputPaths) {
+          const key = inputPath.startsWith("public/") ? "/" + inputPath.slice(7) : inputPath;
+          const isFolder = !key.match(/\.[a-zA-Z0-9]+$/);
+          if (isFolder) {
+            const folderPrefix = key.endsWith("/") ? key : key + "/";
+            for (const [metaKey, entry] of Object.entries(meta)) {
+              if (metaKey.startsWith(folderPrefix) && entry && typeof entry === "object" && "u" in entry && entry.u === 1) {
+                paths.push(metaKey);
+              }
+            }
+          } else {
+            paths.push(inputPath);
+          }
+        }
         const pushed = [];
         const skipped = [];
         const errors = [];
         const total = paths.length;
+        if (total === 0) {
+          sendEvent({
+            type: "complete",
+            pushed: 0,
+            message: "No files with pending updates found."
+          });
+          controller.close();
+          return;
+        }
         sendEvent({ type: "start", total });
         for (let i = 0; i < paths.length; i++) {
           if (isCancelled()) {
             await saveMeta(meta);
             if (operationId) clearCancelledOperation(operationId);
-            sendEvent({ type: "complete", pushed: pushed.length, message: `Stopped. ${pushed.length} file${pushed.length !== 1 ? "s" : ""} pushed.`, cancelled: true });
+            sendEvent({
+              type: "complete",
+              pushed: pushed.length,
+              message: `Stopped. ${pushed.length} file${pushed.length !== 1 ? "s" : ""} pushed.`,
+              cancelled: true
+            });
             controller.close();
             return;
           }
@@ -2006,18 +2068,22 @@ async function handlePushUpdatesStream(request) {
             const contentType = getContentType(path6.basename(key));
             const uploadKey = key.startsWith("/") ? key.slice(1) : key;
             try {
-              await s3.send(new DeleteObjectCommand2({
-                Bucket: bucketName,
-                Key: uploadKey
-              }));
+              await s3.send(
+                new DeleteObjectCommand2({
+                  Bucket: bucketName,
+                  Key: uploadKey
+                })
+              );
             } catch {
             }
-            await s3.send(new PutObjectCommand2({
-              Bucket: bucketName,
-              Key: uploadKey,
-              Body: buffer,
-              ContentType: contentType
-            }));
+            await s3.send(
+              new PutObjectCommand2({
+                Bucket: bucketName,
+                Key: uploadKey,
+                Body: buffer,
+                ContentType: contentType
+              })
+            );
             if (isProcessed(entry)) {
               await deleteThumbnailsFromCdn(key);
               const processedEntry = await processImage(buffer, key);
@@ -2083,7 +2149,7 @@ async function handlePushUpdatesStream(request) {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      "Connection": "keep-alive"
+      Connection: "keep-alive"
     }
   });
 }
@@ -2091,22 +2157,43 @@ async function handleCancelStreamOperation(request) {
   try {
     const { operationId } = await request.json();
     if (!operationId || typeof operationId !== "string") {
-      return jsonResponse({ error: "No operation ID provided" }, { status: 400 });
+      return jsonResponse(
+        { error: "No operation ID provided" },
+        { status: 400 }
+      );
     }
     cancelOperation(operationId);
     return jsonResponse({ success: true, operationId });
   } catch (error) {
     console.error("Failed to cancel operation:", error);
-    return jsonResponse({ error: "Failed to cancel operation" }, { status: 500 });
+    return jsonResponse(
+      { error: "Failed to cancel operation" },
+      { status: 500 }
+    );
   }
 }
 async function handleCancelUpdates(request) {
   try {
-    const { paths } = await request.json();
-    if (!paths || !Array.isArray(paths) || paths.length === 0) {
+    const { paths: inputPaths } = await request.json();
+    if (!inputPaths || !Array.isArray(inputPaths) || inputPaths.length === 0) {
       return jsonResponse({ error: "No paths provided" }, { status: 400 });
     }
     const meta = await loadMeta();
+    const paths = [];
+    for (const inputPath of inputPaths) {
+      const key = inputPath.startsWith("public/") ? "/" + inputPath.slice(7) : inputPath;
+      const isFolder = !key.match(/\.[a-zA-Z0-9]+$/);
+      if (isFolder) {
+        const folderPrefix = key.endsWith("/") ? key : key + "/";
+        for (const [metaKey, entry] of Object.entries(meta)) {
+          if (metaKey.startsWith(folderPrefix) && entry && typeof entry === "object" && "u" in entry && entry.u === 1) {
+            paths.push(metaKey);
+          }
+        }
+      } else {
+        paths.push(inputPath);
+      }
+    }
     const cancelled = [];
     const skipped = [];
     const errors = [];
@@ -2169,7 +2256,9 @@ async function handleUpload(request) {
     }
     if (relativeDir === "images" || relativeDir.startsWith("images/")) {
       return jsonResponse(
-        { error: "Cannot upload to images/ folder. Upload to public/ instead - thumbnails are generated automatically." },
+        {
+          error: "Cannot upload to images/ folder. Upload to public/ instead - thumbnails are generated automatically."
+        },
         { status: 400 }
       );
     }
@@ -2199,7 +2288,8 @@ async function handleUpload(request) {
     }
     if (isImage && ext !== ".svg") {
       try {
-        const metadata = await sharp2(buffer).metadata();
+        const rotatedBuffer = await sharp2(buffer).rotate().toBuffer();
+        const metadata = await sharp2(rotatedBuffer).metadata();
         meta[imageKey] = {
           o: { w: metadata.width || 0, h: metadata.height || 0 }
         };
@@ -2218,7 +2308,10 @@ async function handleUpload(request) {
   } catch (error) {
     console.error("Failed to upload:", error);
     const message = error instanceof Error ? error.message : "Unknown error";
-    return jsonResponse({ error: `Failed to upload file: ${message}` }, { status: 500 });
+    return jsonResponse(
+      { error: `Failed to upload file: ${message}` },
+      { status: 500 }
+    );
   }
 }
 async function handleDelete(request) {
@@ -2348,9 +2441,11 @@ async function handleDeleteStream(request) {
     async start(controller) {
       const sendEvent = (data) => {
         try {
-          controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
+          controller.enqueue(
+            encoder.encode(`data: ${JSON.stringify(data)}
 
-`));
+`)
+          );
         } catch {
         }
       };
@@ -2529,7 +2624,7 @@ async function handleDeleteStream(request) {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      "Connection": "keep-alive"
+      Connection: "keep-alive"
     }
   });
 }
@@ -2537,7 +2632,10 @@ async function handleCreateFolder(request) {
   try {
     const { parentPath, name } = await request.json();
     if (!name || typeof name !== "string") {
-      return jsonResponse({ error: "Folder name is required" }, { status: 400 });
+      return jsonResponse(
+        { error: "Folder name is required" },
+        { status: 400 }
+      );
     }
     const sanitizedName = slugifyFolderName(name);
     if (!sanitizedName) {
@@ -2550,11 +2648,17 @@ async function handleCreateFolder(request) {
     }
     try {
       await fs7.access(folderPath);
-      return jsonResponse({ error: "A folder with this name already exists" }, { status: 400 });
+      return jsonResponse(
+        { error: "A folder with this name already exists" },
+        { status: 400 }
+      );
     } catch {
     }
     await fs7.mkdir(folderPath, { recursive: true });
-    return jsonResponse({ success: true, path: path7.join(safePath, sanitizedName) });
+    return jsonResponse({
+      success: true,
+      path: path7.join(safePath, sanitizedName)
+    });
   } catch (error) {
     console.error("Failed to create folder:", error);
     return jsonResponse({ error: "Failed to create folder" }, { status: 500 });
@@ -2565,7 +2669,10 @@ async function handleRename(request) {
   try {
     const { oldPath, newName } = await request.json();
     if (!oldPath || !newName) {
-      return jsonResponse({ error: "Path and new name are required" }, { status: 400 });
+      return jsonResponse(
+        { error: "Path and new name are required" },
+        { status: 400 }
+      );
     }
     const safePath = oldPath.replace(/\.\./g, "");
     const absoluteOldPath = getWorkspacePath(safePath);
@@ -2590,7 +2697,10 @@ async function handleRename(request) {
       isFile = stats.isFile();
     } catch {
       if (!isInCloud) {
-        return jsonResponse({ error: "File or folder not found" }, { status: 404 });
+        return jsonResponse(
+          { error: "File or folder not found" },
+          { status: 404 }
+        );
       }
     }
     const sanitizedName = isFile ? slugifyFilename(newName) : slugifyFolderName(newName);
@@ -2599,14 +2709,23 @@ async function handleRename(request) {
     }
     const parentDir = path7.dirname(absoluteOldPath);
     const absoluteNewPath = path7.join(parentDir, sanitizedName);
-    const newRelativePath = path7.join(path7.dirname(oldRelativePath), sanitizedName);
+    const newRelativePath = path7.join(
+      path7.dirname(oldRelativePath),
+      sanitizedName
+    );
     const newKey = "/" + newRelativePath;
     if (meta[newKey]) {
-      return jsonResponse({ error: "An item with this name already exists" }, { status: 400 });
+      return jsonResponse(
+        { error: "An item with this name already exists" },
+        { status: 400 }
+      );
     }
     try {
       await fs7.access(absoluteNewPath);
-      return jsonResponse({ error: "An item with this name already exists" }, { status: 400 });
+      return jsonResponse(
+        { error: "An item with this name already exists" },
+        { status: 400 }
+      );
     } catch {
     }
     if (isInOurR2 && !hasLocalFile) {
@@ -2664,7 +2783,10 @@ async function handleRenameStream(request) {
       try {
         const { oldPath, newName, operationId } = await request.json();
         if (!oldPath || !newName) {
-          sendEvent({ type: "error", message: "Path and new name are required" });
+          sendEvent({
+            type: "error",
+            message: "Path and new name are required"
+          });
           controller.close();
           return;
         }
@@ -2693,7 +2815,9 @@ async function handleRenameStream(request) {
             isFile = true;
           } else {
             const folderPrefix = oldKey2 + "/";
-            const hasChildrenInMeta = Object.keys(meta2).some((key) => key.startsWith(folderPrefix));
+            const hasChildrenInMeta = Object.keys(meta2).some(
+              (key) => key.startsWith(folderPrefix)
+            );
             if (hasChildrenInMeta) {
               isFile = false;
               isVirtualFolder = true;
@@ -2712,14 +2836,20 @@ async function handleRenameStream(request) {
         }
         const parentDir = path7.dirname(absoluteOldPath);
         const absoluteNewPath = path7.join(parentDir, sanitizedName);
-        const newRelativePath = path7.join(path7.dirname(oldRelativePath), sanitizedName);
+        const newRelativePath = path7.join(
+          path7.dirname(oldRelativePath),
+          sanitizedName
+        );
         const newPath = path7.join(path7.dirname(safePath), sanitizedName);
         const meta = await loadMeta();
         const cdnUrls = getCdnUrls(meta);
         if (isFile) {
           const newKey2 = "/" + newRelativePath;
           if (meta[newKey2]) {
-            sendEvent({ type: "error", message: "An item with this name already exists" });
+            sendEvent({
+              type: "error",
+              message: "An item with this name already exists"
+            });
             controller.close();
             return;
           }
@@ -2727,7 +2857,10 @@ async function handleRenameStream(request) {
         if (!isVirtualFolder) {
           try {
             await fs7.access(absoluteNewPath);
-            sendEvent({ type: "error", message: "An item with this name already exists" });
+            sendEvent({
+              type: "error",
+              message: "An item with this name already exists"
+            });
             controller.close();
             return;
           } catch {
@@ -2735,9 +2868,14 @@ async function handleRenameStream(request) {
         }
         if (isVirtualFolder) {
           const newPrefix = "/" + newRelativePath + "/";
-          const hasConflict = Object.keys(meta).some((key) => key.startsWith(newPrefix));
+          const hasConflict = Object.keys(meta).some(
+            (key) => key.startsWith(newPrefix)
+          );
           if (hasConflict) {
-            sendEvent({ type: "error", message: "A folder with this name already exists" });
+            sendEvent({
+              type: "error",
+              message: "A folder with this name already exists"
+            });
             controller.close();
             return;
           }
@@ -2749,11 +2887,19 @@ async function handleRenameStream(request) {
           for (const [key, entry2] of Object.entries(meta)) {
             if (key.startsWith(oldPrefix) && entry2 && typeof entry2 === "object") {
               const newKey2 = key.replace(oldPrefix, newPrefix);
-              itemsToUpdate.push({ oldKey: key, newKey: newKey2, entry: entry2 });
+              itemsToUpdate.push({
+                oldKey: key,
+                newKey: newKey2,
+                entry: entry2
+              });
             }
           }
           const total = itemsToUpdate.length + 1;
-          sendEvent({ type: "start", total, message: `Renaming folder with ${itemsToUpdate.length} item(s)...` });
+          sendEvent({
+            type: "start",
+            total,
+            message: `Renaming folder with ${itemsToUpdate.length} item(s)...`
+          });
           if (hasLocalItem) {
             await fs7.rename(absoluteOldPath, absoluteNewPath);
             const imagesDir = getPublicPath("/images");
@@ -2766,12 +2912,21 @@ async function handleRenameStream(request) {
             } catch {
             }
           }
-          sendEvent({ type: "progress", current: 1, total, renamed: 1, message: "Renamed folder" });
+          sendEvent({
+            type: "progress",
+            current: 1,
+            total,
+            renamed: 1,
+            message: "Renamed folder"
+          });
           let renamed = 1;
           const handleRenameCancel = async () => {
             await saveMeta(meta);
             await deleteEmptyFolders(absoluteOldPath);
-            const oldThumbFolder2 = path7.join(getPublicPath("/images"), oldRelativePath);
+            const oldThumbFolder2 = path7.join(
+              getPublicPath("/images"),
+              oldRelativePath
+            );
             await deleteEmptyFolders(oldThumbFolder2);
             sendEvent({ type: "complete", renamed, newPath, cancelled: true });
             controller.close();
@@ -2814,7 +2969,10 @@ async function handleRenameStream(request) {
             });
           }
           await deleteEmptyFolders(absoluteOldPath);
-          const oldThumbFolder = path7.join(getPublicPath("/images"), oldRelativePath);
+          const oldThumbFolder = path7.join(
+            getPublicPath("/images"),
+            oldRelativePath
+          );
           await deleteEmptyFolders(oldThumbFolder);
           sendEvent({ type: "complete", renamed, newPath });
           controller.close();
@@ -2937,7 +3095,9 @@ async function handleMoveStream(request) {
               const entries = await fs7.readdir(dir, { withFileTypes: true });
               for (const entry of entries) {
                 if (entry.isDirectory()) {
-                  count += await countFilesRecursive(path7.join(dir, entry.name));
+                  count += await countFilesRecursive(
+                    path7.join(dir, entry.name)
+                  );
                 } else {
                   count++;
                 }
@@ -2959,7 +3119,15 @@ async function handleMoveStream(request) {
               }
             }
             totalFiles += localFileCount + cloudOnlyCount;
-            expandedItems.push({ itemPath, safePath, itemName, oldKey, newKey, newAbsolutePath, isVirtualFolder: false });
+            expandedItems.push({
+              itemPath,
+              safePath,
+              itemName,
+              oldKey,
+              newKey,
+              newAbsolutePath,
+              isVirtualFolder: false
+            });
           } else if (!hasLocalItem) {
             const folderPrefix = oldKey + "/";
             const virtualItems = [];
@@ -2967,20 +3135,49 @@ async function handleMoveStream(request) {
               if (key.startsWith(folderPrefix) && metaEntry && typeof metaEntry === "object") {
                 const relativePath = key.slice(folderPrefix.length);
                 const destNewKey = newKey + "/" + relativePath;
-                virtualItems.push({ oldKey: key, newKey: destNewKey, entry: metaEntry });
+                virtualItems.push({
+                  oldKey: key,
+                  newKey: destNewKey,
+                  entry: metaEntry
+                });
               }
             }
             if (virtualItems.length > 0) {
               totalFiles += virtualItems.length;
-              expandedItems.push({ itemPath, safePath, itemName, oldKey, newKey, newAbsolutePath, isVirtualFolder: true, virtualFolderItems: virtualItems });
+              expandedItems.push({
+                itemPath,
+                safePath,
+                itemName,
+                oldKey,
+                newKey,
+                newAbsolutePath,
+                isVirtualFolder: true,
+                virtualFolderItems: virtualItems
+              });
               sourceFolders.add(absolutePath);
             } else {
               totalFiles++;
-              expandedItems.push({ itemPath, safePath, itemName, oldKey, newKey, newAbsolutePath, isVirtualFolder: false });
+              expandedItems.push({
+                itemPath,
+                safePath,
+                itemName,
+                oldKey,
+                newKey,
+                newAbsolutePath,
+                isVirtualFolder: false
+              });
             }
           } else {
             totalFiles++;
-            expandedItems.push({ itemPath, safePath, itemName, oldKey, newKey, newAbsolutePath, isVirtualFolder: false });
+            expandedItems.push({
+              itemPath,
+              safePath,
+              itemName,
+              oldKey,
+              newKey,
+              newAbsolutePath,
+              isVirtualFolder: false
+            });
           }
         }
         sendEvent({ type: "start", total: totalFiles });
@@ -2992,7 +3189,13 @@ async function handleMoveStream(request) {
             await deleteEmptyFolders(folder);
           }
           await deleteEmptyFolders(absoluteDestination);
-          sendEvent({ type: "complete", moved: filesMoved, errors: errors.length, errorMessages: errors, cancelled: true });
+          sendEvent({
+            type: "complete",
+            moved: filesMoved,
+            errors: errors.length,
+            errorMessages: errors,
+            cancelled: true
+          });
           controller.close();
         };
         for (const expandedItem of expandedItems) {
@@ -3000,7 +3203,16 @@ async function handleMoveStream(request) {
             await handleCancel();
             return;
           }
-          const { itemPath, safePath, itemName, oldKey, newKey, newAbsolutePath, isVirtualFolder, virtualFolderItems } = expandedItem;
+          const {
+            itemPath,
+            safePath,
+            itemName,
+            oldKey,
+            newKey,
+            newAbsolutePath,
+            isVirtualFolder,
+            virtualFolderItems
+          } = expandedItem;
           if (isVirtualFolder && virtualFolderItems) {
             for (const vItem of virtualFolderItems) {
               if (isCancelled()) {
@@ -3015,11 +3227,18 @@ async function handleMoveStream(request) {
               let vItemMoved = false;
               if (isItemInR2) {
                 try {
-                  await moveInCdn(vItem.oldKey, vItem.newKey, itemHasThumbnails);
+                  await moveInCdn(
+                    vItem.oldKey,
+                    vItem.newKey,
+                    itemHasThumbnails
+                  );
                   vItemMoved = true;
                   filesMoved++;
                 } catch (err) {
-                  console.error(`Failed to move cloud item ${vItem.oldKey}:`, err);
+                  console.error(
+                    `Failed to move cloud item ${vItem.oldKey}:`,
+                    err
+                  );
                   delete meta[vItem.oldKey];
                   await saveMeta(meta);
                 }
@@ -3043,7 +3262,10 @@ async function handleMoveStream(request) {
             }
             const newFolderPath = getPublicPath(newKey);
             await deleteEmptyFolders(newFolderPath);
-            const newThumbFolder = path7.join(getPublicPath("images"), newKey.slice(1));
+            const newThumbFolder = path7.join(
+              getPublicPath("images"),
+              newKey.slice(1)
+            );
             await deleteEmptyFolders(newThumbFolder);
             const oldFolderPath = getPublicPath(oldKey);
             sourceFolders.add(oldFolderPath);
@@ -3076,7 +3298,9 @@ async function handleMoveStream(request) {
             if (isRemote) {
               const remoteUrl = `${fileCdnUrl}${oldKey}`;
               const buffer = await downloadFromRemoteUrl(remoteUrl);
-              await fs7.mkdir(path7.dirname(newAbsolutePath), { recursive: true });
+              await fs7.mkdir(path7.dirname(newAbsolutePath), {
+                recursive: true
+              });
               await fs7.writeFile(newAbsolutePath, buffer);
               const newEntry = {
                 o: entry?.o,
@@ -3161,7 +3385,9 @@ async function handleMoveStream(request) {
               }
               const stats = await fs7.stat(absolutePath);
               if (stats.isFile()) {
-                await fs7.mkdir(path7.dirname(newAbsolutePath), { recursive: true });
+                await fs7.mkdir(path7.dirname(newAbsolutePath), {
+                  recursive: true
+                });
                 await fs7.rename(absolutePath, newAbsolutePath);
                 if (isImage && entry) {
                   const oldThumbPaths = getAllThumbnailPaths(oldKey);
@@ -3172,7 +3398,9 @@ async function handleMoveStream(request) {
                     try {
                       await fs7.access(oldThumbPath);
                       sourceFolders.add(path7.dirname(oldThumbPath));
-                      await fs7.mkdir(path7.dirname(newThumbPath), { recursive: true });
+                      await fs7.mkdir(path7.dirname(newThumbPath), {
+                        recursive: true
+                      });
                       await fs7.rename(oldThumbPath, newThumbPath);
                     } catch {
                     }
@@ -3208,13 +3436,21 @@ async function handleMoveStream(request) {
                 const newPrefix = newKey + "/";
                 const localFiles = [];
                 const collectLocalFiles = async (dir, relativeDir) => {
-                  const entries = await fs7.readdir(dir, { withFileTypes: true });
+                  const entries = await fs7.readdir(dir, {
+                    withFileTypes: true
+                  });
                   for (const dirEntry of entries) {
                     const entryRelPath = relativeDir ? `${relativeDir}/${dirEntry.name}` : dirEntry.name;
                     if (dirEntry.isDirectory()) {
-                      await collectLocalFiles(path7.join(dir, dirEntry.name), entryRelPath);
+                      await collectLocalFiles(
+                        path7.join(dir, dirEntry.name),
+                        entryRelPath
+                      );
                     } else {
-                      localFiles.push({ relativePath: entryRelPath, isImage: isImageFile(dirEntry.name) });
+                      localFiles.push({
+                        relativePath: entryRelPath,
+                        isImage: isImageFile(dirEntry.name)
+                      });
                     }
                   }
                 };
@@ -3240,13 +3476,21 @@ async function handleMoveStream(request) {
                     await handleCancel();
                     return;
                   }
-                  const fileOldPath = path7.join(absolutePath, localFile.relativePath);
-                  const fileNewPath = path7.join(newAbsolutePath, localFile.relativePath);
+                  const fileOldPath = path7.join(
+                    absolutePath,
+                    localFile.relativePath
+                  );
+                  const fileNewPath = path7.join(
+                    newAbsolutePath,
+                    localFile.relativePath
+                  );
                   const fileOldKey = oldPrefix + localFile.relativePath;
                   const fileNewKey = newPrefix + localFile.relativePath;
                   const fileEntry = meta[fileOldKey];
                   sourceFolders.add(path7.dirname(fileOldPath));
-                  await fs7.mkdir(path7.dirname(fileNewPath), { recursive: true });
+                  await fs7.mkdir(path7.dirname(fileNewPath), {
+                    recursive: true
+                  });
                   await fs7.rename(fileOldPath, fileNewPath);
                   filesMoved++;
                   if (localFile.isImage && fileEntry) {
@@ -3258,7 +3502,9 @@ async function handleMoveStream(request) {
                       try {
                         await fs7.access(oldThumbPath);
                         sourceFolders.add(path7.dirname(oldThumbPath));
-                        await fs7.mkdir(path7.dirname(newThumbPath), { recursive: true });
+                        await fs7.mkdir(path7.dirname(newThumbPath), {
+                          recursive: true
+                        });
                         await fs7.rename(oldThumbPath, newThumbPath);
                       } catch {
                       }
@@ -3297,11 +3543,18 @@ async function handleMoveStream(request) {
                   let cloudFileMoved = false;
                   if (cloudIsInR2) {
                     try {
-                      await moveInCdn(cloudFile.oldKey, cloudFile.newKey, cloudHasThumbs);
+                      await moveInCdn(
+                        cloudFile.oldKey,
+                        cloudFile.newKey,
+                        cloudHasThumbs
+                      );
                       cloudFileMoved = true;
                       filesMoved++;
                     } catch (err) {
-                      console.error(`Failed to move cloud file ${cloudFile.oldKey}:`, err);
+                      console.error(
+                        `Failed to move cloud file ${cloudFile.oldKey}:`,
+                        err
+                      );
                       delete meta[cloudFile.oldKey];
                       await saveMeta(meta);
                     }
@@ -3323,7 +3576,10 @@ async function handleMoveStream(request) {
                 }
                 sourceFolders.add(absolutePath);
                 const oldThumbRelPath = oldKey.slice(1);
-                const oldThumbFolder = path7.join(getPublicPath("images"), oldThumbRelPath);
+                const oldThumbFolder = path7.join(
+                  getPublicPath("images"),
+                  oldThumbRelPath
+                );
                 sourceFolders.add(oldThumbFolder);
                 moved.push(itemPath);
               }
@@ -3365,7 +3621,7 @@ async function handleMoveStream(request) {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      "Connection": "keep-alive"
+      Connection: "keep-alive"
     }
   });
 }
@@ -3385,7 +3641,9 @@ async function handleScanStream() {
       };
       try {
         const meta = await loadMeta();
-        const existingCount = Object.keys(meta).filter((k) => !k.startsWith("_")).length;
+        const existingCount = Object.keys(meta).filter(
+          (k) => !k.startsWith("_")
+        ).length;
         const existingKeys = new Set(Object.keys(meta));
         const added = [];
         const renamed = [];
@@ -3400,7 +3658,8 @@ async function handleScanStream() {
               if (entry.name.startsWith(".")) continue;
               const fullPath = path8.join(dir, entry.name);
               const relPath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
-              if (relPath === "images" || relPath.startsWith("images/")) continue;
+              if (relPath === "images" || relPath.startsWith("images/"))
+                continue;
               if (entry.isDirectory()) {
                 await scanDir(fullPath, relPath);
               } else if (isMediaFile(entry.name)) {
@@ -3484,7 +3743,8 @@ async function handleScanStream() {
               } else {
                 try {
                   const buffer = await fs8.readFile(fullPath);
-                  const metadata = await sharp3(buffer).metadata();
+                  const rotatedBuffer = await sharp3(buffer).rotate().toBuffer();
+                  const metadata = await sharp3(rotatedBuffer).metadata();
                   meta[imageKey] = {
                     o: { w: metadata.width || 0, h: metadata.height || 0 }
                   };
@@ -3505,7 +3765,10 @@ async function handleScanStream() {
             errors.push(relativePath);
           }
         }
-        sendEvent({ type: "cleanup", message: "Checking for orphaned thumbnails..." });
+        sendEvent({
+          type: "cleanup",
+          message: "Checking for orphaned thumbnails..."
+        });
         const expectedThumbnails = /* @__PURE__ */ new Set();
         const fileEntries = getFileEntries(meta);
         for (const [imageKey, entry] of fileEntries) {
@@ -3552,7 +3815,9 @@ async function handleScanStream() {
               await cleanEmptyFolders(fullPath);
               try {
                 const subEntries = await fs8.readdir(fullPath);
-                const meaningfulEntries = subEntries.filter((e) => !e.startsWith("."));
+                const meaningfulEntries = subEntries.filter(
+                  (e) => !e.startsWith(".")
+                );
                 if (meaningfulEntries.length === 0) {
                   await fs8.rm(fullPath, { recursive: true });
                   emptyFoldersDeleted++;
@@ -3570,7 +3835,9 @@ async function handleScanStream() {
             let isEmpty = true;
             for (const entry of entries) {
               if (entry.isDirectory()) {
-                const subDirEmpty = await cleanImagesEmptyFolders(path8.join(dir, entry.name));
+                const subDirEmpty = await cleanImagesEmptyFolders(
+                  path8.join(dir, entry.name)
+                );
                 if (!subDirEmpty) isEmpty = false;
               } else if (!entry.name.startsWith(".")) {
                 isEmpty = false;
@@ -3589,7 +3856,10 @@ async function handleScanStream() {
           await cleanImagesEmptyFolders(imagesDir);
         } catch {
         }
-        sendEvent({ type: "cleanup", message: "Checking for orphaned entries..." });
+        sendEvent({
+          type: "cleanup",
+          message: "Checking for orphaned entries..."
+        });
         const orphanedEntries = [];
         const cdnUrls = meta._cdns || [];
         const r2PublicUrl = (process.env.CLOUDFLARE_R2_PUBLIC_URL || "").replace(/\/$/, "");
@@ -3617,7 +3887,10 @@ async function handleScanStream() {
           }
         }
         if (orphanedEntries.length > 0) {
-          sendEvent({ type: "cleanup", message: `Removed ${orphanedEntries.length} orphaned entries...` });
+          sendEvent({
+            type: "cleanup",
+            message: `Removed ${orphanedEntries.length} orphaned entries...`
+          });
         }
         await saveMeta(meta);
         sendEvent({
@@ -3644,7 +3917,7 @@ async function handleScanStream() {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      "Connection": "keep-alive"
+      Connection: "keep-alive"
     }
   });
 }
@@ -3682,7 +3955,10 @@ async function handleDeleteOrphans(request) {
     });
   } catch (error) {
     console.error("Failed to delete orphans:", error);
-    return jsonResponse({ error: "Failed to delete orphaned files" }, { status: 500 });
+    return jsonResponse(
+      { error: "Failed to delete orphaned files" },
+      { status: 500 }
+    );
   }
 }
 
@@ -3700,9 +3976,11 @@ async function processRemoteImage(url) {
     throw new Error(`Failed to fetch: ${response.status}`);
   }
   const buffer = Buffer.from(await response.arrayBuffer());
-  const metadata = await sharp4(buffer).metadata();
+  const rotatedBuffer = await sharp4(buffer).rotate().toBuffer();
+  const metadata = await sharp4(rotatedBuffer).metadata();
   return {
     o: { w: metadata.width || 0, h: metadata.height || 0 }
+    // b: blur hash would be generated here if needed
   };
 }
 async function handleImportUrls(request) {
@@ -3711,9 +3989,11 @@ async function handleImportUrls(request) {
     async start(controller) {
       const sendEvent = (data) => {
         try {
-          controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
+          controller.enqueue(
+            encoder.encode(`data: ${JSON.stringify(data)}
 
-`));
+`)
+          );
         } catch {
         }
       };
@@ -3813,7 +4093,7 @@ async function handleImportUrls(request) {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      "Connection": "keep-alive"
+      Connection: "keep-alive"
     }
   });
 }
@@ -3866,9 +4146,12 @@ async function handleGenerateFavicon(request) {
   }
   const fileName = path9.basename(imagePath).toLowerCase();
   if (fileName !== "favicon.png" && fileName !== "favicon.jpg") {
-    return jsonResponse({
-      error: "Source file must be named favicon.png or favicon.jpg"
-    }, { status: 400 });
+    return jsonResponse(
+      {
+        error: "Source file must be named favicon.png or favicon.jpg"
+      },
+      { status: 400 }
+    );
   }
   const sourcePath = getPublicPath(imagePath.replace(/^\//, ""));
   try {
@@ -3878,17 +4161,24 @@ async function handleGenerateFavicon(request) {
   }
   let metadata;
   try {
-    metadata = await sharp5(sourcePath).metadata();
+    const rotatedBuffer = await sharp5(sourcePath).rotate().toBuffer();
+    metadata = await sharp5(rotatedBuffer).metadata();
   } catch {
-    return jsonResponse({ error: "Source file is not a valid image" }, { status: 400 });
+    return jsonResponse(
+      { error: "Source file is not a valid image" },
+      { status: 400 }
+    );
   }
   const outputDir = getSrcAppPath();
   try {
     await fs9.access(outputDir);
   } catch {
-    return jsonResponse({
-      error: "Output directory src/app/ not found"
-    }, { status: 500 });
+    return jsonResponse(
+      {
+        error: "Output directory src/app/ not found"
+      },
+      { status: 500 }
+    );
   }
   const stream = new ReadableStream({
     async start(controller) {
@@ -3910,7 +4200,7 @@ async function handleGenerateFavicon(request) {
           const config = FAVICON_CONFIGS[i];
           try {
             const outputPath = path9.join(outputDir, config.name);
-            await sharp5(sourcePath).resize(config.size, config.size, {
+            await sharp5(sourcePath).rotate().resize(config.size, config.size, {
               fit: "cover",
               position: "center"
             }).png({ quality: 100 }).toFile(outputPath);