@colyseus/sdk 0.17.13 → 0.17.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/sdk",
-  "version": "0.17.13",
+  "version": "0.17.15",
   "description": "Colyseus Multiplayer SDK for JavaScript/TypeScript",
   "author": "Endel Dreyer",
   "license": "MIT",
@@ -52,10 +52,10 @@
   },
   "dependencies": {
     "@colyseus/msgpackr": "^1.11.2",
-    "@colyseus/schema": "^4.0.1",
+    "@colyseus/schema": "^4.0.4",
     "tslib": "^2.1.0",
     "ws": "^8.13.0",
-    "@colyseus/shared-types": "^0.17.0",
+    "@colyseus/shared-types": "^0.17.1",
     "@colyseus/better-call": "^1.0.26"
   },
   "devDependencies": {
@@ -82,7 +82,7 @@
     "typescript": "^5.9.3",
     "vite": "^5.0.11",
     "vitest": "^2.1.1",
-    "@colyseus/core": "^0.17.10"
+    "@colyseus/core": "^0.17.12"
   },
   "peerDependencies": {
     "@colyseus/core": "0.17.x"

package/src/Client.ts

@@ -1,6 +1,6 @@
-import type { SDKTypes, ServerRoomLike, ISeatReservation } from '@colyseus/shared-types';
+import { CloseCode, type SDKTypes, type ServerRoomLike, type ISeatReservation } from '@colyseus/shared-types';
 
-import { CloseCode, ServerError } from './errors/Errors.ts';
+import { ServerError } from './errors/Errors.ts';
 import { Room } from './Room.ts';
 import { SchemaConstructor } from './serializer/SchemaSerializer.ts';
 import { HTTP } from './HTTP.ts';

package/src/Connection.ts

@@ -1,6 +1,20 @@
 import type { ITransport, ITransportEventMap } from "./transport/ITransport.ts";
 import { H3TransportTransport } from "./transport/H3Transport.ts";
 import { WebSocketTransport } from "./transport/WebSocketTransport.ts";
+import { CloseCode } from "@colyseus/shared-types";
+
+const onOfflineListeners: (() => void)[] = [];
+const hasGlobalEventListeners = typeof (addEventListener) === "function" && typeof (removeEventListener) === "function";
+if (hasGlobalEventListeners) {
+    /**
+     * Detects when the network is offline and closes all connections.
+     * (When switching wifi networks, etc.)
+     */
+    addEventListener("offline", () => {
+        console.warn(`@colyseus/sdk: 🛑 Network offline. Closing ${onOfflineListeners.length} connection(s)`);
+        onOfflineListeners.forEach((listener) => listener());
+    }, false);
+}
 
 export class Connection implements ITransport {
     transport: ITransport;
@@ -9,6 +23,8 @@ export class Connection implements ITransport {
     url?: string;
     options?: any;
 
+    #_offlineListener = (hasGlobalEventListeners) ? () => this.close(CloseCode.MAY_TRY_RECONNECT) : null;
+
     constructor(protocol?: string) {
         switch (protocol) {
             case "h3":
@@ -22,6 +38,20 @@ export class Connection implements ITransport {
     }
 
     connect(url: string, options?: any): void {
+        if (hasGlobalEventListeners) {
+            const onOpen = this.events.onopen;
+            this.events.onopen = (ev: any) => {
+                onOfflineListeners.push(this.#_offlineListener);
+                onOpen?.(ev);
+            };
+
+            const onClose = this.events.onclose;
+            this.events.onclose = (ev: any) => {
+                onOfflineListeners.splice(onOfflineListeners.indexOf(this.#_offlineListener), 1);
+                onClose?.(ev);
+            };
+        }
+
         this.url = url;
         this.options = options;
         this.transport.connect(url, options);

package/src/Room.ts

@@ -1,4 +1,4 @@
-import { type InferState, type ExtractRoomMessages, type ExtractRoomClientMessages, type ExtractMessageType } from '@colyseus/shared-types';
+import { CloseCode, 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';
@@ -14,7 +14,6 @@ import { createSignal } from './core/signal.ts';
 
 import { SchemaConstructor, SchemaSerializer } from './serializer/SchemaSerializer.ts';
 
-import { CloseCode } from './errors/Errors.ts';
 import { now } from './core/utils.ts';
 
 // Infer serializer type based on State: SchemaSerializer for Schema types, Serializer otherwise
@@ -113,7 +112,7 @@ export class Room<
     // reconnection logic
     public reconnection: ReconnectionOptions = {
         retryCount: 0,
-        maxRetries: 8,
+        maxRetries: 15,
         delay: 100,
         minDelay: 100,
         maxDelay: 5000,
@@ -146,7 +145,6 @@ export class Room<
             (this.serializer as SchemaSerializer).state = new rootSchema();
         }
 
-        this.onError((code, message) => console.warn?.(`colyseus.js - onError => (${code}) ${message}`));
         this.onLeave(() => this.removeAllListeners());
     }
 
@@ -164,7 +162,7 @@ export class Room<
                 e.code === CloseCode.NO_STATUS_RECEIVED ||
                 e.code === CloseCode.ABNORMAL_CLOSURE ||
                 e.code === CloseCode.GOING_AWAY ||
-                e.code === CloseCode.DEVMODE_RESTART
+                e.code === CloseCode.MAY_TRY_RECONNECT
             ) {
                 this.onDrop.invoke(e.code, e.reason);
                 this.handleReconnection();
@@ -176,7 +174,6 @@ export class Room<
         };
 
         this.connection.events.onerror = (e: CloseEvent) => {
-            console.warn?.(`Room, onError (${e.code}): ${e.reason}`);
             this.onError.invoke(e.code, e.reason);
         };
 
@@ -227,6 +224,11 @@ export class Room<
     }
 
     public ping(callback: (ms: number) => void) {
+        // skip if connection is not open
+        if (!this.connection?.isOpen) {
+            return;
+        }
+
         this.#lastPingTime = now();
         this.#pingCallback = callback;
         this.packr.buffer[0] = Protocol.PING;
@@ -414,8 +416,9 @@ export class Room<
                 : decode.number(buffer as Buffer, it);
 
             this.dispatchMessage(type, buffer.subarray(it.offset));
+
         } else if (code === Protocol.PING) {
-            this.#pingCallback?.(now() - this.#lastPingTime);
+            this.#pingCallback?.(Math.round(now() - this.#lastPingTime));
             this.#pingCallback = undefined;
         }
     }
@@ -459,7 +462,6 @@ export class Room<
         }
 
         if (!this.reconnection.isReconnecting) {
-            console.info(`[Colyseus reconnection]: ${String.fromCodePoint(0x1F504)} Re-establishing connection with roomId '${this.roomId}'...`); // 🔄
             this.reconnection.retryCount = 0;
             this.reconnection.isReconnecting = true;
         }
@@ -471,18 +473,19 @@ export class Room<
         this.reconnection.retryCount++;
 
         const delay = Math.min(this.reconnection.maxDelay, Math.max(this.reconnection.minDelay, this.reconnection.backoff(this.reconnection.retryCount, this.reconnection.delay)));
-
-        console.info(`[Colyseus reconnection]: ${String.fromCodePoint(0x1F504)} will retry in ${delay}ms... (${this.reconnection.retryCount} out of ${this.reconnection.maxRetries})`); // 🔄
+        console.info(`[Colyseus reconnection]: ${String.fromCodePoint(0x023F3)} will retry in ${(delay/1000).toFixed(1)} seconds...`); // 🔄
 
         // Wait before attempting reconnection
         setTimeout(() => {
             try {
+                console.info(`[Colyseus reconnection]: ${String.fromCodePoint(0x1F504)} Re-establishing sessionId '${this.sessionId}' with roomId '${this.roomId}'... (attempt ${this.reconnection.retryCount} of ${this.reconnection.maxRetries})`); // 🔄
                 this.connection.reconnect({
                     reconnectionToken: this.reconnectionToken.split(":")[1],
                     skipHandshake: true, // we already applied the handshake on first join
                 });
 
             } catch (e) {
+                console.log(".reconnect() failed", e);
                 if (this.reconnection.retryCount < this.reconnection.maxRetries) {
                     this.retryReconnection();
                 } else {