@fudrouter/fsrouter 0.6.101 → 0.6.103

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/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/dist/routes/db/route.js

@@ -91,9 +91,7 @@ export async function POST_handler(req, res) {
             const hasLogical = !!body.database;
             if (hasLogical) {
                 progress(15, "Mengimpor data logical (provider, connections, proxy, api keys, combos)...");
-                // Import on the live connection — do NOT close it first, or getAdapter()
-                // would keep returning the stale closed instance and every query throws
-                // "The database connection is not open".
+                // Import on the live connection.
                 await importDb(body.database);
                 progress(40, "Flush WAL ke file database utama (checkpoint)...");
                 const db = await getAdapter();
@@ -111,6 +109,26 @@ export async function POST_handler(req, res) {
                     }
                     catch { /* ignore */ }
                 }
+                progress(50, "Menutup koneksi DB agar file WAL/SHM tidak terkunci...");
+                // Switch journal mode to DELETE so SQLite folds the WAL back into the
+                // main db file and deletes -wal/-shm itself — avoids leaving a locked
+                // WAL that Windows can't unlink (which previously dropped restored rows).
+                if (db && typeof db.exec === "function") {
+                    try {
+                        db.exec("PRAGMA journal_mode=DELETE");
+                    }
+                    catch { /* ignore */ }
+                }
+                // Close the connection so Windows releases the -wal/-shm file locks.
+                // Logical data is already flushed to the main DB via the checkpoint above.
+                if (db && typeof db.close === "function") {
+                    try {
+                        db.close();
+                    }
+                    catch { /* ignore */ }
+                }
+                // Clear the cached instance so getAdapter() re-opens fresh on next boot.
+                resetAdapter();
             }
             else {
                 progress(15, "Menutup koneksi database aktif (raw restore)...");

package/package.json

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