@socket-mesh/server 18.1.3 → 18.1.5

package/dist/server.d.ts

@@ -1,52 +1,111 @@
-import { ServerSocket } from "./server-socket.js";
+import { AsyncStreamEmitter } from '@socket-mesh/async-stream-emitter';
+import { AuthEngine } from '@socket-mesh/auth-engine';
+import { ChannelMap } from '@socket-mesh/channels';
+import { PrivateMethodMap, PublicMethodMap, ServiceMap, StreamCleanupMode } from '@socket-mesh/core';
+import { CodecEngine } from '@socket-mesh/formatter';
+import { DemuxedConsumableStream, StreamEvent } from '@socket-mesh/stream-demux';
 import { Server as HttpServer } from 'http';
-import { CodecEngine } from "@socket-mesh/formatter";
-import { StreamCleanupMode } from "@socket-mesh/core";
-import { AuthEngine } from "@socket-mesh/auth-engine";
-import { ServerPlugin } from "./plugin/server-plugin.js";
-import { CloseEvent, ConnectionEvent, ErrorEvent, HandshakeEvent, HeadersEvent, ListeningEvent, ServerEvent, SocketAuthenticateEvent, SocketAuthStateChangeEvent, SocketBadAuthTokenEvent, SocketCloseEvent, SocketConnectEvent, SocketConnectingEvent, SocketDeauthenticateEvent, SocketDisconnectEvent, SocketErrorEvent, SocketMessageEvent, SocketPingEvent, SocketPongEvent, SocketRemoveAuthTokenEvent, SocketRequestEvent, SocketResponseEvent, SocketSubscribeEvent, SocketSubscribeFailEvent, SocketSubscribeStateChangeEvent, SocketUnsubscribeEvent, WarningEvent } from "./server-event.js";
-import { AsyncStreamEmitter } from "@socket-mesh/async-stream-emitter";
-import { DemuxedConsumableStream, StreamEvent } from "@socket-mesh/stream-demux";
-import { ServerOptions } from "./server-options.js";
-import { ServerMap } from "./maps/server-map.js";
-import { Broker } from "./broker/broker.js";
-import { Exchange } from "./broker/exchange.js";
-export declare class Server<T extends ServerMap> extends AsyncStreamEmitter<ServerEvent<T>> {
+import { Broker } from './broker/broker.js';
+import { Exchange } from './broker/exchange.js';
+import { CloseEvent, ConnectionEvent, ErrorEvent, HandshakeEvent, HeadersEvent, ListeningEvent, ServerEvent, SocketAuthenticateEvent, SocketAuthStateChangeEvent, SocketBadAuthTokenEvent, SocketCloseEvent, SocketConnectEvent, SocketConnectingEvent, SocketDeauthenticateEvent, SocketDisconnectEvent, SocketErrorEvent, SocketMessageEvent, SocketPingEvent, SocketPongEvent, SocketRemoveAuthTokenEvent, SocketRequestEvent, SocketResponseEvent, SocketSubscribeEvent, SocketSubscribeFailEvent, SocketSubscribeStateChangeEvent, SocketUnsubscribeEvent, WarningEvent } from './events/index.js';
+import { ServerPlugin } from './plugin/server-plugin.js';
+import { ServerOptions } from './server-options.js';
+import { ServerSocket } from './server-socket.js';
+export declare class Server<TIncoming extends PublicMethodMap = {}, TChannel extends ChannelMap = {}, TService extends ServiceMap = {}, TOutgoing extends PublicMethodMap = {}, TPrivateIncoming extends PrivateMethodMap = {}, TPrivateOutgoing extends PrivateMethodMap = {}, TServerState extends object = {}, TState extends object = {}> extends AsyncStreamEmitter<ServerEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>> {
     private readonly _callIdGenerator;
-    private readonly _wss;
-    private _isReady;
+    private _handlers;
     private _isListening;
+    private _isReady;
     private _pingIntervalRef;
-    private _handlers;
+    private readonly _wss;
     ackTimeoutMs: number;
     allowClientPublish: boolean;
-    pingIntervalMs: number;
-    isPingTimeoutDisabled: boolean;
-    origins: string;
-    pingTimeoutMs: number;
-    socketChannelLimit?: number;
-    strictHandshake: boolean;
     readonly auth: AuthEngine;
-    readonly brokerEngine: Broker<T['Channel']>;
+    readonly brokerEngine: Broker<TChannel>;
+    clientCount: number;
     readonly clients: {
-        [id: string]: ServerSocket<T>;
+        [id: string]: ServerSocket<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
     };
-    clientCount: number;
     readonly codecEngine: CodecEngine;
+    readonly httpServer: HttpServer;
+    isPingTimeoutDisabled: boolean;
+    origins: string;
+    pendingClientCount: number;
     readonly pendingClients: {
-        [id: string]: ServerSocket<T>;
+        [id: string]: ServerSocket<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
     };
-    pendingClientCount: number;
+    pingIntervalMs: number;
+    pingTimeoutMs: number;
+    readonly plugins: ServerPlugin<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>[];
+    socketChannelLimit?: number;
     readonly socketStreamCleanupMode: StreamCleanupMode;
-    readonly httpServer: HttpServer;
-    readonly plugins: ServerPlugin<T>[];
-    constructor(options?: ServerOptions<T>);
-    addPlugin(...plugin: ServerPlugin<T>[]): void;
+    strictHandshake: boolean;
+    constructor(options?: ServerOptions<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>);
+    addPlugin(...plugin: ServerPlugin<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>[]): void;
     private bind;
     close(keepSocketsOpen?: boolean): Promise<void>;
-    get exchange(): Exchange<T['Channel']>;
+    emit(event: 'close', data: CloseEvent): void;
+    emit(event: 'connection', data: ConnectionEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'error', data: ErrorEvent): void;
+    emit(event: 'headers', data: HeadersEvent): void;
+    emit(event: 'handshake', data: HandshakeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'listening', data: ListeningEvent): void;
+    emit(event: 'ready', data: {}): void;
+    emit(event: 'socketAuthStateChange', data: SocketAuthStateChangeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketAuthenticate', data: SocketAuthenticateEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketBadAuthToken', data: SocketBadAuthTokenEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketClose', data: SocketCloseEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketConnect', data: SocketConnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketConnectAbort', data: SocketDisconnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketConnecting', data: SocketConnectingEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketDeauthenticate', data: SocketDeauthenticateEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketDisconnect', data: SocketDisconnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketError', data: SocketErrorEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketMessage', data: SocketMessageEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketPing', data: SocketPingEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketPong', data: SocketPongEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketRemoveAuthToken', data: SocketRemoveAuthTokenEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketRequest', data: SocketRequestEvent<TService, TIncoming, TPrivateIncoming>): void;
+    emit(event: 'socketResponse', data: SocketResponseEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketSubscribe', data: SocketSubscribeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketSubscribeFail', data: SocketSubscribeFailEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketSubscribeRequest', data: SocketSubscribeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketSubscribeStateChange', data: SocketSubscribeStateChangeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'socketUnsubscribe', data: SocketUnsubscribeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>): void;
+    emit(event: 'warning', data: WarningEvent): void;
+    get exchange(): Exchange<TChannel>;
     get isListening(): boolean;
     get isReady(): boolean;
+    listen(): DemuxedConsumableStream<StreamEvent<ServerEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>>;
+    listen(event: 'close'): DemuxedConsumableStream<CloseEvent>;
+    listen(event: 'connection'): DemuxedConsumableStream<ConnectionEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'error'): DemuxedConsumableStream<ErrorEvent>;
+    listen(event: 'handshake'): DemuxedConsumableStream<HandshakeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'headers'): DemuxedConsumableStream<HeadersEvent>;
+    listen(event: 'listening'): DemuxedConsumableStream<ListeningEvent>;
+    listen(event: 'ready'): DemuxedConsumableStream<{}>;
+    listen(event: 'socketAuthStateChange'): DemuxedConsumableStream<SocketAuthStateChangeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketAuthenticate'): DemuxedConsumableStream<SocketAuthenticateEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketBadAuthToken'): DemuxedConsumableStream<SocketBadAuthTokenEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketClose'): DemuxedConsumableStream<SocketCloseEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketConnect'): DemuxedConsumableStream<SocketConnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketConnectAbort'): DemuxedConsumableStream<SocketDisconnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketConnecting'): DemuxedConsumableStream<SocketConnectingEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketDeauthenticate'): DemuxedConsumableStream<SocketDeauthenticateEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketDisconnect'): DemuxedConsumableStream<SocketDisconnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketError'): DemuxedConsumableStream<SocketErrorEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketMessage'): DemuxedConsumableStream<SocketMessageEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketPing'): DemuxedConsumableStream<SocketPingEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketPong'): DemuxedConsumableStream<SocketPongEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketRemoveAuthToken'): DemuxedConsumableStream<SocketRemoveAuthTokenEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketRequest'): DemuxedConsumableStream<SocketRequestEvent<TService, TIncoming, TPrivateIncoming>>;
+    listen(event: 'socketResponse'): DemuxedConsumableStream<SocketResponseEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketSubscribe'): DemuxedConsumableStream<SocketSubscribeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketSubscribeFail'): DemuxedConsumableStream<SocketSubscribeFailEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketSubscribeRequest'): DemuxedConsumableStream<SocketSubscribeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketSubscribeStateChange'): DemuxedConsumableStream<SocketSubscribeStateChangeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'socketUnsubscribe'): DemuxedConsumableStream<SocketUnsubscribeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;
+    listen(event: 'warning'): DemuxedConsumableStream<WarningEvent>;
     private onClose;
     private onConnection;
     private onError;
@@ -57,63 +116,4 @@ export declare class Server<T extends ServerMap> extends AsyncStreamEmitter<Serv
     private startPinging;
     private stopPinging;
     private verifyClient;
-    emit(event: "close", data: CloseEvent): void;
-    emit(event: "connection", data: ConnectionEvent<T>): void;
-    emit(event: "error", data: ErrorEvent): void;
-    emit(event: "headers", data: HeadersEvent): void;
-    emit(event: "handshake", data: HandshakeEvent<T>): void;
-    emit(event: "listening", data: ListeningEvent): void;
-    emit(event: "ready", data: {}): void;
-    emit(event: 'socketAuthStateChange', data: SocketAuthStateChangeEvent<T>): void;
-    emit(event: 'socketAuthenticate', data: SocketAuthenticateEvent<T>): void;
-    emit(event: 'socketBadAuthToken', data: SocketBadAuthTokenEvent<T>): void;
-    emit(event: 'socketClose', data: SocketCloseEvent<T>): void;
-    emit(event: 'socketConnect', data: SocketConnectEvent<T>): void;
-    emit(event: 'socketConnectAbort', data: SocketDisconnectEvent<T>): void;
-    emit(event: 'socketConnecting', data: SocketConnectingEvent<T>): void;
-    emit(event: 'socketDeauthenticate', data: SocketDeauthenticateEvent<T>): void;
-    emit(event: 'socketDisconnect', data: SocketDisconnectEvent<T>): void;
-    emit(event: 'socketError', data: SocketErrorEvent<T>): void;
-    emit(event: 'socketMessage', data: SocketMessageEvent<T>): void;
-    emit(event: 'socketPing', data: SocketPingEvent<T>): void;
-    emit(event: 'socketPong', data: SocketPongEvent<T>): void;
-    emit(event: 'socketRemoveAuthToken', data: SocketRemoveAuthTokenEvent<T>): void;
-    emit(event: 'socketRequest', data: SocketRequestEvent<T>): void;
-    emit(event: 'socketResponse', data: SocketResponseEvent<T>): void;
-    emit(event: 'socketSubscribe', data: SocketSubscribeEvent<T>): void;
-    emit(event: 'socketSubscribeFail', data: SocketSubscribeFailEvent<T>): void;
-    emit(event: 'socketSubscribeRequest', data: SocketSubscribeEvent<T>): void;
-    emit(event: 'socketSubscribeStateChange', data: SocketSubscribeStateChangeEvent<T>): void;
-    emit(event: 'socketUnsubscribe', data: SocketUnsubscribeEvent<T>): void;
-    emit(event: "warning", data: WarningEvent): void;
-    listen(): DemuxedConsumableStream<StreamEvent<ServerEvent<T>>>;
-    listen(event: "close"): DemuxedConsumableStream<CloseEvent>;
-    listen(event: "connection"): DemuxedConsumableStream<ConnectionEvent<T>>;
-    listen(event: "error"): DemuxedConsumableStream<ErrorEvent>;
-    listen(event: "handshake"): DemuxedConsumableStream<HandshakeEvent<T>>;
-    listen(event: "headers"): DemuxedConsumableStream<HeadersEvent>;
-    listen(event: "listening"): DemuxedConsumableStream<ListeningEvent>;
-    listen(event: "ready"): DemuxedConsumableStream<{}>;
-    listen(event: 'socketAuthStateChange'): DemuxedConsumableStream<SocketAuthStateChangeEvent<T>>;
-    listen(event: 'socketAuthenticate'): DemuxedConsumableStream<SocketAuthenticateEvent<T>>;
-    listen(event: 'socketBadAuthToken'): DemuxedConsumableStream<SocketBadAuthTokenEvent<T>>;
-    listen(event: 'socketClose'): DemuxedConsumableStream<SocketCloseEvent<T>>;
-    listen(event: 'socketConnect'): DemuxedConsumableStream<SocketConnectEvent<T>>;
-    listen(event: 'socketConnectAbort'): DemuxedConsumableStream<SocketDisconnectEvent<T>>;
-    listen(event: 'socketConnecting'): DemuxedConsumableStream<SocketConnectingEvent<T>>;
-    listen(event: 'socketDeauthenticate'): DemuxedConsumableStream<SocketDeauthenticateEvent<T>>;
-    listen(event: 'socketDisconnect'): DemuxedConsumableStream<SocketDisconnectEvent<T>>;
-    listen(event: 'socketError'): DemuxedConsumableStream<SocketErrorEvent<T>>;
-    listen(event: 'socketMessage'): DemuxedConsumableStream<SocketMessageEvent<T>>;
-    listen(event: 'socketPing'): DemuxedConsumableStream<SocketPingEvent<T>>;
-    listen(event: 'socketPong'): DemuxedConsumableStream<SocketPongEvent<T>>;
-    listen(event: 'socketRemoveAuthToken'): DemuxedConsumableStream<SocketRemoveAuthTokenEvent<T>>;
-    listen(event: 'socketRequest'): DemuxedConsumableStream<SocketRequestEvent<T>>;
-    listen(event: 'socketResponse'): DemuxedConsumableStream<SocketResponseEvent<T>>;
-    listen(event: 'socketSubscribe'): DemuxedConsumableStream<SocketSubscribeEvent<T>>;
-    listen(event: 'socketSubscribeFail'): DemuxedConsumableStream<SocketSubscribeFailEvent<T>>;
-    listen(event: 'socketSubscribeRequest'): DemuxedConsumableStream<SocketSubscribeEvent<T>>;
-    listen(event: 'socketSubscribeStateChange'): DemuxedConsumableStream<SocketSubscribeStateChangeEvent<T>>;
-    listen(event: 'socketUnsubscribe'): DemuxedConsumableStream<SocketUnsubscribeEvent<T>>;
-    listen(event: "warning"): DemuxedConsumableStream<WarningEvent>;
 }

package/dist/server.js

@@ -1,17 +1,42 @@
-import ws from "ws";
-import { ServerProtocolError } from "@socket-mesh/errors";
-import { ServerSocket } from "./server-socket.js";
-import defaultCodec from "@socket-mesh/formatter";
-import { removeAuthTokenHandler } from "@socket-mesh/client";
-import { defaultAuthEngine, isAuthEngine } from "@socket-mesh/auth-engine";
-import { handshakeHandler } from "./handlers/handshake.js";
-import { authenticateHandler } from "./handlers/authenticate.js";
-import { AsyncStreamEmitter } from "@socket-mesh/async-stream-emitter";
-import { subscribeHandler } from "./handlers/subscribe.js";
-import { unsubscribeHandler } from "./handlers/unsubscribe.js";
-import { SimpleBroker } from "./broker/simple-broker.js";
-import { publishHandler } from "./handlers/publish.js";
+import { AsyncStreamEmitter } from '@socket-mesh/async-stream-emitter';
+import { defaultAuthEngine, isAuthEngine } from '@socket-mesh/auth-engine';
+import { removeAuthTokenHandler } from '@socket-mesh/client';
+import { ServerProtocolError } from '@socket-mesh/errors';
+import defaultCodec from '@socket-mesh/formatter';
+import { WebSocketServer } from 'ws';
+import { SimpleBroker } from './broker/simple-broker.js';
+import { authenticateHandler } from './handlers/authenticate.js';
+import { handshakeHandler } from './handlers/handshake.js';
+import { publishHandler } from './handlers/publish.js';
+import { subscribeHandler } from './handlers/subscribe.js';
+import { unsubscribeHandler } from './handlers/unsubscribe.js';
+import { ServerSocket } from './server-socket.js';
 export class Server extends AsyncStreamEmitter {
+    _callIdGenerator;
+    _handlers;
+    _isListening;
+    _isReady;
+    _pingIntervalRef;
+    _wss;
+    // | ServerSocket<TIncomingMap, TServiceMap, TOutgoingMap, TPrivateIncomingMap, TPrivateOutgoingMap, TServerState, TSocketState>
+    ackTimeoutMs;
+    allowClientPublish;
+    auth;
+    brokerEngine;
+    clientCount;
+    clients;
+    codecEngine;
+    httpServer;
+    isPingTimeoutDisabled;
+    origins;
+    pendingClientCount;
+    pendingClients;
+    pingIntervalMs;
+    pingTimeoutMs;
+    plugins;
+    socketChannelLimit;
+    socketStreamCleanupMode;
+    strictHandshake;
     constructor(options) {
         super();
         let cid = 1;
@@ -30,12 +55,12 @@ export class Server extends AsyncStreamEmitter {
         this.clientCount = 0;
         this.codecEngine = options.codecEngine || defaultCodec;
         this._handlers = Object.assign({
-            "#authenticate": authenticateHandler,
-            "#handshake": handshakeHandler,
-            "#publish": publishHandler,
-            "#removeAuthToken": removeAuthTokenHandler,
-            "#subscribe": subscribeHandler,
-            "#unsubscribe": unsubscribeHandler
+            '#authenticate': authenticateHandler,
+            '#handshake': handshakeHandler,
+            '#publish': publishHandler,
+            '#removeAuthToken': removeAuthTokenHandler,
+            '#subscribe': subscribeHandler,
+            '#unsubscribe': unsubscribeHandler
         }, options.handlers);
         this.httpServer = options.server;
         this.plugins = options.plugins || [];
@@ -49,14 +74,14 @@ export class Server extends AsyncStreamEmitter {
         this.socketStreamCleanupMode = options.socketStreamCleanupMode || 'kill';
         this.strictHandshake = options.strictHandshake ?? true;
         options.verifyClient = this.verifyClient.bind(this);
-        this._wss = new ws.WebSocketServer(options);
+        this._wss = new WebSocketServer(options);
         this._wss.on('close', this.onClose.bind(this));
         this._wss.on('connection', this.onConnection.bind(this));
         this._wss.on('error', this.onError.bind(this));
         this._wss.on('headers', this.onHeaders.bind(this));
         this._wss.on('listening', this.onListening.bind(this));
         (async () => {
-            for await (let { error } of this.brokerEngine.listen('error')) {
+            for await (const { error } of this.brokerEngine.listen('error')) {
                 this.emit('warning', { warning: error });
             }
         })();
@@ -80,34 +105,34 @@ export class Server extends AsyncStreamEmitter {
     }
     bind(socket) {
         /*
-                if (socket.type === 'client') {
-                    (async () => {
-                        for await (let event of socket.listen()) {
-                            this.emit(
-                                `socket${event.stream[0].toUpperCase()}${event.stream.substring(1)}` as any,
-                                Object.assign(
-                                    { socket },
-                                    event.value
-                                )
-                            );
-                        }
-                    })();
-            
-                    (async () => {
-                        for await (let event of socket.channels.listen()) {
-                            this.emit(
-                                `socket${event.stream[0].toUpperCase()}${event.stream.substring(1)}` as any,
-                                Object.assign(
-                                    { socket },
-                                    event.value
-                                )
-                            );
-                        }
-                    })();
+        if (socket.type === 'client') {
+            (async () => {
+                for await (let event of socket.listen()) {
+                    this.emit(
+                        `socket${event.stream[0].toUpperCase()}${event.stream.substring(1)}` as any,
+                        Object.assign(
+                            { socket },
+                            event.value
+                        )
+                    );
+                }
+            })();
+
+            (async () => {
+                for await (let event of socket.channels.listen()) {
+                    this.emit(
+                        `socket${event.stream[0].toUpperCase()}${event.stream.substring(1)}` as any,
+                        Object.assign(
+                            { socket },
+                            event.value
+                        )
+                    );
                 }
-        */
+            })();
+        }
+*/
         (async () => {
-            for await (let {} of socket.listen('connect')) {
+            for await (const _ of socket.listen('connect')) {
                 if (this.pendingClients[socket.id]) {
                     delete this.pendingClients[socket.id];
                     this.pendingClientCount--;
@@ -118,12 +143,12 @@ export class Server extends AsyncStreamEmitter {
             }
         })();
         (async () => {
-            for await (let {} of socket.listen('connectAbort')) {
+            for await (const _ of socket.listen('connectAbort')) {
                 this.socketDisconnected(socket);
             }
         })();
         (async () => {
-            for await (let {} of socket.listen('disconnect')) {
+            for await (const _ of socket.listen('disconnect')) {
                 this.socketDisconnected(socket);
             }
         })();
@@ -139,12 +164,15 @@ export class Server extends AsyncStreamEmitter {
                 resolve();
             });
             if (!keepSocketsOpen) {
-                for (let socket of Object.values(this.clients)) {
+                for (const socket of Object.values(this.clients)) {
                     socket.disconnect();
                 }
             }
         });
     }
+    emit(event, data) {
+        super.emit(event, data);
+    }
     get exchange() {
         return this.brokerEngine.exchange;
     }
@@ -154,32 +182,35 @@ export class Server extends AsyncStreamEmitter {
     get isReady() {
         return this._isReady;
     }
+    listen(event) {
+        return event ? super.listen(event) : super.listen();
+    }
     onClose(code, reason) {
         this.emit('close', {});
     }
     onConnection(wsSocket, upgradeReq) {
         /*
-                if (!wsSocket.upgradeReq) {
-                    // Normalize ws modules to match.
-                    wsSocket.upgradeReq = upgradeReq;
-                }
-        */
+        if (!wsSocket.upgradeReq) {
+            // Normalize ws modules to match.
+            wsSocket.upgradeReq = upgradeReq;
+        }
+*/
         const socket = new ServerSocket({
             ackTimeoutMs: this.ackTimeoutMs,
             callIdGenerator: this._callIdGenerator,
             codecEngine: this.codecEngine,
             handlers: this._handlers,
-            plugins: this.plugins,
             onUnhandledRequest: this.onUnhandledRequest.bind(this),
+            plugins: this.plugins,
             request: upgradeReq,
-            socket: wsSocket,
             server: this,
+            socket: wsSocket,
             state: {},
             streamCleanupMode: this.socketStreamCleanupMode
         });
         this.pendingClientCount++;
         this.bind(this.pendingClients[socket.id] = socket);
-        //		ws.on('error', console.error);
+        // ws.on('error', console.error);
         this.emit('connection', { socket, upgradeReq });
         // Emit event to signal that a socket handshake has been initiated.
         this.emit('handshake', { socket });
@@ -200,11 +231,11 @@ export class Server extends AsyncStreamEmitter {
     onUnhandledRequest(socket, packet) {
     }
     socketDisconnected(socket) {
-        if (!!this.pendingClients[socket.id]) {
+        if (this.pendingClients[socket.id]) {
             delete this.pendingClients[socket.id];
             this.pendingClientCount--;
         }
-        if (!!this.clients[socket.id]) {
+        if (this.clients[socket.id]) {
             delete this.clients[socket.id];
             this.clientCount--;
         }
@@ -218,7 +249,7 @@ export class Server extends AsyncStreamEmitter {
                 for (const id in this.clients) {
                     this.clients[id]
                         .ping()
-                        .catch(err => {
+                        .catch((err) => {
                         this.onError(err);
                     });
                 }
@@ -237,16 +268,18 @@ export class Server extends AsyncStreamEmitter {
                 info.origin = '*';
             }
             if (this.origins.indexOf('*:*') === -1) {
-                let ok = false;
+                let isOk = false;
                 try {
                     const url = new URL(info.origin);
                     url.port = url.port || (url.protocol === 'https:' ? '443' : '80');
-                    ok = !!(~this.origins.indexOf(url.hostname + ':' + url.port) ||
-                        ~this.origins.indexOf(url.hostname + ':*') ||
-                        ~this.origins.indexOf('*:' + url.port));
+                    isOk = !!(~this.origins.indexOf(url.hostname + ':' + url.port)
+                        || ~this.origins.indexOf(url.hostname + ':*')
+                        || ~this.origins.indexOf('*:' + url.port));
+                }
+                catch (e) {
+                    // Intentional
                 }
-                catch (e) { }
-                if (!ok) {
+                if (!isOk) {
                     const error = new ServerProtocolError(`Failed to authorize socket handshake - Invalid origin: ${info.origin}`);
                     this.emit('warning', { warning: error });
                     callback(false, 403, error.message);
@@ -272,10 +305,4 @@ export class Server extends AsyncStreamEmitter {
             callback(false, 403, typeof err === 'string' ? err : err.message);
         }
     }
-    emit(event, data) {
-        super.emit(event, data);
-    }
-    listen(event) {
-        return super.listen(event);
-    }
 }

package/package.json

@@ -1,43 +1,72 @@
 {
 	"name": "@socket-mesh/server",
 	"description": "A TCP socket pair for easily transmitting full messages without worrying about request size limits.",
-	"version": "18.1.3",
-  "type": "module",
-  "main": "dist/index.js",
+	"version": "18.1.5",
+	"type": "module",
+	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"files": ["./dist"],
+	"exports": {
+		".": {
+			"types": "./dist/index.d.ts",
+			"import": "./dist/index.js",
+			"default": "./dist/index.js"
+		},
+		"./broker": {
+			"types": "./dist/broker/index.d.ts",
+			"import": "./dist/broker/index.js",
+			"default": "./dist/broker/index.js"
+		},
+		"./events": {
+			"types": "./dist/events/index.d.ts",
+			"import": "./dist/events/index.js",
+			"default": "./dist/events/index.js"
+		},
+		"./handlers": {
+			"types": "./dist/handlers/index.d.ts",
+			"import": "./dist/handlers/index.js",
+			"default": "./dist/handlers/index.js"
+		}
+	},
 	"author": {
 		"name": "Greg Kimmy"
 	},
 	"scripts": {
-    "build": "node ../../scripts/build.mjs && tsc --project tsconfig.build.json",
-    "deploy": "npm run build && node ../../scripts/publish.mjs",
-		"test": "cross-env node --test --import=./run-test.js test/server-test.ts"
+		"build": "node ../../scripts/build.mjs && tsc --project tsconfig.build.json",
+		"deploy": "node ../../scripts/publish.mjs",
+		"lint": "eslint . --c ../../eslint.config.mjs",
+		"lint:fix": "eslint . --c ../../eslint.config.mjs --fix",
+		"test": "tsx --tsconfig ./tsconfig.build.json --test ./src/**/*.{spec,test}.ts ./test/**/*.{spec,test}.ts"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/socket-mesh/client-server.git"
 	},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/socket-mesh/client-server.git"
-  },
-  "bugs": {
+	"bugs": {
 		"url": "https://github.com/socket-mesh/client-server/labels/server"
-  },	
+	},	
 	"devDependencies": {
-		"@socket-mesh/local-storage": "^1.0.2",
-		"@types/base64id": "^2.0.2",
-		"@types/jsonwebtoken": "^9.0.6",
-		"@types/ws": "^8.5.10"
+		"@socket-mesh/local-storage": "workspace:^",
+		"@socket-mesh/typescript-config": "workspace:^",
+		"@types/base64id": "catalog:base64id",
+		"@types/jsonwebtoken": "catalog:json-web-token",
+		"@types/ws": "catalog:ws"
 	},
 	"dependencies": {
-		"@socket-mesh/async-stream-emitter": "^7.1.2",
-		"@socket-mesh/auth": "^2.2.0",
-		"@socket-mesh/auth-engine": "^1.0.0",
-		"@socket-mesh/client": "^18.1.4",
-		"@socket-mesh/errors": "^3.2.0",
-		"@socket-mesh/formatter": "^4.1.0",
-		"base64id": "^2.0.0",
-		"events": "^3.3.0",
-		"jsonwebtoken": "^9.0.2",
-		"ws": "^8.18.0"
+		"@socket-mesh/async-stream-emitter": "workspace:^",
+		"@socket-mesh/auth": "workspace:^",
+		"@socket-mesh/auth-engine": "workspace:^",
+		"@socket-mesh/channels": "workspace:^",
+		"@socket-mesh/client": "workspace:^",
+		"@socket-mesh/core": "workspace:^",
+		"@socket-mesh/errors": "workspace:^",
+		"@socket-mesh/formatter": "workspace:^",
+		"@socket-mesh/stream-demux": "workspace:^",
+		"@socket-mesh/writable-consumable-stream": "workspace:^",
+		"base64id": "catalog:base64id",
+		"events": "catalog:",
+		"jsonwebtoken": "catalog:json-web-token",
+		"ws": "catalog:ws"
 	},
 	"keywords": [
 		"ncom",

package/dist/maps/client-map.d.ts

@@ -1,10 +0,0 @@
-import { PublicMethodMap } from "@socket-mesh/core";
-import { ServerMap } from "./server-map.js";
-export interface ClientMapFromServer<T extends ServerMap> {
-    Channel: T['Channel'];
-    Incoming: T['Outgoing'] & T['PrivateOutgoing'];
-    Service: T['Service'];
-    Outgoing: PublicMethodMap;
-    PrivateOutgoing: T['PrivateIncoming'];
-    State: object;
-}

package/dist/maps/server-map.d.ts

@@ -1,24 +0,0 @@
-import { ChannelMap } from "@socket-mesh/channels";
-import { ClientPrivateMap, ServerPrivateMap } from "@socket-mesh/client";
-import { PrivateMethodMap, PublicMethodMap, ServiceMap } from "@socket-mesh/core";
-import { ServerSocketState } from "../server-socket-state.js";
-export interface ServerMap {
-    Channel: ChannelMap;
-    Service: ServiceMap;
-    Incoming: PublicMethodMap;
-    Outgoing: PublicMethodMap;
-    PrivateIncoming: PrivateMethodMap;
-    PrivateOutgoing: PrivateMethodMap;
-    ServerState: object;
-    State: object;
-}
-export interface BasicServerMap<TIncoming extends PublicMethodMap = {}, TChannels extends ChannelMap = {}, TState extends object = {}, TOutgoing extends object = {}> {
-    Channel: TChannels;
-    Service: {};
-    Incoming: TIncoming;
-    Outgoing: TOutgoing;
-    PrivateIncoming: ServerPrivateMap;
-    PrivateOutgoing: ClientPrivateMap;
-    ServerState: {};
-    State: TState & ServerSocketState;
-}