@socket-mesh/server 18.1.3 → 18.1.5

package/dist/broker/broker-events.d.ts

@@ -2,6 +2,10 @@ export type BrokerEvent<T> = ErrorEvent | PublishEvent<T> | ReadyEvent | Subscri
 export interface ErrorEvent {
     error: Error;
 }
+export interface PublishEvent<T> {
+    channel: string;
+    data: T;
+}
 export interface ReadyEvent {
 }
 export interface SubscribeEvent {
@@ -10,7 +14,3 @@ export interface SubscribeEvent {
 export interface UnsubscribeEvent {
     channel: string;
 }
-export interface PublishEvent<T> {
-    channel: string;
-    data: T;
-}

package/dist/broker/broker.d.ts

@@ -1,10 +1,11 @@
-import { AsyncStreamEmitter } from "@socket-mesh/async-stream-emitter";
-import { DemuxedConsumableStream, StreamEvent } from "@socket-mesh/stream-demux";
-import { BrokerEvent, ErrorEvent, PublishEvent, ReadyEvent, SubscribeEvent, UnsubscribeEvent } from "./broker-events.js";
-import { ChannelMap } from "@socket-mesh/channels";
-import { Exchange } from "./exchange.js";
-import { ExchangeClient } from "./exchange-client.js";
+import { AsyncStreamEmitter } from '@socket-mesh/async-stream-emitter';
+import { ChannelMap } from '@socket-mesh/channels';
+import { DemuxedConsumableStream, StreamEvent } from '@socket-mesh/stream-demux';
+import { BrokerEvent, ErrorEvent, PublishEvent, ReadyEvent, SubscribeEvent, UnsubscribeEvent } from './broker-events.js';
+import { ExchangeClient } from './exchange-client.js';
+import { Exchange } from './exchange.js';
 export declare abstract class Broker<T extends ChannelMap> extends AsyncStreamEmitter<BrokerEvent<T[keyof T]>> {
+    abstract readonly exchange: Exchange<T>;
     isReady: boolean;
     constructor();
     emit(event: 'error', data: ErrorEvent): void;
@@ -12,17 +13,16 @@ export declare abstract class Broker<T extends ChannelMap> extends AsyncStreamEm
     emit(event: 'ready', data: ReadyEvent): void;
     emit(event: 'subscribe', data: SubscribeEvent): void;
     emit(event: 'unsubscribe', data: UnsubscribeEvent): void;
+    abstract invokePublish<U extends keyof T & string>(channelName: U, data: T[U], suppressEvent?: boolean): Promise<void>;
+    abstract isSubscribed(channelName: string): boolean;
     listen(): DemuxedConsumableStream<StreamEvent<BrokerEvent<T[keyof T]>>>;
     listen(event: 'ready'): DemuxedConsumableStream<ReadyEvent>;
     listen(event: 'publish'): DemuxedConsumableStream<PublishEvent<T[keyof T]>>;
     listen(event: 'error'): DemuxedConsumableStream<ErrorEvent>;
     listen(event: 'subscribe'): DemuxedConsumableStream<SubscribeEvent>;
     listen(event: 'unsubscribe'): DemuxedConsumableStream<UnsubscribeEvent>;
-    abstract readonly exchange: Exchange<T>;
     abstract subscribe(socket: ExchangeClient, channelName: string): Promise<void>;
     abstract subscriptions(): string[];
-    abstract isSubscribed(channelName: string): boolean;
-    abstract unsubscribe(socket: ExchangeClient, channelName: string): Promise<void>;
     abstract transmitPublish<U extends keyof T & string>(channelName: U, data: T[U], suppressEvent?: boolean): Promise<void>;
-    abstract invokePublish<U extends keyof T & string>(channelName: U, data: T[U], suppressEvent?: boolean): Promise<void>;
+    abstract unsubscribe(socket: ExchangeClient, channelName: string): Promise<void>;
 }

package/dist/broker/broker.js

@@ -1,5 +1,6 @@
-import { AsyncStreamEmitter } from "@socket-mesh/async-stream-emitter";
+import { AsyncStreamEmitter } from '@socket-mesh/async-stream-emitter';
 export class Broker extends AsyncStreamEmitter {
+    isReady;
     constructor() {
         super();
         this.isReady = false;

package/dist/broker/exchange-client.d.ts

@@ -1,4 +1,4 @@
-import { PublishOptions } from "@socket-mesh/channels";
+import { PublishOptions } from '@socket-mesh/channels';
 export interface ExchangeClient {
     id: string;
     transmit(event: '#publish', options: PublishOptions): Promise<void>;

package/dist/broker/exchange.d.ts

@@ -1,4 +1,4 @@
-import { ChannelMap, Channels } from "@socket-mesh/channels";
+import { ChannelMap, Channels } from '@socket-mesh/channels';
 export declare abstract class Exchange<T extends ChannelMap> extends Channels<T> {
     id: string;
 }

package/dist/broker/exchange.js

@@ -1,3 +1,4 @@
-import { Channels } from "@socket-mesh/channels";
+import { Channels } from '@socket-mesh/channels';
 export class Exchange extends Channels {
+    id;
 }

package/dist/broker/index.d.ts

@@ -0,0 +1,5 @@
+export * from './broker-events.js';
+export * from './broker.js';
+export * from './exchange-client.js';
+export * from './simple-broker.js';
+export * from './simple-exchange.js';

package/dist/broker/index.js

@@ -0,0 +1,5 @@
+export * from './broker-events.js';
+export * from './broker.js';
+export * from './exchange-client.js';
+export * from './simple-broker.js';
+export * from './simple-exchange.js';

package/dist/broker/simple-broker.d.ts

@@ -1,16 +1,16 @@
-import { Broker } from "./broker.js";
-import { ChannelMap } from "@socket-mesh/channels";
-import { SimpleExchange } from "./simple-exchange.js";
-import { ExchangeClient } from "./exchange-client.js";
+import { ChannelMap } from '@socket-mesh/channels';
+import { Broker } from './broker.js';
+import { ExchangeClient } from './exchange-client.js';
+import { SimpleExchange } from './simple-exchange.js';
 export declare class SimpleBroker<T extends ChannelMap> extends Broker<T> {
-    readonly exchange: SimpleExchange<T>;
     private readonly _clientSubscribers;
     private readonly _clientSubscribersCounter;
+    readonly exchange: SimpleExchange<T>;
     constructor();
+    invokePublish<U extends keyof T & string>(channelName: U, data: T[U], suppressEvent?: boolean): Promise<void>;
+    isSubscribed(channelName: string): boolean;
     subscribe(client: ExchangeClient, channelName: string): Promise<void>;
-    unsubscribe(client: ExchangeClient, channelName: string): Promise<void>;
     subscriptions(): string[];
-    isSubscribed(channelName: string): boolean;
-    invokePublish<U extends keyof T & string>(channelName: U, data: T[U], suppressEvent?: boolean): Promise<void>;
     transmitPublish<U extends keyof T & string>(channelName: U, data: T[U], suppressEvent?: boolean): Promise<void>;
+    unsubscribe(client: ExchangeClient, channelName: string): Promise<void>;
 }

package/dist/broker/simple-broker.js

@@ -1,12 +1,23 @@
-import { Broker } from "./broker.js";
-import { SimpleExchange } from "./simple-exchange.js";
+import { Broker } from './broker.js';
+import { SimpleExchange } from './simple-exchange.js';
 export class SimpleBroker extends Broker {
+    _clientSubscribers;
+    _clientSubscribersCounter;
+    exchange;
     constructor() {
         super();
         this.exchange = new SimpleExchange(this);
         this._clientSubscribers = {};
         this._clientSubscribersCounter = {};
     }
+    // In this implementation of the broker engine, both invokePublish and transmitPublish
+    // methods are the same. In alternative implementations, they could be different.
+    invokePublish(channelName, data, suppressEvent) {
+        return this.transmitPublish(channelName, data, suppressEvent);
+    }
+    isSubscribed(channelName) {
+        return !!this._clientSubscribers[channelName];
+    }
     async subscribe(client, channelName) {
         if (!this._clientSubscribers[channelName]) {
             this._clientSubscribers[channelName] = {};
@@ -18,30 +29,9 @@ export class SimpleBroker extends Broker {
         }
         this._clientSubscribers[channelName][client.id] = client;
     }
-    async unsubscribe(client, channelName) {
-        if (this._clientSubscribers[channelName]) {
-            if (this._clientSubscribers[channelName][client.id]) {
-                this._clientSubscribersCounter[channelName]--;
-                delete this._clientSubscribers[channelName][client.id];
-                if (this._clientSubscribersCounter[channelName] <= 0) {
-                    delete this._clientSubscribers[channelName];
-                    delete this._clientSubscribersCounter[channelName];
-                    this.emit('unsubscribe', { channel: channelName });
-                }
-            }
-        }
-    }
     subscriptions() {
         return Object.keys(this._clientSubscribers);
     }
-    isSubscribed(channelName) {
-        return !!this._clientSubscribers[channelName];
-    }
-    // In this implementation of the broker engine, both invokePublish and transmitPublish
-    // methods are the same. In alternative implementations, they could be different.
-    invokePublish(channelName, data, suppressEvent) {
-        return this.transmitPublish(channelName, data, suppressEvent);
-    }
     async transmitPublish(channelName, data, suppressEvent) {
         const packet = {
             channel: channelName,
@@ -62,4 +52,17 @@ export class SimpleBroker extends Broker {
             this.emit('publish', packet);
         }
     }
+    async unsubscribe(client, channelName) {
+        if (this._clientSubscribers[channelName]) {
+            if (this._clientSubscribers[channelName][client.id]) {
+                this._clientSubscribersCounter[channelName]--;
+                delete this._clientSubscribers[channelName][client.id];
+                if (this._clientSubscribersCounter[channelName] <= 0) {
+                    delete this._clientSubscribers[channelName];
+                    delete this._clientSubscribersCounter[channelName];
+                    this.emit('unsubscribe', { channel: channelName });
+                }
+            }
+        }
+    }
 }

package/dist/broker/simple-exchange.d.ts

@@ -1,13 +1,13 @@
-import { ChannelDetails, ChannelMap, ChannelsOptions, PublishOptions } from "@socket-mesh/channels";
-import { Broker } from "./broker.js";
-import { Exchange } from "./exchange.js";
+import { ChannelDetails, ChannelMap, ChannelsOptions, PublishOptions } from '@socket-mesh/channels';
+import { Broker } from './broker.js';
+import { Exchange } from './exchange.js';
 export declare class SimpleExchange<T extends ChannelMap> extends Exchange<T> {
-    readonly id: string;
     private readonly _broker;
+    readonly id: string;
     constructor(broker: Broker<T>, options?: ChannelsOptions);
-    protected trySubscribe(channel: ChannelDetails): Promise<void>;
-    protected tryUnsubscribe(channel: ChannelDetails): Promise<void>;
+    invokePublish<U extends keyof T & string>(channelName: U, data: T[U]): Promise<void>;
     transmit(event: '#publish', packet: PublishOptions): Promise<void>;
     transmitPublish<U extends keyof T & string>(channelName: U, data: T[U]): Promise<void>;
-    invokePublish<U extends keyof T & string>(channelName: U, data: T[U]): Promise<void>;
+    protected trySubscribe(channel: ChannelDetails): Promise<void>;
+    protected tryUnsubscribe(channel: ChannelDetails): Promise<void>;
 }

package/dist/broker/simple-exchange.js

@@ -1,10 +1,24 @@
-import { Exchange } from "./exchange.js";
+import { Exchange } from './exchange.js';
 export class SimpleExchange extends Exchange {
+    _broker;
+    id;
     constructor(broker, options) {
         super(options);
         this.id = 'exchange';
         this._broker = broker;
     }
+    async invokePublish(channelName, data) {
+        await this._broker.invokePublish(channelName, data);
+    }
+    async transmit(event, packet) {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        if (event === '#publish') {
+            this._channelDataDemux.write(packet.channel, packet.data);
+        }
+    }
+    async transmitPublish(channelName, data) {
+        await this._broker.transmitPublish(channelName, data);
+    }
     async trySubscribe(channel) {
         channel.state = 'subscribed';
         this._channelEventDemux.write(`${channel.name}/subscribe`, { channel: channel.name });
@@ -19,15 +33,4 @@ export class SimpleExchange extends Exchange {
             this.emit('unsubscribe', { channel: channel.name });
         }
     }
-    async transmit(event, packet) {
-        if (event === '#publish') {
-            this._channelDataDemux.write(packet.channel, packet.data);
-        }
-    }
-    async transmitPublish(channelName, data) {
-        await this._broker.transmitPublish(channelName, data);
-    }
-    async invokePublish(channelName, data) {
-        await this._broker.invokePublish(channelName, data);
-    }
 }

package/dist/events/index.d.ts

@@ -0,0 +1,49 @@
+import { ChannelMap, SubscribeEvent, SubscribeFailEvent, SubscribeStateChangeEvent, UnsubscribeEvent } from '@socket-mesh/channels';
+import { ClientSocket, ServerPrivateMap } from '@socket-mesh/client';
+import { AuthenticateEvent, AuthStateChangeEvent, BadAuthTokenEvent, ConnectEvent, ConnectingEvent, DeauthenticateEvent, DisconnectEvent, MessageEvent, PingEvent, PongEvent, PrivateMethodMap, PublicMethodMap, RemoveAuthTokenEvent, RequestEvent, ResponseEvent, CloseEvent as SCloseEvent, ErrorEvent as SErrorEvent, ServiceMap } from '@socket-mesh/core';
+import { IncomingMessage } from 'http';
+import { ServerSocket } from '../server-socket.js';
+export interface CloseEvent {
+}
+export interface ConnectionEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> {
+    socket: ServerSocket<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+    upgradeReq: IncomingMessage;
+}
+export interface ErrorEvent {
+    error: Error;
+}
+export interface HandshakeEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> {
+    socket: ServerSocket<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+}
+export interface HeadersEvent {
+    headers: string[];
+    request: IncomingMessage;
+}
+export interface ListeningEvent {
+}
+export type ServerEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = CloseEvent | ConnectionEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | ErrorEvent | HandshakeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | HeadersEvent | ListeningEvent | SocketAuthenticateEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketAuthStateChangeEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketBadAuthTokenEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketCloseEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketConnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketConnectingEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketDeauthenticateEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketDisconnectEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketErrorEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketMessageEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketPingEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketPongEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketRemoveAuthTokenEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | SocketRequestEvent<TService, TIncoming, TPrivateIncoming> | SocketResponseEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState> | WarningEvent;
+export interface ServerSocketEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> {
+    socket: ClientSocket<PublicMethodMap, TChannel, TService, TState, TOutgoing & TPrivateOutgoing, TPrivateIncoming> | ServerSocket<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+}
+export type SocketAuthenticateEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = AuthenticateEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketAuthStateChangeEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = AuthStateChangeEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketBadAuthTokenEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = BadAuthTokenEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketCloseEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = SCloseEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketConnectEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = ConnectEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketConnectingEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = ConnectingEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketDeauthenticateEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = DeauthenticateEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketDisconnectEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = DisconnectEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketErrorEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = SErrorEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketMessageEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = MessageEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketPingEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = PingEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketPongEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = PongEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketRemoveAuthTokenEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = RemoveAuthTokenEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketRequestEvent<TService extends ServiceMap, TIncoming extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap> = RequestEvent<TIncoming & TPrivateIncoming & ServerPrivateMap, TService>;
+export type SocketResponseEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = ResponseEvent<TOutgoing, TPrivateOutgoing, TService> & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketSubscribeEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = SubscribeEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketSubscribeFailEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = SubscribeFailEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketSubscribeStateChangeEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = SubscribeStateChangeEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export type SocketUnsubscribeEvent<TChannel extends ChannelMap, TService extends ServiceMap, TIncoming extends PublicMethodMap, TOutgoing extends PublicMethodMap, TPrivateIncoming extends PrivateMethodMap, TPrivateOutgoing extends PrivateMethodMap, TServerState extends object, TState extends object> = UnsubscribeEvent & ServerSocketEvent<TChannel, TService, TIncoming, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>;
+export interface WarningEvent {
+    warning: Error;
+}

package/dist/handlers/authenticate.d.ts

@@ -1,20 +1,19 @@
-import { RequestHandlerArgs, SocketTransport } from "@socket-mesh/core";
-import jwt from "jsonwebtoken";
-import { AuthTokenError } from "@socket-mesh/errors";
-import { AuthEngine } from "@socket-mesh/auth-engine";
-import { AuthToken, SignedAuthToken } from "@socket-mesh/auth";
-import { BasicSocketMapServer } from "../maps/socket-map.js";
-import { ServerSocket } from "../server-socket.js";
-import { BasicServerMap } from "../maps/server-map.js";
-export type AuthInfo = ValidAuthInfo | InvalidAuthInfo;
+import { AuthToken, SignedAuthToken } from '@socket-mesh/auth';
+import { AuthEngine } from '@socket-mesh/auth-engine';
+import { AuthTokenError } from '@socket-mesh/errors';
+import jwt from 'jsonwebtoken';
+import { ServerSocket } from '../server-socket.js';
+import { ServerTransport } from '../server-transport.js';
+import { ServerRequestHandlerArgs } from './server-request-handler.js';
+export type AuthInfo = InvalidAuthInfo | ValidAuthInfo;
 export interface InvalidAuthInfo {
-    signedAuthToken: SignedAuthToken;
     authError: AuthTokenError;
+    signedAuthToken: SignedAuthToken;
 }
 export interface ValidAuthInfo {
-    signedAuthToken: SignedAuthToken;
     authToken: AuthToken;
+    signedAuthToken: SignedAuthToken;
 }
-export declare function authenticateHandler({ isRpc, options: signedAuthToken, socket, transport }: RequestHandlerArgs<string, BasicSocketMapServer, ServerSocket<BasicServerMap>>): Promise<void>;
+export declare function authenticateHandler({ isRpc, options: signedAuthToken, socket, transport }: ServerRequestHandlerArgs<string>): Promise<void>;
+export declare function processAuthentication(socket: ServerSocket, transport: ServerTransport, authInfo: AuthInfo): Promise<boolean>;
 export declare function validateAuthToken(auth: AuthEngine, authToken: SignedAuthToken, verificationOptions?: jwt.VerifyOptions): Promise<AuthInfo>;
-export declare function processAuthentication(socket: ServerSocket<BasicServerMap>, transport: SocketTransport<BasicSocketMapServer>, authInfo: AuthInfo): Promise<boolean>;

package/dist/handlers/authenticate.js

@@ -1,4 +1,4 @@
-import { AuthTokenError, AuthTokenExpiredError, AuthTokenInvalidError, AuthTokenNotBeforeError, InvalidActionError } from "@socket-mesh/errors";
+import { AuthTokenError, AuthTokenExpiredError, AuthTokenInvalidError, AuthTokenNotBeforeError, InvalidActionError } from '@socket-mesh/errors';
 const HANDSHAKE_REJECTION_STATUS_CODE = 4008;
 ;
 export async function authenticateHandler({ isRpc, options: signedAuthToken, socket, transport }) {
@@ -9,38 +9,12 @@ export async function authenticateHandler({ isRpc, options: signedAuthToken, soc
     const authInfo = await validateAuthToken(socket.server.auth, signedAuthToken);
     await processAuthentication(socket, transport, authInfo);
 }
-export async function validateAuthToken(auth, authToken, verificationOptions) {
-    try {
-        return {
-            signedAuthToken: authToken,
-            authToken: await auth.verifyToken(authToken, verificationOptions)
-        };
-    }
-    catch (error) {
-        return {
-            signedAuthToken: authToken,
-            authError: processTokenError(error)
-        };
-    }
-}
-function processTokenError(err) {
-    if (err.name === 'TokenExpiredError' && 'expiredAt' in err) {
-        return new AuthTokenExpiredError(err.message, err.expiredAt);
-    }
-    if (err.name === 'JsonWebTokenError') {
-        return new AuthTokenInvalidError(err.message);
-    }
-    if (err.name === 'NotBeforeError' && 'date' in err) {
-        // In this case, the token is good; it's just not active yet.
-        return new AuthTokenNotBeforeError(err.message, err.date);
-    }
-    return new AuthTokenError(err.message);
-}
 export async function processAuthentication(socket, transport, authInfo) {
     if ('authError' in authInfo) {
         await transport.changeToUnauthenticatedState();
         // If the error is related to the JWT being badly formatted, then we will
         // treat the error as a socket error.
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if (authInfo.signedAuthToken != null) {
             transport.onError(authInfo.authError);
             if (authInfo.authError instanceof AuthTokenError) {
@@ -65,3 +39,30 @@ export async function processAuthentication(socket, transport, authInfo) {
     }
     return await transport.setAuthorization(authInfo.signedAuthToken, authInfo.authToken);
 }
+function processTokenError(err) {
+    if (err.name === 'TokenExpiredError' && 'expiredAt' in err) {
+        return new AuthTokenExpiredError(err.message, err.expiredAt);
+    }
+    if (err.name === 'JsonWebTokenError') {
+        return new AuthTokenInvalidError(err.message);
+    }
+    if (err.name === 'NotBeforeError' && 'date' in err) {
+        // In this case, the token is good; it's just not active yet.
+        return new AuthTokenNotBeforeError(err.message, err.date);
+    }
+    return new AuthTokenError(err.message);
+}
+export async function validateAuthToken(auth, authToken, verificationOptions) {
+    try {
+        return {
+            authToken: await auth.verifyToken(authToken, verificationOptions),
+            signedAuthToken: authToken
+        };
+    }
+    catch (error) {
+        return {
+            authError: processTokenError(error),
+            signedAuthToken: authToken
+        };
+    }
+}

package/dist/handlers/handshake.d.ts

@@ -1,7 +1,3 @@
-import { HandshakeOptions, HandshakeStatus } from "@socket-mesh/client";
-import { RequestHandlerArgs } from "@socket-mesh/core";
-import { BasicServerMap } from "../maps/server-map.js";
-import { BasicSocketMapServer } from "../maps/socket-map.js";
-import { ServerSocket } from "../server-socket.js";
-import { ServerTransport } from "../server-transport.js";
-export declare function handshakeHandler({ options, socket, transport }: RequestHandlerArgs<HandshakeOptions, BasicSocketMapServer, ServerSocket<BasicServerMap>, ServerTransport<BasicServerMap>>): Promise<HandshakeStatus>;
+import { HandshakeOptions, HandshakeStatus } from '@socket-mesh/client';
+import { ServerRequestHandlerArgs } from './server-request-handler.js';
+export declare function handshakeHandler({ options, socket, transport }: ServerRequestHandlerArgs<HandshakeOptions>): Promise<HandshakeStatus>;

package/dist/handlers/handshake.js

@@ -1,6 +1,6 @@
-import { wait } from "@socket-mesh/core";
-import { processAuthentication, validateAuthToken } from "./authenticate.js";
-import { dehydrateError } from "@socket-mesh/errors";
+import { wait } from '@socket-mesh/core';
+import { dehydrateError } from '@socket-mesh/errors';
+import { processAuthentication, validateAuthToken } from './authenticate.js';
 const HANDSHAKE_REJECTION_STATUS_CODE = 4008;
 export async function handshakeHandler({ options, socket, transport }) {
     const server = socket.server;
@@ -10,11 +10,11 @@ export async function handshakeHandler({ options, socket, transport }) {
         if (plugin.onHandshake) {
             try {
                 await plugin.onHandshake({
+                    authInfo: 'authError' in authInfo
+                        ? { authError: authInfo.authError, signedAuthToken: options.authToken }
+                        : { authToken: authInfo.authToken, signedAuthToken: options.authToken },
                     socket,
-                    transport,
-                    authInfo: 'authError' in authInfo ?
-                        { signedAuthToken: options.authToken, authError: authInfo.authError } :
-                        { signedAuthToken: options.authToken, authToken: authInfo.authToken }
+                    transport
                 });
             }
             catch (err) {
@@ -26,11 +26,15 @@ export async function handshakeHandler({ options, socket, transport }) {
         }
     }
     let authError = undefined;
-    let changed;
+    let changed = false;
     try {
         changed = await processAuthentication(socket, transport, authInfo);
         if (socket.status === 'closed') {
-            return;
+            return {
+                authToken: options.authToken,
+                id: socket.id,
+                pingTimeoutMs: server.pingTimeoutMs
+            };
         }
     }
     catch (err) {
@@ -48,14 +52,14 @@ export async function handshakeHandler({ options, socket, transport }) {
     }
     if (authError) {
         return {
+            authError,
             id: socket.id,
-            pingTimeoutMs: server.pingTimeoutMs,
-            authError
+            pingTimeoutMs: server.pingTimeoutMs
         };
     }
     return {
+        authToken: options.authToken,
         id: socket.id,
-        pingTimeoutMs: server.pingTimeoutMs,
-        authToken: options.authToken
+        pingTimeoutMs: server.pingTimeoutMs
     };
 }

package/dist/handlers/index.d.ts

@@ -0,0 +1,7 @@
+export * from './authenticate.js';
+export * from './handshake.js';
+export * from './publish.js';
+export * from './remove-auth-token.js';
+export * from './server-request-handler.js';
+export * from './subscribe.js';
+export * from './unsubscribe.js';

package/dist/handlers/index.js

@@ -0,0 +1,7 @@
+export * from './authenticate.js';
+export * from './handshake.js';
+export * from './publish.js';
+export * from './remove-auth-token.js';
+export * from './server-request-handler.js';
+export * from './subscribe.js';
+export * from './unsubscribe.js';

package/dist/handlers/publish.d.ts

@@ -1,11 +1,5 @@
-import { RequestHandlerArgs } from "@socket-mesh/core";
-import { BasicSocketMapServer } from "../maps/socket-map.js";
-import { PublishOptions } from "@socket-mesh/channels";
-import { ServerSocket } from "../server-socket.js";
-import { BasicServerMap } from "../maps/server-map.js";
-import { ServerTransport } from "../server-transport.js";
-export declare function publishHandler({ socket, transport, options }: RequestHandlerArgs<PublishOptions, BasicSocketMapServer<{}, {
+import { PublishOptions } from '@socket-mesh/channels';
+import { ServerRequestHandlerArgs } from './server-request-handler.js';
+export declare function publishHandler({ options, socket, transport }: ServerRequestHandlerArgs<PublishOptions, {}, {
     [channel: string]: any;
-}>, ServerSocket<BasicServerMap<{}, {
-    [channel: string]: any;
-}>>, ServerTransport<BasicServerMap>>): Promise<void>;
+}>): Promise<void>;

package/dist/handlers/publish.js

@@ -1,5 +1,5 @@
-import { InvalidActionError } from "@socket-mesh/errors";
-export async function publishHandler({ socket, transport, options }) {
+import { InvalidActionError } from '@socket-mesh/errors';
+export async function publishHandler({ options, socket, transport }) {
     if (!socket.server.allowClientPublish) {
         throw new InvalidActionError('Client publish feature is disabled');
     }

package/dist/handlers/remove-auth-token.d.ts

@@ -1,3 +1,4 @@
-import { BasicSocketMapServer } from "../maps/socket-map.js";
-import { SocketTransport } from "@socket-mesh/core";
-export declare function deauthenticate(transport: SocketTransport<BasicSocketMapServer>): Promise<boolean>;
+import { ClientPrivateMap, ServerPrivateMap } from '@socket-mesh/client';
+import { SocketTransport } from '@socket-mesh/core';
+import { ServerSocketState } from '../server-socket-state.js';
+export declare function deauthenticate(transport: SocketTransport<ServerPrivateMap, {}, ClientPrivateMap, {}, ServerSocketState>): Promise<boolean>;

package/dist/handlers/server-request-handler.d.ts

@@ -0,0 +1,7 @@
+import { ChannelMap } from '@socket-mesh/channels';
+import { ClientPrivateMap, ServerPrivateMap } from '@socket-mesh/client';
+import { PrivateMethodMap, PublicMethodMap, RequestHandlerArgs, ServiceMap } from '@socket-mesh/core';
+import { ServerSocketState } from '../server-socket-state.js';
+import { ServerSocket } from '../server-socket.js';
+import { ServerTransport } from '../server-transport.js';
+export type ServerRequestHandlerArgs<TOptions, TIncoming extends PublicMethodMap = {}, TChannel extends ChannelMap = {}, TService extends ServiceMap = {}, TOutgoing extends PublicMethodMap = {}, TPrivateIncoming extends PrivateMethodMap = {}, TPrivateOutgoing extends PrivateMethodMap = {}, TServerState extends object = {}, TState extends object = {}> = RequestHandlerArgs<TOptions, TIncoming & TPrivateIncoming & ServerPrivateMap, TOutgoing, TPrivateOutgoing & ClientPrivateMap, TService, TState & ServerSocketState, ServerSocket<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>, ServerTransport<TIncoming, TChannel, TService, TOutgoing, TPrivateIncoming, TPrivateOutgoing, TServerState, TState>>;

package/dist/handlers/subscribe.d.ts

@@ -1,7 +1,3 @@
-import { BasicServerMap } from "../maps/server-map.js";
-import { BasicSocketMapServer } from "../maps/socket-map.js";
-import { SubscribeOptions } from "@socket-mesh/client";
-import { RequestHandlerArgs } from "@socket-mesh/core";
-import { ServerSocket } from "../server-socket.js";
-import { ServerTransport } from "../server-transport.js";
-export declare function subscribeHandler({ socket, transport, options }: RequestHandlerArgs<SubscribeOptions, BasicSocketMapServer, ServerSocket<BasicServerMap>, ServerTransport<BasicServerMap>>): Promise<void>;
+import { SubscribeOptions } from '@socket-mesh/client';
+import { ServerRequestHandlerArgs } from './server-request-handler.js';
+export declare function subscribeHandler({ options, socket, transport }: ServerRequestHandlerArgs<SubscribeOptions>): Promise<void>;

package/dist/handlers/subscribe.js

@@ -1,5 +1,5 @@
-import { BrokerError, InvalidActionError } from "@socket-mesh/errors";
-export async function subscribeHandler({ socket, transport, options }) {
+import { BrokerError, InvalidActionError } from '@socket-mesh/errors';
+export async function subscribeHandler({ options, socket, transport }) {
     if (socket.status !== 'ready') {
         // This is an invalid state; it means the client tried to subscribe before
         // having completed the handshake.
@@ -7,7 +7,7 @@ export async function subscribeHandler({ socket, transport, options }) {
     }
     const state = socket.state;
     const server = socket.server;
-    if (server.socketChannelLimit && state.channelSubscriptionsCount >= server.socketChannelLimit) {
+    if (server.socketChannelLimit && (state.channelSubscriptionsCount || 0) >= server.socketChannelLimit) {
         throw new InvalidActionError(`Socket ${socket.id} tried to exceed the channel subscription limit of ${server.socketChannelLimit}`);
     }
     const { channel, ...channelOptions } = options;

package/dist/handlers/unsubscribe.d.ts

@@ -1,6 +1,2 @@
-import { RequestHandlerArgs } from "@socket-mesh/core";
-import { BasicSocketMapServer } from "../maps/socket-map.js";
-import { ServerSocket } from "../server-socket.js";
-import { BasicServerMap } from "../maps/server-map.js";
-import { ServerTransport } from "../server-transport.js";
-export declare function unsubscribeHandler({ transport, options: channel }: RequestHandlerArgs<string, BasicSocketMapServer, ServerSocket<BasicServerMap>, ServerTransport<BasicServerMap>>): Promise<void>;
+import { ServerRequestHandlerArgs } from './server-request-handler.js';
+export declare function unsubscribeHandler({ options: channel, transport }: ServerRequestHandlerArgs<string>): Promise<void>;