starpc 0.49.2 → 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.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

@@ -3,7 +3,7 @@ module github.com/aperturerobotics/starpc
 go 1.25.0
 
 require (
-	github.com/aperturerobotics/common v0.32.1 // latest
+	github.com/aperturerobotics/common v0.32.2 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.12.2 // latest
 	github.com/aperturerobotics/util v1.33.0 // latest
 )

package/go.sum

@@ -2,8 +2,8 @@ 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.1 h1:pvmmDBttGnQM5HBoe8T1xHeHmFg2L7ecPZjx1oHLIX0=
-github.com/aperturerobotics/common v0.32.1/go.mod h1:6I+CZvcNEXf7Abd0tFVbMgOJ/pFE8C4qlYG9KZvBAnc=
+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=

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.49.2",
+  "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 --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'",

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.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)
+  })
 })