Skip to content

refactor: use computed property names #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions src/client/sse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,33 @@ export class SSEClientTransport implements Transport {
private _requestInit?: RequestInit;
private _authProvider?: OAuthClientProvider;

onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage) => void;
protected _onclose?: Transport['onclose'];
protected _onerror?: Transport['onerror'];
protected _onmessage?: (message: JSONRPCMessage) => void;

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: SSEClientTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: SSEClientTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: SSEClientTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}

constructor(
url: URL,
Expand Down
31 changes: 28 additions & 3 deletions src/client/stdio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,34 @@ export class StdioClientTransport implements Transport {
private _serverParams: StdioServerParameters;
private _stderrStream: PassThrough | null = null;

onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage) => void;
protected _onclose?: Transport['onclose'];
protected _onerror?: Transport['onerror'];
protected _onmessage?: (message: JSONRPCMessage) => void;

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: StdioClientTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: StdioClientTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: StdioClientTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}


constructor(server: StdioServerParameters) {
this._serverParams = server;
Expand Down
30 changes: 27 additions & 3 deletions src/client/streamableHttp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,33 @@ export class StreamableHTTPClientTransport implements Transport {
private _sessionId?: string;
private _reconnectionOptions: StreamableHTTPReconnectionOptions;

onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage) => void;
protected _onclose?: Transport['onclose'];
protected _onerror?: Transport['onerror'];
protected _onmessage?: (message: JSONRPCMessage) => void;

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: StreamableHTTPClientTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: StreamableHTTPClientTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: StreamableHTTPClientTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}

constructor(
url: URL,
Expand Down
30 changes: 27 additions & 3 deletions src/client/websocket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,33 @@ export class WebSocketClientTransport implements Transport {
private _socket?: WebSocket;
private _url: URL;

onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage) => void;
protected _onclose?: Transport['onclose'];
protected _onerror?: Transport['onerror'];
protected _onmessage?: (message: JSONRPCMessage) => void;

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: WebSocketClientTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: WebSocketClientTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: WebSocketClientTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}

constructor(url: URL) {
this._url = url;
Expand Down
41 changes: 37 additions & 4 deletions src/inMemory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,43 @@ export class InMemoryTransport implements Transport {
private _otherTransport?: InMemoryTransport;
private _messageQueue: QueuedMessage[] = [];

onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage, extra?: { authInfo?: AuthInfo }) => void;
sessionId?: string;
protected _onclose?: Transport['onclose'];
protected _onerror?: Transport['onerror'];
protected _onmessage?: Transport['onmessage'];
protected _sessionId?: Transport['sessionId'];

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: InMemoryTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: InMemoryTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: InMemoryTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}

set sessionId(sessionId: InMemoryTransport['_sessionId']) {
this._sessionId = sessionId;
}

get sessionId() {
return this._sessionId;
}


/**
* Creates a pair of linked in-memory transports that can communicate with each other. One should be passed to a Client and one to a Server.
Expand Down
30 changes: 27 additions & 3 deletions src/server/sse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,33 @@ export class SSEServerTransport implements Transport {
private _sseResponse?: ServerResponse;
private _sessionId: string;

onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage, extra?: { authInfo?: AuthInfo }) => void;
protected _onclose?: Transport['onclose'];
protected _onerror?: Transport['onerror'];
protected _onmessage?: Transport['onmessage'];;

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: SSEServerTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: SSEServerTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: SSEServerTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}

/**
* Creates a new SSE server transport, which will direct the client to POST messages to the relative or absolute URL identified by `_endpoint`.
Expand Down
36 changes: 30 additions & 6 deletions src/server/stdio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,42 @@ export class StdioServerTransport implements Transport {
private _stdout: Writable = process.stdout,
) {}

onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage) => void;
protected _onclose?: Transport['onclose'];
protected _onerror: NonNullable<Transport['onerror']> = () => {};
protected _onmessage?: (message: JSONRPCMessage) => void;

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: StdioServerTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: StdioServerTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: StdioServerTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}

// Arrow functions to bind `this` properly, while maintaining function identity.
_ondata = (chunk: Buffer) => {
this._readBuffer.append(chunk);
this.processReadBuffer();
};
_onerror = (error: Error) => {
this.onerror?.(error);
};
// _onerror = (error: Error) => {
// this.onerror?.(error);
// };

/**
* Starts listening for messages on stdin.
Expand Down
41 changes: 37 additions & 4 deletions src/server/streamableHttp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,43 @@ export class StreamableHTTPServerTransport implements Transport {
private _eventStore?: EventStore;
private _onsessioninitialized?: (sessionId: string) => void;

sessionId?: string | undefined;
onclose?: () => void;
onerror?: (error: Error) => void;
onmessage?: (message: JSONRPCMessage) => void;
protected _onclose?: Transport['onclose'];
protected _onerror?: Transport['onerror'];
protected _onmessage?: (message: JSONRPCMessage) => void;
protected _sessionId?: Transport['sessionId'];

get onmessage() {
return this._onmessage;
}

set onmessage(onmessage: StreamableHTTPServerTransport['_onmessage']) {
this._onmessage = onmessage;
}

set onerror(onerror: StreamableHTTPServerTransport['_onerror']) {
this._onerror = onerror;
}

get onerror() {
return this._onerror;
}

set onclose(onclose: StreamableHTTPServerTransport['_onclose']) {
this._onclose = onclose;
}

get onclose() {
return this._onclose;
}

set sessionId(sessionId: StreamableHTTPServerTransport['_sessionId']) {
this._sessionId = sessionId;
}

get sessionId() {
return this._sessionId;
}


constructor(options: StreamableHTTPServerTransportOptions) {
this.sessionIdGenerator = options.sessionIdGenerator;
Expand Down
Loading