@fudrouter/fsrouter 0.6.100 → 0.6.102

package/dist/lib/db/driver.js

@@ -79,6 +79,14 @@ export async function getAdapter() {
   return state.initPromise;
 }
 
+// Force re-open the underlying connection (used after an explicit close, e.g.
+// during raw DB restore). Without this, getAdapter() would return the stale
+// closed instance and every subsequent query throws "connection is not open".
+export function resetAdapter() {
+  state.instance = null;
+  state.initPromise = null;
+}
+
 export function getAdapterSync() {
   if (!state.instance) throw new Error("[DB] adapter not initialized — await getAdapter() first");
   return state.instance;

package/dist/routes/db/route.js

@@ -1,4 +1,4 @@
-import { getAdapter } from "../../lib/db/driver.js";
+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";
@@ -90,15 +90,8 @@ export async function POST_handler(req, res) {
             // state differs between machines. Keep raw-file restore below for old backups.
             const hasLogical = !!body.database;
             if (hasLogical) {
-                progress(15, "Menutup koneksi database aktif...");
-                const db0 = await getAdapter();
-                if (db0 && typeof db0.close === "function") {
-                    try {
-                        db0.close();
-                    }
-                    catch { /* ignore */ }
-                }
-                progress(25, "Mengimpor data logical (provider, connections, proxy, api keys, combos)...");
+                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();
@@ -116,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)...");
@@ -126,6 +139,8 @@ export async function POST_handler(req, res) {
                     }
                     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...");

package/package.json

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