@colyseus/sdk 0.17.11 → 0.17.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/sdk",
-  "version": "0.17.11",
+  "version": "0.17.13",
   "description": "Colyseus Multiplayer SDK for JavaScript/TypeScript",
   "author": "Endel Dreyer",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "./*": {
       "@source": "./src/*.ts",
       "types": "./build/*.d.ts",
-      "import": "./build/esm/*.mjs",
+      "import": "./build/*.mjs",
       "require": "./build/*.cjs"
     },
     "./package.json": "./package.json"
@@ -55,6 +55,7 @@
     "@colyseus/schema": "^4.0.1",
     "tslib": "^2.1.0",
     "ws": "^8.13.0",
+    "@colyseus/shared-types": "^0.17.0",
     "@colyseus/better-call": "^1.0.26"
   },
   "devDependencies": {
@@ -81,7 +82,7 @@
     "typescript": "^5.9.3",
     "vite": "^5.0.11",
     "vitest": "^2.1.1",
-    "@colyseus/core": "^0.17.9"
+    "@colyseus/core": "^0.17.10"
   },
   "peerDependencies": {
     "@colyseus/core": "0.17.x"

package/src/Client.ts

@@ -1,4 +1,4 @@
-import type { matchMaker, SDKTypes, Room as ServerRoom } from '@colyseus/core';
+import type { SDKTypes, ServerRoomLike, ISeatReservation } from '@colyseus/shared-types';
 
 import { CloseCode, ServerError } from './errors/Errors.ts';
 import { Room } from './Room.ts';
@@ -10,7 +10,7 @@ import { Connection } from './Connection.ts';
 import { discordURLBuilder } from './3rd_party/discord.ts';
 
 export type JoinOptions = any;
-export type ISeatReservation = matchMaker.ISeatReservation;
+export type { ISeatReservation };
 
 export class MatchMakeError extends Error {
     code: number;
@@ -173,7 +173,7 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
         rootSchema?: SchemaConstructor<ServerType>
     ): Promise<Room<ServerType['~rooms'][R]['~room']>>
     // Overload: Pass RoomType directly to extract state
-    public async joinOrCreate<RoomType extends ServerRoom>(
+    public async joinOrCreate<RoomType extends ServerRoomLike>(
         roomName: string,
         options?: Parameters<RoomType['onJoin']>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
@@ -196,7 +196,7 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
         rootSchema?: SchemaConstructor<ServerType>
     ): Promise<Room<ServerType['~rooms'][R]['~room']>>
     // Overload: Pass RoomType directly to extract state
-    public async create<RoomType extends ServerRoom>(
+    public async create<RoomType extends ServerRoomLike>(
         roomName: string,
         options?: Parameters<RoomType['onJoin']>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
@@ -219,7 +219,7 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
         rootSchema?: SchemaConstructor<ServerType>
     ): Promise<Room<ServerType['~rooms'][R]['~room']>>
     // Overload: Pass RoomType directly to extract state
-    public async join<RoomType extends ServerRoom>(
+    public async join<RoomType extends ServerRoomLike>(
         roomName: string,
         options?: Parameters<RoomType['onJoin']>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
@@ -242,7 +242,7 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
         rootSchema?: SchemaConstructor<ServerType>
     ): Promise<Room<ServerType['~rooms'][R]['~room']>>
     // Overload: Pass RoomType directly to extract state
-    public async joinById<RoomType extends ServerRoom>(
+    public async joinById<RoomType extends ServerRoomLike>(
         roomId: string,
         options?: Parameters<RoomType['onJoin']>[1],
         rootSchema?: SchemaConstructor<RoomType['state']>
@@ -268,7 +268,7 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
     // Overload: Use room name from ServerType to infer room type
     public async reconnect<R extends keyof ServerType['~rooms']>(reconnectionToken: string, roomName?: R): Promise<Room<ServerType['~rooms'][R]['~room']>>
     // Overload: Pass RoomType directly to extract state
-    public async reconnect<RoomType extends ServerRoom>(
+    public async reconnect<RoomType extends ServerRoomLike>(
         reconnectionToken: string,
         rootSchema?: SchemaConstructor<RoomType['state']>
     ): Promise<Room<RoomType, RoomType['state']>>

package/src/Room.ts

@@ -1,5 +1,5 @@
-import { type Room as ServerRoom, type ExtractMessageType } from '@colyseus/core';
-import { decode, Decoder, encode, Iterator, schema, Schema, SchemaType } from '@colyseus/schema';
+import { type InferState, type ExtractRoomMessages, type ExtractRoomClientMessages, type ExtractMessageType } from '@colyseus/shared-types';
+import { decode, encode, Iterator, Schema } from '@colyseus/schema';
 
 import { Packr, unpack } from '@colyseus/msgpackr';
 
@@ -22,25 +22,6 @@ export type InferSerializer<State> = [State] extends [Schema]
     ? SchemaSerializer<State>
     : Serializer<State>;
 
-// Helper types for flexible Room generics
-// Allows: Room<State>, Room<ServerRoom>, or Room<ServerRoom, State>
-type InferState<T, S> = [S] extends [never]
-    ? (T extends typeof ServerRoom ? T['prototype']['state'] : T)
-    : S;
-
-// Supports both constructor types (typeof MyRoom) and instance types (MyRoom)
-type RoomMessages<T> = T extends abstract new (...args: any) => { messages: infer M }
-    ? M
-    : T extends { messages: infer M }
-        ? M
-        : {};
-
-type RoomClientMessages<T> = T extends abstract new (...args: any) => { '~client': { '~messages': infer M } }
-    ? M
-    : T extends { '~client': { '~messages': infer M } }
-        ? M
-        : {};
-
 export interface RoomAvailable<Metadata = any> {
     name: string;
     roomId: string;
@@ -235,9 +216,9 @@ export class Room<
         });
     }
 
-    public onMessage<MessageType extends keyof RoomClientMessages<T>>(
+    public onMessage<MessageType extends keyof ExtractRoomClientMessages<T>>(
         message: MessageType,
-        callback: (payload: RoomClientMessages<T>[MessageType]) => void
+        callback: (payload: ExtractRoomClientMessages<T>[MessageType]) => void
     )
     public onMessage<T = any>(type: "*", callback: (messageType: string | number, payload: T) => void)
     public onMessage<T = any>(type: string | number, callback: (payload: T) => void)
@@ -252,9 +233,9 @@ export class Room<
         this.connection.send(this.packr.buffer.subarray(0, 1));
     }
 
-    public send<MessageType extends keyof RoomMessages<T>>(
+    public send<MessageType extends keyof ExtractRoomMessages<T>>(
         messageType: MessageType,
-        payload?: ExtractMessageType<RoomMessages<T>[MessageType]>
+        payload?: ExtractMessageType<ExtractRoomMessages<T>[MessageType]>
     )
     public send<T = any>(messageType: string | number, payload?: T): void {
         const it: Iterator = { offset: 1 };

package/src/debug.ts

@@ -1,6 +1,6 @@
-import { Client } from "./Client";
-import type { Room } from "./Room";
-import type { WebSocketTransport } from "./transport/WebSocketTransport";
+import { Client } from "./Client.ts";
+import type { Room } from "./Room.ts";
+import type { WebSocketTransport } from "./transport/WebSocketTransport.ts";
 
 const logoIcon = `<svg viewBox="0 0 488.94 541.2" style="width: 100%; height: 100%;">
   <g>
@@ -1431,7 +1431,6 @@ function openStateInspectorModal(uniquePanelId) {
     }
 
     var room = debugInfo.room;
-    var refIds = room.serializer.decoder.root.refIds;
 
     // Remove existing modal if present
     var existingModal = document.getElementById('debug-state-inspector-modal');
@@ -1671,7 +1670,7 @@ function openStateInspectorModal(uniquePanelId) {
 
         var type = typeof obj;
         var indent = depth * 6;
-        var refId = refIds.get(obj);
+        var refId = obj["~refId"];
         var nodeId = 'state-node-' + refId;
         var currentPath = path ? path + '.' + (parentKey || '') : (parentKey || 'root');
         var isPathExpanded = expandedPaths.has(currentPath);
@@ -1747,6 +1746,7 @@ function openStateInspectorModal(uniquePanelId) {
 
                 for (var i = 0; i < keys.length; i++) {
                     var key = keys[i];
+                    if (key === "~refId") continue;// skip refId
                     html += renderKeyValue(key, obj[key], depth + 1, currentPath, key, false);
                 }