@trops/dash-core 0.1.232 → 0.1.234

package/dist/electron/index.js

@@ -29124,16 +29124,27 @@ function buildWidgetDependencies$1(componentNames, widgetRegistry = null) {
     if (seen.has(name)) continue;
     seen.add(name);
 
+    let scope = "";
     let packageName = "";
+    let widgetName = name;
     let version = "*";
     let author = "";
 
+    // Check if name is already a scoped ID (scope.packageName.widgetName)
+    const parts = name.split(".");
+    if (parts.length === 3) {
+      scope = parts[0];
+      packageName = parts[1];
+      widgetName = parts[2];
+    }
+
     // Try to resolve from widget registry
     if (widgetRegistry) {
       const installedWidgets = widgetRegistry.getWidgets();
       for (const w of installedWidgets) {
         if (w.componentNames && w.componentNames.includes(name)) {
-          packageName = w.name || "";
+          if (!scope && w.scope) scope = w.scope;
+          if (!packageName || packageName === name) packageName = w.name || "";
           version = w.version || "*";
           author =
             typeof w.author === "string" ? w.author : w.author?.name || "";
@@ -29142,9 +29153,19 @@ function buildWidgetDependencies$1(componentNames, widgetRegistry = null) {
       }
     }
 
+    const id =
+      scope && packageName && widgetName
+        ? `${scope}.${packageName}.${widgetName}`
+        : packageName
+          ? `${packageName}.${widgetName}`
+          : widgetName;
+
     widgets.push({
-      id: packageName ? `${packageName}.${name}` : name,
-      package: packageName || name,
+      id,
+      scope: scope || "",
+      packageName: packageName || widgetName,
+      widgetName,
+      package: packageName || widgetName,
       version,
       required: true,
       author: author || "",
@@ -29268,11 +29289,18 @@ function checkDashboardCompatibility(
   installedWidgets = [],
   registryPackages = [],
 ) {
+  // Build lookup maps using composite keys (scope.packageName.componentName)
+  const installedByKey = new Map();
   const installedByName = new Map();
   for (const w of installedWidgets) {
     if (w.name) {
       installedByName.set(w.name, w);
     }
+    if (w.scope && w.name && w.componentNames) {
+      for (const cn of w.componentNames) {
+        installedByKey.set(`${w.scope}.${w.name}.${cn}`, w);
+      }
+    }
   }
 
   const registryByName = new Map();
@@ -29289,19 +29317,31 @@ function checkDashboardCompatibility(
   let hasUnavailableRequired = false;
 
   for (const dep of dashboardWidgets) {
-    const packageName = dep.package;
+    // Build composite key for scoped matching
+    const key =
+      dep.scope && dep.packageName && dep.widgetName
+        ? `${dep.scope}.${dep.packageName}.${dep.widgetName}`
+        : null;
+    const packageName = dep.package || dep.packageName || "";
     const required = dep.required !== false;
-    const installed = installedByName.get(packageName);
+
+    // Try composite key first, then fall back to package name
+    const installed = key
+      ? installedByKey.get(key) || installedByName.get(packageName)
+      : installedByName.get(packageName);
+
+    // Use the dep's id or key for the status map
+    const statusKey = dep.id || key || packageName;
 
     if (installed) {
       installedCount++;
-      widgets[packageName] = "installed";
+      widgets[statusKey] = "installed";
     } else if (registryByName.has(packageName)) {
       toInstallCount++;
-      widgets[packageName] = "available";
+      widgets[statusKey] = "available";
     } else {
       unavailableCount++;
-      widgets[packageName] = "unavailable";
+      widgets[statusKey] = "unavailable";
       if (required) {
         hasUnavailableRequired = true;
       }
@@ -29360,6 +29400,9 @@ function generateRegistryManifest(dashboardConfig, options = {}) {
     publishedAt: new Date().toISOString(),
     widgets: (dashboardConfig.widgets || []).map((w) => ({
       id: w.id,
+      scope: w.scope || "",
+      packageName: w.packageName || w.package || "",
+      widgetName: w.widgetName || (w.id ? w.id.split(".").pop() : w.package),
       name: w.id ? w.id.split(".").pop() : w.package,
       package: w.package,
       version: w.version || "*",
@@ -31364,6 +31407,11 @@ var schedulerController_1 = schedulerController$2;
 	      registeredAt: new Date().toISOString(),
 	    };
 
+	    // Persist scope from manifest/config if available
+	    if (config.scope) {
+	      widgetEntry.scope = config.scope;
+	    }
+
 	    this.widgets.set(widgetName, widgetEntry);
 	    this.saveRegistry();
 	    console.log(`[WidgetRegistry] Registered widget: ${widgetName}`);
@@ -31424,6 +31472,8 @@ var schedulerController_1 = schedulerController$2;
 	          // has full display data without needing ComponentManager.
 	          if (result?.config && existingEntry) {
 	            const cfg = result.config;
+	            if (cfg.scope && !existingEntry.scope)
+	              existingEntry.scope = cfg.scope;
 	            if (cfg.icon && !existingEntry.icon) existingEntry.icon = cfg.icon;
 	            if (cfg.providers?.length && !existingEntry.providers?.length)
 	              existingEntry.providers = cfg.providers;
@@ -32248,7 +32298,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) {
@@ -32272,8 +32322,10 @@ async function installThemeFromRegistry$1(win, appId, packageName) {
     let themeData;
 
     if (contentType.includes("application/json")) {
-      // Registry served theme data as JSON directly — parse and use it
-      console.log(`${TAG} [4/5 Extract] JSON response — parsing directly`);
+      // Registry returns JSON with a downloadUrl pointing to the actual ZIP
+      console.log(
+        `${TAG} [3/5 Download] JSON response — checking for downloadUrl`,
+      );
       let jsonData;
       try {
         jsonData = JSON.parse(zipBuffer.toString("utf-8"));
@@ -32285,16 +32337,52 @@ async function installThemeFromRegistry$1(win, appId, packageName) {
       }
       if (jsonData.error) {
         console.log(
-          `${TAG} [4/5 Extract] FAIL — JSON error: ${jsonData.error}`,
+          `${TAG} [3/5 Download] FAIL — JSON error: ${jsonData.error}`,
         );
         return {
           success: false,
           error: `Download failed: ${jsonData.error}`,
         };
       }
-      // The response may be raw theme data, or wrapped in a data/theme key
-      themeData = jsonData.data || jsonData.theme || jsonData;
-    } else {
+      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;
+      }
+    }
+
+    if (!themeData) {
       // ZIP response — extract .theme.json from archive
       let zip;
       try {