@getrouter/getrouter-cli 0.1.7 → 0.1.9

package/dist/bin.mjs

@@ -8,7 +8,7 @@ import { randomInt } from "node:crypto";
 import prompts from "prompts";
 
 //#region package.json
-var version = "0.1.7";
+var version = "0.1.9";
 
 //#endregion
 //#region src/generated/router/dashboard/v1/index.ts
@@ -369,12 +369,15 @@ const shouldRetryResponse = (error) => {
 	if (typeof error === "object" && error !== null && "status" in error && typeof error.status === "number") return isServerError(error.status);
 	return error instanceof TypeError;
 };
-const requestJson = async ({ path: path$1, method, body, fetchImpl, maxRetries = 3, _retrySleep }) => {
+const requestJson = async ({ path: path$1, method, body, fetchImpl, maxRetries = 3, includeAuth = true, _retrySleep }) => {
 	return withRetry(async () => {
-		const auth = readAuth();
+		const auth = includeAuth ? readAuth() : {
+			accessToken: void 0,
+			refreshToken: void 0
+		};
 		const url = buildApiUrl(path$1);
-		let res = await doFetch(url, method, buildHeaders(auth.accessToken), body, fetchImpl);
-		if (res.status === 401 && auth.refreshToken) {
+		let res = await doFetch(url, method, includeAuth ? buildHeaders(auth.accessToken) : buildHeaders(), body, fetchImpl);
+		if (includeAuth && res.status === 401 && auth.refreshToken) {
 			const refreshed = await refreshAccessToken({ fetchImpl });
 			if (refreshed?.accessToken) res = await doFetch(url, method, buildHeaders(refreshed.accessToken), body, fetchImpl);
 		}
@@ -389,7 +392,7 @@ const requestJson = async ({ path: path$1, method, body, fetchImpl, maxRetries =
 
 //#endregion
 //#region src/core/api/client.ts
-const createApiClients = ({ fetchImpl, clients }) => {
+const createApiClients = ({ fetchImpl, clients, includeAuth = true }) => {
 	const factories = clients ?? {
 		createConsumerServiceClient,
 		createAuthServiceClient,
@@ -402,7 +405,8 @@ const createApiClients = ({ fetchImpl, clients }) => {
 			path: path$1,
 			method,
 			body: body ? JSON.parse(body) : void 0,
-			fetchImpl
+			fetchImpl,
+			includeAuth
 		});
 	};
 	return {
@@ -446,31 +450,38 @@ const generateAuthCode = () => {
 	return out;
 };
 const buildLoginUrl = (authCode) => `https://getrouter.dev/auth/${authCode}`;
+const spawnBrowser = (command, args) => {
+	try {
+		const child = spawn(command, args, {
+			stdio: "ignore",
+			detached: true
+		});
+		child.on("error", (err) => {
+			const code = typeof err === "object" && err !== null && "code" in err ? err.code : void 0;
+			const reason = code === "ENOENT" ? ` (${command} not found)` : code ? ` (${code})` : "";
+			console.log(`⚠️ Unable to open browser${reason}. Please open the URL manually.`);
+		});
+		child.unref();
+	} catch {
+		console.log("⚠️ Unable to open browser. Please open the URL manually.");
+	}
+};
 const openLoginUrl = async (url) => {
 	try {
 		if (process.platform === "darwin") {
-			spawn("open", [url], {
-				stdio: "ignore",
-				detached: true
-			}).unref();
+			spawnBrowser("open", [url]);
 			return;
 		}
 		if (process.platform === "win32") {
-			spawn("cmd", [
+			spawnBrowser("cmd", [
 				"/c",
 				"start",
 				"",
 				url
-			], {
-				stdio: "ignore",
-				detached: true
-			}).unref();
+			]);
 			return;
 		}
-		spawn("xdg-open", [url], {
-			stdio: "ignore",
-			detached: true
-		}).unref();
+		spawnBrowser("xdg-open", [url]);
 	} catch {}
 };
 const pollAuthorize = async ({ authorize, code, timeoutMs = 300 * 1e3, initialDelayMs = 1e3, maxDelayMs = 1e4, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), now = () => Date.now(), onRetry }) => {
@@ -498,7 +509,7 @@ const pollAuthorize = async ({ authorize, code, timeoutMs = 300 * 1e3, initialDe
 //#region src/cmd/auth.ts
 const registerAuthCommands = (program) => {
 	program.command("login").description("Login with device flow").action(async () => {
-		const { authService } = createApiClients({});
+		const { authService } = createApiClients({ includeAuth: false });
 		const authCode = generateAuthCode();
 		const url = buildLoginUrl(authCode);
 		console.log("🔐 To authenticate, visit:");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getrouter/getrouter-cli",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "description": "CLI for getrouter.dev",
   "bin": {

package/src/cmd/auth.ts

@@ -14,7 +14,7 @@ export const registerAuthCommands = (program: Command) => {
     .command("login")
     .description("Login with device flow")
     .action(async () => {
-      const { authService } = createApiClients({});
+      const { authService } = createApiClients({ includeAuth: false });
       const authCode = generateAuthCode();
       const url = buildLoginUrl(authCode);
       console.log("🔐 To authenticate, visit:");

package/src/core/api/client.ts

@@ -46,9 +46,11 @@ export type ApiClients = {
 export const createApiClients = ({
   fetchImpl,
   clients,
+  includeAuth = true,
 }: {
   fetchImpl?: typeof fetch;
   clients?: ClientFactories;
+  includeAuth?: boolean;
 }): ApiClients => {
   const factories =
     clients ??
@@ -66,6 +68,7 @@ export const createApiClients = ({
       method,
       body: body ? JSON.parse(body) : undefined,
       fetchImpl,
+      includeAuth,
     });
   };
 

package/src/core/auth/device.ts

@@ -33,29 +33,44 @@ export const generateAuthCode = () => {
 export const buildLoginUrl = (authCode: string) =>
   `https://getrouter.dev/auth/${authCode}`;
 
+const spawnBrowser = (command: string, args: string[]) => {
+  try {
+    const child = spawn(command, args, {
+      stdio: "ignore",
+      detached: true,
+    });
+    child.on("error", (err) => {
+      const code =
+        typeof err === "object" && err !== null && "code" in err
+          ? (err as { code?: string }).code
+          : undefined;
+      const reason =
+        code === "ENOENT"
+          ? ` (${command} not found)`
+          : code
+            ? ` (${code})`
+            : "";
+      console.log(
+        `⚠️ Unable to open browser${reason}. Please open the URL manually.`,
+      );
+    });
+    child.unref();
+  } catch {
+    console.log("⚠️ Unable to open browser. Please open the URL manually.");
+  }
+};
+
 export const openLoginUrl = async (url: string) => {
   try {
     if (process.platform === "darwin") {
-      const child = spawn("open", [url], {
-        stdio: "ignore",
-        detached: true,
-      });
-      child.unref();
+      spawnBrowser("open", [url]);
       return;
     }
     if (process.platform === "win32") {
-      const child = spawn("cmd", ["/c", "start", "", url], {
-        stdio: "ignore",
-        detached: true,
-      });
-      child.unref();
+      spawnBrowser("cmd", ["/c", "start", "", url]);
       return;
     }
-    const child = spawn("xdg-open", [url], {
-      stdio: "ignore",
-      detached: true,
-    });
-    child.unref();
+    spawnBrowser("xdg-open", [url]);
   } catch {
     // best effort
   }

package/src/core/http/request.ts

@@ -10,6 +10,7 @@ type RequestInput = {
   body?: unknown;
   fetchImpl?: typeof fetch;
   maxRetries?: number;
+  includeAuth?: boolean;
   /** For testing: override the sleep function used for retry delays */
   _retrySleep?: (ms: number) => Promise<void>;
 };
@@ -63,18 +64,23 @@ export const requestJson = async <T = unknown>({
   body,
   fetchImpl,
   maxRetries = 3,
+  includeAuth = true,
   _retrySleep,
 }: RequestInput): Promise<T> => {
   return withRetry(
     async () => {
-      const auth = readAuth();
+      const auth = includeAuth
+        ? readAuth()
+        : { accessToken: undefined, refreshToken: undefined };
       const url = buildApiUrl(path);
-      const headers = buildHeaders(auth.accessToken);
+      const headers = includeAuth
+        ? buildHeaders(auth.accessToken)
+        : buildHeaders();
 
       let res = await doFetch(url, method, headers, body, fetchImpl);
 
       // On 401, attempt token refresh and retry once
-      if (res.status === 401 && auth.refreshToken) {
+      if (includeAuth && res.status === 401 && auth.refreshToken) {
         const refreshed = await refreshAccessToken({ fetchImpl });
         if (refreshed?.accessToken) {
           const newHeaders = buildHeaders(refreshed.accessToken);

package/tests/http/request.test.ts

@@ -51,6 +51,36 @@ describe("requestJson", () => {
     expect(headers.Cookie).toBe("access_token=t");
   });
 
+  it("skips auth headers when includeAuth is false", async () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));
+    process.env.GETROUTER_CONFIG_DIR = dir;
+    fs.writeFileSync(
+      path.join(dir, "auth.json"),
+      JSON.stringify({ accessToken: "t" }),
+    );
+
+    const fetchSpy = vi.fn(
+      async (_input: RequestInfo | URL, _init?: RequestInit) =>
+        ({
+          ok: true,
+          json: async () => ({ ok: true }),
+        }) as Response,
+    );
+
+    await requestJson({
+      path: "/v1/test",
+      method: "GET",
+      fetchImpl: fetchSpy as unknown as typeof fetch,
+      includeAuth: false,
+    });
+
+    const call = fetchSpy.mock.calls[0] as Parameters<typeof fetch> | undefined;
+    const init = call?.[1];
+    const headers = (init?.headers ?? {}) as Record<string, string>;
+    expect(headers.Authorization).toBeUndefined();
+    expect(headers.Cookie).toBeUndefined();
+  });
+
   it("uses GETROUTER_AUTH_COOKIE when set", async () => {
     process.env.GETROUTER_AUTH_COOKIE = "router_auth";
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));