@colyseus/core 0.17.49 → 0.17.50

package/build/utils/nanoevents.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/nanoevents.ts"],
-  "sourcesContent": ["export const createNanoEvents = () => ({\n    emit(event: string, ...args: any[]) {\n      for (\n        let callbacks = this.events[event] || [],\n          i = 0,\n          length = callbacks.length;\n        i < length;\n        i++\n      ) {\n        callbacks[i](...args)\n      }\n    },\n    events: {},\n    on(event: string, cb: (...args: any[]) => void) {\n      ;(this.events[event] ||= []).push(cb)\n      return () => {\n        this.events[event] = this.events[event]?.filter(i => cb !== i)\n      }\n    }\n  })"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,IAAM,mBAAmB,OAAO;AAAA,EACnC,KAAK,UAAkB,MAAa;AAClC,aACM,YAAY,KAAK,OAAO,KAAK,KAAK,CAAC,GACrC,IAAI,GACJ,SAAS,UAAU,QACrB,IAAI,QACJ,KACA;AACA,gBAAU,CAAC,EAAE,GAAG,IAAI;AAAA,IACtB;AAAA,EACF;AAAA,EACA,QAAQ,CAAC;AAAA,EACT,GAAG,OAAe,IAA8B;AAC9C;AAAC,KAAC,KAAK,OAAO,KAAK,MAAM,CAAC,GAAG,KAAK,EAAE;AACpC,WAAO,MAAM;AACX,WAAK,OAAO,KAAK,IAAI,KAAK,OAAO,KAAK,GAAG,OAAO,OAAK,OAAO,CAAC;AAAA,IAC/D;AAAA,EACF;AACF;",
+  "sourcesContent": ["export const createNanoEvents = () => ({\n    emit(event: string, ...args: any[]) {\n      for (\n        let callbacks = this.events[event] || [],\n          i = 0,\n          length = callbacks.length;\n        i < length;\n        i++\n      ) {\n        callbacks[i](...args)\n      }\n    },\n    // null-prototype: event names are client-supplied (message types), and on a\n    // plain object \"__proto__\" / \"constructor\" / \"toString\" resolve to inherited\n    // members instead of missing (colyseus/colyseus#951)\n    events: Object.create(null) as { [event: string]: Array<(...args: any[]) => void> },\n    on(event: string, cb: (...args: any[]) => void) {\n      ;(this.events[event] ||= []).push(cb)\n      return () => {\n        this.events[event] = this.events[event]?.filter(i => cb !== i)\n      }\n    }\n  })"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,IAAM,mBAAmB,OAAO;AAAA,EACnC,KAAK,UAAkB,MAAa;AAClC,aACM,YAAY,KAAK,OAAO,KAAK,KAAK,CAAC,GACrC,IAAI,GACJ,SAAS,UAAU,QACrB,IAAI,QACJ,KACA;AACA,gBAAU,CAAC,EAAE,GAAG,IAAI;AAAA,IACtB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAIA,QAAQ,uBAAO,OAAO,IAAI;AAAA,EAC1B,GAAG,OAAe,IAA8B;AAC9C;AAAC,KAAC,KAAK,OAAO,KAAK,MAAM,CAAC,GAAG,KAAK,EAAE;AACpC,WAAO,MAAM;AACX,WAAK,OAAO,KAAK,IAAI,KAAK,OAAO,KAAK,GAAG,OAAO,OAAK,OAAO,CAAC;AAAA,IAC/D;AAAA,EACF;AACF;",
   "names": []
 }

package/build/utils/nanoevents.d.ts

@@ -1,5 +1,7 @@
 export declare const createNanoEvents: () => {
     emit(event: string, ...args: any[]): void;
-    events: {};
+    events: {
+        [event: string]: Array<(...args: any[]) => void>;
+    };
     on(event: string, cb: (...args: any[]) => void): () => void;
 };

package/build/utils/nanoevents.mjs

@@ -5,7 +5,10 @@ var createNanoEvents = () => ({
       callbacks[i](...args);
     }
   },
-  events: {},
+  // null-prototype: event names are client-supplied (message types), and on a
+  // plain object "__proto__" / "constructor" / "toString" resolve to inherited
+  // members instead of missing (colyseus/colyseus#951)
+  events: /* @__PURE__ */ Object.create(null),
   on(event, cb) {
     ;
     (this.events[event] ||= []).push(cb);

package/build/utils/nanoevents.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/nanoevents.ts"],
-  "sourcesContent": ["export const createNanoEvents = () => ({\n    emit(event: string, ...args: any[]) {\n      for (\n        let callbacks = this.events[event] || [],\n          i = 0,\n          length = callbacks.length;\n        i < length;\n        i++\n      ) {\n        callbacks[i](...args)\n      }\n    },\n    events: {},\n    on(event: string, cb: (...args: any[]) => void) {\n      ;(this.events[event] ||= []).push(cb)\n      return () => {\n        this.events[event] = this.events[event]?.filter(i => cb !== i)\n      }\n    }\n  })"],
-  "mappings": ";AAAO,IAAM,mBAAmB,OAAO;AAAA,EACnC,KAAK,UAAkB,MAAa;AAClC,aACM,YAAY,KAAK,OAAO,KAAK,KAAK,CAAC,GACrC,IAAI,GACJ,SAAS,UAAU,QACrB,IAAI,QACJ,KACA;AACA,gBAAU,CAAC,EAAE,GAAG,IAAI;AAAA,IACtB;AAAA,EACF;AAAA,EACA,QAAQ,CAAC;AAAA,EACT,GAAG,OAAe,IAA8B;AAC9C;AAAC,KAAC,KAAK,OAAO,KAAK,MAAM,CAAC,GAAG,KAAK,EAAE;AACpC,WAAO,MAAM;AACX,WAAK,OAAO,KAAK,IAAI,KAAK,OAAO,KAAK,GAAG,OAAO,OAAK,OAAO,CAAC;AAAA,IAC/D;AAAA,EACF;AACF;",
+  "sourcesContent": ["export const createNanoEvents = () => ({\n    emit(event: string, ...args: any[]) {\n      for (\n        let callbacks = this.events[event] || [],\n          i = 0,\n          length = callbacks.length;\n        i < length;\n        i++\n      ) {\n        callbacks[i](...args)\n      }\n    },\n    // null-prototype: event names are client-supplied (message types), and on a\n    // plain object \"__proto__\" / \"constructor\" / \"toString\" resolve to inherited\n    // members instead of missing (colyseus/colyseus#951)\n    events: Object.create(null) as { [event: string]: Array<(...args: any[]) => void> },\n    on(event: string, cb: (...args: any[]) => void) {\n      ;(this.events[event] ||= []).push(cb)\n      return () => {\n        this.events[event] = this.events[event]?.filter(i => cb !== i)\n      }\n    }\n  })"],
+  "mappings": ";AAAO,IAAM,mBAAmB,OAAO;AAAA,EACnC,KAAK,UAAkB,MAAa;AAClC,aACM,YAAY,KAAK,OAAO,KAAK,KAAK,CAAC,GACrC,IAAI,GACJ,SAAS,UAAU,QACrB,IAAI,QACJ,KACA;AACA,gBAAU,CAAC,EAAE,GAAG,IAAI;AAAA,IACtB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAIA,QAAQ,uBAAO,OAAO,IAAI;AAAA,EAC1B,GAAG,OAAe,IAA8B;AAC9C;AAAC,KAAC,KAAK,OAAO,KAAK,MAAM,CAAC,GAAG,KAAK,EAAE;AACpC,WAAO,MAAM;AACX,WAAK,OAAO,KAAK,IAAI,KAAK,OAAO,KAAK,GAAG,OAAO,OAAK,OAAO,CAAC;AAAA,IAC/D;AAAA,EACF;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/core",
-  "version": "0.17.49",
+  "version": "0.17.50",
   "description": "Multiplayer Framework for Node.js.",
   "type": "module",
   "input": "./src/index.ts",
@@ -52,15 +52,16 @@
     "debug": "^4.3.4",
     "nanoid": "^3.3.11",
     "@colyseus/shared-types": "^0.17.6",
-    "@colyseus/greeting-banner": "^3.0.8",
-    "@colyseus/better-call": "^1.3.1"
+    "@colyseus/better-call": "^1.3.1",
+    "@colyseus/greeting-banner": "^3.0.8"
   },
   "devDependencies": {
     "@colyseus/schema": "^4.0.7",
     "express": "^5.0.0",
+    "vitest": "^3.1.1",
+    "@colyseus/redis-presence": "^0.17.8",
     "@colyseus/redis-driver": "^0.17.7",
-    "@colyseus/tools": "^0.17.20",
-    "@colyseus/redis-presence": "^0.17.8"
+    "@colyseus/tools": "^0.17.20"
   },
   "peerDependencies": {
     "@colyseus/schema": "^4.0.7",
@@ -94,6 +95,6 @@
   },
   "gitHead": "c45b410e99eadffff4b74e701339992e2faa15f8",
   "scripts": {
-    "test": "tsc -p test"
+    "test": "vitest run"
   }
 }

package/src/MatchMaker.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'events';
 
 import { requestFromIPC, subscribeIPC, subscribeWithTimeout } from './IPC.ts';
 
-import { type Type, Deferred, generateId, merge, retry, MAX_CONCURRENT_CREATE_ROOM_WAIT_TIME, REMOTE_ROOM_SHORT_TIMEOUT, type MethodName, type ExtractMethodOrPropertyType } from './utils/Utils.ts';
+import { type Type, Deferred, generateId, merge, retry, MAX_CONCURRENT_CREATE_ROOM_WAIT_TIME, REMOTE_ROOM_SHORT_TIMEOUT, type MethodName, type RemoteRoomCallReturn } from './utils/Utils.ts';
 import { isDevMode, cacheRoomHistory, getPreviousProcessId, getRoomRestoreListKey, reloadFromCache } from './utils/DevMode.ts';
 
 import { RegisteredHandler } from './matchmaker/RegisteredHandler.ts';
@@ -32,7 +32,8 @@ export { controller, stats, type MatchMakerDriver };
 export type ClientOptions = any;
 export type SelectProcessIdCallback = (roomName: string, clientOptions: ClientOptions) => Promise<string>;
 
-const handlers: {[id: string]: RegisteredHandler} = {};
+// null-prototype: keyed by client-supplied room name (colyseus/colyseus#951)
+const handlers: {[id: string]: RegisteredHandler} = Object.create(null);
 const rooms: {[roomId: string]: Room} = {};
 const events = new EventEmitter();
 
@@ -326,7 +327,7 @@ export async function query<T extends Room = any>(
  *
  * @param roomName - The Id of the specific room.
  * @param filterOptions - Filter options.
- * @param sortOptions - Sorting options.
+ * @param additionalSortOptions - Sorting options, merged over the ones declared on the room handler.
  *
  * @returns Promise<IRoomCache> - A promise contaning an object which includes room metadata and configurations.
  */
@@ -353,23 +354,43 @@ export async function findOneRoomAvailable(
 /**
  * Call a method or return a property on a remote room.
  *
+ * Provide both type arguments for a precisely typed result, e.g.
+ * `remoteRoomCall<MyRoom, 'myMethod'>(roomId, 'myMethod')`. With only the
+ * room type given, TypeScript cannot infer the method literal
+ * (microsoft/TypeScript#26242) and the result is typed `any`.
+ *
  * @param roomId - The Id of the specific room instance.
  * @param method - Method or attribute to call or retrive.
  * @param args - Array of arguments for the method
  *
- * @returns Promise<any> - Returned value from the called or retrieved method/attribute.
+ * @returns Promise - Returned value from the called or retrieved method/attribute.
  */
-export async function remoteRoomCall<TRoom = Room>(
+export function remoteRoomCall<TRoom = Room, TMethod extends keyof TRoom = keyof TRoom>(
+  roomId: string,
+  method: TMethod,
+  args?: any[],
+  rejectionTimeout?: number,
+): Promise<RemoteRoomCallReturn<TRoom, TMethod>>;
+
+// fallback for dynamic method names not present on the room type
+export function remoteRoomCall<TRoom = Room>(
   roomId: string,
   method: keyof TRoom,
   args?: any[],
+  rejectionTimeout?: number,
+): Promise<any>;
+
+export async function remoteRoomCall(
+  roomId: string,
+  method: any,
+  args?: any[],
   rejectionTimeout = REMOTE_ROOM_SHORT_TIMEOUT,
-): Promise<ExtractMethodOrPropertyType<TRoom, typeof method>> {
-  const room = rooms[roomId] as TRoom;
+): Promise<any> {
+  const room = rooms[roomId];
 
   if (!room) {
     try {
-      return await requestFromIPC(presence, getRoomChannel(roomId), method as string, args, rejectionTimeout);
+      return await requestFromIPC(presence, getRoomChannel(roomId), method, args, rejectionTimeout);
 
     } catch (e: any) {
 
@@ -384,7 +405,7 @@ export async function remoteRoomCall<TRoom = Room>(
 
       // TODO: for 1.0, consider always throwing previous error directly.
 
-      const request = `${String(method)}${args && ' with args ' + JSON.stringify(args) || ''}`;
+      const request = `${method}${args && ' with args ' + JSON.stringify(args) || ''}`;
       throw new ServerError(
         ErrorCode.MATCHMAKE_UNHANDLED,
         `remote room (${roomId}) timed out, requesting "${request}". (${rejectionTimeout}ms exceeded)`,
@@ -392,9 +413,9 @@ export async function remoteRoomCall<TRoom = Room>(
     }
 
   } else {
-    return (!args && typeof (room[method]) !== 'function')
-        ? room[method as string]
-        : (await room[method as string].apply(room, args && JSON.parse(JSON.stringify(args))));
+    return (!args && typeof ((room as any)[method]) !== 'function')
+        ? (room as any)[method]
+        : (await (room as any)[method].apply(room, args && JSON.parse(JSON.stringify(args))));
   }
 }
 

package/src/Room.ts

@@ -255,7 +255,8 @@ export class Room<T extends RoomOptions = RoomOptions> {
   public messages?: Messages<any>;
 
   private onMessageEvents = createNanoEvents();
-  private onMessageValidators: {[message: string]: StandardSchemaV1} = {};
+  // null-prototype: keyed by client-supplied message type (colyseus/colyseus#951)
+  private onMessageValidators: {[message: string]: StandardSchemaV1} = Object.create(null);
 
   private onMessageFallbacks = {
     '__no_message_handler': (client: ExtractRoomClient<T>, messageType: string | number, _: unknown) => {
@@ -1308,7 +1309,7 @@ export class Room<T extends RoomOptions = RoomOptions> {
    * Allow the specified client to reconnect into the room. Must be used inside `onLeave()` method.
    * If seconds is provided, the reconnection is going to be cancelled after the provided amount of seconds.
    *
-   * @param client - The client that is allowed to reconnect into the room.
+   * @param previousClient - The client that is allowed to reconnect into the room.
    * @param seconds - The time in seconds that the client is allowed to reconnect into the room.
    *
    * @returns Deferred<Client> - The differed is a promise like type.

package/src/utils/Utils.ts

@@ -22,6 +22,24 @@ export type ExtractMethodOrPropertyType<
   ? Awaited<R>
   : TClass[TKey];
 
+/**
+ * Return type of `remoteRoomCall()`.
+ *
+ * Resolves to the method's awaited return type (or the property's type) when
+ * the method name was captured as a literal type. Falls back to `any` when it
+ * wasn't — e.g. `remoteRoomCall<MyRoom>(...)` with only the room type given:
+ * TypeScript applies the `TMethod` default instead of inferring the literal
+ * once an explicit type argument list is present (microsoft/TypeScript#26242).
+ * Pass both type arguments (`remoteRoomCall<MyRoom, 'myMethod'>`) for a
+ * precise return type.
+ */
+export type RemoteRoomCallReturn<
+  TRoom,
+  TMethod extends keyof TRoom
+> = keyof TRoom extends TMethod
+  ? any
+  : ExtractMethodOrPropertyType<TRoom, TMethod>;
+
 // remote room call timeouts
 export const REMOTE_ROOM_SHORT_TIMEOUT = Number(process.env.COLYSEUS_PRESENCE_SHORT_TIMEOUT || 2000);
 export const MAX_CONCURRENT_CREATE_ROOM_WAIT_TIME = Number(process.env.COLYSEUS_MAX_CONCURRENT_CREATE_ROOM_WAIT_TIME || 0.5);

package/src/utils/nanoevents.ts

@@ -10,7 +10,10 @@ export const createNanoEvents = () => ({
         callbacks[i](...args)
       }
     },
-    events: {},
+    // null-prototype: event names are client-supplied (message types), and on a
+    // plain object "__proto__" / "constructor" / "toString" resolve to inherited
+    // members instead of missing (colyseus/colyseus#951)
+    events: Object.create(null) as { [event: string]: Array<(...args: any[]) => void> },
     on(event: string, cb: (...args: any[]) => void) {
       ;(this.events[event] ||= []).push(cb)
       return () => {