rechrome 1.9.1 → 1.10.0

package/package.json

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

package/rech.js

@@ -11,8 +11,8 @@ export const DEFAULT_PORT = 13775;
 export const RECH_DIR = join(import.meta.dir, ".rech");
 export const LOG_DIR = join(RECH_DIR, "logs");
 
-const RECH_HOME_DIR = join(process.env.HOME!, ".rech");
-const TOKENS_FILE = join(RECH_HOME_DIR, "tokens.json");
+const RECH_HOME_DIR = join(process.env.HOME!, ".rechrome");
+const TOKENS_FILE = join(RECH_HOME_DIR, "profiles.json");
 
 type TokenEntry = { extensionId: string; token: string; profileDir: string; userDataDir?: string };
 
@@ -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 -> playwright[unknown]`);
+    console.error(`[rech] rech-client -> rech-server[ok]\n  -x: token rejected (used: ${key.slice(0, 6)}...) -> playwright[unknown]`);
     process.exit(1);
   }
   return res.json();
@@ -549,13 +549,18 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
   const { host, port, protocol } = parseUrl(url);
 
   const { key: serveKey } = parseUrl(url);
-  const authPing = await fetch(`${protocol}://${host}:${port}/ping`, {
+  // First check if server is up at all (unauthenticated root), then verify our key matches
+  const anonPing = await fetch(`${protocol}://${host}:${port}/`, { signal: AbortSignal.timeout(2000) }).catch(() => null);
+  const authPing = anonPing ? await fetch(`${protocol}://${host}:${port}/ping`, {
     headers: { Authorization: `Bearer ${serveKey}` },
     signal: AbortSignal.timeout(2000),
-  }).catch(() => null);
-  if (authPing?.ok) {
+  }).catch(() => null) : null;
+  if (anonPing && authPing?.ok) {
     console.log(`      Already running at ${protocol}://${host}:${port} — skipping reinstall`);
     await runOxmgr(["service", "install"]);
+  } else if (anonPing && !authPing?.ok) {
+    console.log(`      Server running but key mismatch — reinstalling with new key`);
+    await daemonInstall(url);
   } else {
     await daemonInstall(url);
     console.log(`      Registered daemon: ${OXMGR_PROCESS_NAME}`);
@@ -603,7 +608,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     return available[idx];
   }
 
-  async function getExtAndToken(profileDir: string, profileDisplay: string): Promise<{ extId: string; token: string } | null> {
+  async function getExtAndToken(profileDir: string, profileDisplay: string, profileKey: string): Promise<{ extId: string; token: string } | null> {
     // Extension check
     let extId: string | undefined;
     while (true) {
@@ -620,6 +625,19 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     }
     console.log(`      Extension found: ${extId}`);
 
+    // Check for existing token in registry
+    const registry = await readTokenRegistry();
+    const existing = registry[profileKey];
+    if (existing && existing.extensionId === extId && existing.token) {
+      console.log(`      Existing token found: ${existing.token.slice(0, 6)}…`);
+      if (!isTTY) console.log(`      [agent] Provide y to keep existing token, n to refresh on next stdin line`);
+      const keep = (await ask("      Keep existing token? [Y/n]: ")).trim().toLowerCase();
+      if (keep !== "n") {
+        console.log("      Keeping existing token");
+        return { extId, token: existing.token };
+      }
+    }
+
     // Token
     const statusUrl = `chrome-extension://${extId}/status.html`;
     console.log(`\n      Get auth token from the extension:`);
@@ -653,10 +671,10 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
 
   // [3+4/4] Extension + token for primary profile
   console.log("\n[3/4] Checking extension...");
-  const primary = await getExtAndToken(profileDir, profileDisplay);
+  const profileEmail = profileInfoSel.user_name || profileDir;
+  const primary = await getExtAndToken(profileDir, profileDisplay, profileEmail);
   if (!primary) { rl?.close(); process.exit(1); }
   const { extId, token } = primary;
-  const profileEmail = profileInfoSel.user_name || profileDir;
 
   // Build RECHROME_URL and show it before asking where to save
   const rechUrl = new URL(url);
@@ -703,10 +721,10 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     if (!extra) { console.log("      Skipped."); continue; }
     const [extraDir, extraInfo] = extra;
     const extraDisplay = extraInfo.user_name || extraInfo.name || extraDir;
+    const extraEmail = extraInfo.user_name || extraDir;
     console.log(`\n      Setting up: ${extraDisplay}`);
-    const result = await getExtAndToken(extraDir, extraDisplay);
+    const result = await getExtAndToken(extraDir, extraDisplay, extraEmail);
     if (!result) { console.log("      Skipped."); continue; }
-    const extraEmail = extraInfo.user_name || extraDir;
     await saveTokenEntry(extraEmail, { extensionId: result.extId, token: result.token, profileDir: extraDir, userDataDir: userDataDir ?? undefined });
     configured.add(extraDir);
     console.log(`      Saved token for ${extraDisplay}`);

package/rech.ts

@@ -11,8 +11,8 @@ export const DEFAULT_PORT = 13775;
 export const RECH_DIR = join(import.meta.dir, ".rech");
 export const LOG_DIR = join(RECH_DIR, "logs");
 
-const RECH_HOME_DIR = join(process.env.HOME!, ".rech");
-const TOKENS_FILE = join(RECH_HOME_DIR, "tokens.json");
+const RECH_HOME_DIR = join(process.env.HOME!, ".rechrome");
+const TOKENS_FILE = join(RECH_HOME_DIR, "profiles.json");
 
 type TokenEntry = { extensionId: string; token: string; profileDir: string; userDataDir?: string };
 
@@ -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 -> playwright[unknown]`);
+    console.error(`[rech] rech-client -> rech-server[ok]\n  -x: token rejected (used: ${key.slice(0, 6)}...) -> playwright[unknown]`);
     process.exit(1);
   }
   return res.json();
@@ -549,13 +549,18 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
   const { host, port, protocol } = parseUrl(url);
 
   const { key: serveKey } = parseUrl(url);
-  const authPing = await fetch(`${protocol}://${host}:${port}/ping`, {
+  // First check if server is up at all (unauthenticated root), then verify our key matches
+  const anonPing = await fetch(`${protocol}://${host}:${port}/`, { signal: AbortSignal.timeout(2000) }).catch(() => null);
+  const authPing = anonPing ? await fetch(`${protocol}://${host}:${port}/ping`, {
     headers: { Authorization: `Bearer ${serveKey}` },
     signal: AbortSignal.timeout(2000),
-  }).catch(() => null);
-  if (authPing?.ok) {
+  }).catch(() => null) : null;
+  if (anonPing && authPing?.ok) {
     console.log(`      Already running at ${protocol}://${host}:${port} — skipping reinstall`);
     await runOxmgr(["service", "install"]);
+  } else if (anonPing && !authPing?.ok) {
+    console.log(`      Server running but key mismatch — reinstalling with new key`);
+    await daemonInstall(url);
   } else {
     await daemonInstall(url);
     console.log(`      Registered daemon: ${OXMGR_PROCESS_NAME}`);
@@ -603,7 +608,7 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     return available[idx];
   }
 
-  async function getExtAndToken(profileDir: string, profileDisplay: string): Promise<{ extId: string; token: string } | null> {
+  async function getExtAndToken(profileDir: string, profileDisplay: string, profileKey: string): Promise<{ extId: string; token: string } | null> {
     // Extension check
     let extId: string | undefined;
     while (true) {
@@ -620,6 +625,19 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     }
     console.log(`      Extension found: ${extId}`);
 
+    // Check for existing token in registry
+    const registry = await readTokenRegistry();
+    const existing = registry[profileKey];
+    if (existing && existing.extensionId === extId && existing.token) {
+      console.log(`      Existing token found: ${existing.token.slice(0, 6)}…`);
+      if (!isTTY) console.log(`      [agent] Provide y to keep existing token, n to refresh on next stdin line`);
+      const keep = (await ask("      Keep existing token? [Y/n]: ")).trim().toLowerCase();
+      if (keep !== "n") {
+        console.log("      Keeping existing token");
+        return { extId, token: existing.token };
+      }
+    }
+
     // Token
     const statusUrl = `chrome-extension://${extId}/status.html`;
     console.log(`\n      Get auth token from the extension:`);
@@ -653,10 +671,10 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
 
   // [3+4/4] Extension + token for primary profile
   console.log("\n[3/4] Checking extension...");
-  const primary = await getExtAndToken(profileDir, profileDisplay);
+  const profileEmail = profileInfoSel.user_name || profileDir;
+  const primary = await getExtAndToken(profileDir, profileDisplay, profileEmail);
   if (!primary) { rl?.close(); process.exit(1); }
   const { extId, token } = primary;
-  const profileEmail = profileInfoSel.user_name || profileDir;
 
   // Build RECHROME_URL and show it before asking where to save
   const rechUrl = new URL(url);
@@ -703,10 +721,10 @@ async function setup(opts: { profile?: string } = {}): Promise<void> {
     if (!extra) { console.log("      Skipped."); continue; }
     const [extraDir, extraInfo] = extra;
     const extraDisplay = extraInfo.user_name || extraInfo.name || extraDir;
+    const extraEmail = extraInfo.user_name || extraDir;
     console.log(`\n      Setting up: ${extraDisplay}`);
-    const result = await getExtAndToken(extraDir, extraDisplay);
+    const result = await getExtAndToken(extraDir, extraDisplay, extraEmail);
     if (!result) { console.log("      Skipped."); continue; }
-    const extraEmail = extraInfo.user_name || extraDir;
     await saveTokenEntry(extraEmail, { extensionId: result.extId, token: result.token, profileDir: extraDir, userDataDir: userDataDir ?? undefined });
     configured.add(extraDir);
     console.log(`      Saved token for ${extraDisplay}`);