kiri-mcp-server 0.22.4 → 0.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/package.json +1 -1
- package/dist/src/client/connection-manager.d.ts +151 -0
- package/dist/src/client/connection-manager.d.ts.map +1 -0
- package/dist/src/client/connection-manager.js +375 -0
- package/dist/src/client/connection-manager.js.map +1 -0
- package/dist/src/client/proxy.d.ts +3 -0
- package/dist/src/client/proxy.d.ts.map +1 -1
- package/dist/src/client/proxy.js +237 -37
- package/dist/src/client/proxy.js.map +1 -1
- package/dist/src/client/request-queue.d.ts +103 -0
- package/dist/src/client/request-queue.d.ts.map +1 -0
- package/dist/src/client/request-queue.js +203 -0
- package/dist/src/client/request-queue.js.map +1 -0
- package/dist/src/client/start-daemon.d.ts +4 -1
- package/dist/src/client/start-daemon.d.ts.map +1 -1
- package/dist/src/client/start-daemon.js +5 -2
- package/dist/src/client/start-daemon.js.map +1 -1
- package/dist/src/shared/utils/retry.d.ts +16 -1
- package/dist/src/shared/utils/retry.d.ts.map +1 -1
- package/dist/src/shared/utils/retry.js +23 -3
- package/dist/src/shared/utils/retry.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
> Intelligent code context extraction for LLMs via Model Context Protocol
|
|
4
4
|
|
|
5
|
-
[](package.json)
|
|
6
6
|
[](LICENSE)
|
|
7
7
|
[](https://www.typescriptlang.org/)
|
|
8
8
|
[](https://modelcontextprotocol.io/)
|
package/dist/package.json
CHANGED
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ConnectionManager - ソケット接続の確立・維持・再接続を管理
|
|
3
|
+
*
|
|
4
|
+
* @see Issue #156: MCP接続がデーモン再起動時に切断され、自動再接続しない問題への対応
|
|
5
|
+
*/
|
|
6
|
+
import { EventEmitter } from "events";
|
|
7
|
+
import * as net from "net";
|
|
8
|
+
import { RequestQueue } from "./request-queue.js";
|
|
9
|
+
/**
|
|
10
|
+
* 接続状態
|
|
11
|
+
*/
|
|
12
|
+
export type ConnectionStatus = "disconnected" | "connecting" | "connected" | "reconnecting";
|
|
13
|
+
/**
|
|
14
|
+
* 接続状態の詳細情報
|
|
15
|
+
*/
|
|
16
|
+
export interface ConnectionState {
|
|
17
|
+
status: ConnectionStatus;
|
|
18
|
+
lastConnectedAt?: number;
|
|
19
|
+
disconnectedAt?: number;
|
|
20
|
+
reconnectAttempt: number;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* エラーが再接続可能かどうかを判定
|
|
24
|
+
*/
|
|
25
|
+
export declare function isRetriableError(error: unknown): boolean;
|
|
26
|
+
/**
|
|
27
|
+
* ConnectionManagerのオプション
|
|
28
|
+
*/
|
|
29
|
+
export interface ConnectionManagerOptions {
|
|
30
|
+
/** ソケットパス */
|
|
31
|
+
socketPath: string;
|
|
32
|
+
/** データベースパス(デーモン起動用) */
|
|
33
|
+
databasePath: string;
|
|
34
|
+
/** リポジトリルート(デーモン起動用) */
|
|
35
|
+
repoRoot: string;
|
|
36
|
+
/** 最大再接続試行回数。デフォルト: 10 */
|
|
37
|
+
maxReconnectAttempts?: number | undefined;
|
|
38
|
+
/** 初期再接続遅延(ミリ秒)。デフォルト: 500 */
|
|
39
|
+
reconnectInitialDelayMs?: number | undefined;
|
|
40
|
+
/** 最大再接続遅延(ミリ秒)。デフォルト: 30000 */
|
|
41
|
+
reconnectMaxDelayMs?: number | undefined;
|
|
42
|
+
/** バックオフ倍率。デフォルト: 2 */
|
|
43
|
+
backoffMultiplier?: number | undefined;
|
|
44
|
+
/** ジッター(ミリ秒)。デフォルト: 100 */
|
|
45
|
+
jitterMs?: number | undefined;
|
|
46
|
+
/** リクエストキュー(外部から注入可能) */
|
|
47
|
+
requestQueue?: RequestQueue | undefined;
|
|
48
|
+
/** ウォッチモード */
|
|
49
|
+
watchMode?: boolean | undefined;
|
|
50
|
+
/** デバウンス時間(ミリ秒) */
|
|
51
|
+
debounceMs?: number | undefined;
|
|
52
|
+
/** 縮退モード許可 */
|
|
53
|
+
allowDegrade?: boolean | undefined;
|
|
54
|
+
/** セキュリティ設定パス */
|
|
55
|
+
securityConfigPath?: string | undefined;
|
|
56
|
+
/** セキュリティロックパス */
|
|
57
|
+
securityLockPath?: string | undefined;
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* ConnectionManagerイベント
|
|
61
|
+
*/
|
|
62
|
+
export interface ConnectionManagerEvents {
|
|
63
|
+
connected: [];
|
|
64
|
+
disconnected: [reason: string];
|
|
65
|
+
reconnecting: [attempt: number, maxAttempts: number, delayMs: number];
|
|
66
|
+
reconnected: [];
|
|
67
|
+
maxRetriesExceeded: [];
|
|
68
|
+
data: [data: Buffer];
|
|
69
|
+
error: [error: Error];
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* 接続マネージャー
|
|
73
|
+
*
|
|
74
|
+
* ソケット接続の確立・維持・再接続を管理する。
|
|
75
|
+
* 指数バックオフ付きリトライ戦略を提供する。
|
|
76
|
+
*/
|
|
77
|
+
export declare class ConnectionManager extends EventEmitter {
|
|
78
|
+
private socket;
|
|
79
|
+
private state;
|
|
80
|
+
private readonly socketPath;
|
|
81
|
+
private readonly databasePath;
|
|
82
|
+
private readonly repoRoot;
|
|
83
|
+
private readonly maxReconnectAttempts;
|
|
84
|
+
private readonly reconnectInitialDelayMs;
|
|
85
|
+
private readonly reconnectMaxDelayMs;
|
|
86
|
+
private readonly backoffMultiplier;
|
|
87
|
+
private readonly jitterMs;
|
|
88
|
+
private readonly requestQueue;
|
|
89
|
+
private readonly watchMode;
|
|
90
|
+
private readonly debounceMs;
|
|
91
|
+
private readonly allowDegrade;
|
|
92
|
+
private readonly securityConfigPath;
|
|
93
|
+
private readonly securityLockPath;
|
|
94
|
+
private isReconnecting;
|
|
95
|
+
private isClosed;
|
|
96
|
+
/** 再接続待機中のintervalをトラッキング(close時にクリーンアップ) */
|
|
97
|
+
private pendingWaitIntervals;
|
|
98
|
+
constructor(options: ConnectionManagerOptions);
|
|
99
|
+
/**
|
|
100
|
+
* 型安全なイベント発火
|
|
101
|
+
*/
|
|
102
|
+
emit<K extends keyof ConnectionManagerEvents>(event: K, ...args: ConnectionManagerEvents[K]): boolean;
|
|
103
|
+
/**
|
|
104
|
+
* 型安全なイベントリスナー登録
|
|
105
|
+
*/
|
|
106
|
+
on<K extends keyof ConnectionManagerEvents>(event: K, listener: (...args: ConnectionManagerEvents[K]) => void): this;
|
|
107
|
+
/**
|
|
108
|
+
* 初回接続を確立
|
|
109
|
+
*/
|
|
110
|
+
connect(): Promise<net.Socket>;
|
|
111
|
+
/**
|
|
112
|
+
* 再接続を試行
|
|
113
|
+
*/
|
|
114
|
+
reconnect(): Promise<net.Socket>;
|
|
115
|
+
/**
|
|
116
|
+
* データを送信(キュー経由)
|
|
117
|
+
*
|
|
118
|
+
* 接続中の場合は即座に送信。未接続の場合はキューに追加し、
|
|
119
|
+
* 再接続後にreplayAll()で自動送信される。
|
|
120
|
+
*/
|
|
121
|
+
send(data: string): Promise<void>;
|
|
122
|
+
/**
|
|
123
|
+
* 接続を閉じる
|
|
124
|
+
*/
|
|
125
|
+
close(): void;
|
|
126
|
+
/**
|
|
127
|
+
* 現在の接続状態を取得
|
|
128
|
+
*/
|
|
129
|
+
getState(): ConnectionState;
|
|
130
|
+
/**
|
|
131
|
+
* 現在のソケットを取得
|
|
132
|
+
*/
|
|
133
|
+
getSocket(): net.Socket | null;
|
|
134
|
+
/**
|
|
135
|
+
* リクエストキューを取得
|
|
136
|
+
*/
|
|
137
|
+
getRequestQueue(): RequestQueue;
|
|
138
|
+
/**
|
|
139
|
+
* ソケット接続を作成
|
|
140
|
+
*/
|
|
141
|
+
private createConnection;
|
|
142
|
+
/**
|
|
143
|
+
* ソケットイベントリスナーを設定
|
|
144
|
+
*/
|
|
145
|
+
private setupSocketListeners;
|
|
146
|
+
/**
|
|
147
|
+
* 切断時の処理
|
|
148
|
+
*/
|
|
149
|
+
private handleDisconnection;
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=connection-manager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../../src/client/connection-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,375 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ConnectionManager - ソケット接続の確立・維持・再接続を管理
|
|
3
|
+
*
|
|
4
|
+
* @see Issue #156: MCP接続がデーモン再起動時に切断され、自動再接続しない問題への対応
|
|
5
|
+
*/
|
|
6
|
+
import { EventEmitter } from "events";
|
|
7
|
+
import * as net from "net";
|
|
8
|
+
import { calculateBackoffDelay } from "../shared/utils/retry.js";
|
|
9
|
+
import { RequestQueue } from "./request-queue.js";
|
|
10
|
+
import { startDaemon, isDaemonRunning } from "./start-daemon.js";
|
|
11
|
+
/**
|
|
12
|
+
* 再接続可能なエラーコード
|
|
13
|
+
*/
|
|
14
|
+
const RETRIABLE_ERROR_CODES = new Set([
|
|
15
|
+
"ECONNREFUSED", // デーモン未起動
|
|
16
|
+
"EPIPE", // 接続切断
|
|
17
|
+
"ECONNRESET", // 接続リセット
|
|
18
|
+
"ENOENT", // ソケットファイル未作成
|
|
19
|
+
"ETIMEDOUT", // 接続タイムアウト
|
|
20
|
+
]);
|
|
21
|
+
/**
|
|
22
|
+
* エラーが再接続可能かどうかを判定
|
|
23
|
+
*/
|
|
24
|
+
export function isRetriableError(error) {
|
|
25
|
+
if (error instanceof Error) {
|
|
26
|
+
const code = error.code;
|
|
27
|
+
return code !== undefined && RETRIABLE_ERROR_CODES.has(code);
|
|
28
|
+
}
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* 接続マネージャー
|
|
33
|
+
*
|
|
34
|
+
* ソケット接続の確立・維持・再接続を管理する。
|
|
35
|
+
* 指数バックオフ付きリトライ戦略を提供する。
|
|
36
|
+
*/
|
|
37
|
+
export class ConnectionManager extends EventEmitter {
|
|
38
|
+
socket = null;
|
|
39
|
+
state = {
|
|
40
|
+
status: "disconnected",
|
|
41
|
+
reconnectAttempt: 0,
|
|
42
|
+
};
|
|
43
|
+
socketPath;
|
|
44
|
+
databasePath;
|
|
45
|
+
repoRoot;
|
|
46
|
+
maxReconnectAttempts;
|
|
47
|
+
reconnectInitialDelayMs;
|
|
48
|
+
reconnectMaxDelayMs;
|
|
49
|
+
backoffMultiplier;
|
|
50
|
+
jitterMs;
|
|
51
|
+
requestQueue;
|
|
52
|
+
watchMode;
|
|
53
|
+
debounceMs;
|
|
54
|
+
allowDegrade;
|
|
55
|
+
securityConfigPath;
|
|
56
|
+
securityLockPath;
|
|
57
|
+
isReconnecting = false;
|
|
58
|
+
isClosed = false;
|
|
59
|
+
/** 再接続待機中のintervalをトラッキング(close時にクリーンアップ) */
|
|
60
|
+
pendingWaitIntervals = new Set();
|
|
61
|
+
constructor(options) {
|
|
62
|
+
super();
|
|
63
|
+
this.socketPath = options.socketPath;
|
|
64
|
+
this.databasePath = options.databasePath;
|
|
65
|
+
this.repoRoot = options.repoRoot;
|
|
66
|
+
this.maxReconnectAttempts = options.maxReconnectAttempts ?? 10;
|
|
67
|
+
this.reconnectInitialDelayMs = options.reconnectInitialDelayMs ?? 500;
|
|
68
|
+
this.reconnectMaxDelayMs = options.reconnectMaxDelayMs ?? 30000;
|
|
69
|
+
this.backoffMultiplier = options.backoffMultiplier ?? 2;
|
|
70
|
+
this.jitterMs = options.jitterMs ?? 100;
|
|
71
|
+
this.requestQueue = options.requestQueue ?? new RequestQueue();
|
|
72
|
+
this.watchMode = options.watchMode ?? false;
|
|
73
|
+
this.debounceMs = options.debounceMs ?? 500;
|
|
74
|
+
this.allowDegrade = options.allowDegrade ?? false;
|
|
75
|
+
this.securityConfigPath = options.securityConfigPath;
|
|
76
|
+
this.securityLockPath = options.securityLockPath;
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* 型安全なイベント発火
|
|
80
|
+
*/
|
|
81
|
+
emit(event, ...args) {
|
|
82
|
+
return super.emit(event, ...args);
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* 型安全なイベントリスナー登録
|
|
86
|
+
*/
|
|
87
|
+
on(event, listener) {
|
|
88
|
+
return super.on(event, listener);
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* 初回接続を確立
|
|
92
|
+
*/
|
|
93
|
+
async connect() {
|
|
94
|
+
if (this.isClosed) {
|
|
95
|
+
throw new Error("ConnectionManager is closed");
|
|
96
|
+
}
|
|
97
|
+
if (this.socket && this.state.status === "connected") {
|
|
98
|
+
return this.socket;
|
|
99
|
+
}
|
|
100
|
+
this.state.status = "connecting";
|
|
101
|
+
// デーモンが起動していない場合は起動(カスタムソケットパスを考慮)
|
|
102
|
+
const running = await isDaemonRunning(this.databasePath, this.socketPath);
|
|
103
|
+
if (!running) {
|
|
104
|
+
console.error("[ConnectionManager] Daemon not running. Starting daemon...");
|
|
105
|
+
await startDaemon({
|
|
106
|
+
repoRoot: this.repoRoot,
|
|
107
|
+
databasePath: this.databasePath,
|
|
108
|
+
socketPath: this.socketPath,
|
|
109
|
+
watchMode: this.watchMode,
|
|
110
|
+
debounceMs: this.debounceMs,
|
|
111
|
+
allowDegrade: this.allowDegrade,
|
|
112
|
+
securityConfigPath: this.securityConfigPath,
|
|
113
|
+
securityLockPath: this.securityLockPath,
|
|
114
|
+
});
|
|
115
|
+
console.error("[ConnectionManager] Daemon started successfully");
|
|
116
|
+
}
|
|
117
|
+
this.socket = await this.createConnection();
|
|
118
|
+
this.setupSocketListeners(this.socket);
|
|
119
|
+
this.state.status = "connected";
|
|
120
|
+
this.state.lastConnectedAt = Date.now();
|
|
121
|
+
this.state.reconnectAttempt = 0;
|
|
122
|
+
this.emit("connected");
|
|
123
|
+
return this.socket;
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* 再接続を試行
|
|
127
|
+
*/
|
|
128
|
+
async reconnect() {
|
|
129
|
+
if (this.isClosed) {
|
|
130
|
+
throw new Error("ConnectionManager is closed");
|
|
131
|
+
}
|
|
132
|
+
if (this.isReconnecting) {
|
|
133
|
+
// 既に再接続中の場合は完了を待機(タイムアウト付き)
|
|
134
|
+
const waitTimeoutMs = this.maxReconnectAttempts * this.reconnectMaxDelayMs + 10000;
|
|
135
|
+
return new Promise((resolve, reject) => {
|
|
136
|
+
const startTime = Date.now();
|
|
137
|
+
const checkInterval = setInterval(() => {
|
|
138
|
+
// タイムアウトチェック
|
|
139
|
+
if (Date.now() - startTime > waitTimeoutMs) {
|
|
140
|
+
clearInterval(checkInterval);
|
|
141
|
+
this.pendingWaitIntervals.delete(checkInterval);
|
|
142
|
+
reject(new Error("Reconnection wait timeout"));
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
// close()が呼ばれた場合
|
|
146
|
+
if (this.isClosed) {
|
|
147
|
+
clearInterval(checkInterval);
|
|
148
|
+
this.pendingWaitIntervals.delete(checkInterval);
|
|
149
|
+
reject(new Error("ConnectionManager is closed"));
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
// 再接続完了チェック
|
|
153
|
+
if (!this.isReconnecting) {
|
|
154
|
+
clearInterval(checkInterval);
|
|
155
|
+
this.pendingWaitIntervals.delete(checkInterval);
|
|
156
|
+
if (this.socket && this.state.status === "connected") {
|
|
157
|
+
resolve(this.socket);
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
reject(new Error("Reconnection failed"));
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}, 100);
|
|
164
|
+
this.pendingWaitIntervals.add(checkInterval);
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
this.isReconnecting = true;
|
|
168
|
+
this.state.status = "reconnecting";
|
|
169
|
+
this.state.disconnectedAt = Date.now();
|
|
170
|
+
try {
|
|
171
|
+
for (let attempt = 1; attempt <= this.maxReconnectAttempts; attempt++) {
|
|
172
|
+
this.state.reconnectAttempt = attempt;
|
|
173
|
+
const delayMs = calculateBackoffDelay(this.reconnectInitialDelayMs, attempt, this.backoffMultiplier, this.reconnectMaxDelayMs, this.jitterMs);
|
|
174
|
+
this.emit("reconnecting", attempt, this.maxReconnectAttempts, delayMs);
|
|
175
|
+
console.error(`[ConnectionManager] Reconnection attempt ${attempt}/${this.maxReconnectAttempts} (delay: ${Math.round(delayMs)}ms)`);
|
|
176
|
+
// 遅延
|
|
177
|
+
await new Promise((resolve) => setTimeout(resolve, delayMs));
|
|
178
|
+
// デーモンが起動していない場合は起動を試みる(カスタムソケットパスを考慮)
|
|
179
|
+
const running = await isDaemonRunning(this.databasePath, this.socketPath);
|
|
180
|
+
if (!running) {
|
|
181
|
+
console.error("[ConnectionManager] Daemon not running. Attempting to start...");
|
|
182
|
+
try {
|
|
183
|
+
await startDaemon({
|
|
184
|
+
repoRoot: this.repoRoot,
|
|
185
|
+
databasePath: this.databasePath,
|
|
186
|
+
socketPath: this.socketPath,
|
|
187
|
+
watchMode: this.watchMode,
|
|
188
|
+
debounceMs: this.debounceMs,
|
|
189
|
+
allowDegrade: this.allowDegrade,
|
|
190
|
+
securityConfigPath: this.securityConfigPath,
|
|
191
|
+
securityLockPath: this.securityLockPath,
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
catch (startErr) {
|
|
195
|
+
console.error(`[ConnectionManager] Failed to start daemon: ${startErr.message}`);
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
try {
|
|
200
|
+
// 古いソケットをクリーンアップ
|
|
201
|
+
if (this.socket) {
|
|
202
|
+
this.socket.removeAllListeners();
|
|
203
|
+
this.socket.destroy();
|
|
204
|
+
this.socket = null;
|
|
205
|
+
}
|
|
206
|
+
this.socket = await this.createConnection();
|
|
207
|
+
this.setupSocketListeners(this.socket);
|
|
208
|
+
this.state.status = "connected";
|
|
209
|
+
this.state.lastConnectedAt = Date.now();
|
|
210
|
+
this.state.reconnectAttempt = 0;
|
|
211
|
+
// 保留中のリクエストを再送信
|
|
212
|
+
const replayedCount = await this.requestQueue.replayAll(this.socket);
|
|
213
|
+
if (replayedCount > 0) {
|
|
214
|
+
console.error(`[ConnectionManager] Replayed ${replayedCount} pending requests`);
|
|
215
|
+
}
|
|
216
|
+
this.emit("reconnected");
|
|
217
|
+
console.error("[ConnectionManager] Reconnected to daemon successfully");
|
|
218
|
+
return this.socket;
|
|
219
|
+
}
|
|
220
|
+
catch (err) {
|
|
221
|
+
console.error(`[ConnectionManager] Reconnection attempt ${attempt} failed: ${err.message}`);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
// 最大リトライ回数超過
|
|
225
|
+
this.state.status = "disconnected";
|
|
226
|
+
this.emit("maxRetriesExceeded");
|
|
227
|
+
console.error(`[ConnectionManager] Max reconnection attempts (${this.maxReconnectAttempts}) exceeded`);
|
|
228
|
+
throw new Error(`Failed to reconnect after ${this.maxReconnectAttempts} attempts`);
|
|
229
|
+
}
|
|
230
|
+
finally {
|
|
231
|
+
this.isReconnecting = false;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
/**
|
|
235
|
+
* データを送信(キュー経由)
|
|
236
|
+
*
|
|
237
|
+
* 接続中の場合は即座に送信。未接続の場合はキューに追加し、
|
|
238
|
+
* 再接続後にreplayAll()で自動送信される。
|
|
239
|
+
*/
|
|
240
|
+
async send(data) {
|
|
241
|
+
// 接続中の場合は即座に送信
|
|
242
|
+
if (this.socket && this.state.status === "connected") {
|
|
243
|
+
// キューに追加(レスポンス受信時にdequeueされる)
|
|
244
|
+
this.requestQueue.enqueue(data);
|
|
245
|
+
return new Promise((resolve, reject) => {
|
|
246
|
+
this.socket.write(data + "\n", (err) => {
|
|
247
|
+
if (err) {
|
|
248
|
+
reject(err);
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
resolve();
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
// 未接続の場合はキューに追加して再接続
|
|
257
|
+
// 再接続成功時にreplayAll()で自動送信されるため、ここでは送信しない
|
|
258
|
+
this.requestQueue.enqueue(data);
|
|
259
|
+
await this.reconnect();
|
|
260
|
+
// replayAll()で既に送信済みなので、追加の送信は不要
|
|
261
|
+
}
|
|
262
|
+
/**
|
|
263
|
+
* 接続を閉じる
|
|
264
|
+
*/
|
|
265
|
+
close() {
|
|
266
|
+
this.isClosed = true;
|
|
267
|
+
this.requestQueue.clear();
|
|
268
|
+
// 待機中のintervalをすべてクリア
|
|
269
|
+
for (const interval of this.pendingWaitIntervals) {
|
|
270
|
+
clearInterval(interval);
|
|
271
|
+
}
|
|
272
|
+
this.pendingWaitIntervals.clear();
|
|
273
|
+
if (this.socket) {
|
|
274
|
+
this.socket.removeAllListeners();
|
|
275
|
+
this.socket.destroy();
|
|
276
|
+
this.socket = null;
|
|
277
|
+
}
|
|
278
|
+
this.state.status = "disconnected";
|
|
279
|
+
}
|
|
280
|
+
/**
|
|
281
|
+
* 現在の接続状態を取得
|
|
282
|
+
*/
|
|
283
|
+
getState() {
|
|
284
|
+
return { ...this.state };
|
|
285
|
+
}
|
|
286
|
+
/**
|
|
287
|
+
* 現在のソケットを取得
|
|
288
|
+
*/
|
|
289
|
+
getSocket() {
|
|
290
|
+
return this.socket;
|
|
291
|
+
}
|
|
292
|
+
/**
|
|
293
|
+
* リクエストキューを取得
|
|
294
|
+
*/
|
|
295
|
+
getRequestQueue() {
|
|
296
|
+
return this.requestQueue;
|
|
297
|
+
}
|
|
298
|
+
/**
|
|
299
|
+
* ソケット接続を作成
|
|
300
|
+
*/
|
|
301
|
+
createConnection() {
|
|
302
|
+
return new Promise((resolve, reject) => {
|
|
303
|
+
const socket = net.connect(this.socketPath);
|
|
304
|
+
const onConnect = () => {
|
|
305
|
+
socket.removeListener("error", onError);
|
|
306
|
+
resolve(socket);
|
|
307
|
+
};
|
|
308
|
+
const onError = (err) => {
|
|
309
|
+
socket.removeListener("connect", onConnect);
|
|
310
|
+
reject(err);
|
|
311
|
+
};
|
|
312
|
+
socket.once("connect", onConnect);
|
|
313
|
+
socket.once("error", onError);
|
|
314
|
+
});
|
|
315
|
+
}
|
|
316
|
+
/**
|
|
317
|
+
* ソケットイベントリスナーを設定
|
|
318
|
+
*/
|
|
319
|
+
setupSocketListeners(socket) {
|
|
320
|
+
socket.on("data", (data) => {
|
|
321
|
+
this.emit("data", data);
|
|
322
|
+
// レスポンスを受信したらキューから削除
|
|
323
|
+
try {
|
|
324
|
+
const lines = data
|
|
325
|
+
.toString()
|
|
326
|
+
.split("\n")
|
|
327
|
+
.filter((line) => line.trim());
|
|
328
|
+
for (const line of lines) {
|
|
329
|
+
const response = JSON.parse(line);
|
|
330
|
+
if (response.id !== undefined && response.id !== null) {
|
|
331
|
+
this.requestQueue.dequeue(response.id);
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
catch {
|
|
336
|
+
// JSONパースエラーは無視
|
|
337
|
+
}
|
|
338
|
+
});
|
|
339
|
+
socket.on("end", () => {
|
|
340
|
+
console.error("[ConnectionManager] Connection ended");
|
|
341
|
+
this.emit("disconnected", "Connection ended");
|
|
342
|
+
this.handleDisconnection();
|
|
343
|
+
});
|
|
344
|
+
socket.on("error", (err) => {
|
|
345
|
+
console.error(`[ConnectionManager] Socket error: ${err.message}`);
|
|
346
|
+
this.emit("error", err);
|
|
347
|
+
if (isRetriableError(err)) {
|
|
348
|
+
this.emit("disconnected", `Socket error: ${err.message}`);
|
|
349
|
+
this.handleDisconnection();
|
|
350
|
+
}
|
|
351
|
+
});
|
|
352
|
+
socket.on("close", () => {
|
|
353
|
+
if (this.state.status === "connected") {
|
|
354
|
+
console.error("[ConnectionManager] Connection closed");
|
|
355
|
+
this.emit("disconnected", "Connection closed");
|
|
356
|
+
this.handleDisconnection();
|
|
357
|
+
}
|
|
358
|
+
});
|
|
359
|
+
}
|
|
360
|
+
/**
|
|
361
|
+
* 切断時の処理
|
|
362
|
+
*/
|
|
363
|
+
handleDisconnection() {
|
|
364
|
+
if (this.isClosed || this.isReconnecting) {
|
|
365
|
+
return;
|
|
366
|
+
}
|
|
367
|
+
this.state.status = "disconnected";
|
|
368
|
+
this.state.disconnectedAt = Date.now();
|
|
369
|
+
// 自動再接続を開始
|
|
370
|
+
this.reconnect().catch((err) => {
|
|
371
|
+
console.error(`[ConnectionManager] Auto-reconnection failed: ${err.message}`);
|
|
372
|
+
});
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
//# sourceMappingURL=connection-manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../src/client/connection-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,9 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Transparently bridges stdio (MCP client) ↔ Unix socket (daemon).
|
|
6
6
|
* Auto-starts daemon if not running, handles retries and fallback.
|
|
7
|
+
* Supports automatic reconnection on daemon restart.
|
|
8
|
+
*
|
|
9
|
+
* @see Issue #156: MCP接続がデーモン再起動時に切断され、自動再接続しない問題への対応
|
|
7
10
|
*/
|
|
8
11
|
export {};
|
|
9
12
|
//# sourceMappingURL=proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/client/proxy.ts"],"names":[],"mappings":";AACA
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/client/proxy.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG"}
|