@verdant-web/server 1.7.8 → 1.7.10

package/src/Server.ts

@@ -265,8 +265,15 @@ export class Server extends EventEmitter implements MessageSender {
 						});
 					}));
 
-				for (const message of body.messages) {
-					await this.handleMessage(key, info, message);
+				try {
+					for (const message of body.messages) {
+						await this.handleMessage(key, info, message);
+					}
+				} catch (e) {
+					this.emit('error', e);
+					res.writeHead(500);
+					res.end();
+					return;
 				}
 
 				// update our keepalive timers for presence management

package/dist/cjs/ServerStorage.d.ts

@@ -1,35 +0,0 @@
-import { Database } from 'better-sqlite3';
-import { ClientMessage } from '@lo-fi/common';
-import { MessageSender } from './MessageSender.js';
-import { UserProfiles } from './Profiles.js';
-import { TokenInfo } from './TokenVerifier.js';
-interface ServerStorageOptions {
-    db: Database;
-    sender: MessageSender;
-    profiles: UserProfiles<any>;
-    replicaTruancyMinutes: number;
-    log?: (...args: any[]) => void;
-    disableRebasing?: boolean;
-}
-export declare class ServerStorage {
-    private profileLoader;
-    private libraries;
-    private db;
-    private sender;
-    constructor({ db, sender, profiles, replicaTruancyMinutes, disableRebasing, log, }: ServerStorageOptions);
-    /**
-     * Call with any message from any replica
-     */
-    receive: (libraryId: string, clientKey: string, message: ClientMessage, info: TokenInfo) => Promise<void>;
-    /**
-     * Call when a replica disconnects from the server
-     */
-    remove: (libraryId: string, replicaId: string) => void;
-    evictLibrary: (libraryId: string) => void;
-    evictUser: (libraryId: string, userId: string) => void;
-    private createSchema;
-    close: () => Promise<void>;
-    getLibraryPresence: (libraryId: string) => Record<string, import("@lo-fi/common").UserInfo<any, any>>;
-    getDocumentSnapshot: (libraryId: string, documentId: string) => any;
-}
-export {};

package/dist/cjs/ServerStorage.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerStorage = void 0;
-const ServerLibrary_js_1 = require("./ServerLibrary.js");
-const Profiles_js_1 = require("./Profiles.js");
-const migrations_js_1 = require("./migrations.js");
-class ServerStorage {
-    constructor({ db, sender, profiles, replicaTruancyMinutes, disableRebasing = false, log = () => { }, }) {
-        /**
-         * Call with any message from any replica
-         */
-        this.receive = (libraryId, clientKey, message, info) => {
-            const library = this.libraries.open(libraryId);
-            return library.receive(message, clientKey, info);
-        };
-        /**
-         * Call when a replica disconnects from the server
-         */
-        this.remove = (libraryId, replicaId) => {
-            const library = this.libraries.open(libraryId);
-            library.remove(replicaId);
-        };
-        this.evictLibrary = (libraryId) => {
-            const library = this.libraries.open(libraryId);
-            library.destroy();
-        };
-        this.evictUser = (libraryId, userId) => {
-            const library = this.libraries.open(libraryId);
-            library.evictUser(userId);
-        };
-        this.createSchema = () => {
-            (0, migrations_js_1.migrations)(this.db);
-        };
-        this.close = async () => {
-            this.db.close();
-        };
-        this.getLibraryPresence = (libraryId) => {
-            const library = this.libraries.open(libraryId);
-            return library.getPresence();
-        };
-        this.getDocumentSnapshot = (libraryId, documentId) => {
-            const library = this.libraries.open(libraryId);
-            return library.getDocumentSnapshot(documentId);
-        };
-        this.db = db;
-        this.sender = sender;
-        this.createSchema();
-        this.profileLoader = new Profiles_js_1.UserProfileLoader(profiles);
-        this.libraries = new ServerLibrary_js_1.ServerLibraryManager({
-            db: this.db,
-            sender: this.sender,
-            profileLoader: this.profileLoader,
-            replicaTruancyMinutes,
-            log,
-            disableRebasing,
-        });
-    }
-}
-exports.ServerStorage = ServerStorage;
-//# sourceMappingURL=ServerStorage.js.map

package/dist/cjs/ServerStorage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServerStorage.js","sourceRoot":"","sources":["../../src/ServerStorage.ts"],"names":[],"mappings":";;;AAEA,yDAA0D;AAE1D,+CAAgE;AAEhE,mDAA6C;AAW7C,MAAa,aAAa;IAMzB,YAAY,EACX,EAAE,EACF,MAAM,EACN,QAAQ,EACR,qBAAqB,EACrB,eAAe,GAAG,KAAK,EACvB,GAAG,GAAG,GAAG,EAAE,GAAE,CAAC,GACQ;QAevB;;WAEG;QACH,YAAO,GAAG,CACT,SAAiB,EACjB,SAAiB,EACjB,OAAsB,EACtB,IAAe,EACd,EAAE;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF;;WAEG;QACH,WAAM,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,EAAE;YACjD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,iBAAY,GAAG,CAAC,SAAiB,EAAE,EAAE;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,OAAO,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC;QAEF,cAAS,GAAG,CAAC,SAAiB,EAAE,MAAc,EAAE,EAAE;YACjD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEM,iBAAY,GAAG,GAAG,EAAE;YAC3B,IAAA,0BAAU,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,CAAC;QAEF,UAAK,GAAG,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC;QAEF,uBAAkB,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC;QAC9B,CAAC,CAAC;QAEF,wBAAmB,GAAG,CAAC,SAAiB,EAAE,UAAkB,EAAE,EAAE;YAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,OAAO,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAChD,CAAC,CAAC;QA7DD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,aAAa,GAAG,IAAI,+BAAiB,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,IAAI,uCAAoB,CAAC;YACzC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,qBAAqB;YACrB,GAAG;YACH,eAAe;SACf,CAAC,CAAC;IACJ,CAAC;CAkDD;AA5ED,sCA4EC"}

package/dist/esm/ServerStorage.d.ts

@@ -1,44 +0,0 @@
-import { Database } from 'better-sqlite3';
-import { ClientMessage } from '@lo-fi/common';
-import { MessageSender } from './MessageSender.js';
-import { UserProfiles } from './Profiles.js';
-import { TokenInfo } from './TokenVerifier.js';
-import { FileInfo } from './files/FileStorage.js';
-interface ServerStorageOptions {
-    db: Database;
-    sender: MessageSender;
-    profiles: UserProfiles<any>;
-    replicaTruancyMinutes: number;
-    log?: (...args: any[]) => void;
-    disableRebasing?: boolean;
-}
-export declare class ServerStorage {
-    private profileLoader;
-    private library;
-    private db;
-    private sender;
-    private fileMetadata;
-    constructor({ db, sender, profiles, replicaTruancyMinutes, disableRebasing, log, }: ServerStorageOptions);
-    /**
-     * Call with any message from any replica
-     */
-    receive: (libraryId: string, clientKey: string, message: ClientMessage, info: TokenInfo) => Promise<void>;
-    /**
-     * Call when a replica disconnects from the server
-     */
-    remove: (libraryId: string, replicaId: string) => void;
-    evictLibrary: (libraryId: string) => void;
-    evictUser: (libraryId: string, userId: string) => void;
-    private createSchema;
-    close: () => Promise<void>;
-    getLibraryPresence: (libraryId: string) => Record<string, import("@lo-fi/common").UserInfo<any, any>>;
-    getDocumentSnapshot: (libraryId: string, oid: string) => any;
-    putFileInfo: (libraryId: string, fileInfo: FileInfo) => void;
-    getFileInfo: (libraryId: string, fileId: string) => {
-        libraryId: string;
-        fileId: string;
-        name: string;
-        type: string;
-    };
-}
-export {};

package/dist/esm/ServerStorage.js

@@ -1,58 +0,0 @@
-import { ServerLibrary } from './ServerLibrary.js';
-import { UserProfileLoader } from './Profiles.js';
-import { migrations } from './migrations.js';
-import { FileMetadata } from './files/FileMetadata.js';
-export class ServerStorage {
-    constructor({ db, sender, profiles, replicaTruancyMinutes, disableRebasing = false, log = () => { }, }) {
-        /**
-         * Call with any message from any replica
-         */
-        this.receive = (libraryId, clientKey, message, info) => {
-            return this.library.receive(message, clientKey, info);
-        };
-        /**
-         * Call when a replica disconnects from the server
-         */
-        this.remove = (libraryId, replicaId) => {
-            this.library.remove(libraryId, replicaId);
-        };
-        this.evictLibrary = (libraryId) => {
-            this.library.destroy(libraryId);
-        };
-        this.evictUser = (libraryId, userId) => {
-            this.library.evictUser(libraryId, userId);
-        };
-        this.createSchema = () => {
-            migrations(this.db);
-        };
-        this.close = async () => {
-            this.db.close();
-        };
-        this.getLibraryPresence = (libraryId) => {
-            return this.library.getPresence(libraryId);
-        };
-        this.getDocumentSnapshot = (libraryId, oid) => {
-            return this.library.getDocumentSnapshot(libraryId, oid);
-        };
-        this.putFileInfo = (libraryId, fileInfo) => {
-            this.fileMetadata.put(libraryId, fileInfo);
-        };
-        this.getFileInfo = (libraryId, fileId) => {
-            return this.fileMetadata.get(libraryId, fileId);
-        };
-        this.db = db;
-        this.sender = sender;
-        this.createSchema();
-        this.profileLoader = new UserProfileLoader(profiles);
-        this.library = new ServerLibrary({
-            db: this.db,
-            sender: this.sender,
-            profiles: this.profileLoader,
-            replicaTruancyMinutes,
-            log,
-            disableRebasing,
-        });
-        this.fileMetadata = new FileMetadata(this.db);
-    }
-}
-//# sourceMappingURL=ServerStorage.js.map

package/dist/esm/ServerStorage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServerStorage.js","sourceRoot":"","sources":["../../src/ServerStorage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAgB,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAWvD,MAAM,OAAO,aAAa;IAOzB,YAAY,EACX,EAAE,EACF,MAAM,EACN,QAAQ,EACR,qBAAqB,EACrB,eAAe,GAAG,KAAK,EACvB,GAAG,GAAG,GAAG,EAAE,GAAE,CAAC,GACQ;QAgBvB;;WAEG;QACH,YAAO,GAAG,CACT,SAAiB,EACjB,SAAiB,EACjB,OAAsB,EACtB,IAAe,EACd,EAAE;YACH,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF;;WAEG;QACH,WAAM,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,EAAE;YACjD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC;QAEF,iBAAY,GAAG,CAAC,SAAiB,EAAE,EAAE;YACpC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC,CAAC;QAEF,cAAS,GAAG,CAAC,SAAiB,EAAE,MAAc,EAAE,EAAE;YACjD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC,CAAC;QAEM,iBAAY,GAAG,GAAG,EAAE;YAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,CAAC;QAEF,UAAK,GAAG,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC;QAEF,uBAAkB,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC,CAAC;QAEF,wBAAmB,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE;YACxD,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACzD,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,SAAiB,EAAE,QAAkB,EAAE,EAAE;YACvD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC5C,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,SAAiB,EAAE,MAAc,EAAE,EAAE;YACnD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC,CAAC;QAhED,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,aAAa,GAAG,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,aAAa,CAAC;YAChC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,aAAa;YAC5B,qBAAqB;YACrB,GAAG;YACH,eAAe;SACf,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;CAoDD"}