fix(skill-mcp-manager): remove process listeners on disconnect and guard connection races

H7: Process 'exit'/'SIGINT' listeners registered per-session were never removed when all sessions disconnected, accumulating handlers. - Add unregisterProcessCleanup() called in disconnectAll() H8: Race condition where disconnectSession() during pending connection left orphan clients in state.clients. - Add disconnectedSessions Set to track mid-flight disconnects - Check disconnect marker after connection resolves, close if stale - Clear marker on reconnection for same session Tests: 6 pass (3 disconnect + 3 race)
2026-03-11 20:10:34 +09:00
parent fed720dd11
commit d1fc6629c2
6 changed files with 301 additions and 2 deletions
@@ -0,0 +1,108 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js"
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
+import { afterEach, describe, expect, it } from "bun:test"
+import { disconnectSession, registerProcessCleanup, unregisterProcessCleanup } from "./cleanup"
+import type { ManagedClient, SkillMcpManagerState } from "./types"
+
+const trackedStates: SkillMcpManagerState[] = []
+
+afterEach(() => {
+  for (const state of trackedStates) {
+    unregisterProcessCleanup(state)
+  }
+
+  trackedStates.length = 0
+})
+
+function createState(): SkillMcpManagerState {
+  const state: SkillMcpManagerState = {
+    clients: new Map(),
+    pendingConnections: new Map(),
+    disconnectedSessions: new Set(),
+    authProviders: new Map(),
+    cleanupRegistered: false,
+    cleanupInterval: null,
+    cleanupHandlers: [],
+    idleTimeoutMs: 5 * 60 * 1000,
+  }
+
+  trackedStates.push(state)
+  return state
+}
+
+function createManagedClient(skillName: string): ManagedClient {
+  return {
+    client: new Client(
+      { name: `test-${skillName}`, version: "1.0.0" },
+      { capabilities: {} }
+    ),
+    transport: new StreamableHTTPClientTransport(new URL("https://example.com/mcp")),
+    skillName,
+    lastUsedAt: Date.now(),
+    connectionType: "http",
+  }
+}
+
+describe("disconnectSession cleanup registration", () => {
+  it("#given state with 1 client and cleanup registered #when disconnectSession removes last client #then process cleanup handlers are unregistered", async () => {
+    // given
+    const state = createState()
+    const signalIntCountBeforeRegister = process.listenerCount("SIGINT")
+    const signalTermCountBeforeRegister = process.listenerCount("SIGTERM")
+
+    state.clients.set("session-1:skill-1:server-1", createManagedClient("skill-1"))
+    registerProcessCleanup(state)
+
+    // when
+    await disconnectSession(state, "session-1")
+
+    // then
+    expect(state.cleanupRegistered).toBe(false)
+    expect(state.cleanupHandlers).toEqual([])
+    expect(process.listenerCount("SIGINT")).toBe(signalIntCountBeforeRegister)
+    expect(process.listenerCount("SIGTERM")).toBe(signalTermCountBeforeRegister)
+  })
+
+  it("#given state with 2 clients in different sessions #when disconnectSession removes one session #then process cleanup handlers remain registered", async () => {
+    // given
+    const state = createState()
+    const signalIntCountBeforeRegister = process.listenerCount("SIGINT")
+    const signalTermCountBeforeRegister = process.listenerCount("SIGTERM")
+
+    state.clients.set("session-1:skill-1:server-1", createManagedClient("skill-1"))
+    state.clients.set("session-2:skill-2:server-2", createManagedClient("skill-2"))
+    registerProcessCleanup(state)
+
+    // when
+    await disconnectSession(state, "session-1")
+
+    // then
+    expect(state.clients.has("session-2:skill-2:server-2")).toBe(true)
+    expect(state.cleanupRegistered).toBe(true)
+    expect(state.cleanupHandlers).toHaveLength(2)
+    expect(process.listenerCount("SIGINT")).toBe(signalIntCountBeforeRegister + 1)
+    expect(process.listenerCount("SIGTERM")).toBe(signalTermCountBeforeRegister + 1)
+  })
+
+  it("#given state with 2 clients in different sessions #when both sessions disconnected #then process cleanup handlers are unregistered", async () => {
+    // given
+    const state = createState()
+    const signalIntCountBeforeRegister = process.listenerCount("SIGINT")
+    const signalTermCountBeforeRegister = process.listenerCount("SIGTERM")
+
+    state.clients.set("session-1:skill-1:server-1", createManagedClient("skill-1"))
+    state.clients.set("session-2:skill-2:server-2", createManagedClient("skill-2"))
+    registerProcessCleanup(state)
+
+    // when
+    await disconnectSession(state, "session-1")
+    await disconnectSession(state, "session-2")
+
+    // then
+    expect(state.clients.size).toBe(0)
+    expect(state.cleanupRegistered).toBe(false)
+    expect(state.cleanupHandlers).toEqual([])
+    expect(process.listenerCount("SIGINT")).toBe(signalIntCountBeforeRegister)
+    expect(process.listenerCount("SIGTERM")).toBe(signalTermCountBeforeRegister)
+  })
+})