|
| 1 | +import { describe, expect, it } from "@effect/vitest"; |
| 2 | +import { Effect } from "effect"; |
| 3 | +import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; |
| 4 | +import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"; |
| 5 | +import type { JSONRPCMessage, MessageExtraInfo } from "@modelcontextprotocol/sdk/types.js"; |
| 6 | + |
| 7 | +import { defaultMcpResource } from "@executor-js/host-mcp"; |
| 8 | + |
| 9 | +import { McpAgentSessionDOBase, type SessionMeta } from "./agent-session-durable-object"; |
| 10 | + |
| 11 | +class MemoryStorage { |
| 12 | + private readonly data = new Map<string, unknown>(); |
| 13 | + alarm: number | undefined; |
| 14 | + |
| 15 | + readonly sql = { |
| 16 | + exec: () => [], |
| 17 | + }; |
| 18 | + |
| 19 | + async get<T>(key: string): Promise<T | undefined> { |
| 20 | + return this.data.get(key) as T | undefined; |
| 21 | + } |
| 22 | + |
| 23 | + async put(key: string, value: unknown): Promise<void> { |
| 24 | + this.data.set(key, value); |
| 25 | + } |
| 26 | + |
| 27 | + async setAlarm(time: number | Date): Promise<void> { |
| 28 | + this.alarm = typeof time === "number" ? time : time.getTime(); |
| 29 | + } |
| 30 | + |
| 31 | + async deleteAlarm(): Promise<void> { |
| 32 | + this.alarm = undefined; |
| 33 | + } |
| 34 | + |
| 35 | + async delete(key: string | readonly string[]): Promise<void> { |
| 36 | + if (typeof key === "string") { |
| 37 | + this.data.delete(key); |
| 38 | + return; |
| 39 | + } |
| 40 | + for (const entry of key) { |
| 41 | + this.data.delete(entry); |
| 42 | + } |
| 43 | + } |
| 44 | + |
| 45 | + async deleteAll(): Promise<void> { |
| 46 | + this.data.clear(); |
| 47 | + } |
| 48 | + |
| 49 | + async list<T>( |
| 50 | + options: { readonly prefix?: string; readonly limit?: number } = {}, |
| 51 | + ): Promise<Map<string, T>> { |
| 52 | + const rows = new Map<string, T>(); |
| 53 | + for (const [key, value] of this.data) { |
| 54 | + if (options.prefix && !key.startsWith(options.prefix)) continue; |
| 55 | + rows.set(key, value as T); |
| 56 | + if (options.limit && rows.size >= options.limit) break; |
| 57 | + } |
| 58 | + return rows; |
| 59 | + } |
| 60 | + |
| 61 | + async blockConcurrencyWhile<T>(callback: () => T | Promise<T>): Promise<T> { |
| 62 | + return callback(); |
| 63 | + } |
| 64 | + |
| 65 | + get id(): { readonly name: string } { |
| 66 | + return { name: "streamable-http:session-reconnect" }; |
| 67 | + } |
| 68 | + |
| 69 | + get storage(): MemoryStorage { |
| 70 | + return this; |
| 71 | + } |
| 72 | + |
| 73 | + waitUntil(_promise: Promise<unknown>): void {} |
| 74 | +} |
| 75 | + |
| 76 | +type HarnessSession = { |
| 77 | + alarm: () => Promise<void>; |
| 78 | + ctx: MemoryStorage; |
| 79 | + dbHandle: { readonly end: () => void } | null; |
| 80 | + engine: { readonly pausedExecutionCount: () => Effect.Effect<number> } | null; |
| 81 | + getSessionId: () => string; |
| 82 | + initialized: boolean; |
| 83 | + lastActivityMs: number; |
| 84 | + maxPausedSessionIdleMs: () => number; |
| 85 | + onStart: () => Promise<void>; |
| 86 | + pendingApprovalLeases: Map<string, never>; |
| 87 | + props: Record<string, unknown>; |
| 88 | + server?: McpServer; |
| 89 | + sessionMeta: SessionMeta; |
| 90 | + sessionTimeoutMs: () => number; |
| 91 | + validateMcpSessionOwner: (identity: { |
| 92 | + readonly accountId: string; |
| 93 | + readonly organizationId: string; |
| 94 | + }) => Promise<"ok" | "not_found" | "forbidden">; |
| 95 | +}; |
| 96 | + |
| 97 | +class StaleCloseTransport implements Transport { |
| 98 | + onclose?: () => void; |
| 99 | + onerror?: (error: Error) => void; |
| 100 | + onmessage?: (message: JSONRPCMessage, extra?: MessageExtraInfo) => void; |
| 101 | + |
| 102 | + async start(): Promise<void> {} |
| 103 | + |
| 104 | + async close(): Promise<void> {} |
| 105 | + |
| 106 | + async send(_message: JSONRPCMessage): Promise<void> {} |
| 107 | +} |
| 108 | + |
| 109 | +class RestoredTransport implements Transport { |
| 110 | + onclose?: () => void; |
| 111 | + onerror?: (error: Error) => void; |
| 112 | + onmessage?: (message: JSONRPCMessage, extra?: MessageExtraInfo) => void; |
| 113 | + |
| 114 | + async start(): Promise<void> {} |
| 115 | + |
| 116 | + async close(): Promise<void> { |
| 117 | + this.onclose?.(); |
| 118 | + } |
| 119 | + |
| 120 | + async send(_message: JSONRPCMessage): Promise<void> {} |
| 121 | +} |
| 122 | + |
| 123 | +const makeServer = () => new McpServer({ name: "executor-test", version: "1.0.0" }); |
| 124 | + |
| 125 | +const makeDeferred = (): { readonly promise: Promise<void>; readonly resolve: () => void } => { |
| 126 | + let resolve: () => void = () => undefined; |
| 127 | + const promise = new Promise<void>((settle) => { |
| 128 | + resolve = settle; |
| 129 | + }); |
| 130 | + return { promise, resolve }; |
| 131 | +}; |
| 132 | + |
| 133 | +const makeHarnessSession = async (): Promise<HarnessSession> => { |
| 134 | + const sessionId = "session-reconnect"; |
| 135 | + const sessionMeta: SessionMeta = { |
| 136 | + organizationId: "org-1", |
| 137 | + organizationName: "Org 1", |
| 138 | + userId: "user-1", |
| 139 | + resource: defaultMcpResource, |
| 140 | + }; |
| 141 | + const storage = new MemoryStorage(); |
| 142 | + const server = makeServer(); |
| 143 | + await server.connect(new StaleCloseTransport()); |
| 144 | + |
| 145 | + const session = Object.create(McpAgentSessionDOBase.prototype) as HarnessSession; |
| 146 | + session.ctx = storage; |
| 147 | + session.dbHandle = { end: () => undefined }; |
| 148 | + session.engine = { pausedExecutionCount: () => Effect.succeed(0) }; |
| 149 | + session.getSessionId = () => sessionId; |
| 150 | + session.initialized = true; |
| 151 | + session.lastActivityMs = Date.now() - 10; |
| 152 | + session.maxPausedSessionIdleMs = () => 1_000; |
| 153 | + session.pendingApprovalLeases = new Map<string, never>(); |
| 154 | + session.props = {}; |
| 155 | + session.server = server; |
| 156 | + session.sessionMeta = sessionMeta; |
| 157 | + session.sessionTimeoutMs = () => 1; |
| 158 | + session.onStart = async () => { |
| 159 | + const restored = session.server ?? makeServer(); |
| 160 | + session.server = restored; |
| 161 | + await restored.connect(new RestoredTransport()); |
| 162 | + session.initialized = true; |
| 163 | + }; |
| 164 | + |
| 165 | + return session; |
| 166 | +}; |
| 167 | + |
| 168 | +describe("McpAgentSessionDOBase transport restore", () => { |
| 169 | + it("restores a same-session request after idle disposal leaves a stale server transport", async () => { |
| 170 | + const session = await makeHarnessSession(); |
| 171 | + |
| 172 | + await session.alarm(); |
| 173 | + |
| 174 | + await expect( |
| 175 | + session.validateMcpSessionOwner({ accountId: "user-1", organizationId: "org-1" }), |
| 176 | + ).resolves.toBe("ok"); |
| 177 | + }); |
| 178 | + |
| 179 | + it("single-flights concurrent same-session restore after idle disposal", async () => { |
| 180 | + const session = await makeHarnessSession(); |
| 181 | + const firstRestoreEntered = makeDeferred(); |
| 182 | + const finishRestore = makeDeferred(); |
| 183 | + let onStartCalls = 0; |
| 184 | + let restoredServer: McpServer | undefined; |
| 185 | + |
| 186 | + session.onStart = async () => { |
| 187 | + onStartCalls += 1; |
| 188 | + const restored = session.server ?? makeServer(); |
| 189 | + restoredServer ??= restored; |
| 190 | + session.server = restored; |
| 191 | + firstRestoreEntered.resolve(); |
| 192 | + await finishRestore.promise; |
| 193 | + await restored.connect(new RestoredTransport()); |
| 194 | + session.initialized = true; |
| 195 | + }; |
| 196 | + |
| 197 | + await session.alarm(); |
| 198 | + |
| 199 | + const first = session.validateMcpSessionOwner({ |
| 200 | + accountId: "user-1", |
| 201 | + organizationId: "org-1", |
| 202 | + }); |
| 203 | + const second = session.validateMcpSessionOwner({ |
| 204 | + accountId: "user-1", |
| 205 | + organizationId: "org-1", |
| 206 | + }); |
| 207 | + |
| 208 | + await firstRestoreEntered.promise; |
| 209 | + await Promise.resolve(); |
| 210 | + finishRestore.resolve(); |
| 211 | + |
| 212 | + await expect(Promise.all([first, second])).resolves.toEqual(["ok", "ok"]); |
| 213 | + expect(onStartCalls).toBe(1); |
| 214 | + expect(session.server).toBe(restoredServer); |
| 215 | + }); |
| 216 | +}); |
0 commit comments