@gbraver-burst-network/anonymous-browser-sdk 2.4.0 → 2.5.0-beta.0

package/lib/abort-controller/abort-error.d.ts

@@ -0,0 +1,7 @@
+/**
+ * AbortErrorを生成する
+ * 本関数で生成する例外はfetchのAbortSignalがabortされた際に発生するものを模倣している
+ * @param message エラーメッセージ
+ * @returns AbortError
+ */
+export declare const createAbortError: (message: string) => DOMException;

package/lib/abort-controller/abort-error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAbortError = void 0;
+/**
+ * AbortErrorを生成する
+ * 本関数で生成する例外はfetchのAbortSignalがabortされた際に発生するものを模倣している
+ * @param message エラーメッセージ
+ * @returns AbortError
+ */
+const createAbortError = (message) => new DOMException(message, "AbortError");
+exports.createAbortError = createAbortError;

package/lib/abort-controller/abort-manager.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Abort管理オブジェクト
+ * Abortされた場合にあたらしいAbortControllerを生成する
+ * 本クラスはゲーム内で一つのみ生成される想定である
+ */
+export declare class AbortManager {
+    #private;
+    /**
+     * コンストラクタ
+     */
+    constructor();
+    /**
+     * 現在有効なAbortControllerを取得する
+     * @returns 取得結果
+     */
+    getAbortController(): AbortController;
+}

package/lib/abort-controller/abort-manager.js

@@ -0,0 +1,58 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AbortManager_instances, _AbortManager_abortController, _AbortManager_onAbortBound, _AbortManager_onAbort;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbortManager = void 0;
+/**
+ * Abort管理オブジェクト
+ * Abortされた場合にあたらしいAbortControllerを生成する
+ * 本クラスはゲーム内で一つのみ生成される想定である
+ */
+class AbortManager {
+    /**
+     * コンストラクタ
+     */
+    constructor() {
+        _AbortManager_instances.add(this);
+        /** 現在有効なAbortController */
+        _AbortManager_abortController.set(this, void 0);
+        /**
+         * プライベート関数#onAbortをthisでbindした関数
+         * bind(this)は新しい関数を生成するため、以下コードではコールバック関数の削除が正しく行えない
+         * そのため、本プロパティにbindした関数を保持し、コールバック関数の削除を行えるようにする。
+         *
+         * ```typescript
+         * abortController.signal.addEventListener("abort", this.#onAbort.bind(this));
+         * abortController.signal.removeEventListener("abort", this.#onAbort.bind(this));
+         * ```
+         * @private
+         */
+        _AbortManager_onAbortBound.set(this, void 0);
+        __classPrivateFieldSet(this, _AbortManager_abortController, new AbortController(), "f");
+        __classPrivateFieldSet(this, _AbortManager_onAbortBound, __classPrivateFieldGet(this, _AbortManager_instances, "m", _AbortManager_onAbort).bind(this), "f");
+        __classPrivateFieldGet(this, _AbortManager_abortController, "f").signal.addEventListener("abort", __classPrivateFieldGet(this, _AbortManager_onAbortBound, "f"));
+    }
+    /**
+     * 現在有効なAbortControllerを取得する
+     * @returns 取得結果
+     */
+    getAbortController() {
+        return __classPrivateFieldGet(this, _AbortManager_abortController, "f");
+    }
+}
+exports.AbortManager = AbortManager;
+_AbortManager_abortController = new WeakMap(), _AbortManager_onAbortBound = new WeakMap(), _AbortManager_instances = new WeakSet(), _AbortManager_onAbort = function _AbortManager_onAbort() {
+    __classPrivateFieldGet(this, _AbortManager_abortController, "f").signal.removeEventListener("abort", __classPrivateFieldGet(this, _AbortManager_onAbortBound, "f"));
+    __classPrivateFieldSet(this, _AbortManager_abortController, new AbortController(), "f");
+    __classPrivateFieldGet(this, _AbortManager_abortController, "f").signal.addEventListener("abort", __classPrivateFieldGet(this, _AbortManager_onAbortBound, "f"));
+};

package/lib/abort-controller/signal-container.d.ts

@@ -0,0 +1,5 @@
+/** シグナルコンテナ */
+export type SignalContainer = {
+    /** Promise強制終了用シグナル */
+    signal: AbortSignal;
+};

package/lib/abort-controller/signal-container.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export { AnonymousBattleSDK } from "./sdk/anonymous-battle-sdk";
 export { AuthTokenManager, createAuthTokenManager, } from "./sdk/auth-token-manager";
-export { createGuestAnonymousSDK, GuestAnonymousSDK, } from "./sdk/guest-anonymous-sdk";
-export { createHostAnonymousSDK, HostAnonymousSDK, } from "./sdk/host-anonymous-sdk";
-export { LocalWebRTCRoom } from "./sdk/local-webrtc-room";
+export { createGuestAnonymousSDK, GuestAnonymousSDK, } from "./sdk/guest/guest-anonymous-sdk";
+export { createHostAnonymousSDK, HostAnonymousSDK, } from "./sdk/host/host-anonymous-sdk";
+export { LocalWebRTCRoom } from "./sdk/host/local-webrtc-room";

package/lib/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHostAnonymousSDK = exports.createGuestAnonymousSDK = exports.createAuthTokenManager = void 0;
 var auth_token_manager_1 = require("./sdk/auth-token-manager");
 Object.defineProperty(exports, "createAuthTokenManager", { enumerable: true, get: function () { return auth_token_manager_1.createAuthTokenManager; } });
-var guest_anonymous_sdk_1 = require("./sdk/guest-anonymous-sdk");
+var guest_anonymous_sdk_1 = require("./sdk/guest/guest-anonymous-sdk");
 Object.defineProperty(exports, "createGuestAnonymousSDK", { enumerable: true, get: function () { return guest_anonymous_sdk_1.createGuestAnonymousSDK; } });
-var host_anonymous_sdk_1 = require("./sdk/host-anonymous-sdk");
+var host_anonymous_sdk_1 = require("./sdk/host/host-anonymous-sdk");
 Object.defineProperty(exports, "createHostAnonymousSDK", { enumerable: true, get: function () { return host_anonymous_sdk_1.createHostAnonymousSDK; } });

package/lib/sdk/{guest-anonymous-sdk.d.ts → guest/guest-anonymous-sdk.d.ts}

@@ -1,6 +1,6 @@
 import { ArmdozerId, PilotId } from "gbraver-burst-core";
 import { Observable } from "rxjs";
-import { AnonymousBattleSDK } from "./anonymous-battle-sdk";
+import { AnonymousBattleSDK } from "../anonymous-battle-sdk";
 import { GuestWebRTCConnectionManagerOptions } from "./guest-webrtc-connection-manager";
 /** ゲスト用匿名バックエンドSDK */
 export type GuestAnonymousSDK = {

package/lib/sdk/{guest-anonymous-sdk.js → guest/guest-anonymous-sdk.js}

@@ -19,25 +19,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _GuestAnonymousSDKImpl_instances, _GuestAnonymousSDKImpl_webRTCConnection, _GuestAnonymousSDKImpl_websocketConnection, _GuestAnonymousSDKImpl_frontendLog, _GuestAnonymousSDKImpl_signaling;
+var _GuestAnonymousSDKImpl_instances, _GuestAnonymousSDKImpl_webRTCConnection, _GuestAnonymousSDKImpl_websocketConnection, _GuestAnonymousSDKImpl_frontendLog, _GuestAnonymousSDKImpl_abortManager, _GuestAnonymousSDKImpl_signaling;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGuestAnonymousSDK = createGuestAnonymousSDK;
 const nanoid_1 = require("nanoid");
 const rxjs_1 = require("rxjs");
-const gather_all_ice_candidate_1 = require("../webrtc/gather-all-ice-candidate");
-const get_selected_ice_candidate_summary_1 = require("../webrtc/get-selected-ice-candidate-summary");
-const guest_message_1 = require("../webrtc/guest/guest-message");
-const receive_battle_start_1 = require("../webrtc/guest/receive-battle-start");
-const receive_request_selected_player_1 = require("../webrtc/guest/receive-request-selected-player");
-const wait_until_connected_1 = require("../webrtc/wait-until-connected");
-const join_room_1 = require("../websocket-api/join-room");
-const notify_ice_candidate_recieved_1 = require("../websocket-api/notify-ice-candidate-recieved");
-const send_to_ws_signal_1 = require("../websocket-api/send-to-ws-signal");
-const wait_until_sdp_recieve_1 = require("../websocket-api/wait-until-sdp-recieve");
-const frontend_log_manager_1 = require("./frontend-log-manager");
+const abort_manager_1 = require("../../abort-controller/abort-manager");
+const gather_all_ice_candidate_1 = require("../../webrtc/gather-all-ice-candidate");
+const get_selected_ice_candidate_summary_1 = require("../../webrtc/get-selected-ice-candidate-summary");
+const guest_message_1 = require("../../webrtc/guest/guest-message");
+const guest_ping_pong_check_1 = require("../../webrtc/guest/guest-ping-pong-check");
+const receive_battle_start_1 = require("../../webrtc/guest/receive-battle-start");
+const receive_request_selected_player_1 = require("../../webrtc/guest/receive-request-selected-player");
+const wait_until_connected_1 = require("../../webrtc/wait-until-connected");
+const join_room_1 = require("../../websocket-api/join-room");
+const notify_ice_candidate_recieved_1 = require("../../websocket-api/notify-ice-candidate-recieved");
+const send_to_ws_signal_1 = require("../../websocket-api/send-to-ws-signal");
+const wait_until_sdp_recieve_1 = require("../../websocket-api/wait-until-sdp-recieve");
+const frontend_log_manager_1 = require("../frontend-log-manager");
+const websocket_connection_manager_1 = require("../websocket-connection-manager");
 const guest_battle_sdk_1 = require("./guest-battle-sdk");
 const guest_webrtc_connection_manager_1 = require("./guest-webrtc-connection-manager");
-const websocket_connection_manager_1 = require("./websocket-connection-manager");
 /** ゲスト用匿名バックエンドSDKの実装 */
 class GuestAnonymousSDKImpl {
     /**
@@ -52,13 +54,20 @@ class GuestAnonymousSDKImpl {
         _GuestAnonymousSDKImpl_websocketConnection.set(this, void 0);
         /** フロントエンドログマネージャー */
         _GuestAnonymousSDKImpl_frontendLog.set(this, void 0);
+        /** アボート管理オブジェクト */
+        _GuestAnonymousSDKImpl_abortManager.set(this, void 0);
         __classPrivateFieldSet(this, _GuestAnonymousSDKImpl_webRTCConnection, new guest_webrtc_connection_manager_1.GuestWebRTCConnectionManager(options), "f");
         __classPrivateFieldSet(this, _GuestAnonymousSDKImpl_websocketConnection, new websocket_connection_manager_1.WebSocketConnectionManager(options), "f");
         __classPrivateFieldSet(this, _GuestAnonymousSDKImpl_frontendLog, new frontend_log_manager_1.FrontendLogManager(options), "f");
+        __classPrivateFieldSet(this, _GuestAnonymousSDKImpl_abortManager, new abort_manager_1.AbortManager(), "f");
     }
     /** @override */
     joinRoom(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { signal } = __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f").getAbortController();
+            if (signal.aborted) {
+                return Promise.reject(signal.reason);
+            }
             const spanId = (0, nanoid_1.nanoid)();
             const { roomID, armdozerId, pilotId } = options;
             __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
@@ -66,21 +75,23 @@ class GuestAnonymousSDKImpl {
             // イベントを取り逃がさないように、あらかじめハンドラをセットしておく
             const requestSelectedPlayerPromise = (() => __awaiter(this, void 0, void 0, function* () {
                 const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
-                return yield (0, receive_request_selected_player_1.receiveRequestSelectedPlayer)(dataChannel);
+                return yield (0, receive_request_selected_player_1.receiveRequestSelectedPlayer)({ dataChannel, signal });
             }))();
             const battleStartPromise = (() => __awaiter(this, void 0, void 0, function* () {
                 const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
-                return yield (0, receive_battle_start_1.receiveBattleStart)(dataChannel);
+                return yield (0, receive_battle_start_1.receiveBattleStart)({ dataChannel, signal });
             }))();
             const websocket = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").getOrCreate();
-            const joinRoomAccepted = yield (0, join_room_1.joinRoom)({ websocket, roomID });
+            const joinRoomAccepted = yield (0, join_room_1.joinRoom)({ websocket, roomID, signal });
             if (!joinRoomAccepted) {
                 return null;
             }
             const { signalingID } = joinRoomAccepted;
-            yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_instances, "m", _GuestAnonymousSDKImpl_signaling).call(this, { signalingID, spanId });
-            const { flowID } = yield requestSelectedPlayerPromise;
+            yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_instances, "m", _GuestAnonymousSDKImpl_signaling).call(this, { signalingID, spanId, signal });
             const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
+            yield (0, guest_ping_pong_check_1.guestPingPongCheck)({ dataChannel, signal });
+            const { flowID } = yield requestSelectedPlayerPromise;
+            __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
             (0, guest_message_1.sendGuestMessage)(dataChannel, {
                 type: "send-player",
                 flowID,
@@ -94,6 +105,7 @@ class GuestAnonymousSDKImpl {
                 initialState: battleStart.update,
                 initialFlowID: battleStart.flowID,
                 webRTCConnection: __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f"),
+                abortManager: __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f"),
             });
         });
     }
@@ -104,15 +116,20 @@ class GuestAnonymousSDKImpl {
     /** @override */
     disconnectWebSocket() {
         __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
+        __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebSocket disconnected");
     }
     /** @override */
     disconnectWebRTC() {
         __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").disconnect();
+        __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebRTC disconnected");
     }
 }
-_GuestAnonymousSDKImpl_webRTCConnection = new WeakMap(), _GuestAnonymousSDKImpl_websocketConnection = new WeakMap(), _GuestAnonymousSDKImpl_frontendLog = new WeakMap(), _GuestAnonymousSDKImpl_instances = new WeakSet(), _GuestAnonymousSDKImpl_signaling = function _GuestAnonymousSDKImpl_signaling(options) {
+_GuestAnonymousSDKImpl_webRTCConnection = new WeakMap(), _GuestAnonymousSDKImpl_websocketConnection = new WeakMap(), _GuestAnonymousSDKImpl_frontendLog = new WeakMap(), _GuestAnonymousSDKImpl_abortManager = new WeakMap(), _GuestAnonymousSDKImpl_instances = new WeakSet(), _GuestAnonymousSDKImpl_signaling = function _GuestAnonymousSDKImpl_signaling(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { signalingID, spanId } = options;
+        const { signalingID, spanId, signal } = options;
+        if (signal.aborted) {
+            return Promise.reject(signal.reason);
+        }
         let unSubscribers = [];
         try {
             yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_frontendLog, "f").log({
@@ -151,7 +168,7 @@ _GuestAnonymousSDKImpl_webRTCConnection = new WeakMap(), _GuestAnonymousSDKImpl_
                     });
                 }),
             ];
-            const remoteSDP = yield (0, wait_until_sdp_recieve_1.waitUntilSDPReceive)(websocket);
+            const remoteSDP = yield (0, wait_until_sdp_recieve_1.waitUntilSDPReceive)({ websocket, signal });
             yield connection.setRemoteDescription(remoteSDP);
             isRemoteDescriptionSet = true;
             pendingIceCandidates.forEach((iceCandidate) => {
@@ -164,7 +181,7 @@ _GuestAnonymousSDKImpl_webRTCConnection = new WeakMap(), _GuestAnonymousSDKImpl_
                 signalingID,
                 sdp,
             });
-            yield (0, wait_until_connected_1.waitUntilConnected)(connection);
+            yield (0, wait_until_connected_1.waitUntilConnected)(connection, { signal });
             yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_frontendLog, "f").log({
                 type: "SIGNALING_END",
                 spanId,
@@ -179,7 +196,6 @@ _GuestAnonymousSDKImpl_webRTCConnection = new WeakMap(), _GuestAnonymousSDKImpl_
             }
         }
         finally {
-            __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
             unSubscribers.forEach((unSubscriber) => unSubscriber.unsubscribe());
         }
     });

package/lib/sdk/{guest-battle-sdk.d.ts → guest/guest-battle-sdk.d.ts}

@@ -1,6 +1,7 @@
 import { Command, GameState, Player } from "gbraver-burst-core";
 import { Observable } from "rxjs";
-import { AnonymousBattleSDK } from "./anonymous-battle-sdk";
+import { AbortManager } from "../../abort-controller/abort-manager";
+import { AnonymousBattleSDK } from "../anonymous-battle-sdk";
 import { GuestWebRTCConnectionManager } from "./guest-webrtc-connection-manager";
 /** ゲスト側バトルSDK */
 export declare class GuestBattleSDK implements AnonymousBattleSDK {
@@ -21,6 +22,7 @@ export declare class GuestBattleSDK implements AnonymousBattleSDK {
      * @param options.initialState ゲームの初期状態
      * @param options.initialFlowID 初期のフローID
      * @param options.webRTCConnection ホストのWebRTCコネクションマネージャー
+     * @param options.abortManager アボート管理オブジェクト
      */
     constructor(options: {
         hostPlayer: Player;
@@ -28,6 +30,7 @@ export declare class GuestBattleSDK implements AnonymousBattleSDK {
         initialState: GameState[];
         initialFlowID: string;
         webRTCConnection: GuestWebRTCConnectionManager;
+        abortManager: AbortManager;
     });
     /** @override */
     progress(command: Command): Promise<GameState[]>;

package/lib/sdk/{guest-battle-sdk.js → guest/guest-battle-sdk.js}

@@ -19,13 +19,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _GuestBattleSDK_webRTCConnection, _GuestBattleSDK_sendExceptionSubject;
+var _GuestBattleSDK_webRTCConnection, _GuestBattleSDK_sendExceptionSubject, _GuestBattleSDK_abortManager;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuestBattleSDK = void 0;
 const rxjs_1 = require("rxjs");
-const guest_message_1 = require("../webrtc/guest/guest-message");
-const receive_battle_progressed_1 = require("../webrtc/guest/receive-battle-progressed");
-const notify_connection_failed_1 = require("../webrtc/notify-connection-failed");
+const guest_message_1 = require("../../webrtc/guest/guest-message");
+const receive_battle_progressed_1 = require("../../webrtc/guest/receive-battle-progressed");
+const notify_connection_failed_1 = require("../../webrtc/notify-connection-failed");
 /** ゲスト側バトルSDK */
 class GuestBattleSDK {
     /**
@@ -36,23 +36,34 @@ class GuestBattleSDK {
      * @param options.initialState ゲームの初期状態
      * @param options.initialFlowID 初期のフローID
      * @param options.webRTCConnection ホストのWebRTCコネクションマネージャー
+     * @param options.abortManager アボート管理オブジェクト
      */
     constructor(options) {
         /** ホストのWebRTCコネクションマネージャー */
         _GuestBattleSDK_webRTCConnection.set(this, void 0);
         /** dataChannel.sendの例外通知ストリーム */
         _GuestBattleSDK_sendExceptionSubject.set(this, new rxjs_1.Subject());
+        /** アボート管理オブジェクト */
+        _GuestBattleSDK_abortManager.set(this, void 0);
         this.player = options.guestPlayer;
         this.enemy = options.hostPlayer;
         this.initialState = options.initialState;
         this.flowID = options.initialFlowID;
         __classPrivateFieldSet(this, _GuestBattleSDK_webRTCConnection, options.webRTCConnection, "f");
+        __classPrivateFieldSet(this, _GuestBattleSDK_abortManager, options.abortManager, "f");
     }
     /** @override */
     progress(command) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { signal } = __classPrivateFieldGet(this, _GuestBattleSDK_abortManager, "f").getAbortController();
+            if (signal.aborted) {
+                return Promise.reject(signal.reason);
+            }
             const dataChannel = yield __classPrivateFieldGet(this, _GuestBattleSDK_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
-            const battleProgressedPromise = (0, receive_battle_progressed_1.receiveBattleProgressed)(dataChannel);
+            const battleProgressedPromise = (0, receive_battle_progressed_1.receiveBattleProgressed)({
+                dataChannel,
+                signal,
+            });
             try {
                 (0, guest_message_1.sendGuestMessage)(dataChannel, {
                     type: "send-command",
@@ -75,4 +86,4 @@ class GuestBattleSDK {
     }
 }
 exports.GuestBattleSDK = GuestBattleSDK;
-_GuestBattleSDK_webRTCConnection = new WeakMap(), _GuestBattleSDK_sendExceptionSubject = new WeakMap();
+_GuestBattleSDK_webRTCConnection = new WeakMap(), _GuestBattleSDK_sendExceptionSubject = new WeakMap(), _GuestBattleSDK_abortManager = new WeakMap();

package/lib/sdk/{guest-webrtc-connection-manager.d.ts → guest/guest-webrtc-connection-manager.d.ts}

@@ -1,4 +1,4 @@
-import { AuthTokenManager } from "./auth-token-manager";
+import { AuthTokenManager } from "../auth-token-manager";
 /** GuestWebRTCConnectionManagerコンストラクタのオプション */
 export type GuestWebRTCConnectionManagerOptions = {
     /** 認証トークンマネージャー */

package/lib/sdk/{guest-webrtc-connection-manager.js → guest/guest-webrtc-connection-manager.js}

@@ -13,8 +13,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GuestWebRTCConnectionManager_authToken, _GuestWebRTCConnectionManager_connectionState, _GuestWebRTCConnectionManager_anonymousBackendApiURL, _GuestWebRTCConnectionManager_coturnDomainName;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuestWebRTCConnectionManager = void 0;
-const wait_until_data_channel_1 = require("../webrtc/guest/wait-until-data-channel");
-const create_rtc_peer_connection_1 = require("./create-rtc-peer-connection");
+const wait_until_data_channel_1 = require("../../webrtc/guest/wait-until-data-channel");
+const create_rtc_peer_connection_1 = require("../create-rtc-peer-connection");
 /** ゲストのWebRTCコネクション管理 */
 class GuestWebRTCConnectionManager {
     /** コンストラクタ

package/lib/sdk/{host-anonymous-sdk.js → host/host-anonymous-sdk.js}

@@ -19,15 +19,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HostAnonymousSDKImpl_webRTCConnection, _HostAnonymousSDKImpl_websocketConnection, _HostAnonymousSDKImpl_frontendLog;
+var _HostAnonymousSDKImpl_webRTCConnection, _HostAnonymousSDKImpl_websocketConnection, _HostAnonymousSDKImpl_frontendLog, _HostAnonymousSDKImpl_abortManager;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHostAnonymousSDK = createHostAnonymousSDK;
 const nanoid_1 = require("nanoid");
-const create_room_1 = require("../websocket-api/create-room");
-const frontend_log_manager_1 = require("./frontend-log-manager");
+const abort_manager_1 = require("../../abort-controller/abort-manager");
+const create_room_1 = require("../../websocket-api/create-room");
+const frontend_log_manager_1 = require("../frontend-log-manager");
+const websocket_connection_manager_1 = require("../websocket-connection-manager");
 const host_webrtc_connection_manager_1 = require("./host-webrtc-connection-manager");
 const local_webrtc_room_1 = require("./local-webrtc-room");
-const websocket_connection_manager_1 = require("./websocket-connection-manager");
 /** ホスト用匿名バックエンドSDKの実装 */
 class HostAnonymousSDKImpl {
     /**
@@ -41,19 +42,26 @@ class HostAnonymousSDKImpl {
         _HostAnonymousSDKImpl_websocketConnection.set(this, void 0);
         /** フロントエンドログマネージャー */
         _HostAnonymousSDKImpl_frontendLog.set(this, void 0);
+        /** アボート管理オブジェクト */
+        _HostAnonymousSDKImpl_abortManager.set(this, void 0);
         __classPrivateFieldSet(this, _HostAnonymousSDKImpl_websocketConnection, new websocket_connection_manager_1.WebSocketConnectionManager(options), "f");
         __classPrivateFieldSet(this, _HostAnonymousSDKImpl_webRTCConnection, new host_webrtc_connection_manager_1.HostWebRTCConnectionManager(options), "f");
         __classPrivateFieldSet(this, _HostAnonymousSDKImpl_frontendLog, new frontend_log_manager_1.FrontendLogManager(options), "f");
+        __classPrivateFieldSet(this, _HostAnonymousSDKImpl_abortManager, new abort_manager_1.AbortManager(), "f");
     }
     /** @override */
     createRoom(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { signal } = __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f").getAbortController();
+            if (signal.aborted) {
+                return Promise.reject(signal.reason);
+            }
             const spanId = (0, nanoid_1.nanoid)();
             try {
                 __classPrivateFieldGet(this, _HostAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
                 __classPrivateFieldGet(this, _HostAnonymousSDKImpl_webRTCConnection, "f").disconnect();
                 const websocket = yield __classPrivateFieldGet(this, _HostAnonymousSDKImpl_websocketConnection, "f").getOrCreate();
-                const roomID = yield (0, create_room_1.createRoom)(websocket);
+                const roomID = yield (0, create_room_1.createRoom)({ websocket, signal });
                 if (roomID === null) {
                     __classPrivateFieldGet(this, _HostAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
                     return null;
@@ -67,6 +75,7 @@ class HostAnonymousSDKImpl {
                     frontendLog: __classPrivateFieldGet(this, _HostAnonymousSDKImpl_frontendLog, "f"),
                     hostArmdozerId,
                     hostPilotId,
+                    abortManager: __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f"),
                 });
             }
             catch (e) {
@@ -82,13 +91,15 @@ class HostAnonymousSDKImpl {
     /** @override */
     disconnectWebSocket() {
         __classPrivateFieldGet(this, _HostAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
+        __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebSocket disconnected");
     }
     /** @override */
     disconnectWebRTC() {
         __classPrivateFieldGet(this, _HostAnonymousSDKImpl_webRTCConnection, "f").disconnect();
+        __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebRTC disconnected");
     }
 }
-_HostAnonymousSDKImpl_webRTCConnection = new WeakMap(), _HostAnonymousSDKImpl_websocketConnection = new WeakMap(), _HostAnonymousSDKImpl_frontendLog = new WeakMap();
+_HostAnonymousSDKImpl_webRTCConnection = new WeakMap(), _HostAnonymousSDKImpl_websocketConnection = new WeakMap(), _HostAnonymousSDKImpl_frontendLog = new WeakMap(), _HostAnonymousSDKImpl_abortManager = new WeakMap();
 /**
  * ホスト用匿名バックエンドSDKを生成する
  * @param options SDK生成のオプション

package/lib/sdk/{host-battle-sdk.d.ts → host/host-battle-sdk.d.ts}

@@ -1,6 +1,7 @@
 import { ArmdozerId, Command, GameState, PilotId, Player } from "gbraver-burst-core";
 import { Observable } from "rxjs";
-import { AnonymousBattleSDK } from "./anonymous-battle-sdk";
+import { AbortManager } from "../../abort-controller/abort-manager";
+import { AnonymousBattleSDK } from "../anonymous-battle-sdk";
 import { HostWebRTCConnectionManager } from "./host-webrtc-connection-manager";
 /** ホスト側バトルSDK */
 export declare class HostBattleSDK implements AnonymousBattleSDK {
@@ -21,6 +22,7 @@ export declare class HostBattleSDK implements AnonymousBattleSDK {
      * @param options.guestArmdozerId ゲスト側のアームドーザID
      * @param options.guestPilotId ゲスト側のパイロットID
      * @param options.webRTCConnection ホスト側のWebRTC接続マネージャー
+     * @param options.abortManager アボート管理オブジェクト
      */
     constructor(options: {
         hostArmdozerId: ArmdozerId;
@@ -28,6 +30,7 @@ export declare class HostBattleSDK implements AnonymousBattleSDK {
         guestArmdozerId: ArmdozerId;
         guestPilotId: PilotId;
         webRTCConnection: HostWebRTCConnectionManager;
+        abortManager: AbortManager;
     });
     /** @override */
     progress(command: Command): Promise<GameState[]>;

package/lib/sdk/{host-battle-sdk.js → host/host-battle-sdk.js}

@@ -19,15 +19,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HostBattleSDK_core, _HostBattleSDK_webRTCConnection, _HostBattleSDK_sendCommandPromise, _HostBattleSDK_sendExceptionSubject;
+var _HostBattleSDK_core, _HostBattleSDK_webRTCConnection, _HostBattleSDK_sendCommandPromise, _HostBattleSDK_sendExceptionSubject, _HostBattleSDK_abortManager;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HostBattleSDK = void 0;
 const gbraver_burst_core_1 = require("gbraver-burst-core");
 const nanoid_1 = require("nanoid");
 const rxjs_1 = require("rxjs");
-const host_message_1 = require("../webrtc/host/host-message");
-const receive_send_command_1 = require("../webrtc/host/receive-send-command");
-const notify_connection_failed_1 = require("../webrtc/notify-connection-failed");
+const host_message_1 = require("../../webrtc/host/host-message");
+const receive_send_command_1 = require("../../webrtc/host/receive-send-command");
+const notify_connection_failed_1 = require("../../webrtc/notify-connection-failed");
 /** ホスト側バトルSDK */
 class HostBattleSDK {
     /**
@@ -38,6 +38,7 @@ class HostBattleSDK {
      * @param options.guestArmdozerId ゲスト側のアームドーザID
      * @param options.guestPilotId ゲスト側のパイロットID
      * @param options.webRTCConnection ホスト側のWebRTC接続マネージャー
+     * @param options.abortManager アボート管理オブジェクト
      */
     constructor(options) {
         var _a, _b, _c, _d;
@@ -49,6 +50,8 @@ class HostBattleSDK {
         _HostBattleSDK_sendCommandPromise.set(this, void 0);
         /** dataChannel.sendの例外通知ストリーム */
         _HostBattleSDK_sendExceptionSubject.set(this, new rxjs_1.Subject());
+        /** アボート管理オブジェクト */
+        _HostBattleSDK_abortManager.set(this, void 0);
         const hostPlayerId = (0, nanoid_1.nanoid)();
         this.player = {
             playerId: hostPlayerId,
@@ -63,15 +66,21 @@ class HostBattleSDK {
         };
         __classPrivateFieldSet(this, _HostBattleSDK_core, (0, gbraver_burst_core_1.startGBraverBurst)([this.player, this.enemy]), "f");
         this.initialState = __classPrivateFieldGet(this, _HostBattleSDK_core, "f").stateHistory();
+        __classPrivateFieldSet(this, _HostBattleSDK_abortManager, options.abortManager, "f");
+        const { signal } = __classPrivateFieldGet(this, _HostBattleSDK_abortManager, "f").getAbortController();
         this.flowID = (0, nanoid_1.nanoid)();
         __classPrivateFieldSet(this, _HostBattleSDK_webRTCConnection, options.webRTCConnection, "f");
         __classPrivateFieldSet(this, _HostBattleSDK_sendCommandPromise, __classPrivateFieldGet(this, _HostBattleSDK_webRTCConnection, "f")
             .getOrCreateConnection()
-            .then(({ dataChannel }) => (0, receive_send_command_1.receiveSendCommand)(dataChannel, this.flowID)), "f");
+            .then(({ dataChannel }) => (0, receive_send_command_1.receiveSendCommand)({ dataChannel, flowID: this.flowID, signal })), "f");
     }
     /** @override */
     progress(command) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { signal } = __classPrivateFieldGet(this, _HostBattleSDK_abortManager, "f").getAbortController();
+            if (signal.aborted) {
+                return Promise.reject(signal.reason);
+            }
             const sendCommand = yield __classPrivateFieldGet(this, _HostBattleSDK_sendCommandPromise, "f");
             const hostCommand = { playerId: this.player.playerId, command };
             const guestCommand = {
@@ -81,7 +90,11 @@ class HostBattleSDK {
             const update = __classPrivateFieldGet(this, _HostBattleSDK_core, "f").progress([hostCommand, guestCommand]);
             this.flowID = (0, nanoid_1.nanoid)();
             const { dataChannel } = yield __classPrivateFieldGet(this, _HostBattleSDK_webRTCConnection, "f").getOrCreateConnection();
-            __classPrivateFieldSet(this, _HostBattleSDK_sendCommandPromise, (0, receive_send_command_1.receiveSendCommand)(dataChannel, this.flowID), "f");
+            __classPrivateFieldSet(this, _HostBattleSDK_sendCommandPromise, (0, receive_send_command_1.receiveSendCommand)({
+                dataChannel,
+                flowID: this.flowID,
+                signal,
+            }), "f");
             try {
                 (0, host_message_1.sendHostMessage)(dataChannel, {
                     type: "battle-progressed",
@@ -105,4 +118,4 @@ class HostBattleSDK {
     }
 }
 exports.HostBattleSDK = HostBattleSDK;
-_HostBattleSDK_core = new WeakMap(), _HostBattleSDK_webRTCConnection = new WeakMap(), _HostBattleSDK_sendCommandPromise = new WeakMap(), _HostBattleSDK_sendExceptionSubject = new WeakMap();
+_HostBattleSDK_core = new WeakMap(), _HostBattleSDK_webRTCConnection = new WeakMap(), _HostBattleSDK_sendCommandPromise = new WeakMap(), _HostBattleSDK_sendExceptionSubject = new WeakMap(), _HostBattleSDK_abortManager = new WeakMap();

package/lib/sdk/{host-webrtc-connection-manager.d.ts → host/host-webrtc-connection-manager.d.ts}

@@ -1,4 +1,4 @@
-import { AuthTokenManager } from "./auth-token-manager";
+import { AuthTokenManager } from "../auth-token-manager";
 /** コネクション情報 */
 type Connection = {
     /** WebRTCコネクション */

package/lib/sdk/{host-webrtc-connection-manager.js → host/host-webrtc-connection-manager.js}

@@ -22,7 +22,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _HostWebRTCConnectionManager_authToken, _HostWebRTCConnectionManager_connection, _HostWebRTCConnectionManager_anonymousBackendApiURL, _HostWebRTCConnectionManager_coturnDomainName;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HostWebRTCConnectionManager = void 0;
-const create_rtc_peer_connection_1 = require("./create-rtc-peer-connection");
+const create_rtc_peer_connection_1 = require("../create-rtc-peer-connection");
 /** ホストのWebRTCコネクション管理 */
 class HostWebRTCConnectionManager {
     /**

package/lib/sdk/{local-webrtc-room.d.ts → host/local-webrtc-room.d.ts}

@@ -1,8 +1,9 @@
 import { ArmdozerId, PilotId } from "gbraver-burst-core";
-import { AnonymousBattleSDK } from "./anonymous-battle-sdk";
-import { FrontendLogManager } from "./frontend-log-manager";
+import { AbortManager } from "../../abort-controller/abort-manager";
+import { AnonymousBattleSDK } from "../anonymous-battle-sdk";
+import { FrontendLogManager } from "../frontend-log-manager";
+import { WebSocketConnectionManager } from "../websocket-connection-manager";
 import { HostWebRTCConnectionManager } from "./host-webrtc-connection-manager";
-import { WebSocketConnectionManager } from "./websocket-connection-manager";
 /** ローカルWebRTC ルーム */
 export type LocalWebRTCRoom = {
     /** ルームID */
@@ -26,6 +27,7 @@ export declare class LocalWebRTCRoomImpl implements LocalWebRTCRoom {
      * @param options.webRTCConnection WebRTCコネクションマネジャー
      * @param options.websocketConnection WebSocketコネクションマネジャー
      * @param options.frontendLog フロントエンドログマネジャー
+     * @param options.abortManager アボート管理オブジェクト
      */
     constructor(options: {
         roomID: string;
@@ -35,6 +37,7 @@ export declare class LocalWebRTCRoomImpl implements LocalWebRTCRoom {
         frontendLog: FrontendLogManager;
         hostArmdozerId: ArmdozerId;
         hostPilotId: PilotId;
+        abortManager: AbortManager;
     });
     /**
      * マッチングするまで待機する