@colyseus/core 0.16.0-preview.21 → 0.16.0-preview.28

package/build/Protocol.mjs

@@ -34,50 +34,52 @@ var IpcProtocol = /* @__PURE__ */ ((IpcProtocol2) => {
   IpcProtocol2[IpcProtocol2["TIMEOUT"] = 2] = "TIMEOUT";
   return IpcProtocol2;
 })(IpcProtocol || {});
-const sendBuffer = Buffer.allocUnsafe(8192);
 const packr = new Packr();
-packr.useBuffer(sendBuffer);
+packr.encode(void 0);
 const getMessageBytes = {
   [10 /* JOIN_ROOM */]: (reconnectionToken, serializerId, handshake) => {
     const it = { offset: 1 };
-    sendBuffer[0] = 10 /* JOIN_ROOM */;
-    sendBuffer[it.offset++] = Buffer.byteLength(reconnectionToken, "utf8");
-    encode.utf8Write(sendBuffer, reconnectionToken, it);
-    sendBuffer[it.offset++] = Buffer.byteLength(serializerId, "utf8");
-    encode.utf8Write(sendBuffer, serializerId, it);
+    packr.buffer[0] = 10 /* JOIN_ROOM */;
+    packr.buffer[it.offset++] = Buffer.byteLength(reconnectionToken, "utf8");
+    encode.utf8Write(packr.buffer, reconnectionToken, it);
+    packr.buffer[it.offset++] = Buffer.byteLength(serializerId, "utf8");
+    encode.utf8Write(packr.buffer, serializerId, it);
     let handshakeLength = handshake?.byteLength || 0;
     if (handshakeLength > 0) {
-      handshake.copy(sendBuffer, it.offset, 0, handshakeLength);
+      handshake.copy(packr.buffer, it.offset, 0, handshakeLength);
     }
-    return sendBuffer.subarray(0, it.offset + handshakeLength);
+    return packr.buffer.subarray(0, it.offset + handshakeLength);
   },
   [11 /* ERROR */]: (code, message = "") => {
     const it = { offset: 1 };
-    sendBuffer[0] = 11 /* ERROR */;
-    encode.number(sendBuffer, code, it);
-    encode.string(sendBuffer, message, it);
-    return sendBuffer.subarray(0, it.offset);
+    packr.buffer[0] = 11 /* ERROR */;
+    encode.number(packr.buffer, code, it);
+    encode.string(packr.buffer, message, it);
+    return packr.buffer.subarray(0, it.offset);
   },
   [14 /* ROOM_STATE */]: (bytes) => {
     return [14 /* ROOM_STATE */, ...bytes];
   },
   raw: (code, type, message, rawMessage) => {
     const it = { offset: 1 };
-    sendBuffer[0] = code;
+    packr.buffer[0] = code;
     if (typeof type === "string") {
-      encode.string(sendBuffer, type, it);
+      encode.string(packr.buffer, type, it);
     } else {
-      encode.number(sendBuffer, type, it);
+      encode.number(packr.buffer, type, it);
     }
     if (message !== void 0) {
       packr.position = 0;
+      if (process.env.NODE_ENV !== "production") {
+        packr.useBuffer(packr.buffer);
+      }
       const endOfBufferOffset = packr.pack(message, 2048 + it.offset).byteLength;
-      return sendBuffer.subarray(0, endOfBufferOffset);
+      return packr.buffer.subarray(0, endOfBufferOffset);
     } else if (rawMessage !== void 0) {
-      sendBuffer.set(rawMessage, it.offset);
-      return sendBuffer.subarray(0, it.offset + rawMessage.byteLength);
+      packr.buffer.set(rawMessage, it.offset);
+      return packr.buffer.subarray(0, it.offset + rawMessage.byteLength);
     } else {
-      return sendBuffer.subarray(0, it.offset);
+      return packr.buffer.subarray(0, it.offset);
     }
   }
 };

package/build/Protocol.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/Protocol.ts"],
-  "sourcesContent": ["import { pack, Packr } from '@colyseus/msgpackr';\nimport { encode, Iterator } from '@colyseus/schema';\n\n// Colyseus protocol codes range between 0~100\nexport enum Protocol {\n  // Room-related (10~19)\n  JOIN_ROOM = 10,\n  ERROR = 11,\n  LEAVE_ROOM = 12,\n  ROOM_DATA = 13,\n  ROOM_STATE = 14,\n  ROOM_STATE_PATCH = 15,\n  // ROOM_DATA_SCHEMA = 16, // DEPRECATED: used to send schema instances via room.send()\n  ROOM_DATA_BYTES = 17,\n\n  // WebSocket close codes (https://github.com/Luka967/websocket-close-codes)\n  WS_CLOSE_NORMAL = 1000,\n  WS_CLOSE_GOING_AWAY = 1001,\n\n  // WebSocket error codes\n  WS_CLOSE_CONSENTED = 4000,\n  WS_CLOSE_WITH_ERROR = 4002,\n  WS_CLOSE_DEVMODE_RESTART = 4010,\n\n  WS_SERVER_DISCONNECT = 4201,\n  WS_TOO_MANY_CLIENTS = 4202,\n}\n\nexport enum ErrorCode {\n  // MatchMaking Error Codes\n  MATCHMAKE_NO_HANDLER = 4210,\n  MATCHMAKE_INVALID_CRITERIA = 4211,\n  MATCHMAKE_INVALID_ROOM_ID = 4212,\n  MATCHMAKE_UNHANDLED = 4213, // generic exception during onCreate/onJoin\n  MATCHMAKE_EXPIRED = 4214, // generic exception during onCreate/onJoin\n\n  AUTH_FAILED = 4215,\n  APPLICATION_ERROR = 4216,\n\n  INVALID_PAYLOAD = 4217,\n}\n\n// Inter-process communication protocol\nexport enum IpcProtocol {\n  SUCCESS = 0,\n  ERROR = 1,\n  TIMEOUT = 2,\n}\n\nconst sendBuffer = Buffer.allocUnsafe(8192);\n\nconst packr = new Packr();\npackr.useBuffer(sendBuffer);\n\nexport const getMessageBytes = {\n  [Protocol.JOIN_ROOM]: (reconnectionToken: string, serializerId: string, handshake?: Buffer) => {\n    const it: Iterator = { offset: 1 };\n    sendBuffer[0] = Protocol.JOIN_ROOM;\n\n    sendBuffer[it.offset++] = Buffer.byteLength(reconnectionToken, \"utf8\");\n    encode.utf8Write(sendBuffer, reconnectionToken, it);\n\n    sendBuffer[it.offset++] = Buffer.byteLength(serializerId, \"utf8\");\n    encode.utf8Write(sendBuffer, serializerId, it);\n\n    let handshakeLength = handshake?.byteLength || 0;\n    if (handshakeLength > 0) {\n      handshake.copy(sendBuffer, it.offset, 0, handshakeLength);\n    }\n\n    return sendBuffer.subarray(0, it.offset + handshakeLength);\n  },\n\n  [Protocol.ERROR]: (code: number, message: string = '') => {\n    const it: Iterator = { offset: 1 };\n    sendBuffer[0] = Protocol.ERROR;\n\n    encode.number(sendBuffer, code, it);\n    encode.string(sendBuffer, message, it);\n\n    return sendBuffer.subarray(0, it.offset);\n  },\n\n  [Protocol.ROOM_STATE]: (bytes: number[]) => {\n    return [Protocol.ROOM_STATE, ...bytes];\n  },\n\n  raw: (code: Protocol, type: string | number, message?: any, rawMessage?: Uint8Array | Buffer) => {\n\n    const it: Iterator = { offset: 1 };\n    sendBuffer[0] = code;\n\n    if (typeof (type) === 'string') {\n      encode.string(sendBuffer, type as string, it);\n\n    } else {\n      encode.number(sendBuffer, type, it);\n    }\n\n    if (message !== undefined) {\n      // pack message into the same sendBuffer\n      packr.position = 0; // force to encode from the beginning\n      const endOfBufferOffset = packr.pack(message, 2048 + it.offset).byteLength;\n                                                 // 2048 = RESERVE_START_SPACE\n      return sendBuffer.subarray(0, endOfBufferOffset);\n\n    } else if (rawMessage !== undefined) {\n\n      // copy raw message into sendBuffer\n      sendBuffer.set(rawMessage, it.offset);\n      return sendBuffer.subarray(0, it.offset + rawMessage.byteLength);\n\n    } else {\n      return sendBuffer.subarray(0, it.offset);\n    }\n  },\n\n};\n\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { pack, Packr } from '@colyseus/msgpackr';\nimport { encode, Iterator } from '@colyseus/schema';\n\n// Colyseus protocol codes range between 0~100\nexport enum Protocol {\n  // Room-related (10~19)\n  JOIN_ROOM = 10,\n  ERROR = 11,\n  LEAVE_ROOM = 12,\n  ROOM_DATA = 13,\n  ROOM_STATE = 14,\n  ROOM_STATE_PATCH = 15,\n  // ROOM_DATA_SCHEMA = 16, // DEPRECATED: used to send schema instances via room.send()\n  ROOM_DATA_BYTES = 17,\n\n  // WebSocket close codes (https://github.com/Luka967/websocket-close-codes)\n  WS_CLOSE_NORMAL = 1000,\n  WS_CLOSE_GOING_AWAY = 1001,\n\n  // WebSocket error codes\n  WS_CLOSE_CONSENTED = 4000,\n  WS_CLOSE_WITH_ERROR = 4002,\n  WS_CLOSE_DEVMODE_RESTART = 4010,\n\n  WS_SERVER_DISCONNECT = 4201,\n  WS_TOO_MANY_CLIENTS = 4202,\n}\n\nexport enum ErrorCode {\n  // MatchMaking Error Codes\n  MATCHMAKE_NO_HANDLER = 4210,\n  MATCHMAKE_INVALID_CRITERIA = 4211,\n  MATCHMAKE_INVALID_ROOM_ID = 4212,\n  MATCHMAKE_UNHANDLED = 4213, // generic exception during onCreate/onJoin\n  MATCHMAKE_EXPIRED = 4214, // generic exception during onCreate/onJoin\n\n  AUTH_FAILED = 4215,\n  APPLICATION_ERROR = 4216,\n\n  INVALID_PAYLOAD = 4217,\n}\n\n// Inter-process communication protocol\nexport enum IpcProtocol {\n  SUCCESS = 0,\n  ERROR = 1,\n  TIMEOUT = 2,\n}\n\n\nconst packr = new Packr();\n\n// msgpackr workaround: initialize buffer\npackr.encode(undefined);\n\nexport const getMessageBytes = {\n  [Protocol.JOIN_ROOM]: (reconnectionToken: string, serializerId: string, handshake?: Buffer) => {\n    const it: Iterator = { offset: 1 };\n    packr.buffer[0] = Protocol.JOIN_ROOM;\n\n    packr.buffer[it.offset++] = Buffer.byteLength(reconnectionToken, \"utf8\");\n    encode.utf8Write(packr.buffer, reconnectionToken, it);\n\n    packr.buffer[it.offset++] = Buffer.byteLength(serializerId, \"utf8\");\n    encode.utf8Write(packr.buffer, serializerId, it);\n\n    let handshakeLength = handshake?.byteLength || 0;\n    if (handshakeLength > 0) {\n      handshake.copy(packr.buffer, it.offset, 0, handshakeLength);\n    }\n\n    return packr.buffer.subarray(0, it.offset + handshakeLength);\n  },\n\n  [Protocol.ERROR]: (code: number, message: string = '') => {\n    const it: Iterator = { offset: 1 };\n    packr.buffer[0] = Protocol.ERROR;\n\n    encode.number(packr.buffer, code, it);\n    encode.string(packr.buffer, message, it);\n\n    return packr.buffer.subarray(0, it.offset);\n  },\n\n  [Protocol.ROOM_STATE]: (bytes: number[]) => {\n    return [Protocol.ROOM_STATE, ...bytes];\n  },\n\n  raw: (code: Protocol, type: string | number, message?: any, rawMessage?: Uint8Array | Buffer) => {\n    const it: Iterator = { offset: 1 };\n    packr.buffer[0] = code;\n\n    if (typeof (type) === 'string') {\n      encode.string(packr.buffer, type as string, it);\n\n    } else {\n      encode.number(packr.buffer, type, it);\n    }\n\n    if (message !== undefined) {\n      // force to encode from offset\n      packr.position = 0;\n\n      //\n      // TODO: remove this after issue is fixed https://github.com/kriszyp/msgpackr/issues/139\n      //\n      // - This check is only required when running integration tests.\n      //   (colyseus.js' usage of msgpackr/buffer is conflicting)\n      //\n      if (process.env.NODE_ENV !== \"production\") {\n        packr.useBuffer(packr.buffer);\n      }\n\n      // pack message into the same packr.buffer\n      const endOfBufferOffset = packr.pack(message, 2048 + it.offset).byteLength;\n                                                 // 2048 = RESERVE_START_SPACE\n      return packr.buffer.subarray(0, endOfBufferOffset);\n\n    } else if (rawMessage !== undefined) {\n\n      // copy raw message into packr.buffer\n      packr.buffer.set(rawMessage, it.offset);\n      return packr.buffer.subarray(0, it.offset + rawMessage.byteLength);\n\n    } else {\n      return packr.buffer.subarray(0, it.offset);\n    }\n  },\n\n};\n\n"],
+  "mappings": "AAAA,SAAe,aAAa;AAC5B,SAAS,cAAwB;AAG1B,IAAK,WAAL,kBAAKA,cAAL;AAEL,EAAAA,oBAAA,eAAY,MAAZ;AACA,EAAAA,oBAAA,WAAQ,MAAR;AACA,EAAAA,oBAAA,gBAAa,MAAb;AACA,EAAAA,oBAAA,eAAY,MAAZ;AACA,EAAAA,oBAAA,gBAAa,MAAb;AACA,EAAAA,oBAAA,sBAAmB,MAAnB;AAEA,EAAAA,oBAAA,qBAAkB,MAAlB;AAGA,EAAAA,oBAAA,qBAAkB,OAAlB;AACA,EAAAA,oBAAA,yBAAsB,QAAtB;AAGA,EAAAA,oBAAA,wBAAqB,OAArB;AACA,EAAAA,oBAAA,yBAAsB,QAAtB;AACA,EAAAA,oBAAA,8BAA2B,QAA3B;AAEA,EAAAA,oBAAA,0BAAuB,QAAvB;AACA,EAAAA,oBAAA,yBAAsB,QAAtB;AArBU,SAAAA;AAAA,GAAA;AAwBL,IAAK,YAAL,kBAAKC,eAAL;AAEL,EAAAA,sBAAA,0BAAuB,QAAvB;AACA,EAAAA,sBAAA,gCAA6B,QAA7B;AACA,EAAAA,sBAAA,+BAA4B,QAA5B;AACA,EAAAA,sBAAA,yBAAsB,QAAtB;AACA,EAAAA,sBAAA,uBAAoB,QAApB;AAEA,EAAAA,sBAAA,iBAAc,QAAd;AACA,EAAAA,sBAAA,uBAAoB,QAApB;AAEA,EAAAA,sBAAA,qBAAkB,QAAlB;AAXU,SAAAA;AAAA,GAAA;AAeL,IAAK,cAAL,kBAAKC,iBAAL;AACL,EAAAA,0BAAA,aAAU,KAAV;AACA,EAAAA,0BAAA,WAAQ,KAAR;AACA,EAAAA,0BAAA,aAAU,KAAV;AAHU,SAAAA;AAAA,GAAA;AAOZ,MAAM,QAAQ,IAAI,MAAM;AAGxB,MAAM,OAAO,MAAS;AAEf,MAAM,kBAAkB;AAAA,EAC7B,CAAC,qBAAqB,CAAC,mBAA2B,cAAsB,cAAuB;AAC7F,UAAM,KAAe,EAAE,QAAQ,EAAE;AACjC,UAAM,OAAO,KAAK;AAElB,UAAM,OAAO,GAAG,YAAY,OAAO,WAAW,mBAAmB,MAAM;AACvE,WAAO,UAAU,MAAM,QAAQ,mBAAmB,EAAE;AAEpD,UAAM,OAAO,GAAG,YAAY,OAAO,WAAW,cAAc,MAAM;AAClE,WAAO,UAAU,MAAM,QAAQ,cAAc,EAAE;AAE/C,QAAI,kBAAkB,WAAW,cAAc;AAC/C,QAAI,kBAAkB,GAAG;AACvB,gBAAU,KAAK,MAAM,QAAQ,GAAG,QAAQ,GAAG,eAAe;AAAA,IAC5D;AAEA,WAAO,MAAM,OAAO,SAAS,GAAG,GAAG,SAAS,eAAe;AAAA,EAC7D;AAAA,EAEA,CAAC,iBAAiB,CAAC,MAAc,UAAkB,OAAO;AACxD,UAAM,KAAe,EAAE,QAAQ,EAAE;AACjC,UAAM,OAAO,KAAK;AAElB,WAAO,OAAO,MAAM,QAAQ,MAAM,EAAE;AACpC,WAAO,OAAO,MAAM,QAAQ,SAAS,EAAE;AAEvC,WAAO,MAAM,OAAO,SAAS,GAAG,GAAG,MAAM;AAAA,EAC3C;AAAA,EAEA,CAAC,sBAAsB,CAAC,UAAoB;AAC1C,WAAO,CAAC,qBAAqB,GAAG,KAAK;AAAA,EACvC;AAAA,EAEA,KAAK,CAAC,MAAgB,MAAuB,SAAe,eAAqC;AAC/F,UAAM,KAAe,EAAE,QAAQ,EAAE;AACjC,UAAM,OAAO,KAAK;AAElB,QAAI,OAAQ,SAAU,UAAU;AAC9B,aAAO,OAAO,MAAM,QAAQ,MAAgB,EAAE;AAAA,IAEhD,OAAO;AACL,aAAO,OAAO,MAAM,QAAQ,MAAM,EAAE;AAAA,IACtC;AAEA,QAAI,YAAY,QAAW;AAEzB,YAAM,WAAW;AAQjB,UAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,cAAM,UAAU,MAAM,MAAM;AAAA,MAC9B;AAGA,YAAM,oBAAoB,MAAM,KAAK,SAAS,OAAO,GAAG,MAAM,EAAE;AAEhE,aAAO,MAAM,OAAO,SAAS,GAAG,iBAAiB;AAAA,IAEnD,WAAW,eAAe,QAAW;AAGnC,YAAM,OAAO,IAAI,YAAY,GAAG,MAAM;AACtC,aAAO,MAAM,OAAO,SAAS,GAAG,GAAG,SAAS,WAAW,UAAU;AAAA,IAEnE,OAAO;AACL,aAAO,MAAM,OAAO,SAAS,GAAG,GAAG,MAAM;AAAA,IAC3C;AAAA,EACF;AAEF;",
   "names": ["Protocol", "ErrorCode", "IpcProtocol"]
 }

package/build/Room.d.ts

@@ -1,14 +1,10 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import http, { IncomingMessage } from 'http';
-import { Schema } from '@colyseus/schema';
 import Clock from '@gamestdio/timer';
 import { EventEmitter } from 'events';
 import { Presence } from './presence/Presence';
 import { Serializer } from './serializer/Serializer';
 import { Deferred } from './utils/Utils';
-import { RoomListingData } from './matchmaker/driver';
+import { RoomCache } from './matchmaker/driver/local/LocalDriver';
 import { Client, ClientArray, ClientPrivate, ISendOptions } from './Transport';
 export declare const DEFAULT_SEAT_RESERVATION_TIME: number;
 export type SimulationCallback = (deltaTime: number) => void;
@@ -38,7 +34,7 @@ export declare abstract class Room<State extends object = any, Metadata = any, U
      */
     get locked(): boolean;
     get metadata(): Metadata;
-    listing: RoomListingData<Metadata>;
+    listing: RoomCache<Metadata>;
     /**
      * Timing events tied to the room instance.
      * Intervals and timeouts are cleared when the room is disposed.
@@ -50,6 +46,12 @@ export declare abstract class Room<State extends object = any, Metadata = any, U
      * the room will be unlocked as soon as a client disconnects from it.
      */
     maxClients: number;
+    /**
+     * Automatically dispose the room when last client disconnects.
+     *
+     * @default true
+     */
+    autoDispose: boolean;
     /**
      * Frequency to send the room state to connected clients, in milliseconds.
      *
@@ -76,7 +78,7 @@ export declare abstract class Room<State extends object = any, Metadata = any, U
     _events: EventEmitter<[never]>;
     protected seatReservationTime: number;
     protected reservedSeats: {
-        [sessionId: string]: [any, any];
+        [sessionId: string]: [any, any, boolean?, boolean?];
     };
     protected reservedSeatTimeouts: {
         [sessionId: string]: NodeJS.Timeout;
@@ -89,20 +91,13 @@ export declare abstract class Room<State extends object = any, Metadata = any, U
     private _serializer;
     private _afterNextPatchQueue;
     private _simulationInterval;
-    private _patchInterval;
     private _internalState;
     private _locked;
     private _lockedExplicitly;
     private _maxClientsReached;
     private _autoDisposeTimeout;
     constructor();
-    /**
-     * Automatically dispose the room when last client disconnects.
-     *
-     * @default true
-     */
-    get autoDispose(): boolean;
-    set autoDispose(value: boolean);
+    protected __init(): void;
     /**
      * The name of the room you provided as first argument for `gameServer.define()`.
      *
@@ -184,6 +179,9 @@ export declare abstract class Room<State extends object = any, Metadata = any, U
      * @param delay - Interval delay on executing `onTickCallback` in milliseconds.
      */
     setSimulationInterval(onTickCallback?: SimulationCallback, delay?: number): void;
+    /**
+     * @deprecated Use `.patchRate=` instead.
+     */
     setPatchRate(milliseconds: number | null): void;
     setState(newState: State): void;
     setSerializer(serializer: Serializer<State>): void;
@@ -198,15 +196,17 @@ export declare abstract class Room<State extends object = any, Metadata = any, U
      */
     unlock(): Promise<void>;
     send(client: Client, type: string | number, message: any, options?: ISendOptions): void;
-    send(client: Client, message: Schema, options?: ISendOptions): void;
-    broadcast(type: string | number, message?: any, options?: IBroadcastOptions): any;
-    broadcast<T extends Schema>(message: T, options?: IBroadcastOptions): any;
+    broadcast(type: string | number, message?: any, options?: IBroadcastOptions): void;
+    /**
+     * Broadcast bytes (UInt8Arrays) to a particular room
+     */
+    broadcastBytes(type: string | number, message: Uint8Array, options: IBroadcastOptions): void;
     /**
      * Checks whether mutations have occurred in the state, and broadcast them to all connected clients.
      */
     broadcastPatch(): boolean;
     onMessage<T = any>(messageType: '*', callback: (client: Client<UserData, AuthData>, type: string | number, message: T) => void): any;
-    onMessage<T = any>(messageType: string | number, callback: (client: Client<UserData, AuthData>, message: T) => void): any;
+    onMessage<T = any>(messageType: string | number, callback: (client: Client<UserData, AuthData>, message: T) => void, validate?: (message: unknown) => T): any;
     /**
      * Disconnect all connected clients, and then dispose the room.
      *
@@ -228,14 +228,15 @@ export declare abstract class Room<State extends object = any, Metadata = any, U
     allowReconnection(previousClient: Client, seconds: number | "manual"): Deferred<Client>;
     protected resetAutoDisposeTimeout(timeoutInSeconds?: number): void;
     private broadcastMessageType;
-    private sendFullState;
-    private _dequeueAfterPatchMessages;
-    private _reserveSeat;
-    private _disposeIfEmpty;
-    private _dispose;
-    private _onMessage;
-    private _forciblyCloseClient;
-    private _onLeave;
-    private _incrementClientCount;
-    private _decrementClientCount;
+    protected sendFullState(client: Client): void;
+    protected _dequeueAfterPatchMessages(): void;
+    protected _reserveSeat(sessionId: string, joinOptions?: any, authData?: any, seconds?: number, allowReconnection?: boolean, devModeReconnection?: boolean): Promise<boolean>;
+    protected _disposeIfEmpty(): boolean;
+    protected _dispose(): Promise<any>;
+    protected _onMessage(client: Client & ClientPrivate, buffer: Buffer): void;
+    protected _forciblyCloseClient(client: Client & ClientPrivate, closeCode: number): void;
+    protected _onLeave(client: Client, code?: number): Promise<any>;
+    protected _onAfterLeave(client: Client): Promise<void>;
+    protected _incrementClientCount(): Promise<void>;
+    protected _decrementClientCount(): Promise<boolean>;
 }

package/build/Room.js

@@ -54,8 +54,8 @@ var RoomInternalState = /* @__PURE__ */ ((RoomInternalState2) => {
 class Room {
   constructor() {
     this.clock = new import_timer.default();
-    this.#_autoDispose = true;
     this.maxClients = Infinity;
+    this.autoDispose = true;
     this.patchRate = DEFAULT_PATCH_RATE;
     this.clients = new import_Transport.ClientArray();
     this._events = new import_events.EventEmitter();
@@ -64,23 +64,28 @@ class Room {
     this.reservedSeatTimeouts = {};
     this._reconnections = {};
     this._reconnectingSessionId = /* @__PURE__ */ new Map();
-    this.onMessageHandlers = {};
+    this.onMessageHandlers = {
+      "__no_message_handler": {
+        callback: (client, messageType, _) => {
+          const errorMessage = `onMessage for "${messageType}" not registered.`;
+          (0, import_Debug.debugAndPrintError)(errorMessage);
+          if (import_DevMode.isDevMode) {
+            client.error(import_Protocol.ErrorCode.INVALID_PAYLOAD, errorMessage);
+          } else {
+            client.leave(import_Protocol.Protocol.WS_CLOSE_WITH_ERROR, errorMessage);
+          }
+        }
+      }
+    };
     this._serializer = noneSerializer;
     this._afterNextPatchQueue = [];
     this._internalState = 0 /* CREATING */;
     this._locked = false;
     this._lockedExplicitly = false;
     this._maxClientsReached = false;
-    this._events.once("dispose", async () => {
-      try {
-        await this._dispose();
-      } catch (e) {
-        (0, import_Debug.debugAndPrintError)(`onDispose error: ${e && e.message || e || "promise rejected"}`);
-      }
-      this._events.emit("disconnect");
+    this._events.once("dispose", () => {
+      this._dispose().catch((e) => (0, import_Debug.debugAndPrintError)(`onDispose error: ${e && e.message || e || "promise rejected"}`)).finally(() => this._events.emit("disconnect"));
     });
-    this.setPatchRate(this.patchRate);
-    this.resetAutoDisposeTimeout(this.seatReservationTime);
   }
   get locked() {
     return this._locked;
@@ -91,14 +96,42 @@ class Room {
   #_roomId;
   #_roomName;
   #_autoDispose;
-  get autoDispose() {
-    return this.#_autoDispose;
-  }
-  set autoDispose(value) {
-    if (value !== this.#_autoDispose && this._internalState !== 2 /* DISPOSING */) {
-      this.#_autoDispose = value;
-      this.resetAutoDisposeTimeout();
-    }
+  #_patchRate;
+  #_patchInterval;
+  __init() {
+    if (this.state) {
+      this.setState(this.state);
+    }
+    this.#_autoDispose = this.autoDispose;
+    this.#_patchRate = this.patchRate;
+    Object.defineProperties(this, {
+      autoDispose: {
+        enumerable: true,
+        get: () => this.#_autoDispose,
+        set: (value) => {
+          if (value !== this.#_autoDispose && this._internalState !== 2 /* DISPOSING */) {
+            this.#_autoDispose = value;
+            this.resetAutoDisposeTimeout();
+          }
+        }
+      },
+      patchRate: {
+        enumerable: true,
+        get: () => this.#_patchRate,
+        set: (milliseconds) => {
+          this.#_patchRate = milliseconds;
+          if (this.#_patchInterval) {
+            clearInterval(this.#_patchInterval);
+            this.#_patchInterval = void 0;
+          }
+          if (milliseconds !== null && milliseconds !== 0) {
+            this.#_patchInterval = setInterval(() => this.broadcastPatch(), milliseconds);
+          }
+        }
+      }
+    });
+    this.patchRate = this.#_patchRate;
+    this.resetAutoDisposeTimeout(this.seatReservationTime);
   }
   get roomName() {
     return this.#_roomName;
@@ -132,17 +165,20 @@ class Room {
     return this;
   }
   hasReservedSeat(sessionId, reconnectionToken) {
-    if (reconnectionToken) {
-      const reconnection = this._reconnections[reconnectionToken];
-      return reconnection && reconnection[0] === sessionId && this.reservedSeats[sessionId] !== void 0 && this._reconnectingSessionId.has(sessionId);
+    const reservedSeat = this.reservedSeats[sessionId];
+    if (reservedSeat === void 0) {
+      return false;
+    }
+    if (reservedSeat[3]) {
+      return reconnectionToken && this._reconnections[reconnectionToken]?.[0] === sessionId && this._reconnectingSessionId.has(sessionId);
     } else {
-      return this.reservedSeats[sessionId] !== void 0 && (!this._reconnectingSessionId.has(sessionId) || this._reconnectingSessionId.get(sessionId) === sessionId);
+      return reservedSeat[2] === false;
     }
   }
   checkReconnectionToken(reconnectionToken) {
-    const reconnection = this._reconnections[reconnectionToken];
-    const sessionId = reconnection && reconnection[0];
-    if (this.hasReservedSeat(sessionId)) {
+    const sessionId = this._reconnections[reconnectionToken]?.[0];
+    const reservedSeat = this.reservedSeats[sessionId];
+    if (reservedSeat && reservedSeat[3]) {
       this._reconnectingSessionId.set(sessionId, reconnectionToken);
       return sessionId;
     } else {
@@ -162,13 +198,6 @@ class Room {
   }
   setPatchRate(milliseconds) {
     this.patchRate = milliseconds;
-    if (this._patchInterval) {
-      clearInterval(this._patchInterval);
-      this._patchInterval = void 0;
-    }
-    if (milliseconds !== null && milliseconds !== 0) {
-      this._patchInterval = setInterval(() => this.broadcastPatch(), milliseconds);
-    }
   }
   setState(newState) {
     this.clock.start();
@@ -238,15 +267,21 @@ class Room {
     import_Logger.logger.warn("DEPRECATION WARNING: use client.send(...) instead of this.send(client, ...)");
     client.send(messageOrType, messageOrOptions, options);
   }
-  broadcast(typeOrSchema, messageOrOptions, options) {
-    const isSchema = typeof typeOrSchema === "object";
-    const opts = isSchema ? messageOrOptions : options;
-    if (opts && opts.afterNextPatch) {
-      delete opts.afterNextPatch;
+  broadcast(type, message, options) {
+    if (options && options.afterNextPatch) {
+      delete options.afterNextPatch;
       this._afterNextPatchQueue.push(["broadcast", arguments]);
       return;
     }
-    this.broadcastMessageType(typeOrSchema, messageOrOptions, opts);
+    this.broadcastMessageType(type, message, options);
+  }
+  broadcastBytes(type, message, options) {
+    if (options && options.afterNextPatch) {
+      delete options.afterNextPatch;
+      this._afterNextPatchQueue.push(["broadcastBytes", arguments]);
+      return;
+    }
+    this.broadcastMessageType(type, message, options);
   }
   broadcastPatch() {
     if (this.onBeforePatch) {
@@ -262,8 +297,8 @@ class Room {
     this._dequeueAfterPatchMessages();
     return hasChanges;
   }
-  onMessage(messageType, callback) {
-    this.onMessageHandlers[messageType] = callback;
+  onMessage(messageType, callback, validate) {
+    this.onMessageHandlers[messageType] = { callback, validate };
     return () => delete this.onMessageHandlers[messageType];
   }
   disconnect(closeCode = import_Protocol.Protocol.WS_CLOSE_CONSENTED) {
@@ -300,18 +335,23 @@ class Room {
       clearTimeout(this._autoDisposeTimeout);
       this._autoDisposeTimeout = void 0;
     }
-    const [joinOptions, authData] = this.reservedSeats[sessionId];
-    if (this.reservedSeats[sessionId].length > 2) {
+    const [joinOptions, authData, isConsumed, isWaitingReconnection] = this.reservedSeats[sessionId];
+    if (isConsumed) {
       throw new import_ServerError.ServerError(import_Protocol.ErrorCode.MATCHMAKE_EXPIRED, "already consumed");
     }
-    this.reservedSeats[sessionId].push(true);
+    this.reservedSeats[sessionId][2] = true;
     client._afterNextPatchQueue = this._afterNextPatchQueue;
     client.ref["onleave"] = (_) => client.state = import_Transport.ClientState.LEAVING;
     client.ref.once("close", client.ref["onleave"]);
-    const previousReconnectionToken = this._reconnectingSessionId.get(sessionId);
-    if (previousReconnectionToken) {
-      this.clients.push(client);
-      this._reconnections[previousReconnectionToken]?.[1].resolve(client);
+    if (isWaitingReconnection) {
+      const previousReconnectionToken = this._reconnectingSessionId.get(sessionId);
+      if (previousReconnectionToken) {
+        this.clients.push(client);
+        await this._reconnections[previousReconnectionToken]?.[1].resolve(client);
+      } else {
+        const errorMessage = process.env.NODE_ENV === "production" ? "already consumed" : "bad reconnection token";
+        throw new import_ServerError.ServerError(import_Protocol.ErrorCode.MATCHMAKE_EXPIRED, errorMessage);
+      }
     } else {
       try {
         if (authData) {
@@ -362,7 +402,7 @@ class Room {
   }
   allowReconnection(previousClient, seconds) {
     if (previousClient._enqueuedMessages !== void 0) {
-      return;
+      return import_Utils.Deferred.reject("client not joined");
     }
     if (seconds === void 0) {
       console.warn('DEPRECATED: allowReconnection() requires a second argument. Using "manual" mode.');
@@ -373,7 +413,7 @@ class Room {
     }
     if (this._internalState === 2 /* DISPOSING */) {
       this._disposeIfEmpty();
-      throw new Error("disconnecting");
+      return import_Utils.Deferred.reject("disconnecting");
     }
     const sessionId = previousClient.sessionId;
     const reconnectionToken = previousClient.reconnectionToken;
@@ -414,7 +454,7 @@ class Room {
   }
   broadcastMessageType(type, message, options = {}) {
     (0, import_Debug.debugMessage)("broadcast: %O", message);
-    const encodedMessage = import_Protocol.getMessageBytes.raw(import_Protocol.Protocol.ROOM_DATA, type, message);
+    const encodedMessage = message instanceof Uint8Array ? import_Protocol.getMessageBytes.raw(import_Protocol.Protocol.ROOM_DATA_BYTES, type, void 0, message) : import_Protocol.getMessageBytes.raw(import_Protocol.Protocol.ROOM_DATA, type, message);
     const except = typeof options.except !== "undefined" ? Array.isArray(options.except) ? options.except : [options.except] : void 0;
     let numClients = this.clients.length;
     while (numClients--) {
@@ -445,7 +485,7 @@ class Room {
     if (!allowReconnection && this.hasReachedMaxClients()) {
       return false;
     }
-    this.reservedSeats[sessionId] = [joinOptions, authData];
+    this.reservedSeats[sessionId] = [joinOptions, authData, false, allowReconnection];
     if (!allowReconnection) {
       await this._incrementClientCount();
       this.reservedSeatTimeouts[sessionId] = setTimeout(async () => {
@@ -469,14 +509,14 @@ class Room {
   }
   async _dispose() {
     this._internalState = 2 /* DISPOSING */;
-    await this.listing.remove();
+    this.listing.remove();
     let userReturnData;
     if (this.onDispose) {
       userReturnData = this.onDispose();
     }
-    if (this._patchInterval) {
-      clearInterval(this._patchInterval);
-      this._patchInterval = void 0;
+    if (this.#_patchInterval) {
+      clearInterval(this.#_patchInterval);
+      this.#_patchInterval = void 0;
     }
     if (this._simulationInterval) {
       clearInterval(this._simulationInterval);
@@ -502,44 +542,36 @@ class Room {
     }
     if (code === import_Protocol.Protocol.ROOM_DATA) {
       const messageType = import_schema.decode.stringCheck(buffer, it) ? import_schema.decode.string(buffer, it) : import_schema.decode.number(buffer, it);
+      const messageTypeHandler = this.onMessageHandlers[messageType];
       let message;
       try {
         message = buffer.byteLength > it.offset ? (0, import_msgpackr.unpack)(buffer.subarray(it.offset, buffer.byteLength)) : void 0;
         (0, import_Debug.debugMessage)("received: '%s' -> %j", messageType, message);
+        if (messageTypeHandler?.validate !== void 0) {
+          message = messageTypeHandler.validate(message);
+        }
       } catch (e) {
         (0, import_Debug.debugAndPrintError)(e);
         client.leave(import_Protocol.Protocol.WS_CLOSE_WITH_ERROR);
         return;
       }
-      if (this.onMessageHandlers[messageType]) {
-        this.onMessageHandlers[messageType](client, message);
-      } else if (this.onMessageHandlers["*"]) {
-        this.onMessageHandlers["*"](client, messageType, message);
+      if (messageTypeHandler) {
+        messageTypeHandler.callback(client, message);
       } else {
-        const errorMessage = `onMessage for "${messageType}" not registered.`;
-        (0, import_Debug.debugAndPrintError)(errorMessage);
-        if (import_DevMode.isDevMode) {
-          client.error(import_Protocol.ErrorCode.INVALID_PAYLOAD, errorMessage);
-        } else {
-          client.leave(import_Protocol.Protocol.WS_CLOSE_WITH_ERROR, errorMessage);
-        }
+        (this.onMessageHandlers["*"] || this.onMessageHandlers["__no_message_handler"]).callback(client, messageType, message);
       }
     } else if (code === import_Protocol.Protocol.ROOM_DATA_BYTES) {
       const messageType = import_schema.decode.stringCheck(buffer, it) ? import_schema.decode.string(buffer, it) : import_schema.decode.number(buffer, it);
-      const message = buffer.subarray(it.offset, buffer.byteLength);
+      const messageTypeHandler = this.onMessageHandlers[messageType];
+      let message = buffer.subarray(it.offset, buffer.byteLength);
       (0, import_Debug.debugMessage)("received: '%s' -> %j", messageType, message);
-      if (this.onMessageHandlers[messageType]) {
-        this.onMessageHandlers[messageType](client, message);
-      } else if (this.onMessageHandlers["*"]) {
-        this.onMessageHandlers["*"](client, messageType, message);
+      if (messageTypeHandler?.validate !== void 0) {
+        message = messageTypeHandler.validate(message);
+      }
+      if (messageTypeHandler) {
+        messageTypeHandler.callback(client, message);
       } else {
-        const errorMessage = `onMessage for "${messageType}" not registered.`;
-        (0, import_Debug.debugAndPrintError)(errorMessage);
-        if (import_DevMode.isDevMode) {
-          client.error(import_Protocol.ErrorCode.INVALID_PAYLOAD, errorMessage);
-        } else {
-          client.leave(import_Protocol.Protocol.WS_CLOSE_WITH_ERROR, errorMessage);
-        }
+        (this.onMessageHandlers["*"] || this.onMessageHandlers["__no_message_handler"]).callback(client, messageType, message);
       }
     } else if (code === import_Protocol.Protocol.JOIN_ROOM && client.state === import_Transport.ClientState.JOINING) {
       client.state = import_Transport.ClientState.JOINED;
@@ -572,11 +604,18 @@ class Room {
         }
       }
     }
-    if (client.state !== import_Transport.ClientState.RECONNECTED) {
-      const willDispose = await this._decrementClientCount();
-      if (this.reservedSeats[client.sessionId] === void 0) {
-        this._events.emit("leave", client, willDispose);
-      }
+    if (this._reconnections[client.reconnectionToken]) {
+      this._reconnections[client.reconnectionToken][1].catch(async () => {
+        await this._onAfterLeave(client);
+      });
+    } else if (client.state !== import_Transport.ClientState.RECONNECTED) {
+      await this._onAfterLeave(client);
+    }
+  }
+  async _onAfterLeave(client) {
+    const willDispose = await this._decrementClientCount();
+    if (this.reservedSeats[client.sessionId] === void 0) {
+      this._events.emit("leave", client, willDispose);
     }
   }
   async _incrementClientCount() {