@gallop.software/studio 0.1.93 → 0.1.95

package/dist/handlers/index.mjs

@@ -1,7 +1,7 @@
 import {
   getAllThumbnailPaths,
   getThumbnailPath
-} from "../chunk-DTVEVFQ2.mjs";
+} from "../chunk-IHXG2EE4.mjs";
 
 // src/handlers/index.ts
 import { NextResponse as NextResponse4 } from "next/server";
@@ -29,6 +29,35 @@ async function saveMeta(meta) {
   const metaPath = path.join(dataDir, "_meta.json");
   await fs.writeFile(metaPath, JSON.stringify(meta, null, 2));
 }
+function getCdnUrls(meta) {
+  return meta._cdns || [];
+}
+function getOrAddCdnIndex(meta, cdnUrl) {
+  if (!meta._cdns) {
+    meta._cdns = [];
+  }
+  const normalizedUrl = cdnUrl.replace(/\/$/, "");
+  const existingIndex = meta._cdns.indexOf(normalizedUrl);
+  if (existingIndex >= 0) {
+    return existingIndex;
+  }
+  meta._cdns.push(normalizedUrl);
+  return meta._cdns.length - 1;
+}
+function getMetaEntry(meta, key) {
+  if (key.startsWith("_")) return void 0;
+  const value = meta[key];
+  if (Array.isArray(value)) return void 0;
+  return value;
+}
+function setMetaEntry(meta, key, entry) {
+  meta[key] = entry;
+}
+function getFileEntries(meta) {
+  return Object.entries(meta).filter(
+    ([key, value]) => !key.startsWith("_") && !Array.isArray(value)
+  );
+}
 
 // src/handlers/utils/files.ts
 import path2 from "path";
@@ -188,16 +217,17 @@ async function handleList(request) {
   const requestedPath = searchParams.get("path") || "public";
   try {
     const meta = await loadMeta();
-    const metaKeys = Object.keys(meta);
-    if (metaKeys.length === 0) {
+    const fileEntries = getFileEntries(meta);
+    const cdnUrls = getCdnUrls(meta);
+    if (fileEntries.length === 0) {
       return NextResponse.json({ items: [], isEmpty: true });
     }
     const relativePath = requestedPath.replace(/^public\/?/, "");
     const pathPrefix = relativePath ? `/${relativePath}/` : "/";
     const items = [];
     const seenFolders = /* @__PURE__ */ new Set();
-    for (const key of metaKeys) {
-      const entry = meta[key];
+    const metaKeys = fileEntries.map(([key]) => key);
+    for (const [key, entry] of fileEntries) {
       if (!key.startsWith(pathPrefix) && pathPrefix !== "/") continue;
       if (pathPrefix === "/" && !key.startsWith("/")) continue;
       const remaining = pathPrefix === "/" ? key.slice(1) : key.slice(pathPrefix.length);
@@ -222,14 +252,14 @@ async function handleList(request) {
       } else {
         const fileName = remaining;
         const isImage = isImageFile(fileName);
-        const isPushedToCloud = entry.c === 1;
+        const isPushedToCloud = entry.c !== void 0;
         let thumbnail;
         let hasThumbnail = false;
         let fileSize;
-        if (isImage && (entry.w || entry.b)) {
+        if (isImage && entry.p === 1) {
           const thumbPath = getThumbnailPath(key, "sm");
-          if (isPushedToCloud) {
-            const cdnUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_R2_PUBLIC_URL;
+          if (isPushedToCloud && entry.c !== void 0) {
+            const cdnUrl = cdnUrls[entry.c];
             if (cdnUrl) {
               thumbnail = `${cdnUrl}${thumbPath}`;
               hasThumbnail = true;
@@ -246,7 +276,12 @@ async function handleList(request) {
             }
           }
         } else if (isImage) {
-          thumbnail = key;
+          if (isPushedToCloud && entry.c !== void 0) {
+            const cdnUrl = cdnUrls[entry.c];
+            thumbnail = cdnUrl ? `${cdnUrl}${key}` : key;
+          } else {
+            thumbnail = key;
+          }
           hasThumbnail = false;
         }
         if (!isPushedToCloud) {
@@ -284,19 +319,21 @@ async function handleSearch(request) {
   }
   try {
     const meta = await loadMeta();
+    const fileEntries = getFileEntries(meta);
+    const cdnUrls = getCdnUrls(meta);
     const items = [];
-    for (const [key, entry] of Object.entries(meta)) {
+    for (const [key, entry] of fileEntries) {
       if (!key.toLowerCase().includes(query)) continue;
       const fileName = path5.basename(key);
       const relativePath = key.slice(1);
       const isImage = isImageFile(fileName);
-      const isPushedToCloud = entry.c === 1;
+      const isPushedToCloud = entry.c !== void 0;
       let thumbnail;
       let hasThumbnail = false;
-      if (isImage && (entry.w || entry.b)) {
+      if (isImage && entry.p === 1) {
         const thumbPath = getThumbnailPath(key, "sm");
-        if (isPushedToCloud) {
-          const cdnUrl = process.env.CLOUDFLARE_R2_PUBLIC_URL || process.env.NEXT_PUBLIC_CLOUDFLARE_R2_PUBLIC_URL;
+        if (isPushedToCloud && entry.c !== void 0) {
+          const cdnUrl = cdnUrls[entry.c];
           if (cdnUrl) {
             thumbnail = `${cdnUrl}${thumbPath}`;
             hasThumbnail = true;
@@ -313,7 +350,12 @@ async function handleSearch(request) {
           }
         }
       } else if (isImage) {
-        thumbnail = key;
+        if (isPushedToCloud && entry.c !== void 0) {
+          const cdnUrl = cdnUrls[entry.c];
+          thumbnail = cdnUrl ? `${cdnUrl}${key}` : key;
+        } else {
+          thumbnail = key;
+        }
         hasThumbnail = false;
       }
       items.push({
@@ -336,8 +378,9 @@ async function handleSearch(request) {
 async function handleListFolders() {
   try {
     const meta = await loadMeta();
+    const fileEntries = getFileEntries(meta);
     const folderSet = /* @__PURE__ */ new Set();
-    for (const key of Object.keys(meta)) {
+    for (const [key] of fileEntries) {
       const parts = key.split("/");
       let current = "";
       for (let i = 1; i < parts.length - 1; i++) {
@@ -366,8 +409,9 @@ async function handleListFolders() {
 async function handleCountImages() {
   try {
     const meta = await loadMeta();
+    const fileEntries = getFileEntries(meta);
     const allImages = [];
-    for (const key of Object.keys(meta)) {
+    for (const [key] of fileEntries) {
       const fileName = path5.basename(key);
       if (isImageFile(fileName)) {
         allImages.push(key.slice(1));
@@ -391,12 +435,13 @@ async function handleFolderImages(request) {
     }
     const folders = foldersParam.split(",");
     const meta = await loadMeta();
+    const fileEntries = getFileEntries(meta);
     const allImages = [];
     const prefixes = folders.map((f) => {
       const rel = f.replace(/^public\/?/, "");
       return rel ? `/${rel}/` : "/";
     });
-    for (const key of Object.keys(meta)) {
+    for (const [key] of fileEntries) {
       const fileName = path5.basename(key);
       if (!isImageFile(fileName)) continue;
       for (const prefix of prefixes) {
@@ -790,6 +835,7 @@ async function handleSync(request) {
       return NextResponse3.json({ error: "No image keys provided" }, { status: 400 });
     }
     const meta = await loadMeta();
+    const cdnIndex = getOrAddCdnIndex(meta, publicUrl);
     const r2 = new S3Client2({
       region: "auto",
       endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
@@ -798,12 +844,12 @@ async function handleSync(request) {
     const pushed = [];
     const errors = [];
     for (const imageKey of imageKeys) {
-      const entry = meta[imageKey];
+      const entry = getMetaEntry(meta, imageKey);
       if (!entry) {
         errors.push(`Image not found in meta: ${imageKey}. Run Scan first.`);
         continue;
       }
-      if (entry.c) {
+      if (entry.c !== void 0) {
         pushed.push(imageKey);
         continue;
       }
@@ -842,7 +888,7 @@ async function handleSync(request) {
           } catch {
           }
         }
-        entry.c = 1;
+        entry.c = cdnIndex;
         for (const thumbPath of getAllThumbnailPaths(imageKey)) {
           const localPath = path7.join(process.cwd(), "public", thumbPath);
           try {
@@ -883,8 +929,9 @@ async function handleReprocess(request) {
     for (const imageKey of imageKeys) {
       try {
         let buffer;
-        const entry = meta[imageKey];
-        const isPushedToCloud = entry?.c === 1;
+        const entry = getMetaEntry(meta, imageKey);
+        const isPushedToCloud = entry?.c !== void 0;
+        const existingCdnIndex = entry?.c;
         const originalPath = path7.join(process.cwd(), "public", imageKey);
         try {
           buffer = await fs6.readFile(originalPath);
@@ -900,7 +947,7 @@ async function handleReprocess(request) {
         }
         const updatedEntry = await processImage(buffer, imageKey);
         if (isPushedToCloud) {
-          updatedEntry.c = 1;
+          updatedEntry.c = existingCdnIndex;
           await uploadToCdn(imageKey);
           await deleteLocalThumbnails(imageKey);
           try {
@@ -942,7 +989,7 @@ async function handleProcessAllStream() {
         const orphansRemoved = [];
         let alreadyProcessed = 0;
         const imagesToProcess = [];
-        for (const [key, entry] of Object.entries(meta)) {
+        for (const [key, entry] of getFileEntries(meta)) {
           const fileName = path7.basename(key);
           if (!isImageFile(fileName)) continue;
           if (!entry.p) {
@@ -956,7 +1003,8 @@ async function handleProcessAllStream() {
         for (let i = 0; i < imagesToProcess.length; i++) {
           const { key, entry } = imagesToProcess[i];
           const fullPath = path7.join(process.cwd(), "public", key);
-          const isInCloud = entry.c === 1;
+          const isInCloud = entry.c !== void 0;
+          const existingCdnIndex = entry.c;
           sendEvent({
             type: "progress",
             current: i + 1,
@@ -996,7 +1044,7 @@ async function handleProcessAllStream() {
               meta[key] = {
                 ...processedEntry,
                 p: 1,
-                ...isInCloud ? { c: 1 } : {}
+                ...isInCloud ? { c: existingCdnIndex } : {}
               };
             }
             if (isInCloud) {
@@ -1015,8 +1063,8 @@ async function handleProcessAllStream() {
         }
         sendEvent({ type: "cleanup", message: "Removing orphaned thumbnails..." });
         const trackedPaths = /* @__PURE__ */ new Set();
-        for (const imageKey of Object.keys(meta)) {
-          if (!meta[imageKey].c) {
+        for (const [imageKey, entry] of getFileEntries(meta)) {
+          if (entry.c === void 0) {
             for (const thumbPath of getAllThumbnailPaths(imageKey)) {
               trackedPaths.add(thumbPath);
             }
@@ -1236,6 +1284,132 @@ async function handleScanStream() {
   });
 }
 
+// src/handlers/import.ts
+import sharp4 from "sharp";
+import { encode as encode3 } from "blurhash";
+function parseImageUrl(url) {
+  const parsed = new URL(url);
+  const base = `${parsed.protocol}//${parsed.host}`;
+  const path9 = parsed.pathname;
+  return { base, path: path9 };
+}
+async function processRemoteImage(url) {
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch: ${response.status}`);
+  }
+  const buffer = Buffer.from(await response.arrayBuffer());
+  const metadata = await sharp4(buffer).metadata();
+  const { data, info } = await sharp4(buffer).resize(32, 32, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
+  const blurhash = encode3(new Uint8ClampedArray(data), info.width, info.height, 4, 4);
+  return {
+    w: metadata.width || 0,
+    h: metadata.height || 0,
+    b: blurhash
+  };
+}
+async function handleImportUrls(request) {
+  const encoder = new TextEncoder();
+  const stream = new ReadableStream({
+    async start(controller) {
+      const sendEvent = (data) => {
+        controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}
+
+`));
+      };
+      try {
+        const { urls } = await request.json();
+        if (!urls || !Array.isArray(urls) || urls.length === 0) {
+          sendEvent({ type: "error", message: "No URLs provided" });
+          controller.close();
+          return;
+        }
+        const meta = await loadMeta();
+        const added = [];
+        const skipped = [];
+        const errors = [];
+        const total = urls.length;
+        sendEvent({ type: "start", total });
+        for (let i = 0; i < urls.length; i++) {
+          const url = urls[i].trim();
+          if (!url) continue;
+          sendEvent({
+            type: "progress",
+            current: i + 1,
+            total,
+            percent: Math.round((i + 1) / total * 100),
+            currentFile: url
+          });
+          try {
+            const { base, path: path9 } = parseImageUrl(url);
+            const existingEntry = getMetaEntry(meta, path9);
+            if (existingEntry) {
+              skipped.push(path9);
+              continue;
+            }
+            const cdnIndex = getOrAddCdnIndex(meta, base);
+            const imageData = await processRemoteImage(url);
+            setMetaEntry(meta, path9, {
+              w: imageData.w,
+              h: imageData.h,
+              b: imageData.b,
+              c: cdnIndex
+            });
+            added.push(path9);
+          } catch (error) {
+            console.error(`Failed to import ${url}:`, error);
+            errors.push(url);
+          }
+        }
+        await saveMeta(meta);
+        sendEvent({
+          type: "complete",
+          added: added.length,
+          skipped: skipped.length,
+          errors: errors.length
+        });
+      } catch (error) {
+        console.error("Import failed:", error);
+        sendEvent({ type: "error", message: "Import failed" });
+      } finally {
+        controller.close();
+      }
+    }
+  });
+  return new Response(stream, {
+    headers: {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache",
+      "Connection": "keep-alive"
+    }
+  });
+}
+async function handleGetCdns() {
+  try {
+    const meta = await loadMeta();
+    const cdns = meta._cdns || [];
+    return Response.json({ cdns });
+  } catch (error) {
+    console.error("Failed to get CDNs:", error);
+    return Response.json({ error: "Failed to get CDNs" }, { status: 500 });
+  }
+}
+async function handleUpdateCdns(request) {
+  try {
+    const { cdns } = await request.json();
+    if (!Array.isArray(cdns)) {
+      return Response.json({ error: "Invalid CDN array" }, { status: 400 });
+    }
+    const meta = await loadMeta();
+    meta._cdns = cdns.map((url) => url.replace(/\/$/, ""));
+    await saveMeta(meta);
+    return Response.json({ success: true, cdns: meta._cdns });
+  } catch (error) {
+    console.error("Failed to update CDNs:", error);
+    return Response.json({ error: "Failed to update CDNs" }, { status: 500 });
+  }
+}
+
 // src/handlers/index.ts
 async function GET(request) {
   if (process.env.NODE_ENV !== "development") {
@@ -1258,6 +1432,9 @@ async function GET(request) {
   if (route === "search") {
     return handleSearch(request);
   }
+  if (route === "cdns") {
+    return handleGetCdns();
+  }
   return NextResponse4.json({ error: "Not found" }, { status: 404 });
 }
 async function POST(request) {
@@ -1293,6 +1470,12 @@ async function POST(request) {
   if (route === "scan") {
     return handleScanStream();
   }
+  if (route === "import") {
+    return handleImportUrls(request);
+  }
+  if (route === "cdns") {
+    return handleUpdateCdns(request);
+  }
   return NextResponse4.json({ error: "Not found" }, { status: 404 });
 }
 async function DELETE(request) {