@gallop.software/studio 1.2.3 → 1.2.5

package/dist/handlers/index.js

@@ -355,6 +355,12 @@ async function handleList(request) {
       }
       for (const thumb of allThumbnails) {
         const thumbRelative = thumb.path.replace(/^\/images\/?/, "");
+        const originalEntry = _optionalChain([fileEntries, 'access', _5 => _5.find, 'call', _6 => _6(([k]) => k === thumb.originalKey), 'optionalAccess', _7 => _7[1]]);
+        const cdnIndex = _optionalChain([originalEntry, 'optionalAccess', _8 => _8.c]);
+        const cdnBaseUrl = cdnIndex !== void 0 ? cdnUrls[cdnIndex] : void 0;
+        const thumbnailUrl = cdnBaseUrl ? `${cdnBaseUrl}${thumb.path}` : thumb.path;
+        const isPushedToCloud = cdnIndex !== void 0;
+        const isRemote = isPushedToCloud && cdnBaseUrl !== r2PublicUrl;
         if (imagesSubPath === "") {
           const slashIndex = thumbRelative.indexOf("/");
           if (slashIndex === -1) {
@@ -363,9 +369,12 @@ async function handleList(request) {
               name: fileName,
               path: `public/images/${fileName}`,
               type: "file",
-              thumbnail: thumb.path,
+              thumbnail: thumbnailUrl,
               hasThumbnail: false,
-              isProtected: true
+              isProtected: true,
+              cdnPushed: isPushedToCloud,
+              cdnBaseUrl,
+              isRemote
             });
           } else {
             const folderName = thumbRelative.slice(0, slashIndex);
@@ -394,9 +403,12 @@ async function handleList(request) {
               name: remaining,
               path: `public/images/${imagesSubPath}/${remaining}`,
               type: "file",
-              thumbnail: thumb.path,
+              thumbnail: thumbnailUrl,
               hasThumbnail: false,
-              isProtected: true
+              isProtected: true,
+              cdnPushed: isPushedToCloud,
+              cdnBaseUrl,
+              isRemote
             });
           } else {
             const folderName = remaining.slice(0, slashIndex);
@@ -567,7 +579,7 @@ async function handleList(request) {
 }
 async function handleSearch(request) {
   const searchParams = request.nextUrl.searchParams;
-  const query = _optionalChain([searchParams, 'access', _5 => _5.get, 'call', _6 => _6("q"), 'optionalAccess', _7 => _7.toLowerCase, 'call', _8 => _8()]) || "";
+  const query = _optionalChain([searchParams, 'access', _9 => _9.get, 'call', _10 => _10("q"), 'optionalAccess', _11 => _11.toLowerCase, 'call', _12 => _12()]) || "";
   if (query.length < 2) {
     return _server.NextResponse.json({ items: [] });
   }
@@ -575,7 +587,7 @@ async function handleSearch(request) {
     const meta = await loadMeta();
     const fileEntries = getFileEntries(meta);
     const cdnUrls = getCdnUrls(meta);
-    const r2PublicUrl = _optionalChain([process, 'access', _9 => _9.env, 'access', _10 => _10.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _11 => _11.replace, 'call', _12 => _12(/\/$/, "")]) || "";
+    const r2PublicUrl = _optionalChain([process, 'access', _13 => _13.env, 'access', _14 => _14.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _15 => _15.replace, 'call', _16 => _16(/\/$/, "")]) || "";
     const items = [];
     for (const [key, entry] of fileEntries) {
       if (!key.toLowerCase().includes(query)) continue;
@@ -834,7 +846,7 @@ async function handleDelete(request) {
         const absolutePath = _path2.default.join(process.cwd(), itemPath);
         const imageKey = "/" + itemPath.replace(/^public\//, "");
         const entry = meta[imageKey];
-        const isPushedToCloud = _optionalChain([entry, 'optionalAccess', _13 => _13.c]) !== void 0;
+        const isPushedToCloud = _optionalChain([entry, 'optionalAccess', _17 => _17.c]) !== void 0;
         try {
           const stats = await _fs.promises.stat(absolutePath);
           if (stats.isDirectory()) {
@@ -1026,7 +1038,7 @@ async function handleMoveStream(request) {
         await _fs.promises.mkdir(absoluteDestination, { recursive: true });
         const meta = await loadMeta();
         const cdnUrls = getCdnUrls(meta);
-        const r2PublicUrl = _optionalChain([process, 'access', _14 => _14.env, 'access', _15 => _15.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _16 => _16.replace, 'call', _17 => _17(/\/$/, "")]) || "";
+        const r2PublicUrl = _optionalChain([process, 'access', _18 => _18.env, 'access', _19 => _19.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _20 => _20.replace, 'call', _21 => _21(/\/$/, "")]) || "";
         const moved = [];
         const errors = [];
         const total = paths.length;
@@ -1053,7 +1065,7 @@ async function handleMoveStream(request) {
           }
           const entry = meta[oldKey];
           const isImage = isImageFile(itemName);
-          const isInCloud = _optionalChain([entry, 'optionalAccess', _18 => _18.c]) !== void 0;
+          const isInCloud = _optionalChain([entry, 'optionalAccess', _22 => _22.c]) !== void 0;
           const fileCdnUrl = isInCloud && entry.c !== void 0 ? cdnUrls[entry.c] : void 0;
           const isRemote = isInCloud && (!r2PublicUrl || fileCdnUrl !== r2PublicUrl);
           const isPushedToR2 = isInCloud && r2PublicUrl && fileCdnUrl === r2PublicUrl;
@@ -1065,8 +1077,8 @@ async function handleMoveStream(request) {
               await _fs.promises.mkdir(_path2.default.dirname(newAbsolutePath), { recursive: true });
               await _fs.promises.writeFile(newAbsolutePath, buffer);
               const newEntry = {
-                o: _optionalChain([entry, 'optionalAccess', _19 => _19.o]),
-                b: _optionalChain([entry, 'optionalAccess', _20 => _20.b])
+                o: _optionalChain([entry, 'optionalAccess', _23 => _23.o]),
+                b: _optionalChain([entry, 'optionalAccess', _24 => _24.b])
               };
               delete meta[oldKey];
               meta[newKey] = newEntry;
@@ -1076,8 +1088,8 @@ async function handleMoveStream(request) {
               await _fs.promises.mkdir(_path2.default.dirname(newAbsolutePath), { recursive: true });
               await _fs.promises.writeFile(newAbsolutePath, buffer);
               let newEntry = {
-                o: _optionalChain([entry, 'optionalAccess', _21 => _21.o]),
-                b: _optionalChain([entry, 'optionalAccess', _22 => _22.b])
+                o: _optionalChain([entry, 'optionalAccess', _25 => _25.o]),
+                b: _optionalChain([entry, 'optionalAccess', _26 => _26.b])
               };
               if (hasProcessedThumbnails) {
                 const processedEntry = await processImage(buffer, newKey);
@@ -1095,7 +1107,7 @@ async function handleMoveStream(request) {
               if (hasProcessedThumbnails) {
                 await deleteLocalThumbnails(newKey);
               }
-              newEntry.c = _optionalChain([entry, 'optionalAccess', _23 => _23.c]);
+              newEntry.c = _optionalChain([entry, 'optionalAccess', _27 => _27.c]);
               delete meta[oldKey];
               meta[newKey] = newEntry;
               moved.push(itemPath);
@@ -1185,7 +1197,7 @@ async function handleSync(request) {
   const accessKeyId = process.env.CLOUDFLARE_R2_ACCESS_KEY_ID;
   const secretAccessKey = process.env.CLOUDFLARE_R2_SECRET_ACCESS_KEY;
   const bucketName = process.env.CLOUDFLARE_R2_BUCKET_NAME;
-  const publicUrl = _optionalChain([process, 'access', _24 => _24.env, 'access', _25 => _25.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _26 => _26.replace, 'call', _27 => _27(/\/\s*$/, "")]);
+  const publicUrl = _optionalChain([process, 'access', _28 => _28.env, 'access', _29 => _29.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _30 => _30.replace, 'call', _31 => _31(/\/\s*$/, "")]);
   if (!accountId || !accessKeyId || !secretAccessKey || !bucketName || !publicUrl) {
     return _server.NextResponse.json(
       { error: "R2 not configured. Set CLOUDFLARE_R2_* environment variables." },
@@ -1301,7 +1313,7 @@ async function handleSync(request) {
   }
 }
 async function handleReprocess(request) {
-  const publicUrl = _optionalChain([process, 'access', _28 => _28.env, 'access', _29 => _29.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _30 => _30.replace, 'call', _31 => _31(/\/\s*$/, "")]);
+  const publicUrl = _optionalChain([process, 'access', _32 => _32.env, 'access', _33 => _33.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _34 => _34.replace, 'call', _35 => _35(/\/\s*$/, "")]);
   try {
     const { imageKeys } = await request.json();
     if (!imageKeys || !Array.isArray(imageKeys) || imageKeys.length === 0) {
@@ -1319,7 +1331,7 @@ async function handleReprocess(request) {
       try {
         let buffer;
         const entry = getMetaEntry(meta, imageKey);
-        const existingCdnIndex = _optionalChain([entry, 'optionalAccess', _32 => _32.c]);
+        const existingCdnIndex = _optionalChain([entry, 'optionalAccess', _36 => _36.c]);
         const existingCdnUrl = existingCdnIndex !== void 0 ? cdnUrls[existingCdnIndex] : void 0;
         const isInOurR2 = existingCdnUrl === publicUrl;
         const isRemote = existingCdnIndex !== void 0 && !isInOurR2;
@@ -1378,7 +1390,7 @@ async function handleReprocess(request) {
   }
 }
 async function handleProcessAllStream() {
-  const publicUrl = _optionalChain([process, 'access', _33 => _33.env, 'access', _34 => _34.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _35 => _35.replace, 'call', _36 => _36(/\/\s*$/, "")]);
+  const publicUrl = _optionalChain([process, 'access', _37 => _37.env, 'access', _38 => _38.CLOUDFLARE_R2_PUBLIC_URL, 'optionalAccess', _39 => _39.replace, 'call', _40 => _40(/\/\s*$/, "")]);
   const encoder = new TextEncoder();
   const stream = new ReadableStream({
     async start(controller) {