Address review feedback: move getDefaultServerParameters to test file

- Moved getDefaultServerParameters from stdio.ts to stdio.test.ts since it's only used in tests
- Reverted unrelated changes to inMemory.ts and inMemory.test.ts
- Kept the core Windows compatibility fix for stdio tests

Co-authored-by: HoberMin <99346635+HoberMin@users.noreply.github.com>
This commit is contained in:
Felix Weinberger 2025-07-08 15:15:50 +01:00
commit 88ede3783e
No known key found for this signature in database
4 changed files with 13 additions and 109 deletions

View file

@ -1,5 +1,14 @@
import { JSONRPCMessage } from "../types.js";
import { StdioClientTransport, getDefaultServerParameters } from "./stdio.js";
import { StdioClientTransport, StdioServerParameters } from "./stdio.js";
// Configure default server parameters based on OS
// Uses 'more' command for Windows and 'tee' command for Unix/Linux
const getDefaultServerParameters = (): StdioServerParameters => {
if (process.platform === "win32") {
return { command: "more" };
}
return { command: "/usr/bin/tee" };
};
const serverParameters = getDefaultServerParameters();

View file

@ -39,15 +39,6 @@ export type StdioServerParameters = {
cwd?: string;
};
// Configure default server parameters based on OS
// Uses 'more' command for Windows and 'tee' command for Unix/Linux
export const getDefaultServerParameters = (): StdioServerParameters => {
if (process.platform === "win32") {
return { command: "more" };
}
return { command: "/usr/bin/tee" };
};
/**
* Environment variables to inherit by default, if an environment is not explicitly given.
*/

View file

@ -96,43 +96,10 @@ describe("InMemoryTransport", () => {
});
test("should throw error when sending after close", async () => {
const [client, server] = InMemoryTransport.createLinkedPair();
let clientError: Error | undefined;
let serverError: Error | undefined;
client.onerror = (err) => {
clientError = err;
};
server.onerror = (err) => {
serverError = err;
};
await client.close();
// Attempt to send message from client
await clientTransport.close();
await expect(
client.send({
jsonrpc: "2.0",
method: "test",
id: 1,
}),
clientTransport.send({ jsonrpc: "2.0", method: "test", id: 1 }),
).rejects.toThrow("Not connected");
// Attempt to send message from server
await expect(
server.send({
jsonrpc: "2.0",
method: "test",
id: 2,
}),
).rejects.toThrow("Not connected");
// Verify that both sides received errors
expect(clientError).toBeDefined();
expect(clientError?.message).toBe("Not connected");
expect(serverError).toBeDefined();
expect(serverError?.message).toBe("Not connected");
});
test("should queue messages sent before start", async () => {
@ -151,65 +118,4 @@ describe("InMemoryTransport", () => {
await serverTransport.start();
expect(receivedMessage).toEqual(message);
});
describe("error handling", () => {
test("should trigger onerror when sending without connection", async () => {
const transport = new InMemoryTransport();
let error: Error | undefined;
transport.onerror = (err) => {
error = err;
};
await expect(
transport.send({
jsonrpc: "2.0",
method: "test",
id: 1,
}),
).rejects.toThrow("Not connected");
expect(error).toBeDefined();
expect(error?.message).toBe("Not connected");
});
test("should trigger onerror when sending after close", async () => {
const [client, server] = InMemoryTransport.createLinkedPair();
let clientError: Error | undefined;
let serverError: Error | undefined;
client.onerror = (err) => {
clientError = err;
};
server.onerror = (err) => {
serverError = err;
};
await client.close();
// Attempt to send message from client
await expect(
client.send({
jsonrpc: "2.0",
method: "test",
id: 1,
}),
).rejects.toThrow("Not connected");
// Attempt to send message from server
await expect(
server.send({
jsonrpc: "2.0",
method: "test",
id: 2,
}),
).rejects.toThrow("Not connected");
// Verify that both sides received errors
expect(clientError?.message).toBe("Not connected");
expect(serverError).toBeDefined();
expect(serverError?.message).toBe("Not connected");
});
});
});

View file

@ -51,9 +51,7 @@ export class InMemoryTransport implements Transport {
*/
async send(message: JSONRPCMessage, options?: { relatedRequestId?: RequestId, authInfo?: AuthInfo }): Promise<void> {
if (!this._otherTransport) {
const error = new Error("Not connected");
this.onerror?.(error);
throw error;
throw new Error("Not connected");
}
if (this._otherTransport.onmessage) {