@nmtjs/protocol 0.6.5 → 0.7.1

package/dist/client/protocol.js

@@ -1,350 +1,345 @@
-import { createPromise, onceAborted } from '@nmtjs/common';
+import { createPromise, onceAborted } from "@nmtjs/common";
 import { concat, decodeNumber, encodeNumber } from "../common/binary.js";
 import { ClientMessageType, ErrorCode, ServerMessageType } from "../common/enums.js";
 import { EventEmitter } from "./events.js";
 import { ProtocolClientBlobStream, ProtocolServerBlobStream, ProtocolServerStream } from "./stream.js";
 export class ProtocolError extends Error {
-    code;
-    data;
-    constructor(code, message, data){
-        super(message);
-        this.code = code;
-        this.data = data;
-    }
-    get message() {
-        return `${this.code} ${super.message}`;
-    }
-    toString() {
-        return `${this.code} ${this.message}`;
-    }
-    toJSON() {
-        return {
-            code: this.code,
-            message: this.message,
-            data: this.data
-        };
-    }
+	code;
+	data;
+	constructor(code, message, data) {
+		super(message);
+		this.code = code;
+		this.data = data;
+	}
+	get message() {
+		return `${this.code} ${super.message}`;
+	}
+	toString() {
+		return `${this.code} ${this.message}`;
+	}
+	toJSON() {
+		return {
+			code: this.code,
+			message: this.message,
+			data: this.data
+		};
+	}
 }
 export class ProtocolClientStreams {
-    #collection = new Map();
-    get(streamId) {
-        const stream = this.#collection.get(streamId);
-        if (!stream) throw new Error('Stream not found');
-        return stream;
-    }
-    add(source, streamId, metadata) {
-        const stream = new ProtocolClientBlobStream(source, streamId, metadata);
-        this.#collection.set(streamId, stream);
-        return stream;
-    }
-    remove(streamId) {
-        this.#collection.delete(streamId);
-    }
-    abort(streamId) {
-        const stream = this.get(streamId);
-        stream.abort();
-        this.remove(streamId);
-    }
-    pull(streamId, size) {
-        const stream = this.get(streamId);
-        return stream.read(size);
-    }
-    end(streamId) {
-        const stream = this.get(streamId);
-        stream.end();
-        this.remove(streamId);
-    }
-    clear(error) {
-        if (error) {
-            for (const stream of this.#collection.values()){
-                stream.abort(error);
-            }
-        }
-        this.#collection.clear();
-    }
+	#collection = new Map();
+	get(streamId) {
+		const stream = this.#collection.get(streamId);
+		if (!stream) throw new Error("Stream not found");
+		return stream;
+	}
+	add(source, streamId, metadata) {
+		const stream = new ProtocolClientBlobStream(source, streamId, metadata);
+		this.#collection.set(streamId, stream);
+		return stream;
+	}
+	remove(streamId) {
+		this.#collection.delete(streamId);
+	}
+	abort(streamId) {
+		const stream = this.get(streamId);
+		stream.abort();
+		this.remove(streamId);
+	}
+	pull(streamId, size) {
+		const stream = this.get(streamId);
+		return stream.read(size);
+	}
+	end(streamId) {
+		this.get(streamId).end();
+		this.remove(streamId);
+	}
+	clear(error) {
+		if (error) {
+			for (const stream of this.#collection.values()) {
+				stream.abort(error);
+			}
+		}
+		this.#collection.clear();
+	}
 }
 export class ProtocolServerStreams {
-    #collection = new Map();
-    has(streamId) {
-        return this.#collection.has(streamId);
-    }
-    get(streamId) {
-        const stream = this.#collection.get(streamId);
-        if (!stream) throw new Error('Stream not found');
-        return stream;
-    }
-    add(streamId, stream) {
-        this.#collection.set(streamId, stream);
-        return stream;
-    }
-    remove(streamId) {
-        this.#collection.delete(streamId);
-    }
-    abort(streamId) {
-        if (this.has(streamId)) {
-            const stream = this.get(streamId);
-            stream.abort();
-            this.remove(streamId);
-        }
-    }
-    async push(streamId, chunk) {
-        const stream = this.get(streamId);
-        return await stream.push(chunk);
-    }
-    end(streamId) {
-        const stream = this.get(streamId);
-        stream.end();
-        this.remove(streamId);
-    }
-    clear(error) {
-        if (error) {
-            for (const stream of this.#collection.values()){
-                stream.abort(error);
-            }
-        }
-        this.#collection.clear();
-    }
+	#collection = new Map();
+	has(streamId) {
+		return this.#collection.has(streamId);
+	}
+	get(streamId) {
+		const stream = this.#collection.get(streamId);
+		if (!stream) throw new Error("Stream not found");
+		return stream;
+	}
+	add(streamId, stream) {
+		this.#collection.set(streamId, stream);
+		return stream;
+	}
+	remove(streamId) {
+		this.#collection.delete(streamId);
+	}
+	abort(streamId) {
+		if (this.has(streamId)) {
+			const stream = this.get(streamId);
+			stream.abort();
+			this.remove(streamId);
+		}
+	}
+	async push(streamId, chunk) {
+		const stream = this.get(streamId);
+		return await stream.push(chunk);
+	}
+	end(streamId) {
+		const stream = this.get(streamId);
+		stream.end();
+		this.remove(streamId);
+	}
+	clear(error) {
+		if (error) {
+			for (const stream of this.#collection.values()) {
+				stream.abort(error);
+			}
+		}
+		this.#collection.clear();
+	}
 }
 export class ProtocolBaseTransformer {
-    encodeRPC(namespace, procedure, payload) {
-        return payload;
-    }
-    decodeRPC(namespace, procedure, payload) {
-        return payload;
-    }
-    decodeRPCChunk(namespace, procedure, payload) {
-        return payload;
-    }
-    decodeEvent(namespace, event, payload) {
-        return payload;
-    }
+	encodeRPC(namespace, procedure, payload) {
+		return payload;
+	}
+	decodeRPC(namespace, procedure, payload) {
+		return payload;
+	}
+	decodeRPCChunk(namespace, procedure, payload) {
+		return payload;
+	}
+	decodeEvent(namespace, event, payload) {
+		return payload;
+	}
 }
 export class ProtocolBaseClient extends EventEmitter {
-    #clientStreams;
-    #serverStreams;
-    #rpcStreams;
-    #rpcStreamData = new Map();
-    #calls = new Map();
-    #transport;
-    #format;
-    transformer = new ProtocolBaseTransformer();
-    #timeout;
-    #callId = 0;
-    #streamId = 0;
-    constructor(options){
-        super();
-        this.#transport = options.transport;
-        this.#format = options.format;
-        this.#timeout = options.timeout ?? 60000;
-        this.#clientStreams = new ProtocolClientStreams();
-        this.#serverStreams = new ProtocolServerStreams();
-        this.#rpcStreams = new ProtocolServerStreams();
-        this.#transport.on(`${ServerMessageType.Event}`, (buffer)=>{
-            const [namespace, event, payload] = this.#format.decode(buffer);
-            const name = `${namespace}/${event}`;
-            const transformed = this.transformer.decodeEvent(namespace, event, payload);
-            this.emit(name, transformed);
-        });
-        this.#transport.on(`${ServerMessageType.RpcResponse}`, (buffer)=>{
-            const { call, error, payload } = this.#handleResponse(buffer);
-            if (error) call.reject(error);
-            else call.resolve(payload);
-        });
-        this.#transport.on(`${ServerMessageType.RpcStreamResponse}`, (buffer)=>{
-            const { call, response, payload, error } = this.#handleResponse(buffer);
-            if (error) return call.reject(error);
-            console.log('Creating RPC stream', response);
-            const stream = new ProtocolServerStream();
-            this.#rpcStreams.add(response.callId, stream);
-            this.#rpcStreamData.set(response.callId, {
-                namespace: call.namespace,
-                procedure: call.procedure
-            });
-            call.resolve({
-                payload,
-                stream
-            });
-        });
-        this.#transport.on(`${ServerMessageType.RpcStreamChunk}`, async (buffer)=>{
-            const callId = decodeNumber(buffer, 'Uint32');
-            console.log('RPC stream chunk', callId);
-            const chunk = buffer.slice(Uint32Array.BYTES_PER_ELEMENT);
-            if (chunk.byteLength === 0) {
-                this.#rpcStreams.end(callId);
-                this.#rpcStreamData.delete(callId);
-            } else {
-                const call = this.#rpcStreamData.get(callId);
-                console.log('RPC stream call', call);
-                if (call) {
-                    const payload = this.#format.decode(chunk);
-                    console.log('RPC stream payload', payload);
-                    try {
-                        const transformed = this.transformer.decodeRPCChunk(call.namespace, call.procedure, payload);
-                        await this.#rpcStreams.push(callId, transformed);
-                    } catch (error) {
-                        this.#send(ClientMessageType.RpcStreamAbort, encodeNumber(callId, 'Uint32'));
-                        this.#rpcStreams.remove(callId);
-                        this.#rpcStreamData.delete(callId);
-                    }
-                }
-            }
-        });
-        this.#transport.on(`${ServerMessageType.RpcStreamAbort}`, (buffer)=>{
-            const callId = decodeNumber(buffer, 'Uint32');
-            console.log('RPC stream abort', callId);
-            const call = this.#calls.get(callId);
-            if (call) {
-                this.#serverStreams.end(callId);
-                this.#rpcStreams.abort(callId);
-            }
-        });
-        this.#transport.on(`${ServerMessageType.ServerStreamPush}`, async (buffer)=>{
-            const streamId = decodeNumber(buffer, 'Uint32');
-            const chunk = buffer.slice(Uint32Array.BYTES_PER_ELEMENT);
-            console.log('Server stream push', streamId, chunk.byteLength);
-            try {
-                await this.#serverStreams.push(streamId, chunk);
-                this.#send(ClientMessageType.ServerStreamPull, encodeNumber(streamId, 'Uint32'));
-            } catch (error) {
-                this.#send(ClientMessageType.ServerStreamAbort, encodeNumber(streamId, 'Uint32'));
-                this.#serverStreams.remove(streamId);
-            }
-        });
-        this.#transport.on(`${ServerMessageType.ServerStreamEnd}`, (buffer)=>{
-            const streamId = decodeNumber(buffer, 'Uint32');
-            console.log('Server stream end', streamId);
-            this.#serverStreams.end(streamId);
-        });
-        this.#transport.on(`${ServerMessageType.ServerStreamAbort}`, (buffer)=>{
-            const streamId = decodeNumber(buffer, 'Uint32');
-            console.log('Server stream abort', streamId);
-            this.#serverStreams.abort(streamId);
-        });
-        this.#transport.on(`${ServerMessageType.ClientStreamAbort}`, (buffer)=>{
-            const streamId = decodeNumber(buffer, 'Uint32');
-            console.log('Client stream abort', streamId);
-            this.#clientStreams.abort(streamId);
-        });
-        this.#transport.on(`${ServerMessageType.ClientStreamPull}`, async (buffer)=>{
-            const streamId = decodeNumber(buffer, 'Uint32');
-            console.log('Client stream pull', streamId);
-            const size = decodeNumber(buffer, 'Uint32', Uint32Array.BYTES_PER_ELEMENT);
-            const streamIdEncoded = encodeNumber(streamId, 'Uint32');
-            try {
-                const chunk = await this.#clientStreams.pull(streamId, size);
-                if (chunk) {
-                    this.#send(ClientMessageType.ClientStreamPush, concat(streamIdEncoded, chunk));
-                } else {
-                    this.#send(ClientMessageType.ClientStreamEnd, streamIdEncoded);
-                    this.#clientStreams.end(streamId);
-                }
-            } catch (error) {
-                console.error(error);
-                this.#send(ClientMessageType.ClientStreamAbort, streamIdEncoded);
-            }
-        });
-        this.#transport.on('disconnected', ()=>{});
-    }
-    async connect(auth) {
-        return await this.#transport.connect(auth, this.#format.contentType);
-    }
-    async disconnect() {
-        this.#clear();
-        return await this.#transport.disconnect();
-    }
-    async #send(messageType, buffer) {
-        console.log('Client transport send', ClientMessageType[messageType], buffer.byteLength);
-        return await this.#transport.send(messageType, buffer);
-    }
-    async #clear() {
-        const error = new ProtocolError(ErrorCode.ConnectionError, 'Connection closed');
-        for (const call of this.#calls.values())call.reject(error);
-        this.#calls.clear();
-        this.#serverStreams.clear(error);
-        this.#clientStreams.clear(error);
-        this.#rpcStreams.clear(error);
-        this.#callId = 0;
-        this.#streamId = 0;
-    }
-    async _call(namespace, procedure, payload, options = {}) {
-        const timeoutSignal = AbortSignal.timeout(options.timeout || this.#timeout);
-        const signal = options.signal ? AbortSignal.any([
-            options.signal,
-            timeoutSignal
-        ]) : timeoutSignal;
-        const callId = ++this.#callId;
-        const call = Object.assign(createPromise(), {
-            namespace,
-            procedure
-        });
-        const buffer = this.#format.encodeRPC({
-            callId,
-            namespace,
-            procedure,
-            payload: this.transformer.encodeRPC(namespace, procedure, payload)
-        }, {
-            addStream: (blob)=>{
-                const streamId = ++this.#streamId;
-                const stream = this.#clientStreams.add(blob.source, streamId, blob.metadata);
-                return stream;
-            },
-            getStream: (id)=>{
-                const stream = this.#clientStreams.get(id);
-                return stream;
-            }
-        });
-        this.#transport.send(ClientMessageType.Rpc, buffer).catch(console.error);
-        this.#calls.set(callId, call);
-        const onAborted = onceAborted(signal).then(()=>{
-            if (this.#calls.has(callId)) {
-                this.#send(ClientMessageType.RpcAbort, encodeNumber(callId, 'Uint32'));
-            }
-            throw new ProtocolError(ErrorCode.RequestTimeout, 'Request timeout');
-        });
-        return Promise.race([
-            call.promise,
-            onAborted
-        ]);
-    }
-    #handleResponse(buffer) {
-        const callStreams = [];
-        const response = this.#format.decodeRPC(buffer, {
-            addStream: (id, metadata)=>{
-                console.log('Client transport blob stream', id, metadata);
-                const stream = new ProtocolServerBlobStream(id, metadata, ()=>{
-                    this.#send(ClientMessageType.ServerStreamPull, encodeNumber(id, 'Uint32'));
-                });
-                callStreams.push(stream);
-                this.#serverStreams.add(id, stream);
-                return stream;
-            },
-            getStream: (id)=>{
-                return this.#serverStreams.get(id);
-            }
-        });
-        console.log('Client transport response', response);
-        const call = this.#calls.get(response.callId);
-        if (call) {
-            this.#calls.delete(response.callId);
-            if (response.error) {
-                const error = new ProtocolError(response.error.code, response.error.message, response.error.data);
-                return {
-                    call,
-                    response,
-                    error
-                };
-            } else {
-                const payload = this.transformer.decodeRPC(call.namespace, call.procedure, response.payload);
-                return {
-                    call,
-                    response,
-                    payload
-                };
-            }
-        }
-        for (const stream of callStreams){
-            this.#serverStreams.abort(stream.id);
-        }
-        throw new Error('Call not found');
-    }
+	#clientStreams;
+	#serverStreams;
+	#rpcStreams;
+	#rpcStreamData = new Map();
+	#calls = new Map();
+	#transport;
+	#format;
+	transformer = new ProtocolBaseTransformer();
+	#timeout;
+	#callId = 0;
+	#streamId = 0;
+	constructor(options) {
+		super();
+		this.#transport = options.transport;
+		this.#format = options.format;
+		this.#timeout = options.timeout ?? 6e4;
+		this.#clientStreams = new ProtocolClientStreams();
+		this.#serverStreams = new ProtocolServerStreams();
+		this.#rpcStreams = new ProtocolServerStreams();
+		this.#transport.on(`${ServerMessageType.Event}`, (buffer) => {
+			const [namespace, event, payload] = this.#format.decode(buffer);
+			const name = `${namespace}/${event}`;
+			const transformed = this.transformer.decodeEvent(namespace, event, payload);
+			this.emit(name, transformed);
+		});
+		this.#transport.on(`${ServerMessageType.RpcResponse}`, (buffer) => {
+			const { call, error, payload } = this.#handleResponse(buffer);
+			if (error) call.reject(error);
+			else call.resolve(payload);
+		});
+		this.#transport.on(`${ServerMessageType.RpcStreamResponse}`, (buffer) => {
+			const { call, response, payload, error } = this.#handleResponse(buffer);
+			if (error) return call.reject(error);
+			console.log("Creating RPC stream", response);
+			const stream = new ProtocolServerStream();
+			this.#rpcStreams.add(response.callId, stream);
+			this.#rpcStreamData.set(response.callId, {
+				namespace: call.namespace,
+				procedure: call.procedure
+			});
+			call.resolve({
+				payload,
+				stream
+			});
+		});
+		this.#transport.on(`${ServerMessageType.RpcStreamChunk}`, async (buffer) => {
+			const callId = decodeNumber(buffer, "Uint32");
+			console.log("RPC stream chunk", callId);
+			const chunk = buffer.slice(Uint32Array.BYTES_PER_ELEMENT);
+			if (chunk.byteLength === 0) {
+				this.#rpcStreams.end(callId);
+				this.#rpcStreamData.delete(callId);
+			} else {
+				const call = this.#rpcStreamData.get(callId);
+				console.log("RPC stream call", call);
+				if (call) {
+					const payload = this.#format.decode(chunk);
+					console.log("RPC stream payload", payload);
+					try {
+						const transformed = this.transformer.decodeRPCChunk(call.namespace, call.procedure, payload);
+						await this.#rpcStreams.push(callId, transformed);
+					} catch (error) {
+						this.#send(ClientMessageType.RpcStreamAbort, encodeNumber(callId, "Uint32"));
+						this.#rpcStreams.remove(callId);
+						this.#rpcStreamData.delete(callId);
+					}
+				}
+			}
+		});
+		this.#transport.on(`${ServerMessageType.RpcStreamAbort}`, (buffer) => {
+			const callId = decodeNumber(buffer, "Uint32");
+			console.log("RPC stream abort", callId);
+			const call = this.#calls.get(callId);
+			if (call) {
+				this.#serverStreams.end(callId);
+				this.#rpcStreams.abort(callId);
+			}
+		});
+		this.#transport.on(`${ServerMessageType.ServerStreamPush}`, async (buffer) => {
+			const streamId = decodeNumber(buffer, "Uint32");
+			const chunk = buffer.slice(Uint32Array.BYTES_PER_ELEMENT);
+			console.log("Server stream push", streamId, chunk.byteLength);
+			try {
+				await this.#serverStreams.push(streamId, chunk);
+				this.#send(ClientMessageType.ServerStreamPull, encodeNumber(streamId, "Uint32"));
+			} catch (error) {
+				this.#send(ClientMessageType.ServerStreamAbort, encodeNumber(streamId, "Uint32"));
+				this.#serverStreams.remove(streamId);
+			}
+		});
+		this.#transport.on(`${ServerMessageType.ServerStreamEnd}`, (buffer) => {
+			const streamId = decodeNumber(buffer, "Uint32");
+			console.log("Server stream end", streamId);
+			this.#serverStreams.end(streamId);
+		});
+		this.#transport.on(`${ServerMessageType.ServerStreamAbort}`, (buffer) => {
+			const streamId = decodeNumber(buffer, "Uint32");
+			console.log("Server stream abort", streamId);
+			this.#serverStreams.abort(streamId);
+		});
+		this.#transport.on(`${ServerMessageType.ClientStreamAbort}`, (buffer) => {
+			const streamId = decodeNumber(buffer, "Uint32");
+			console.log("Client stream abort", streamId);
+			this.#clientStreams.abort(streamId);
+		});
+		this.#transport.on(`${ServerMessageType.ClientStreamPull}`, async (buffer) => {
+			const streamId = decodeNumber(buffer, "Uint32");
+			console.log("Client stream pull", streamId);
+			const size = decodeNumber(buffer, "Uint32", Uint32Array.BYTES_PER_ELEMENT);
+			const streamIdEncoded = encodeNumber(streamId, "Uint32");
+			try {
+				const chunk = await this.#clientStreams.pull(streamId, size);
+				if (chunk) {
+					this.#send(ClientMessageType.ClientStreamPush, concat(streamIdEncoded, chunk));
+				} else {
+					this.#send(ClientMessageType.ClientStreamEnd, streamIdEncoded);
+					this.#clientStreams.end(streamId);
+				}
+			} catch (error) {
+				console.error(error);
+				this.#send(ClientMessageType.ClientStreamAbort, streamIdEncoded);
+			}
+		});
+		this.#transport.on("disconnected", () => {
+			this.#clear();
+		});
+	}
+	async connect(auth) {
+		return await this.#transport.connect(auth, this.#format.contentType);
+	}
+	async disconnect() {
+		this.#clear();
+		return await this.#transport.disconnect();
+	}
+	async #send(messageType, buffer) {
+		console.log("Client transport send", ClientMessageType[messageType], buffer.byteLength);
+		return await this.#transport.send(messageType, buffer);
+	}
+	async #clear() {
+		const error = new ProtocolError(ErrorCode.ConnectionError, "Connection closed");
+		for (const call of this.#calls.values()) call.reject(error);
+		this.#calls.clear();
+		this.#serverStreams.clear(error);
+		this.#clientStreams.clear(error);
+		this.#rpcStreams.clear(error);
+		this.#callId = 0;
+		this.#streamId = 0;
+	}
+	async _call(namespace, procedure, payload, options = {}) {
+		const timeoutSignal = AbortSignal.timeout(options.timeout || this.#timeout);
+		const signal = options.signal ? AbortSignal.any([options.signal, timeoutSignal]) : timeoutSignal;
+		const callId = ++this.#callId;
+		const call = Object.assign(createPromise(), {
+			namespace,
+			procedure
+		});
+		const buffer = this.#format.encodeRPC({
+			callId,
+			namespace,
+			procedure,
+			payload: this.transformer.encodeRPC(namespace, procedure, payload)
+		}, {
+			addStream: (blob) => {
+				const streamId = ++this.#streamId;
+				const stream = this.#clientStreams.add(blob.source, streamId, blob.metadata);
+				return stream;
+			},
+			getStream: (id) => {
+				const stream = this.#clientStreams.get(id);
+				return stream;
+			}
+		});
+		this.#transport.send(ClientMessageType.Rpc, buffer).catch(console.error);
+		this.#calls.set(callId, call);
+		const onAborted = onceAborted(signal).then(() => {
+			if (this.#calls.has(callId)) {
+				this.#send(ClientMessageType.RpcAbort, encodeNumber(callId, "Uint32"));
+			}
+			throw new ProtocolError(ErrorCode.RequestTimeout, "Request timeout");
+		});
+		return Promise.race([call.promise, onAborted]);
+	}
+	#handleResponse(buffer) {
+		const callStreams = [];
+		const response = this.#format.decodeRPC(buffer, {
+			addStream: (id, metadata) => {
+				console.log("Client transport blob stream", id, metadata);
+				const stream = new ProtocolServerBlobStream(id, metadata, () => {
+					this.#send(ClientMessageType.ServerStreamPull, encodeNumber(id, "Uint32"));
+				});
+				callStreams.push(stream);
+				this.#serverStreams.add(id, stream);
+				return stream;
+			},
+			getStream: (id) => {
+				return this.#serverStreams.get(id);
+			}
+		});
+		console.log("Client transport response", response);
+		const call = this.#calls.get(response.callId);
+		if (call) {
+			this.#calls.delete(response.callId);
+			if (response.error) {
+				const error = new ProtocolError(response.error.code, response.error.message, response.error.data);
+				return {
+					call,
+					response,
+					error
+				};
+			} else {
+				const payload = this.transformer.decodeRPC(call.namespace, call.procedure, response.payload);
+				return {
+					call,
+					response,
+					payload
+				};
+			}
+		}
+		for (const stream of callStreams) {
+			this.#serverStreams.abort(stream.id);
+		}
+		throw new Error("Call not found");
+	}
 }