starpc 0.49.1 → 0.49.3

package/dist/echo/echo_srpc.pb.d.ts

@@ -9,7 +9,7 @@ import { MessageStream, ProtoRpc } from 'starpc';
  * @generated from service echo.Echoer
  */
 export declare const EchoerDefinition: {
-    readonly typeName: "echo.Echoer";
+    readonly typeName: 'echo.Echoer';
     readonly methods: {
         /**
          * Echo returns the given message.
@@ -17,7 +17,7 @@ export declare const EchoerDefinition: {
          * @generated from rpc echo.Echoer.Echo
          */
         readonly Echo: {
-            readonly name: "Echo";
+            readonly name: 'Echo';
             readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.Unary;
@@ -28,7 +28,7 @@ export declare const EchoerDefinition: {
          * @generated from rpc echo.Echoer.EchoServerStream
          */
         readonly EchoServerStream: {
-            readonly name: "EchoServerStream";
+            readonly name: 'EchoServerStream';
             readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.ServerStreaming;
@@ -39,7 +39,7 @@ export declare const EchoerDefinition: {
          * @generated from rpc echo.Echoer.EchoClientStream
          */
         readonly EchoClientStream: {
-            readonly name: "EchoClientStream";
+            readonly name: 'EchoClientStream';
             readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.ClientStreaming;
@@ -50,7 +50,7 @@ export declare const EchoerDefinition: {
          * @generated from rpc echo.Echoer.EchoBidiStream
          */
         readonly EchoBidiStream: {
-            readonly name: "EchoBidiStream";
+            readonly name: 'EchoBidiStream';
             readonly I: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly O: import("@aptre/protobuf-es-lite").MessageType<EchoMsg>;
             readonly kind: MethodKind.BiDiStreaming;
@@ -61,7 +61,7 @@ export declare const EchoerDefinition: {
          * @generated from rpc echo.Echoer.RpcStream
          */
         readonly RpcStream: {
-            readonly name: "RpcStream";
+            readonly name: 'RpcStream';
             readonly I: import("@aptre/protobuf-es-lite").MessageType<RpcStreamPacket>;
             readonly O: import("@aptre/protobuf-es-lite").MessageType<RpcStreamPacket>;
             readonly kind: MethodKind.BiDiStreaming;
@@ -72,7 +72,7 @@ export declare const EchoerDefinition: {
          * @generated from rpc echo.Echoer.DoNothing
          */
         readonly DoNothing: {
-            readonly name: "DoNothing";
+            readonly name: 'DoNothing';
             readonly I: import("@aptre/protobuf-es-lite").MessageType<Empty>;
             readonly O: import("@aptre/protobuf-es-lite").MessageType<Empty>;
             readonly kind: MethodKind.Unary;

package/dist/mock/mock_srpc.pb.d.ts

@@ -7,7 +7,7 @@ import { ProtoRpc } from 'starpc';
  * @generated from service e2e.mock.Mock
  */
 export declare const MockDefinition: {
-    readonly typeName: "e2e.mock.Mock";
+    readonly typeName: 'e2e.mock.Mock';
     readonly methods: {
         /**
          * MockRequest runs a mock unary request.
@@ -15,7 +15,7 @@ export declare const MockDefinition: {
          * @generated from rpc e2e.mock.Mock.MockRequest
          */
         readonly MockRequest: {
-            readonly name: "MockRequest";
+            readonly name: 'MockRequest';
             readonly I: import("@aptre/protobuf-es-lite").MessageType<MockMsg>;
             readonly O: import("@aptre/protobuf-es-lite").MessageType<MockMsg>;
             readonly kind: MethodKind.Unary;

package/dist/srpc/channel.d.ts

@@ -31,6 +31,7 @@ export declare class ChannelStream<T = Uint8Array> implements Duplex<AsyncGenera
     private _remoteAck?;
     private keepAlive?;
     private idleWatchdog?;
+    private closed;
     get isAcked(): boolean;
     get isOpen(): boolean;
     get isIdlePaused(): boolean;
@@ -38,6 +39,7 @@ export declare class ChannelStream<T = Uint8Array> implements Duplex<AsyncGenera
     private postMessage;
     private idleElapsed;
     private keepAliveElapsed;
+    private finish;
     close(error?: Error): void;
     pauseIdle(): void;
     resumeIdle(): void;

package/dist/srpc/channel.js

@@ -37,6 +37,8 @@ export class ChannelStream {
     keepAlive;
     // idleWatchdog is the receive timeout watchdog.
     idleWatchdog;
+    // closed indicates the local channel has been torn down.
+    closed = false;
     // isAcked checks if the stream is acknowledged by the remote.
     get isAcked() {
         return this.remoteAck ?? false;
@@ -114,6 +116,9 @@ export class ChannelStream {
     }
     // postMessage writes a message to the stream.
     postMessage(msg) {
+        if (this.closed) {
+            return;
+        }
         msg.from = this.localId;
         if (this.channel instanceof MessagePort) {
             this.channel.postMessage(msg);
@@ -139,23 +144,37 @@ export class ChannelStream {
             this.postMessage({});
         }
     }
-    // close closes the broadcast channels.
-    close(error) {
-        // write a message to indicate the stream is now closed.
-        this.postMessage({ closed: true, error });
+    // finish tears down local stream state, optionally notifying the remote side.
+    finish(error, notifyRemote) {
+        if (this.closed) {
+            return;
+        }
+        if (notifyRemote) {
+            try {
+                this.postMessage({ closed: true, error });
+            }
+            catch {
+                // Ignore close races while tearing down the local channel.
+            }
+        }
+        this.closed = true;
         // close channels
         if (this.channel instanceof MessagePort) {
+            this.channel.onmessage = null;
             this.channel.close();
         }
         else {
+            this.channel.rx.onmessage = null;
             this.channel.tx.close();
             this.channel.rx.close();
         }
         if (!this.remoteOpen && this._remoteOpen) {
             this._remoteOpen(error || new Error('closed'));
+            delete this._remoteOpen;
         }
         if (!this.remoteAck && this._remoteAck) {
             this._remoteAck(error || new Error('closed'));
+            delete this._remoteAck;
         }
         if (this.idleWatchdog) {
             this.idleWatchdog.clear();
@@ -167,6 +186,10 @@ export class ChannelStream {
         }
         this._source.end(error);
     }
+    // close closes the broadcast channels.
+    close(error) {
+        this.finish(error, true);
+    }
     // pauseIdle pauses the idle watchdog, preventing the stream from timing out.
     // Use this when the remote is known to be inactive (e.g., browser tab hidden).
     pauseIdle() {
@@ -236,10 +259,11 @@ export class ChannelStream {
             this._source.push(data);
         }
         if (err) {
-            this._source.end(err);
+            this.finish(err, false);
+            return;
         }
-        else if (closed) {
-            this._source.end();
+        if (closed) {
+            this.finish(undefined, false);
         }
     }
 }

package/dist/srpc/client.js

@@ -81,13 +81,17 @@ export class Client {
         const openStreamFn = await this.openStreamCtr.wait();
         const stream = await openStreamFn();
         const call = new ClientRPC(rpcService, rpcMethod);
-        abortSignal?.addEventListener('abort', () => {
+        const onAbort = () => {
             call.writeCallCancel();
             call.close(new Error(ERR_RPC_ABORT));
-        });
+        };
+        abortSignal?.addEventListener('abort', onAbort, { once: true });
         pipe(stream, decodePacketSource, call, encodePacketSource, stream)
             .catch((err) => call.close(err))
-            .then(() => call.close());
+            .then(() => call.close())
+            .finally(() => {
+            abortSignal?.removeEventListener('abort', onAbort);
+        });
         await call.writeCallStart(data ?? undefined);
         return call;
     }

package/dist/srpc/packet.d.ts

@@ -3,14 +3,14 @@ import { Source, Transform } from 'it-stream-types';
 import { Packet } from './rpcproto.pb.js';
 export declare const decodePacketSource: import("./message.js").DecodeMessageTransform<Packet>;
 export declare const encodePacketSource: import("./message.js").EncodeMessageTransform<Packet>;
-export declare const uint32LEDecode: {
-    (data: Uint8ArrayList): number;
-    bytes: number;
-};
-export declare const uint32LEEncode: {
-    (value: number): Uint8ArrayList;
-    bytes: number;
-};
+export declare function uint32LEDecode(data: Uint8ArrayList): number;
+export declare namespace uint32LEDecode {
+    var bytes: number;
+}
+export declare function uint32LEEncode(value: number): Uint8ArrayList;
+export declare namespace uint32LEEncode {
+    var bytes: number;
+}
 export declare function lengthPrefixEncode(source: Source<Uint8Array | Uint8ArrayList>, lengthEncoder: typeof uint32LEEncode): AsyncGenerator<Uint8ArrayList, void, unknown>;
 export declare function lengthPrefixDecode(source: Source<Uint8Array | Uint8ArrayList>, lengthDecoder: typeof uint32LEDecode): AsyncGenerator<Uint8ArrayList, void, unknown>;
 export declare function prependLengthPrefixTransform(lengthEncoder?: {

package/dist/srpc/server.d.ts

@@ -1,12 +1,11 @@
 import { LookupMethod } from './mux.js';
 import { ServerRPC } from './server-rpc.js';
 import type { StreamHandler } from './conn.js';
-import { PacketStream } from './stream.js';
-import { RpcStreamHandler } from '../rpcstream/rpcstream.js';
+import { HandleStreamFunc, PacketStream } from './stream.js';
 export declare class Server implements StreamHandler {
     private lookupMethod;
     constructor(lookupMethod: LookupMethod);
-    get rpcStreamHandler(): RpcStreamHandler;
+    get rpcStreamHandler(): HandleStreamFunc;
     startRpc(): ServerRPC;
     handlePacketStream(stream: PacketStream): ServerRPC;
 }

package/dist/srpc/server.test.js

@@ -1,7 +1,7 @@
-import { describe, it, beforeEach } from 'vitest';
+import { describe, it, beforeEach, expect, vi } from 'vitest';
 import { pipe } from 'it-pipe';
 import { createHandler, createMux, Server, Client, StreamConn, ChannelStream, combineUint8ArrayListTransform, } from '../srpc/index.js';
-import { EchoerDefinition, EchoerServer, runClientTest } from '../echo/index.js';
+import { EchoerDefinition, EchoerServer, EchoerServiceName, runClientTest, } from '../echo/index.js';
 import { runAbortControllerTest, runRpcStreamTest, } from '../echo/client-test.js';
 describe('srpc server', () => {
     let client;
@@ -39,4 +39,24 @@ describe('srpc server', () => {
     it('should pass rpc stream tests', async () => {
         await runRpcStreamTest(client);
     });
+    it('removes abort listeners after a request completes', async () => {
+        const controller = new AbortController();
+        const removeEventListener = vi.spyOn(controller.signal, 'removeEventListener');
+        await client.request(EchoerServiceName, 'Echo', new TextEncoder().encode('hello'), controller.signal);
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        expect(removeEventListener).toHaveBeenCalledWith('abort', expect.any(Function));
+    });
+    it('tears down passive channel close state', async () => {
+        const { port1, port2 } = new MessageChannel();
+        const opts = { idleTimeoutMs: 1000, keepAliveMs: 1000 };
+        const active = new ChannelStream('active', port1, opts);
+        const passive = new ChannelStream('passive', port2, opts);
+        const next = passive.source[Symbol.asyncIterator]().next();
+        active.close();
+        await expect(next).resolves.toEqual({ done: true, value: undefined });
+        expect(passive.closed).toBe(true);
+        expect(passive.idleWatchdog).toBeUndefined();
+        expect(passive.keepAlive).toBeUndefined();
+        expect(port2.onmessage).toBe(null);
+    });
 });

package/go.mod

@@ -1,23 +1,23 @@
 module github.com/aperturerobotics/starpc
 
-go 1.25
+go 1.25.0
 
 require (
-	github.com/aperturerobotics/common v0.32.0 // latest
+	github.com/aperturerobotics/common v0.32.2 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.12.2 // latest
-	github.com/aperturerobotics/util v1.32.5 // latest
+	github.com/aperturerobotics/util v1.33.0 // latest
 )
 
 require (
 	github.com/aperturerobotics/abseil-cpp v0.0.0-20260131110040-4bb56e2f9017 // aperture-2
 	github.com/aperturerobotics/cli v1.1.0 // indirect
-	github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260219012250-c573f70e4509 // indirect
+	github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260329113540-600516012db3 // indirect
 	github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 // indirect
 	github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 // wasi
 )
 
 require (
-	github.com/aperturerobotics/go-websocket v1.8.15-0.20260228132212-c5f88237fdf8 // master
+	github.com/aperturerobotics/go-websocket v1.8.15-0.20260329113544-74dbfb8f11c6 // master
 	github.com/libp2p/go-yamux/v4 v4.0.2 // latest
 	github.com/pkg/errors v0.9.1 // latest
 	github.com/sirupsen/logrus v1.9.5-0.20260309202648-9f0600962f75 // latest
@@ -25,10 +25,10 @@ require (
 )
 
 require (
-	github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260219012250-e75aa9f430a2 // indirect
+	github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260329113538-218ccd8f20e0 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/tetratelabs/wazero v1.11.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
-	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/mod v0.34.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
 )

package/go.sum

@@ -2,22 +2,22 @@ github.com/aperturerobotics/abseil-cpp v0.0.0-20260131110040-4bb56e2f9017 h1:3U7
 github.com/aperturerobotics/abseil-cpp v0.0.0-20260131110040-4bb56e2f9017/go.mod h1:lNSJTKECIUFAnfeSqy01kXYTYe1BHubW7198jNX3nEw=
 github.com/aperturerobotics/cli v1.1.0 h1:7a+YRC+EY3npAnTzhHV5gLCiw91KS0Ts3XwLILGOsT8=
 github.com/aperturerobotics/cli v1.1.0/go.mod h1:M7BFP9wow5ytTzMyJQOOO991fGfsUqdTI7gGEsHfTQ8=
-github.com/aperturerobotics/common v0.32.0 h1:wKKKUMGs8HZC2exPGVNtj81zqW687mf/rhSbme45CFs=
-github.com/aperturerobotics/common v0.32.0/go.mod h1:m46OxaMDdhPjsWBSdIwkPPCmuFVMuJiRc8/DvC0wStM=
-github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260219012250-e75aa9f430a2 h1:DbLHhYu2wdFvwQ02KE3rxBE1vSc+ecMxLEyTwv8Ci00=
-github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260219012250-e75aa9f430a2/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
-github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260219012250-c573f70e4509 h1:2O8djle14ujtze1xQb9MVXAdEepumxhoBJPEdf+kNnA=
-github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260219012250-c573f70e4509/go.mod h1:vEq8i7EKb32+KXGtIEZjjhNns+BdsL2dUMw4uhy3578=
-github.com/aperturerobotics/go-websocket v1.8.15-0.20260228132212-c5f88237fdf8 h1:OWYqCKoDoPGXgkD1y465qb8L5odv3nGabeN9wF50GxU=
-github.com/aperturerobotics/go-websocket v1.8.15-0.20260228132212-c5f88237fdf8/go.mod h1:9KnSGuqxSXbdB/Oi0I6vvfPLkclfJwMGAQaDDGVgGow=
+github.com/aperturerobotics/common v0.32.2 h1:YAZfvBphNxGTF7x+O/e7UIFw8cCf5Pog6ptw7Y+PjTU=
+github.com/aperturerobotics/common v0.32.2/go.mod h1:6glNxt6cEYab10WAVT4tOGhwgvDG2fnUMSyKuKZg02Y=
+github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260329113538-218ccd8f20e0 h1:6/3RSSlPEQ6LeidslB1ZCJkxW+MnfYDkvdWMDklDXw4=
+github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260329113538-218ccd8f20e0/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
+github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260329113540-600516012db3 h1:lp+V8RYcBwTX1p81swkpZn5fhw1wn2xLorzETIxRyZQ=
+github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260329113540-600516012db3/go.mod h1:vEq8i7EKb32+KXGtIEZjjhNns+BdsL2dUMw4uhy3578=
+github.com/aperturerobotics/go-websocket v1.8.15-0.20260329113544-74dbfb8f11c6 h1:Utc1F7jdCc6/HrwwIikJFXt/hXxkWIWETLp/CsG6Gl0=
+github.com/aperturerobotics/go-websocket v1.8.15-0.20260329113544-74dbfb8f11c6/go.mod h1:9KnSGuqxSXbdB/Oi0I6vvfPLkclfJwMGAQaDDGVgGow=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 h1:4B1F0DzuqPzb6WqgCjWaqDD7JU9RDsevQG5OP0DFBgs=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726/go.mod h1:SvGGBv3OVxUyqO0ZxA/nvs6z3cg7NIbZ64TnbV2OISo=
 github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 h1:4Dy3BAHh2kgVdHAqtlwcFsgY0kAwUe2m3rfFcaGwGQg=
 github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4/go.mod h1:tMgO7y6SJo/d9ZcvrpNqIQtdYT9de+QmYaHOZ4KnhOg=
 github.com/aperturerobotics/protobuf-go-lite v0.12.2 h1:ujwTKgpIYAVsv8VljB6PPMY5SI8i8m/NlIHAkkuxQcU=
 github.com/aperturerobotics/protobuf-go-lite v0.12.2/go.mod h1:lGH3s5ArCTXKI4wJdlNpaybUtwSjfAG0vdWjxOfMcF8=
-github.com/aperturerobotics/util v1.32.5 h1:5gr2Ft1rYGFA5yrSm3n18Ghu5Al2uyg7DTtljh1wLHI=
-github.com/aperturerobotics/util v1.32.5/go.mod h1:jXVTz1OQqM3VSrjy06qiCmJLaUm80NxVuKgweaRs5dg=
+github.com/aperturerobotics/util v1.33.0 h1:l7Aql7rlFZaGPRS+lzFC7h0zuLE0WyR3nPVXgCYMW88=
+github.com/aperturerobotics/util v1.33.0/go.mod h1:FOKm51ZpgLsRszA4e7mjvqrt6J6Pju5GjSJg1Qz4Ouo=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -38,10 +38,10 @@ github.com/tetratelabs/wazero v1.11.0 h1:+gKemEuKCTevU4d7ZTzlsvgd1uaToIDtlQlmNbw
 github.com/tetratelabs/wazero v1.11.0/go.mod h1:eV28rsN8Q+xwjogd7f4/Pp4xFxO7uOGbLcD/LzB1wiU=
 github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 h1:FnBeRrxr7OU4VvAzt5X7s6266i6cSVkkFPS0TuXWbIg=
 github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
+golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
+golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

package/integration/cross-language/go-client/main.go

@@ -21,7 +21,7 @@ func main() {
 	addr := os.Args[1]
 
 	openStream := func(ctx context.Context, msgHandler srpc.PacketDataHandler, closeHandler srpc.CloseHandler) (srpc.PacketWriter, error) {
-		conn, err := net.Dial("tcp", addr)
+		conn, err := net.Dial("tcp", addr) //nolint:gosec
 		if err != nil {
 			return nil, err
 		}

package/integration/cross-language/run.bash

@@ -55,7 +55,7 @@ echo "Building TypeScript server/client..."
     --outfile="$SCRIPT_DIR/ts-client.mjs"
 
 echo "Building Rust server/client..."
-cargo build --release --bin integration-server --bin integration-client 2>&1 | grep -v "^warning:" || true
+cargo build --release -p echo-example --bin integration-server --bin integration-client
 
 echo "Vendoring Go dependencies (needed for C++ build)..."
 go mod vendor

package/integration/integration.go

@@ -1,3 +1,5 @@
+//go:build !js
+
 package main
 
 import (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.49.1",
+  "version": "0.49.3",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -62,7 +62,7 @@
   },
   "scripts": {
     "clean": "rimraf ./dist",
-    "build": "bun run clean && tsc --project tsconfig.build.json --outDir ./dist/",
+    "build": "bun run clean && tsgo --outDir ./dist/",
     "check": "bun run typecheck",
     "typecheck": "tsgo --noEmit",
     "deps": "depcheck --ignores 'bufferutil,utf-8-validate,rimraf,starpc,@aptre/protobuf-es-lite,tsx'",
@@ -109,23 +109,23 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.56.1",
-    "@typescript-eslint/parser": "^8.56.1",
+    "@typescript-eslint/eslint-plugin": "^8.57.2",
+    "@typescript-eslint/parser": "^8.57.2",
     "depcheck": "^1.4.6",
-    "esbuild": "^0.27.3",
-    "eslint": "^10.0.2",
+    "esbuild": "^0.27.4",
+    "eslint": "^10.1.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-unused-imports": "^4.4.1",
-    "globals": "^17.0.0",
-    "happy-dom": "^20.7.0",
+    "globals": "^17.4.0",
+    "happy-dom": "^20.8.9",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
+    "lint-staged": "^16.4.0",
     "prettier": "^3.8.1",
     "rimraf": "^6.1.3",
     "tsx": "^4.20.4",
-    "typescript": "^5.8.2",
-    "@typescript/native-preview": "^7.0.0-dev.20260228.1",
-    "vitest": "^4.0.18"
+    "typescript": "^6.0.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260330.1",
+    "vitest": "^4.1.2"
   },
   "dependencies": {
     "@aptre/it-ws": "^1.1.2",
@@ -139,9 +139,6 @@
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.2",
     "uint8arraylist": "^2.4.7",
-    "ws": "^8.18.1"
-  },
-  "resolutions": {
-    "@aptre/protobuf-es-lite": "1.0.2"
+    "ws": "^8.20.0"
   }
 }

package/srpc/channel.ts

@@ -80,6 +80,8 @@ export class ChannelStream<T = Uint8Array> implements Duplex<
   private keepAlive?: Watchdog
   // idleWatchdog is the receive timeout watchdog.
   private idleWatchdog?: Watchdog
+  // closed indicates the local channel has been torn down.
+  private closed = false
 
   // isAcked checks if the stream is acknowledged by the remote.
   public get isAcked() {
@@ -168,6 +170,9 @@ export class ChannelStream<T = Uint8Array> implements Duplex<
 
   // postMessage writes a message to the stream.
   private postMessage(msg: Partial<ChannelStreamMessage<T>>) {
+    if (this.closed) {
+      return
+    }
     msg.from = this.localId
     if (this.channel instanceof MessagePort) {
       this.channel.postMessage(msg)
@@ -195,22 +200,35 @@ export class ChannelStream<T = Uint8Array> implements Duplex<
     }
   }
 
-  // close closes the broadcast channels.
-  public close(error?: Error) {
-    // write a message to indicate the stream is now closed.
-    this.postMessage({ closed: true, error })
+  // finish tears down local stream state, optionally notifying the remote side.
+  private finish(error?: Error, notifyRemote?: boolean) {
+    if (this.closed) {
+      return
+    }
+    if (notifyRemote) {
+      try {
+        this.postMessage({ closed: true, error })
+      } catch {
+        // Ignore close races while tearing down the local channel.
+      }
+    }
+    this.closed = true
     // close channels
     if (this.channel instanceof MessagePort) {
+      this.channel.onmessage = null
       this.channel.close()
     } else {
+      this.channel.rx.onmessage = null
       this.channel.tx.close()
       this.channel.rx.close()
     }
     if (!this.remoteOpen && this._remoteOpen) {
       this._remoteOpen(error || new Error('closed'))
+      delete this._remoteOpen
     }
     if (!this.remoteAck && this._remoteAck) {
       this._remoteAck(error || new Error('closed'))
+      delete this._remoteAck
     }
     if (this.idleWatchdog) {
       this.idleWatchdog.clear()
@@ -223,6 +241,11 @@ export class ChannelStream<T = Uint8Array> implements Duplex<
     this._source.end(error)
   }
 
+  // close closes the broadcast channels.
+  public close(error?: Error) {
+    this.finish(error, true)
+  }
+
   // pauseIdle pauses the idle watchdog, preventing the stream from timing out.
   // Use this when the remote is known to be inactive (e.g., browser tab hidden).
   public pauseIdle() {
@@ -298,9 +321,11 @@ export class ChannelStream<T = Uint8Array> implements Duplex<
       this._source.push(data)
     }
     if (err) {
-      this._source.end(err)
-    } else if (closed) {
-      this._source.end()
+      this.finish(err, false)
+      return
+    }
+    if (closed) {
+      this.finish(undefined, false)
     }
   }
 }

package/srpc/client.ts

@@ -116,13 +116,17 @@ export class Client implements ProtoRpc {
     const openStreamFn = await this.openStreamCtr.wait()
     const stream = await openStreamFn()
     const call = new ClientRPC(rpcService, rpcMethod)
-    abortSignal?.addEventListener('abort', () => {
+    const onAbort = () => {
       call.writeCallCancel()
       call.close(new Error(ERR_RPC_ABORT))
-    })
+    }
+    abortSignal?.addEventListener('abort', onAbort, { once: true })
     pipe(stream, decodePacketSource, call, encodePacketSource, stream)
       .catch((err) => call.close(err))
       .then(() => call.close())
+      .finally(() => {
+        abortSignal?.removeEventListener('abort', onAbort)
+      })
     await call.writeCallStart(data ?? undefined)
     return call
   }

package/srpc/server-http_js.go

@@ -10,7 +10,7 @@ import "errors"
 type HTTPServer struct{}
 
 // NewHTTPServer builds a http server / handler.
-func NewHTTPServer(mux Mux, path string) (*HTTPServer, error) {
+func NewHTTPServer(mux Mux, path string, websocketOpts any) (*HTTPServer, error) {
 	return nil, errors.New("srpc: http server not implemented on js")
 }
 

package/srpc/server.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, beforeEach } from 'vitest'
+import { describe, it, beforeEach, expect, vi } from 'vitest'
 import { pipe } from 'it-pipe'
 import {
   createHandler,
@@ -10,7 +10,12 @@ import {
   combineUint8ArrayListTransform,
   ChannelStreamOpts,
 } from '../srpc/index.js'
-import { EchoerDefinition, EchoerServer, runClientTest } from '../echo/index.js'
+import {
+  EchoerDefinition,
+  EchoerServer,
+  EchoerServiceName,
+  runClientTest,
+} from '../echo/index.js'
 import {
   runAbortControllerTest,
   runRpcStreamTest,
@@ -71,4 +76,41 @@ describe('srpc server', () => {
   it('should pass rpc stream tests', async () => {
     await runRpcStreamTest(client)
   })
+
+  it('removes abort listeners after a request completes', async () => {
+    const controller = new AbortController()
+    const removeEventListener = vi.spyOn(
+      controller.signal,
+      'removeEventListener',
+    )
+
+    await client.request(
+      EchoerServiceName,
+      'Echo',
+      new TextEncoder().encode('hello'),
+      controller.signal,
+    )
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    expect(removeEventListener).toHaveBeenCalledWith(
+      'abort',
+      expect.any(Function),
+    )
+  })
+
+  it('tears down passive channel close state', async () => {
+    const { port1, port2 } = new MessageChannel()
+    const opts: ChannelStreamOpts = { idleTimeoutMs: 1000, keepAliveMs: 1000 }
+    const active = new ChannelStream('active', port1, opts)
+    const passive = new ChannelStream('passive', port2, opts)
+    const next = passive.source[Symbol.asyncIterator]().next()
+
+    active.close()
+    await expect(next).resolves.toEqual({ done: true, value: undefined })
+
+    expect((passive as any).closed).toBe(true)
+    expect((passive as any).idleWatchdog).toBeUndefined()
+    expect((passive as any).keepAlive).toBeUndefined()
+    expect(port2.onmessage).toBe(null)
+  })
 })

package/srpc/server.ts

@@ -4,8 +4,7 @@ import { LookupMethod } from './mux.js'
 import { ServerRPC } from './server-rpc.js'
 import { decodePacketSource, encodePacketSource } from './packet.js'
 import type { StreamHandler } from './conn.js'
-import { PacketStream } from './stream.js'
-import { RpcStreamHandler } from '../rpcstream/rpcstream.js'
+import { HandleStreamFunc, PacketStream } from './stream.js'
 
 // Server implements the SRPC server in TypeScript with a Mux.
 export class Server implements StreamHandler {
@@ -18,7 +17,7 @@ export class Server implements StreamHandler {
 
   // rpcStreamHandler implements the RpcStreamHandler interface.
   // uses handlePacketDuplex (expects 1 buf = 1 Packet)
-  public get rpcStreamHandler(): RpcStreamHandler {
+  public get rpcStreamHandler(): HandleStreamFunc {
     return async (stream: PacketStream) => {
       const rpc = this.startRpc()
       return pipe(stream, decodePacketSource, rpc, encodePacketSource, stream)

package/integration/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "module": "system",
-    "noEmit": false,
-    "declaration": false
-  },
-  "include": [
-    "./"
-  ]
-}