@fudrouter/fsrouter 0.6.102 → 0.6.104

package/dist/lib/appUpdater.js

@@ -13,7 +13,7 @@ function killMitmByPidFile() {
     const mitmPidFile = path.join(
       process.platform === "win32"
         ? path.join(process.env.APPDATA || "", "9router")
-        : path.join(os.homedir(), ".amrouter"),
+        : path.join(os.homedir(), ".fsrouter"),
       "mitm",
       ".mitm.pid"
     );
@@ -108,7 +108,7 @@ function getDataDir() {
   if (process.platform === "win32") {
     return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "9router");
   }
-  return path.join(os.homedir(), ".amrouter");
+  return path.join(os.homedir(), ".fsrouter");
 }
 
 function resolveBundledUpdaterPath() {

package/dist/lib/dataDir.js

@@ -2,7 +2,8 @@ import fs from "node:fs";
 import path from "path";
 import os from "os";
 
-const APP_NAME = "amrouter";
+const APP_NAME = "fsrouter";
+const LEGACY_APP_NAME = "amrouter";
 
 function defaultDir() {
   if (process.platform === "win32") {
@@ -11,19 +12,43 @@ function defaultDir() {
   return path.join(os.homedir(), `.${APP_NAME}`);
 }
 
+function legacyDir() {
+  if (process.platform === "win32") {
+    return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), LEGACY_APP_NAME);
+  }
+  return path.join(os.homedir(), `.${LEGACY_APP_NAME}`);
+}
+
 export function getDataDir() {
   const configured = process.env.DATA_DIR;
-  if (!configured) return defaultDir();
-  try {
-    fs.mkdirSync(configured, { recursive: true });
-    return configured;
-  } catch (e) {
-    if (e?.code === "EACCES" || e?.code === "EPERM") {
-      console.warn(`[DATA_DIR] '${configured}' not writable → fallback ~/.${APP_NAME}`);
-      return defaultDir();
+  if (configured) {
+    try {
+      fs.mkdirSync(configured, { recursive: true });
+      return configured;
+    } catch (e) {
+      if (e?.code === "EACCES" || e?.code === "EPERM") {
+        console.warn(`[DATA_DIR] '${configured}' not writable → fallback ~/.${APP_NAME}`);
+        return defaultDir();
+      }
+      throw e;
+    }
+  }
+  const dir = defaultDir();
+  // Backward-compat: if the new dir doesn't exist yet but the legacy `amrouter`
+  // dir does, migrate it (rename) so existing data isn't lost on first launch.
+  if (!fs.existsSync(dir)) {
+    const old = legacyDir();
+    if (fs.existsSync(old)) {
+      try {
+        fs.renameSync(old, dir);
+        console.log(`[DATA_DIR] Migrated legacy data folder ${old} → ${dir}`);
+      } catch (e) {
+        console.warn(`[DATA_DIR] Could not migrate ${old} → ${dir}: ${e.message}`);
+      }
     }
-    throw e;
   }
+  try { fs.mkdirSync(dir, { recursive: true }); } catch { /* ignore */ }
+  return dir;
 }
 
 export const DATA_DIR = getDataDir();

package/dist/lib/db/migrations/002-composite-unique.js

@@ -1,20 +1,73 @@
 // Recreate codebuddyAccounts table to drop the single-column UNIQUE(email)
 // and replace it with composite UNIQUE(email, provider).
+// Idempotent: handles both legacy `ammailAlias` and renamed `fsmailAlias`
+// columns in the old table (older DBs may have run migration 003/004 before
+// this migration's version was recorded, leaving `fsmailAlias` in _old).
 export default {
   version: 2,
   name: "composite-unique-codebuddy-accounts",
   up(db) {
+    // If the table doesn't exist at all, just create it fresh and bail.
+    const exists = db.get(
+      "SELECT 1 FROM sqlite_master WHERE type='table' AND name='codebuddyAccounts'"
+    );
+    if (!exists) {
+      db.exec(`
+        CREATE TABLE codebuddyAccounts (
+          id INTEGER PRIMARY KEY AUTOINCREMENT,
+          email TEXT NOT NULL,
+          password TEXT NOT NULL,
+          profileDir TEXT,
+          fsmailAlias TEXT,
+          signupMethod TEXT DEFAULT 'google',
+          apiKey TEXT,
+          apiKeyStatus TEXT DEFAULT 'pending',
+          lastError TEXT,
+          lastRunAt INTEGER,
+          createdAt TEXT NOT NULL,
+          provider TEXT DEFAULT 'codebuddy',
+          canvaEnrolled INTEGER DEFAULT 0,
+          UNIQUE(email, provider)
+        )
+      `);
+      db.exec("CREATE INDEX IF NOT EXISTS idx_cba_email ON codebuddyAccounts(email)");
+      return;
+    }
+
+    // Detect which alias column the existing (old) table uses.
+    const info = db.all("PRAGMA table_info(codebuddyAccounts)");
+    const cols = info.map((c) => c.name);
+    const hasFsmail = cols.includes("fsmailAlias");
+    const hasAmmail = cols.includes("ammailAlias");
+    const oldAlias = hasFsmail ? "fsmailAlias" : hasAmmail ? "ammailAlias" : null;
+
+    // Already on the target schema (composite unique + fsmailAlias) — skip.
+    if (hasFsmail) {
+      const idx = db.all(
+        "SELECT 1 FROM sqlite_master WHERE type='index' AND name='sqlite_autoindex_codebuddyAccounts_1'"
+      );
+      // The composite UNIQUE was added by this migration; if it's already there, nothing to do.
+      try {
+        db.get("SELECT email, provider FROM codebuddyAccounts LIMIT 1");
+      } catch { /* ignore */ }
+      // If a composite index already exists we can safely skip.
+      const compIdx = db.all(
+        "SELECT * FROM sqlite_master WHERE type='index' AND tbl_name='codebuddyAccounts' AND sql LIKE '%email%provider%'"
+      );
+      if (compIdx.length > 0) return;
+    }
+
     // 1. Rename existing table
     db.exec("ALTER TABLE codebuddyAccounts RENAME TO codebuddyAccounts_old");
 
-    // 2. Create new table with unique(email, provider) constraint
+    // 2. Create new table with unique(email, provider) constraint + fsmailAlias
     db.exec(`
       CREATE TABLE codebuddyAccounts (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         email TEXT NOT NULL,
         password TEXT NOT NULL,
         profileDir TEXT,
-        ammailAlias TEXT,
+        fsmailAlias TEXT,
         signupMethod TEXT DEFAULT 'google',
         apiKey TEXT,
         apiKeyStatus TEXT DEFAULT 'pending',
@@ -30,14 +83,15 @@ export default {
     // 3. Recreate index
     db.exec("CREATE INDEX IF NOT EXISTS idx_cba_email ON codebuddyAccounts(email)");
 
-    // 4. Copy data from old table, ignoring any constraint violations.
+    // 4. Copy data from old table, mapping whichever alias column exists.
+    const aliasSelect = oldAlias || "NULL";
     db.exec(`
       INSERT OR IGNORE INTO codebuddyAccounts (
-        id, email, password, profileDir, ammailAlias, signupMethod, 
+        id, email, password, profileDir, fsmailAlias, signupMethod,
         apiKey, apiKeyStatus, lastError, lastRunAt, createdAt, provider, canvaEnrolled
       )
-      SELECT 
-        id, email, password, profileDir, ammailAlias, signupMethod, 
+      SELECT
+        id, email, password, profileDir, ${aliasSelect}, signupMethod,
         apiKey, apiKeyStatus, lastError, lastRunAt, createdAt, provider, canvaEnrolled
       FROM codebuddyAccounts_old
     `);

package/dist/lib/mitmAliasCache.js

@@ -8,7 +8,7 @@ import os from "os";
 const DATA_DIR = process.env.DATA_DIR
   || (process.platform === "win32"
     ? path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "9router")
-    : path.join(os.homedir(), ".amrouter"));
+    : path.join(os.homedir(), ".fsrouter"));
 
 const CACHE_FILE = path.join(DATA_DIR, "mitm", "aliases.json");
 

package/dist/lib/tunnel/tailscale/tailscale.js

@@ -460,7 +460,7 @@ function isDaemonTunMode() {
  * Start tailscaled.
  * - With sudoPassword: TUN mode (root) → Funnel TLS works
  * - Without: userspace-networking fallback (no sudo, but Funnel TLS unstable)
- * State always lives in ~/.amrouter/tailscale/ via --statedir.
+ * State always lives in ~/.fsrouter/tailscale/ via --statedir.
  */
 export async function startDaemonWithPassword(sudoPassword) {
   if (IS_WINDOWS) {

package/dist/lib/updater/updater.js

@@ -28,7 +28,7 @@ function getDataDir() {
   if (process.platform === "win32") {
     return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "9router");
   }
-  return path.join(os.homedir(), ".amrouter");
+  return path.join(os.homedir(), ".fsrouter");
 }
 const updateDir = path.join(getDataDir(), "update");
 try { fs.mkdirSync(updateDir, { recursive: true }); } catch { /* best effort */ }

package/dist/routes/automation/codebuddy/[id]/route.js

@@ -255,7 +255,7 @@ function executeCodeBuddySignupSingle(accountId, jobId, settings) {
                 }
             }
             try {
-                const logDir = path.join(process.env.DATA_DIR || path.join(process.env.HOME || process.env.USERPROFILE || "/tmp", ".amrouter"), "logs");
+                const logDir = path.join(process.env.DATA_DIR || path.join(process.env.HOME || process.env.USERPROFILE || "/tmp", ".fsrouter"), "logs");
                 fs.mkdirSync(logDir, { recursive: true });
                 fs.appendFileSync(`${logDir}/automation_spawn.log`, `[${new Date().toISOString()}] [id]/route.js spawning python: ${venvPython} ${args.join(" ")}\n`);
             }

package/dist/routes/automation/codebuddy/route.js

@@ -898,7 +898,7 @@ function executeCodeBuddySignup(accountId, jobId, idx, settings, jobStartTimes =
                 }
             }
             try {
-                const logDir = path.join(process.env.DATA_DIR || path.join(process.env.HOME || process.env.USERPROFILE || "/tmp", ".amrouter"), "logs");
+                const logDir = path.join(process.env.DATA_DIR || path.join(process.env.HOME || process.env.USERPROFILE || "/tmp", ".fsrouter"), "logs");
                 fs.mkdirSync(logDir, { recursive: true });
                 fs.appendFileSync(`${logDir}/automation_spawn.log`, `[${new Date().toISOString()}] route.js spawning python: ${venvPython} ${args.join(" ")}\n`);
             }

package/dist/routes/automation/openvecta/route.js

@@ -241,7 +241,7 @@ export async function POST_handler(req, res) {
 // ── Background runner ─────────────────────────────────────────────────────────
 async function runOpenVectaSignup(jobId, email, venvPython, args) {
     try {
-        const logDir = path.join(process.env.DATA_DIR || path.join(process.env.HOME || "/tmp", ".amrouter"), "logs");
+        const logDir = path.join(process.env.DATA_DIR || path.join(process.env.HOME || "/tmp", ".fsrouter"), "logs");
         fs.mkdirSync(logDir, { recursive: true });
         fs.appendFileSync(`${logDir}/automation_spawn.log`, `[${new Date().toISOString()}] openvecta spawning python: ${venvPython} ${args.join(" ")}\n`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fudrouter/fsrouter",
-  "version": "0.6.102",
+  "version": "0.6.104",
   "private": false,
   "type": "module",
   "description": "9Router v2 — Express Backend (API, SSE, DB, Auth, MITM)",