@gbraver-burst-network/browser-sdk 1.6.3 → 1.8.0

package/lib/src/browser-sdk/browser-sdk.d.ts

@@ -1,6 +1,7 @@
-import type { CasualMatch, LoggedInUserDelete, LoginCheck, Logout, MailVerify, Ping, UniversalLogin, UserMailGet, UserNameGet, UserPictureGet, WebsocketDisconnect, WebsocketErrorNotifier, WebsocketUnintentionalCloseNotifier } from "@gbraver-burst-network/browser-core";
+import type { CasualMatch, LoggedInUserDelete, LoginCheck, Logout, MailVerify, Ping, PrivateMatchRoomEnter, UniversalLogin, UserMailGet, UserNameGet, UserPictureGet, WebsocketDisconnect, WebsocketErrorNotifier } from "@gbraver-burst-network/browser-core";
+import { PrivateMatchCreate } from "@gbraver-burst-network/browser-core/src";
 /** ブラウザSDK */
-export interface BrowserSDK extends UniversalLogin, LoginCheck, Logout, Ping, CasualMatch, UserNameGet, UserPictureGet, UserMailGet, MailVerify, LoggedInUserDelete, WebsocketDisconnect, WebsocketErrorNotifier, WebsocketUnintentionalCloseNotifier {
+export interface BrowserSDK extends UniversalLogin, LoginCheck, Logout, Ping, CasualMatch, UserNameGet, UserPictureGet, UserMailGet, MailVerify, LoggedInUserDelete, WebsocketDisconnect, WebsocketErrorNotifier, PrivateMatchCreate, PrivateMatchRoomEnter {
 }
 /**
  * GブレイバーバーストブラウザSDKを生成する

package/lib/src/browser-sdk/browser-sdk.js

@@ -8,6 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+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 _BrowserSDKImpl_instances, _BrowserSDKImpl_ownURL, _BrowserSDKImpl_restAPIURL, _BrowserSDKImpl_websocketAPIURL, _BrowserSDKImpl_auth0Client, _BrowserSDKImpl_websocket, _BrowserSDKImpl_websocketError, _BrowserSDKImpl_websocketSubscriptions, _BrowserSDKImpl_getOrCreateWebSocket;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBrowserSDK = void 0;
 const rxjs_1 = require("rxjs");
@@ -15,9 +27,12 @@ const client_1 = require("../auth0/client");
 const login_redirect_1 = require("../auth0/login-redirect");
 const delete_user_1 = require("../http-request/delete-user");
 const connect_1 = require("../websocket/connect");
+const create_private_match_room_1 = require("../websocket/create-private-match-room");
 const enter_casual_match_1 = require("../websocket/enter-casual-match");
+const enter_private_match_room_1 = require("../websocket/enter-private-match-room");
 const ping_1 = require("../websocket/ping");
-const battle_sdk_1 = require("./battle-sdk");
+const create_battle_sdk_from_battle_start_1 = require("./create-battle-sdk-from-battle-start");
+const private_match_room_sdk_1 = require("./private-match-room-sdk");
 /** ブラウザSDK実装 */
 class BrowserSDKImpl {
     /**
@@ -29,14 +44,21 @@ class BrowserSDKImpl {
      * @param auth0Client auth0クライアント
      */
     constructor(ownURL, restAPIURL, websocketAPIURL, auth0Client) {
-        this._ownURL = ownURL;
-        this._restAPIURL = restAPIURL;
-        this._websocketAPIURL = websocketAPIURL;
-        this._auth0Client = auth0Client;
-        this._websocket = null;
-        this._websocketError = new rxjs_1.Subject();
-        this._websocketUnintentionalCloseNotifier = new rxjs_1.Subject();
-        this._websocketSubscriptions = [];
+        _BrowserSDKImpl_instances.add(this);
+        _BrowserSDKImpl_ownURL.set(this, void 0);
+        _BrowserSDKImpl_restAPIURL.set(this, void 0);
+        _BrowserSDKImpl_websocketAPIURL.set(this, void 0);
+        _BrowserSDKImpl_auth0Client.set(this, void 0);
+        _BrowserSDKImpl_websocket.set(this, void 0);
+        _BrowserSDKImpl_websocketError.set(this, void 0);
+        _BrowserSDKImpl_websocketSubscriptions.set(this, void 0);
+        __classPrivateFieldSet(this, _BrowserSDKImpl_ownURL, ownURL, "f");
+        __classPrivateFieldSet(this, _BrowserSDKImpl_restAPIURL, restAPIURL, "f");
+        __classPrivateFieldSet(this, _BrowserSDKImpl_websocketAPIURL, websocketAPIURL, "f");
+        __classPrivateFieldSet(this, _BrowserSDKImpl_auth0Client, auth0Client, "f");
+        __classPrivateFieldSet(this, _BrowserSDKImpl_websocket, null, "f");
+        __classPrivateFieldSet(this, _BrowserSDKImpl_websocketError, new rxjs_1.Subject(), "f");
+        __classPrivateFieldSet(this, _BrowserSDKImpl_websocketSubscriptions, [], "f");
     }
     /** @override */
     isLoginSuccessRedirect() {
@@ -45,30 +67,30 @@ class BrowserSDKImpl {
     /** @override */
     afterLoginSuccess() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._auth0Client.handleRedirectCallback();
+            yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").handleRedirectCallback();
             (0, login_redirect_1.clearLoginHistory)();
         });
     }
     /** @override */
     gotoLoginPage() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._auth0Client.loginWithRedirect({
+            yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").loginWithRedirect({
                 authorizationParams: {
-                    redirect_uri: this._ownURL,
+                    redirect_uri: __classPrivateFieldGet(this, _BrowserSDKImpl_ownURL, "f"),
                 },
             });
         });
     }
     /** @override */
     isLogin() {
-        return this._auth0Client.isAuthenticated();
+        return __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").isAuthenticated();
     }
     /** @override */
     logout() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._auth0Client.logout({
+            yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").logout({
                 logoutParams: {
-                    returnTo: this._ownURL,
+                    returnTo: __classPrivateFieldGet(this, _BrowserSDKImpl_ownURL, "f"),
                 },
             });
         });
@@ -77,7 +99,7 @@ class BrowserSDKImpl {
     getUserName() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const user = yield this._auth0Client.getUser();
+            const user = yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").getUser();
             return (_a = user === null || user === void 0 ? void 0 : user.nickname) !== null && _a !== void 0 ? _a : "";
         });
     }
@@ -85,7 +107,7 @@ class BrowserSDKImpl {
     getUserPictureURL() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const user = yield this._auth0Client.getUser();
+            const user = yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").getUser();
             return (_a = user === null || user === void 0 ? void 0 : user.picture) !== null && _a !== void 0 ? _a : "";
         });
     }
@@ -93,7 +115,7 @@ class BrowserSDKImpl {
     getMail() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const user = yield this._auth0Client.getUser();
+            const user = yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").getUser();
             return (_a = user === null || user === void 0 ? void 0 : user.email) !== null && _a !== void 0 ? _a : "";
         });
     }
@@ -101,21 +123,21 @@ class BrowserSDKImpl {
     isMailVerified() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const user = yield this._auth0Client.getUser();
+            const user = yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").getUser();
             return (_a = user === null || user === void 0 ? void 0 : user.email_verified) !== null && _a !== void 0 ? _a : false;
         });
     }
     /** @override */
     deleteLoggedInUser() {
         return __awaiter(this, void 0, void 0, function* () {
-            const accessToken = yield this._auth0Client.getTokenSilently();
-            yield (0, delete_user_1.deleteLoggedInUser)(this._restAPIURL, accessToken);
+            const accessToken = yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").getTokenSilently();
+            yield (0, delete_user_1.deleteLoggedInUser)(__classPrivateFieldGet(this, _BrowserSDKImpl_restAPIURL, "f"), accessToken);
         });
     }
     /** @override */
     ping() {
         return __awaiter(this, void 0, void 0, function* () {
-            const websocket = yield this._getOrCreateWebSocket();
+            const websocket = yield __classPrivateFieldGet(this, _BrowserSDKImpl_instances, "m", _BrowserSDKImpl_getOrCreateWebSocket).call(this);
             const resp = yield (0, ping_1.ping)(websocket);
             return resp.message;
         });
@@ -123,60 +145,61 @@ class BrowserSDKImpl {
     /** @override */
     startCasualMatch(armdozerId, pilotId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const websocket = yield this._getOrCreateWebSocket();
+            const websocket = yield __classPrivateFieldGet(this, _BrowserSDKImpl_instances, "m", _BrowserSDKImpl_getOrCreateWebSocket).call(this);
             const resp = yield (0, enter_casual_match_1.enterCasualMatch)(websocket, armdozerId, pilotId);
-            return new battle_sdk_1.BattleSDK({
-                player: resp.player,
-                enemy: resp.enemy,
-                initialState: resp.stateHistory,
-                battleID: resp.battleID,
-                initialFlowID: resp.flowID,
-                isPoller: resp.isPoller,
-                websocket,
-            });
+            return (0, create_battle_sdk_from_battle_start_1.createBattleSDKFromBattleStart)(resp, websocket);
         });
     }
     /** @override */
-    disconnectWebsocket() {
+    createPrivateMatchRoom(armdozerId, pilotId) {
         return __awaiter(this, void 0, void 0, function* () {
-            this._websocket && this._websocket.close();
-            this._websocket = null;
-            this._websocketSubscriptions.forEach((v) => {
-                v.unsubscribe();
-            });
-            this._websocketSubscriptions = [];
+            const websocket = yield __classPrivateFieldGet(this, _BrowserSDKImpl_instances, "m", _BrowserSDKImpl_getOrCreateWebSocket).call(this);
+            const resp = yield (0, create_private_match_room_1.createPrivateMatchRoom)(websocket, armdozerId, pilotId);
+            return new private_match_room_sdk_1.PrivateMatchRoomSDK(resp.roomID, websocket);
         });
     }
     /** @override */
-    websocketErrorNotifier() {
-        return this._websocketError;
+    enterPrivateMatchRoom(roomID, armdozerId, pilotId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const websocket = yield __classPrivateFieldGet(this, _BrowserSDKImpl_instances, "m", _BrowserSDKImpl_getOrCreateWebSocket).call(this);
+            const resp = yield (0, enter_private_match_room_1.enterPrivateMatchRoom)(websocket, roomID, armdozerId, pilotId);
+            if (resp.action !== "battle-start") {
+                return null;
+            }
+            return (0, create_battle_sdk_from_battle_start_1.createBattleSDKFromBattleStart)(resp, websocket);
+        });
     }
     /** @override */
-    websocketUnintentionalCloseNotifier() {
-        return this._websocketUnintentionalCloseNotifier;
-    }
-    /**
-     * WebSocketクライアントの取得を行う
-     * WebSocketクライアントが存在しない場合は、本メソッド内で生成してから返す
-     *
-     * @return 取得、生成結果
-     */
-    _getOrCreateWebSocket() {
+    disconnectWebsocket() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._websocket) {
-                return this._websocket;
-            }
-            const accessToken = yield this._auth0Client.getTokenSilently();
-            const websocket = yield (0, connect_1.connect)(`${this._websocketAPIURL}?token=${accessToken}`);
-            this._websocketSubscriptions = [
-                (0, rxjs_1.fromEvent)(websocket, "error").subscribe(this._websocketError),
-                (0, rxjs_1.fromEvent)(websocket, "close").subscribe(this._websocketError),
-            ];
-            this._websocket = websocket;
-            return websocket;
+            __classPrivateFieldGet(this, _BrowserSDKImpl_websocket, "f") && __classPrivateFieldGet(this, _BrowserSDKImpl_websocket, "f").close();
+            __classPrivateFieldSet(this, _BrowserSDKImpl_websocket, null, "f");
+            __classPrivateFieldGet(this, _BrowserSDKImpl_websocketSubscriptions, "f").forEach((v) => {
+                v.unsubscribe();
+            });
+            __classPrivateFieldSet(this, _BrowserSDKImpl_websocketSubscriptions, [], "f");
         });
     }
+    /** @override */
+    websocketErrorNotifier() {
+        return __classPrivateFieldGet(this, _BrowserSDKImpl_websocketError, "f");
+    }
 }
+_BrowserSDKImpl_ownURL = new WeakMap(), _BrowserSDKImpl_restAPIURL = new WeakMap(), _BrowserSDKImpl_websocketAPIURL = new WeakMap(), _BrowserSDKImpl_auth0Client = new WeakMap(), _BrowserSDKImpl_websocket = new WeakMap(), _BrowserSDKImpl_websocketError = new WeakMap(), _BrowserSDKImpl_websocketSubscriptions = new WeakMap(), _BrowserSDKImpl_instances = new WeakSet(), _BrowserSDKImpl_getOrCreateWebSocket = function _BrowserSDKImpl_getOrCreateWebSocket() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (__classPrivateFieldGet(this, _BrowserSDKImpl_websocket, "f")) {
+            return __classPrivateFieldGet(this, _BrowserSDKImpl_websocket, "f");
+        }
+        const accessToken = yield __classPrivateFieldGet(this, _BrowserSDKImpl_auth0Client, "f").getTokenSilently();
+        const websocket = yield (0, connect_1.connect)(`${__classPrivateFieldGet(this, _BrowserSDKImpl_websocketAPIURL, "f")}?token=${accessToken}`);
+        __classPrivateFieldSet(this, _BrowserSDKImpl_websocketSubscriptions, [
+            (0, rxjs_1.fromEvent)(websocket, "error").subscribe(__classPrivateFieldGet(this, _BrowserSDKImpl_websocketError, "f")),
+            (0, rxjs_1.fromEvent)(websocket, "close").subscribe(__classPrivateFieldGet(this, _BrowserSDKImpl_websocketError, "f")),
+        ], "f");
+        __classPrivateFieldSet(this, _BrowserSDKImpl_websocket, websocket, "f");
+        return websocket;
+    });
+};
 /**
  * GブレイバーバーストブラウザSDKを生成する
  *

package/lib/src/browser-sdk/create-battle-sdk-from-battle-start.d.ts

@@ -0,0 +1,9 @@
+import { BattleStart } from "../response/battle-start";
+import { BattleSDK } from "./battle-sdk";
+/**
+ * BattleStartからBattleSDKを生成する
+ * @param battleStart BattleStartのデータ
+ * @param websocket websocketクライアント
+ * @return 生成結果
+ */
+export declare function createBattleSDKFromBattleStart(battleStart: BattleStart, websocket: WebSocket): BattleSDK;

package/lib/src/browser-sdk/create-battle-sdk-from-battle-start.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBattleSDKFromBattleStart = void 0;
+const battle_sdk_1 = require("./battle-sdk");
+/**
+ * BattleStartからBattleSDKを生成する
+ * @param battleStart BattleStartのデータ
+ * @param websocket websocketクライアント
+ * @return 生成結果
+ */
+function createBattleSDKFromBattleStart(battleStart, websocket) {
+    return new battle_sdk_1.BattleSDK({
+        player: battleStart.player,
+        enemy: battleStart.enemy,
+        initialState: battleStart.stateHistory,
+        battleID: battleStart.battleID,
+        initialFlowID: battleStart.flowID,
+        isPoller: battleStart.isPoller,
+        websocket,
+    });
+}
+exports.createBattleSDKFromBattleStart = createBattleSDKFromBattleStart;

package/lib/src/browser-sdk/private-match-room-sdk.d.ts

@@ -0,0 +1,16 @@
+import { PrivateMatchRoom } from "@gbraver-burst-network/browser-core";
+import { Battle, PrivateMatchRoomID } from "@gbraver-burst-network/browser-core/src";
+/** プライベートマッチSDK */
+export declare class PrivateMatchRoomSDK implements PrivateMatchRoom {
+    #private;
+    /** @override */
+    roomID: PrivateMatchRoomID;
+    /**
+     * コンストラクタ
+     * @param roomID ルームID
+     * @param websocket websocketクライアント
+     */
+    constructor(roomID: PrivateMatchRoomID, websocket: WebSocket);
+    /** @override */
+    waitUntilMatching(): Promise<Battle>;
+}

package/lib/src/browser-sdk/private-match-room-sdk.js

@@ -0,0 +1,49 @@
+"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());
+    });
+};
+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 _PrivateMatchRoomSDK_websocket;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrivateMatchRoomSDK = void 0;
+const private_match_make_polling_1 = require("../websocket/private-match-make-polling");
+const create_battle_sdk_from_battle_start_1 = require("./create-battle-sdk-from-battle-start");
+/** プライベートマッチSDK */
+class PrivateMatchRoomSDK {
+    /**
+     * コンストラクタ
+     * @param roomID ルームID
+     * @param websocket websocketクライアント
+     */
+    constructor(roomID, websocket) {
+        /** websocketクライアント */
+        _PrivateMatchRoomSDK_websocket.set(this, void 0);
+        this.roomID = roomID;
+        __classPrivateFieldSet(this, _PrivateMatchRoomSDK_websocket, websocket, "f");
+    }
+    /** @override */
+    waitUntilMatching() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const resp = yield (0, private_match_make_polling_1.privateMatchMakePolling)(__classPrivateFieldGet(this, _PrivateMatchRoomSDK_websocket, "f"), this.roomID);
+            return (0, create_battle_sdk_from_battle_start_1.createBattleSDKFromBattleStart)(resp, __classPrivateFieldGet(this, _PrivateMatchRoomSDK_websocket, "f"));
+        });
+    }
+}
+exports.PrivateMatchRoomSDK = PrivateMatchRoomSDK;
+_PrivateMatchRoomSDK_websocket = new WeakMap();

package/lib/src/request/create-private-match-room.d.ts

@@ -0,0 +1,9 @@
+import { ArmDozerId, PilotId } from "gbraver-burst-core";
+/** プライベートマッチルーム生成 */
+export type CreatePrivateMatchRoom = {
+    action: "create-private-match-room";
+    /** 選択したアームドーザのID */
+    armdozerId: ArmDozerId;
+    /** 選択したパイロットのID */
+    pilotId: PilotId;
+};

package/lib/src/request/enter-private-match-room.d.ts

@@ -0,0 +1,12 @@
+import { PrivateMatchRoomID } from "@gbraver-burst-network/browser-core";
+import { ArmDozerId, PilotId } from "gbraver-burst-core";
+/** プライベートマッチルームエントリ */
+export type EnterPrivateMatchRoom = {
+    action: "enter-private-match-room";
+    /** ルームID */
+    roomID: PrivateMatchRoomID;
+    /** 選択したアームドーザID */
+    armdozerId: ArmDozerId;
+    /** 選択したパイロットID */
+    pilotId: PilotId;
+};

package/lib/src/request/enter-private-match-room.js

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

package/lib/src/request/private-match-make-polling.d.ts

@@ -0,0 +1,7 @@
+import { PrivateMatchRoomID } from "@gbraver-burst-network/browser-core";
+/** プライベートルームマッチポーリング */
+export type PrivateMatchMakePolling = {
+    action: "private-match-make-polling";
+    /** ルームID */
+    roomID: PrivateMatchRoomID;
+};

package/lib/src/request/private-match-make-polling.js

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

package/lib/src/request/request.d.ts

@@ -1,6 +1,9 @@
 import type { BattleProgressPolling } from "./battle-progress-polling";
+import { CreatePrivateMatchRoom } from "./create-private-match-room";
 import type { EnterCasualMatch } from "./enter-casual-match";
+import { EnterPrivateMatchRoom } from "./enter-private-match-room";
 import type { Ping } from "./ping";
+import { PrivateMatchMakePolling } from "./private-match-make-polling";
 import type { SendCommand } from "./send-command";
 /** APIサーバへのリクエスト */
-export type APIServerRequest = Ping | EnterCasualMatch | SendCommand | BattleProgressPolling;
+export type APIServerRequest = Ping | EnterCasualMatch | SendCommand | BattleProgressPolling | CreatePrivateMatchRoom | EnterPrivateMatchRoom | PrivateMatchMakePolling;

package/lib/src/response/cloud-not-private-match-making.d.ts

@@ -0,0 +1,11 @@
+/** オーナーがプライベートマッチングできなかった */
+export type CouldNotPrivateMatchMaking = {
+    action: "cloud-not-private-match-making";
+};
+/**
+ * 任意オブジェクトをCouldNotPrivateMatchMakingにパースする
+ * パースできない場合はnullを返す
+ * @param origin パース元
+ * @return パース結果
+ */
+export declare function parseCouldNotPrivateMatchMaking(origin: any): CouldNotPrivateMatchMaking | null;

package/lib/src/response/cloud-not-private-match-making.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCouldNotPrivateMatchMaking = void 0;
+/**
+ * 任意オブジェクトをCouldNotPrivateMatchMakingにパースする
+ * パースできない場合はnullを返す
+ * @param origin パース元
+ * @return パース結果
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+function parseCouldNotPrivateMatchMaking(origin) {
+    /* eslint-enable */
+    if ((origin === null || origin === void 0 ? void 0 : origin.action) === "cloud-not-private-match-making") {
+        return {
+            action: "cloud-not-private-match-making",
+        };
+    }
+    return null;
+}
+exports.parseCouldNotPrivateMatchMaking = parseCouldNotPrivateMatchMaking;

package/lib/src/response/created-private-match-room.d.ts

@@ -0,0 +1,13 @@
+/** オーナーがプライベートマッチルーム作成に成功した */
+export type CreatedPrivateMatchRoom = {
+    action: "created-private-match-room";
+    /** 作成したルームID */
+    roomID: string;
+};
+/**
+ * 任意オブジェクトをCreatedPrivateMatchRoomにパースする
+ * パースできない場合はnullを返す
+ * @param data パース元
+ * @return パース結果
+ */
+export declare function parseCreatedPrivateMatchRoom(data: any): CreatedPrivateMatchRoom | null;

package/lib/src/response/created-private-match-room.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCreatedPrivateMatchRoom = void 0;
+/**
+ * 任意オブジェクトをCreatedPrivateMatchRoomにパースする
+ * パースできない場合はnullを返す
+ * @param data パース元
+ * @return パース結果
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+function parseCreatedPrivateMatchRoom(data) {
+    /* eslint-enable */
+    if ((data === null || data === void 0 ? void 0 : data.action) === "created-private-match-room" &&
+        typeof (data === null || data === void 0 ? void 0 : data.roomID) === "string") {
+        return {
+            action: "created-private-match-room",
+            roomID: data.roomID,
+        };
+    }
+    return null;
+}
+exports.parseCreatedPrivateMatchRoom = parseCreatedPrivateMatchRoom;

package/lib/src/response/reject-private-match-entry.d.ts

@@ -0,0 +1,11 @@
+/** 何らかの理由でプライベートマッチに参加できなかった */
+export type RejectPrivateMatchEntry = {
+    action: "reject-private-match-entry";
+};
+/**
+ * 任意オブジェクトをRejectPrivateMatchEntryにパースする
+ * パースできない場合はnullを返す
+ * @param data パース元となるオブジェクト
+ * @return パース結果
+ */
+export declare function parseRejectPrivateMatchEntry(origin: any): RejectPrivateMatchEntry | null;

package/lib/src/response/reject-private-match-entry.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRejectPrivateMatchEntry = void 0;
+/**
+ * 任意オブジェクトをRejectPrivateMatchEntryにパースする
+ * パースできない場合はnullを返す
+ * @param data パース元となるオブジェクト
+ * @return パース結果
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+function parseRejectPrivateMatchEntry(origin) {
+    /* eslint-enable */
+    if ((origin === null || origin === void 0 ? void 0 : origin.action) === "reject-private-match-entry") {
+        return { action: "reject-private-match-entry" };
+    }
+    return null;
+}
+exports.parseRejectPrivateMatchEntry = parseRejectPrivateMatchEntry;

package/lib/src/websocket/create-private-match-room.d.ts

@@ -0,0 +1,10 @@
+import { ArmDozerId, PilotId } from "gbraver-burst-core";
+import { CreatedPrivateMatchRoom } from "../response/created-private-match-room";
+/**
+ * プライベートマッチルームを生成する
+ * @param websocket websocketクライアント
+ * @param armdozerId 選択したアームドーザのID
+ * @param pilotId 選択したパイロットのID
+ * @return レスポンス
+ */
+export declare function createPrivateMatchRoom(websocket: WebSocket, armdozerId: ArmDozerId, pilotId: PilotId): Promise<CreatedPrivateMatchRoom>;

package/lib/src/websocket/create-private-match-room.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPrivateMatchRoom = void 0;
+const parse_1 = require("../json/parse");
+const created_private_match_room_1 = require("../response/created-private-match-room");
+const send_to_api_server_1 = require("./send-to-api-server");
+const wait_until_1 = require("./wait-until");
+/**
+ * プライベートマッチルームを生成する
+ * @param websocket websocketクライアント
+ * @param armdozerId 選択したアームドーザのID
+ * @param pilotId 選択したパイロットのID
+ * @return レスポンス
+ */
+function createPrivateMatchRoom(websocket, armdozerId, pilotId) {
+    (0, send_to_api_server_1.sendToAPIServer)(websocket, {
+        action: "create-private-match-room",
+        armdozerId,
+        pilotId,
+    });
+    return (0, wait_until_1.waitUntil)(websocket, (e, resolve) => {
+        const data = (0, parse_1.parseJSON)(e.data);
+        const response = (0, created_private_match_room_1.parseCreatedPrivateMatchRoom)(data);
+        response && resolve(response);
+    });
+}
+exports.createPrivateMatchRoom = createPrivateMatchRoom;

package/lib/src/websocket/enter-private-match-room.d.ts

@@ -0,0 +1,13 @@
+import { PrivateMatchRoomID } from "@gbraver-burst-network/browser-core";
+import { ArmDozerId, PilotId } from "gbraver-burst-core";
+import { BattleStart } from "../response/battle-start";
+import { RejectPrivateMatchEntry } from "../response/reject-private-match-entry";
+/**
+ * プライベートマッチルームに入室する
+ * @param websocket websocketクライアント
+ * @param roomID ルームID
+ * @param armdozerId アームドーザID
+ * @param pilotId パイロットID
+ * @return 入室結果
+ */
+export declare function enterPrivateMatchRoom(websocket: WebSocket, roomID: PrivateMatchRoomID, armdozerId: ArmDozerId, pilotId: PilotId): Promise<BattleStart | RejectPrivateMatchEntry>;

package/lib/src/websocket/enter-private-match-room.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enterPrivateMatchRoom = void 0;
+const parse_1 = require("../json/parse");
+const battle_start_1 = require("../response/battle-start");
+const reject_private_match_entry_1 = require("../response/reject-private-match-entry");
+const send_to_api_server_1 = require("./send-to-api-server");
+const wait_until_1 = require("./wait-until");
+/**
+ * プライベートマッチルームに入室する
+ * @param websocket websocketクライアント
+ * @param roomID ルームID
+ * @param armdozerId アームドーザID
+ * @param pilotId パイロットID
+ * @return 入室結果
+ */
+function enterPrivateMatchRoom(websocket, roomID, armdozerId, pilotId) {
+    (0, send_to_api_server_1.sendToAPIServer)(websocket, {
+        action: "enter-private-match-room",
+        roomID,
+        armdozerId,
+        pilotId,
+    });
+    return (0, wait_until_1.waitUntil)(websocket, (e, resolve) => {
+        const data = (0, parse_1.parseJSON)(e.data);
+        const battleStart = (0, battle_start_1.parseBattleStart)(data);
+        if (battleStart) {
+            resolve(battleStart);
+        }
+        const rejectPrivateMatchEntry = (0, reject_private_match_entry_1.parseRejectPrivateMatchEntry)(data);
+        if (rejectPrivateMatchEntry) {
+            resolve(rejectPrivateMatchEntry);
+        }
+    });
+}
+exports.enterPrivateMatchRoom = enterPrivateMatchRoom;

package/lib/src/websocket/private-match-make-polling.d.ts

@@ -0,0 +1,9 @@
+import { PrivateMatchRoomID } from "@gbraver-burst-network/browser-core";
+import { BattleStart } from "../response/battle-start";
+/**
+ * プライベートマッチングポーリング
+ * @param websocket websocketクライアント
+ * @param roomID ルームID
+ * @return APIサーバからのレスポンス
+ */
+export declare function privateMatchMakePolling(websocket: WebSocket, roomID: PrivateMatchRoomID): Promise<BattleStart>;

package/lib/src/websocket/private-match-make-polling.js

@@ -0,0 +1,62 @@
+"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.privateMatchMakePolling = void 0;
+const parse_1 = require("../json/parse");
+const battle_start_1 = require("../response/battle-start");
+const cloud_not_private_match_making_1 = require("../response/cloud-not-private-match-making");
+const wait_1 = require("../wait/wait");
+const send_to_api_server_1 = require("./send-to-api-server");
+const wait_until_1 = require("./wait-until");
+/**
+ * プライベートマッチングポーリング
+ * @param websocket websocketクライアント
+ * @param roomID ルームID
+ * @return APIサーバからのレスポンス
+ */
+function privateMatchMakePolling(websocket, roomID) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const maxPollingCount = 200;
+        const pollingIntervalMilliSec = 3000;
+        let pollingCount = 1;
+        let lastPollingTime = 0;
+        const polling = () => {
+            pollingCount++;
+            lastPollingTime = Date.now();
+            (0, send_to_api_server_1.sendToAPIServer)(websocket, {
+                action: "private-match-make-polling",
+                roomID,
+            });
+        };
+        polling();
+        return (0, wait_until_1.waitUntil)(websocket, (e, resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+            const data = (0, parse_1.parseJSON)(e.data);
+            const cloudNotPrivateMatchMaking = (0, cloud_not_private_match_making_1.parseCouldNotPrivateMatchMaking)(data);
+            const isOverPollingCount = maxPollingCount <= pollingCount;
+            if (cloudNotPrivateMatchMaking && isOverPollingCount) {
+                reject(new Error("max polling count over"));
+                return;
+            }
+            if (cloudNotPrivateMatchMaking) {
+                const pollingTime = Date.now() - lastPollingTime;
+                const waitTime = Math.max(pollingIntervalMilliSec - pollingTime, 0);
+                yield (0, wait_1.wait)(waitTime);
+                polling();
+                return;
+            }
+            const battleStart = (0, battle_start_1.parseBattleStart)(data);
+            if (battleStart) {
+                resolve(battleStart);
+            }
+        }));
+    });
+}
+exports.privateMatchMakePolling = privateMatchMakePolling;

package/lib/src/websocket/send-command.js

@@ -61,6 +61,17 @@ exports.sendCommand = sendCommand;
  */
 function sendCommandWithPolling(websocket, battleID, flowID, command) {
     return __awaiter(this, void 0, void 0, function* () {
+        (0, send_to_api_server_1.sendToAPIServer)(websocket, {
+            action: "send-command",
+            battleID,
+            flowID,
+            command,
+        });
+        yield (0, wait_until_1.waitUntil)(websocket, (e, resolve) => {
+            const data = (0, parse_1.parseJSON)(e.data);
+            const acceptCommand = (0, accept_command_1.parseAcceptCommand)(data);
+            acceptCommand && resolve(acceptCommand);
+        });
         const maxPollingCount = 100;
         const pollingIntervalMilliSec = 3000;
         let pollingCount = 1;
@@ -74,17 +85,6 @@ function sendCommandWithPolling(websocket, battleID, flowID, command) {
                 flowID,
             });
         };
-        (0, send_to_api_server_1.sendToAPIServer)(websocket, {
-            action: "send-command",
-            battleID,
-            flowID,
-            command,
-        });
-        yield (0, wait_until_1.waitUntil)(websocket, (e, resolve) => {
-            const data = (0, parse_1.parseJSON)(e.data);
-            const acceptCommand = (0, accept_command_1.parseAcceptCommand)(data);
-            acceptCommand && resolve(acceptCommand);
-        });
         battleProgressPolling();
         return (0, wait_until_1.waitUntil)(websocket, (e, resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             const data = (0, parse_1.parseJSON)(e.data);

package/lib/test/src/response/cloud-not-private-match-making.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test/src/response/cloud-not-private-match-making.test.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cloud_not_private_match_making_1 = require("../../../src/response/cloud-not-private-match-making");
+test("CouldNotPrivateMatchMakingはパースできる", () => {
+    const data = {
+        action: "cloud-not-private-match-making",
+    };
+    expect((0, cloud_not_private_match_making_1.parseCouldNotPrivateMatchMaking)(data)).toEqual(data);
+});
+test("余計なプロパティがあってもパースできる", () => {
+    const origin = {
+        action: "cloud-not-private-match-making",
+    };
+    const data = Object.assign(Object.assign({}, origin), { propA: 1000, propB: "value" });
+    expect((0, cloud_not_private_match_making_1.parseCouldNotPrivateMatchMaking)(data)).toEqual(origin);
+});
+test("nullはパースできない", () => {
+    const data = null;
+    expect((0, cloud_not_private_match_making_1.parseCouldNotPrivateMatchMaking)(data)).toEqual(null);
+});
+test("undefinedはパースできない", () => {
+    const data = undefined;
+    expect((0, cloud_not_private_match_making_1.parseCouldNotPrivateMatchMaking)(data)).toEqual(null);
+});

package/lib/test/src/response/parse-created-private-match-room.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test/src/response/parse-created-private-match-room.test.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const created_private_match_room_1 = require("../../../src/response/created-private-match-room");
+test("CreatedPrivateMatchRoomはパースできる", () => {
+    const data = {
+        action: "created-private-match-room",
+        roomID: "test-room-id",
+    };
+    expect((0, created_private_match_room_1.parseCreatedPrivateMatchRoom)(data)).toEqual(data);
+});
+test("データ型が異なるとパースできない", () => {
+    const data = {
+        action: "created-private-match-room",
+        roomID: 1000,
+    };
+    expect((0, created_private_match_room_1.parseCreatedPrivateMatchRoom)(data)).toEqual(null);
+});
+test("nullはパースできない", () => {
+    const data = null;
+    expect((0, created_private_match_room_1.parseCreatedPrivateMatchRoom)(data)).toEqual(null);
+});
+test("undefinedはパースできない", () => {
+    const data = undefined;
+    expect((0, created_private_match_room_1.parseCreatedPrivateMatchRoom)(data)).toEqual(null);
+});

package/lib/test/src/response/parse-reject-private-match-entry.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/test/src/response/parse-reject-private-match-entry.test.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const reject_private_match_entry_1 = require("../../../src/response/reject-private-match-entry");
+test("RejectPrivateMatchEntryはパースできる", () => {
+    const data = {
+        action: "reject-private-match-entry",
+    };
+    expect((0, reject_private_match_entry_1.parseRejectPrivateMatchEntry)(data)).toEqual(data);
+});
+test("余計なプロパティがあってもパースできる", () => {
+    const origin = {
+        action: "reject-private-match-entry",
+    };
+    const data = Object.assign(Object.assign({}, origin), { propA: 1000, propB: "value" });
+    expect((0, reject_private_match_entry_1.parseRejectPrivateMatchEntry)(data)).toEqual(origin);
+});
+test("nullはパースできない", () => {
+    const data = null;
+    expect((0, reject_private_match_entry_1.parseRejectPrivateMatchEntry)(data)).toEqual(null);
+});
+test("undefinedはパースできない", () => {
+    const data = undefined;
+    expect((0, reject_private_match_entry_1.parseRejectPrivateMatchEntry)(data)).toEqual(null);
+});

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@gbraver-burst-network/browser-sdk",
   "description": "gbraver burst browser sdk",
-  "version": "1.6.3",
+  "version": "1.8.0",
   "author": "Y.Takeuchi",
   "bugs": {
     "url": "https://github.com/kaidouji85/gbraver-burst-network/issues",
     "email": "kaidouji85@gmail.com"
   },
   "dependencies": {
-    "@auth0/auth0-spa-js": "^2.0.1",
-    "@gbraver-burst-network/browser-core": "^1.6.3",
-    "gbraver-burst-core": "^1.16.3",
+    "@auth0/auth0-spa-js": "^2.0.2",
+    "@gbraver-burst-network/browser-core": "^1.8.0",
+    "gbraver-burst-core": "^1.16.4",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.2.5",
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
+    "@types/jest": "^29.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
     "codehawk-cli": "^10.1.0",
-    "eslint": "^8.31.0",
+    "eslint": "^8.33.0",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-simple-import-sort": "^8.0.0",
-    "jest": "^29.3.1",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
+    "jest": "^29.4.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "2.8.2",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.3",
+    "prettier": "2.8.3",
+    "rimraf": "^4.1.2",
+    "ts-jest": "^29.0.5",
     "typescript": "^4.9.4",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
@@ -33,7 +33,7 @@
   "files": [
     "lib"
   ],
-  "gitHead": "25fa9022512a0c41290a4f4507fb0460befce802",
+  "gitHead": "aef64e53855bb9f1ae46ab575312ec1978700fb5",
   "homepage": "https://github.com/kaidouji85/gbraver-burst-network/tree/develop/packages/browser-sdk#readme",
   "keywords": [
     "browser",
@@ -44,14 +44,17 @@
   "main": "lib/src/index.js",
   "repository": "https://github.com/kaidouji85/gbraver-burst-network/tree/develop/packages/browser-sdk",
   "scripts": {
-    "build": "run-s clean type-check lint test transpile",
+    "build": "run-s clean transpile",
     "clean": "rimraf lib",
     "code-analysis": "codehawk src",
-    "code-format": "prettier --write src",
+    "code-format": "run-s code-format:src code-format:test",
+    "code-format:src": "prettier --write src",
     "code-format:test": "prettier --write test",
-    "lint": "eslint src",
-    "lint-fix": "eslint --fix src",
+    "lint": "run-s lint:src lint:test",
+    "lint-fix": "run-s lint-fix:src lint-fix:test",
+    "lint-fix:src": "eslint --fix src",
     "lint-fix:test": "eslint --fix test",
+    "lint:src": "eslint src",
     "lint:test": "eslint test",
     "test": "jest",
     "transpile": "tsc -d --outDir lib",

package/lib/src/response/websocket-api-response.d.ts

@@ -1,11 +0,0 @@
-import type { AcceptCommand } from "./accept-command";
-import type { BattleEnd } from "./battle-end";
-import type { BattleProgressed } from "./battle-progressed";
-import type { BattleStart } from "./battle-start";
-import type { EnteredCasualMatch } from "./entered-casual-match";
-import type { Error } from "./error";
-import type { NotReadyBattleProgress } from "./not-ready-battle-progress";
-import type { Pong } from "./pong";
-import type { SuddenlyBattleEnd } from "./suddenly-battle-end";
-/** APIサーバからのレスポンス */
-export type WebsocketAPIResponse = Pong | EnteredCasualMatch | AcceptCommand | BattleStart | NotReadyBattleProgress | BattleProgressed | BattleEnd | SuddenlyBattleEnd | Error;