@colyseus/core 0.15.41 → 0.16.0-preview.1

package/build/Protocol.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Schema } from '@colyseus/schema';
+import { Iterator } from '@colyseus/schema';
 export declare enum Protocol {
     JOIN_ROOM = 10,
     ERROR = 11,
@@ -7,7 +7,6 @@ export declare enum Protocol {
     ROOM_DATA = 13,
     ROOM_STATE = 14,
     ROOM_STATE_PATCH = 15,
-    ROOM_DATA_SCHEMA = 16,// used to send schema instances via room.send()
     ROOM_DATA_BYTES = 17,
     WS_CLOSE_NORMAL = 1000,
     WS_CLOSE_GOING_AWAY = 1001,
@@ -33,11 +32,9 @@ export declare enum IpcProtocol {
     TIMEOUT = 2
 }
 export declare const getMessageBytes: {
-    10: (reconnectionToken: string, serializerId: string, handshake?: number[]) => Buffer;
-    11: (code: number, message?: string) => Protocol[];
+    10: (reconnectionToken: string, serializerId: string, handshake?: Buffer) => Buffer;
+    11: (code: number, message?: string) => Buffer;
     14: (bytes: number[]) => number[];
-    16: (message: Schema) => number[];
-    raw: (code: Protocol, type: string | number, message?: any, rawMessage?: ArrayLike<number> | Buffer) => Uint8Array;
+    raw: (code: Protocol, type: string | number, message?: any, rawMessage?: Uint8Array | Buffer) => Buffer;
 };
-export declare function utf8Write(buff: Buffer, offset: number, str?: string): void;
-export declare function utf8Length(str?: string): number;
+export declare function utf8Write(buff: Buffer, it: Iterator, str?: string): void;

package/build/Protocol.js

@@ -21,13 +21,11 @@ __export(Protocol_exports, {
   IpcProtocol: () => IpcProtocol,
   Protocol: () => Protocol,
   getMessageBytes: () => getMessageBytes,
-  utf8Length: () => utf8Length,
   utf8Write: () => utf8Write
 });
 module.exports = __toCommonJS(Protocol_exports);
 var import_msgpackr = require("msgpackr");
 var import_schema = require("@colyseus/schema");
-var import_Logger = require("./Logger");
 var Protocol = /* @__PURE__ */ ((Protocol2) => {
   Protocol2[Protocol2["JOIN_ROOM"] = 10] = "JOIN_ROOM";
   Protocol2[Protocol2["ERROR"] = 11] = "ERROR";
@@ -35,7 +33,6 @@ var Protocol = /* @__PURE__ */ ((Protocol2) => {
   Protocol2[Protocol2["ROOM_DATA"] = 13] = "ROOM_DATA";
   Protocol2[Protocol2["ROOM_STATE"] = 14] = "ROOM_STATE";
   Protocol2[Protocol2["ROOM_STATE_PATCH"] = 15] = "ROOM_STATE_PATCH";
-  Protocol2[Protocol2["ROOM_DATA_SCHEMA"] = 16] = "ROOM_DATA_SCHEMA";
   Protocol2[Protocol2["ROOM_DATA_BYTES"] = 17] = "ROOM_DATA_BYTES";
   Protocol2[Protocol2["WS_CLOSE_NORMAL"] = 1e3] = "WS_CLOSE_NORMAL";
   Protocol2[Protocol2["WS_CLOSE_GOING_AWAY"] = 1001] = "WS_CLOSE_GOING_AWAY";
@@ -63,109 +60,70 @@ var IpcProtocol = /* @__PURE__ */ ((IpcProtocol2) => {
   IpcProtocol2[IpcProtocol2["TIMEOUT"] = 2] = "TIMEOUT";
   return IpcProtocol2;
 })(IpcProtocol || {});
+const sendBuffer = Buffer.allocUnsafe(8192);
+const packr = new import_msgpackr.Packr();
+packr.useBuffer(sendBuffer);
 const getMessageBytes = {
   [10 /* JOIN_ROOM */]: (reconnectionToken, serializerId, handshake) => {
-    let offset = 0;
-    const reconnectionTokenLength = utf8Length(reconnectionToken);
-    const serializerIdLength = utf8Length(serializerId);
-    const handshakeLength = handshake ? handshake.length : 0;
-    const buff = Buffer.allocUnsafe(1 + reconnectionTokenLength + serializerIdLength + handshakeLength);
-    buff.writeUInt8(10 /* JOIN_ROOM */, offset++);
-    utf8Write(buff, offset, reconnectionToken);
-    offset += reconnectionTokenLength;
-    utf8Write(buff, offset, serializerId);
-    offset += serializerIdLength;
-    if (handshake) {
-      for (let i = 0, l = handshake.length; i < l; i++) {
-        buff.writeUInt8(handshake[i], offset++);
-      }
-    }
-    return buff;
+    const it = { offset: 1 };
+    sendBuffer[0] = 10 /* JOIN_ROOM */;
+    utf8Write(sendBuffer, it, reconnectionToken);
+    utf8Write(sendBuffer, it, serializerId);
+    return Buffer.concat([sendBuffer.subarray(0, it.offset), handshake]);
   },
   [11 /* ERROR */]: (code, message = "") => {
-    const bytes = [11 /* ERROR */];
-    import_schema.encode.number(bytes, code);
-    import_schema.encode.string(bytes, message);
-    return bytes;
+    const it = { offset: 1 };
+    sendBuffer[0] = 11 /* ERROR */;
+    import_schema.encode.number(sendBuffer, code, it);
+    import_schema.encode.string(sendBuffer, message, it);
+    return sendBuffer.subarray(0, it.offset);
   },
   [14 /* ROOM_STATE */]: (bytes) => {
     return [14 /* ROOM_STATE */, ...bytes];
   },
-  [16 /* ROOM_DATA_SCHEMA */]: (message) => {
-    const typeid = message.constructor._typeid;
-    if (typeid === void 0) {
-      import_Logger.logger.warn("Starting at colyseus >= 0.13 You must provide a type and message when calling `this.broadcast()` or `client.send()`. Please see: https://docs.colyseus.io/migrating/0.13/");
-      throw new Error(`an instance of Schema was expected, but ${JSON.stringify(message)} has been provided.`);
-    }
-    return [16 /* ROOM_DATA_SCHEMA */, typeid, ...message.encodeAll()];
-  },
   raw: (code, type, message, rawMessage) => {
-    const initialBytes = [code];
-    const messageType = typeof type;
-    if (messageType === "string") {
-      import_schema.encode.string(initialBytes, type);
-    } else if (messageType === "number") {
-      import_schema.encode.number(initialBytes, type);
+    const it = { offset: 1 };
+    sendBuffer[0] = code;
+    if (typeof type === "string") {
+      import_schema.encode.string(sendBuffer, type, it);
     } else {
-      throw new Error(`Protocol.ROOM_DATA: message type not supported "${type.toString()}"`);
+      import_schema.encode.number(sendBuffer, type, it);
     }
-    let arr;
     if (message !== void 0) {
-      const encoded = (0, import_msgpackr.pack)(message);
-      arr = new Uint8Array(initialBytes.length + encoded.byteLength);
-      arr.set(new Uint8Array(initialBytes), 0);
-      arr.set(new Uint8Array(encoded), initialBytes.length);
+      return (0, import_msgpackr.pack)(message, 2048 + it.offset);
     } else if (rawMessage !== void 0) {
-      arr = new Uint8Array(initialBytes.length + (rawMessage.byteLength || rawMessage.length));
-      arr.set(new Uint8Array(initialBytes), 0);
-      arr.set(new Uint8Array(rawMessage), initialBytes.length);
+      return Buffer.concat([sendBuffer.subarray(0, it.offset), rawMessage]);
     } else {
-      arr = new Uint8Array(initialBytes);
+      return sendBuffer.subarray(0, it.offset);
     }
-    return arr;
   }
 };
-function utf8Write(buff, offset, str = "") {
-  buff[offset++] = utf8Length(str) - 1;
+function utf8Write(buff, it, str = "") {
+  const byteLength = Buffer.byteLength(str, "utf8");
+  console.log("utf8Write", { byteLength, str });
+  buff[it.offset++] = byteLength;
   let c = 0;
   for (let i = 0, l = str.length; i < l; i++) {
     c = str.charCodeAt(i);
     if (c < 128) {
-      buff[offset++] = c;
+      buff[it.offset++] = c;
     } else if (c < 2048) {
-      buff[offset++] = 192 | c >> 6;
-      buff[offset++] = 128 | c & 63;
+      buff[it.offset++] = 192 | c >> 6;
+      buff[it.offset++] = 128 | c & 63;
     } else if (c < 55296 || c >= 57344) {
-      buff[offset++] = 224 | c >> 12;
-      buff[offset++] = 128 | c >> 6 & 63;
-      buff[offset++] = 128 | c & 63;
+      buff[it.offset++] = 224 | c >> 12;
+      buff[it.offset++] = 128 | c >> 6 & 63;
+      buff[it.offset++] = 128 | c & 63;
     } else {
       i++;
       c = 65536 + ((c & 1023) << 10 | str.charCodeAt(i) & 1023);
-      buff[offset++] = 240 | c >> 18;
-      buff[offset++] = 128 | c >> 12 & 63;
-      buff[offset++] = 128 | c >> 6 & 63;
-      buff[offset++] = 128 | c & 63;
-    }
-  }
-}
-function utf8Length(str = "") {
-  let c = 0;
-  let length = 0;
-  for (let i = 0, l = str.length; i < l; i++) {
-    c = str.charCodeAt(i);
-    if (c < 128) {
-      length += 1;
-    } else if (c < 2048) {
-      length += 2;
-    } else if (c < 55296 || c >= 57344) {
-      length += 3;
-    } else {
-      i++;
-      length += 4;
+      buff[it.offset++] = 240 | c >> 18;
+      buff[it.offset++] = 128 | c >> 12 & 63;
+      buff[it.offset++] = 128 | c >> 6 & 63;
+      buff[it.offset++] = 128 | c & 63;
     }
   }
-  return length + 1;
+  it.offset += byteLength;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -173,6 +131,5 @@ function utf8Length(str = "") {
   IpcProtocol,
   Protocol,
   getMessageBytes,
-  utf8Length,
   utf8Write
 });

package/build/Protocol.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/Protocol.ts"],
-  "sourcesContent": ["import { pack } from 'msgpackr';\nimport { encode, Schema } from '@colyseus/schema';\nimport { logger } from './Logger';\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, // 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\nexport const getMessageBytes = {\n  [Protocol.JOIN_ROOM]: (reconnectionToken: string, serializerId: string, handshake?: number[]) => {\n    let offset = 0;\n\n    const reconnectionTokenLength = utf8Length(reconnectionToken);\n    const serializerIdLength = utf8Length(serializerId);\n    const handshakeLength = (handshake) ? handshake.length : 0;\n\n    const buff = Buffer.allocUnsafe(1 + reconnectionTokenLength + serializerIdLength + handshakeLength);\n    buff.writeUInt8(Protocol.JOIN_ROOM, offset++);\n\n    utf8Write(buff, offset, reconnectionToken);\n    offset += reconnectionTokenLength;\n\n    utf8Write(buff, offset, serializerId);\n    offset += serializerIdLength;\n\n    if (handshake) {\n      for (let i = 0, l = handshake.length; i < l; i++) {\n        buff.writeUInt8(handshake[i], offset++);\n      }\n    }\n\n    return buff;\n  },\n\n  [Protocol.ERROR]: (code: number, message: string = '') => {\n    const bytes = [Protocol.ERROR];\n\n    encode.number(bytes, code);\n    encode.string(bytes, message);\n\n    return bytes;\n  },\n\n  [Protocol.ROOM_STATE]: (bytes: number[]) => {\n    return [Protocol.ROOM_STATE, ...bytes];\n  },\n\n  [Protocol.ROOM_DATA_SCHEMA]: (message: Schema) => {\n    const typeid = (message.constructor as typeof Schema)._typeid;\n\n    if (typeid === undefined) {\n      logger.warn('Starting at colyseus >= 0.13 You must provide a type and message when calling `this.broadcast()` or `client.send()`. Please see: https://docs.colyseus.io/migrating/0.13/');\n      throw new Error(`an instance of Schema was expected, but ${JSON.stringify(message)} has been provided.`);\n    }\n\n    return [Protocol.ROOM_DATA_SCHEMA, typeid, ...message.encodeAll()];\n  },\n\n  raw: (code: Protocol, type: string | number, message?: any, rawMessage?: ArrayLike<number> | Buffer) => {\n    const initialBytes: number[] = [code];\n    const messageType = typeof (type);\n\n    if (messageType === 'string') {\n      encode.string(initialBytes, type);\n\n    } else if (messageType === 'number') {\n      encode.number(initialBytes, type);\n\n    } else {\n      throw new Error(`Protocol.ROOM_DATA: message type not supported \"${type.toString()}\"`);\n    }\n\n    let arr: Uint8Array;\n\n    if (message !== undefined) {\n      const encoded = pack(message);\n      arr = new Uint8Array(initialBytes.length + encoded.byteLength);\n      arr.set(new Uint8Array(initialBytes), 0);\n      arr.set(new Uint8Array(encoded), initialBytes.length);\n\n    } else if (rawMessage !== undefined) {\n      arr = new Uint8Array(initialBytes.length + ((rawMessage as Buffer).byteLength || rawMessage.length));\n      arr.set(new Uint8Array(initialBytes), 0);\n      arr.set(new Uint8Array(rawMessage), initialBytes.length);\n\n    } else {\n      arr = new Uint8Array(initialBytes);\n    }\n\n    return arr;\n  },\n\n};\n\nexport function utf8Write(buff: Buffer, offset: number, str: string = '') {\n  buff[offset++] = utf8Length(str) - 1;\n\n  let c = 0;\n  for (let i = 0, l = str.length; i < l; i++) {\n    c = str.charCodeAt(i);\n    if (c < 0x80) {\n      buff[offset++] = c;\n    } else if (c < 0x800) {\n      buff[offset++] = 0xc0 | (c >> 6);\n      buff[offset++] = 0x80 | (c & 0x3f);\n    } else if (c < 0xd800 || c >= 0xe000) {\n      buff[offset++] = 0xe0 | (c >> 12);\n      buff[offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[offset++] = 0x80 | (c & 0x3f);\n    } else {\n      i++;\n      c = 0x10000 + (((c & 0x3ff) << 10) | (str.charCodeAt(i) & 0x3ff));\n      buff[offset++] = 0xf0 | (c >> 18);\n      buff[offset++] = 0x80 | (c >> 12) & 0x3f;\n      buff[offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[offset++] = 0x80 | (c & 0x3f);\n    }\n  }\n}\n\n// Faster for short strings than Buffer.byteLength\nexport function utf8Length(str: string = '') {\n  let c = 0;\n  let length = 0;\n  for (let i = 0, l = str.length; i < l; i++) {\n    c = str.charCodeAt(i);\n    if (c < 0x80) {\n      length += 1;\n    } else if (c < 0x800) {\n      length += 2;\n    } else if (c < 0xd800 || c >= 0xe000) {\n      length += 3;\n    } else {\n      i++;\n      length += 4;\n    }\n  }\n  return length + 1;\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { pack, Packr } from '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);\nconst packr = new Packr();\n// @ts-ignore\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    utf8Write(sendBuffer, it, reconnectionToken);\n    utf8Write(sendBuffer, it, serializerId);\n\n    return Buffer.concat([sendBuffer.subarray(0, it.offset), handshake]);\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    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      // @ts-ignore\n      return pack(message, 2048 + it.offset); // PR to fix TypeScript types https://github.com/kriszyp/msgpackr/pull/137\n                        // 2048 = RESERVE_START_SPACE\n\n    } else if (rawMessage !== undefined) {\n      return Buffer.concat([sendBuffer.subarray(0, it.offset), rawMessage]);\n\n    } else {\n      return sendBuffer.subarray(0, it.offset);\n    }\n  },\n\n};\n\nexport function utf8Write(buff: Buffer, it: Iterator, str: string = '') {\n  const byteLength = Buffer.byteLength(str, \"utf8\");\n  console.log(\"utf8Write\", { byteLength, str });\n\n  buff[it.offset++] = byteLength;\n\n  let c = 0;\n  for (let i = 0, l = str.length; i < l; i++) {\n    c = str.charCodeAt(i);\n    if (c < 0x80) {\n      buff[it.offset++] = c;\n    } else if (c < 0x800) {\n      buff[it.offset++] = 0xc0 | (c >> 6);\n      buff[it.offset++] = 0x80 | (c & 0x3f);\n    } else if (c < 0xd800 || c >= 0xe000) {\n      buff[it.offset++] = 0xe0 | (c >> 12);\n      buff[it.offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[it.offset++] = 0x80 | (c & 0x3f);\n    } else {\n      i++;\n      c = 0x10000 + (((c & 0x3ff) << 10) | (str.charCodeAt(i) & 0x3ff));\n      buff[it.offset++] = 0xf0 | (c >> 18);\n      buff[it.offset++] = 0x80 | (c >> 12) & 0x3f;\n      buff[it.offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[it.offset++] = 0x80 | (c & 0x3f);\n    }\n  }\n\n  it.offset += byteLength;\n}\n"],
+  "mappings": "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",
   "names": ["Protocol", "ErrorCode", "IpcProtocol"]
 }

package/build/Protocol.mjs

@@ -1,6 +1,5 @@
-import { pack } from "msgpackr";
+import { pack, Packr } from "msgpackr";
 import { encode } from "@colyseus/schema";
-import { logger } from "./Logger";
 var Protocol = /* @__PURE__ */ ((Protocol2) => {
   Protocol2[Protocol2["JOIN_ROOM"] = 10] = "JOIN_ROOM";
   Protocol2[Protocol2["ERROR"] = 11] = "ERROR";
@@ -8,7 +7,6 @@ var Protocol = /* @__PURE__ */ ((Protocol2) => {
   Protocol2[Protocol2["ROOM_DATA"] = 13] = "ROOM_DATA";
   Protocol2[Protocol2["ROOM_STATE"] = 14] = "ROOM_STATE";
   Protocol2[Protocol2["ROOM_STATE_PATCH"] = 15] = "ROOM_STATE_PATCH";
-  Protocol2[Protocol2["ROOM_DATA_SCHEMA"] = 16] = "ROOM_DATA_SCHEMA";
   Protocol2[Protocol2["ROOM_DATA_BYTES"] = 17] = "ROOM_DATA_BYTES";
   Protocol2[Protocol2["WS_CLOSE_NORMAL"] = 1e3] = "WS_CLOSE_NORMAL";
   Protocol2[Protocol2["WS_CLOSE_GOING_AWAY"] = 1001] = "WS_CLOSE_GOING_AWAY";
@@ -36,115 +34,75 @@ var IpcProtocol = /* @__PURE__ */ ((IpcProtocol2) => {
   IpcProtocol2[IpcProtocol2["TIMEOUT"] = 2] = "TIMEOUT";
   return IpcProtocol2;
 })(IpcProtocol || {});
+const sendBuffer = Buffer.allocUnsafe(8192);
+const packr = new Packr();
+packr.useBuffer(sendBuffer);
 const getMessageBytes = {
   [10 /* JOIN_ROOM */]: (reconnectionToken, serializerId, handshake) => {
-    let offset = 0;
-    const reconnectionTokenLength = utf8Length(reconnectionToken);
-    const serializerIdLength = utf8Length(serializerId);
-    const handshakeLength = handshake ? handshake.length : 0;
-    const buff = Buffer.allocUnsafe(1 + reconnectionTokenLength + serializerIdLength + handshakeLength);
-    buff.writeUInt8(10 /* JOIN_ROOM */, offset++);
-    utf8Write(buff, offset, reconnectionToken);
-    offset += reconnectionTokenLength;
-    utf8Write(buff, offset, serializerId);
-    offset += serializerIdLength;
-    if (handshake) {
-      for (let i = 0, l = handshake.length; i < l; i++) {
-        buff.writeUInt8(handshake[i], offset++);
-      }
-    }
-    return buff;
+    const it = { offset: 1 };
+    sendBuffer[0] = 10 /* JOIN_ROOM */;
+    utf8Write(sendBuffer, it, reconnectionToken);
+    utf8Write(sendBuffer, it, serializerId);
+    return Buffer.concat([sendBuffer.subarray(0, it.offset), handshake]);
   },
   [11 /* ERROR */]: (code, message = "") => {
-    const bytes = [11 /* ERROR */];
-    encode.number(bytes, code);
-    encode.string(bytes, message);
-    return bytes;
+    const it = { offset: 1 };
+    sendBuffer[0] = 11 /* ERROR */;
+    encode.number(sendBuffer, code, it);
+    encode.string(sendBuffer, message, it);
+    return sendBuffer.subarray(0, it.offset);
   },
   [14 /* ROOM_STATE */]: (bytes) => {
     return [14 /* ROOM_STATE */, ...bytes];
   },
-  [16 /* ROOM_DATA_SCHEMA */]: (message) => {
-    const typeid = message.constructor._typeid;
-    if (typeid === void 0) {
-      logger.warn("Starting at colyseus >= 0.13 You must provide a type and message when calling `this.broadcast()` or `client.send()`. Please see: https://docs.colyseus.io/migrating/0.13/");
-      throw new Error(`an instance of Schema was expected, but ${JSON.stringify(message)} has been provided.`);
-    }
-    return [16 /* ROOM_DATA_SCHEMA */, typeid, ...message.encodeAll()];
-  },
   raw: (code, type, message, rawMessage) => {
-    const initialBytes = [code];
-    const messageType = typeof type;
-    if (messageType === "string") {
-      encode.string(initialBytes, type);
-    } else if (messageType === "number") {
-      encode.number(initialBytes, type);
+    const it = { offset: 1 };
+    sendBuffer[0] = code;
+    if (typeof type === "string") {
+      encode.string(sendBuffer, type, it);
     } else {
-      throw new Error(`Protocol.ROOM_DATA: message type not supported "${type.toString()}"`);
+      encode.number(sendBuffer, type, it);
     }
-    let arr;
     if (message !== void 0) {
-      const encoded = pack(message);
-      arr = new Uint8Array(initialBytes.length + encoded.byteLength);
-      arr.set(new Uint8Array(initialBytes), 0);
-      arr.set(new Uint8Array(encoded), initialBytes.length);
+      return pack(message, 2048 + it.offset);
     } else if (rawMessage !== void 0) {
-      arr = new Uint8Array(initialBytes.length + (rawMessage.byteLength || rawMessage.length));
-      arr.set(new Uint8Array(initialBytes), 0);
-      arr.set(new Uint8Array(rawMessage), initialBytes.length);
+      return Buffer.concat([sendBuffer.subarray(0, it.offset), rawMessage]);
     } else {
-      arr = new Uint8Array(initialBytes);
+      return sendBuffer.subarray(0, it.offset);
     }
-    return arr;
   }
 };
-function utf8Write(buff, offset, str = "") {
-  buff[offset++] = utf8Length(str) - 1;
+function utf8Write(buff, it, str = "") {
+  const byteLength = Buffer.byteLength(str, "utf8");
+  console.log("utf8Write", { byteLength, str });
+  buff[it.offset++] = byteLength;
   let c = 0;
   for (let i = 0, l = str.length; i < l; i++) {
     c = str.charCodeAt(i);
     if (c < 128) {
-      buff[offset++] = c;
+      buff[it.offset++] = c;
     } else if (c < 2048) {
-      buff[offset++] = 192 | c >> 6;
-      buff[offset++] = 128 | c & 63;
+      buff[it.offset++] = 192 | c >> 6;
+      buff[it.offset++] = 128 | c & 63;
     } else if (c < 55296 || c >= 57344) {
-      buff[offset++] = 224 | c >> 12;
-      buff[offset++] = 128 | c >> 6 & 63;
-      buff[offset++] = 128 | c & 63;
+      buff[it.offset++] = 224 | c >> 12;
+      buff[it.offset++] = 128 | c >> 6 & 63;
+      buff[it.offset++] = 128 | c & 63;
     } else {
       i++;
       c = 65536 + ((c & 1023) << 10 | str.charCodeAt(i) & 1023);
-      buff[offset++] = 240 | c >> 18;
-      buff[offset++] = 128 | c >> 12 & 63;
-      buff[offset++] = 128 | c >> 6 & 63;
-      buff[offset++] = 128 | c & 63;
-    }
-  }
-}
-function utf8Length(str = "") {
-  let c = 0;
-  let length = 0;
-  for (let i = 0, l = str.length; i < l; i++) {
-    c = str.charCodeAt(i);
-    if (c < 128) {
-      length += 1;
-    } else if (c < 2048) {
-      length += 2;
-    } else if (c < 55296 || c >= 57344) {
-      length += 3;
-    } else {
-      i++;
-      length += 4;
+      buff[it.offset++] = 240 | c >> 18;
+      buff[it.offset++] = 128 | c >> 12 & 63;
+      buff[it.offset++] = 128 | c >> 6 & 63;
+      buff[it.offset++] = 128 | c & 63;
     }
   }
-  return length + 1;
+  it.offset += byteLength;
 }
 export {
   ErrorCode,
   IpcProtocol,
   Protocol,
   getMessageBytes,
-  utf8Length,
   utf8Write
 };

package/build/Protocol.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/Protocol.ts"],
-  "sourcesContent": ["import { pack } from 'msgpackr';\nimport { encode, Schema } from '@colyseus/schema';\nimport { logger } from './Logger';\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, // 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\nexport const getMessageBytes = {\n  [Protocol.JOIN_ROOM]: (reconnectionToken: string, serializerId: string, handshake?: number[]) => {\n    let offset = 0;\n\n    const reconnectionTokenLength = utf8Length(reconnectionToken);\n    const serializerIdLength = utf8Length(serializerId);\n    const handshakeLength = (handshake) ? handshake.length : 0;\n\n    const buff = Buffer.allocUnsafe(1 + reconnectionTokenLength + serializerIdLength + handshakeLength);\n    buff.writeUInt8(Protocol.JOIN_ROOM, offset++);\n\n    utf8Write(buff, offset, reconnectionToken);\n    offset += reconnectionTokenLength;\n\n    utf8Write(buff, offset, serializerId);\n    offset += serializerIdLength;\n\n    if (handshake) {\n      for (let i = 0, l = handshake.length; i < l; i++) {\n        buff.writeUInt8(handshake[i], offset++);\n      }\n    }\n\n    return buff;\n  },\n\n  [Protocol.ERROR]: (code: number, message: string = '') => {\n    const bytes = [Protocol.ERROR];\n\n    encode.number(bytes, code);\n    encode.string(bytes, message);\n\n    return bytes;\n  },\n\n  [Protocol.ROOM_STATE]: (bytes: number[]) => {\n    return [Protocol.ROOM_STATE, ...bytes];\n  },\n\n  [Protocol.ROOM_DATA_SCHEMA]: (message: Schema) => {\n    const typeid = (message.constructor as typeof Schema)._typeid;\n\n    if (typeid === undefined) {\n      logger.warn('Starting at colyseus >= 0.13 You must provide a type and message when calling `this.broadcast()` or `client.send()`. Please see: https://docs.colyseus.io/migrating/0.13/');\n      throw new Error(`an instance of Schema was expected, but ${JSON.stringify(message)} has been provided.`);\n    }\n\n    return [Protocol.ROOM_DATA_SCHEMA, typeid, ...message.encodeAll()];\n  },\n\n  raw: (code: Protocol, type: string | number, message?: any, rawMessage?: ArrayLike<number> | Buffer) => {\n    const initialBytes: number[] = [code];\n    const messageType = typeof (type);\n\n    if (messageType === 'string') {\n      encode.string(initialBytes, type);\n\n    } else if (messageType === 'number') {\n      encode.number(initialBytes, type);\n\n    } else {\n      throw new Error(`Protocol.ROOM_DATA: message type not supported \"${type.toString()}\"`);\n    }\n\n    let arr: Uint8Array;\n\n    if (message !== undefined) {\n      const encoded = pack(message);\n      arr = new Uint8Array(initialBytes.length + encoded.byteLength);\n      arr.set(new Uint8Array(initialBytes), 0);\n      arr.set(new Uint8Array(encoded), initialBytes.length);\n\n    } else if (rawMessage !== undefined) {\n      arr = new Uint8Array(initialBytes.length + ((rawMessage as Buffer).byteLength || rawMessage.length));\n      arr.set(new Uint8Array(initialBytes), 0);\n      arr.set(new Uint8Array(rawMessage), initialBytes.length);\n\n    } else {\n      arr = new Uint8Array(initialBytes);\n    }\n\n    return arr;\n  },\n\n};\n\nexport function utf8Write(buff: Buffer, offset: number, str: string = '') {\n  buff[offset++] = utf8Length(str) - 1;\n\n  let c = 0;\n  for (let i = 0, l = str.length; i < l; i++) {\n    c = str.charCodeAt(i);\n    if (c < 0x80) {\n      buff[offset++] = c;\n    } else if (c < 0x800) {\n      buff[offset++] = 0xc0 | (c >> 6);\n      buff[offset++] = 0x80 | (c & 0x3f);\n    } else if (c < 0xd800 || c >= 0xe000) {\n      buff[offset++] = 0xe0 | (c >> 12);\n      buff[offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[offset++] = 0x80 | (c & 0x3f);\n    } else {\n      i++;\n      c = 0x10000 + (((c & 0x3ff) << 10) | (str.charCodeAt(i) & 0x3ff));\n      buff[offset++] = 0xf0 | (c >> 18);\n      buff[offset++] = 0x80 | (c >> 12) & 0x3f;\n      buff[offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[offset++] = 0x80 | (c & 0x3f);\n    }\n  }\n}\n\n// Faster for short strings than Buffer.byteLength\nexport function utf8Length(str: string = '') {\n  let c = 0;\n  let length = 0;\n  for (let i = 0, l = str.length; i < l; i++) {\n    c = str.charCodeAt(i);\n    if (c < 0x80) {\n      length += 1;\n    } else if (c < 0x800) {\n      length += 2;\n    } else if (c < 0xd800 || c >= 0xe000) {\n      length += 3;\n    } else {\n      i++;\n      length += 4;\n    }\n  }\n  return length + 1;\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { pack, Packr } from '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);\nconst packr = new Packr();\n// @ts-ignore\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    utf8Write(sendBuffer, it, reconnectionToken);\n    utf8Write(sendBuffer, it, serializerId);\n\n    return Buffer.concat([sendBuffer.subarray(0, it.offset), handshake]);\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    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      // @ts-ignore\n      return pack(message, 2048 + it.offset); // PR to fix TypeScript types https://github.com/kriszyp/msgpackr/pull/137\n                        // 2048 = RESERVE_START_SPACE\n\n    } else if (rawMessage !== undefined) {\n      return Buffer.concat([sendBuffer.subarray(0, it.offset), rawMessage]);\n\n    } else {\n      return sendBuffer.subarray(0, it.offset);\n    }\n  },\n\n};\n\nexport function utf8Write(buff: Buffer, it: Iterator, str: string = '') {\n  const byteLength = Buffer.byteLength(str, \"utf8\");\n  console.log(\"utf8Write\", { byteLength, str });\n\n  buff[it.offset++] = byteLength;\n\n  let c = 0;\n  for (let i = 0, l = str.length; i < l; i++) {\n    c = str.charCodeAt(i);\n    if (c < 0x80) {\n      buff[it.offset++] = c;\n    } else if (c < 0x800) {\n      buff[it.offset++] = 0xc0 | (c >> 6);\n      buff[it.offset++] = 0x80 | (c & 0x3f);\n    } else if (c < 0xd800 || c >= 0xe000) {\n      buff[it.offset++] = 0xe0 | (c >> 12);\n      buff[it.offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[it.offset++] = 0x80 | (c & 0x3f);\n    } else {\n      i++;\n      c = 0x10000 + (((c & 0x3ff) << 10) | (str.charCodeAt(i) & 0x3ff));\n      buff[it.offset++] = 0xf0 | (c >> 18);\n      buff[it.offset++] = 0x80 | (c >> 12) & 0x3f;\n      buff[it.offset++] = 0x80 | (c >> 6) & 0x3f;\n      buff[it.offset++] = 0x80 | (c & 0x3f);\n    }\n  }\n\n  it.offset += byteLength;\n}\n"],
+  "mappings": "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",
   "names": ["Protocol", "ErrorCode", "IpcProtocol"]
 }

package/build/Room.d.ts

@@ -20,8 +20,6 @@ export declare enum RoomInternalState {
     CREATED = 1,
     DISPOSING = 2
 }
-type ExtractUserData<T> = T extends ClientArray<infer U> ? U : never;
-type ExtractAuthData<T> = T extends ClientArray<infer _, infer U> ? U : never;
 /**
  * A Room class is meant to implement a game session, and/or serve as the communication channel
  * between a group of clients.
@@ -29,7 +27,7 @@ type ExtractAuthData<T> = T extends ClientArray<infer _, infer U> ? U : never;
  * - Rooms are created on demand during matchmaking by default
  * - Room classes must be exposed using `.define()`
  */
-export declare abstract class Room<State extends object = any, Metadata = any> {
+export declare abstract class Room<State extends object = any, Metadata = any, UserData = any, AuthData = any> {
     #private;
     /**
      * This property will change on these situations:
@@ -42,7 +40,8 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
     get metadata(): Metadata;
     listing: RoomListingData<Metadata>;
     /**
-     * A ClockTimer instance, used for timing events.
+     * Timing events tied to the room instance.
+     * Intervals and timeouts are cleared when the room is disposed.
      */
     clock: Clock;
     /**
@@ -72,15 +71,15 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
      *
      * @see {@link https://docs.colyseus.io/colyseus/server/room/#client|Client instance}
      */
-    clients: ClientArray;
+    clients: ClientArray<UserData, AuthData>;
     /** @internal */
-    _events: EventEmitter;
+    _events: EventEmitter<[never]>;
     protected seatReservationTime: number;
     protected reservedSeats: {
         [sessionId: string]: [any, any];
     };
     protected reservedSeatTimeouts: {
-        [sessionId: string]: NodeJS.Timer;
+        [sessionId: string]: NodeJS.Timeout;
     };
     protected _reconnections: {
         [reconnectionToken: string]: [string, Deferred];
@@ -96,7 +95,7 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
     private _lockedExplicitly;
     private _maxClientsReached;
     private _autoDisposeTimeout;
-    constructor(presence?: Presence);
+    constructor();
     /**
      * Automatically dispose the room when last client disconnects.
      *
@@ -132,14 +131,14 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
     set roomId(roomId: string);
     onBeforePatch?(state: State): void | Promise<any>;
     onCreate?(options: any): void | Promise<any>;
-    onJoin?(client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, options?: any, auth?: ExtractAuthData<typeof this['clients']>): void | Promise<any>;
-    onLeave?(client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, consented?: boolean): void | Promise<any>;
+    onJoin?(client: Client<UserData, AuthData>, options?: any, auth?: AuthData): void | Promise<any>;
+    onLeave?(client: Client<UserData, AuthData>, consented?: boolean): void | Promise<any>;
     onDispose?(): void | Promise<any>;
     /**
      * onAuth at the instance level will be deprecated in the future.
      * Please use "static onAuth(token, req) instead
      */
-    onAuth(client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, options: any, request?: http.IncomingMessage): any | Promise<any>;
+    onAuth(client: Client<UserData, AuthData>, options: any, request?: http.IncomingMessage): any | Promise<any>;
     static onAuth(token: string, req: IncomingMessage): Promise<unknown>;
     /**
      * devMode: When `devMode` is enabled, `onCacheRoom` method is called during
@@ -206,8 +205,8 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
      * Checks whether mutations have occurred in the state, and broadcast them to all connected clients.
      */
     broadcastPatch(): boolean;
-    onMessage<T = any>(messageType: '*', callback: (client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, type: string | number, message: T) => void): any;
-    onMessage<T = any>(messageType: string | number, callback: (client: Client<ExtractUserData<typeof this['clients']>, ExtractAuthData<typeof this['clients']>>, message: T) => void): any;
+    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;
     /**
      * Disconnect all connected clients, and then dispose the room.
      *
@@ -228,9 +227,8 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
      */
     allowReconnection(previousClient: Client, seconds: number | "manual"): Deferred<Client>;
     protected resetAutoDisposeTimeout(timeoutInSeconds?: number): void;
-    private broadcastMessageSchema;
     private broadcastMessageType;
-    protected sendFullState(client: Client): void;
+    private sendFullState;
     private _dequeueAfterPatchMessages;
     private _reserveSeat;
     private _disposeIfEmpty;
@@ -241,4 +239,3 @@ export declare abstract class Room<State extends object = any, Metadata = any> {
     private _incrementClientCount;
     private _decrementClientCount;
 }
-export {};