@verdant-web/server 3.3.11 → 4.0.1

package/src/storage/sqlShard/database.ts

@@ -1,18 +1,67 @@
-import { Kysely, SqliteDialect } from 'kysely';
-import { join } from 'path';
-import { Database as DatabaseTypes } from './tables.js';
 import Database from 'better-sqlite3';
-import { migrateToLatest } from '@a-type/kysely';
-import migrations from './migrations.js';
+import { join } from 'path';
+import { Logger } from '../../logger.js';
+import { migrateToLatest } from './migrations.js';
+
+export interface SqliteExecutor {
+	query: <O extends Record<string, any>>(
+		sql: string,
+		parameters?: readonly unknown[],
+	) => O[];
+	first: <O extends Record<string, any>>(
+		sql: string,
+		parameters?: readonly unknown[],
+	) => O | null;
+	exec: (sql: string, parameters?: readonly unknown[]) => void;
+	migrate: () => void;
+	close: () => void;
+	transaction: <T>(cb: (tx: SqliteExecutor) => T) => T | Promise<T>;
+	migrated: boolean;
+}
+
+export class SqliteExecutor {
+	private log;
+	constructor(
+		partial: Pick<SqliteExecutor, 'query' | 'exec' | 'close'> & {
+			createTransaction: (
+				exec: SqliteExecutor,
+			) => <T>(cb: (tx: SqliteExecutor) => T) => T | Promise<T>;
+		},
+		{ log }: { log?: Logger } = {},
+	) {
+		this.log = log || (() => {});
+		this.query = partial.query.bind(this) as any;
+		this.exec = partial.exec.bind(this);
+		this.close = partial.close.bind(this);
+		this.transaction = partial.createTransaction(this);
+	}
 
-export async function openDatabase(
+	migrate = () => {
+		return migrateToLatest(this, this.log);
+	};
+	first = <O extends Record<string, any>>(
+		sql: string,
+		parameters?: readonly unknown[],
+	): O | null => {
+		const results = this.query<O>(sql, parameters);
+		return results[0] ?? null;
+	};
+	migrated = false;
+}
+
+export function openDatabase(executor: SqliteExecutor) {
+	executor.migrate();
+	return executor;
+}
+
+export function createFilesystemExecutor(
 	directory: string,
 	libraryId: string,
 	options: {
-		skipMigrations?: boolean;
 		disableWal?: boolean;
+		log?: Logger;
 	} = {},
-) {
+): SqliteExecutor {
 	const label = `openDatabase ${libraryId}`;
 	console.time(label);
 	const filePath =
@@ -23,15 +72,30 @@ export async function openDatabase(
 	if (!options.disableWal) {
 		internalDb.pragma('journal_mode = WAL');
 	}
-	const db = new Kysely<DatabaseTypes>({
-		dialect: new SqliteDialect({
-			database: internalDb,
-		}),
-	});
-	// only migrate on first open
-	if (!options.skipMigrations) {
-		await migrateToLatest(db, migrations);
-	}
 	console.timeEnd(label);
-	return db;
+
+	return new SqliteExecutor(
+		{
+			query: function (sql, parameters = []) {
+				const stmt = internalDb.prepare(sql);
+				return stmt.all(...parameters) as any;
+			},
+			exec: function (sql, parameters = []) {
+				const stmt = internalDb.prepare(sql);
+				stmt.run(...parameters);
+			},
+			close: function () {
+				internalDb.close();
+			},
+			createTransaction: (exec) => (cb) => {
+				const tx = internalDb.transaction(() => {
+					return cb(exec);
+				});
+				return tx();
+			},
+		},
+		{
+			log: options.log ?? (() => {}),
+		},
+	);
 }

package/src/storage/sqlShard/migrations/v1.ts

@@ -1,53 +1,43 @@
-import { Kysely } from 'kysely';
+export const version = 1;
 
-export async function up(db: Kysely<any>) {
-	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: Kysely<any>) {
-	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 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
+);
+`,
+];

package/src/storage/sqlShard/migrations/v2.ts

@@ -1,20 +1,6 @@
-import { Kysely } from 'kysely';
+export const version = 2;
 
-export async function up(db: Kysely<any>) {
-	// 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: Kysely<any>) {
-	await db.schema.alterTable('OperationHistory').dropColumn('authz').execute();
-
-	await db.schema.alterTable('DocumentBaseline').dropColumn('authz').execute();
-}
+export const up = [
+	`ALTER TABLE "OperationHistory" ADD COLUMN "authz" TEXT DEFAULT NULL;`,
+	`ALTER TABLE "DocumentBaseline" ADD COLUMN "authz" TEXT DEFAULT NULL;`,
+];

package/src/storage/sqlShard/migrations.ts

@@ -1,4 +1,69 @@
+import { Logger } from '../../logger.js';
+import { SqliteExecutor } from './database.js';
 import * as v1 from './migrations/v1.js';
 import * as v2 from './migrations/v2.js';
 
-export default { v1, v2 };
+export function getMigrationVersion(run: SqliteExecutor['query']) {
+	try {
+		const result = run(
+			`SELECT id FROM _Migrations
+			ORDER BY id DESC
+			LIMIT 1;`,
+		);
+		const value = result[0]?.id ?? 0;
+		return value;
+	} catch (e) {
+		if (
+			e instanceof Error &&
+			e.message.includes('no such table: _Migrations')
+		) {
+			return 0;
+		}
+		throw e;
+	}
+}
+
+export function updateMigrationVersion(
+	run: SqliteExecutor['exec'],
+	version: number,
+) {
+	run(`INSERT INTO _Migrations (id, appliedAt) VALUES (?, ?)`, [
+		version,
+		Date.now(),
+	]);
+}
+
+export function migrateToLatest(
+	e: Pick<SqliteExecutor, 'exec' | 'query' | 'migrated'>,
+	log: Logger,
+) {
+	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;
+}

package/src/storage/sqlShard/sqlShardStorage.ts

@@ -1,81 +1,82 @@
-import Database from 'better-sqlite3';
-import { Kysely, SqliteDialect } from 'kysely';
-import { StorageFactory } from '../Storage.js';
+import { existsSync, mkdirSync } from 'fs';
+import {
+	defaultFileExpirationDays,
+	defaultReplicaTruancyMinutes,
+} from '../../defaults.js';
+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 { Database as DatabaseTypes } from './tables.js';
-import { SqlFileMetadata } from './SqlFileMetadata.js';
-import { migrateToLatest } from '@a-type/kysely';
-import migrations from './migrations.js';
-import { Databases } from './Databases.js';
-import { transferToShards } from './transfer.js';
-import { existsSync, mkdirSync, readdirSync } from 'fs';
+import { SqliteExecutor } from './database.js';
 
 export const sqlShardStorage = ({
 	databasesDirectory,
-	transferFromUnifiedDatabaseFile,
 	disableWal,
 	closeTimeout,
+	fileDeleteExpirationDays = defaultFileExpirationDays,
+	replicaTruancyMinutes = defaultReplicaTruancyMinutes,
+	log,
 }: {
 	databasesDirectory: string;
-	transferFromUnifiedDatabaseFile?: string;
 	disableWal?: boolean;
 	closeTimeout?: number;
-}): StorageFactory => {
-	let ready = Promise.resolve<void>(undefined);
+	databases?: Databases;
+	log?: Logger;
+} & StorageOptions): StorageFactory => {
 	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,
+	return async (libraryId) => {
+		const db = await dbs.get(libraryId);
+		return new SqlShardStorage(db, {
+			fileDeleteExpirationDays,
+			replicaTruancyMinutes,
+			libraryId,
+		});
+	};
+};
+
+export class SqlShardStorage implements Storage {
+	baselines;
+	operations;
+	replicas;
+	fileMetadata;
+
+	#open = true;
+	get open() {
+		return this.#open;
+	}
+
+	constructor(
+		private db: SqliteExecutor,
+		options: Required<StorageOptions> & { libraryId: string },
+	) {
+		this.baselines = new SqlBaselines(db, options.libraryId);
+		this.operations = new SqlOperations(db, options.libraryId);
+		this.replicas = new SqlReplicas(
+			db,
+			options.libraryId,
 			options.replicaTruancyMinutes,
-			'sqlite',
 		);
-		const fileMetadata = new SqlFileMetadata(
-			dbs,
+		this.fileMetadata = new SqlFileMetadata(
+			db,
+			options.libraryId,
 			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;
+	}
+
+	close = async () => {
+		this.#open = false;
+		await this.db.close();
 	};
-};
+}

package/src/storage/sqlShard/tables.ts

@@ -1,11 +1,11 @@
 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 {
@@ -16,7 +16,7 @@ export interface OperationHistoryTable {
 	replicaId: string;
 	authz: string | null;
 }
-export type OperationHistoryRow = Selectable<OperationHistoryTable>;
+export type OperationHistoryRow = OperationHistoryTable;
 
 export interface DocumentBaselineTable {
 	oid: string;
@@ -24,7 +24,7 @@ export interface DocumentBaselineTable {
 	timestamp: string;
 	authz: string | null;
 }
-export type DocumentBaselineRow = Selectable<DocumentBaselineTable>;
+export type DocumentBaselineRow = DocumentBaselineTable;
 
 export interface ReplicaInfoTable {
 	id: string;
@@ -32,10 +32,10 @@ export interface ReplicaInfoTable {
 	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;
@@ -44,4 +44,4 @@ export interface FileMetadataTable {
 	pendingDeleteAt: number | null;
 }
 
-export type FileMetadataRow = Selectable<FileMetadataTable>;
+export type FileMetadataRow = FileMetadataTable;

package/src/types.ts

@@ -22,15 +22,14 @@ export interface HydratedDocumentBaseline extends DocumentBaseline<any> {
 
 export interface StoredReplicaInfo extends ReplicaInfo {
 	libraryId: string;
-	// the authenticated client ID authorized
-	// to write to this replica
+	/** AKA userId!! */
 	clientId: string;
 	lastSeenWallClockTime: number | null;
 	type: ReplicaType;
 	ackedServerOrder: number;
 }
 
-export type LibraryInfo<Profile = unknown> = {
+export type LibraryInfo = {
 	id: string;
 	replicas: {
 		id: string;
@@ -38,7 +37,6 @@ export type LibraryInfo<Profile = unknown> = {
 		ackedServerOrder: number;
 		type: ReplicaType;
 		truant: boolean;
-		profile: Profile;
 	}[];
 	latestServerOrder: number;
 	operationsCount: number;

package/dist/esm/ClientConnection.d.ts

@@ -1,19 +0,0 @@
-import { ServerMessage } from '@verdant-web/common';
-import { IncomingMessage, ServerResponse } from 'http';
-import { WebSocket } from 'ws';
-import { TokenInfo } from './TokenVerifier.js';
-export declare class ClientConnectionManager {
-    private readonly connections;
-    private getLibraryConnections;
-    addSocket: (libraryId: string, key: string, socket: WebSocket, info: TokenInfo) => void;
-    addRequest: (libraryId: string, key: string, request: IncomingMessage, response: ServerResponse, info: TokenInfo) => () => void;
-    addFetch: (libraryId: string, key: string, req: Request, info: TokenInfo) => (() => Response);
-    remove: (libraryId: string, key: string) => void;
-    respond: (libraryId: string, key: string, message: ServerMessage) => void;
-    /**
-     * Broadcasts a message to all live-connected clients in a library.
-     * This does not reach push/pull clients.
-     */
-    broadcast: (libraryId: string, message: ServerMessage, omitKeys?: string[]) => void;
-    disconnectAll: (libraryId: string) => void;
-}

package/dist/esm/ClientConnection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ClientConnection.js","sourceRoot":"","sources":["../../src/ClientConnection.ts"],"names":[],"mappings":"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"}

package/dist/esm/MessageSender.d.ts

@@ -1,5 +0,0 @@
-import { ServerMessage } from '@verdant-web/common';
-export interface MessageSender {
-    broadcast(libraryId: string, message: ServerMessage, omitKeys?: string[]): void;
-    send(libraryId: string, clientKey: string, message: ServerMessage): void;
-}

package/dist/esm/MessageSender.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MessageSender.js","sourceRoot":"","sources":["../../src/MessageSender.ts"],"names":[],"mappings":""}

package/dist/esm/Presence.d.ts

@@ -1,18 +0,0 @@
-import { UserInfo, UserInfoUpdate } from '@verdant-web/common';
-import EventEmitter from 'events';
-import { UserProfiles } from './Profiles.js';
-/**
- * Stores client presence in-memory for connected
- * clients
- */
-export declare class Presence extends EventEmitter {
-    private profiles;
-    private presences;
-    constructor(profiles: UserProfiles<any>);
-    private getLibrary;
-    set: (libraryId: string, userId: string, userInfo: UserInfoUpdate) => Promise<UserInfo<any, any>>;
-    get: (libraryId: string, userId: string) => UserInfo<any, any> | undefined;
-    removeReplica: (libraryId: string, replicaId: string) => void;
-    all: (libraryId: string) => Record<string, UserInfo<any, any>>;
-    clear: (libraryId: string) => void;
-}

package/dist/esm/Presence.js

@@ -1,65 +0,0 @@
-import { initialInternalPresence, } from '@verdant-web/common';
-import EventEmitter from 'events';
-/**
- * Stores client presence in-memory for connected
- * clients
- */
-export class Presence extends EventEmitter {
-    constructor(profiles) {
-        super();
-        this.profiles = profiles;
-        this.presences = new Map();
-        this.getLibrary = (libraryId) => {
-            let map = this.presences.get(libraryId);
-            if (!map) {
-                map = {
-                    presences: {},
-                    replicaToUser: {},
-                    userToReplica: {},
-                };
-                this.presences.set(libraryId, map);
-            }
-            return map;
-        };
-        this.set = async (libraryId, userId, userInfo) => {
-            const lib = this.getLibrary(libraryId);
-            if (!lib.presences[userId]) {
-                lib.presences[userId] = Object.assign(Object.assign({}, userInfo), { profile: await this.profiles.get(userId), internal: userInfo.internal || initialInternalPresence });
-            }
-            else {
-                Object.assign(lib.presences[userId], userInfo);
-            }
-            lib.replicaToUser[userInfo.replicaId] = userId;
-            lib.userToReplica[userId] = lib.userToReplica[userId] || new Set();
-            lib.userToReplica[userId].add(userInfo.replicaId);
-            return lib.presences[userId];
-        };
-        this.get = (libraryId, userId) => {
-            var _a;
-            return (_a = this.presences.get(libraryId)) === null || _a === void 0 ? void 0 : _a.presences[userId];
-        };
-        this.removeReplica = (libraryId, replicaId) => {
-            const lib = this.getLibrary(libraryId);
-            const userId = lib.replicaToUser[replicaId];
-            if (!userId)
-                return;
-            lib.userToReplica[userId].delete(replicaId);
-            if (lib.userToReplica[userId].size === 0) {
-                delete lib.presences[userId];
-                this.emit('lost', libraryId, replicaId, userId);
-                // memory cleanup
-                if (Object.keys(lib.presences).length === 0) {
-                    this.clear(libraryId);
-                }
-            }
-        };
-        this.all = (libraryId) => {
-            var _a;
-            return ((_a = this.presences.get(libraryId)) === null || _a === void 0 ? void 0 : _a.presences) || {};
-        };
-        this.clear = (libraryId) => {
-            this.presences.delete(libraryId);
-        };
-    }
-}
-//# sourceMappingURL=Presence.js.map

package/dist/esm/Presence.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Presence.js","sourceRoot":"","sources":["../../src/Presence.ts"],"names":[],"mappings":"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"}