refactor(core): apply v1.5-port cleanups deferred from #1306 (#1316)

* refactor(core): apply v1.5-port cleanups deferred from #1306

Addresses issue #1309 — five small, mechanical cleanups deferred from the
v1.5 runtime port:

1. Collapse BrowserOAuthStorage / NodeOAuthStorage / RemoteOAuthStorage
   onto a shared OAuthStorageBase. Three ~130-line duplicates become
   thin adapter wrappers; behavior + public API unchanged.
2. Re-enable erasableSyntaxOnly in tsconfig.app.json by rewriting the
   seven (plus two the issue missed in sampling/elicitation create-
   message) parameter-property constructors as explicit field + assign.
3. Route the lone console.error in inspectorClient.ts through this.logger.
4. Replace `${Date.now()}-${Math.random()}` with crypto.randomUUID() at
   the five local-only ID sites (message tracking + sampling/elicit).
5. Pin the remote-server hono app generic at new Hono<Env>() and drop
   the streamSSE cast. Root cause of the cast was an unresolved hono
   subpath: the tsconfig "hono/*" wildcard didn't honor the exports
   map, so hono/streaming leaked to the root-hoisted hono@4.12.12 while
   hono itself resolved to clients/web/hono@4.12.18. Replaced the
   wildcard with an explicit hono/streaming entry in both tsconfig.app
   and tsconfig.test, removing the package-identity mismatch.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* refactor(core): address #1316 PR review feedback

- Drop the stranded no-op getServerState() read at the top of
  clearClientInformation in OAuthStorageBase (carried over verbatim
  from the three originals).
- Drop the crypto.randomUUID() guard at the task-ID site so all
  six in-scope sites are consistent; the fallback branch was dead
  code on every supported runtime.
- Remove the residual `c as Context` cast at the streamSSE call site
  in core/mcp/remote/node/server.ts — once both hono imports
  resolve to the same package the route-typed Context flows through
  to streamSSE with no cast at all.
- Move the new `options` / `config` field declarations in
  RemoteClientTransport up with the rest of the field block, matching
  the layout used by the other five rewritten classes in this PR.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Cliff Hall 2026-05-17 19:15:48 -04:00 • committed by GitHub
commit 82269e78cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 236 additions and 449 deletions

View file

@ -29,14 +29,16 @@ export class ElicitationCreateMessage {
private resolvePromise?: (result: ElicitResult) => void;
/** Set only for task-augmented elicit; used when user declines so server's tasks/result receives an error */
private rejectCallback?: (error: Error) => void;
private onRemove: (id: string) => void;
constructor(
request: ElicitRequest,
resolve: (result: ElicitResult) => void,
private onRemove: (id: string) => void,
onRemove: (id: string) => void,
reject?: (error: Error) => void,
) {
this.id = `elicitation-${Date.now()}-${Math.random()}`;
this.onRemove = onRemove;
this.id = `elicitation-${crypto.randomUUID()}`;
this.timestamp = new Date();
this.request = request;
// Extract taskId from request params metadata if present

View file

@ -174,12 +174,14 @@ export class InspectorClient extends InspectorClientEventTarget {
private effectiveAuthFetch: typeof fetch;
// Session ID (for OAuth state and saveSession event; persistence is in FetchRequestLogState)
private sessionId?: string;
private transportConfig: MCPServerConfig;
constructor(
private transportConfig: MCPServerConfig,
transportConfig: MCPServerConfig,
options: InspectorClientOptions,
) {
super();
this.transportConfig = transportConfig;
// Extract environment components
this.transportClientFactory = options.environment.transport;
this.fetchFn = options.environment.fetch;
@ -309,7 +311,7 @@ export class InspectorClient extends InspectorClientEventTarget {
return {
trackRequest: (message: JSONRPCRequest) => {
const entry: MessageEntry = {
id: `${Date.now()}-${Math.random()}`,
id: crypto.randomUUID(),
timestamp: new Date(),
direction: "request",
message,
@ -320,7 +322,7 @@ export class InspectorClient extends InspectorClientEventTarget {
message: JSONRPCResultResponse | JSONRPCErrorResponse,
) => {
const entry: MessageEntry = {
id: `${Date.now()}-${Math.random()}`,
id: crypto.randomUUID(),
timestamp: new Date(),
direction: "response",
message,
@ -329,7 +331,7 @@ export class InspectorClient extends InspectorClientEventTarget {
},
trackNotification: (message: JSONRPCNotification) => {
const entry: MessageEntry = {
id: `${Date.now()}-${Math.random()}`,
id: crypto.randomUUID(),
timestamp: new Date(),
direction: "notification",
message,
@ -415,10 +417,7 @@ export class InspectorClient extends InspectorClientEventTarget {
statusMessage?: string;
pollInterval?: number;
}): ReceiverTaskRecord {
const taskId =
typeof crypto !== "undefined" && crypto.randomUUID
? crypto.randomUUID()
: `task-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
const taskId = crypto.randomUUID();
const ttlMs =
opts.ttl ??
(typeof this.receiverTaskTtlMs === "function"
@ -1962,7 +1961,10 @@ export class InspectorClient extends InspectorClientEventTarget {
});
} catch (error) {
// Log but don't throw - roots were updated locally even if notification failed
console.error("Failed to send roots/list_changed notification:", error);
this.logger.error(
{ error },
"Failed to send roots/list_changed notification",
);
}
}

View file

@ -23,10 +23,16 @@ export interface MessageTrackingCallbacks {
// Transport wrapper that intercepts all messages for tracking
export class MessageTrackingTransport implements Transport {
private baseTransport: Transport;
private callbacks: MessageTrackingCallbacks;
constructor(
private baseTransport: Transport,
private callbacks: MessageTrackingCallbacks,
) {}
baseTransport: Transport,
callbacks: MessageTrackingCallbacks,
) {
this.baseTransport = baseTransport;
this.callbacks = callbacks;
}
async start(): Promise<void> {
return this.baseTransport.start();

View file

@ -41,11 +41,13 @@ export interface OAuthManagerParams {
* InspectorClient creates this when oauth is configured and delegates all OAuth methods.
*/
export class OAuthManager {
private params: OAuthManagerParams;
private oauthConfig: OAuthManagerConfig;
private oauthStateMachine: OAuthStateMachine | null = null;
private oauthState: AuthGuidedState | null = null;
constructor(private params: OAuthManagerParams) {
constructor(params: OAuthManagerParams) {
this.params = params;
this.oauthConfig = { ...params.initialConfig };
}

View file

@ -17,7 +17,7 @@ import {
} from "../../../storage/store-io.js";
import type { LogEvent } from "pino";
import { Hono } from "hono";
import type { Context, Next } from "hono";
import type { Context, Env, Next } from "hono";
import { streamSSE } from "hono/streaming";
import { createTransportNode } from "../../node/transport.js";
import type { RemoteConnectRequest, RemoteSendRequest } from "../types.js";
@ -277,7 +277,7 @@ export function createRemoteApp(
process.env[API_SERVER_ENV_VARS.AUTH_TOKEN] ||
randomBytes(32).toString("hex");
const app = new Hono();
const app = new Hono<Env>();
const sessions = new Map<string, RemoteSession>();
const { logger: fileLogger, allowedOrigins } = options;
const storageDir = options.storageDir ?? getDefaultStorageDir();
@ -453,9 +453,7 @@ export function createRemoteApp(
return c.json({ error: "Session not found" }, 404);
}
// hono's streamSSE generic typing has tightened since v1.5; cast the
// route-typed Context down to the broader Context shape it expects.
return streamSSE(c as unknown as Parameters<typeof streamSSE>[0], async (stream) => {
return streamSSE(c, async (stream) => {
session.setEventConsumer((event) => {
const data = JSON.stringify(event);
void stream.writeSSE({

View file

@ -99,6 +99,8 @@ export class RemoteClientTransport implements Transport {
null;
private eventStreamAbort: AbortController | null = null;
private closed = false;
private readonly options: RemoteTransportOptions;
private readonly config: import("../types.js").MCPServerConfig;
/**
* Intentionally returns undefined. The MCP Client checks transport.sessionId to detect
@ -112,9 +114,12 @@ export class RemoteClientTransport implements Transport {
}
constructor(
private readonly options: RemoteTransportOptions,
private readonly config: import("../types.js").MCPServerConfig,
) {}
options: RemoteTransportOptions,
config: import("../types.js").MCPServerConfig,
) {
this.options = options;
this.config = config;
}
private get fetchFn(): typeof fetch {
return this.options.fetchFn ?? globalThis.fetch;

View file

@ -28,14 +28,16 @@ export class SamplingCreateMessage {
public readonly taskId?: string;
private resolvePromise?: (result: CreateMessageResult) => void;
private rejectPromise?: (error: Error) => void;
private onRemove: (id: string) => void;
constructor(
request: CreateMessageRequest,
resolve: (result: CreateMessageResult) => void,
reject: (error: Error) => void,
private onRemove: (id: string) => void,
onRemove: (id: string) => void,
) {
this.id = `sampling-${Date.now()}-${Math.random()}`;
this.onRemove = onRemove;
this.id = `sampling-${crypto.randomUUID()}`;
this.timestamp = new Date();
this.request = request;
// Extract taskId from request params metadata if present