rechrome 1.10.1 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rechrome",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/snomiao/rechrome.git"

package/rech.js

@@ -120,7 +120,7 @@ export function parseUrl(raw: string) {
 export async function getOrCreateUrl(): Promise<string> {
   // Treat a URL without a bearer key as missing — it cannot authenticate
   try { if (process.env[ENV_KEY] && new URL(process.env[ENV_KEY]!).username) return process.env[ENV_KEY]!; } catch {}
-  const key = randomBytes(9).toString("base64url"); // 12 chars
+  const key = randomBytes(12).toString("base64url"); // 16 chars
   const url = `http://${key}@127.0.0.1:${DEFAULT_PORT}`;
   const newLine = `${ENV_KEY}=${url}`;
   // Write to ~/.env.local so it's not shadowed by project .env.local
@@ -362,7 +362,7 @@ async function callServe(
     process.exit(1);
   });
   if (res.status === 401) {
-    console.error(`[rech] rech-client -> rech-server[ok]\n  -x: token rejected (used: ${key.slice(0, 6)}...) -> playwright[unknown]`);
+    console.error(`[rech] rech-client -> rech-server[ok]\n  -x: bearer key rejected (used: ${key.slice(0, 4)}...) -> playwright[unknown]`);
     process.exit(1);
   }
   return res.json();
@@ -381,6 +381,11 @@ async function run(url: string, args: string[]) {
   const resolvedEnv = await getClientEnv({ extensionId, extensionToken, profileDirectory, userDataDir });
   const { status, stdout, stderr, files, existingSession } = await callServe(url, args);
 
+  const isOpenWithUrl = args[0] === "open" && args.length > 1;
+  if (existingSession && isOpenWithUrl) {
+    return run(url, ["goto", ...args.slice(1)]);
+  }
+
   if (existingSession)
     console.error(`[rech] session already has open tabs — listing existing tabs instead of opening a new window`);
   if (stderr) {
@@ -406,7 +411,7 @@ async function run(url: string, args: string[]) {
       });
       if (!fileRes.ok) continue;
       const dest = join(dlDir, basename(name));
-      await Bun.write(dest, fileRes);
+      await Bun.write(dest, await fileRes.arrayBuffer());
       console.error(`[rech] downloaded: ${dest}`);
     }
   }
@@ -481,6 +486,17 @@ async function runOxmgr(args: string[]): Promise<number> {
 }
 
 async function daemonInstall(serveUrl: string): Promise<void> {
+  // Persist the URL to ~/.env.local before starting the daemon. The daemon's
+  // loadEnv() walks CWD→root reading .env.local files and unconditionally
+  // overwrites process.env.RECHROME_URL from whichever file it finds first.
+  // Without this write, oxmgr's --env RECHROME_URL=... gets clobbered by a
+  // stale ~/.env.local entry — the daemon then listens on a different bearer
+  // key than the one daemonInstall was called with, and every client request
+  // is rejected with "bearer key rejected".
+  const envRaw = await file(globalEnvFile).text().catch(() => "");
+  const filtered = envRaw.trimEnd().split("\n").filter(l => !l.startsWith(`${ENV_KEY}=`));
+  await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${serveUrl}`, ""].join("\n"));
+
   const home = process.env.HOME!;
   const bunBin = Bun.which("bun") ?? process.execPath;
   const rechScript = import.meta.filename;
@@ -677,7 +693,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
 
   // Build RECHROME_URL and show it before asking where to save
   const rechUrl = new URL(url);
-  if (!rechUrl.username) rechUrl.username = randomBytes(9).toString("base64url");
+  if (!rechUrl.username) rechUrl.username = randomBytes(12).toString("base64url");
   rechUrl.searchParams.set("extension_id", extId);
   rechUrl.searchParams.set("token", token);
   rechUrl.searchParams.set("profile", profileEmail);

package/rech.ts

@@ -120,7 +120,7 @@ export function parseUrl(raw: string) {
 export async function getOrCreateUrl(): Promise<string> {
   // Treat a URL without a bearer key as missing — it cannot authenticate
   try { if (process.env[ENV_KEY] && new URL(process.env[ENV_KEY]!).username) return process.env[ENV_KEY]!; } catch {}
-  const key = randomBytes(9).toString("base64url"); // 12 chars
+  const key = randomBytes(12).toString("base64url"); // 16 chars
   const url = `http://${key}@127.0.0.1:${DEFAULT_PORT}`;
   const newLine = `${ENV_KEY}=${url}`;
   // Write to ~/.env.local so it's not shadowed by project .env.local
@@ -362,7 +362,7 @@ async function callServe(
     process.exit(1);
   });
   if (res.status === 401) {
-    console.error(`[rech] rech-client -> rech-server[ok]\n  -x: token rejected (used: ${key.slice(0, 6)}...) -> playwright[unknown]`);
+    console.error(`[rech] rech-client -> rech-server[ok]\n  -x: bearer key rejected (used: ${key.slice(0, 4)}...) -> playwright[unknown]`);
     process.exit(1);
   }
   return res.json();
@@ -381,6 +381,11 @@ async function run(url: string, args: string[]) {
   const resolvedEnv = await getClientEnv({ extensionId, extensionToken, profileDirectory, userDataDir });
   const { status, stdout, stderr, files, existingSession } = await callServe(url, args);
 
+  const isOpenWithUrl = args[0] === "open" && args.length > 1;
+  if (existingSession && isOpenWithUrl) {
+    return run(url, ["goto", ...args.slice(1)]);
+  }
+
   if (existingSession)
     console.error(`[rech] session already has open tabs — listing existing tabs instead of opening a new window`);
   if (stderr) {
@@ -406,7 +411,7 @@ async function run(url: string, args: string[]) {
       });
       if (!fileRes.ok) continue;
       const dest = join(dlDir, basename(name));
-      await Bun.write(dest, fileRes);
+      await Bun.write(dest, await fileRes.arrayBuffer());
       console.error(`[rech] downloaded: ${dest}`);
     }
   }
@@ -481,6 +486,17 @@ async function runOxmgr(args: string[]): Promise<number> {
 }
 
 async function daemonInstall(serveUrl: string): Promise<void> {
+  // Persist the URL to ~/.env.local before starting the daemon. The daemon's
+  // loadEnv() walks CWD→root reading .env.local files and unconditionally
+  // overwrites process.env.RECHROME_URL from whichever file it finds first.
+  // Without this write, oxmgr's --env RECHROME_URL=... gets clobbered by a
+  // stale ~/.env.local entry — the daemon then listens on a different bearer
+  // key than the one daemonInstall was called with, and every client request
+  // is rejected with "bearer key rejected".
+  const envRaw = await file(globalEnvFile).text().catch(() => "");
+  const filtered = envRaw.trimEnd().split("\n").filter(l => !l.startsWith(`${ENV_KEY}=`));
+  await Bun.write(globalEnvFile, [...filtered, `${ENV_KEY}=${serveUrl}`, ""].join("\n"));
+
   const home = process.env.HOME!;
   const bunBin = Bun.which("bun") ?? process.execPath;
   const rechScript = import.meta.filename;
@@ -677,7 +693,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
 
   // Build RECHROME_URL and show it before asking where to save
   const rechUrl = new URL(url);
-  if (!rechUrl.username) rechUrl.username = randomBytes(9).toString("base64url");
+  if (!rechUrl.username) rechUrl.username = randomBytes(12).toString("base64url");
   rechUrl.searchParams.set("extension_id", extId);
   rechUrl.searchParams.set("token", token);
   rechUrl.searchParams.set("profile", profileEmail);

package/serve.js

@@ -173,8 +173,8 @@ export async function serve() {
 
       // For open commands, default to about:blank to avoid leaving connect.html visible
       const isOpenCmd = filteredArgs[0] === "open";
-      if (isOpenCmd && filteredArgs.length === 1)
-        filteredArgs.push("about:blank");
+      const isOpenNoUrl = isOpenCmd && filteredArgs.length === 1;
+      if (isOpenNoUrl) filteredArgs.push("about:blank");
 
       // bare `rech open` with no URL: warn if session already has tabs
       if (isOpenCmd && filteredArgs.length === 1) {
@@ -186,19 +186,26 @@ export async function serve() {
             stderr: "pipe",
             env: { PATH: process.env.PATH, HOME: process.env.HOME },
           });
-          const [listStatus, listOut] = await Promise.all([
-            listProc.exited,
-            new Response(listProc.stdout).text(),
+          const [listStatus, listOut] = await Promise.race([
+            Promise.all([listProc.exited, new Response(listProc.stdout).text()]),
+            new Promise<[number, string]>((resolve) =>
+              setTimeout(() => { listProc.kill(); resolve([1, ""]); }, 5000)
+            ),
           ]);
           if (listStatus === 0 && listOut.trim()) {
-            log(`session ${namespacedSession} already has tabs, returning tab-list hint`);
-            return Response.json({
-              status: 0,
-              stdout: listOut,
-              stderr: `[rech] session "${namespacedSession}" already has open tabs:\n`,
-              files: [],
-              existingSession: true,
-            });
+            if (isOpenNoUrl) {
+              log(`session ${namespacedSession} already has tabs, returning tab-list hint`);
+              return Response.json({
+                status: 0,
+                stdout: listOut,
+                stderr: `[rech] session "${namespacedSession}" already has open tabs:\n`,
+                files: [],
+                existingSession: true,
+              });
+            }
+            // URL specified: navigate to it instead of returning tab-list
+            log(`session ${namespacedSession} already has tabs, converting open to goto`);
+            filteredArgs[0] = "goto";
           }
         } catch (e) {
           log(`tab-list check failed: ${e}`);

package/serve.ts

@@ -173,8 +173,8 @@ export async function serve() {
 
       // For open commands, default to about:blank to avoid leaving connect.html visible
       const isOpenCmd = filteredArgs[0] === "open";
-      if (isOpenCmd && filteredArgs.length === 1)
-        filteredArgs.push("about:blank");
+      const isOpenNoUrl = isOpenCmd && filteredArgs.length === 1;
+      if (isOpenNoUrl) filteredArgs.push("about:blank");
 
       // bare `rech open` with no URL: warn if session already has tabs
       if (isOpenCmd && filteredArgs.length === 1) {
@@ -186,19 +186,26 @@ export async function serve() {
             stderr: "pipe",
             env: { PATH: process.env.PATH, HOME: process.env.HOME },
           });
-          const [listStatus, listOut] = await Promise.all([
-            listProc.exited,
-            new Response(listProc.stdout).text(),
+          const [listStatus, listOut] = await Promise.race([
+            Promise.all([listProc.exited, new Response(listProc.stdout).text()]),
+            new Promise<[number, string]>((resolve) =>
+              setTimeout(() => { listProc.kill(); resolve([1, ""]); }, 5000)
+            ),
           ]);
           if (listStatus === 0 && listOut.trim()) {
-            log(`session ${namespacedSession} already has tabs, returning tab-list hint`);
-            return Response.json({
-              status: 0,
-              stdout: listOut,
-              stderr: `[rech] session "${namespacedSession}" already has open tabs:\n`,
-              files: [],
-              existingSession: true,
-            });
+            if (isOpenNoUrl) {
+              log(`session ${namespacedSession} already has tabs, returning tab-list hint`);
+              return Response.json({
+                status: 0,
+                stdout: listOut,
+                stderr: `[rech] session "${namespacedSession}" already has open tabs:\n`,
+                files: [],
+                existingSession: true,
+              });
+            }
+            // URL specified: navigate to it instead of returning tab-list
+            log(`session ${namespacedSession} already has tabs, converting open to goto`);
+            filteredArgs[0] = "goto";
           }
         } catch (e) {
           log(`tab-list check failed: ${e}`);