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

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

@@ -19,22 +19,23 @@ 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 _LocalWebRTCRoomImpl_instances, _LocalWebRTCRoomImpl_spanId, _LocalWebRTCRoomImpl_webRTCConnection, _LocalWebRTCRoomImpl_websocketConnection, _LocalWebRTCRoomImpl_frontendLog, _LocalWebRTCRoomImpl_hostArmdozerId, _LocalWebRTCRoomImpl_hostPilotId, _LocalWebRTCRoomImpl_signaling;
+var _LocalWebRTCRoomImpl_instances, _LocalWebRTCRoomImpl_spanId, _LocalWebRTCRoomImpl_webRTCConnection, _LocalWebRTCRoomImpl_websocketConnection, _LocalWebRTCRoomImpl_frontendLog, _LocalWebRTCRoomImpl_abortManager, _LocalWebRTCRoomImpl_hostArmdozerId, _LocalWebRTCRoomImpl_hostPilotId, _LocalWebRTCRoomImpl_signaling;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalWebRTCRoomImpl = void 0;
 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 host_message_1 = require("../webrtc/host/host-message");
-const request_selected_player_1 = require("../webrtc/host/request-selected-player");
-const wait_until_connected_1 = require("../webrtc/wait-until-connected");
-const wait_until_data_channel_ready_1 = require("../webrtc/wait-until-data-channel-ready");
-const delete_signaling_channel_1 = require("../websocket-api/delete-signaling-channel");
-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_matching_1 = require("../websocket-api/wait-until-matching");
-const wait_until_sdp_recieve_1 = require("../websocket-api/wait-until-sdp-recieve");
+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 host_message_1 = require("../../webrtc/host/host-message");
+const host_ping_pong_check_1 = require("../../webrtc/host/host-ping-pong-check");
+const request_selected_player_1 = require("../../webrtc/host/request-selected-player");
+const wait_until_connected_1 = require("../../webrtc/wait-until-connected");
+const wait_until_data_channel_ready_1 = require("../../webrtc/wait-until-data-channel-ready");
+const delete_signaling_channel_1 = require("../../websocket-api/delete-signaling-channel");
+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_matching_1 = require("../../websocket-api/wait-until-matching");
+const wait_until_sdp_recieve_1 = require("../../websocket-api/wait-until-sdp-recieve");
 const host_battle_sdk_1 = require("./host-battle-sdk");
 /** ローカルWebRTCルームの実装 */
 class LocalWebRTCRoomImpl {
@@ -46,6 +47,7 @@ class LocalWebRTCRoomImpl {
      * @param options.webRTCConnection WebRTCコネクションマネジャー
      * @param options.websocketConnection WebSocketコネクションマネジャー
      * @param options.frontendLog フロントエンドログマネジャー
+     * @param options.abortManager アボート管理オブジェクト
      */
     constructor(options) {
         _LocalWebRTCRoomImpl_instances.add(this);
@@ -57,11 +59,13 @@ class LocalWebRTCRoomImpl {
         _LocalWebRTCRoomImpl_websocketConnection.set(this, void 0);
         /** フロントエンドログマネージャー */
         _LocalWebRTCRoomImpl_frontendLog.set(this, void 0);
+        /** アボート管理オブジェクト */
+        _LocalWebRTCRoomImpl_abortManager.set(this, void 0);
         /** ホストが選択したアームドーザID */
         _LocalWebRTCRoomImpl_hostArmdozerId.set(this, void 0);
         /** ホストが選択したパイロットID */
         _LocalWebRTCRoomImpl_hostPilotId.set(this, void 0);
-        const { roomID, spanId, webRTCConnection, websocketConnection, hostArmdozerId, hostPilotId, frontendLog, } = options;
+        const { roomID, spanId, webRTCConnection, websocketConnection, hostArmdozerId, hostPilotId, frontendLog, abortManager, } = options;
         this.roomID = roomID;
         __classPrivateFieldSet(this, _LocalWebRTCRoomImpl_spanId, spanId, "f");
         __classPrivateFieldSet(this, _LocalWebRTCRoomImpl_webRTCConnection, webRTCConnection, "f");
@@ -69,6 +73,7 @@ class LocalWebRTCRoomImpl {
         __classPrivateFieldSet(this, _LocalWebRTCRoomImpl_hostArmdozerId, hostArmdozerId, "f");
         __classPrivateFieldSet(this, _LocalWebRTCRoomImpl_hostPilotId, hostPilotId, "f");
         __classPrivateFieldSet(this, _LocalWebRTCRoomImpl_frontendLog, frontendLog, "f");
+        __classPrivateFieldSet(this, _LocalWebRTCRoomImpl_abortManager, abortManager, "f");
     }
     /**
      * マッチングするまで待機する
@@ -76,17 +81,25 @@ class LocalWebRTCRoomImpl {
      */
     waitUntilMatching() {
         return __awaiter(this, void 0, void 0, function* () {
+            const { signal } = __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_abortManager, "f").getAbortController();
+            if (signal.aborted) {
+                return Promise.reject(signal.reason);
+            }
             const websocket = yield __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_websocketConnection, "f").getOrCreate();
-            const signalingID = yield __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_instances, "m", _LocalWebRTCRoomImpl_signaling).call(this, websocket);
+            const signalingID = yield __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_instances, "m", _LocalWebRTCRoomImpl_signaling).call(this, websocket, signal);
             const { dataChannel } = yield __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_webRTCConnection, "f").getOrCreateConnection();
+            yield (0, host_ping_pong_check_1.hostPingPongCheck)({ dataChannel, signal });
+            yield (0, delete_signaling_channel_1.deleteSignalingChannel)({ signalingID, websocket, signal });
+            __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_websocketConnection, "f").gracefulDisconnect();
             const flowID = (0, nanoid_1.nanoid)();
-            const { armdozerId: guestArmdozerId, pilotId: guestPilotId } = yield (0, request_selected_player_1.requestSelectedPlayer)(dataChannel, flowID);
+            const { armdozerId: guestArmdozerId, pilotId: guestPilotId } = yield (0, request_selected_player_1.requestSelectedPlayer)({ dataChannel, flowID, signal });
             const battleSDK = new host_battle_sdk_1.HostBattleSDK({
                 hostArmdozerId: __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_hostArmdozerId, "f"),
                 hostPilotId: __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_hostPilotId, "f"),
                 guestArmdozerId,
                 guestPilotId,
                 webRTCConnection: __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_webRTCConnection, "f"),
+                abortManager: __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_abortManager, "f"),
             });
             (0, host_message_1.sendHostMessage)(dataChannel, {
                 type: "battle-start",
@@ -95,21 +108,23 @@ class LocalWebRTCRoomImpl {
                 guestPlayer: battleSDK.enemy,
                 update: battleSDK.initialState,
             });
-            yield (0, delete_signaling_channel_1.deleteSignalingChannel)({ signalingID, websocket });
             return battleSDK;
         });
     }
 }
 exports.LocalWebRTCRoomImpl = LocalWebRTCRoomImpl;
-_LocalWebRTCRoomImpl_spanId = new WeakMap(), _LocalWebRTCRoomImpl_webRTCConnection = new WeakMap(), _LocalWebRTCRoomImpl_websocketConnection = new WeakMap(), _LocalWebRTCRoomImpl_frontendLog = new WeakMap(), _LocalWebRTCRoomImpl_hostArmdozerId = new WeakMap(), _LocalWebRTCRoomImpl_hostPilotId = new WeakMap(), _LocalWebRTCRoomImpl_instances = new WeakSet(), _LocalWebRTCRoomImpl_signaling = function _LocalWebRTCRoomImpl_signaling(websocket) {
+_LocalWebRTCRoomImpl_spanId = new WeakMap(), _LocalWebRTCRoomImpl_webRTCConnection = new WeakMap(), _LocalWebRTCRoomImpl_websocketConnection = new WeakMap(), _LocalWebRTCRoomImpl_frontendLog = new WeakMap(), _LocalWebRTCRoomImpl_abortManager = new WeakMap(), _LocalWebRTCRoomImpl_hostArmdozerId = new WeakMap(), _LocalWebRTCRoomImpl_hostPilotId = new WeakMap(), _LocalWebRTCRoomImpl_instances = new WeakSet(), _LocalWebRTCRoomImpl_signaling = function _LocalWebRTCRoomImpl_signaling(websocket, signal) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (signal.aborted) {
+            return Promise.reject(signal.reason);
+        }
         let unSubscribers = [];
         try {
             yield __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_frontendLog, "f").log({
                 type: "SIGNALING_START",
                 spanId: __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_spanId, "f"),
             });
-            const signalingID = yield (0, wait_until_matching_1.waitUntilMatching)(websocket);
+            const signalingID = yield (0, wait_until_matching_1.waitUntilMatching)({ websocket, signal });
             const { connection, dataChannel } = yield __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_webRTCConnection, "f").getOrCreateConnection();
             let isRemoteDescriptionSet = false;
             const pendingIceCandidates = [];
@@ -147,15 +162,15 @@ _LocalWebRTCRoomImpl_spanId = new WeakMap(), _LocalWebRTCRoomImpl_webRTCConnecti
                 signalingID,
                 sdp,
             });
-            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) => {
                 connection.addIceCandidate(iceCandidate);
             });
             yield Promise.all([
-                (0, wait_until_connected_1.waitUntilConnected)(connection),
-                (0, wait_until_data_channel_ready_1.waitUntilDataChannelOpen)(dataChannel),
+                (0, wait_until_connected_1.waitUntilConnected)(connection, { signal }),
+                (0, wait_until_data_channel_ready_1.waitUntilDataChannelOpen)(dataChannel, { signal }),
             ]);
             yield __classPrivateFieldGet(this, _LocalWebRTCRoomImpl_frontendLog, "f").log({
                 type: "SIGNALING_END",

package/lib/webrtc/gather-all-ice-candidate.d.ts

@@ -1,3 +1,4 @@
+import { SignalContainer } from "../abort-controller/signal-container";
 /**
  * ICE Candidateの収集中に発生したエラーのメッセージを作成する
  * @param error ICE Candidateの収集中に発生したエラー
@@ -14,7 +15,9 @@ type Result = {
 /**
  * すべてのICE Candidateが収集する
  * @param connection 待機するコネクション
+ * @param options オプション
+ * @param options.signal Promise強制終了用シグナル
  * @returns 収集結果
  */
-export declare const gatherAllIceCandidates: (connection: RTCPeerConnection) => Promise<Result>;
+export declare const gatherAllIceCandidates: (connection: RTCPeerConnection, options?: Partial<SignalContainer>) => Promise<Result>;
 export {};

package/lib/webrtc/gather-all-ice-candidate.js

@@ -11,14 +11,26 @@ exports.createICECandidateErrorMessage = createICECandidateErrorMessage;
 /**
  * すべてのICE Candidateが収集する
  * @param connection 待機するコネクション
+ * @param options オプション
+ * @param options.signal Promise強制終了用シグナル
  * @returns 収集結果
  */
-const gatherAllIceCandidates = (connection) => {
+const gatherAllIceCandidates = (connection, options) => {
+    const signal = options === null || options === void 0 ? void 0 : options.signal;
     let icecandidateHandler = null;
     let icecandidateErrorHandler = null;
+    let onAbort = null;
     let candidates = [];
     let iceCandidateErrors = [];
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        onAbort = () => {
+            reject(signal === null || signal === void 0 ? void 0 : signal.reason);
+        };
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
         icecandidateHandler = (event) => {
             if (event.candidate === null) {
                 resolve({ iceCandidates: candidates, iceCandidateErrors });
@@ -34,6 +46,9 @@ const gatherAllIceCandidates = (connection) => {
         connection.addEventListener("icecandidate", icecandidateHandler);
         connection.addEventListener("icecandidateerror", icecandidateErrorHandler);
     }).finally(() => {
+        if (onAbort) {
+            signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+        }
         if (icecandidateHandler) {
             connection.removeEventListener("icecandidate", icecandidateHandler);
         }

package/lib/webrtc/guest/guest-message.d.ts

@@ -1,5 +1,13 @@
 import { ArmdozerId, Command, PilotId } from "gbraver-burst-core";
 import { z } from "zod";
+/** Pong */
+export type Pong = {
+    type: "pong";
+};
+/** Pong zod のスキーマ */
+export declare const PongSchema: z.ZodObject<{
+    type: z.ZodLiteral<"pong">;
+}, z.core.$strip>;
 /** 選択したプレイヤーをホストに送信する */
 export type SendPlayer = {
     type: "send-player";
@@ -39,7 +47,7 @@ export declare const SendCommandSchema: z.ZodObject<{
     }, z.core.$strip>]>;
 }, z.core.$strip>;
 /** ゲストから送信されるメッセージ */
-export type GuestMessage = SendPlayer | SendCommand;
+export type GuestMessage = Pong | SendPlayer | SendCommand;
 /**
  * ゲストメッセージをホストに送信する
  * @param dataChannel データチャンネル

package/lib/webrtc/guest/guest-message.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendGuestMessage = exports.SendCommandSchema = exports.SendPlayerSchema = void 0;
+exports.sendGuestMessage = exports.SendCommandSchema = exports.SendPlayerSchema = exports.PongSchema = void 0;
 const gbraver_burst_core_1 = require("gbraver-burst-core");
 const zod_1 = require("zod");
+/** Pong zod のスキーマ */
+exports.PongSchema = zod_1.z.object({
+    type: zod_1.z.literal("pong"),
+});
 /** SendPlayer zod のスキーマ */
 exports.SendPlayerSchema = zod_1.z.object({
     type: zod_1.z.literal("send-player"),

package/lib/webrtc/guest/guest-ping-pong-check.d.ts

@@ -0,0 +1,12 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
+/**
+ * ping -> pong による疎通確認を行う
+ * ゲストなので ping を待って pong を送信する
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal アボートシグナル
+ * @returns 疎通確認が完了したら発火するPromise
+ */
+export declare const guestPingPongCheck: (options: {
+    dataChannel: RTCDataChannel;
+} & Partial<SignalContainer>) => Promise<unknown>;

package/lib/webrtc/guest/guest-ping-pong-check.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.guestPingPongCheck = void 0;
+const parse_1 = require("../../json/parse");
+const host_message_1 = require("../host/host-message");
+const guest_message_1 = require("./guest-message");
+/**
+ * ping -> pong による疎通確認を行う
+ * ゲストなので ping を待って pong を送信する
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal アボートシグナル
+ * @returns 疎通確認が完了したら発火するPromise
+ */
+const guestPingPongCheck = (options) => {
+    const { dataChannel, signal } = options;
+    let handler = null;
+    let onAbort = null;
+    return new Promise((resolve, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        onAbort = () => {
+            reject(signal === null || signal === void 0 ? void 0 : signal.reason);
+        };
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
+        handler = (event) => {
+            const data = (0, parse_1.parseJSON)(event.data);
+            const parsedPing = host_message_1.PingSchema.safeParse(data);
+            if (parsedPing.success) {
+                (0, guest_message_1.sendGuestMessage)(dataChannel, { type: "pong" });
+                resolve(parsedPing.data);
+                return;
+            }
+        };
+        dataChannel.addEventListener("message", handler);
+    }).finally(() => {
+        if (handler) {
+            dataChannel.removeEventListener("message", handler);
+        }
+        if (onAbort) {
+            signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+        }
+    });
+};
+exports.guestPingPongCheck = guestPingPongCheck;

package/lib/webrtc/guest/receive-battle-progressed.d.ts

@@ -1,7 +1,12 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
 import { BattleProgressed } from "../host/host-message";
 /**
  * ホストから「BattleProgressed」メッセージを待ち受ける
- * @param dataChannel データチャネル
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal Promise強制終了用シグナル
  * @returns BattleProgressedメッセージの内容
  */
-export declare const receiveBattleProgressed: (dataChannel: RTCDataChannel) => Promise<BattleProgressed>;
+export declare const receiveBattleProgressed: (options: {
+    dataChannel: RTCDataChannel;
+} & Partial<SignalContainer>) => Promise<BattleProgressed>;

package/lib/webrtc/guest/receive-battle-progressed.js

@@ -5,12 +5,24 @@ const parse_1 = require("../../json/parse");
 const host_message_1 = require("../host/host-message");
 /**
  * ホストから「BattleProgressed」メッセージを待ち受ける
- * @param dataChannel データチャネル
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal Promise強制終了用シグナル
  * @returns BattleProgressedメッセージの内容
  */
-const receiveBattleProgressed = (dataChannel) => {
+const receiveBattleProgressed = (options) => {
+    const { dataChannel, signal } = options;
     let handler = null;
-    return new Promise((resolve) => {
+    let onAbort = null;
+    return new Promise((resolve, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        onAbort = () => {
+            reject(signal === null || signal === void 0 ? void 0 : signal.reason);
+        };
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
         handler = (event) => {
             const data = (0, parse_1.parseJSON)(event.data);
             const parsedBattleProgressed = host_message_1.BattleProgressedSchema.safeParse(data);
@@ -24,6 +36,9 @@ const receiveBattleProgressed = (dataChannel) => {
         if (handler) {
             dataChannel.removeEventListener("message", handler);
         }
+        if (onAbort) {
+            signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+        }
     });
 };
 exports.receiveBattleProgressed = receiveBattleProgressed;

package/lib/webrtc/guest/receive-battle-start.d.ts

@@ -1,7 +1,12 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
 import { BattleStart } from "../host/host-message";
 /**
  * ホストから「BattleStart」メッセージを待ち受ける
- * @param dataChannel データチャネル
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal Promise強制終了用シグナル
  * @returns BattleStartメッセージの内容
  */
-export declare const receiveBattleStart: (dataChannel: RTCDataChannel) => Promise<BattleStart>;
+export declare const receiveBattleStart: (options: {
+    dataChannel: RTCDataChannel;
+} & Partial<SignalContainer>) => Promise<BattleStart>;

package/lib/webrtc/guest/receive-battle-start.js

@@ -5,12 +5,24 @@ const parse_1 = require("../../json/parse");
 const host_message_1 = require("../host/host-message");
 /**
  * ホストから「BattleStart」メッセージを待ち受ける
- * @param dataChannel データチャネル
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal Promise強制終了用シグナル
  * @returns BattleStartメッセージの内容
  */
-const receiveBattleStart = (dataChannel) => {
+const receiveBattleStart = (options) => {
+    const { dataChannel, signal } = options;
     let handler = null;
-    return new Promise((resolve) => {
+    let onAbort = null;
+    return new Promise((resolve, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        onAbort = () => {
+            reject(signal === null || signal === void 0 ? void 0 : signal.reason);
+        };
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
         handler = (event) => {
             const data = (0, parse_1.parseJSON)(event.data);
             const parsedBattleStart = host_message_1.BattleStartSchema.safeParse(data);
@@ -24,6 +36,9 @@ const receiveBattleStart = (dataChannel) => {
         if (handler) {
             dataChannel.removeEventListener("message", handler);
         }
+        if (onAbort) {
+            signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+        }
     });
 };
 exports.receiveBattleStart = receiveBattleStart;

package/lib/webrtc/guest/receive-request-selected-player.d.ts

@@ -1,7 +1,12 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
 import { RequestSelectedPlayer } from "../host/host-message";
 /**
  * ホストから「RequestSelectedPlayer」メッセージを待ち受ける
- * @param dataChannel データチャネル
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal Promise強制終了用シグナル
  * @returns フローID
  */
-export declare const receiveRequestSelectedPlayer: (dataChannel: RTCDataChannel) => Promise<RequestSelectedPlayer>;
+export declare const receiveRequestSelectedPlayer: (options: {
+    dataChannel: RTCDataChannel;
+} & Partial<SignalContainer>) => Promise<RequestSelectedPlayer>;

package/lib/webrtc/guest/receive-request-selected-player.js

@@ -5,12 +5,24 @@ const parse_1 = require("../../json/parse");
 const host_message_1 = require("../host/host-message");
 /**
  * ホストから「RequestSelectedPlayer」メッセージを待ち受ける
- * @param dataChannel データチャネル
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal Promise強制終了用シグナル
  * @returns フローID
  */
-const receiveRequestSelectedPlayer = (dataChannel) => {
+const receiveRequestSelectedPlayer = (options) => {
+    const { dataChannel, signal } = options;
     let handler = null;
-    return new Promise((resolve) => {
+    let onAbort = null;
+    return new Promise((resolve, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        onAbort = () => {
+            reject(signal === null || signal === void 0 ? void 0 : signal.reason);
+        };
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
         handler = (event) => {
             const data = (0, parse_1.parseJSON)(event.data);
             const parsedRequestSelectedPlayer = host_message_1.RequestSelectedPlayerSchema.safeParse(data);
@@ -24,6 +36,9 @@ const receiveRequestSelectedPlayer = (dataChannel) => {
         if (handler) {
             dataChannel.removeEventListener("message", handler);
         }
+        if (onAbort) {
+            signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+        }
     });
 };
 exports.receiveRequestSelectedPlayer = receiveRequestSelectedPlayer;

package/lib/webrtc/guest/wait-until-data-channel.d.ts

@@ -1,6 +1,9 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
 /**
  * ゲスト側でデータチャネルが開通するのを待つ
  * @param connection ホスト側のWebRTCコネクション
+ * @param options オプション
+ * @param options.signal Promise強制終了用シグナル
  * @returns 開通したデータチャネル
  */
-export declare const waitUntilDataChannel: (connection: RTCPeerConnection) => Promise<RTCDataChannel>;
+export declare const waitUntilDataChannel: (connection: RTCPeerConnection, options?: Partial<SignalContainer>) => Promise<RTCDataChannel>;

package/lib/webrtc/guest/wait-until-data-channel.js

@@ -4,11 +4,29 @@ exports.waitUntilDataChannel = void 0;
 /**
  * ゲスト側でデータチャネルが開通するのを待つ
  * @param connection ホスト側のWebRTCコネクション
+ * @param options オプション
+ * @param options.signal Promise強制終了用シグナル
  * @returns 開通したデータチャネル
  */
-const waitUntilDataChannel = (connection) => new Promise((resolve) => {
-    connection.addEventListener("datachannel", (event) => {
-        resolve(event.channel);
-    }, { once: true });
-});
+const waitUntilDataChannel = (connection, options) => {
+    const signal = options === null || options === void 0 ? void 0 : options.signal;
+    let onAbort = null;
+    return new Promise((resolve, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        onAbort = () => {
+            reject(signal === null || signal === void 0 ? void 0 : signal.reason);
+        };
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
+        connection.addEventListener("datachannel", (event) => {
+            resolve(event.channel);
+        }, { once: true });
+    }).finally(() => {
+        if (onAbort) {
+            signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+        }
+    });
+};
 exports.waitUntilDataChannel = waitUntilDataChannel;

package/lib/webrtc/host/host-message.d.ts

@@ -1,5 +1,13 @@
 import { GameState, Player } from "gbraver-burst-core";
 import { z } from "zod";
+/** Ping */
+export type Ping = {
+    type: "ping";
+};
+/** Ping zod のスキーマ */
+export declare const PingSchema: z.ZodObject<{
+    type: z.ZodLiteral<"ping">;
+}, z.core.$strip>;
 /** 選択したキャラクターをホストに送信するように要求する */
 export type RequestSelectedPlayer = {
     type: "request-selected-player";
@@ -992,7 +1000,7 @@ export declare const BattleProgressedSchema: z.ZodObject<{
     }, z.core.$strip>>;
 }, z.core.$strip>;
 /** ホストから送信されるメッセージ */
-export type HostMessage = RequestSelectedPlayer | BattleStart | BattleProgressed;
+export type HostMessage = Ping | RequestSelectedPlayer | BattleStart | BattleProgressed;
 /**
  * ホストメッセージをゲストに送信する
  * @param dataChannel データチャンネル

package/lib/webrtc/host/host-message.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendHostMessage = exports.BattleProgressedSchema = exports.BattleStartSchema = exports.RequestSelectedPlayerSchema = void 0;
+exports.sendHostMessage = exports.BattleProgressedSchema = exports.BattleStartSchema = exports.RequestSelectedPlayerSchema = exports.PingSchema = void 0;
 const gbraver_burst_core_1 = require("gbraver-burst-core");
 const zod_1 = require("zod");
+/** Ping zod のスキーマ */
+exports.PingSchema = zod_1.z.object({
+    type: zod_1.z.literal("ping"),
+});
 /** RequestSelectedPlayer zod のスキーマ */
 exports.RequestSelectedPlayerSchema = zod_1.z.object({
     type: zod_1.z.literal("request-selected-player"),

package/lib/webrtc/host/host-ping-pong-check.d.ts

@@ -0,0 +1,12 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
+/**
+ * ping -> pong による疎通確認を行う
+ * ホストなので ping を送信して pong を待つ
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal アボートシグナル
+ * @returns
+ */
+export declare const hostPingPongCheck: (options: {
+    dataChannel: RTCDataChannel;
+} & Partial<SignalContainer>) => Promise<unknown>;

package/lib/webrtc/host/host-ping-pong-check.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hostPingPongCheck = void 0;
+const parse_1 = require("../../json/parse");
+const guest_message_1 = require("../guest/guest-message");
+const host_message_1 = require("./host-message");
+/**
+ * ping -> pong による疎通確認を行う
+ * ホストなので ping を送信して pong を待つ
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.signal アボートシグナル
+ * @returns
+ */
+const hostPingPongCheck = (options) => {
+    const { dataChannel, signal } = options;
+    let handler = null;
+    let onAbort = null;
+    return new Promise((resolve, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            reject(signal.reason);
+            return;
+        }
+        onAbort = () => {
+            reject(signal === null || signal === void 0 ? void 0 : signal.reason);
+        };
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
+        handler = (event) => {
+            const data = (0, parse_1.parseJSON)(event.data);
+            const parsedPong = guest_message_1.PongSchema.safeParse(data);
+            if (parsedPong.success) {
+                resolve(parsedPong.data);
+                return;
+            }
+        };
+        dataChannel.addEventListener("message", handler);
+        (0, host_message_1.sendHostMessage)(dataChannel, { type: "ping" });
+    }).finally(() => {
+        if (handler) {
+            dataChannel.removeEventListener("message", handler);
+        }
+        if (onAbort) {
+            signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+        }
+    });
+};
+exports.hostPingPongCheck = hostPingPongCheck;

package/lib/webrtc/host/receive-send-command.d.ts

@@ -1,8 +1,14 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
 import { SendCommand } from "../guest/guest-message";
 /**
  * ゲストからflowIDが一致した「SendCommand」メッセージを待ち受ける
- * @param dataChannel データチャネル
- * @param flowID フローID
- * @returns フローID
+ * @param options オプション
+ * @param options.dataChannel データチャネル
+ * @param options.flowID フローID
+ * @param options.signal Promise強制終了用シグナル
+ * @returns ゲストから送信されたSendCommandメッセージ
  */
-export declare const receiveSendCommand: (dataChannel: RTCDataChannel, flowID: string) => Promise<SendCommand>;
+export declare const receiveSendCommand: (options: {
+    dataChannel: RTCDataChannel;
+    flowID: string;
+} & Partial<SignalContainer>) => Promise<SendCommand>;