@hilbras/omnihilbras 2.8.0 → 2.9.1

package/app/node_modules/sql.js/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "sql.js",
-	"version": "1.15.0",
-	"description": "SQLite library with support for opening and writing databases, prepared statements, and more. Compiled to WebAssembly with Emscripten, with JavaScript bindings.",
+	"version": "1.14.1",
+	"description": "SQLite library with support for opening and writing databases, prepared statements, and more. This SQLite library is in pure javascript (compiled with emscripten).",
 	"keywords": [
 		"sql",
 		"sqlite",
@@ -13,8 +13,8 @@
 		"query",
 		"statement",
 		"emscripten",
-		"wasm",
-		"webassembly"
+		"asm",
+		"asm.js"
 	],
 	"license": "MIT",
 	"main": "./dist/sql-wasm.js",
@@ -29,16 +29,16 @@
 		"build": "make",
 		"rebuild": "npm run clean && npm run build",
 		"clean": "make clean",
-		"test": "npm run lint && npm run test-wasm && npm run test-wasm-debug && npm run test-wasm-browser && npm run test-wasm-inline && npm run test-wasm-inline-debug && npm run test-builds",
+		"test": "npm run lint && npm run test-asm && npm run test-asm-debug && npm run test-wasm && npm run test-wasm-debug && npm run test-wasm-browser && npm run test-asm-memory-growth",
 		"lint": "eslint .",
 		"prettify": "eslint . --fix",
+		"test-asm": "node --unhandled-rejections=strict test/all.js asm",
+		"test-asm-debug": "node --unhandled-rejections=strict test/all.js asm-debug",
+		"test-asm-memory-growth": "node --unhandled-rejections=strict test/all.js asm-memory-growth",
 		"test-wasm": "node --unhandled-rejections=strict test/all.js wasm",
 		"test-wasm-debug": "node --unhandled-rejections=strict test/all.js wasm-debug",
 		"test-wasm-browser": "node --unhandled-rejections=strict test/all.js wasm-browser",
-		"test-wasm-inline": "node --unhandled-rejections=strict test/all.js wasm-inline",
-		"test-wasm-inline-debug": "node --unhandled-rejections=strict test/all.js wasm-inline-debug",
-		"test-builds": "node --unhandled-rejections=strict test/builds.js",
-		"doc": "jsdoc -c .jsdoc.config.json && node scripts/doc-redirects.cjs"
+		"doc": "jsdoc -c .jsdoc.config.json"
 	},
 	"homepage": "http://github.com/sql-js/sql.js",
 	"repository": {
@@ -49,10 +49,10 @@
 		"url": "https://github.com/sql-js/sql.js/issues"
 	},
 	"devDependencies": {
-		"@eslint/js": "^10.0.1",
-		"clean-jsdoc-theme": "^5.2.0",
-		"eslint": "^10.12.0",
-		"globals": "^17.13.0",
-		"jsdoc": "^4.0.5"
+		"@eslint/js": "^10.0.0",
+		"clean-jsdoc-theme": "^4.2.0",
+		"eslint": "^10.0.0",
+		"globals": "^16.4.0",
+		"jsdoc": "^4.0.2"
 	}
 }

package/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnihilbras-app",
-  "version": "2.8.0",
+  "version": "2.9.1",
   "description": "OmniHilbras web dashboard",
   "private": true,
   "scripts": {
@@ -49,7 +49,7 @@
     "recharts": "^3.7.0",
     "selfsigned": "^5.5.0",
     "socks-proxy-agent": "^8.0.5",
-    "sql.js": "^1.14.1",
+    "sql.js": "1.14.1",
     "undici": "^7.19.2",
     "uuid": "^13.0.0",
     "zustand": "^5.0.10"
@@ -66,5 +66,9 @@
     "eslint-config-next": "16.1.6",
     "postcss": "^8.5.6",
     "tailwindcss": "^4"
+  },
+  "overrides": {
+    "dompurify": "^3.4.17",
+    "braces": "^3.0.3"
   }
 }

package/app/src/lib/db/migrate.js

@@ -7,10 +7,17 @@ import { getMetaSync, setMetaSync } from "./helpers/metaStore.js";
 import { makeBackupDir, backupFile, backupDbLite, pruneOldBackups } from "./backup.js";
 import { getAppVersion } from "./version.js";
 import { stringifyJson } from "./helpers/jsonCol.js";
+import { maskApiKey } from "./helpers/maskApiKey.js";
+import { rewriteDayApiKeys } from "./helpers/usageKeyRows.js";
+import { hashApiKey } from "@/lib/auth/keyPepper.js";
+import { invalidateAllProviderConnections } from "./repos/providerConnectionCache.js";
 
 // Marker file: prevents re-importing legacy JSON when user wipes data.sqlite.
 const MIGRATED_MARKER = path.join(DB_DIR, ".migrated-from-json");
 
+// The migration that moved the API keys out of the database in the clear.
+const KEY_HASH_MIGRATION_VERSION = 2;
+
 // Track per-adapter so reusing same adapter skips re-run, but new adapter (after reset) re-runs.
 const _migratedAdapters = new WeakSet();
 
@@ -141,9 +148,12 @@ function importLegacyMain(adapter, data) {
   }, (p) => ({ id: p.id ?? null }));
 
   importWithAssertion(adapter, "apiKeys", data.apiKeys || [], (k) => {
+    // The legacy file holds the plaintext; the row takes the hash and the
+    // display form, so the imported keys work and no secret lands in the
+    // database.
     adapter.run(
-      `INSERT OR REPLACE INTO apiKeys(id, key, name, machineId, isActive, createdAt) VALUES(?, ?, ?, ?, ?, ?)`,
-      [k.id, k.key, k.name || null, k.machineId || null, k.isActive === false ? 0 : 1, k.createdAt || new Date().toISOString()]
+      `INSERT OR REPLACE INTO apiKeys(id, key, keyHash, name, machineId, isActive, createdAt) VALUES(?, ?, ?, ?, ?, ?, ?)`,
+      [k.id, maskApiKey(k.key), hashApiKey(k.key), k.name || null, k.machineId || null, k.isActive === false ? 0 : 1, k.createdAt || new Date().toISOString()]
     );
   }, (k) => ({ id: k.id ?? null, name: k.name ?? null }));
 
@@ -167,6 +177,9 @@ function importLegacyMain(adapter, data) {
   for (const [provider, models] of Object.entries(data.pricing || {})) {
     adapter.run(`INSERT OR REPLACE INTO kv(scope, key, value) VALUES('pricing', ?, ?)`, [provider, stringifyJson(models || {})]);
   }
+
+  // The import wrote the connection table directly.
+  invalidateAllProviderConnections();
 }
 
 function importLegacyUsage(adapter, data) {
@@ -177,7 +190,7 @@ function importLegacyUsage(adapter, data) {
       `INSERT INTO usageHistory(timestamp, provider, model, connectionId, apiKey, endpoint, promptTokens, completionTokens, cost, status, tokens, meta) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       [
         e.timestamp || new Date().toISOString(),
-        e.provider || null, e.model || null, e.connectionId || null, e.apiKey || null, e.endpoint || null,
+        e.provider || null, e.model || null, e.connectionId || null, maskApiKey(e.apiKey), e.endpoint || null,
         t.prompt_tokens || t.input_tokens || 0,
         t.completion_tokens || t.output_tokens || 0,
         e.cost || 0,
@@ -188,6 +201,9 @@ function importLegacyUsage(adapter, data) {
     );
   }
   for (const [dateKey, day] of Object.entries(data.dailySummary || {})) {
+    // The rollup holds the raw key in its bucket keys — rewrite it to the
+    // display form, so the row groups with the ones written after the change.
+    rewriteDayApiKeys(day);
     adapter.run(`INSERT OR REPLACE INTO usageDaily(dateKey, data) VALUES(?, ?)`, [dateKey, stringifyJson(day)]);
   }
   if (typeof data.totalRequestsLifetime === "number") {
@@ -249,6 +265,25 @@ export async function runMigrationOnce(adapter) {
   // 2. Additive sync (auto add missing columns/indexes declared in TABLES)
   syncSchemaFromTables(adapter);
 
+  // 2b. The key-hash migration rewrote the rows that held the secrets.
+  // SQLite does not erase the pages it frees, so the file (and its WAL)
+  // would still carry the keys in its free space — a stolen copy could be
+  // carved. Compact the database once, right after the rewrite (and after a
+  // key was healed at runtime, which asks for the same).
+  const needsCompaction = getMetaSync(adapter, "needsCompaction", null) === "1";
+  if (needsCompaction || (migInfo.from < KEY_HASH_MIGRATION_VERSION && migInfo.to >= KEY_HASH_MIGRATION_VERSION)) {
+    try {
+      adapter.exec("VACUUM");
+      // The WAL holds the old page images — fold them into the database and
+      // drop the log, or the keys stay in the sidecar file.
+      if (typeof adapter.checkpoint === "function") adapter.checkpoint();
+      if (needsCompaction) adapter.run(`DELETE FROM _meta WHERE key = 'needsCompaction'`);
+      console.log("[DB][migrate] compacted the database after the key migration");
+    } catch (e) {
+      console.warn(`[DB][migrate] VACUUM after the key migration failed (the file keeps the old pages): ${e.message}`);
+    }
+  }
+
   // Stamp the schema version we just reached so future boots skip re-backup.
   setMetaSync(adapter, "backupSchemaVersion", SCHEMA_VERSION);