@antha/multiplayer-p2p-authoritative-host 0.0.3 → 0.0.5

package/dist/p2p-authoritative-host-multiplayer-controller.d.ts

@@ -1,6 +1,6 @@
 import { type ApiAndRoomConnectionState, type ClientId, ControllerClientEvent, ControllerConnectionEvent, ControllerRoomListEvent, type ControllerRoomListListener, type MultiplayerInitParams, type MultiplayerRoomConnection, MultiplayerRoomController, type RoomInput, RoomRejectionError } from '@antha/multiplayer-core';
 import { type JsonCompatibleValue, type MaybePromise, type PartialWithUndefined } from '@augment-vir/common';
-import { ListenTarget, type TypedCustomEventInit } from 'typed-event-target';
+import { ListenTarget, type RemoveListenerCallback, type TypedCustomEventInit } from 'typed-event-target';
 /**
  * Message type for {@link P2pAuthoritativeHostMessage}.
  *
@@ -152,7 +152,9 @@ export declare class P2pAuthoritativeHostMultiplayerController<Input extends Jso
      *
      * 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;
     /** Currently joined room id. If a room has not been joined yet, this will be empty. */
@@ -204,12 +206,13 @@ export declare class P2pAuthoritativeHostMultiplayerController<Input extends Jso
     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>;
+    /** Join through the core room controller while preserving the wrapper connection on failure. */
+    protected joinRoom({ previousRoomConnection, room, }: Readonly<{
+        previousRoomConnection: MultiplayerRoomConnection<P2pAuthoritativeHostMessage<Input, State>> | undefined;
+        room: Readonly<RoomInput>;
+    }>): Promise<MultiplayerRoomConnection<P2pAuthoritativeHostMessage<Input, State>>>;
     /** Leave the current room or single player connection. */
     leaveRoom(): void;
     /** Forward core room-controller events into this state-sync controller. */

package/dist/p2p-authoritative-host-multiplayer-controller.js

@@ -1,5 +1,5 @@
 import { ControllerClientEvent, ControllerConnectionEvent, ControllerMessageEvent, ControllerRoomListEvent, createMultiplayerId, emptyApiAndRoomConnectionState, MultiplayerConnectionState, MultiplayerRoomController, RoomRejectionError, } from '@antha/multiplayer-core';
-import { defineTypedCustomEvent, ListenTarget } from 'typed-event-target';
+import { defineTypedCustomEvent, ListenTarget, } from 'typed-event-target';
 /**
  * Message type for {@link P2pAuthoritativeHostMessage}.
  *
@@ -66,11 +66,6 @@ export class P2pAuthoritativeHostMultiplayerController extends ListenTarget {
     get clientId() {
         return this.roomConnection?.clientId || this.localClientId;
     }
-    /**
-     * 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) {
         return this.roomController.startRoomUpdates(callback);
     }
@@ -194,24 +189,29 @@ export class P2pAuthoritativeHostMultiplayerController extends ListenTarget {
         this.roomController.destroy();
         super.destroy();
     }
-    /**
-     * 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) {
+        if (this.singleplayer) {
             throw new Error('Cannot join room: connection already established.');
         }
+        const previousRoomConnection = this.roomConnection;
+        const roomConnection = await this.joinRoom({
+            previousRoomConnection,
+            room,
+        });
+        this.attachMultiplayerRoomConnection(roomConnection);
+    }
+    /** Join through the core room controller while preserving the wrapper connection on failure. */
+    async joinRoom({ previousRoomConnection, room, }) {
         try {
             await this.roomController.joinOrCreateRoom(room);
             if (!this.roomController.currentConnection) {
                 throw new Error('Cannot start p2p-authoritative-host multiplayer: room connection is missing.');
             }
-            this.attachMultiplayerRoomConnection(this.roomController.currentConnection);
+            return this.roomController.currentConnection;
         }
         catch (error) {
-            this.roomConnection = undefined;
+            this.roomConnection = previousRoomConnection;
             throw error;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@antha/multiplayer-p2p-authoritative-host",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "P2P authoritative-host multiplayer strategy for the Antha engine.",
     "keywords": [
         "vir",
@@ -48,7 +48,7 @@
         "istanbul-smart-text-reporter": "^1.1.5"
     },
     "peerDependencies": {
-        "@antha/multiplayer-core": "^0.0.3"
+        "@antha/multiplayer-core": "^0.0.5"
     },
     "engines": {
         "node": ">=22"