@verdant-web/server 2.0.7 → 2.1.0

package/dist/cjs/ClientConnection.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 import { ServerMessage } from '@verdant-web/common';
 import { IncomingMessage, ServerResponse } from 'http';
 import { WebSocket } from 'ws';
@@ -7,6 +8,7 @@ export declare class ClientConnectionManager {
     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;
     /**

package/dist/cjs/ClientConnection.js

@@ -28,6 +28,29 @@ class RequestClientConnection extends ClientConnection {
         };
     }
 }
+class FetchClientConnection extends ClientConnection {
+    constructor(key, req, info) {
+        super(key);
+        this.req = req;
+        this.info = info;
+        this.type = 'fetch';
+        this.responses = [];
+        this.res = new Response('', { status: 200 });
+        this.respond = (message) => {
+            this.responses.push(message);
+        };
+        this.end = () => {
+            this.res = new Response(JSON.stringify({
+                messages: this.responses,
+            }), {
+                status: 200,
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        };
+    }
+}
 class WebSocketClientConnection extends ClientConnection {
     constructor(key, ws, info) {
         super(key);
@@ -65,6 +88,16 @@ class ClientConnectionManager {
                 lib.delete(key);
             };
         };
+        this.addFetch = (libraryId, key, req, info) => {
+            const lib = this.getLibraryConnections(libraryId);
+            const connection = new FetchClientConnection(key, req, info);
+            lib.set(key, connection);
+            return () => {
+                connection.end();
+                lib.delete(key);
+                return connection.res;
+            };
+        };
         this.remove = (libraryId, key) => {
             const lib = this.getLibraryConnections(libraryId);
             lib.delete(key);

package/dist/cjs/ClientConnection.js.map

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

package/dist/cjs/Server.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { DocumentBaseline, Operation, ServerMessage } from '@verdant-web/common';
 import EventEmitter from 'events';
 import { IncomingMessage, Server as HttpServer, ServerResponse } from 'http';
@@ -7,6 +9,7 @@ import { UserProfiles } from './Profiles.js';
 import { MessageSender } from './MessageSender.js';
 import { TokenInfo } from './TokenVerifier.js';
 import { FileStorage } from './files/FileStorage.js';
+import internal from 'stream';
 import { FileMetadataConfig } from './files/FileMetadata.js';
 export interface ServerOptions {
     /**
@@ -68,7 +71,7 @@ export declare interface Server {
     emit<Event extends keyof ServerEvents>(ev: Event, ...args: Parameters<ServerEvents[Event]>): boolean;
 }
 export declare class Server extends EventEmitter implements MessageSender {
-    readonly httpServer: HttpServer;
+    private httpServer;
     private wss;
     private fileStorage?;
     private fileMetadata;
@@ -80,17 +83,50 @@ export declare class Server extends EventEmitter implements MessageSender {
     private log;
     private __testMode;
     constructor(options: ServerOptions);
+    /**
+     * Attaches the Verdant server to an HttpServer instance, which
+     * allows it to handle requests and websockets required for the
+     * Verdant protocol.
+     *
+     * You can pass httpPath = false if you want to handle HTTP requests
+     * yourself, and this will only attach the websocket handling.
+     */
+    attach: (server: HttpServer, options?: {
+        httpPath?: string | false;
+    }) => void;
+    /**
+     * Handles an HTTP upgrade request to a websocket connection.
+     */
+    handleUpgrade: (req: IncomingMessage, socket: internal.Duplex, head: Buffer) => Promise<void>;
     private authorizeRequest;
     private getRequestToken;
-    private internalServerHandleRequest;
+    private createInternalRequestHandler;
+    /**
+     * Handles an HTTP request from a verdant client.
+     */
     handleRequest: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
-    private sendErrorResponse;
+    /**
+     * Handles a "fetch" style request. Complement to handleRequest, for servers
+     * that use Request/Response style handlers.
+     */
+    handleFetch: (req: Request) => Promise<Response>;
+    private handleRequestBody;
+    private writeErrorResponse;
+    private getErrorResponse;
     /**
      * Handles a multipart upload of a file from a verdant client. The upload
      * will include parameters for the file's ID, name, and type. The request
      * must be authenticated with a token to tie it to a library.
      */
     handleFileRequest: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
+    /**
+     * Handles a "fetch" style file request. Complement to handleFileRequest,
+     * for servers that use Request/Response style handlers.
+     */
+    handleFileFetch: (req: Request) => Promise<Response>;
+    private getFileStorageOrThrow;
+    private streamIncomingFile;
+    private getFileData;
     broadcast: (libraryId: string, message: ServerMessage, omitKeys?: string[]) => void;
     send: (libraryId: string, key: string, message: ServerMessage) => void;
     private handleMessage;

package/dist/cjs/Server.js

@@ -30,6 +30,7 @@ const stream_1 = require("stream");
 const FileMetadata_js_1 = require("./files/FileMetadata.js");
 const ServerLibrary_js_1 = require("./ServerLibrary.js");
 const migrations_js_1 = require("./migrations.js");
+const web_1 = require("node:stream/web");
 class DefaultProfiles {
     constructor() {
         this.get = async (userId) => {
@@ -45,10 +46,58 @@ class Server extends events_1.default {
         this.connectionToReplicaIdMap = new WeakMap();
         this.log = () => { };
         this.__testMode = false;
+        /**
+         * Attaches the Verdant server to an HttpServer instance, which
+         * allows it to handle requests and websockets required for the
+         * Verdant protocol.
+         *
+         * You can pass httpPath = false if you want to handle HTTP requests
+         * yourself, and this will only attach the websocket handling.
+         */
+        this.attach = (server, options = {}) => {
+            if (this.httpServer) {
+                this.httpServer.off('upgrade', this.handleUpgrade);
+            }
+            this.httpServer = server;
+            this.httpServer.on('upgrade', this.handleUpgrade);
+            if (options.httpPath !== false) {
+                this.httpServer.on('request', this.createInternalRequestHandler(options.httpPath));
+            }
+        };
+        /**
+         * Handles an HTTP upgrade request to a websocket connection.
+         */
+        this.handleUpgrade = async (req, socket, head) => {
+            try {
+                const info = this.authorizeRequest(req);
+                this.wss.handleUpgrade(req, socket, head, (ws) => {
+                    this.wss.emit('connection', ws, req, info);
+                });
+            }
+            catch (e) {
+                this.emit('error', e);
+                if (e instanceof common_1.VerdantError && e.httpStatus === 401) {
+                    socket.write('HTTP/1.1 401 Unauthorized\r\n' +
+                        'Connection: close\r\n' +
+                        'Content-Length: 0\r\n' +
+                        '\r\n');
+                }
+                socket.destroy();
+            }
+        };
         this.authorizeRequest = (req) => {
             return this.tokenVerifier.verifyToken(this.getRequestToken(req));
         };
         this.getRequestToken = (req) => {
+            if (isFetch(req)) {
+                const authHeader = req.headers.get('Authorization');
+                (0, common_1.assert)(authHeader, 'Token is required');
+                const [type, token] = authHeader.split(' ');
+                if (type === 'Bearer') {
+                    return token;
+                }
+                return token;
+            }
             if (req.headers.authorization) {
                 const [type, token] = req.headers.authorization.split(' ');
                 if (type === 'Bearer') {
@@ -68,21 +117,27 @@ class Server extends events_1.default {
             (0, common_1.assert)(token, 'Token is required');
             return token;
         };
-        this.internalServerHandleRequest = (req, res) => {
-            const url = new url_1.URL(req.url || '', 'http://localhost');
-            if (url.pathname.startsWith('lofi')) {
-                if (url.pathname === 'lofi') {
-                    return this.handleRequest(req, res);
+        this.createInternalRequestHandler = (pathPrefix = '/sync') => {
+            const handleRequest = (req, res) => {
+                const url = new url_1.URL(req.url || '', 'http://localhost');
+                if (url.pathname.startsWith('sync')) {
+                    if (url.pathname === 'sync') {
+                        return this.handleRequest(req, res);
+                    }
+                    else if (url.pathname.startsWith('/sync/files/')) {
+                        return this.handleFileRequest(req, res);
+                    }
                 }
-                else if (url.pathname.startsWith('/lofi/files/')) {
-                    return this.handleFileRequest(req, res);
+                else {
+                    res.writeHead(404);
+                    res.end();
                 }
-            }
-            else {
-                res.writeHead(404);
-                res.end();
-            }
+            };
+            return handleRequest;
         };
+        /**
+         * Handles an HTTP request from a verdant client.
+         */
         this.handleRequest = async (req, res) => {
             var _a;
             try {
@@ -104,28 +159,45 @@ class Server extends events_1.default {
                             reject(e);
                         });
                     }));
-                    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
-                    const firstMessage = body.messages[0];
-                    if (firstMessage) {
-                        this.keepalives.refresh(info.libraryId, firstMessage.replicaId);
-                    }
+                    await this.handleRequestBody(key, info, body);
                     finish();
                     this.emit('request', info);
                 }
             }
             catch (e) {
-                return this.sendErrorResponse(e, res);
+                return this.writeErrorResponse(e, res);
+            }
+        };
+        /**
+         * Handles a "fetch" style request. Complement to handleRequest, for servers
+         * that use Request/Response style handlers.
+         */
+        this.handleFetch = async (req) => {
+            try {
+                const info = this.authorizeRequest(req);
+                const key = (0, common_1.generateId)();
+                const finish = this.clientConnections.addFetch(info.libraryId, key, req, info);
+                const body = (await req.json());
+                if (!body) {
+                    throw new common_1.VerdantError(common_1.VerdantError.Code.BodyRequired);
+                }
+                await this.handleRequestBody(key, info, body);
+                const res = finish();
+                this.emit('request', info);
+                return res;
+            }
+            catch (e) {
+                return this.getErrorResponse(e);
+            }
+        };
+        this.handleRequestBody = async (key, info, body) => {
+            for (const message of body.messages) {
+                await this.handleMessage(key, info, message);
+            }
+            // update our keepalive timers for presence management
+            const firstMessage = body.messages[0];
+            if (firstMessage) {
+                this.keepalives.refresh(info.libraryId, firstMessage.replicaId);
             }
         };
         /**
@@ -134,70 +206,19 @@ class Server extends events_1.default {
          * must be authenticated with a token to tie it to a library.
          */
         this.handleFileRequest = async (req, res) => {
-            const fs = this.fileStorage;
-            if (!fs) {
-                this.emit('error', new Error('No file storage configured, but a client attempted to upload a file.'));
-                res.writeHead(500);
-                res.write('File storage is not configured');
-                res.end();
-                return;
-            }
-            // FIXME: rather than trying to support Express, I should
-            // just expose regular methods you call from whatever HTTP handler...
-            const url = new url_1.URL(req.originalUrl || req.baseUrl || req.url || '', 'http://localhost');
-            const id = url.pathname.split('/').pop();
-            if (!id || id === 'files') {
-                res.writeHead(400);
-                res.write('File ID is required to be in the URL path as the last parameter');
-                res.end();
-                return;
-            }
             try {
+                const info = this.authorizeRequest(req);
+                const url = new url_1.URL(req.originalUrl || req.baseUrl || req.url || '', 'http://localhost');
+                const id = url.pathname.split('/').pop();
+                if (!id || id === 'files') {
+                    throw new common_1.VerdantError(common_1.VerdantError.Code.NotFound);
+                }
                 if (req.method === 'POST') {
-                    const info = this.authorizeRequest(req);
-                    await new Promise((resolve, reject) => {
-                        const bb = (0, busboy_1.default)({ headers: req.headers });
-                        bb.on('file', (fieldName, stream, fileInfo) => {
-                            // too many 'info's....
-                            const lofiFileInfo = {
-                                id,
-                                libraryId: info.libraryId,
-                                fileName: fileInfo.filename,
-                                type: fileInfo.mimeType,
-                            };
-                            // write metadata to storage
-                            try {
-                                this.fileMetadata.put(info.libraryId, lofiFileInfo);
-                                fs.put(stream, lofiFileInfo);
-                            }
-                            catch (e) {
-                                reject(e);
-                            }
-                        });
-                        bb.on('field', (fieldName, value) => {
-                            if (fieldName === 'file') {
-                                if (this.__testMode) {
-                                    // this isn't right in the real world, but in testing it's
-                                    // the only way we get file data.
-                                    // we create a stream from the data and pass it as if it
-                                    // were a file stream
-                                    const stream = new stream_1.Readable();
-                                    stream.push(value);
-                                    stream.push(null);
-                                    const fileInfo = {
-                                        filename: 'test.txt',
-                                        mimeType: 'text/plain',
-                                    };
-                                    bb.emit('file', fieldName, stream, fileInfo);
-                                }
-                                else {
-                                    throw new Error('Invalid file upload');
-                                }
-                            }
-                        });
-                        req.pipe(bb);
-                        bb.on('finish', resolve);
-                        bb.on('error', reject);
+                    await this.streamIncomingFile({
+                        req,
+                        info,
+                        headers: req.headers,
+                        id,
                     });
                     this.log('File upload complete');
                     res.writeHead(200);
@@ -205,39 +226,147 @@ class Server extends events_1.default {
                     res.end();
                 }
                 else if (req.method === 'GET') {
-                    const info = this.authorizeRequest(req);
-                    const fileInfo = this.fileMetadata.get(info.libraryId, id);
-                    if (!fileInfo) {
-                        res.writeHead(404);
-                        res.end();
-                        return;
-                    }
-                    const url = await fs.getUrl({
-                        fileName: fileInfo.name,
-                        id: fileInfo.fileId,
-                        libraryId: info.libraryId,
-                        type: fileInfo.type,
-                    });
+                    const data = await this.getFileData(info, id);
                     res.writeHead(200, {
                         'Content-Type': 'application/json',
                     });
-                    // we need to augment that data with the URL from the file backend.
-                    // and generally enforce the FileData interface here...
-                    const data = {
-                        id: fileInfo.fileId,
-                        url,
-                        remote: true,
-                        name: fileInfo.name,
-                        type: fileInfo.type,
-                    };
                     res.write(JSON.stringify(data));
                     res.end();
                 }
             }
             catch (e) {
-                return this.sendErrorResponse(e, res);
+                return this.writeErrorResponse(e, res);
             }
         };
+        /**
+         * Handles a "fetch" style file request. Complement to handleFileRequest,
+         * for servers that use Request/Response style handlers.
+         */
+        this.handleFileFetch = async (req) => {
+            this.log('info', 'Handling file fetch', req.url, req.method);
+            try {
+                const info = this.authorizeRequest(req);
+                const url = new url_1.URL(req.url, 'http://localhost');
+                const id = url.pathname.split('/').pop();
+                if (!id || id === 'files') {
+                    throw new common_1.VerdantError(common_1.VerdantError.Code.NotFound);
+                }
+                if (req.method === 'POST') {
+                    if (!req.body) {
+                        throw new common_1.VerdantError(common_1.VerdantError.Code.InvalidRequest);
+                    }
+                    const headersAsRecord = Array.from(req.headers.entries()).reduce((acc, [key, value]) => {
+                        acc[key] = value;
+                        return acc;
+                    }, {});
+                    // this is needed because Node's webstreams don't
+                    // like itty's polyfill streams
+                    const intermediate = new web_1.TransformStream();
+                    req.body.pipeTo(intermediate.writable);
+                    await this.streamIncomingFile({
+                        req: stream_1.Readable.fromWeb(intermediate.readable),
+                        info,
+                        headers: headersAsRecord,
+                        id,
+                    });
+                    this.log('File upload complete');
+                    return new Response(JSON.stringify({ success: true }), {
+                        status: 200,
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                    });
+                }
+                else if (req.method === 'GET') {
+                    const data = await this.getFileData(info, id);
+                    return new Response(JSON.stringify(data), {
+                        status: 200,
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                    });
+                }
+                else {
+                    throw new common_1.VerdantError(common_1.VerdantError.Code.InvalidRequest);
+                }
+            }
+            catch (e) {
+                return this.getErrorResponse(e);
+            }
+        };
+        this.getFileStorageOrThrow = () => {
+            if (!this.fileStorage) {
+                throw new common_1.VerdantError(common_1.VerdantError.Code.NoFileStorage);
+            }
+            return this.fileStorage;
+        };
+        this.streamIncomingFile = ({ id, req, headers, info, }) => {
+            const fs = this.getFileStorageOrThrow();
+            return new Promise((resolve, reject) => {
+                const bb = (0, busboy_1.default)({ headers });
+                bb.on('file', (fieldName, stream, fileInfo) => {
+                    // too many 'info's....
+                    const lofiFileInfo = {
+                        id,
+                        libraryId: info.libraryId,
+                        fileName: fileInfo.filename,
+                        type: fileInfo.mimeType,
+                    };
+                    // write metadata to storage
+                    try {
+                        this.fileMetadata.put(info.libraryId, lofiFileInfo);
+                        fs.put(stream, lofiFileInfo);
+                    }
+                    catch (e) {
+                        reject(e);
+                    }
+                });
+                bb.on('field', (fieldName, value) => {
+                    if (fieldName === 'file') {
+                        if (this.__testMode) {
+                            // this isn't right in the real world, but in testing it's
+                            // the only way we get file data.
+                            // we create a stream from the data and pass it as if it
+                            // were a file stream
+                            const stream = new stream_1.Readable();
+                            stream.push(value);
+                            stream.push(null);
+                            const fileInfo = {
+                                filename: 'test.txt',
+                                mimeType: 'text/plain',
+                            };
+                            bb.emit('file', fieldName, stream, fileInfo);
+                        }
+                        else {
+                            throw new Error('Invalid file upload');
+                        }
+                    }
+                });
+                req.pipe(bb);
+                bb.on('finish', resolve);
+                bb.on('error', reject);
+            });
+        };
+        this.getFileData = async (info, id) => {
+            const fs = this.getFileStorageOrThrow();
+            const fileInfo = this.fileMetadata.get(info.libraryId, id);
+            if (!fileInfo) {
+                throw new common_1.VerdantError(common_1.VerdantError.Code.NotFound, undefined, `File ${id} not found`);
+            }
+            const url = await fs.getUrl({
+                fileName: fileInfo.name,
+                id: fileInfo.fileId,
+                libraryId: info.libraryId,
+                type: fileInfo.type,
+            });
+            return {
+                id: fileInfo.fileId,
+                url,
+                remote: true,
+                name: fileInfo.name,
+                type: fileInfo.type,
+            };
+        };
         this.broadcast = (libraryId, message, omitKeys = []) => {
             this.clientConnections.broadcast(libraryId, message, omitKeys);
         };
@@ -372,28 +501,10 @@ class Server extends events_1.default {
         });
         this.wss.on('connection', this.handleConnection);
         this.httpServer =
-            options.httpServer || new http_1.Server(this.internalServerHandleRequest);
-        this.httpServer.on('upgrade', async (req, socket, head) => {
-            try {
-                const info = this.authorizeRequest(req);
-                this.wss.handleUpgrade(req, socket, head, (ws) => {
-                    this.wss.emit('connection', ws, req, info);
-                });
-            }
-            catch (e) {
-                this.emit('error', e);
-                if (e instanceof common_1.VerdantError && e.httpStatus === 401) {
-                    socket.write('HTTP/1.1 401 Unauthorized\r\n' +
-                        'Connection: close\r\n' +
-                        'Content-Length: 0\r\n' +
-                        '\r\n');
-                }
-                socket.destroy();
-            }
-        });
+            options.httpServer || new http_1.Server(this.createInternalRequestHandler());
         this.keepalives.subscribe('lost', this.library.remove);
     }
-    sendErrorResponse(e, res) {
+    writeErrorResponse(e, res) {
         this.emit('error', e);
         this.log('Error handling request', e);
         if (e instanceof common_1.VerdantError) {
@@ -407,6 +518,30 @@ class Server extends events_1.default {
         }
         res.end();
     }
+    // for fetch-style
+    getErrorResponse(e) {
+        this.emit('error', e);
+        this.log('Error handling request', e);
+        if (e instanceof common_1.VerdantError) {
+            return new Response(JSON.stringify(e.toResponse()), {
+                status: e.httpStatus,
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        }
+        else {
+            return new Response(JSON.stringify(new common_1.VerdantError(common_1.VerdantError.Code.Unexpected).toResponse()), {
+                status: 500,
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        }
+    }
 }
 exports.Server = Server;
+function isFetch(request) {
+    return 'json' in request;
+}
 //# sourceMappingURL=Server.js.map