@gbraver-burst-network/offline-browser-sdk 1.18.0 → 1.19.0

package/lib/offline-battle-sdk-impl.d.ts

@@ -0,0 +1,27 @@
+import { Command, GameState, Player } from "gbraver-burst-core";
+import { Observable } from "rxjs";
+import { Socket } from "socket.io-client";
+import { OfflineBattleSDK } from "./offline-battle-sdk";
+import { BattleInfo } from "./offline-browser-sdk";
+/** オフライン用バトルSDK実装 */
+export declare class OfflineBattleSDKImpl implements OfflineBattleSDK {
+    #private;
+    /** @override */
+    player: Player;
+    /** @override */
+    enemy: Player;
+    /** @override */
+    initialState: GameState[];
+    /**
+     * コンストラクタ
+     * @param options オプション
+     */
+    constructor(options: BattleInfo & {
+        /** 入室したソケット */
+        socket: Socket;
+    });
+    /** @override */
+    progress(command: Command): Promise<GameState[]>;
+    /** @override */
+    suddenlyBattleEndNotifier(): Observable<unknown>;
+}

package/lib/offline-battle-sdk-impl.js

@@ -0,0 +1,70 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _OfflineBattleSDKImpl_socket, _OfflineBattleSDKImpl_flowId;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OfflineBattleSDKImpl = void 0;
+const rxjs_1 = require("rxjs");
+const game_ended_1 = require("./socket-io-events/game-ended");
+const progressed_1 = require("./socket-io-events/progressed");
+/** オフライン用バトルSDK実装 */
+class OfflineBattleSDKImpl {
+    /**
+     * コンストラクタ
+     * @param options オプション
+     */
+    constructor(options) {
+        var _a;
+        /** ソケット */
+        _OfflineBattleSDKImpl_socket.set(this, void 0);
+        /** フローID */
+        _OfflineBattleSDKImpl_flowId.set(this, void 0);
+        const enemy = (_a = options.stateHistory
+            .at(-1)) === null || _a === void 0 ? void 0 : _a.players.find((p) => p.playerId !== options.player.playerId);
+        if (!enemy) {
+            throw new Error("Enemy player not found");
+        }
+        this.player = options.player;
+        this.enemy = enemy;
+        this.initialState = options.stateHistory;
+        __classPrivateFieldSet(this, _OfflineBattleSDKImpl_socket, options.socket, "f");
+        __classPrivateFieldSet(this, _OfflineBattleSDKImpl_flowId, options.flowId, "f");
+    }
+    /** @override */
+    progress(command) {
+        __classPrivateFieldGet(this, _OfflineBattleSDKImpl_socket, "f").emit("sendCommand", { command, flowId: __classPrivateFieldGet(this, _OfflineBattleSDKImpl_flowId, "f") });
+        return new Promise((resolve) => {
+            __classPrivateFieldGet(this, _OfflineBattleSDKImpl_socket, "f").once("progressed", (data) => {
+                const parsedResult = progressed_1.ProgressedSchema.safeParse(data);
+                if (!parsedResult.success) {
+                    return;
+                }
+                __classPrivateFieldSet(this, _OfflineBattleSDKImpl_flowId, parsedResult.data.flowId, "f");
+                resolve(parsedResult.data.updatedStateHistory);
+            });
+            __classPrivateFieldGet(this, _OfflineBattleSDKImpl_socket, "f").once("gameEnded", (data) => {
+                const parsedResult = game_ended_1.GameEndedSchema.safeParse(data);
+                if (!parsedResult.success) {
+                    return;
+                }
+                // ゲームが終了したのでflowIdは送信されないので、同プロパティの更新処理は行わない
+                resolve(parsedResult.data.updatedStateHistory);
+            });
+        });
+    }
+    /** @override */
+    suddenlyBattleEndNotifier() {
+        return (0, rxjs_1.fromEvent)(__classPrivateFieldGet(this, _OfflineBattleSDKImpl_socket, "f"), "error");
+    }
+}
+exports.OfflineBattleSDKImpl = OfflineBattleSDKImpl;
+_OfflineBattleSDKImpl_socket = new WeakMap(), _OfflineBattleSDKImpl_flowId = new WeakMap();

package/lib/offline-battle-sdk.d.ts

@@ -0,0 +1,26 @@
+import { Command, GameState, Player } from "gbraver-burst-core";
+import { Observable } from "rxjs";
+/**
+ * オフライン用バトルSDK
+ * インターフェースはpackages/browser-sdk/src/browser-sdk/battle-sdk.tsのBattleSDKと同一
+ * 本操作はログイン後に実行することを想定している
+ */
+export interface OfflineBattleSDK {
+    /** プレイヤーの情報 */
+    player: Player;
+    /** 対戦相手の情報 */
+    enemy: Player;
+    /** ゲームの初期状態 */
+    initialState: GameState[];
+    /**
+     * バトルを進行させる
+     * @param command プレイヤーが入力するコマンド
+     * @returns ゲーム結果
+     */
+    progress(command: Command): Promise<GameState[]>;
+    /**
+     * バトル強制終了の通知ストリーム
+     * @returns 通知ストリーム
+     */
+    suddenlyBattleEndNotifier(): Observable<unknown>;
+}

package/lib/offline-battle-sdk.js

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

package/lib/offline-browser-sdk-impl.d.ts

@@ -1,6 +1,7 @@
-import { ArmdozerId, Command, GameState, PilotId } from "gbraver-burst-core";
+import { ArmdozerId, PilotId } from "gbraver-burst-core";
 import { Observable } from "rxjs";
-import { BattleInfo, OfflineBrowserSDK } from "./offline-browser-sdk";
+import { OfflineBattleSDK } from "./offline-battle-sdk";
+import { OfflineBrowserSDK } from "./offline-browser-sdk";
 /** オフライン用ブラウザSDK実装 */
 export declare class OfflineBrowserSDKImpl implements OfflineBrowserSDK {
     #private;
@@ -16,9 +17,7 @@ export declare class OfflineBrowserSDKImpl implements OfflineBrowserSDK {
     enterRoom(options: {
         armdozerId: ArmdozerId;
         pilotId: PilotId;
-    }): Promise<BattleInfo>;
-    /** @override */
-    sendCommand(command: Command): Promise<GameState[]>;
+    }): Promise<OfflineBattleSDK>;
     /** @override */
     closeConnection(): void;
     /** @override */

package/lib/offline-browser-sdk-impl.js

@@ -19,14 +19,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _OfflineBrowserSDKImpl_instances, _OfflineBrowserSDKImpl_backendURL, _OfflineBrowserSDKImpl_socket, _OfflineBrowserSDKImpl_flowId, _OfflineBrowserSDKImpl_error, _OfflineBrowserSDKImpl_ensureSocket;
+var _OfflineBrowserSDKImpl_instances, _OfflineBrowserSDKImpl_backendURL, _OfflineBrowserSDKImpl_socket, _OfflineBrowserSDKImpl_error, _OfflineBrowserSDKImpl_ensureSocket;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OfflineBrowserSDKImpl = void 0;
 const rxjs_1 = require("rxjs");
 const socket_io_client_1 = require("socket.io-client");
+const offline_battle_sdk_impl_1 = require("./offline-battle-sdk-impl");
 const offline_browser_sdk_1 = require("./offline-browser-sdk");
-const game_ended_1 = require("./socket-io-events/game-ended");
-const progressed_1 = require("./socket-io-events/progressed");
 /** オフライン用ブラウザSDK実装 */
 class OfflineBrowserSDKImpl {
     /**
@@ -40,8 +39,6 @@ class OfflineBrowserSDKImpl {
         _OfflineBrowserSDKImpl_backendURL.set(this, void 0);
         /** ソケット接続、未作成の場合はnull */
         _OfflineBrowserSDKImpl_socket.set(this, null);
-        /** 現在のフローID、バトル以外ではnullがセットされる */
-        _OfflineBrowserSDKImpl_flowId.set(this, null);
         /** エラー通知のSubject */
         _OfflineBrowserSDKImpl_error.set(this, void 0);
         __classPrivateFieldSet(this, _OfflineBrowserSDKImpl_backendURL, options.backendURL, "f");
@@ -56,49 +53,20 @@ class OfflineBrowserSDKImpl {
                 socket.once("matched", (data) => {
                     const parsedBattleInfo = offline_browser_sdk_1.BattleInfoSchema.safeParse(data);
                     if (parsedBattleInfo.success) {
-                        __classPrivateFieldSet(this, _OfflineBrowserSDKImpl_flowId, parsedBattleInfo.data.flowId, "f");
-                        resolve(parsedBattleInfo.data);
+                        const battleSDK = new offline_battle_sdk_impl_1.OfflineBattleSDKImpl(Object.assign(Object.assign({}, parsedBattleInfo.data), { socket }));
+                        resolve(battleSDK);
                     }
                 });
             });
         });
     }
     /** @override */
-    sendCommand(command) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!__classPrivateFieldGet(this, _OfflineBrowserSDKImpl_flowId, "f")) {
-                throw new Error("Not in battle");
-            }
-            const socket = __classPrivateFieldGet(this, _OfflineBrowserSDKImpl_instances, "m", _OfflineBrowserSDKImpl_ensureSocket).call(this);
-            socket.emit("sendCommand", { command, flowId: __classPrivateFieldGet(this, _OfflineBrowserSDKImpl_flowId, "f") });
-            return new Promise((resolve) => {
-                socket.once("progressed", (data) => {
-                    const parsedResult = progressed_1.ProgressedSchema.safeParse(data);
-                    if (!parsedResult.success) {
-                        return;
-                    }
-                    __classPrivateFieldSet(this, _OfflineBrowserSDKImpl_flowId, parsedResult.data.flowId, "f");
-                    resolve(parsedResult.data.updatedStateHistory);
-                });
-                socket.once("gameEnded", (data) => {
-                    const parsedResult = game_ended_1.GameEndedSchema.safeParse(data);
-                    if (!parsedResult.success) {
-                        return;
-                    }
-                    __classPrivateFieldSet(this, _OfflineBrowserSDKImpl_flowId, null, "f");
-                    resolve(parsedResult.data.updatedStateHistory);
-                });
-            });
-        });
-    }
-    /** @override */
     closeConnection() {
         if (!__classPrivateFieldGet(this, _OfflineBrowserSDKImpl_socket, "f")) {
             return;
         }
         __classPrivateFieldGet(this, _OfflineBrowserSDKImpl_socket, "f").disconnect();
         __classPrivateFieldSet(this, _OfflineBrowserSDKImpl_socket, null, "f");
-        __classPrivateFieldSet(this, _OfflineBrowserSDKImpl_flowId, null, "f");
     }
     /** @override */
     notifyError() {
@@ -106,7 +74,7 @@ class OfflineBrowserSDKImpl {
     }
 }
 exports.OfflineBrowserSDKImpl = OfflineBrowserSDKImpl;
-_OfflineBrowserSDKImpl_backendURL = new WeakMap(), _OfflineBrowserSDKImpl_socket = new WeakMap(), _OfflineBrowserSDKImpl_flowId = new WeakMap(), _OfflineBrowserSDKImpl_error = new WeakMap(), _OfflineBrowserSDKImpl_instances = new WeakSet(), _OfflineBrowserSDKImpl_ensureSocket = function _OfflineBrowserSDKImpl_ensureSocket() {
+_OfflineBrowserSDKImpl_backendURL = new WeakMap(), _OfflineBrowserSDKImpl_socket = new WeakMap(), _OfflineBrowserSDKImpl_error = new WeakMap(), _OfflineBrowserSDKImpl_instances = new WeakSet(), _OfflineBrowserSDKImpl_ensureSocket = function _OfflineBrowserSDKImpl_ensureSocket() {
     if (__classPrivateFieldGet(this, _OfflineBrowserSDKImpl_socket, "f")) {
         return __classPrivateFieldGet(this, _OfflineBrowserSDKImpl_socket, "f");
     }

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

@@ -1,6 +1,7 @@
-import { ArmdozerId, Command, GameState, PilotId, Player } from "gbraver-burst-core";
+import { ArmdozerId, GameState, PilotId, Player } from "gbraver-burst-core";
 import { Observable } from "rxjs";
 import { z } from "zod";
+import { OfflineBattleSDK } from "./offline-battle-sdk";
 /** バトル情報 */
 export type BattleInfo = {
     /** バトルID */
@@ -504,12 +505,7 @@ export interface OfflineBrowserSDK {
     enterRoom(options: {
         armdozerId: ArmdozerId;
         pilotId: PilotId;
-    }): Promise<BattleInfo>;
-    /**
-     * コマンドを送信する
-     * @param command 送信するコマンド
-     */
-    sendCommand(command: Command): Promise<GameState[]>;
+    }): Promise<OfflineBattleSDK>;
     /**
      * サーバーとの接続を閉じる
      */

package/package.json

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