gs2 1.4.126 → 1.4.128

package/core/AbstractGs2RestClient.d.ts

@@ -7,6 +7,8 @@ export default class {
     };
     private prepareRequestConfig;
     private compressBody;
+    /** 既存の要求と同じ写像: 応答があれば message（JSON 文字列）を展開、無ければ [] */
+    private mapError;
     protected request<T>(method: 'GET' | 'POST' | 'PUT' | 'DELETE', url: string, headers: {
         [key: string]: any;
     }, params?: {

package/core/AbstractGs2RestClient.js

@@ -16,6 +16,7 @@ permissions and limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
+var model_1 = require("./model");
 var axios_1 = tslib_1.__importDefault(require("axios"));
 var pako_1 = tslib_1.__importDefault(require("pako"));
 var default_1 = /** @class */ (function () {
@@ -47,31 +48,68 @@ var default_1 = /** @class */ (function () {
         }
         return body;
     };
+    /** 既存の要求と同じ写像: 応答があれば message（JSON 文字列）を展開、無ければ [] */
+    default_1.prototype.mapError = function (error) {
+        // ★応答が無い失敗（接続段階の失敗・切断）では error.response が無い
+        // ―― 従来 GET / DELETE はここで TypeError になっていた。
+        if (error != null && error.response) {
+            return JSON.parse(error.response.data.message);
+        }
+        return [];
+    };
     default_1.prototype.request = function (method, url, headers, params, body) {
+        var _this = this;
         var config = this.prepareRequestConfig(headers);
+        // Steady: 生成クライアントが共有クラウドの template から組んだ URL を `<steady>/<service>...` へ。
+        // steadyEndpoint が未設定なら target は url と byte 単位で同じ。
+        var target = (0, model_1.steadyRestUrl)(this.session.steadyEndpoint, this.session.region, url);
+        var viaSteady = (0, model_1.isSteadyUrl)(this.session.steadyEndpoint, target);
+        var data = undefined;
         if (method === 'GET' || method === 'DELETE') {
             config.params = params;
-            var axiosMethod = method === 'GET' ? axios_1.default.get : axios_1.default.delete;
-            return axiosMethod(url, config)
-                .then(function (response) { return response.data; })
-                .catch(function (error) {
-                throw JSON.parse(error.response.data.message);
-            });
         }
         else {
-            var data = body ? this.compressBody(body, headers) : undefined;
-            var axiosMethod = method === 'POST' ? axios_1.default.post : axios_1.default.put;
-            return axiosMethod(url, data, config)
-                .then(function (response) { return response.data; })
-                .catch(function (error) {
-                if (error.response) {
-                    throw JSON.parse(error.response.data.message);
-                }
-                else {
-                    throw [];
-                }
-            });
+            // ★本文は先に作って持つ（接続失敗の再送で同じ要求をもう一度組むため）。
+            data = body ? this.compressBody(body, headers) : undefined;
         }
+        var requestConfig = config;
+        if (viaSteady) {
+            var agents = (0, model_1.steadyAgents)(this.session.steadyConnectTimeoutMs);
+            if (agents != null) {
+                requestConfig = Object.assign({}, config, {
+                    httpAgent: agents.http,
+                    httpsAgent: agents.https,
+                });
+            }
+        }
+        var send = function () {
+            if (method === 'GET') {
+                return axios_1.default.get(target, requestConfig);
+            }
+            else if (method === 'DELETE') {
+                return axios_1.default.delete(target, requestConfig);
+            }
+            else if (method === 'POST') {
+                return axios_1.default.post(target, data, requestConfig);
+            }
+            else {
+                return axios_1.default.put(target, data, requestConfig);
+            }
+        };
+        return send()
+            .catch(function (error) {
+            // ★Steady の再送: 基点への**接続段階**の失敗（DNS / dial / TLS。1 バイトも送っていない）だけ、
+            // 同じ要求をもう 1 回だけ送る。フリートが手放した IP に当たったとき、名前を引き直して
+            // 別のノードへ着く機会を 1 回だけ作る。送信後の失敗（5xx・切断・読み取りタイムアウト）は
+            // 届いたかもしれないので再送しない。再送は 1 回だけ（3 回目は無い）。
+            if (viaSteady && (0, model_1.isConnectFailure)(error)) {
+                return send();
+            }
+            throw error;
+        })
+            .then(function (response) { return response.data; }, function (error) {
+            throw _this.mapError(error);
+        });
     };
     return default_1;
 }());

package/core/AbstractGs2RestClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractGs2RestClient.js","sourceRoot":"","sources":["../../src/core/AbstractGs2RestClient.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,wDAAkD;AAClD,sDAAwB;AAExB;IAIE,mBAAY,OAAuB;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAES,2CAAuB,GAAjC;QACE,OAAO;YACL,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAS;YACpD,eAAe,EAAE,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY;SACvD,CAAC;IACJ,CAAC;IAEO,wCAAoB,GAA5B,UAA6B,OAA6B;QACxD,IAAM,MAAM,GAAuB;YACjC,OAAO,SAAA;SACR,CAAC;QAEF,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACpE,OAAO,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;SACrC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gCAAY,GAApB,UAAqB,IAA0B,EAAE,OAA6B;QAC5E,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAChC,IAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACxC,IAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACzC,OAAO,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;YACrC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;YAC7C,OAAO,UAAU,CAAC;SACnB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAES,2BAAO,GAAjB,UACE,MAAyC,EACzC,GAAW,EACX,OAA6B,EAC7B,MAA6B,EAC7B,IAA2B;QAE3B,IAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAElD,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,EAAE;YAC3C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,IAAM,WAAW,GAAG,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC;YAChE,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC;iBAC5B,IAAI,CAAC,UAAC,QAAa,IAAK,OAAA,QAAQ,CAAC,IAAS,EAAlB,CAAkB,CAAC;iBAC3C,KAAK,CAAC,UAAC,KAAU;gBAChB,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;SACN;aAAM;YACL,IAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACjE,IAAM,WAAW,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,eAAK,CAAC,IAAI,CAAC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC;YAC/D,OAAO,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC;iBAClC,IAAI,CAAC,UAAC,QAAa,IAAK,OAAA,QAAQ,CAAC,IAAS,EAAlB,CAAkB,CAAC;iBAC3C,KAAK,CAAC,UAAC,KAAU;gBAChB,IAAI,KAAK,CAAC,QAAQ,EAAE;oBAClB,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC/C;qBAAM;oBACL,MAAM,EAAE,CAAC;iBACV;YACH,CAAC,CAAC,CAAC;SACN;IACH,CAAC;IACH,gBAAC;AAAD,CAAC,AArED,IAqEC"}
+{"version":3,"file":"AbstractGs2RestClient.js","sourceRoot":"","sources":["../../src/core/AbstractGs2RestClient.ts"],"names":[],"mappings":"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"}

package/core/index.d.ts

@@ -1,7 +1,7 @@
 import AbstractGs2Client from './AbstractGs2RestClient';
-import { Gs2RestSession, Gs2WebSocketSession, BasicGs2Credential, ProjectTokenGs2Credential, Region } from './model';
+import { Gs2RestSession, Gs2RestSessionOptions, Gs2WebSocketSession, Gs2WebSocketSessionOptions, BasicGs2Credential, ProjectTokenGs2Credential, Region, STEADY_CONNECT_TIMEOUT_MS, isConnectFailure, ConnectionBrokenError } from './model';
 import AcquireActionResult from "./AcquireActionResult";
 import ConsumeActionResult from "./ConsumeActionResult";
 import VerifyActionResult from "./VerifyActionResult";
 import TransactionResult from "./TransactionResult";
-export { AbstractGs2Client, Gs2RestSession, Gs2WebSocketSession, BasicGs2Credential, ProjectTokenGs2Credential, Region, AcquireActionResult, ConsumeActionResult, VerifyActionResult, TransactionResult, };
+export { AbstractGs2Client, Gs2RestSession, Gs2RestSessionOptions, Gs2WebSocketSession, Gs2WebSocketSessionOptions, BasicGs2Credential, ProjectTokenGs2Credential, Region, STEADY_CONNECT_TIMEOUT_MS, isConnectFailure, ConnectionBrokenError, AcquireActionResult, ConsumeActionResult, VerifyActionResult, TransactionResult, };

package/core/index.js

@@ -15,7 +15,7 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionResult = exports.VerifyActionResult = exports.ConsumeActionResult = exports.AcquireActionResult = exports.Region = exports.ProjectTokenGs2Credential = exports.BasicGs2Credential = exports.Gs2WebSocketSession = exports.Gs2RestSession = exports.AbstractGs2Client = void 0;
+exports.TransactionResult = exports.VerifyActionResult = exports.ConsumeActionResult = exports.AcquireActionResult = exports.ConnectionBrokenError = exports.isConnectFailure = exports.STEADY_CONNECT_TIMEOUT_MS = exports.Region = exports.ProjectTokenGs2Credential = exports.BasicGs2Credential = exports.Gs2WebSocketSession = exports.Gs2RestSession = exports.AbstractGs2Client = void 0;
 var tslib_1 = require("tslib");
 var AbstractGs2RestClient_1 = tslib_1.__importDefault(require("./AbstractGs2RestClient"));
 exports.AbstractGs2Client = AbstractGs2RestClient_1.default;
@@ -25,6 +25,9 @@ Object.defineProperty(exports, "Gs2WebSocketSession", { enumerable: true, get: f
 Object.defineProperty(exports, "BasicGs2Credential", { enumerable: true, get: function () { return model_1.BasicGs2Credential; } });
 Object.defineProperty(exports, "ProjectTokenGs2Credential", { enumerable: true, get: function () { return model_1.ProjectTokenGs2Credential; } });
 Object.defineProperty(exports, "Region", { enumerable: true, get: function () { return model_1.Region; } });
+Object.defineProperty(exports, "STEADY_CONNECT_TIMEOUT_MS", { enumerable: true, get: function () { return model_1.STEADY_CONNECT_TIMEOUT_MS; } });
+Object.defineProperty(exports, "isConnectFailure", { enumerable: true, get: function () { return model_1.isConnectFailure; } });
+Object.defineProperty(exports, "ConnectionBrokenError", { enumerable: true, get: function () { return model_1.ConnectionBrokenError; } });
 var AcquireActionResult_1 = tslib_1.__importDefault(require("./AcquireActionResult"));
 exports.AcquireActionResult = AcquireActionResult_1.default;
 var ConsumeActionResult_1 = tslib_1.__importDefault(require("./ConsumeActionResult"));

package/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH,0FAAwD;AAQtD,4BARK,+BAAiB,CAQL;AAPnB,iCAAqH;AAQnH,+FARO,sBAAc,OAQP;AACd,oGATuB,2BAAmB,OASvB;AACnB,mGAV4C,0BAAkB,OAU5C;AAClB,0GAXgE,iCAAyB,OAWhE;AACzB,uFAZ2F,cAAM,OAY3F;AAXR,sFAAwD;AAYtD,8BAZK,6BAAmB,CAYL;AAXrB,sFAAwD;AAYtD,8BAZK,6BAAmB,CAYL;AAXrB,oFAAsD;AAYpD,6BAZK,4BAAkB,CAYL;AAXpB,kFAAoD;AAYlD,4BAZK,2BAAiB,CAYL"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;AAEH,0FAAwD;AAmBtD,4BAnBK,+BAAiB,CAmBL;AAlBnB,iCAWiB;AAQf,+FAlBA,sBAAc,OAkBA;AAEd,oGAlBA,2BAAmB,OAkBA;AAEnB,mGAlBA,0BAAkB,OAkBA;AAClB,0GAlBA,iCAAyB,OAkBA;AACzB,uFAlBA,cAAM,OAkBA;AACN,0GAlBA,iCAAyB,OAkBA;AACzB,iGAlBA,wBAAgB,OAkBA;AAChB,sGAlBA,6BAAqB,OAkBA;AAhBvB,sFAAwD;AAiBtD,8BAjBK,6BAAmB,CAiBL;AAhBrB,sFAAwD;AAiBtD,8BAjBK,6BAAmB,CAiBL;AAhBrB,oFAAsD;AAiBpD,6BAjBK,4BAAkB,CAiBL;AAhBpB,kFAAoD;AAiBlD,4BAjBK,2BAAiB,CAiBL"}

package/core/model.d.ts

@@ -5,11 +5,67 @@ export declare class BasicGs2Credential implements IGs2Credential {
     clientSecret: string;
     constructor(clientId: string, clientSecret: string);
 }
+/**
+ * Steady の基点への接続（DNS / TCP / TLS handshake）の上限（ms）。
+ * フリートが手放した公開 IP は SYN を落とすので、OS 既定（数十秒〜数分）に任せない。
+ * ★ブラウザでは接続だけの上限を持てない（XHR / fetch の timeout は要求全体にかかり、
+ *  GS2 の長い API を殺す）ので、ブラウザでは上限を置かず 1 回の再送だけが効く。
+ */
+export declare const STEADY_CONNECT_TIMEOUT_MS = 5000;
+/** 接続段階の上限で落としたときに載せる code（Node だけ。再送の判定に使う） */
+export declare const STEADY_CONNECT_TIMEOUT_CODE = "GS2_STEADY_CONNECT_TIMEOUT";
+/** 末尾の / と空白を落とす。未設定なら '' */
+export declare function normalizeSteadyEndpoint(value?: string | null): string;
+/** steadyEndpoint から REST の template（{service} 付き）を作る。未設定なら '' */
+export declare function steadyRestTemplate(steadyEndpoint?: string | null): string;
+/**
+ * steadyEndpoint から WebSocket の接続先を作る。未設定・壊れた基点なら ''。
+ * http:// の基点（ローカルの試験・開発）は ws:// に、https:// は wss:// に。
+ */
+export declare function steadyWebSocketUrl(steadyEndpoint?: string | null): string;
+/** 要求 URL が Steady の基点宛か */
+export declare function isSteadyUrl(steadyEndpoint: string | null | undefined, url: string): boolean;
+/**
+ * 生成クライアントが組んだ URL を Steady の基点配下へ書き換える。
+ *
+ * 生成クライアントは `(Gs2XxxRestClient.ENDPOINT_HOST ?? Gs2Constant.ENDPOINT_HOST) + <path>` で
+ * URL を組む。★共有クラウドの template（Gs2Constant.ENDPOINT_HOST）から組まれた URL だけを
+ * `<steady>/<service><path>` に書き換えるので、優先順は
+ * サービスごとの override ＞ steadyEndpoint ＞ 共有クラウドの template になる
+ * （override の URL は template に当たらないので、そのまま残る）。
+ * steadyEndpoint が未設定なら URL は従来と byte 単位で同じ。
+ */
+export declare function steadyRestUrl(steadyEndpoint: string | null | undefined, region: string, url: string): string;
+/**
+ * 接続段階の失敗か（応答が無く、code が接続系）。
+ * ★ブラウザの axios は接続失敗も送信後の切断もまとめて ERR_NETWORK（応答無し）にするので、
+ *  ブラウザでは両者を見分けられない ―― 再送が効くのは Node だけ。
+ */
+export declare function isConnectFailure(error: any): boolean;
+/** Steady 宛の要求に使う Agent（Node だけ）。http / https の両方を用意する */
+export interface SteadyAgents {
+    http: any;
+    https: any;
+}
+/**
+ * Node のときだけ: 接続（DNS / TCP / TLS handshake）に上限を置く Agent を作る（timeout ごとに使い回す）。
+ * ★要求全体の timeout は使わない ―― GS2 には応答まで長くかかる API があるので殺せない。
+ * ブラウザ（window がある）では接続だけの上限を持てないので null を返す（再送だけが効く）。
+ */
+export declare function steadyAgents(timeoutMs: number): SteadyAgents | null;
 export interface Gs2RestSessionOptions {
     /** リクエストボディをgzip圧縮して送信するかどうか（デフォルト: true） */
     compressRequest?: boolean;
     /** レスポンスのgzip展開を受け入れるかどうか（デフォルト: true） */
     acceptGzipResponse?: boolean;
+    /**
+     * Steady（専用フリート）の基点 `https://<host>`（placeholder 無し。末尾の `/` と空白は落とす）。
+     * 設定すると全サービスの接続先が `<steady>/<service>` になり、接続段階に上限と 1 回の再送が付く。
+     * 未設定なら URL・挙動は従来どおり（`Gs2Constant.ENDPOINT_HOST` から組む）。
+     */
+    steadyEndpoint?: string;
+    /** Steady の基点への接続タイムアウト（ms、デフォルト: STEADY_CONNECT_TIMEOUT_MS） */
+    steadyConnectTimeoutMs?: number;
 }
 export declare class Gs2RestSession {
     credential: IGs2Credential;
@@ -18,23 +74,76 @@ export declare class Gs2RestSession {
     expiresAt: number | null;
     compressRequest: boolean;
     acceptGzipResponse: boolean;
+    /** Steady の基点（正規化済み）。'' なら共有クラウド */
+    steadyEndpoint: string;
+    /** Steady の基点への接続タイムアウト（ms） */
+    steadyConnectTimeoutMs: number;
     constructor(credential: IGs2Credential, region: string, options?: Gs2RestSessionOptions);
+    /**
+     * サービスの接続先。優先順: steadyEndpoint ＞ 共有クラウドの `Gs2Constant.ENDPOINT_HOST`。
+     * steadyEndpoint が未設定なら従来の文字列と byte 単位で一致する
+     * （生成クライアントのサービスごとの override はこれより強い。`steadyRestUrl` の説明）。
+     */
+    endpointHost(service: string): string;
     connect(): Promise<LoginResult> | undefined;
     disconnect(): void;
 }
+export declare class ConnectionBrokenError extends Error {
+    constructor(detail?: string);
+}
+export interface Gs2WebSocketSessionOptions {
+    /**
+     * Steady（専用フリート）の基点 `https://<host>`。接続先は `wss://<host>/`（基点が `http://` なら
+     * `ws://<host>/`）になり、handshake に上限（steadyConnectTimeoutMs）が付く。未設定なら従来の gateway-ws。
+     */
+    steadyEndpoint?: string;
+    /** Steady の handshake タイムアウト（ms、デフォルト: STEADY_CONNECT_TIMEOUT_MS） */
+    steadyConnectTimeoutMs?: number;
+}
 export declare class Gs2WebSocketSession {
     credential: IGs2Credential;
     private client;
     region: string;
     projectToken: string | null;
     expiresAt: number | null;
-    private inflightRequest;
+    /** Steady の基点（正規化済み）。'' なら共有クラウド */
+    steadyEndpoint: string;
+    /** Steady の handshake タイムアウト（ms） */
+    steadyConnectTimeoutMs: number;
+    /**
+     * 応答待ちの要求（requestId → Promise の決着口）。
+     * ★応答が来たもの・接続が切れたものは必ず取り除く。以前は応答の無い要求が残り続け、
+     *  呼び手は「応答も誤りも来ない」まま待っていた（送信の成否も見ていなかった）。
+     */
+    private pendingRequests;
     private onOpenHandlers;
     private onErrorHandlers;
     private onCloseHandlers;
     private onNotificationHandlers;
-    constructor(credential: IGs2Credential, region: string);
+    constructor(credential: IGs2Credential, region: string, options?: Gs2WebSocketSessionOptions);
+    /** 接続先。steadyEndpoint ＞ 共有クラウドの `Gs2Constant.WS_ENDPOINT_HOST` */
+    webSocketUrl(): string;
+    /**
+     * Node の `ws` に渡す接続オプション。Steady のときだけ handshake に上限を置く。
+     * ★ブラウザの WebSocket は handshake の上限を持てない（オプションが無い）ので、
+     *  ブラウザでは上限が効かない。共有クラウドは従来どおりオプション無し（undefined）。
+     */
+    webSocketOptions(): {
+        handshakeTimeout: number;
+    } | undefined;
+    /** ログイン（identifier）の REST 接続先。steady があれば `<steady>/identifier`、無ければ従来 */
+    endpointHost(service: string): string;
     connect(): Promise<any>;
+    /** requestId の要求を待ち行列から外して返す（無ければ null） */
+    private takePending;
+    /** 待ち中の要求すべてを ConnectionBrokenError で決着させ、待ち行列を空にする */
+    private failPending;
+    /**
+     * 切れた接続を捨て、待ち中の要求すべてを ConnectionBrokenError で決着させる。
+     * ★既に別の接続へ差し替わっていたら（disconnect → connect の後の古い接続）何もしない。
+     * ★同じ接続に二度呼ばれても 2 回目は待ち行列が空なので無害（close と error の両方から来る）。
+     */
+    private dropConnection;
     send(service: string, component: string, func: string, payload: any): Promise<any>;
     onOpen(func: (ev: Event) => any): void;
     onError(func: (ev: Event) => any): void;
@@ -44,6 +153,7 @@ export declare class Gs2WebSocketSession {
         issuer: string;
         payload: any;
     }) => any): void;
+    /** 接続を閉じる。★待ち中の要求には ConnectionBrokenError が返る（close を待たずに決着させる） */
     disconnect(): Promise<any>;
 }
 declare class LoginResult {

package/core/model.js

@@ -14,8 +14,9 @@ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Region = exports.Gs2Constant = exports.ProjectTokenGs2Credential = exports.ProjectToken = exports.Gs2WebSocketSession = exports.Gs2RestSession = exports.BasicGs2Credential = void 0;
+exports.Region = exports.Gs2Constant = exports.ProjectTokenGs2Credential = exports.ProjectToken = exports.Gs2WebSocketSession = exports.ConnectionBrokenError = exports.Gs2RestSession = exports.steadyAgents = exports.isConnectFailure = exports.steadyRestUrl = exports.isSteadyUrl = exports.steadyWebSocketUrl = exports.steadyRestTemplate = exports.normalizeSteadyEndpoint = exports.STEADY_CONNECT_TIMEOUT_CODE = exports.STEADY_CONNECT_TIMEOUT_MS = exports.BasicGs2Credential = void 0;
 var tslib_1 = require("tslib");
 var axios_1 = tslib_1.__importDefault(require("axios"));
 var async_wait_until_1 = tslib_1.__importDefault(require("async-wait-until"));
@@ -29,35 +30,281 @@ var BasicGs2Credential = /** @class */ (function () {
     return BasicGs2Credential;
 }());
 exports.BasicGs2Credential = BasicGs2Credential;
+// ---------------------------------------------------------------- Steady（専用フリート）の基点
+//
+// フリートは 1 つの名前（steadyEndpoint、例 https://bs-dev.ap-northeast-1.dev.gen2.gs2io.com）で受け、
+// REST は <steady>/<service>/...、WebSocket は wss://<host>/ を使う。名前はフリートのノードへ直接
+// 解決される（間に ALB は無い）ので、フリートが手放した公開 IP に当たると SYN が落ちる。
+// そのため Steady のときだけ接続段階に上限（steadyConnectTimeoutMs）を置き、接続段階の失敗
+// （1 バイトも送っていない）だけは同じ要求をもう 1 回だけ送る。送信後の失敗は届いたかもしれない
+// ので再送しない（非冪等要求の二重実行を作らない）。
+/**
+ * Steady の基点への接続（DNS / TCP / TLS handshake）の上限（ms）。
+ * フリートが手放した公開 IP は SYN を落とすので、OS 既定（数十秒〜数分）に任せない。
+ * ★ブラウザでは接続だけの上限を持てない（XHR / fetch の timeout は要求全体にかかり、
+ *  GS2 の長い API を殺す）ので、ブラウザでは上限を置かず 1 回の再送だけが効く。
+ */
+exports.STEADY_CONNECT_TIMEOUT_MS = 5000;
+/** 接続段階の上限で落としたときに載せる code（Node だけ。再送の判定に使う） */
+exports.STEADY_CONNECT_TIMEOUT_CODE = 'GS2_STEADY_CONNECT_TIMEOUT';
+/** 末尾の / と空白を落とす。未設定なら '' */
+function normalizeSteadyEndpoint(value) {
+    if (value == null) {
+        return '';
+    }
+    return value.trim().replace(/\/+$/, '');
+}
+exports.normalizeSteadyEndpoint = normalizeSteadyEndpoint;
+/** steadyEndpoint から REST の template（{service} 付き）を作る。未設定なら '' */
+function steadyRestTemplate(steadyEndpoint) {
+    var steady = normalizeSteadyEndpoint(steadyEndpoint);
+    if (steady === '') {
+        return '';
+    }
+    return steady + '/{service}';
+}
+exports.steadyRestTemplate = steadyRestTemplate;
+/**
+ * steadyEndpoint から WebSocket の接続先を作る。未設定・壊れた基点なら ''。
+ * http:// の基点（ローカルの試験・開発）は ws:// に、https:// は wss:// に。
+ */
+function steadyWebSocketUrl(steadyEndpoint) {
+    var base = normalizeSteadyEndpoint(steadyEndpoint);
+    if (base === '') {
+        return '';
+    }
+    // 基点に path が付いていても host だけを見る（Go の url.Parse と同じ）。
+    var match = /^(https?):\/\/([^/]+)/i.exec(base);
+    if (match == null) {
+        return '';
+    }
+    var scheme = match[1].toLowerCase() === 'http' ? 'ws' : 'wss';
+    return scheme + '://' + match[2] + '/';
+}
+exports.steadyWebSocketUrl = steadyWebSocketUrl;
+/** 要求 URL が Steady の基点宛か */
+function isSteadyUrl(steadyEndpoint, url) {
+    var base = normalizeSteadyEndpoint(steadyEndpoint);
+    if (base === '') {
+        return false;
+    }
+    return url === base || url.indexOf(base + '/') === 0;
+}
+exports.isSteadyUrl = isSteadyUrl;
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+/**
+ * 生成クライアントが組んだ URL を Steady の基点配下へ書き換える。
+ *
+ * 生成クライアントは `(Gs2XxxRestClient.ENDPOINT_HOST ?? Gs2Constant.ENDPOINT_HOST) + <path>` で
+ * URL を組む。★共有クラウドの template（Gs2Constant.ENDPOINT_HOST）から組まれた URL だけを
+ * `<steady>/<service><path>` に書き換えるので、優先順は
+ * サービスごとの override ＞ steadyEndpoint ＞ 共有クラウドの template になる
+ * （override の URL は template に当たらないので、そのまま残る）。
+ * steadyEndpoint が未設定なら URL は従来と byte 単位で同じ。
+ */
+function steadyRestUrl(steadyEndpoint, region, url) {
+    var steady = normalizeSteadyEndpoint(steadyEndpoint);
+    if (steady === '' || isSteadyUrl(steady, url)) {
+        return url;
+    }
+    var template = exports.Gs2Constant.ENDPOINT_HOST;
+    if (template.indexOf('{service}') < 0) {
+        return url;
+    }
+    var pattern = new RegExp('^' + escapeRegExp(template)
+        .replace('\\{service\\}', '([^/]+)')
+        .replace('\\{region\\}', escapeRegExp(region)) + '(?=$|/)');
+    var match = pattern.exec(url);
+    if (match == null) {
+        // サービスごとの override（または region 違い）―― 触らない。
+        return url;
+    }
+    return steady + '/' + match[1] + url.substring(match[0].length);
+}
+exports.steadyRestUrl = steadyRestUrl;
+/**
+ * 「1 バイトも送っていない」接続段階の失敗のエラーコード。これだけが再送の対象。
+ * 送信後の失敗（ECONNRESET / socket hang up / 読み取りタイムアウト / 5xx）は届いたかもしれないので
+ * 再送しない（非冪等要求の二重実行を作らない）。
+ */
+var CONNECT_FAILURE_CODES = (_a = {
+        'ECONNREFUSED': true,
+        'ENOTFOUND': true,
+        'EAI_AGAIN': true
+    },
+    _a[exports.STEADY_CONNECT_TIMEOUT_CODE] = true,
+    _a['CERT_HAS_EXPIRED'] = true,
+    _a['UNABLE_TO_VERIFY_LEAF_SIGNATURE'] = true,
+    _a['ERR_TLS_CERT_ALTNAME_INVALID'] = true,
+    _a['DEPTH_ZERO_SELF_SIGNED_CERT'] = true,
+    _a['SELF_SIGNED_CERT_IN_CHAIN'] = true,
+    _a);
+/**
+ * 接続段階の失敗か（応答が無く、code が接続系）。
+ * ★ブラウザの axios は接続失敗も送信後の切断もまとめて ERR_NETWORK（応答無し）にするので、
+ *  ブラウザでは両者を見分けられない ―― 再送が効くのは Node だけ。
+ */
+function isConnectFailure(error) {
+    var _a, _b;
+    if (error == null || error.response) {
+        return false;
+    }
+    var code = (_a = error.code) !== null && _a !== void 0 ? _a : (_b = error.cause) === null || _b === void 0 ? void 0 : _b.code;
+    return typeof code === 'string' && CONNECT_FAILURE_CODES[code] === true;
+}
+exports.isConnectFailure = isConnectFailure;
+var steadyAgentCache = {};
+function withConnectTimeout(socket, timeoutMs, connectedEvent) {
+    var timer = setTimeout(function () {
+        var error = new Error('connect timeout (' + timeoutMs + 'ms)');
+        error.code = exports.STEADY_CONNECT_TIMEOUT_CODE;
+        socket.destroy(error);
+    }, timeoutMs);
+    var clear = function () { return clearTimeout(timer); };
+    socket.once(connectedEvent, clear);
+    socket.once('error', clear);
+    socket.once('close', clear);
+    return socket;
+}
+/**
+ * Node のときだけ: 接続（DNS / TCP / TLS handshake）に上限を置く Agent を作る（timeout ごとに使い回す）。
+ * ★要求全体の timeout は使わない ―― GS2 には応答まで長くかかる API があるので殺せない。
+ * ブラウザ（window がある）では接続だけの上限を持てないので null を返す（再送だけが効く）。
+ */
+function steadyAgents(timeoutMs) {
+    if (typeof window !== 'undefined' || typeof require !== 'function') {
+        return null;
+    }
+    var cached = steadyAgentCache[timeoutMs];
+    if (cached != null) {
+        return cached;
+    }
+    var http;
+    var https;
+    try {
+        http = require('http');
+        https = require('https');
+    }
+    catch (e) {
+        return null;
+    }
+    if ((http === null || http === void 0 ? void 0 : http.Agent) == null || (https === null || https === void 0 ? void 0 : https.Agent) == null) {
+        return null;
+    }
+    var SteadyHttpAgent = /** @class */ (function (_super) {
+        tslib_1.__extends(SteadyHttpAgent, _super);
+        function SteadyHttpAgent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        SteadyHttpAgent.prototype.createConnection = function (options, callback) {
+            return withConnectTimeout(_super.prototype.createConnection.call(this, options, callback), timeoutMs, 'connect');
+        };
+        return SteadyHttpAgent;
+    }(http.Agent));
+    var SteadyHttpsAgent = /** @class */ (function (_super) {
+        tslib_1.__extends(SteadyHttpsAgent, _super);
+        function SteadyHttpsAgent() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        SteadyHttpsAgent.prototype.createConnection = function (options, callback) {
+            return withConnectTimeout(_super.prototype.createConnection.call(this, options, callback), timeoutMs, 'secureConnect');
+        };
+        return SteadyHttpsAgent;
+    }(https.Agent));
+    // ★接続は使い回す（Node 既定の globalAgent と同じ keepAlive）。Steady だけ毎回 3-way handshake に
+    // なると、接続段階の上限を付けた意味（速く諦める）と引き換えに遅くなってしまう。
+    var options = { keepAlive: true, scheduling: 'lifo', timeout: 5000 };
+    var agents = {
+        http: new SteadyHttpAgent(options),
+        https: new SteadyHttpsAgent(options),
+    };
+    steadyAgentCache[timeoutMs] = agents;
+    return agents;
+}
+exports.steadyAgents = steadyAgents;
+/**
+ * Steady のときだけ、接続段階に上限を置いた POST を投げ、接続段階の失敗なら
+ * 同じ要求をもう 1 回だけ送る（プロジェクトトークンのログイン用）。
+ * steadyEndpoint が未設定なら従来どおり素の axios.post。
+ */
+function postWithSteadyResilience(url, data, steadyEndpoint, steadyConnectTimeoutMs) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var agents, config, error_1;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!isSteadyUrl(steadyEndpoint, url)) {
+                        return [2 /*return*/, axios_1.default.post(url, data)];
+                    }
+                    agents = steadyAgents(steadyConnectTimeoutMs);
+                    config = agents == null ? {} : { httpAgent: agents.http, httpsAgent: agents.https };
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 5]);
+                    return [4 /*yield*/, axios_1.default.post(url, data, config)];
+                case 2: return [2 /*return*/, _a.sent()];
+                case 3:
+                    error_1 = _a.sent();
+                    if (!isConnectFailure(error_1)) {
+                        throw error_1;
+                    }
+                    return [4 /*yield*/, axios_1.default.post(url, data, config)];
+                case 4: 
+                // ★接続段階の失敗（DNS / dial / TLS。1 バイトも送っていない）だけ、同じ要求をもう 1 回だけ。
+                // フリートが手放した IP に当たったとき、名前を引き直して別のノードへ着く機会を 1 回だけ作る。
+                return [2 /*return*/, _a.sent()];
+                case 5: return [2 /*return*/];
+            }
+        });
+    });
+}
 var Gs2RestSession = /** @class */ (function () {
     function Gs2RestSession(credential, region, options) {
-        var _a, _b;
+        var _a, _b, _c;
         this.credential = credential;
         this.region = region;
         this.projectToken = null;
         this.expiresAt = null;
         this.compressRequest = (_a = options === null || options === void 0 ? void 0 : options.compressRequest) !== null && _a !== void 0 ? _a : true;
         this.acceptGzipResponse = (_b = options === null || options === void 0 ? void 0 : options.acceptGzipResponse) !== null && _b !== void 0 ? _b : true;
+        this.steadyEndpoint = normalizeSteadyEndpoint(options === null || options === void 0 ? void 0 : options.steadyEndpoint);
+        this.steadyConnectTimeoutMs = (_c = options === null || options === void 0 ? void 0 : options.steadyConnectTimeoutMs) !== null && _c !== void 0 ? _c : exports.STEADY_CONNECT_TIMEOUT_MS;
     }
+    /**
+     * サービスの接続先。優先順: steadyEndpoint ＞ 共有クラウドの `Gs2Constant.ENDPOINT_HOST`。
+     * steadyEndpoint が未設定なら従来の文字列と byte 単位で一致する
+     * （生成クライアントのサービスごとの override はこれより強い。`steadyRestUrl` の説明）。
+     */
+    Gs2RestSession.prototype.endpointHost = function (service) {
+        var template = steadyRestTemplate(this.steadyEndpoint) || exports.Gs2Constant.ENDPOINT_HOST;
+        return template
+            .replace('{service}', service)
+            .replace('{region}', this.region);
+    };
     Gs2RestSession.prototype.connect = function () {
         var _this = this;
-        var service = 'identifier';
-        var url = exports.Gs2Constant.ENDPOINT_HOST
-            .replace('{service}', service)
-            .replace('{region}', this.region)
-            + '/projectToken/login';
+        // ★プロジェクトトークンのログインも Steady 配下（<steady>/identifier）へ向ける
+        // ―― 放置すると Steady のアプリの identifier だけ共有クラウドへ行く。
+        var url = this.endpointHost('identifier') + '/projectToken/login';
         if (this.credential instanceof BasicGs2Credential) {
             var data = {
                 client_id: this.credential.clientId,
                 client_secret: this.credential.clientSecret,
             };
-            return axios_1.default.post(url, data)
+            return postWithSteadyResilience(url, data, this.steadyEndpoint, this.steadyConnectTimeoutMs)
                 .then(function (response) {
                 var result = new LoginResult(response.data);
                 _this.projectToken = result.accessToken;
                 _this.expiresAt = new Date().getTime() + result.expiresIn * 1000;
                 return result;
             }).catch(function (error) {
+                // ★応答が無い失敗（接続段階の失敗・切断）では error.response が無いので、
+                // 元の誤りをそのまま投げる（従来はここで TypeError になっていた）。
+                if ((error === null || error === void 0 ? void 0 : error.response) == null) {
+                    throw error;
+                }
                 throw JSON.parse(error.response.data.message);
             });
         }
@@ -71,10 +318,65 @@ var Gs2RestSession = /** @class */ (function () {
     return Gs2RestSession;
 }());
 exports.Gs2RestSession = Gs2RestSession;
+// ---------------------------------------------------------------- WebSocket が切れたときの誤り
+//
+// ★サーバーは応答を返す前に接続を閉じることがある
+// （gateway の setUserId を force=true で呼ぶと呼び手自身の接続が切られる／ノードの停止／
+//  ネットワーク断）。そのとき待ち中の要求を決着させないと、呼び手は永久に await したままになる。
+// 切れたら待ち中の要求すべてをこの誤りで落とし、繋ぎ直すまで以後の send も即座にこの誤りで落とす。
+var ConnectionBrokenError = /** @class */ (function (_super) {
+    tslib_1.__extends(ConnectionBrokenError, _super);
+    function ConnectionBrokenError(detail) {
+        var _this = _super.call(this, detail == null ? 'connection broken' : 'connection broken (' + detail + ')') || this;
+        _this.name = 'ConnectionBrokenError';
+        // ★target: es5 では Error を継承すると prototype が失われ instanceof が偽になるので繋ぎ直す。
+        Object.setPrototypeOf(_this, ConnectionBrokenError.prototype);
+        return _this;
+    }
+    return ConnectionBrokenError;
+}(Error));
+exports.ConnectionBrokenError = ConnectionBrokenError;
+/** readyState（Node の `ws` もブラウザの WebSocket も同じ値） */
+var WS_OPEN = 1;
+var WS_CLOSED = 3;
+/** 閉じる挨拶を送る（既に閉じている接続でも安全。例外は握る） */
+function closeQuietly(client) {
+    try {
+        if (client != null && client.readyState !== WS_CLOSED) {
+            client.close();
+        }
+    }
+    catch (e) {
+        // 既に閉じている / 閉じ途中 ―― 何もしない。
+    }
+}
+/**
+ * 接続を叩き落とす（★相手がもう居ない接続に close() を送ると、`ws` は閉じる挨拶の返事を
+ * 30 秒待つタイマーを置くので、socket もタイマーも残さないようにこちらを使う）。
+ * terminate を持たないブラウザの WebSocket では close() に落とす。
+ */
+function terminateQuietly(client) {
+    try {
+        if (client != null && typeof client.terminate === 'function') {
+            client.terminate();
+            return;
+        }
+    }
+    catch (e) {
+        // 何もしない。
+    }
+    closeQuietly(client);
+}
 var Gs2WebSocketSession = /** @class */ (function () {
-    function Gs2WebSocketSession(credential, region) {
+    function Gs2WebSocketSession(credential, region, options) {
+        var _a;
         this.client = null;
-        this.inflightRequest = {};
+        /**
+         * 応答待ちの要求（requestId → Promise の決着口）。
+         * ★応答が来たもの・接続が切れたものは必ず取り除く。以前は応答の無い要求が残り続け、
+         *  呼び手は「応答も誤りも来ない」まま待っていた（送信の成否も見ていなかった）。
+         */
+        this.pendingRequests = {};
         this.onOpenHandlers = [];
         this.onErrorHandlers = [];
         this.onCloseHandlers = [];
@@ -83,25 +385,55 @@ var Gs2WebSocketSession = /** @class */ (function () {
         this.region = region;
         this.projectToken = null;
         this.expiresAt = null;
+        this.steadyEndpoint = normalizeSteadyEndpoint(options === null || options === void 0 ? void 0 : options.steadyEndpoint);
+        this.steadyConnectTimeoutMs = (_a = options === null || options === void 0 ? void 0 : options.steadyConnectTimeoutMs) !== null && _a !== void 0 ? _a : exports.STEADY_CONNECT_TIMEOUT_MS;
     }
+    /** 接続先。steadyEndpoint ＞ 共有クラウドの `Gs2Constant.WS_ENDPOINT_HOST` */
+    Gs2WebSocketSession.prototype.webSocketUrl = function () {
+        var url = steadyWebSocketUrl(this.steadyEndpoint);
+        if (url !== '') {
+            return url;
+        }
+        return exports.Gs2Constant.WS_ENDPOINT_HOST.replace('{region}', this.region);
+    };
+    /**
+     * Node の `ws` に渡す接続オプション。Steady のときだけ handshake に上限を置く。
+     * ★ブラウザの WebSocket は handshake の上限を持てない（オプションが無い）ので、
+     *  ブラウザでは上限が効かない。共有クラウドは従来どおりオプション無し（undefined）。
+     */
+    Gs2WebSocketSession.prototype.webSocketOptions = function () {
+        if (normalizeSteadyEndpoint(this.steadyEndpoint) === '') {
+            return undefined;
+        }
+        return { handshakeTimeout: this.steadyConnectTimeoutMs };
+    };
+    /** ログイン（identifier）の REST 接続先。steady があれば `<steady>/identifier`、無ければ従来 */
+    Gs2WebSocketSession.prototype.endpointHost = function (service) {
+        var template = steadyRestTemplate(this.steadyEndpoint) || exports.Gs2Constant.ENDPOINT_HOST;
+        return template
+            .replace('{service}', service)
+            .replace('{region}', this.region);
+    };
     Gs2WebSocketSession.prototype.connect = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var service, url, data, response, result;
+            var url, data, response, result, wsUrl, client;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        service = 'identifier';
-                        url = exports.Gs2Constant.ENDPOINT_HOST
-                            .replace('{service}', service)
-                            .replace('{region}', this.region)
-                            + '/projectToken/login';
+                        // ★繋ぎ直す前に古い接続を片付ける（そこに残した要求が決着しないまま忘れられないように）。
+                        //  ログインより前に済ませる ―― dropConnection は projectToken も捨てるので、
+                        //  この後で取り直したトークンを消させない。
+                        if (this.client != null) {
+                            this.dropConnection(this.client, 'reconnect');
+                        }
+                        url = this.endpointHost('identifier') + '/projectToken/login';
                         if (!(this.credential instanceof BasicGs2Credential)) return [3 /*break*/, 2];
                         data = {
                             client_id: this.credential.clientId,
                             client_secret: this.credential.clientSecret,
                         };
-                        return [4 /*yield*/, axios_1.default.post(url, data)];
+                        return [4 /*yield*/, postWithSteadyResilience(url, data, this.steadyEndpoint, this.steadyConnectTimeoutMs)];
                     case 1:
                         response = _a.sent();
                         result = new LoginResult(response.data);
@@ -114,63 +446,115 @@ var Gs2WebSocketSession = /** @class */ (function () {
                         }
                         _a.label = 3;
                     case 3:
+                        wsUrl = this.webSocketUrl();
                         if (typeof window === 'undefined') {
-                            this.client = new NodeWebSocket(exports.Gs2Constant.WS_ENDPOINT_HOST.replace('{region}', this.region));
+                            client = new NodeWebSocket(wsUrl, this.webSocketOptions());
                         }
                         else {
-                            this.client = new WebSocket(exports.Gs2Constant.WS_ENDPOINT_HOST.replace('{region}', this.region));
+                            client = new WebSocket(wsUrl);
                         }
-                        this.client.onopen = function (event) {
+                        this.client = client;
+                        client.onopen = function (event) {
                             for (var i = 0; i < _this.onOpenHandlers.length; i++) {
                                 _this.onOpenHandlers[i]();
                             }
                         };
-                        this.client.onmessage = function (message) {
+                        client.onmessage = function (message) {
                             var payload = JSON.parse(message.data);
                             if (payload.type == 'notification') {
                                 for (var i = 0; i < _this.onNotificationHandlers.length; i++) {
                                     _this.onNotificationHandlers[i](payload.body);
                                 }
+                                return;
                             }
-                            else {
-                                _this.inflightRequest[payload.requestId] = payload;
+                            var pending = _this.takePending(payload.requestId);
+                            // ★待ち行列に無い requestId（既に決着した要求への応答など）は捨てる。
+                            if (pending != null) {
+                                pending.resolve(payload);
                             }
                         };
-                        this.client.onerror = function (error) {
+                        client.onerror = function (error) {
+                            // ★close が来ないまま error だけ来ることがある（TCP が黙って切れた・handshake が失敗した）。
+                            //  ここでも待ち中の要求を決着させる（dropConnection は同じ接続に何度呼んでも無害）。
+                            _this.dropConnection(client, 'error');
                             for (var i = 0; i < _this.onErrorHandlers.length; i++) {
                                 _this.onErrorHandlers[i](error);
                             }
                         };
-                        this.client.onclose = function () {
+                        client.onclose = function () {
+                            // ★応答を返す前にサーバーが閉じても、待ち中の要求は必ず ConnectionBrokenError で決着させる。
+                            _this.dropConnection(client, 'closed by peer');
                             for (var i = 0; i < _this.onCloseHandlers.length; i++) {
                                 _this.onCloseHandlers[i]();
                             }
                         };
-                        if (!(typeof window === 'undefined')) return [3 /*break*/, 5];
-                        return [4 /*yield*/, (0, async_wait_until_1.default)(function () { return _this.client == null || _this.client.readyState == NodeWebSocket.CLOSED || _this.client.readyState == NodeWebSocket.OPEN; })];
+                        // 開くか閉じるまで待つ（this.client が差し替わった・捨てられた場合も抜ける）。
+                        return [4 /*yield*/, (0, async_wait_until_1.default)(function () { return _this.client !== client || client.readyState == WS_CLOSED || client.readyState == WS_OPEN; })];
                     case 4:
+                        // 開くか閉じるまで待つ（this.client が差し替わった・捨てられた場合も抜ける）。
                         _a.sent();
-                        return [3 /*break*/, 7];
-                    case 5: return [4 /*yield*/, (0, async_wait_until_1.default)(function () { return _this.client == null || _this.client.readyState == WebSocket.CLOSED || _this.client.readyState == WebSocket.OPEN; })];
-                    case 6:
-                        _a.sent();
-                        _a.label = 7;
-                    case 7: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
     };
+    /** requestId の要求を待ち行列から外して返す（無ければ null） */
+    Gs2WebSocketSession.prototype.takePending = function (requestId) {
+        if (requestId == null) {
+            return null;
+        }
+        var pending = this.pendingRequests[requestId];
+        if (pending == null) {
+            return null;
+        }
+        delete this.pendingRequests[requestId];
+        return pending;
+    };
+    /** 待ち中の要求すべてを ConnectionBrokenError で決着させ、待ち行列を空にする */
+    Gs2WebSocketSession.prototype.failPending = function (detail) {
+        var pendingRequests = this.pendingRequests;
+        this.pendingRequests = {};
+        var error = new ConnectionBrokenError(detail);
+        // ★先に待ち行列を空にしてから落とす（reject の先で send が呼ばれても混ざらない）。
+        Object.keys(pendingRequests).forEach(function (requestId) {
+            pendingRequests[requestId].reject(error);
+        });
+    };
+    /**
+     * 切れた接続を捨て、待ち中の要求すべてを ConnectionBrokenError で決着させる。
+     * ★既に別の接続へ差し替わっていたら（disconnect → connect の後の古い接続）何もしない。
+     * ★同じ接続に二度呼ばれても 2 回目は待ち行列が空なので無害（close と error の両方から来る）。
+     */
+    Gs2WebSocketSession.prototype.dropConnection = function (client, detail) {
+        if (this.client !== client) {
+            terminateQuietly(client);
+            return;
+        }
+        this.client = null;
+        this.projectToken = null;
+        this.expiresAt = null;
+        this.failPending(detail);
+        // ★相手はもう居ないので閉じる挨拶はしない（socket もタイマーも残さない）。
+        terminateQuietly(client);
+    };
     Gs2WebSocketSession.prototype.send = function (service, component, func, payload) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var requestId, result;
+            var client, requestId, body, result;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
+                        client = this.client;
+                        // ★接続が無い／閉じかけ・閉じた接続への送信は、待たずにその場で落とす
+                        //  （以前は送ったつもりになって応答を待ち続けていた）。
+                        if (client == null) {
+                            throw new ConnectionBrokenError('not connected');
+                        }
+                        if (client.readyState !== WS_OPEN) {
+                            throw new ConnectionBrokenError('readyState=' + client.readyState);
+                        }
                         requestId = (0, uuid_1.v4)();
-                        this.inflightRequest[requestId] = null;
-                        (_a = this.client) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify(Object.assign({}, payload, {
+                        body = JSON.stringify(Object.assign({}, payload, {
                             xGs2ClientId: this.credential.clientId,
                             xGs2ProjectToken: this.projectToken,
                             x_gs2: {
@@ -180,12 +564,32 @@ var Gs2WebSocketSession = /** @class */ (function () {
                                 contentType: "application/json",
                                 requestId: requestId,
                             },
-                        })));
-                        return [4 /*yield*/, (0, async_wait_until_1.default)(function () { return _this.inflightRequest[requestId] != null; })];
+                        }));
+                        return [4 /*yield*/, new Promise(function (resolve, reject) {
+                                // ★送信の前に待ち行列へ載せる（応答が先に届いても取り落とさない）。
+                                _this.pendingRequests[requestId] = { resolve: resolve, reject: reject };
+                                try {
+                                    // ★Node の `ws` は第 2 引数に書き込みの結果を受ける口を取る（ブラウザの WebSocket は
+                                    //  余分な引数を無視する）。送れなかった要求は届いていないので、その場で落とす。
+                                    client.send(body, function (error) {
+                                        if (error == null) {
+                                            return;
+                                        }
+                                        var pending = _this.takePending(requestId);
+                                        if (pending != null) {
+                                            pending.reject(new ConnectionBrokenError(error.message));
+                                        }
+                                    });
+                                }
+                                catch (error) {
+                                    var pending_1 = _this.takePending(requestId);
+                                    if (pending_1 != null) {
+                                        pending_1.reject(error);
+                                    }
+                                }
+                            })];
                     case 1:
-                        _b.sent();
-                        result = this.inflightRequest[requestId];
-                        delete this.inflightRequest[requestId];
+                        result = _a.sent();
                         if (result.status != 200) {
                             throw result.body;
                         }
@@ -206,29 +610,38 @@ var Gs2WebSocketSession = /** @class */ (function () {
     Gs2WebSocketSession.prototype.onNotification = function (func) {
         this.onNotificationHandlers.push(func);
     };
+    /** 接続を閉じる。★待ち中の要求には ConnectionBrokenError が返る（close を待たずに決着させる） */
     Gs2WebSocketSession.prototype.disconnect = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
+            var client, e_1;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(this.client != null)) return [3 /*break*/, 5];
-                        this.client.close();
-                        if (!(typeof window === 'undefined')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, (0, async_wait_until_1.default)(function () { return _this.client == null || _this.client.readyState == NodeWebSocket.CLOSED; })];
+                        client = this.client;
+                        this.client = null;
+                        this.projectToken = null;
+                        this.expiresAt = null;
+                        // ★close イベントを待たない（来ないこともある）。
+                        this.failPending('disconnected');
+                        if (!(client != null)) return [3 /*break*/, 5];
+                        closeQuietly(client);
+                        _a.label = 1;
                     case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, (0, async_wait_until_1.default)(function () { return client.readyState == WS_CLOSED; }, { timeout: 1000 })];
+                    case 2:
                         _a.sent();
                         return [3 /*break*/, 4];
-                    case 2: return [4 /*yield*/, (0, async_wait_until_1.default)(function () { return _this.client == null || _this.client.readyState == WebSocket.CLOSED; })];
                     case 3:
-                        _a.sent();
-                        _a.label = 4;
+                        e_1 = _a.sent();
+                        return [3 /*break*/, 4];
                     case 4:
-                        this.client = null;
+                        if (client.readyState !== WS_CLOSED) {
+                            // ★閉じ切らないまま抜けると socket とタイマーが残るので叩き落とす。
+                            terminateQuietly(client);
+                        }
                         _a.label = 5;
-                    case 5:
-                        this.projectToken = null;
-                        return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });

package/core/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gs2",
-  "version": "1.4.126",
+  "version": "1.4.128",
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build"