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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/sdk/guest/guest-anonymous-sdk.js +48 -43
  2. package/lib/sdk/host/host-anonymous-sdk.js +7 -2
  3. package/package.json +1 -1
package/lib/sdk/guest/guest-anonymous-sdk.js CHANGED
@@ -24,6 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
24
24
  exports.createGuestAnonymousSDK = createGuestAnonymousSDK;
25
25
  const nanoid_1 = require("nanoid");
26
26
  const rxjs_1 = require("rxjs");
27
+ const abort_error_1 = require("../../abort-controller/abort-error");
27
28
  const abort_manager_1 = require("../../abort-controller/abort-manager");
28
29
  const gather_all_ice_candidate_1 = require("../../webrtc/gather-all-ice-candidate");
29
30
  const get_selected_ice_candidate_summary_1 = require("../../webrtc/get-selected-ice-candidate-summary");
@@ -64,49 +65,49 @@ class GuestAnonymousSDKImpl {
64
65
  /** @override */
65
66
  joinRoom(options) {
66
67
  return __awaiter(this, void 0, void 0, function* () {
67
- const { signal } = __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f").getAbortController();
68
- if (signal.aborted) {
69
- return Promise.reject(signal.reason);
70
- }
71
- const spanId = (0, nanoid_1.nanoid)();
72
- const { roomID, armdozerId, pilotId } = options;
73
- __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
74
- __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").disconnect();
75
- // イベントを取り逃がさないように、あらかじめハンドラをセットしておく
76
- const requestSelectedPlayerPromise = (() => __awaiter(this, void 0, void 0, function* () {
77
- const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
78
- return yield (0, receive_request_selected_player_1.receiveRequestSelectedPlayer)({ dataChannel, signal });
79
- }))();
80
- const battleStartPromise = (() => __awaiter(this, void 0, void 0, function* () {
68
+ try {
69
+ const { signal } = __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f").getAbortController();
70
+ if (signal.aborted) {
71
+ return Promise.reject(signal.reason);
72
+ }
73
+ const spanId = (0, nanoid_1.nanoid)();
74
+ const { roomID, armdozerId, pilotId } = options;
75
+ __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
76
+ __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").disconnect();
77
+ const websocket = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").getOrCreate();
78
+ const joinRoomAccepted = yield (0, join_room_1.joinRoom)({ websocket, roomID, signal });
79
+ if (!joinRoomAccepted) {
80
+ return null;
81
+ }
82
+ const { signalingID } = joinRoomAccepted;
83
+ yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_instances, "m", _GuestAnonymousSDKImpl_signaling).call(this, { signalingID, spanId, signal });
81
84
  const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
82
- return yield (0, receive_battle_start_1.receiveBattleStart)({ dataChannel, signal });
83
- }))();
84
- const websocket = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").getOrCreate();
85
- const joinRoomAccepted = yield (0, join_room_1.joinRoom)({ websocket, roomID, signal });
86
- if (!joinRoomAccepted) {
87
- return null;
85
+ yield (0, guest_ping_pong_check_1.guestPingPongCheck)({ dataChannel, signal });
86
+ __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
87
+ const { flowID } = yield (0, receive_request_selected_player_1.receiveRequestSelectedPlayer)({
88
+ dataChannel,
89
+ signal,
90
+ });
91
+ (0, guest_message_1.sendGuestMessage)(dataChannel, {
92
+ type: "send-player",
93
+ flowID,
94
+ armdozerId,
95
+ pilotId,
96
+ });
97
+ const battleStart = yield (0, receive_battle_start_1.receiveBattleStart)({ dataChannel, signal });
98
+ return new guest_battle_sdk_1.GuestBattleSDK({
99
+ hostPlayer: battleStart.hostPlayer,
100
+ guestPlayer: battleStart.guestPlayer,
101
+ initialState: battleStart.update,
102
+ initialFlowID: battleStart.flowID,
103
+ webRTCConnection: __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f"),
104
+ abortManager: __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f"),
105
+ });
106
+ }
107
+ catch (e) {
108
+ __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
109
+ throw e;
88
110
  }
89
- const { signalingID } = joinRoomAccepted;
90
- yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_instances, "m", _GuestAnonymousSDKImpl_signaling).call(this, { signalingID, spanId, signal });
91
- const dataChannel = yield __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").getOrCreateConnection().dataChannelPromise;
92
- yield (0, guest_ping_pong_check_1.guestPingPongCheck)({ dataChannel, signal });
93
- const { flowID } = yield requestSelectedPlayerPromise;
94
- __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
95
- (0, guest_message_1.sendGuestMessage)(dataChannel, {
96
- type: "send-player",
97
- flowID,
98
- armdozerId,
99
- pilotId,
100
- });
101
- const battleStart = yield battleStartPromise;
102
- return new guest_battle_sdk_1.GuestBattleSDK({
103
- hostPlayer: battleStart.hostPlayer,
104
- guestPlayer: battleStart.guestPlayer,
105
- initialState: battleStart.update,
106
- initialFlowID: battleStart.flowID,
107
- webRTCConnection: __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f"),
108
- abortManager: __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f"),
109
- });
110
111
  });
111
112
  }
112
113
  /** @override */
@@ -116,12 +117,16 @@ class GuestAnonymousSDKImpl {
116
117
  /** @override */
117
118
  disconnectWebSocket() {
118
119
  __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
119
- __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebSocket disconnected");
120
+ __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f")
121
+ .getAbortController()
122
+ .abort((0, abort_error_1.createAbortError)("WebSocket disconnected"));
120
123
  }
121
124
  /** @override */
122
125
  disconnectWebRTC() {
123
126
  __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_webRTCConnection, "f").disconnect();
124
- __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebRTC disconnected");
127
+ __classPrivateFieldGet(this, _GuestAnonymousSDKImpl_abortManager, "f")
128
+ .getAbortController()
129
+ .abort((0, abort_error_1.createAbortError)("WebRTC disconnected"));
125
130
  }
126
131
  }
127
132
  _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) {
package/lib/sdk/host/host-anonymous-sdk.js CHANGED
@@ -23,6 +23,7 @@ var _HostAnonymousSDKImpl_webRTCConnection, _HostAnonymousSDKImpl_websocketConne
23
23
  Object.defineProperty(exports, "__esModule", { value: true });
24
24
  exports.createHostAnonymousSDK = createHostAnonymousSDK;
25
25
  const nanoid_1 = require("nanoid");
26
+ const abort_error_1 = require("../../abort-controller/abort-error");
26
27
  const abort_manager_1 = require("../../abort-controller/abort-manager");
27
28
  const create_room_1 = require("../../websocket-api/create-room");
28
29
  const frontend_log_manager_1 = require("../frontend-log-manager");
@@ -91,12 +92,16 @@ class HostAnonymousSDKImpl {
91
92
  /** @override */
92
93
  disconnectWebSocket() {
93
94
  __classPrivateFieldGet(this, _HostAnonymousSDKImpl_websocketConnection, "f").gracefulDisconnect();
94
- __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebSocket disconnected");
95
+ __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f")
96
+ .getAbortController()
97
+ .abort((0, abort_error_1.createAbortError)("WebSocket disconnected"));
95
98
  }
96
99
  /** @override */
97
100
  disconnectWebRTC() {
98
101
  __classPrivateFieldGet(this, _HostAnonymousSDKImpl_webRTCConnection, "f").disconnect();
99
- __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f").getAbortController().abort("WebRTC disconnected");
102
+ __classPrivateFieldGet(this, _HostAnonymousSDKImpl_abortManager, "f")
103
+ .getAbortController()
104
+ .abort((0, abort_error_1.createAbortError)("WebRTC disconnected"));
100
105
  }
101
106
  }
102
107
  _HostAnonymousSDKImpl_webRTCConnection = new WeakMap(), _HostAnonymousSDKImpl_websocketConnection = new WeakMap(), _HostAnonymousSDKImpl_frontendLog = new WeakMap(), _HostAnonymousSDKImpl_abortManager = new WeakMap();
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@gbraver-burst-network/anonymous-browser-sdk",
3
3
  "description": "gbraver burst anonymous browser sdk",
4
- "version": "2.5.0-beta.0",
4
+ "version": "2.5.0",
5
5
  "author": "Y.Takeuchi",
6
6
  "bugs": {
7
7
  "url": "https://github.com/kaidouji85/gbraver-burst-network/issues",