@fudrouter/fsrouter 0.6.104 → 0.6.106

package/dist/lib/db/index.js

@@ -80,6 +80,12 @@ export async function exportDb() {
     proxyPools: db.all(`SELECT * FROM proxyPools`).map((r) => ({ ...parseJson(r.data, {}), id: r.id, isActive: r.isActive === 1, testStatus: r.testStatus, createdAt: r.createdAt, updatedAt: r.updatedAt })),
     apiKeys: db.all(`SELECT * FROM apiKeys`).map((r) => ({ id: r.id, key: r.key, name: r.name, machineId: r.machineId, isActive: r.isActive === 1, createdAt: r.createdAt })),
     combos: db.all(`SELECT * FROM combos`).map((r) => ({ id: r.id, name: r.name, kind: r.kind, models: parseJson(r.models, []), createdAt: r.createdAt, updatedAt: r.updatedAt })),
+    codebuddyAccounts: db.all(`SELECT * FROM codebuddyAccounts`).map((r) => ({
+      id: r.id, email: r.email, password: r.password, profileDir: r.profileDir,
+      fsmailAlias: r.fsmailAlias, signupMethod: r.signupMethod, apiKey: r.apiKey,
+      apiKeyStatus: r.apiKeyStatus, lastError: r.lastError, lastRunAt: r.lastRunAt,
+      createdAt: r.createdAt, provider: r.provider, canvaEnrolled: r.canvaEnrolled === 1,
+    })),
     modelAliases: {},
     customModels: [],
     mitmAlias: {},
@@ -108,6 +114,7 @@ export async function importDb(payload) {
     db.run(`DELETE FROM proxyPools`);
     db.run(`DELETE FROM apiKeys`);
     db.run(`DELETE FROM combos`);
+    db.run(`DELETE FROM codebuddyAccounts`);
     db.run(`DELETE FROM kv WHERE scope IN ('modelAliases', 'customModels', 'mitmAlias', 'pricing')`);
 
     // Settings
@@ -148,6 +155,12 @@ export async function importDb(payload) {
         [c.id, c.name, c.kind || null, stringifyJson(c.models || []), c.createdAt || new Date().toISOString(), c.updatedAt || new Date().toISOString()]
       );
     }
+    for (const a of payload.codebuddyAccounts || []) {
+      db.run(
+        `INSERT OR REPLACE INTO codebuddyAccounts(id, email, password, profileDir, fsmailAlias, signupMethod, apiKey, apiKeyStatus, lastError, lastRunAt, createdAt, provider, canvaEnrolled) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        [a.id, a.email || null, a.password || null, a.profileDir || null, a.fsmailAlias || null, a.signupMethod || 'google', a.apiKey || null, a.apiKeyStatus || 'pending', a.lastError || null, a.lastRunAt || null, a.createdAt || new Date().toISOString(), a.provider || 'codebuddy', a.canvaEnrolled === false ? 0 : 1]
+      );
+    }
     for (const [a, m] of Object.entries(payload.modelAliases || {})) {
       db.run(`INSERT OR REPLACE INTO kv(scope, key, value) VALUES('modelAliases', ?, ?)`, [a, stringifyJson(m)]);
     }

package/dist/lib/db/restoreRunner.js

@@ -0,0 +1,136 @@
+import { getAdapter, resetAdapter } from "./driver.js";
+import { importDb } from "./index.js";
+import { DATA_DIR } from "../dataDir.js";
+import path from "path";
+import fs from "fs";
+
+// Streaming restore runner shared by POST /api/db and POST /api/db/restore-path.
+// Sends SSE events: progress {percent,label}, log {message,level}, error, done.
+export function runRestoreStream(res, body) {
+  res.writeHead(200, {
+    "Content-Type": "text/event-stream",
+    "Cache-Control": "no-cache, no-transform",
+    "Connection": "keep-alive",
+    "X-Accel-Buffering": "no"
+  });
+  const sseSend = (event, data) => {
+    res.write(`event: ${event}\n`);
+    res.write(`data: ${JSON.stringify(data)}\n\n`);
+  };
+  const log = (msg, level = "info") => sseSend("log", { message: msg, level, ts: new Date().toISOString() });
+  const progress = (percent, label) => {
+    sseSend("progress", { percent, label });
+    log(label);
+  };
+
+  (async () => {
+    try {
+      progress(5, "Memvalidasi file backup...");
+      if (!body || body.signature !== "FUDROUTER_BACKUP") {
+        sseSend("error", { message: "Invalid backup file signature." });
+        return res.end();
+      }
+
+      const hasLogical = !!body.database;
+      if (hasLogical) {
+        progress(15, "Mengimpor data logical (provider, connections, proxy, api keys, combos, akun automation)...");
+        await importDb(body.database);
+
+        progress(40, "Flush WAL ke file database utama (checkpoint)...");
+        const db = await getAdapter();
+        if (db && typeof db.checkpoint === "function") {
+          try { db.checkpoint(); } catch (e) { log(`checkpoint gagal: ${e.message}`, "warn"); }
+        }
+        if (db && typeof db.exec === "function") {
+          try { db.exec("PRAGMA wal_checkpoint(TRUNCATE)"); } catch { /* ignore */ }
+        }
+
+        progress(50, "Menutup koneksi DB agar file WAL/SHM tidak terkunci...");
+        if (db && typeof db.exec === "function") {
+          try { db.exec("PRAGMA journal_mode=DELETE"); } catch { /* ignore */ }
+        }
+        if (db && typeof db.close === "function") {
+          try { db.close(); } catch { /* ignore */ }
+        }
+        resetAdapter();
+      } else {
+        progress(15, "Menutup koneksi database aktif (raw restore)...");
+        const db = await getAdapter();
+        if (db && typeof db.close === "function") {
+          try { db.close(); } catch { /* ignore */ }
+        }
+        resetAdapter();
+      }
+
+      progress(50, "Membersihkan file WAL/SHM lock...");
+      const walFile = path.join(DATA_DIR, "db", "data.sqlite-wal");
+      const shmFile = path.join(DATA_DIR, "db", "data.sqlite-shm");
+
+      const safeUnlink = (file) => {
+        if (!fs.existsSync(file)) return;
+        const attempts = process.platform === "win32" ? 12 : 3;
+        for (let i = 0; i < attempts; i++) {
+          try {
+            fs.unlinkSync(file);
+            return;
+          } catch (e) {
+            if (e.code === "EBUSY" || e.code === "EPERM" || e.code === "ETXTBSY") {
+              try {
+                const tmp = `${file}.old-${Date.now()}`;
+                fs.renameSync(file, tmp);
+                try { fs.unlinkSync(tmp); } catch { /* ignore */ }
+                return;
+              } catch {
+                try { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 250); } catch { /* noop */ }
+                continue;
+              }
+            }
+            throw e;
+          }
+        }
+        log(`Tidak bisa menghapus ${file} (terkunci) — melanjutkan.`, "warn");
+      };
+      safeUnlink(walFile);
+      safeUnlink(shmFile);
+
+      const filesToRestore = [
+        { key: "db/data.sqlite", path: path.join(DATA_DIR, "db", "data.sqlite") },
+        { key: "machine-id", path: path.join(DATA_DIR, "machine-id") },
+        { key: "jwt-secret", path: path.join(DATA_DIR, "jwt-secret") },
+        { key: "auth/cli-secret", path: path.join(DATA_DIR, "auth", "cli-secret") }
+      ];
+
+      let idx = 0;
+      const total = filesToRestore.length;
+      for (const item of filesToRestore) {
+        if (hasLogical && item.key === "db/data.sqlite") {
+          idx++;
+          continue;
+        }
+        const b64Data = body.files?.[item.key];
+        const pct = 60 + Math.round((idx / total) * 35);
+        if (b64Data) {
+          progress(pct, `Menimpa file: ${item.key} ...`);
+          const dir = path.dirname(item.path);
+          if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+          fs.writeFileSync(item.path, Buffer.from(b64Data, "base64"));
+          log(`✓ Di-timpa: ${item.key}`, "info");
+        } else {
+          log(`Lewati (tidak ada di backup): ${item.key}`, "warn");
+        }
+        idx++;
+      }
+
+      progress(100, "Restore selesai. Server akan merestart...");
+      sseSend("done", { success: true, message: "Restore berhasil. Server merestart..." });
+
+      setTimeout(() => {
+        try { process.exit(0); } catch { /* ignore */ }
+      }, 1200);
+    } catch (error) {
+      console.error("Restore error:", error);
+      sseSend("error", { message: "Restore gagal: " + (error?.message || error) });
+      res.end();
+    }
+  })();
+}

package/dist/routes/db/raw/route.js

@@ -0,0 +1,40 @@
+import { getAdapter } from "../../../lib/db/driver.js";
+import { DATA_DIR } from "../../../lib/dataDir.js";
+import path from "path";
+import fs from "fs";
+export const dynamic = "force-dynamic";
+// GET /api/db/raw - Backup the raw SQLite database file (copy as-is)
+export async function GET(req, res) {
+    try {
+        const db = await getAdapter();
+        // Flush WAL into the main file so the copied .sqlite is self-contained.
+        if (db && typeof db.checkpoint === "function") {
+            try {
+                db.checkpoint();
+            }
+            catch { /* ignore */ }
+        }
+        if (db && typeof db.exec === "function") {
+            try {
+                db.exec("PRAGMA wal_checkpoint(TRUNCATE)");
+            }
+            catch { /* ignore */ }
+        }
+        const sqlitePath = path.join(DATA_DIR, "db", "data.sqlite");
+        if (!fs.existsSync(sqlitePath)) {
+            return res.status(404).json({ error: "Database file not found." });
+        }
+        res.setHeader("Content-Disposition", 'attachment; filename="fsrouter-db-raw.sqlite"');
+        res.setHeader("Content-Type", "application/octet-stream");
+        const stat = fs.statSync(sqlitePath);
+        res.setHeader("Content-Length", stat.size);
+        const stream = fs.createReadStream(sqlitePath);
+        stream.on("error", (e) => { console.error("Raw backup stream error:", e); });
+        stream.pipe(res);
+    }
+    catch (error) {
+        console.error("Raw backup error:", error);
+        if (!res.headersSent)
+            res.status(500).json({ error: "Failed to generate raw backup: " + error.message });
+    }
+}

package/dist/routes/db/restore-path/route.js

@@ -0,0 +1,28 @@
+import fs from "fs";
+import { runRestoreStream } from "../../../lib/db/restoreRunner.js";
+export const dynamic = "force-dynamic";
+// POST /api/db/restore-path - Restore from a file path on the server itself
+// (e.g. user pasted C:\Users\fud\backups\fsrouter-backup.fud, or a raw .sqlite)
+export async function POST(req, res) {
+    const { path: filePath } = req.body || {};
+    if (!filePath || typeof filePath !== "string") {
+        return res.status(400).json({ error: "Field 'path' wajib diisi." });
+    }
+    if (!fs.existsSync(filePath)) {
+        return res.status(404).json({ error: `File tidak ditemukan: ${filePath}` });
+    }
+    let body;
+    try {
+        if (filePath.endsWith(".sqlite")) {
+            const b64 = fs.readFileSync(filePath).toString("base64");
+            body = { signature: "FUDROUTER_BACKUP", version: 1, files: { "db/data.sqlite": b64 } };
+        }
+        else {
+            body = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+        }
+    }
+    catch (e) {
+        return res.status(400).json({ error: "Gagal membaca/mem-parse file: " + e.message });
+    }
+    runRestoreStream(res, body);
+}

package/dist/routes/db/route.js

@@ -1,8 +1,5 @@
-import { getAdapter, resetAdapter } from "../../lib/db/driver.js";
-import { exportDb, importDb } from "../../lib/db/index.js";
-import { DATA_DIR } from "../../lib/dataDir.js";
-import path from "path";
-import fs from "fs";
+import { exportDb } from "../../lib/db/index.js";
+import { runRestoreStream } from "../../lib/db/restoreRunner.js";
 export const dynamic = "force-dynamic";
 // GET /api/db - Backup database & secrets
 export async function GET(req, res) {
@@ -55,176 +52,7 @@ export async function GET(req, res) {
         return res.status(500).json({ error: "Failed to generate backup: " + error.message });
     }
 }
-// ─── SSE helpers for streaming restore progress ───────────────────────────────
-function sseInit(res) {
-    res.writeHead(200, {
-        "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache, no-transform",
-        "Connection": "keep-alive",
-        "X-Accel-Buffering": "no"
-    });
-}
-function sseSend(res, event, data) {
-    res.write(`event: ${event}\n`);
-    res.write(`data: ${JSON.stringify(data)}\n\n`);
-}
 // POST /api/db - Restore database & secrets (streaming progress)
 export async function POST_handler(req, res) {
-    // Switch to SSE immediately so the client sees progress from the start.
-    sseInit(res);
-    const log = (msg, level = "info") => sseSend(res, "log", { message: msg, level, ts: new Date().toISOString() });
-    const progress = (percent, label) => {
-        sseSend(res, "progress", { percent, label });
-        log(label);
-    };
-    // Run restore asynchronously; don't await the whole thing on the request.
-    (async () => {
-        try {
-            const body = req.body;
-            progress(5, "Memvalidasi file backup...");
-            if (!body || body.signature !== "FUDROUTER_BACKUP") {
-                sseSend(res, "error", { message: "Invalid backup file signature." });
-                return res.end();
-            }
-            // Prefer logical import: raw SQLite replacement can lose rows when WAL/driver
-            // state differs between machines. Keep raw-file restore below for old backups.
-            const hasLogical = !!body.database;
-            if (hasLogical) {
-                progress(15, "Mengimpor data logical (provider, connections, proxy, api keys, combos)...");
-                // Import on the live connection.
-                await importDb(body.database);
-                progress(40, "Flush WAL ke file database utama (checkpoint)...");
-                const db = await getAdapter();
-                if (db && typeof db.checkpoint === "function") {
-                    try {
-                        db.checkpoint();
-                    }
-                    catch (e) {
-                        log(`checkpoint gagal: ${e.message}`, "warn");
-                    }
-                }
-                if (db && typeof db.exec === "function") {
-                    try {
-                        db.exec("PRAGMA wal_checkpoint(TRUNCATE)");
-                    }
-                    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)...");
-                const db = await getAdapter();
-                if (db && typeof db.close === "function") {
-                    try {
-                        db.close();
-                    }
-                    catch { /* ignore */ }
-                }
-                // Reset cached instance so the next getAdapter() re-opens a fresh connection.
-                resetAdapter();
-            }
-            // 2. Remove active -wal and -shm files to prevent corruption/mismatch.
-            progress(50, "Membersihkan file WAL/SHM lock...");
-            const walFile = path.join(DATA_DIR, "db", "data.sqlite-wal");
-            const shmFile = path.join(DATA_DIR, "db", "data.sqlite-shm");
-            const safeUnlink = (file) => {
-                if (!fs.existsSync(file))
-                    return;
-                const attempts = process.platform === "win32" ? 12 : 3;
-                for (let i = 0; i < attempts; i++) {
-                    try {
-                        fs.unlinkSync(file);
-                        return;
-                    }
-                    catch (e) {
-                        if (e.code === "EBUSY" || e.code === "EPERM" || e.code === "ETXTBSY") {
-                            try {
-                                const tmp = `${file}.old-${Date.now()}`;
-                                fs.renameSync(file, tmp);
-                                try {
-                                    fs.unlinkSync(tmp);
-                                }
-                                catch { /* ignore */ }
-                                return;
-                            }
-                            catch {
-                                try {
-                                    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 250);
-                                }
-                                catch { /* noop */ }
-                                continue;
-                            }
-                        }
-                        throw e;
-                    }
-                }
-                log(`Tidak bisa menghapus ${file} (terkunci) — melanjutkan.`, "warn");
-            };
-            safeUnlink(walFile);
-            safeUnlink(shmFile);
-            // 3. Restore secrets/raw DB only for legacy backups. Do not overwrite the
-            // logical import with a stale/incompatible SQLite file.
-            const filesToRestore = [
-                { key: "db/data.sqlite", path: path.join(DATA_DIR, "db", "data.sqlite") },
-                { key: "machine-id", path: path.join(DATA_DIR, "machine-id") },
-                { key: "jwt-secret", path: path.join(DATA_DIR, "jwt-secret") },
-                { key: "auth/cli-secret", path: path.join(DATA_DIR, "auth", "cli-secret") }
-            ];
-            let idx = 0;
-            const total = filesToRestore.length;
-            for (const item of filesToRestore) {
-                if (hasLogical && item.key === "db/data.sqlite") {
-                    idx++;
-                    continue; // logical import already applied the DB
-                }
-                const b64Data = body.files?.[item.key];
-                const pct = 60 + Math.round((idx / total) * 35);
-                if (b64Data) {
-                    progress(pct, `Menimpa file: ${item.key} ...`);
-                    const dir = path.dirname(item.path);
-                    if (!fs.existsSync(dir))
-                        fs.mkdirSync(dir, { recursive: true });
-                    fs.writeFileSync(item.path, Buffer.from(b64Data, "base64"));
-                    log(`✓ Di-timpa: ${item.key}`, "info");
-                }
-                else {
-                    log(`Lewati (tidak ada di backup): ${item.key}`, "warn");
-                }
-                idx++;
-            }
-            progress(100, "Restore selesai. Server akan merestart...");
-            sseSend(res, "done", { success: true, message: "Restore berhasil. Server merestart..." });
-            // 4. Shut down process so PM2 restarts it (applies restored data cleanly)
-            setTimeout(() => {
-                try {
-                    process.exit(0);
-                }
-                catch { /* ignore */ }
-            }, 1200);
-        }
-        catch (error) {
-            console.error("Restore error:", error);
-            sseSend(res, "error", { message: "Restore gagal: " + (error?.message || error) });
-            res.end();
-        }
-    })();
+    runRestoreStream(res, req.body);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fudrouter/fsrouter",
-  "version": "0.6.104",
+  "version": "0.6.106",
   "private": false,
   "type": "module",
   "description": "9Router v2 — Express Backend (API, SSE, DB, Auth, MITM)",
@@ -21,7 +21,6 @@
   ],
   "dependencies": {
     "bcryptjs": "^3.0.3",
-    "better-sqlite3": "^12.11.1",
     "confbox": "^0.2.4",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
@@ -44,5 +43,8 @@
     "@/*": "./dist/*",
     "open-sse": "./open-sse/index.js",
     "open-sse/*": "./open-sse/*"
+  },
+  "optionalDependencies": {
+    "better-sqlite3": "^12.11.1"
   }
 }