@colyseus/sdk 0.17.16 → 0.17.18

package/package.json

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

package/src/Client.ts

@@ -1,6 +1,6 @@
 import { CloseCode, type SDKTypes, type ServerRoomLike, type ISeatReservation } from '@colyseus/shared-types';
 
-import { ServerError } from './errors/Errors.ts';
+import { MatchMakeError, ServerError } from './errors/Errors.ts';
 import { Room } from './Room.ts';
 import { SchemaConstructor } from './serializer/SchemaSerializer.ts';
 import { HTTP } from './HTTP.ts';
@@ -12,15 +12,6 @@ import { discordURLBuilder } from './3rd_party/discord.ts';
 export type JoinOptions = any;
 export type { ISeatReservation };
 
-export class MatchMakeError extends Error {
-    code: number;
-    constructor(message: string, code: number) {
-        super(message);
-        this.code = code;
-        this.name = "MatchMakeError";
-        Object.setPrototypeOf(this, MatchMakeError.prototype);
-    }
-}
 
 // - React Native does not provide `window.location`
 // - Cocos Creator (Native) does not provide `window.location.hostname`
@@ -368,28 +359,29 @@ export class ColyseusSDK<ServerType extends SDKTypes = any, UserData = any> {
         options: JoinOptions = {},
         rootSchema?: SchemaConstructor<T>,
     ) {
-        const httpResponse = await (this.http as HTTP<any>).post(`/matchmake/${method}/${roomName}`, {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: options
-        });
+        try {
+            const httpResponse = await (this.http as HTTP<any>).post(`/matchmake/${method}/${roomName}`, {
+                headers: {
+                    'Accept': 'application/json',
+                    'Content-Type': 'application/json'
+                },
+                body: options
+            });
 
-        // Handle HTTP error responses
-        if (!httpResponse.ok) {
-            // @ts-ignore
-            throw new MatchMakeError(httpResponse.error.message || httpResponse.error, httpResponse.error.code || httpResponse.status);
-        }
+            const response = httpResponse.data as unknown as ISeatReservation;
 
-        const response = httpResponse.data as unknown as ISeatReservation;
+            // forward reconnection token during "reconnect" methods.
+            if (method === "reconnect") {
+                response.reconnectionToken = options.reconnectionToken;
+            }
 
-        // forward reconnection token during "reconnect" methods.
-        if (method === "reconnect") {
-            response.reconnectionToken = options.reconnectionToken;
+            return await this.consumeSeatReservation<T>(response, rootSchema);
+        } catch (error) {
+            if (error instanceof ServerError) {
+                throw new MatchMakeError(error.message, error.code);
+            }
+            throw error;
         }
-
-        return await this.consumeSeatReservation<T>(response, rootSchema);
     }
 
     protected createRoom<T>(roomName: string, rootSchema?: SchemaConstructor<T>) {

package/src/HTTP.ts

@@ -146,35 +146,14 @@ type FetchRequestOptions<
   params?: Params;
 }>
 
-type ResponseData<T> = {
-  ok: true;
+type FetchResponse<T> = {
+  raw: Response;
   data: T;
-  error: null,
-  response: Response;
   headers: Headers;
   status: number;
   statusText: string;
 };
 
-type ResponseError<E> = {
-  ok: false,
-  data: null,
-  error: Prettify<(E extends Record<string, any> ? E : {
-    message?: string;
-  }) & {
-    code?: string;
-  }>;
-  response: Response;
-  headers: Headers;
-  status: number;
-  statusText: string;
-};
-
-type FetchResponse<T, E extends Record<string, unknown> | unknown = unknown, Throw extends boolean = false> =
-  Throw extends true
-    ? T
-    : ResponseData<T> | ResponseError<E>;
-
 export function isJSONSerializable(value: any) {
 	if (value === undefined) {
 		return false;
@@ -519,9 +498,9 @@ export class HTTP<R extends Router | Router["endpoints"]> {
 
         const url = getURLWithQueryParams(this.sdk['getHttpEndpoint'](path.toString()), mergedOptions);
 
-        let response: Response;
+        let raw: Response;
         try {
-            response = await fetch(url, mergedOptions);
+            raw = await fetch(url, mergedOptions);
         } catch (err: any) {
             // If it's an AbortError, re-throw as-is
             if (err.name === 'AbortError') {
@@ -529,39 +508,40 @@ export class HTTP<R extends Router | Router["endpoints"]> {
             }
             // Re-throw with network error code at top level (e.g. ECONNREFUSED)
             const networkError: ServerError = new ServerError(err.cause?.code || err.code, err.message);
+            networkError.response = raw;
             networkError.cause = err.cause;
             throw networkError;
         }
-        const contentType = response.headers.get("content-type");
+        const contentType = raw.headers.get("content-type");
 
         let data: any;
-        let error = null;
 
         // TODO: improve content-type detection here!
         if (contentType?.indexOf("json")) {
-            data = await response.json();
+            data = await raw.json();
 
         } else if (contentType?.indexOf("text")) {
-            data = await response.text();
+            data = await raw.text();
 
         } else {
-            data = await response.blob();
+            data = await raw.blob();
         }
 
-        if (!response.ok) {
-            // TODO: throw error here?!
-            error = data;
-            data = null;
+        if (!raw.ok) {
+            throw new ServerError(data.code ?? raw.status, data.message ?? raw.statusText, {
+                headers: raw.headers,
+                status: raw.status,
+                response: raw,
+                data
+            });
         }
 
         return {
-            ok: response.ok,
-            headers: response.headers,
+            raw,
             data,
-            error,
-            status: response.status,
-            statusText: response.statusText,
-            response,
+            headers: raw.headers,
+            status: raw.status,
+            statusText: raw.statusText,
         };
     }
 }

package/src/Room.ts

@@ -1,4 +1,4 @@
-import { CloseCode, type InferState, type ExtractRoomMessages, type ExtractRoomClientMessages, type ExtractMessageType } from '@colyseus/shared-types';
+import { CloseCode, type InferState, type NormalizeRoomType, type ExtractRoomMessages, type ExtractRoomClientMessages, type ExtractMessageType } from '@colyseus/shared-types';
 import { decode, encode, Iterator, Schema } from '@colyseus/schema';
 
 import { Packr, unpack } from '@colyseus/msgpackr';
@@ -213,12 +213,12 @@ export class Room<
         });
     }
 
-    public onMessage<MessageType extends keyof ExtractRoomClientMessages<T>>(
+    public onMessage<MessageType extends keyof ExtractRoomClientMessages<NormalizeRoomType<T>>>(
         message: MessageType,
-        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)
+        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
     public onMessage(type: '*' | string | number, callback: (...args: any[]) => void) {
         return this.onMessageHandlers.on(this.getMessageHandlerKey(type), callback);
     }
@@ -235,11 +235,12 @@ export class Room<
         this.connection.send(this.packr.buffer.subarray(0, 1));
     }
 
-    public send<MessageType extends keyof ExtractRoomMessages<T>>(
+    public send<MessageType extends keyof ExtractRoomMessages<NormalizeRoomType<T>>>(
         messageType: MessageType,
-        payload?: ExtractMessageType<ExtractRoomMessages<T>[MessageType]>
-    )
-    public send<T = any>(messageType: string | number, payload?: T): void {
+        payload?: ExtractMessageType<ExtractRoomMessages<NormalizeRoomType<T>>[MessageType]>
+    ): void
+    public send<Payload = any>(messageType: string | number, payload?: Payload): void
+    public send(messageType: string | number, payload?: any): void {
         const it: Iterator = { offset: 1 };
         this.packr.buffer[0] = Protocol.ROOM_DATA;
 

package/src/errors/Errors.ts

@@ -1,18 +1,40 @@
 
-export class ServerError extends Error {
-  public code: number;
+export class ServerError<DATA=any> extends Error {
+    public code: number;
 
-  constructor(code: number, message: string) {
-    super(message);
+    public headers?: Headers;
+    public status?: number;
+    public response?: Response;
+    public data?: DATA;
 
-    this.name = "ServerError";
-    this.code = code;
-  }
+    constructor(code: number, message: string, opts?: { headers?: Headers, status?: number, response?: Response, data?: any }) {
+        super(message);
+
+        this.name = "ServerError";
+        this.code = code;
+
+        if (opts) {
+            this.headers = opts.headers;
+            this.status = opts.status;
+            this.response = opts.response;
+            this.data = opts.data;
+        }
+    }
 }
 
 export class AbortError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "AbortError";
-  }
+    constructor(message: string) {
+        super(message);
+        this.name = "AbortError";
+    }
 }
+
+export class MatchMakeError extends Error {
+    public code: number;
+    constructor(message: string, code: number) {
+        super(message);
+        this.code = code;
+        this.name = "MatchMakeError";
+        Object.setPrototypeOf(this, MatchMakeError.prototype);
+    }
+}

package/src/index.ts

@@ -1,9 +1,9 @@
 import './legacy';
 
-export { ColyseusSDK, Client, MatchMakeError, type JoinOptions, type EndpointSettings, type ClientOptions, type ISeatReservation as SeatReservation } from './Client.ts';
+export { ColyseusSDK, Client, type JoinOptions, type EndpointSettings, type ClientOptions, type ISeatReservation as SeatReservation } from './Client.ts';
 export { Room, type RoomAvailable } from './Room.ts';
 export { Auth, type AuthSettings, type PopupSettings, type AuthResponse, type UserDataResponse, type ForgotPasswordResponse, type AuthData } from "./Auth.ts";
-export { ServerError } from './errors/Errors.ts';
+export { ServerError, AbortError, MatchMakeError } from './errors/Errors.ts';
 export { CloseCode, ErrorCode, Protocol } from '@colyseus/shared-types'; // convenience re-export / backwards compatibility
 export type { InferRoomConstructor } from './core/utils.ts';