@colyseus/sdk 0.17.20 → 0.17.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/sdk",
-  "version": "0.17.20",
+  "version": "0.17.21",
   "description": "Colyseus Multiplayer SDK for JavaScript/TypeScript",
   "author": "Endel Dreyer",
   "license": "MIT",
@@ -55,8 +55,8 @@
     "@colyseus/schema": "^4.0.4",
     "tslib": "^2.1.0",
     "ws": "^8.13.0",
-    "@colyseus/better-call": "^1.2.0",
-    "@colyseus/shared-types": "^0.17.2"
+    "@colyseus/shared-types": "^0.17.3",
+    "@colyseus/better-call": "^1.2.0"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^5.1.1",
@@ -82,7 +82,7 @@
     "typescript": "^5.9.3",
     "vite": "^5.0.11",
     "vitest": "^2.1.1",
-    "@colyseus/core": "^0.17.18"
+    "@colyseus/core": "^0.17.21"
   },
   "peerDependencies": {
     "@colyseus/core": "0.17.x"

package/src/Client.ts

@@ -1,4 +1,4 @@
-import { CloseCode, Protocol, type SDKTypes, type ServerRoomLike, type ISeatReservation } from '@colyseus/shared-types';
+import { CloseCode, Protocol, type InferState, type SDKTypes, type ServerRoomLike, type ISeatReservation } from '@colyseus/shared-types';
 
 import { MatchMakeError, ServerError } from './errors/Errors.ts';
 import { Room } from './Room.ts';
@@ -156,15 +156,15 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
     }
 
     // Overload: Use room name from ServerType to infer room type
-    public async joinOrCreate<R extends keyof ServerType['~rooms']>(
+    public async joinOrCreate<R extends keyof ServerType['~rooms'], State = InferState<ServerType['~rooms'][R]['~room'], never>>(
         roomName: R,
-        options?: Parameters<ServerType['~rooms'][R]['~room']['prototype']['onJoin']>[1],
-        rootSchema?: SchemaConstructor<ServerType>
-    ): Promise<Room<ServerType['~rooms'][R]['~room']>>
+        options?: Parameters<ServerType['~rooms'][R]['~room']['onJoin']>[1],
+        rootSchema?: SchemaConstructor<State>
+    ): Promise<Room<ServerType['~rooms'][R]['~room'], State>>
     // Overload: Pass RoomType directly to extract state
     public async joinOrCreate<RoomType extends ServerRoomLike>(
         roomName: string,
-        options?: Parameters<RoomType['onJoin']>[1],
+        options?: Parameters<NonNullable<RoomType['onJoin']>>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
     ): Promise<Room<RoomType, RoomType['state']>>
     // Overload: Pass State type directly
@@ -179,15 +179,15 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
     }
 
     // Overload: Use room name from ServerType to infer room type
-    public async create<R extends keyof ServerType['~rooms']>(
+    public async create<R extends keyof ServerType['~rooms'], State = InferState<ServerType['~rooms'][R]['~room'], never>>(
         roomName: R,
-        options?: Parameters<ServerType['~rooms'][R]['~room']['prototype']['onJoin']>[1],
-        rootSchema?: SchemaConstructor<ServerType>
-    ): Promise<Room<ServerType['~rooms'][R]['~room']>>
+        options?: Parameters<ServerType['~rooms'][R]['~room']['onJoin']>[1],
+        rootSchema?: SchemaConstructor<State>
+    ): Promise<Room<ServerType['~rooms'][R]['~room'], State>>
     // Overload: Pass RoomType directly to extract state
     public async create<RoomType extends ServerRoomLike>(
         roomName: string,
-        options?: Parameters<RoomType['onJoin']>[1],
+        options?: Parameters<NonNullable<RoomType['onJoin']>>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
     ): Promise<Room<RoomType, RoomType['state']>>
     // Overload: Pass State type directly
@@ -202,15 +202,15 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
     }
 
     // Overload: Use room name from ServerType to infer room type
-    public async join<R extends keyof ServerType['~rooms']>(
+    public async join<R extends keyof ServerType['~rooms'], State = InferState<ServerType['~rooms'][R]['~room'], never>>(
         roomName: R,
-        options?: Parameters<ServerType['~rooms'][R]['~room']['prototype']['onJoin']>[1],
-        rootSchema?: SchemaConstructor<ServerType>
-    ): Promise<Room<ServerType['~rooms'][R]['~room']>>
+        options?: Parameters<ServerType['~rooms'][R]['~room']['onJoin']>[1],
+        rootSchema?: SchemaConstructor<State>
+    ): Promise<Room<ServerType['~rooms'][R]['~room'], State>>
     // Overload: Pass RoomType directly to extract state
     public async join<RoomType extends ServerRoomLike>(
         roomName: string,
-        options?: Parameters<RoomType['onJoin']>[1],
+        options?: Parameters<NonNullable<RoomType['onJoin']>>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
     ): Promise<Room<RoomType, RoomType['state']>>
     // Overload: Pass State type directly
@@ -225,15 +225,15 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
     }
 
     // Overload: Use room name from ServerType to infer room type
-    public async joinById<R extends keyof ServerType['~rooms']>(
+    public async joinById<R extends keyof ServerType['~rooms'], State = InferState<ServerType['~rooms'][R]['~room'], never>>(
         roomName: R,
-        options?: Parameters<ServerType['~rooms'][R]['~room']['prototype']['onJoin']>[1],
-        rootSchema?: SchemaConstructor<ServerType>
-    ): Promise<Room<ServerType['~rooms'][R]['~room']>>
+        options?: Parameters<ServerType['~rooms'][R]['~room']['onJoin']>[1],
+        rootSchema?: SchemaConstructor<State>
+    ): Promise<Room<ServerType['~rooms'][R]['~room'], State>>
     // Overload: Pass RoomType directly to extract state
     public async joinById<RoomType extends ServerRoomLike>(
         roomId: string,
-        options?: Parameters<RoomType['onJoin']>[1],
+        options?: Parameters<NonNullable<RoomType['onJoin']>>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
     ): Promise<Room<RoomType, RoomType['state']>>
     // Overload: Pass State type directly

package/src/Room.ts

@@ -129,7 +129,7 @@ export class Room<
     protected packr: Packr;
 
     #lastPingTime: number = 0;
-    #pingCallback: (ms: number) => void;
+    #pingCallback?: (ms: number) => void = undefined;
 
     constructor(name: string, rootSchema?: SchemaConstructor<State>) {
         this.name = name;
@@ -221,7 +221,11 @@ export class Room<
         callback: (payload: ExtractRoomClientMessages<NormalizeRoomType<T>>[MessageType]) => void
     ): () => void
     public onMessage<Payload = any>(type: "*", callback: (messageType: string | number, payload: Payload) => void): () => void
-    public onMessage<Payload = any>(type: string | number, callback: (payload: Payload) => void): () => void
+    // Fallback overload: only available when no typed client messages are defined
+    public onMessage<Payload = any>(
+        type: [keyof ExtractRoomClientMessages<NormalizeRoomType<T>>] extends [never] ? (string | number) : never,
+        callback: (payload: Payload) => void
+    ): () => void
     public onMessage(type: '*' | string | number, callback: (...args: any[]) => void) {
         return this.onMessageHandlers.on(this.getMessageHandlerKey(type), callback);
     }
@@ -242,7 +246,11 @@ export class Room<
         messageType: MessageType,
         payload?: ExtractMessageType<ExtractRoomMessages<NormalizeRoomType<T>>[MessageType]>
     ): void
-    public send<Payload = any>(messageType: string | number, payload?: Payload): void
+    // Fallback overload: only available when no typed messages are defined
+    public send<Payload = any>(
+        messageType: [keyof ExtractRoomMessages<NormalizeRoomType<T>>] extends [never] ? (string | number) : never,
+        payload?: Payload
+    ): void
     public send(messageType: string | number, payload?: any): void {
         const it: Iterator = { offset: 1 };
         this.packr.buffer[0] = Protocol.ROOM_DATA;