@verdant-web/server 3.3.11 → 4.0.0

package/dist/esm/storage/sqlShard/migrations/v1.js

@@ -1,48 +1,43 @@
-export async function up(db) {
-    await db.schema
-        .createTable('DocumentBaseline')
-        .ifNotExists()
-        .addColumn('oid', 'text', (cb) => cb.primaryKey())
-        .addColumn('snapshot', 'text')
-        .addColumn('timestamp', 'text', (cb) => cb.notNull())
-        .execute();
-    await db.schema
-        .createTable('OperationHistory')
-        .ifNotExists()
-        .addColumn('oid', 'text', (cb) => cb.notNull())
-        .addColumn('timestamp', 'text', (cb) => cb.notNull())
-        .addColumn('data', 'text', (cb) => cb.notNull())
-        .addColumn('serverOrder', 'integer', (cb) => cb.notNull().defaultTo(0))
-        .addColumn('replicaId', 'text', (cb) => cb.notNull())
-        .addPrimaryKeyConstraint('OperationHistory_primaryKey', [
-        'replicaId',
-        'oid',
-        'timestamp',
-    ])
-        .execute();
-    await db.schema
-        .createTable('ReplicaInfo')
-        .ifNotExists()
-        .addColumn('id', 'text', (cb) => cb.primaryKey())
-        .addColumn('clientId', 'text', (cb) => cb.notNull())
-        .addColumn('lastSeenWallClockTime', 'integer')
-        .addColumn('ackedLogicalTime', 'text')
-        .addColumn('type', 'integer', (cb) => cb.notNull().defaultTo(0))
-        .addColumn('ackedServerOrder', 'integer', (cb) => cb.notNull().defaultTo(0))
-        .execute();
-    await db.schema
-        .createTable('FileMetadata')
-        .ifNotExists()
-        .addColumn('fileId', 'text', (cb) => cb.primaryKey())
-        .addColumn('name', 'text', (cb) => cb.notNull())
-        .addColumn('type', 'text', (cb) => cb.notNull())
-        .addColumn('pendingDeleteAt', 'integer')
-        .execute();
-}
-export async function down(db) {
-    await db.schema.dropTable('DocumentBaseline').execute();
-    await db.schema.dropTable('OperationHistory').execute();
-    await db.schema.dropTable('ReplicaInfo').execute();
-    await db.schema.dropTable('FileMetadata').execute();
-}
+export const version = 1;
+export const up = [
+    `
+CREATE TABLE IF NOT EXISTS "_Migrations" (
+	"id" INTEGER PRIMARY KEY,
+	"appliedAt" TEXT NOT NULL
+);`,
+    `
+CREATE TABLE IF NOT EXISTS "DocumentBaseline" (
+	"oid" TEXT PRIMARY KEY,
+	"snapshot" TEXT,
+	"timestamp" TEXT NOT NULL
+);
+`,
+    `
+CREATE TABLE IF NOT EXISTS "OperationHistory" (
+	"oid" TEXT NOT NULL,
+	"timestamp" TEXT NOT NULL,
+	"data" TEXT NOT NULL,
+	"serverOrder" INTEGER NOT NULL DEFAULT 0,
+	"replicaId" TEXT NOT NULL,
+	PRIMARY KEY ("replicaId", "oid", "timestamp")
+);
+`,
+    `
+CREATE TABLE IF NOT EXISTS "ReplicaInfo" (
+	"id" TEXT PRIMARY KEY,
+	"clientId" TEXT NOT NULL,
+	"lastSeenWallClockTime" INTEGER,
+	"ackedLogicalTime" TEXT,
+	"type" INTEGER NOT NULL DEFAULT 0,
+	"ackedServerOrder" INTEGER NOT NULL DEFAULT 0
+);`,
+    `
+CREATE TABLE IF NOT EXISTS "FileMetadata" (
+	"fileId" TEXT PRIMARY KEY,
+	"name" TEXT NOT NULL,
+	"type" TEXT NOT NULL,
+	"pendingDeleteAt" INTEGER
+);
+`,
+];
 //# sourceMappingURL=v1.js.map

package/dist/esm/storage/sqlShard/migrations/v1.js.map

@@ -1 +1 @@
-{"version":3,"file":"v1.js","sourceRoot":"","sources":["../../../../../src/storage/sqlShard/migrations/v1.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"v1.js","sourceRoot":"","sources":["../../../../../src/storage/sqlShard/migrations/v1.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC;AAEzB,MAAM,CAAC,MAAM,EAAE,GAAG;IACjB;;;;GAIE;IACF;;;;;;CAMA;IACA;;;;;;;;;CASA;IACA;;;;;;;;GAQE;IACF;;;;;;;CAOA;CACA,CAAC"}

package/dist/esm/storage/sqlShard/migrations/v2.d.ts

@@ -1,3 +1,2 @@
-import { Kysely } from 'kysely';
-export declare function up(db: Kysely<any>): Promise<void>;
-export declare function down(db: Kysely<any>): Promise<void>;
+export declare const version = 2;
+export declare const up: string[];

package/dist/esm/storage/sqlShard/migrations/v2.js

@@ -1,16 +1,6 @@
-export async function up(db) {
-    // add authz column to OperationHistory and DocumentBaseline
-    await db.schema
-        .alterTable('OperationHistory')
-        .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
-        .execute();
-    await db.schema
-        .alterTable('DocumentBaseline')
-        .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
-        .execute();
-}
-export async function down(db) {
-    await db.schema.alterTable('OperationHistory').dropColumn('authz').execute();
-    await db.schema.alterTable('DocumentBaseline').dropColumn('authz').execute();
-}
+export const version = 2;
+export const up = [
+    `ALTER TABLE "OperationHistory" ADD COLUMN "authz" TEXT DEFAULT NULL;`,
+    `ALTER TABLE "DocumentBaseline" ADD COLUMN "authz" TEXT DEFAULT NULL;`,
+];
 //# sourceMappingURL=v2.js.map

package/dist/esm/storage/sqlShard/migrations/v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"v2.js","sourceRoot":"","sources":["../../../../../src/storage/sqlShard/migrations/v2.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,EAAe;IACvC,4DAA4D;IAC5D,MAAM,EAAE,CAAC,MAAM;SACb,UAAU,CAAC,kBAAkB,CAAC;SAC9B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACtD,OAAO,EAAE,CAAC;IAEZ,MAAM,EAAE,CAAC,MAAM;SACb,UAAU,CAAC,kBAAkB,CAAC;SAC9B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACtD,OAAO,EAAE,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAe;IACzC,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;IAE7E,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AAC9E,CAAC"}
+{"version":3,"file":"v2.js","sourceRoot":"","sources":["../../../../../src/storage/sqlShard/migrations/v2.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC;AAEzB,MAAM,CAAC,MAAM,EAAE,GAAG;IACjB,sEAAsE;IACtE,sEAAsE;CACtE,CAAC"}

package/dist/esm/storage/sqlShard/migrations.d.ts

@@ -1,7 +1,5 @@
-import * as v1 from './migrations/v1.js';
-import * as v2 from './migrations/v2.js';
-declare const _default: {
-    v1: typeof v1;
-    v2: typeof v2;
-};
-export default _default;
+import { Logger } from '../../logger.js';
+import { SqliteExecutor } from './database.js';
+export declare function getMigrationVersion(run: SqliteExecutor['query']): any;
+export declare function updateMigrationVersion(run: SqliteExecutor['exec'], version: number): void;
+export declare function migrateToLatest(e: Pick<SqliteExecutor, 'exec' | 'query' | 'migrated'>, log: Logger): void;

package/dist/esm/storage/sqlShard/migrations.js

@@ -1,4 +1,51 @@
 import * as v1 from './migrations/v1.js';
 import * as v2 from './migrations/v2.js';
-export default { v1, v2 };
+export function getMigrationVersion(run) {
+    var _a, _b;
+    try {
+        const result = run(`SELECT id FROM _Migrations
+			ORDER BY id DESC
+			LIMIT 1;`);
+        const value = (_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : 0;
+        return value;
+    }
+    catch (e) {
+        if (e instanceof Error &&
+            e.message.includes('no such table: _Migrations')) {
+            return 0;
+        }
+        throw e;
+    }
+}
+export function updateMigrationVersion(run, version) {
+    run(`INSERT INTO _Migrations (id, appliedAt) VALUES (?, ?)`, [
+        version,
+        Date.now(),
+    ]);
+}
+export function migrateToLatest(e, log) {
+    const allMigrations = [v1, v2];
+    const currentVersion = getMigrationVersion(e.query);
+    const pendingMigrations = allMigrations.slice(currentVersion);
+    if (pendingMigrations.length === 0) {
+        e.migrated = true;
+        return;
+    }
+    log('info', `Applying ${pendingMigrations.length} pending migrations...`);
+    for (const migration of pendingMigrations) {
+        for (const step of migration.up) {
+            try {
+                e.exec(step);
+            }
+            catch (err) {
+                log('error', `Error applying migration v${migration.version}:`, err);
+                log('error', `SQL:`, step);
+                throw err;
+            }
+        }
+        log('info', `Applied migration v${migration.version}`);
+    }
+    updateMigrationVersion(e.exec, allMigrations[allMigrations.length - 1].version);
+    e.migrated = true;
+}
 //# sourceMappingURL=migrations.js.map

package/dist/esm/storage/sqlShard/migrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEzC,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC"}
+{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/migrations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEzC,MAAM,UAAU,mBAAmB,CAAC,GAA4B;;IAC/D,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,GAAG,CACjB;;YAES,CACT,CAAC;QACF,MAAM,KAAK,GAAG,MAAA,MAAA,MAAM,CAAC,CAAC,CAAC,0CAAE,EAAE,mCAAI,CAAC,CAAC;QACjC,OAAO,KAAK,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,IACC,CAAC,YAAY,KAAK;YAClB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAC/C,CAAC;YACF,OAAO,CAAC,CAAC;QACV,CAAC;QACD,MAAM,CAAC,CAAC;IACT,CAAC;AACF,CAAC;AAED,MAAM,UAAU,sBAAsB,CACrC,GAA2B,EAC3B,OAAe;IAEf,GAAG,CAAC,uDAAuD,EAAE;QAC5D,OAAO;QACP,IAAI,CAAC,GAAG,EAAE;KACV,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAC9B,CAAsD,EACtD,GAAW;IAEX,MAAM,aAAa,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAE/B,MAAM,cAAc,GAAG,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAEpD,MAAM,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9D,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;QAClB,OAAO;IACR,CAAC;IACD,GAAG,CAAC,MAAM,EAAE,YAAY,iBAAiB,CAAC,MAAM,wBAAwB,CAAC,CAAC;IAC1E,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;QAC3C,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,EAAE,EAAE,CAAC;YACjC,IAAI,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,GAAG,CAAC,OAAO,EAAE,6BAA6B,SAAS,CAAC,OAAO,GAAG,EAAE,GAAG,CAAC,CAAC;gBACrE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;gBAC3B,MAAM,GAAG,CAAC;YACX,CAAC;QACF,CAAC;QACD,GAAG,CAAC,MAAM,EAAE,sBAAsB,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,sBAAsB,CACrB,CAAC,CAAC,IAAI,EACN,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAC/C,CAAC;IAEF,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;AACnB,CAAC"}

package/dist/esm/storage/sqlShard/sqlShardStorage.d.ts

@@ -1,7 +1,28 @@
-import { StorageFactory } from '../Storage.js';
-export declare const sqlShardStorage: ({ databasesDirectory, transferFromUnifiedDatabaseFile, disableWal, closeTimeout, }: {
+import { Logger } from '../../logger.js';
+import { Storage, StorageFactory, StorageOptions } from '../Storage.js';
+import { Databases } from './Databases.js';
+import { SqlBaselines } from './SqlBaselines.js';
+import { SqlFileMetadata } from './SqlFileMetadata.js';
+import { SqlOperations } from './SqlOperations.js';
+import { SqlReplicas } from './SqlReplicas.js';
+import { SqliteExecutor } from './database.js';
+export declare const sqlShardStorage: ({ databasesDirectory, disableWal, closeTimeout, fileDeleteExpirationDays, replicaTruancyMinutes, log, }: {
     databasesDirectory: string;
-    transferFromUnifiedDatabaseFile?: string;
     disableWal?: boolean;
     closeTimeout?: number;
-}) => StorageFactory;
+    databases?: Databases;
+    log?: Logger;
+} & StorageOptions) => StorageFactory;
+export declare class SqlShardStorage implements Storage {
+    #private;
+    private db;
+    baselines: SqlBaselines;
+    operations: SqlOperations;
+    replicas: SqlReplicas;
+    fileMetadata: SqlFileMetadata;
+    get open(): boolean;
+    constructor(db: SqliteExecutor, options: Required<StorageOptions> & {
+        libraryId: string;
+    });
+    close: () => Promise<void>;
+}

package/dist/esm/storage/sqlShard/sqlShardStorage.js

@@ -1,55 +1,58 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _SqlShardStorage_open;
+import { existsSync, mkdirSync } from 'fs';
+import { defaultFileExpirationDays, defaultReplicaTruancyMinutes, } from '../../defaults.js';
+import { Databases } from './Databases.js';
 import { SqlBaselines } from './SqlBaselines.js';
+import { SqlFileMetadata } from './SqlFileMetadata.js';
 import { SqlOperations } from './SqlOperations.js';
 import { SqlReplicas } from './SqlReplicas.js';
-import { SqlFileMetadata } from './SqlFileMetadata.js';
-import { Databases } from './Databases.js';
-import { transferToShards } from './transfer.js';
-import { existsSync, mkdirSync, readdirSync } from 'fs';
-export const sqlShardStorage = ({ databasesDirectory, transferFromUnifiedDatabaseFile, disableWal, closeTimeout, }) => {
-    let ready = Promise.resolve(undefined);
+export const sqlShardStorage = ({ databasesDirectory, disableWal, closeTimeout, fileDeleteExpirationDays = defaultFileExpirationDays, replicaTruancyMinutes = defaultReplicaTruancyMinutes, log, }) => {
     if (databasesDirectory !== ':memory:' && !existsSync(databasesDirectory)) {
         mkdirSync(databasesDirectory);
         console.info(`Created databases directory: ${databasesDirectory}`);
     }
-    if (transferFromUnifiedDatabaseFile) {
-        // check if directory is empty
-        const files = databasesDirectory === ':memory:' ? [] : readdirSync(databasesDirectory);
-        if (files.length > 0) {
-            console.error(`Cannot transfer from unified database to non-empty directory: ${databasesDirectory}. This might mean the transfer has already happened and you're free to turn off the transferFromUnifiedDatabaseFile option.`);
-        }
-        else {
-            ready = transferToShards({
-                file: transferFromUnifiedDatabaseFile,
-                directory: databasesDirectory,
-            }).then();
-        }
-    }
     const dbs = new Databases({
         directory: databasesDirectory,
         disableWal,
         closeTimeout,
+        log,
     });
-    return (options) => {
-        const baselines = new SqlBaselines(dbs, 'sqlite');
-        const operations = new SqlOperations(dbs, 'sqlite');
-        const replicas = new SqlReplicas(dbs, options.replicaTruancyMinutes, 'sqlite');
-        const fileMetadata = new SqlFileMetadata(dbs, options.fileDeleteExpirationDays, 'sqlite');
-        const close = async () => {
-            storage.open = false;
-            await dbs.destroy();
-        };
-        const storage = {
-            baselines,
-            operations,
-            replicas,
-            fileMetadata,
-            close,
-            open: false,
-            ready: ready.then(() => {
-                storage.open = true;
-            }),
-        };
-        return storage;
+    return async (libraryId) => {
+        const db = await dbs.get(libraryId);
+        return new SqlShardStorage(db, {
+            fileDeleteExpirationDays,
+            replicaTruancyMinutes,
+            libraryId,
+        });
     };
 };
+export class SqlShardStorage {
+    get open() {
+        return __classPrivateFieldGet(this, _SqlShardStorage_open, "f");
+    }
+    constructor(db, options) {
+        this.db = db;
+        _SqlShardStorage_open.set(this, true);
+        this.close = async () => {
+            __classPrivateFieldSet(this, _SqlShardStorage_open, false, "f");
+            await this.db.close();
+        };
+        this.baselines = new SqlBaselines(db, options.libraryId);
+        this.operations = new SqlOperations(db, options.libraryId);
+        this.replicas = new SqlReplicas(db, options.libraryId, options.replicaTruancyMinutes);
+        this.fileMetadata = new SqlFileMetadata(db, options.libraryId, options.fileDeleteExpirationDays);
+    }
+}
+_SqlShardStorage_open = new WeakMap();
 //# sourceMappingURL=sqlShardStorage.js.map

package/dist/esm/storage/sqlShard/sqlShardStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqlShardStorage.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/sqlShardStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAExD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC/B,kBAAkB,EAClB,+BAA+B,EAC/B,UAAU,EACV,YAAY,GAMZ,EAAkB,EAAE;IACpB,IAAI,KAAK,GAAG,OAAO,CAAC,OAAO,CAAO,SAAS,CAAC,CAAC;IAC7C,IAAI,kBAAkB,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC1E,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,gCAAgC,kBAAkB,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,+BAA+B,EAAE,CAAC;QACrC,8BAA8B;QAC9B,MAAM,KAAK,GACV,kBAAkB,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QAC1E,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CACZ,iEAAiE,kBAAkB,6HAA6H,CAChN,CAAC;QACH,CAAC;aAAM,CAAC;YACP,KAAK,GAAG,gBAAgB,CAAC;gBACxB,IAAI,EAAE,+BAA+B;gBACrC,SAAS,EAAE,kBAAkB;aAC7B,CAAC,CAAC,IAAI,EAAE,CAAC;QACX,CAAC;IACF,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;QACzB,SAAS,EAAE,kBAAkB;QAC7B,UAAU;QACV,YAAY;KACZ,CAAC,CAAC;IACH,OAAO,CAAC,OAAO,EAAE,EAAE;QAClB,MAAM,SAAS,GAAG,IAAI,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAI,WAAW,CAC/B,GAAG,EACH,OAAO,CAAC,qBAAqB,EAC7B,QAAQ,CACR,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,eAAe,CACvC,GAAG,EACH,OAAO,CAAC,wBAAwB,EAChC,QAAQ,CACR,CAAC;QACF,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;YACxB,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;YACrB,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC,CAAC;QACF,MAAM,OAAO,GAAG;YACf,SAAS;YACT,UAAU;YACV,QAAQ;YACR,YAAY;YACZ,KAAK;YACL,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACtB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,CAAC,CAAC;SACF,CAAC;QACF,OAAO,OAAO,CAAC;IAChB,CAAC,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"sqlShardStorage.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/sqlShardStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EACN,yBAAyB,EACzB,4BAA4B,GAC5B,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC/B,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,wBAAwB,GAAG,yBAAyB,EACpD,qBAAqB,GAAG,4BAA4B,EACpD,GAAG,GAOc,EAAkB,EAAE;IACrC,IAAI,kBAAkB,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC1E,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,gCAAgC,kBAAkB,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC;QACzB,SAAS,EAAE,kBAAkB;QAC7B,UAAU;QACV,YAAY;QACZ,GAAG;KACH,CAAC,CAAC;IACH,OAAO,KAAK,EAAE,SAAS,EAAE,EAAE;QAC1B,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpC,OAAO,IAAI,eAAe,CAAC,EAAE,EAAE;YAC9B,wBAAwB;YACxB,qBAAqB;YACrB,SAAS;SACT,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,OAAO,eAAe;IAO3B,IAAI,IAAI;QACP,OAAO,uBAAA,IAAI,6BAAM,CAAC;IACnB,CAAC;IAED,YACS,EAAkB,EAC1B,OAAyD;QADjD,OAAE,GAAF,EAAE,CAAgB;QAN3B,gCAAQ,IAAI,EAAC;QAuBb,UAAK,GAAG,KAAK,IAAI,EAAE;YAClB,uBAAA,IAAI,yBAAS,KAAK,MAAA,CAAC;YACnB,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC,CAAC;QAjBD,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,GAAG,IAAI,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,GAAG,IAAI,WAAW,CAC9B,EAAE,EACF,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,qBAAqB,CAC7B,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAI,eAAe,CACtC,EAAE,EACF,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,wBAAwB,CAChC,CAAC;IACH,CAAC;CAMD"}

package/dist/esm/storage/sqlShard/tables.d.ts

@@ -1,10 +1,13 @@
 import { ReplicaType } from '@verdant-web/common';
-import { Generated, Selectable } from 'kysely';
 export interface Database {
     OperationHistory: OperationHistoryTable;
     DocumentBaseline: DocumentBaselineTable;
     ReplicaInfo: ReplicaInfoTable;
     FileMetadata: FileMetadataTable;
+    _Migrations: {
+        id: number;
+        appliedAt: string;
+    };
 }
 export interface OperationHistoryTable {
     oid: string;
@@ -14,27 +17,27 @@ export interface OperationHistoryTable {
     replicaId: string;
     authz: string | null;
 }
-export type OperationHistoryRow = Selectable<OperationHistoryTable>;
+export type OperationHistoryRow = OperationHistoryTable;
 export interface DocumentBaselineTable {
     oid: string;
     snapshot: string;
     timestamp: string;
     authz: string | null;
 }
-export type DocumentBaselineRow = Selectable<DocumentBaselineTable>;
+export type DocumentBaselineRow = DocumentBaselineTable;
 export interface ReplicaInfoTable {
     id: string;
     clientId: string;
     lastSeenWallClockTime: number | null;
     ackedLogicalTime: string | null;
     type: ReplicaType;
-    ackedServerOrder: Generated<number>;
+    ackedServerOrder: number;
 }
-export type ReplicaInfoRow = Selectable<ReplicaInfoTable>;
+export type ReplicaInfoRow = ReplicaInfoTable;
 export interface FileMetadataTable {
     fileId: string;
     name: string;
     type: string;
     pendingDeleteAt: number | null;
 }
-export type FileMetadataRow = Selectable<FileMetadataTable>;
+export type FileMetadataRow = FileMetadataTable;

package/dist/esm/types.d.ts

@@ -17,7 +17,7 @@ export interface StoredReplicaInfo extends ReplicaInfo {
     type: ReplicaType;
     ackedServerOrder: number;
 }
-export type LibraryInfo<Profile = unknown> = {
+export type LibraryInfo = {
     id: string;
     replicas: {
         id: string;
@@ -25,7 +25,6 @@ export type LibraryInfo<Profile = unknown> = {
         ackedServerOrder: number;
         type: ReplicaType;
         truant: boolean;
-        profile: Profile;
     }[];
     latestServerOrder: number;
     operationsCount: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdant-web/server",
-  "version": "3.3.11",
+  "version": "4.0.0",
   "access": "public",
   "type": "module",
   "bin": {
@@ -14,6 +14,10 @@
     "./storage": {
       "import": "./dist/esm/storage/index.js",
       "types": "./dist/esm/storage/index.d.ts"
+    },
+    "./internals": {
+      "import": "./dist/esm/internals.js",
+      "types": "./dist/esm/internals.d.ts"
     }
   },
   "publishConfig": {
@@ -24,29 +28,36 @@
     "src/",
     "bin/"
   ],
+  "peerDependencies": {
+    "hono": "^4.7.2",
+    "@hono/node-server": "^1.13.8"
+  },
+  "peerDependenciesMeta": {
+    "hono": {
+      "optional": true
+    },
+    "@hono/node-server": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@a-type/kysely": "^1.0.2",
-    "@fastify/busboy": "^3.1.1",
-    "async-lock": "^1.4.0",
-    "better-sqlite3": "^11.8.1",
-    "busboy": "^1.6.0",
+    "@hono/node-server": "^1.19.5",
+    "better-sqlite3": "^11.10.0",
+    "hono": "^4.9.9",
     "jsonwebtoken": "^8.5.1",
-    "kysely": "0.27.5",
-    "kysely-plugin-serialize": "^0.5.7",
     "minimist": "^1.2.8",
     "ws": "^8.9.0",
-    "@verdant-web/common": "2.9.1"
+    "@verdant-web/common": "3.0.0"
   },
   "devDependencies": {
     "@types/async-lock": "^1.3.0",
     "@types/better-sqlite3": "^7.6.12",
-    "@types/busboy": "^1.5.0",
     "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^20.11.5",
+    "@types/node": "24.6.1",
     "@types/ws": "^8.5.3",
     "cross-env": "7.0.3",
-    "typescript": "^5.4.2",
-    "vitest": "^2.0.5"
+    "typescript": "5.9.3",
+    "vitest": "3.2.4"
   },
   "scripts": {
     "build": "tsc",

package/src/TokenVerifier.ts

@@ -4,6 +4,10 @@ import jwt, { JwtPayload } from 'jsonwebtoken';
 export class TokenVerifier {
 	constructor(private config: { secret: string }) {}
 
+	get secret() {
+		return this.config.secret;
+	}
+
 	verifyToken = (token: string): TokenInfo => {
 		try {
 			const decoded = jwt.verify(token, this.config.secret, {

package/src/adapters/node/errorHandler.ts

@@ -0,0 +1,18 @@
+import { VerdantError } from '@verdant-web/common';
+import { ErrorHandler } from 'hono';
+import { ContentfulStatusCode } from 'hono/utils/http-status';
+
+export const errorHandler: ErrorHandler = (err, ctx) => {
+	if (err instanceof VerdantError) {
+		if (err.code > VerdantError.Code.Unexpected) {
+			console.error('Verdant error:', err);
+		}
+		return ctx.json(err.toResponse(), err.httpStatus as ContentfulStatusCode);
+	}
+
+	console.error('Unexpected error:', err);
+	return ctx.json(
+		new VerdantError(VerdantError.Code.Unexpected).toResponse(),
+		500,
+	);
+};

package/src/adapters/node/getRequestToken.ts

@@ -0,0 +1,34 @@
+import { VerdantError } from '@verdant-web/common';
+
+export function getRequestToken(req: Request) {
+	if (req.method === 'OPTIONS') {
+		// preflight request, np
+		return null;
+	}
+	// websocket compat - we only receive one header...
+	const protocolHeader = req.headers.get('Sec-WebSocket-Protocol');
+	if (protocolHeader) {
+		const [type, token] = protocolHeader.split(',');
+		if (type === 'Bearer') {
+			return token.trim();
+		}
+	}
+
+	const authHeader = req.headers.get('Authorization');
+	if (!authHeader) {
+		throw new VerdantError(
+			VerdantError.Code.NoToken,
+			undefined,
+			'Authorization header is required',
+		);
+	}
+	const [type, token] = authHeader.split(' ');
+	if (type !== 'Bearer') {
+		throw new VerdantError(
+			VerdantError.Code.InvalidToken,
+			undefined,
+			'Authorization type must be Bearer',
+		);
+	}
+	return token;
+}