@trops/dash-core 0.1.237 → 0.1.240

package/dist/electron/index.js

@@ -26595,6 +26595,46 @@ mcpController$3.exports.refreshGoogleOAuthToken = refreshGoogleOAuthToken;
 
 var mcpControllerExports = mcpController$3.exports;
 
+/**
+ * Scoped package identity utilities.
+ *
+ * Follows npm convention: "@scope/name" for scoped packages, "name" for bare.
+ */
+
+/**
+ * Build a canonical package ID from scope + name.
+ * @param {string|null} scope - e.g. "trops" or "@trops"
+ * @param {string} name - bare package name
+ * @returns {string} e.g. "@trops/slack" or "slack"
+ */
+function toPackageId$1(scope, name) {
+  if (scope) {
+    const normalized = scope.replace(/^@/, "");
+    return `@${normalized}/${name}`;
+  }
+  return name;
+}
+
+/**
+ * Parse a package ID into scope + name.
+ * @param {string} id - e.g. "@trops/slack" or "slack"
+ * @returns {{ scope: string|null, name: string }}
+ */
+function parsePackageId(id) {
+  if (id && id.startsWith("@")) {
+    const slashIdx = id.indexOf("/");
+    if (slashIdx !== -1) {
+      return {
+        scope: id.slice(1, slashIdx),
+        name: id.slice(slashIdx + 1),
+      };
+    }
+  }
+  return { scope: null, name: id };
+}
+
+var packageId = { toPackageId: toPackageId$1, parsePackageId };
+
 /**
  * registryController.js
  *
@@ -26609,6 +26649,7 @@ var mcpControllerExports = mcpController$3.exports;
 
 const path$9 = require$$1$2;
 const fs$5 = require$$0$3;
+const { toPackageId } = packageId;
 
 // Default registry API base URL
 const DEFAULT_REGISTRY_API_URL = "https://main.d919rwhuzp7rj.amplifyapp.com";
@@ -26926,10 +26967,18 @@ async function checkUpdates(installedWidgets = []) {
   const updates = [];
 
   for (const installed of installedWidgets) {
-    const pkg = (index.packages || []).find((p) => p.name === installed.name);
+    const installedId = installed.packageId || installed.name;
+    const pkg = (index.packages || []).find((p) => {
+      // Match by scoped ID (e.g. "@trops/slack" === "@trops/slack")
+      const registryId = toPackageId(p.scope, p.name);
+      if (registryId === installedId) return true;
+      // Fallback: bare-name match for pre-migration entries
+      if (p.name === installedId) return true;
+      return false;
+    });
     if (pkg && pkg.version !== installed.version) {
       updates.push({
-        name: pkg.name,
+        name: installed.name,
         currentVersion: installed.version,
         latestVersion: pkg.version,
         downloadUrl: pkg.downloadUrl,
@@ -30933,6 +30982,8 @@ var schedulerController_1 = schedulerController$2;
 	const { app, ipcMain, BrowserWindow } = require$$0$2;
 	const { dynamicWidgetLoader } = dynamicWidgetLoaderExports;
 	const { compileWidget, findWidgetsDir } = widgetCompiler$1;
+	const { toPackageId, parsePackageId } = packageId;
+	const { getStoredToken } = registryAuthController$1;
 
 	let WIDGETS_CACHE_DIR = null;
 	let REGISTRY_CONFIG_FILE = null;
@@ -31041,6 +31092,46 @@ var schedulerController_1 = schedulerController$2;
 	        console.log(
 	          `[WidgetRegistry] Loaded ${this.widgets.size} widgets from cache`,
 	        );
+
+	        // Migration: re-key bare-name entries that have scope metadata
+	        if (!registryData._scopeMigrated) {
+	          let migrated = false;
+	          const entries = Array.from(this.widgets.entries());
+	          for (const [key, entry] of entries) {
+	            if (entry.scope && !key.startsWith("@")) {
+	              const scopedId = toPackageId(entry.scope, key);
+
+	              // Move folder from widgets/{name}/ to widgets/@{scope}/{name}/
+	              const oldPath = path.join(WIDGETS_CACHE_DIR, key);
+	              const newPath = path.join(
+	                WIDGETS_CACHE_DIR,
+	                ...scopedId.split("/"),
+	              );
+	              if (fs.existsSync(oldPath) && !fs.existsSync(newPath)) {
+	                const scopeDir = path.dirname(newPath);
+	                if (!fs.existsSync(scopeDir)) {
+	                  fs.mkdirSync(scopeDir, { recursive: true });
+	                }
+	                fs.renameSync(oldPath, newPath);
+	                console.log(
+	                  `[WidgetRegistry] Migrated folder: ${key} → ${scopedId}`,
+	                );
+	              }
+
+	              // Re-key in the Map
+	              entry.name = scopedId;
+	              entry.packageId = scopedId;
+	              entry.path = newPath;
+	              this.widgets.delete(key);
+	              this.widgets.set(scopedId, entry);
+	              migrated = true;
+	            }
+	          }
+	          if (migrated) {
+	            this.saveRegistry();
+	            console.log("[WidgetRegistry] Scope migration complete");
+	          }
+	        }
 	      }
 	    } catch (error) {
 	      console.error("[WidgetRegistry] Error loading registry:", error);
@@ -31142,7 +31233,8 @@ var schedulerController_1 = schedulerController$2;
 	        throw new Error(`Local path not found: ${resolvedPath}`);
 	      }
 
-	      const widgetPath = path.join(WIDGETS_CACHE_DIR, widgetName);
+	      // Scoped names (e.g. "@trops/slack") get nested dirs: widgets/@trops/slack/
+	      const widgetPath = path.join(WIDGETS_CACHE_DIR, ...widgetName.split("/"));
 
 	      if (fs.existsSync(widgetPath)) {
 	        fs.rmSync(widgetPath, { recursive: true });
@@ -31331,14 +31423,30 @@ var schedulerController_1 = schedulerController$2;
 	        `[WidgetRegistry] Downloading widget: ${widgetName} from ${downloadUrl}`,
 	      );
 
-	      const response = await fetch(downloadUrl);
+	      // Add auth header for registry API download endpoints
+	      const fetchOpts = {};
+	      const registryBase =
+	        process.env.DASH_REGISTRY_API_URL ||
+	        "https://main.d919rwhuzp7rj.amplifyapp.com";
+	      if (
+	        downloadUrl.includes(registryBase) ||
+	        downloadUrl.includes("/api/packages/")
+	      ) {
+	        const auth = getStoredToken();
+	        if (auth?.token) {
+	          fetchOpts.headers = { Authorization: `Bearer ${auth.token}` };
+	        }
+	      }
+
+	      const response = await fetch(downloadUrl, fetchOpts);
 	      if (!response.ok)
 	        throw new Error(`Failed to fetch: ${response.statusText}`);
 
 	      const buffer = await response.arrayBuffer();
 	      const zip = new AdmZip(Buffer.from(buffer));
 
-	      const widgetPath = path.join(WIDGETS_CACHE_DIR, widgetName);
+	      // Scoped names (e.g. "@trops/slack") get nested dirs: widgets/@trops/slack/
+	      const widgetPath = path.join(WIDGETS_CACHE_DIR, ...widgetName.split("/"));
 
 	      if (fs.existsSync(widgetPath)) {
 	        fs.rmSync(widgetPath, { recursive: true });
@@ -31432,6 +31540,9 @@ var schedulerController_1 = schedulerController$2;
 	      widgetEntry.scope = config.scope;
 	    }
 
+	    // Store canonical package ID for update matching
+	    widgetEntry.packageId = widgetName;
+
 	    this.widgets.set(widgetName, widgetEntry);
 	    this.saveRegistry();
 	    console.log(`[WidgetRegistry] Registered widget: ${widgetName}`);
@@ -31557,6 +31668,16 @@ var schedulerController_1 = schedulerController$2;
 	      if (fs.existsSync(widget.path)) {
 	        fs.rmSync(widget.path, { recursive: true });
 	      }
+
+	      // Clean up empty scope directory (e.g. widgets/@trops/ after removing @trops/slack)
+	      const { scope } = parsePackageId(widgetName);
+	      if (scope) {
+	        const scopeDir = path.join(WIDGETS_CACHE_DIR, `@${scope}`);
+	        if (fs.existsSync(scopeDir) && fs.readdirSync(scopeDir).length === 0) {
+	          fs.rmdirSync(scopeDir);
+	        }
+	      }
+
 	      this.widgets.delete(widgetName);
 	      this.saveRegistry();
 	      console.log(`[WidgetRegistry] Uninstalled widget: ${widgetName}`);