@trops/dash-core 0.1.231 → 0.1.233

package/dist/electron/index.js

@@ -32248,7 +32248,7 @@ async function installThemeFromRegistry$1(win, appId, packageName) {
 
     const contentType = response.headers.get("content-type") || "";
     const arrayBuffer = await response.arrayBuffer();
-    const zipBuffer = Buffer.from(arrayBuffer);
+    let zipBuffer = Buffer.from(arrayBuffer);
     console.log(`${TAG} [3/5 Download] size=${zipBuffer.length} bytes`);
 
     if (zipBuffer.length === 0) {
@@ -32258,74 +32258,135 @@ async function installThemeFromRegistry$1(win, appId, packageName) {
       };
     }
 
-    // Check if the response is actually a ZIP (not an HTML error page or JSON error)
-    if (
-      contentType.includes("text/html") ||
-      contentType.includes("application/json")
-    ) {
+    // Reject HTML error pages
+    if (contentType.includes("text/html")) {
       const body = zipBuffer.toString("utf-8").slice(0, 200);
-      console.log(
-        `${TAG} [3/5 Download] FAIL — unexpected content type "${contentType}": ${body}`,
-      );
+      console.log(`${TAG} [3/5 Download] FAIL — HTML response: ${body}`);
       return {
         success: false,
-        error: `Download failed: registry returned ${contentType} instead of a ZIP file. The download URL may be incorrect.`,
+        error: `Download failed: registry returned an HTML page instead of theme data.`,
       };
     }
 
-    // Stage 4: ZIP extraction
-    let zip;
-    try {
-      zip = new AdmZip$1(zipBuffer);
-    } catch (zipErr) {
+    // Stage 4: Extract theme data (JSON or ZIP)
+    let themeData;
+
+    if (contentType.includes("application/json")) {
+      // Registry returns JSON with a downloadUrl pointing to the actual ZIP
       console.log(
-        `${TAG} [4/5 ZIP Extraction] FAIL — invalid ZIP: ${zipErr.message}`,
+        `${TAG} [3/5 Download] JSON response — checking for downloadUrl`,
       );
-      return {
-        success: false,
-        error: `ZIP extraction failed: the downloaded file is not a valid ZIP archive (${zipErr.message}).`,
-      };
+      let jsonData;
+      try {
+        jsonData = JSON.parse(zipBuffer.toString("utf-8"));
+      } catch (parseErr) {
+        return {
+          success: false,
+          error: `Download failed: registry returned invalid JSON (${parseErr.message}).`,
+        };
+      }
+      if (jsonData.error) {
+        console.log(
+          `${TAG} [3/5 Download] FAIL — JSON error: ${jsonData.error}`,
+        );
+        return {
+          success: false,
+          error: `Download failed: ${jsonData.error}`,
+        };
+      }
+      if (jsonData.downloadUrl) {
+        // Follow the pre-signed URL to get the actual ZIP
+        console.log(`${TAG} [3/5 Download] following downloadUrl to fetch ZIP`);
+        let zipResponse;
+        try {
+          zipResponse = await fetch(jsonData.downloadUrl);
+        } catch (fetchErr) {
+          return {
+            success: false,
+            error: `Download failed: could not fetch ZIP from storage (${fetchErr.message}).`,
+          };
+        }
+        if (!zipResponse.ok) {
+          return {
+            success: false,
+            error: `Download failed: storage returned ${zipResponse.status} ${zipResponse.statusText}`,
+          };
+        }
+        const zipArrayBuffer = await zipResponse.arrayBuffer();
+        zipBuffer = Buffer.from(zipArrayBuffer);
+        console.log(
+          `${TAG} [3/5 Download] ZIP fetched, size=${zipBuffer.length} bytes`,
+        );
+        if (zipBuffer.length === 0) {
+          return {
+            success: false,
+            error: "Download failed: storage returned an empty ZIP file.",
+          };
+        }
+      } else {
+        // No downloadUrl — treat as direct theme data
+        console.log(
+          `${TAG} [4/5 Extract] JSON response with no downloadUrl — using as theme data`,
+        );
+        themeData = jsonData.data || jsonData.theme || jsonData;
+      }
     }
-    const entries = zip.getEntries();
-    const entryNames = entries.map((e) => e.entryName);
-    const themeEntry = entries.find((entry) =>
-      entry.entryName.endsWith(".theme.json"),
-    );
-    console.log(
-      `${TAG} [4/5 ZIP Extraction] files=[${entryNames.join(", ")}] hasThemeJson=${!!themeEntry}`,
-    );
 
-    if (!themeEntry) {
+    if (!themeData) {
+      // ZIP response — extract .theme.json from archive
+      let zip;
+      try {
+        zip = new AdmZip$1(zipBuffer);
+      } catch (zipErr) {
+        console.log(
+          `${TAG} [4/5 ZIP Extraction] FAIL — invalid ZIP: ${zipErr.message}`,
+        );
+        return {
+          success: false,
+          error: `ZIP extraction failed: the downloaded file is not a valid ZIP archive (${zipErr.message}).`,
+        };
+      }
+      const entries = zip.getEntries();
+      const entryNames = entries.map((e) => e.entryName);
+      const themeEntry = entries.find((entry) =>
+        entry.entryName.endsWith(".theme.json"),
+      );
       console.log(
-        `${TAG} [4/5 ZIP Extraction] FAIL — no .theme.json in archive`,
+        `${TAG} [4/5 ZIP Extraction] files=[${entryNames.join(", ")}] hasThemeJson=${!!themeEntry}`,
       );
-      return {
-        success: false,
-        error: `ZIP extraction failed: no .theme.json file found in archive. Files present: [${entryNames.join(", ")}]`,
-      };
-    }
 
-    // Validate entry path (security: prevent path traversal)
-    if (
-      themeEntry.entryName.includes("..") ||
-      path$2.isAbsolute(themeEntry.entryName)
-    ) {
-      return {
-        success: false,
-        error: "ZIP extraction failed: invalid file path detected in archive.",
-      };
-    }
+      if (!themeEntry) {
+        console.log(
+          `${TAG} [4/5 ZIP Extraction] FAIL — no .theme.json in archive`,
+        );
+        return {
+          success: false,
+          error: `ZIP extraction failed: no .theme.json file found in archive. Files present: [${entryNames.join(", ")}]`,
+        };
+      }
 
-    // Parse theme data
-    const themeJson = themeEntry.getData().toString("utf-8");
-    let themeData;
-    try {
-      themeData = JSON.parse(themeJson);
-    } catch (parseErr) {
-      return {
-        success: false,
-        error: `ZIP extraction failed: ${themeEntry.entryName} contains invalid JSON (${parseErr.message}).`,
-      };
+      // Validate entry path (security: prevent path traversal)
+      if (
+        themeEntry.entryName.includes("..") ||
+        path$2.isAbsolute(themeEntry.entryName)
+      ) {
+        return {
+          success: false,
+          error:
+            "ZIP extraction failed: invalid file path detected in archive.",
+        };
+      }
+
+      // Parse theme data from ZIP entry
+      const themeJson = themeEntry.getData().toString("utf-8");
+      try {
+        themeData = JSON.parse(themeJson);
+      } catch (parseErr) {
+        return {
+          success: false,
+          error: `ZIP extraction failed: ${themeEntry.entryName} contains invalid JSON (${parseErr.message}).`,
+        };
+      }
     }
 
     // Add registry metadata