@gbraver-burst-network/anonymous-browser-sdk 2.6.0 → 2.7.0-beta.1

package/lib/sdk/guest/guest-anonymous-sdk.js

@@ -19,28 +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 _GuestAnonymousSDKImpl_instances, _GuestAnonymousSDKImpl_webRTCConnection, _GuestAnonymousSDKImpl_websocketConnection, _GuestAnonymousSDKImpl_frontendLog, _GuestAnonymousSDKImpl_abortManager, _GuestAnonymousSDKImpl_signaling;
+var _GuestAnonymousSDKImpl_webRTCConnection, _GuestAnonymousSDKImpl_websocketConnection, _GuestAnonymousSDKImpl_frontendLog, _GuestAnonymousSDKImpl_abortManager;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGuestAnonymousSDK = createGuestAnonymousSDK;
 const nanoid_1 = require("nanoid");
-const rxjs_1 = require("rxjs");
 const abort_error_1 = require("../../abort-controller/abort-error");
 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 signaling_1 = require("./signaling");
 /** ゲスト用匿名バックエンドSDKの実装 */
 class GuestAnonymousSDKImpl {
     /**
@@ -48,7 +43,6 @@ class GuestAnonymousSDKImpl {
      * @param options コンストラクタのオプション
      */
     constructor(options) {
-        _GuestAnonymousSDKImpl_instances.add(this);
         /** WebRTCコネクションマネージャー */
         _GuestAnonymousSDKImpl_webRTCConnection.set(this, void 0);
         /** WebSocketコネクションマネージャー */
@@ -74,22 +68,38 @@ class GuestAnonymousSDKImpl {
                 const { roomID, armdozerId, pilotId } = options;
                 __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
                 __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").disconnect();
-                const websocket = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").getOrCreate();
+                const { connectionPromise, dataChannelPromise } = __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection();
+                const [websocket, connection] = yield Promise.all([
+                    __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").getOrCreate(),
+                    connectionPromise,
+                ]);
+                // joinRoomの成功直後にSDPが送信されるので、取りこぼし防止のために先にイベントを登録する
+                const waitUntilSDPReceivePromise = (0, wait_until_sdp_recieve_1.waitUntilSDPReceive)({
+                    websocket,
+                    signal,
+                });
                 const joinRoomAccepted = yield (0, join_room_1.joinRoom)({ websocket, roomID, signal });
                 if (!joinRoomAccepted) {
                     return null;
                 }
-                // イベントの取りこぼしを防ぐために、あらかじリスナーを登録する
-                const pingPongPromise = (() => __awaiter(this, void 0, void 0, function* () {
-                    const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection()
-                        .dataChannelPromise;
-                    yield (0, guest_ping_pong_check_1.guestPingPongCheck)({ dataChannel, signal });
-                }))();
                 const { signalingID } = joinRoomAccepted;
-                yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_instances, "m", _GuestAnonymousSDKImpl_signaling).call(this, { signalingID, spanId, signal });
-                yield pingPongPromise;
+                const remoteSDP = yield waitUntilSDPReceivePromise;
+                // signalingの成功直後にホストからPingが送信されるので、取りこぼし防止のために先にイベントを登録する
+                const guestPingPongCheckPromise = dataChannelPromise.then((dataChannel) => (0, guest_ping_pong_check_1.guestPingPongCheck)({ dataChannel, signal }));
+                yield (0, signaling_1.signaling)({
+                    signalingID,
+                    spanId,
+                    remoteSDP,
+                    frontendLog: __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_frontendLog, "f"),
+                    websocket,
+                    connection,
+                    signal,
+                });
+                const [dataChannel] = yield Promise.all([
+                    dataChannelPromise,
+                    guestPingPongCheckPromise,
+                ]);
                 __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
-                const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
                 const { flowID } = yield (0, receive_request_selected_player_1.receiveRequestSelectedPlayer)({
                     dataChannel,
                     signal,
@@ -135,82 +145,7 @@ class GuestAnonymousSDKImpl {
             .abort((0, abort_error_1.createAbortError)("WebRTC disconnected"));
     }
 }
-_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, signal } = options;
-        if (signal.aborted) {
-            return Promise.reject(signal.reason);
-        }
-        let unSubscribers = [];
-        try {
-            yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_frontendLog, "f").log({
-                type: "SIGNALING_START",
-                spanId,
-            });
-            const websocket = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").getOrCreate();
-            const { connectionPromise } = __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection();
-            const connection = yield connectionPromise;
-            let isRemoteDescriptionSet = false;
-            const pendingIceCandidates = [];
-            // イベントを取り逃がさないように、あらかじめハンドラをセットしておく
-            unSubscribers = [
-                (0, notify_ice_candidate_recieved_1.notifyIceCandidateReceived)(websocket).subscribe((iceCandidate) => {
-                    if (isRemoteDescriptionSet) {
-                        connection.addIceCandidate(iceCandidate);
-                    }
-                    else {
-                        pendingIceCandidates.push(iceCandidate);
-                    }
-                }),
-                (0, rxjs_1.fromEvent)(connection, "icecandidate").subscribe((event) => {
-                    if (event.candidate) {
-                        (0, send_to_ws_signal_1.sendToWSSignal)(websocket, {
-                            action: "send-ice-candidate",
-                            signalingID,
-                            iceCandidate: event.candidate,
-                        });
-                    }
-                }),
-                (0, rxjs_1.fromEvent)(connection, "icecandidateerror").subscribe((event) => {
-                    __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_frontendLog, "f").log({
-                        type: "ICE_CANDIDATE_ERROR",
-                        spanId,
-                        error: (0, gather_all_ice_candidate_1.createICECandidateErrorMessage)(event),
-                    });
-                }),
-            ];
-            const remoteSDP = yield (0, wait_until_sdp_recieve_1.waitUntilSDPReceive)({ websocket, signal });
-            yield connection.setRemoteDescription(remoteSDP);
-            isRemoteDescriptionSet = true;
-            pendingIceCandidates.forEach((iceCandidate) => {
-                connection.addIceCandidate(iceCandidate);
-            });
-            const sdp = yield connection.createAnswer();
-            yield connection.setLocalDescription(sdp);
-            (0, send_to_ws_signal_1.sendToWSSignal)(websocket, {
-                action: "send-sdp",
-                signalingID,
-                sdp,
-            });
-            yield (0, wait_until_connected_1.waitUntilConnected)(connection, { signal });
-            yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_frontendLog, "f").log({
-                type: "SIGNALING_END",
-                spanId,
-            });
-            const selectedLocalIceCandidateSummary = yield (0, get_selected_ice_candidate_summary_1.getSelectedIceCandidateSummary)(connection);
-            if (selectedLocalIceCandidateSummary !== null) {
-                yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_frontendLog, "f").log({
-                    type: "SELECTED_ICE_CANDIDATE_SUMMARY",
-                    spanId,
-                    summary: selectedLocalIceCandidateSummary,
-                });
-            }
-        }
-        finally {
-            unSubscribers.forEach((unSubscriber) => unSubscriber.unsubscribe());
-        }
-    });
-};
+_GuestAnonymousSDKImpl_webRTCConnection = new WeakMap(), _GuestAnonymousSDKImpl_websocketConnection = new WeakMap(), _GuestAnonymousSDKImpl_frontendLog = new WeakMap(), _GuestAnonymousSDKImpl_abortManager = new WeakMap();
 /**
  * ゲスト用匿名バックエンドSDKを生成する
  * @param options オプション

package/lib/sdk/guest/signaling.d.ts

@@ -0,0 +1,23 @@
+import { SignalContainer } from "../../abort-controller/signal-container";
+import { FrontendLogManager } from "../frontend-log-manager";
+/**
+ * シグナリングを行う
+ * 本処理の前にRemoteSDPを取得しておく必要がある
+ * @param options シグナリングのオプション
+ * @param options.signalingID シグナリングID
+ * @param options.spanId ログ用の識別子
+ * @param options.remoteSDP ホスト側のSDP
+ * @param options.frontendLog フロントエンドのログマネージャー
+ * @param options.rconnection WebRTCコネクション
+ * @param options.websocket WebSocketコネクション
+ * @param options.signal アボートシグナル
+ * @returns シグナリングが完了したら発火するPromise
+ */
+export declare const signaling: (options: {
+    signalingID: string;
+    spanId: string;
+    remoteSDP: RTCSessionDescriptionInit;
+    frontendLog: FrontendLogManager;
+    websocket: WebSocket;
+    connection: RTCPeerConnection;
+} & SignalContainer) => Promise<void>;

package/lib/sdk/guest/signaling.js

@@ -0,0 +1,95 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signaling = void 0;
+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 wait_until_connected_1 = require("../../webrtc/wait-until-connected");
+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");
+/**
+ * シグナリングを行う
+ * 本処理の前にRemoteSDPを取得しておく必要がある
+ * @param options シグナリングのオプション
+ * @param options.signalingID シグナリングID
+ * @param options.spanId ログ用の識別子
+ * @param options.remoteSDP ホスト側のSDP
+ * @param options.frontendLog フロントエンドのログマネージャー
+ * @param options.rconnection WebRTCコネクション
+ * @param options.websocket WebSocketコネクション
+ * @param options.signal アボートシグナル
+ * @returns シグナリングが完了したら発火するPromise
+ */
+const signaling = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    const { signalingID, spanId, remoteSDP, frontendLog, websocket, connection, signal, } = options;
+    if (signal.aborted) {
+        return Promise.reject(signal.reason);
+    }
+    let unSubscribers = [];
+    try {
+        yield frontendLog.log({
+            type: "SIGNALING_START",
+            spanId,
+        });
+        const setRemoteSDPPromise = connection.setRemoteDescription(remoteSDP);
+        unSubscribers = [
+            (0, notify_ice_candidate_recieved_1.notifyIceCandidateReceived)(websocket).subscribe((iceCandidate) => {
+                // RemoteSDPがセットされた後にICE Candidateを追加する
+                // そのためにsetRemoteSDPPromiseを使って、RemoteSDPがセットされるまで待機する
+                setRemoteSDPPromise.then(() => {
+                    connection.addIceCandidate(iceCandidate);
+                });
+            }),
+            (0, rxjs_1.fromEvent)(connection, "icecandidate").subscribe((event) => {
+                if (event.candidate) {
+                    (0, send_to_ws_signal_1.sendToWSSignal)(websocket, {
+                        action: "send-ice-candidate",
+                        signalingID,
+                        iceCandidate: event.candidate,
+                    });
+                }
+            }),
+            (0, rxjs_1.fromEvent)(connection, "icecandidateerror").subscribe((event) => {
+                frontendLog.log({
+                    type: "ICE_CANDIDATE_ERROR",
+                    spanId,
+                    error: (0, gather_all_ice_candidate_1.createICECandidateErrorMessage)(event),
+                });
+            }),
+        ];
+        yield setRemoteSDPPromise;
+        const sdp = yield connection.createAnswer();
+        yield connection.setLocalDescription(sdp);
+        (0, send_to_ws_signal_1.sendToWSSignal)(websocket, {
+            action: "send-sdp",
+            signalingID,
+            sdp,
+        });
+        yield (0, wait_until_connected_1.waitUntilConnected)(connection, { signal });
+        yield frontendLog.log({
+            type: "SIGNALING_END",
+            spanId,
+        });
+        const selectedLocalIceCandidateSummary = yield (0, get_selected_ice_candidate_summary_1.getSelectedIceCandidateSummary)(connection);
+        if (selectedLocalIceCandidateSummary !== null) {
+            yield frontendLog.log({
+                type: "SELECTED_ICE_CANDIDATE_SUMMARY",
+                spanId,
+                summary: selectedLocalIceCandidateSummary,
+            });
+        }
+    }
+    finally {
+        unSubscribers.forEach((unSubscriber) => unSubscriber.unsubscribe());
+    }
+});
+exports.signaling = signaling;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gbraver-burst-network/anonymous-browser-sdk",
   "description": "gbraver burst anonymous browser sdk",
-  "version": "2.6.0",
+  "version": "2.7.0-beta.1",
   "author": "Y.Takeuchi",
   "bugs": {
     "url": "https://github.com/kaidouji85/gbraver-burst-network/issues",