@antha/multiplayer-core 0.0.3 → 0.0.5

package/dist/multiplayer-api/multiplayer-controller.d.ts

@@ -1,7 +1,7 @@
 import { type JsonCompatibleValue, type MaybePromise, type PartialWithUndefined } from '@augment-vir/common';
 import { type FindPortOptions } from '@rest-vir/api';
 import { type AnyDuration } from 'date-vir';
-import { ListenTarget } from 'typed-event-target';
+import { ListenTarget, type RemoveListenerCallback } from 'typed-event-target';
 import { type ClientId, type RoomId } from '../multiplayer-id.js';
 import { type RoomInput } from '../webrtc/webrtc-multiplayer-controller.js';
 import { RoomRejectionError } from './errors.js';
@@ -397,7 +397,9 @@ export declare class MultiplayerRoomController<Message extends JsonCompatibleVal
      *
      * If a callback is provided, it is called each time the room list is updated.
      */
-    startRoomUpdates(callback?: ControllerRoomListListener | undefined): import("typed-event-target").RemoveListenerCallback;
+    startRoomUpdates(callback: ControllerRoomListListener): RemoveListenerCallback;
+    startRoomUpdates(callback?: undefined): undefined;
+    startRoomUpdates(callback?: ControllerRoomListListener | undefined): RemoveListenerCallback | undefined;
     /** Turn off room list updates and remove callbacks added via `startRoomUpdates`. */
     stopRoomUpdates(): void;
     /** Send a generic message to the current room. */
@@ -408,11 +410,7 @@ export declare class MultiplayerRoomController<Message extends JsonCompatibleVal
     isConnected(): boolean;
     /** Cleanup everything. */
     destroy(): void;
-    /**
-     * Join or create a room.
-     *
-     * @throws `Error` if this controller is already connected to a room.
-     */
+    /** Join or create a room. */
     joinOrCreateRoom(room: Readonly<RoomInput>): Promise<void>;
     /** Leave the current room or single player connection. */
     leaveRoom(): void;

package/dist/multiplayer-api/multiplayer-controller.js

@@ -1,7 +1,7 @@
 import { waitUntil } from '@augment-vir/assert';
 import { ensureError, makeWritable, } from '@augment-vir/common';
 import { convertDuration } from 'date-vir';
-import { defineTypedCustomEvent, ListenTarget } from 'typed-event-target';
+import { defineTypedCustomEvent, ListenTarget, } from 'typed-event-target';
 import { WebrtcMultiplayerConnectionUpdateEvent, WebrtcMultiplayerController, WebrtcMultiplayerMessageEvent, } from '../webrtc/webrtc-multiplayer-controller.js';
 import { RoomRejectionError } from './errors.js';
 import { multiplayerHealthEndpoint, multiplayerRoomsEndpoint, } from './multiplayer-api.js';
@@ -178,17 +178,17 @@ export class MultiplayerRoomController extends ListenTarget {
             throw error;
         }
     }
-    /**
-     * Listen for room list updates, including while connected to a room.
-     *
-     * If a callback is provided, it is called each time the room list is updated.
-     */
     startRoomUpdates(callback) {
         this.isListeningToRoomUpdates = true;
         this.startRoomInterval();
-        return this.listen(ControllerRoomListEvent, async (event) => {
-            await callback?.(event.detail);
-        });
+        if (callback) {
+            return this.listen(ControllerRoomListEvent, async (event) => {
+                await callback(event.detail);
+            });
+        }
+        else {
+            return undefined;
+        }
     }
     /** Turn off room list updates and remove callbacks added via `startRoomUpdates`. */
     stopRoomUpdates() {
@@ -220,21 +220,16 @@ export class MultiplayerRoomController extends ListenTarget {
         this.currentConnection?.destroy();
         this.stopRoomUpdates();
     }
-    /**
-     * Join or create a room.
-     *
-     * @throws `Error` if this controller is already connected to a room.
-     */
+    /** Join or create a room. */
     async joinOrCreateRoom(room) {
-        if (this.currentConnection) {
-            throw new Error('Cannot join room: connection already established.');
-        }
-        else if (!this.multiplayerApiClient || !this.multiplayerParams) {
+        if (!this.multiplayerApiClient || !this.multiplayerParams) {
             throw new Error('Cannot join room. Please start this controller in multiplayer mode to join rooms.');
         }
         else if (this.rejectedRoomIds.has(room.roomId)) {
             throw new RoomRejectionError(room);
         }
+        const previousConnection = this.currentConnection;
+        const previousRoomId = this.roomId;
         this.updateConnectionState({
             room: MultiplayerConnectionState.Connecting,
         });
@@ -243,7 +238,6 @@ export class MultiplayerRoomController extends ListenTarget {
                 return this.params.acceptConnection?.(data.connectingClientId, this) ?? true;
             }
             : undefined);
-        this.currentConnection = currentConnection;
         currentConnection.listen((WebrtcMultiplayerMessageEvent), (event) => {
             this.dispatch(new ControllerMessageEvent(event.sourceClientId, event.detail));
         });
@@ -252,32 +246,47 @@ export class MultiplayerRoomController extends ListenTarget {
                 detail: event.detail,
             }));
         });
-        await currentConnection.initConnection();
-        const connectionResult = await waitUntil.isDefined(() => {
-            const connected = currentConnection.isConnected();
-            const destroyed = currentConnection.isDestroyed;
-            return !connected && !destroyed
-                ? undefined
-                : {
-                    connected,
-                    destroyed,
-                };
-        });
-        if (connectionResult.connected) {
-            makeWritable(this).roomId = room.roomId;
-            this.stopRoomUpdates();
-            this.updateConnectionState({
-                room: MultiplayerConnectionState.Connected,
+        try {
+            await currentConnection.initConnection();
+            const connectionResult = await waitUntil.isDefined(() => {
+                const connected = currentConnection.isConnected();
+                const destroyed = currentConnection.isDestroyed;
+                return !connected && !destroyed
+                    ? undefined
+                    : {
+                        connected,
+                        destroyed,
+                    };
             });
+            if (connectionResult.connected) {
+                this.currentConnection = currentConnection;
+                previousConnection?.destroy();
+                makeWritable(this).roomId = room.roomId;
+                this.stopRoomUpdates();
+                this.updateConnectionState({
+                    room: MultiplayerConnectionState.Connected,
+                });
+            }
+            else {
+                this.rejectedRoomIds.add(room.roomId);
+                throw new RoomRejectionError(room);
+            }
         }
-        else {
+        catch (error) {
             currentConnection.destroy();
-            this.rejectedRoomIds.add(room.roomId);
-            this.currentConnection = undefined;
-            const error = new RoomRejectionError(room);
-            this.updateConnectionState({
-                room: error,
-            });
+            if (previousConnection) {
+                this.currentConnection = previousConnection;
+                makeWritable(this).roomId = previousRoomId;
+                this.updateConnectionState({
+                    room: MultiplayerConnectionState.Connected,
+                });
+            }
+            else {
+                this.currentConnection = undefined;
+                this.updateConnectionState({
+                    room: ensureError(error),
+                });
+            }
             throw error;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@antha/multiplayer-core",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "Core functionalities for Antha multiplayer mods.",
     "keywords": [
         "vir",