@glasshome/widget-cli 0.4.11 → 0.4.13

package/bin/cli.ts

@@ -25,6 +25,7 @@ Commands:
   add                    Add a new widget to the project
   build                  Build all widgets (per-widget, self-contained bundles)
   connect <url>          Connect to a running dashboard for live testing
+                         --re-auth discards stored credentials and re-runs device approval
   validate [name]        Validate all widgets or a specific one
   publish [hub-url]      Build and publish a widget to Hub
   login [hub-url]        Authenticate with GlassHome Hub
@@ -60,13 +61,19 @@ const { values: flags, positionals } = parseArgs({
     name: { type: "string" },
     bump: { type: "string" },
     scope: { type: "string" },
+    "re-auth": { type: "boolean" },
     help: { type: "boolean", short: "h" },
   },
   allowPositionals: true,
   strict: false,
 });
 
-const explicitDir = flags.dir;
+// strict:false widens every flag to string | boolean | undefined; a bare
+// `--flag` with no value parses as `true`, which no string option accepts.
+const str = (v: string | boolean | undefined): string | undefined =>
+  typeof v === "string" ? v : undefined;
+
+const explicitDir = str(flags.dir);
 const [command, ...args] = positionals;
 
 if (command === "help" || flags.help) {
@@ -114,7 +121,7 @@ switch (effectiveCommand) {
       process.exit(1);
     }
     const { runConnect } = await import("../src/commands/connect");
-    await runConnect(url, resolveWidgetDir());
+    await runConnect(url, resolveWidgetDir(), { reAuth: flags["re-auth"] === true });
     break;
   }
 
@@ -144,9 +151,9 @@ switch (effectiveCommand) {
     const hubUrlArg = args[0];
     const { runPublish } = await import("../src/commands/publish");
     await runPublish(resolveWidgetDir(), hubUrlArg, {
-      name: flags.name,
-      bump: flags.bump as "keep" | "patch" | "minor" | "major" | undefined,
-      scope: flags.scope,
+      name: str(flags.name),
+      bump: str(flags.bump) as "keep" | "patch" | "minor" | "major" | undefined,
+      scope: str(flags.scope),
     });
     outro("Done");
     break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glasshome/widget-cli",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "description": "CLI for creating and managing GlassHome widgets",
   "type": "module",
   "bin": {

package/src/commands/connect.ts

@@ -87,7 +87,11 @@ async function uploadAllWidgets(apiUrl: string, distDir: string, token: string):
   return slugs;
 }
 
-export async function runConnect(apiUrl: string, cwd: string): Promise<void> {
+export async function runConnect(
+  apiUrl: string,
+  cwd: string,
+  opts: { reAuth?: boolean } = {},
+): Promise<void> {
   const distDir = resolve(cwd, "dist");
   const solid = (await import("vite-plugin-solid")).default;
   const buildOpts = { srcDir: "src", outDir: "dist", plugins: [solid()] };
@@ -119,6 +123,11 @@ export async function runConnect(apiUrl: string, cwd: string): Promise<void> {
   const host = extractHost(api);
   let token = "";
 
+  if (opts.reAuth) {
+    clearHostToken(host);
+    log.info("Discarded stored credentials (--re-auth).");
+  }
+
   // Validate stored token before using it
   const existingToken = getHostToken(host);
   if (existingToken) {
@@ -216,19 +225,19 @@ export async function runConnect(apiUrl: string, cwd: string): Promise<void> {
           });
 
           if (res.ok) {
-            // better-auth's device-authorization plugin returns a
-            // first-party session, not an OIDC token bundle. The bearer is
-            // session.token; expiry is session.expiresAt (ISO/epoch/Date).
+            // better-auth's device-authorization plugin returns an OAuth-style
+            // bundle: { access_token, token_type, expires_in, scope }. The
+            // access_token IS the first-party session token.
             const data = (await res.json()) as {
-              session?: { token: string; expiresAt: string | number | Date };
-              user?: unknown;
+              access_token?: string;
+              expires_in?: number;
             };
-            if (!data.session?.token) {
+            if (!data.access_token) {
               s.stop("Auth response missing session token");
               break;
             }
-            token = data.session.token;
-            const tokenExpiresAt = new Date(data.session.expiresAt).getTime();
+            token = data.access_token;
+            const tokenExpiresAt = Date.now() + (data.expires_in ?? 0) * 1000;
             storeHostToken(host, token, tokenExpiresAt);
             break;
           }