starpc 0.37.0 → 0.38.0

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

@@ -1,4 +1,4 @@
-import type { MessageType } from "@aptre/protobuf-es-lite";
+import type { MessageType } from '@aptre/protobuf-es-lite';
 export declare const protobufPackage = "echo";
 /**
  * EchoMsg is the message body for Echo.

package/dist/echo/echo.pb.js

@@ -1,14 +1,13 @@
 // @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
-import { createMessageType, ScalarType } from "@aptre/protobuf-es-lite";
-export const protobufPackage = "echo";
-;
+import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite';
+export const protobufPackage = 'echo';
 // EchoMsg contains the message type declaration for EchoMsg.
 export const EchoMsg = createMessageType({
-    typeName: "echo.EchoMsg",
+    typeName: 'echo.EchoMsg',
     fields: [
-        { no: 1, name: "body", kind: "scalar", T: ScalarType.STRING },
+        { no: 1, name: 'body', kind: 'scalar', T: ScalarType.STRING },
     ],
     packedByDefault: true,
 });

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

@@ -1,7 +1,7 @@
-import { EchoMsg } from "./echo.pb.js";
-import { Empty, MethodKind } from "@aptre/protobuf-es-lite";
-import { RpcStreamPacket } from "../rpcstream/rpcstream.pb.js";
-import { MessageStream, ProtoRpc } from "starpc";
+import { EchoMsg } from './echo.pb.js';
+import { Empty, MethodKind } from '@aptre/protobuf-es-lite';
+import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
+import { MessageStream, ProtoRpc } from 'starpc';
 /**
  * Echoer service returns the given message.
  *

package/dist/echo/echo_srpc.pb.js

@@ -1,17 +1,17 @@
 // @generated by protoc-gen-es-starpc none with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
-import { EchoMsg } from "./echo.pb.js";
-import { Empty, MethodKind } from "@aptre/protobuf-es-lite";
-import { RpcStreamPacket } from "../rpcstream/rpcstream.pb.js";
-import { buildDecodeMessageTransform, buildEncodeMessageTransform } from "starpc";
+import { EchoMsg } from './echo.pb.js';
+import { Empty, MethodKind } from '@aptre/protobuf-es-lite';
+import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
+import { buildDecodeMessageTransform, buildEncodeMessageTransform, } from 'starpc';
 /**
  * Echoer service returns the given message.
  *
  * @generated from service echo.Echoer
  */
 export const EchoerDefinition = {
-    typeName: "echo.Echoer",
+    typeName: 'echo.Echoer',
     methods: {
         /**
          * Echo returns the given message.
@@ -19,7 +19,7 @@ export const EchoerDefinition = {
          * @generated from rpc echo.Echoer.Echo
          */
         Echo: {
-            name: "Echo",
+            name: 'Echo',
             I: EchoMsg,
             O: EchoMsg,
             kind: MethodKind.Unary,
@@ -30,7 +30,7 @@ export const EchoerDefinition = {
          * @generated from rpc echo.Echoer.EchoServerStream
          */
         EchoServerStream: {
-            name: "EchoServerStream",
+            name: 'EchoServerStream',
             I: EchoMsg,
             O: EchoMsg,
             kind: MethodKind.ServerStreaming,
@@ -41,7 +41,7 @@ export const EchoerDefinition = {
          * @generated from rpc echo.Echoer.EchoClientStream
          */
         EchoClientStream: {
-            name: "EchoClientStream",
+            name: 'EchoClientStream',
             I: EchoMsg,
             O: EchoMsg,
             kind: MethodKind.ClientStreaming,
@@ -52,7 +52,7 @@ export const EchoerDefinition = {
          * @generated from rpc echo.Echoer.EchoBidiStream
          */
         EchoBidiStream: {
-            name: "EchoBidiStream",
+            name: 'EchoBidiStream',
             I: EchoMsg,
             O: EchoMsg,
             kind: MethodKind.BiDiStreaming,
@@ -63,7 +63,7 @@ export const EchoerDefinition = {
          * @generated from rpc echo.Echoer.RpcStream
          */
         RpcStream: {
-            name: "RpcStream",
+            name: 'RpcStream',
             I: RpcStreamPacket,
             O: RpcStreamPacket,
             kind: MethodKind.BiDiStreaming,
@@ -74,12 +74,12 @@ export const EchoerDefinition = {
          * @generated from rpc echo.Echoer.DoNothing
          */
         DoNothing: {
-            name: "DoNothing",
+            name: 'DoNothing',
             I: Empty,
             O: Empty,
             kind: MethodKind.Unary,
         },
-    }
+    },
 };
 export const EchoerServiceName = EchoerDefinition.typeName;
 export class EchoerClient {

package/dist/rpcstream/rpcstream.d.ts

@@ -2,12 +2,12 @@ import { Pushable } from 'it-pushable';
 import { Source, Sink } from 'it-stream-types';
 import { Message } from '@aptre/protobuf-es-lite';
 import { RpcStreamPacket } from './rpcstream.pb.js';
-import { OpenStreamFunc, PacketStream } from '../srpc/stream.js';
+import { OpenStreamFunc, PacketStream, HandleStreamFunc } from '../srpc/stream.js';
 import { MessageStream } from '../srpc/message.js';
 export type RpcStreamCaller = (request: MessageStream<RpcStreamPacket>) => MessageStream<RpcStreamPacket>;
 export declare function openRpcStream(componentId: string, caller: RpcStreamCaller, waitAck?: boolean): Promise<PacketStream>;
 export declare function buildRpcStreamOpenStream(componentId: string, caller: RpcStreamCaller): OpenStreamFunc;
-export type RpcStreamHandler = (stream: PacketStream) => Promise<void>;
+export type RpcStreamHandler = HandleStreamFunc;
 export type RpcStreamGetter = (componentId: string) => Promise<RpcStreamHandler | null>;
 export declare function handleRpcStream(packetRx: AsyncIterator<Message<RpcStreamPacket>>, getter: RpcStreamGetter): AsyncIterable<Message<RpcStreamPacket>>;
 export declare class RpcStream implements PacketStream {

package/dist/rpcstream/rpcstream.pb.d.ts

@@ -1,4 +1,4 @@
-import type { MessageType } from "@aptre/protobuf-es-lite";
+import type { MessageType } from '@aptre/protobuf-es-lite';
 export declare const protobufPackage = "rpcstream";
 /**
  * RpcStreamInit is the first message in a RPC stream.
@@ -48,7 +48,7 @@ export interface RpcStreamPacket {
          * @generated from field: rpcstream.RpcStreamInit init = 1;
          */
         value: RpcStreamInit;
-        case: "init";
+        case: 'init';
     } | {
         /**
          * Ack is sent in response to Init.
@@ -57,7 +57,7 @@ export interface RpcStreamPacket {
          * @generated from field: rpcstream.RpcAck ack = 2;
          */
         value: RpcAck;
-        case: "ack";
+        case: 'ack';
     } | {
         /**
          * Data is the encapsulated data packet.
@@ -65,7 +65,7 @@ export interface RpcStreamPacket {
          * @generated from field: bytes data = 3;
          */
         value: Uint8Array;
-        case: "data";
+        case: 'data';
     };
 }
 export declare const RpcStreamPacket: MessageType<RpcStreamPacket>;

package/dist/rpcstream/rpcstream.pb.js

@@ -1,34 +1,37 @@
 // @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/rpcstream/rpcstream.proto (package rpcstream, syntax proto3)
 /* eslint-disable */
-import { createMessageType, ScalarType } from "@aptre/protobuf-es-lite";
-export const protobufPackage = "rpcstream";
-;
+import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite';
+export const protobufPackage = 'rpcstream';
 // RpcStreamInit contains the message type declaration for RpcStreamInit.
 export const RpcStreamInit = createMessageType({
-    typeName: "rpcstream.RpcStreamInit",
+    typeName: 'rpcstream.RpcStreamInit',
     fields: [
-        { no: 1, name: "component_id", kind: "scalar", T: ScalarType.STRING },
+        { no: 1, name: 'component_id', kind: 'scalar', T: ScalarType.STRING },
     ],
     packedByDefault: true,
 });
-;
 // RpcAck contains the message type declaration for RpcAck.
 export const RpcAck = createMessageType({
-    typeName: "rpcstream.RpcAck",
+    typeName: 'rpcstream.RpcAck',
     fields: [
-        { no: 1, name: "error", kind: "scalar", T: ScalarType.STRING },
+        { no: 1, name: 'error', kind: 'scalar', T: ScalarType.STRING },
     ],
     packedByDefault: true,
 });
-;
 // RpcStreamPacket contains the message type declaration for RpcStreamPacket.
 export const RpcStreamPacket = createMessageType({
-    typeName: "rpcstream.RpcStreamPacket",
+    typeName: 'rpcstream.RpcStreamPacket',
     fields: [
-        { no: 1, name: "init", kind: "message", T: () => RpcStreamInit, oneof: "body" },
-        { no: 2, name: "ack", kind: "message", T: () => RpcAck, oneof: "body" },
-        { no: 3, name: "data", kind: "scalar", T: ScalarType.BYTES, oneof: "body" },
+        {
+            no: 1,
+            name: 'init',
+            kind: 'message',
+            T: () => RpcStreamInit,
+            oneof: 'body',
+        },
+        { no: 2, name: 'ack', kind: 'message', T: () => RpcAck, oneof: 'body' },
+        { no: 3, name: 'data', kind: 'scalar', T: ScalarType.BYTES, oneof: 'body' },
     ],
     packedByDefault: true,
 });

package/dist/srpc/handle-stream-ctr.d.ts

@@ -0,0 +1,6 @@
+import { HandleStreamFunc } from './stream.js';
+import { ValueCtr } from './value-ctr.js';
+export declare class HandleStreamCtr extends ValueCtr<HandleStreamFunc> {
+    constructor(handleStreamFn?: HandleStreamFunc);
+    get handleStreamFunc(): HandleStreamFunc;
+}

package/dist/srpc/handle-stream-ctr.js

@@ -0,0 +1,17 @@
+import { ValueCtr } from './value-ctr.js';
+// HandleStreamCtr contains an OpenStream func which can be awaited.
+export class HandleStreamCtr extends ValueCtr {
+    constructor(handleStreamFn) {
+        super(handleStreamFn);
+    }
+    // handleStreamFunc returns an HandleStreamFunc which waits for the underlying HandleStreamFunc.
+    get handleStreamFunc() {
+        return async (stream) => {
+            let handleFn = this.value;
+            if (!handleFn) {
+                handleFn = await this.wait();
+            }
+            return handleFn(stream);
+        };
+    }
+}

package/dist/srpc/index.d.ts

@@ -3,7 +3,7 @@ export { Client } from './client.js';
 export { Server } from './server.js';
 export { StreamConn, StreamConnParams, StreamHandler } from './conn.js';
 export { WebSocketConn } from './websocket.js';
-export type { PacketHandler, OpenStreamFunc, PacketStream, streamToPacketStream, } from './stream.js';
+export type { PacketHandler, OpenStreamFunc, HandleStreamFunc, PacketStream, streamToPacketStream, } from './stream.js';
 export { Handler, InvokeFn, MethodMap, StaticHandler, createHandler, } from './handler.js';
 export { MethodProto, createInvokeFn } from './invoker.js';
 export { Packet, CallStart, CallData } from './rpcproto.pb.js';
@@ -16,6 +16,7 @@ export { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketS
 export { combineUint8ArrayListTransform } from './array-list.js';
 export { ValueCtr } from './value-ctr.js';
 export { OpenStreamCtr } from './open-stream-ctr.js';
+export { HandleStreamCtr } from './handle-stream-ctr.js';
 export { writeToPushable, buildPushableSink, messagePushable, } from './pushable.js';
 export { Watchdog } from './watchdog.js';
 export { ProtoRpc } from './proto-rpc.js';

package/dist/srpc/index.js

@@ -15,5 +15,6 @@ export { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketS
 export { combineUint8ArrayListTransform } from './array-list.js';
 export { ValueCtr } from './value-ctr.js';
 export { OpenStreamCtr } from './open-stream-ctr.js';
+export { HandleStreamCtr } from './handle-stream-ctr.js';
 export { writeToPushable, buildPushableSink, messagePushable, } from './pushable.js';
 export { Watchdog } from './watchdog.js';

package/dist/srpc/rpcproto.pb.d.ts

@@ -1,4 +1,4 @@
-import type { MessageType } from "@aptre/protobuf-es-lite";
+import type { MessageType } from '@aptre/protobuf-es-lite';
 export declare const protobufPackage = "srpc";
 /**
  * CallStart requests starting a new RPC call.
@@ -89,7 +89,7 @@ export interface Packet {
          * @generated from field: srpc.CallStart call_start = 1;
          */
         value: CallStart;
-        case: "callStart";
+        case: 'callStart';
     } | {
         /**
          * CallData is a message in a streaming RPC sequence.
@@ -97,7 +97,7 @@ export interface Packet {
          * @generated from field: srpc.CallData call_data = 2;
          */
         value: CallData;
-        case: "callData";
+        case: 'callData';
     } | {
         /**
          * CallCancel cancels the call.
@@ -105,7 +105,7 @@ export interface Packet {
          * @generated from field: bool call_cancel = 3;
          */
         value: boolean;
-        case: "callCancel";
+        case: 'callCancel';
     };
 }
 export declare const Packet: MessageType<Packet>;

package/dist/srpc/rpcproto.pb.js

@@ -1,40 +1,55 @@
 // @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/srpc/rpcproto.proto (package srpc, syntax proto3)
 /* eslint-disable */
-import { createMessageType, ScalarType } from "@aptre/protobuf-es-lite";
-export const protobufPackage = "srpc";
-;
+import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite';
+export const protobufPackage = 'srpc';
 // CallStart contains the message type declaration for CallStart.
 export const CallStart = createMessageType({
-    typeName: "srpc.CallStart",
+    typeName: 'srpc.CallStart',
     fields: [
-        { no: 1, name: "rpc_service", kind: "scalar", T: ScalarType.STRING },
-        { no: 2, name: "rpc_method", kind: "scalar", T: ScalarType.STRING },
-        { no: 3, name: "data", kind: "scalar", T: ScalarType.BYTES },
-        { no: 4, name: "data_is_zero", kind: "scalar", T: ScalarType.BOOL },
+        { no: 1, name: 'rpc_service', kind: 'scalar', T: ScalarType.STRING },
+        { no: 2, name: 'rpc_method', kind: 'scalar', T: ScalarType.STRING },
+        { no: 3, name: 'data', kind: 'scalar', T: ScalarType.BYTES },
+        { no: 4, name: 'data_is_zero', kind: 'scalar', T: ScalarType.BOOL },
     ],
     packedByDefault: true,
 });
-;
 // CallData contains the message type declaration for CallData.
 export const CallData = createMessageType({
-    typeName: "srpc.CallData",
+    typeName: 'srpc.CallData',
     fields: [
-        { no: 1, name: "data", kind: "scalar", T: ScalarType.BYTES },
-        { no: 2, name: "data_is_zero", kind: "scalar", T: ScalarType.BOOL },
-        { no: 3, name: "complete", kind: "scalar", T: ScalarType.BOOL },
-        { no: 4, name: "error", kind: "scalar", T: ScalarType.STRING },
+        { no: 1, name: 'data', kind: 'scalar', T: ScalarType.BYTES },
+        { no: 2, name: 'data_is_zero', kind: 'scalar', T: ScalarType.BOOL },
+        { no: 3, name: 'complete', kind: 'scalar', T: ScalarType.BOOL },
+        { no: 4, name: 'error', kind: 'scalar', T: ScalarType.STRING },
     ],
     packedByDefault: true,
 });
-;
 // Packet contains the message type declaration for Packet.
 export const Packet = createMessageType({
-    typeName: "srpc.Packet",
+    typeName: 'srpc.Packet',
     fields: [
-        { no: 1, name: "call_start", kind: "message", T: () => CallStart, oneof: "body" },
-        { no: 2, name: "call_data", kind: "message", T: () => CallData, oneof: "body" },
-        { no: 3, name: "call_cancel", kind: "scalar", T: ScalarType.BOOL, oneof: "body" },
+        {
+            no: 1,
+            name: 'call_start',
+            kind: 'message',
+            T: () => CallStart,
+            oneof: 'body',
+        },
+        {
+            no: 2,
+            name: 'call_data',
+            kind: 'message',
+            T: () => CallData,
+            oneof: 'body',
+        },
+        {
+            no: 3,
+            name: 'call_cancel',
+            kind: 'scalar',
+            T: ScalarType.BOOL,
+            oneof: 'body',
+        },
     ],
     packedByDefault: true,
 });

package/dist/srpc/stream.d.ts

@@ -4,4 +4,5 @@ import type { Packet } from './rpcproto.pb.js';
 export type PacketHandler = (packet: Packet) => Promise<void>;
 export type PacketStream = Duplex<AsyncGenerator<Uint8Array>, Source<Uint8Array>, Promise<void>>;
 export type OpenStreamFunc = () => Promise<PacketStream>;
+export type HandleStreamFunc = (ch: PacketStream) => Promise<void>;
 export declare function streamToPacketStream(stream: Stream): PacketStream;

package/echo/echo.pb.ts

@@ -2,10 +2,10 @@
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 
-import type { MessageType, PartialFieldInfo } from "@aptre/protobuf-es-lite";
-import { createMessageType, ScalarType } from "@aptre/protobuf-es-lite";
+import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
+import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite'
 
-export const protobufPackage = "echo";
+export const protobufPackage = 'echo'
 
 /**
  * EchoMsg is the message body for Echo.
@@ -16,16 +16,14 @@ export interface EchoMsg {
   /**
    * @generated from field: string body = 1;
    */
-  body?: string;
-
-};
+  body?: string
+}
 
 // EchoMsg contains the message type declaration for EchoMsg.
 export const EchoMsg: MessageType<EchoMsg> = createMessageType({
-    typeName: "echo.EchoMsg",
-    fields: [
-        { no: 1, name: "body", kind: "scalar", T: ScalarType.STRING },
-    ] as readonly PartialFieldInfo[],
-    packedByDefault: true,
-});
-
+  typeName: 'echo.EchoMsg',
+  fields: [
+    { no: 1, name: 'body', kind: 'scalar', T: ScalarType.STRING },
+  ] as readonly PartialFieldInfo[],
+  packedByDefault: true,
+})

package/echo/echo_srpc.pb.ts

@@ -2,10 +2,15 @@
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 
-import { EchoMsg } from "./echo.pb.js";
-import { Empty, MethodKind } from "@aptre/protobuf-es-lite";
-import { RpcStreamPacket } from "../rpcstream/rpcstream.pb.js";
-import { buildDecodeMessageTransform, buildEncodeMessageTransform, MessageStream, ProtoRpc } from "starpc";
+import { EchoMsg } from './echo.pb.js'
+import { Empty, MethodKind } from '@aptre/protobuf-es-lite'
+import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js'
+import {
+  buildDecodeMessageTransform,
+  buildEncodeMessageTransform,
+  MessageStream,
+  ProtoRpc,
+} from 'starpc'
 
 /**
  * Echoer service returns the given message.
@@ -13,7 +18,7 @@ import { buildDecodeMessageTransform, buildEncodeMessageTransform, MessageStream
  * @generated from service echo.Echoer
  */
 export const EchoerDefinition = {
-  typeName: "echo.Echoer",
+  typeName: 'echo.Echoer',
   methods: {
     /**
      * Echo returns the given message.
@@ -21,7 +26,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.Echo
      */
     Echo: {
-      name: "Echo",
+      name: 'Echo',
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.Unary,
@@ -32,7 +37,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.EchoServerStream
      */
     EchoServerStream: {
-      name: "EchoServerStream",
+      name: 'EchoServerStream',
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.ServerStreaming,
@@ -43,7 +48,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.EchoClientStream
      */
     EchoClientStream: {
-      name: "EchoClientStream",
+      name: 'EchoClientStream',
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.ClientStreaming,
@@ -54,7 +59,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.EchoBidiStream
      */
     EchoBidiStream: {
-      name: "EchoBidiStream",
+      name: 'EchoBidiStream',
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.BiDiStreaming,
@@ -65,7 +70,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.RpcStream
      */
     RpcStream: {
-      name: "RpcStream",
+      name: 'RpcStream',
       I: RpcStreamPacket,
       O: RpcStreamPacket,
       kind: MethodKind.BiDiStreaming,
@@ -76,13 +81,13 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.DoNothing
      */
     DoNothing: {
-      name: "DoNothing",
+      name: 'DoNothing',
       I: Empty,
       O: Empty,
       kind: MethodKind.Unary,
     },
-  }
-} as const;
+  },
+} as const
 
 /**
  * Echoer service returns the given message.
@@ -95,10 +100,7 @@ export interface Echoer {
    *
    * @generated from rpc echo.Echoer.Echo
    */
-  Echo(
-request: EchoMsg, abortSignal?: AbortSignal
-): 
-Promise<EchoMsg>
+  Echo(request: EchoMsg, abortSignal?: AbortSignal): Promise<EchoMsg>
 
   /**
    * EchoServerStream is an example of a server -> client one-way stream.
@@ -106,9 +108,9 @@ Promise<EchoMsg>
    * @generated from rpc echo.Echoer.EchoServerStream
    */
   EchoServerStream(
-request: EchoMsg, abortSignal?: AbortSignal
-): 
-MessageStream<EchoMsg>
+    request: EchoMsg,
+    abortSignal?: AbortSignal,
+  ): MessageStream<EchoMsg>
 
   /**
    * EchoClientStream is an example of client->server one-way stream.
@@ -116,9 +118,9 @@ MessageStream<EchoMsg>
    * @generated from rpc echo.Echoer.EchoClientStream
    */
   EchoClientStream(
-request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
-): 
-Promise<EchoMsg>
+    request: MessageStream<EchoMsg>,
+    abortSignal?: AbortSignal,
+  ): Promise<EchoMsg>
 
   /**
    * EchoBidiStream is an example of a two-way stream.
@@ -126,9 +128,9 @@ Promise<EchoMsg>
    * @generated from rpc echo.Echoer.EchoBidiStream
    */
   EchoBidiStream(
-request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
-): 
-MessageStream<EchoMsg>
+    request: MessageStream<EchoMsg>,
+    abortSignal?: AbortSignal,
+  ): MessageStream<EchoMsg>
 
   /**
    * RpcStream opens a nested rpc call stream.
@@ -136,20 +138,16 @@ MessageStream<EchoMsg>
    * @generated from rpc echo.Echoer.RpcStream
    */
   RpcStream(
-request: MessageStream<RpcStreamPacket>, abortSignal?: AbortSignal
-): 
-MessageStream<RpcStreamPacket>
+    request: MessageStream<RpcStreamPacket>,
+    abortSignal?: AbortSignal,
+  ): MessageStream<RpcStreamPacket>
 
   /**
    * DoNothing does nothing.
    *
    * @generated from rpc echo.Echoer.DoNothing
    */
-  DoNothing(
-request: Empty, abortSignal?: AbortSignal
-): 
-Promise<Empty>
-
+  DoNothing(request: Empty, abortSignal?: AbortSignal): Promise<Empty>
 }
 
 export const EchoerServiceName = EchoerDefinition.typeName
@@ -172,10 +170,7 @@ export class EchoerClient implements Echoer {
    *
    * @generated from rpc echo.Echoer.Echo
    */
-  async Echo(
-request: EchoMsg, abortSignal?: AbortSignal
-): 
-Promise<EchoMsg> {
+  async Echo(request: EchoMsg, abortSignal?: AbortSignal): Promise<EchoMsg> {
     const requestMsg = EchoMsg.create(request)
     const result = await this.rpc.request(
       this.service,
@@ -192,9 +187,9 @@ Promise<EchoMsg> {
    * @generated from rpc echo.Echoer.EchoServerStream
    */
   EchoServerStream(
-request: EchoMsg, abortSignal?: AbortSignal
-): 
-MessageStream<EchoMsg> {
+    request: EchoMsg,
+    abortSignal?: AbortSignal,
+  ): MessageStream<EchoMsg> {
     const requestMsg = EchoMsg.create(request)
     const result = this.rpc.serverStreamingRequest(
       this.service,
@@ -211,9 +206,9 @@ MessageStream<EchoMsg> {
    * @generated from rpc echo.Echoer.EchoClientStream
    */
   async EchoClientStream(
-request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
-): 
-Promise<EchoMsg> {
+    request: MessageStream<EchoMsg>,
+    abortSignal?: AbortSignal,
+  ): Promise<EchoMsg> {
     const result = await this.rpc.clientStreamingRequest(
       this.service,
       EchoerDefinition.methods.EchoClientStream.name,
@@ -229,9 +224,9 @@ Promise<EchoMsg> {
    * @generated from rpc echo.Echoer.EchoBidiStream
    */
   EchoBidiStream(
-request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
-): 
-MessageStream<EchoMsg> {
+    request: MessageStream<EchoMsg>,
+    abortSignal?: AbortSignal,
+  ): MessageStream<EchoMsg> {
     const result = this.rpc.bidirectionalStreamingRequest(
       this.service,
       EchoerDefinition.methods.EchoBidiStream.name,
@@ -247,9 +242,9 @@ MessageStream<EchoMsg> {
    * @generated from rpc echo.Echoer.RpcStream
    */
   RpcStream(
-request: MessageStream<RpcStreamPacket>, abortSignal?: AbortSignal
-): 
-MessageStream<RpcStreamPacket> {
+    request: MessageStream<RpcStreamPacket>,
+    abortSignal?: AbortSignal,
+  ): MessageStream<RpcStreamPacket> {
     const result = this.rpc.bidirectionalStreamingRequest(
       this.service,
       EchoerDefinition.methods.RpcStream.name,
@@ -264,10 +259,7 @@ MessageStream<RpcStreamPacket> {
    *
    * @generated from rpc echo.Echoer.DoNothing
    */
-  async DoNothing(
-request: Empty, abortSignal?: AbortSignal
-): 
-Promise<Empty> {
+  async DoNothing(request: Empty, abortSignal?: AbortSignal): Promise<Empty> {
     const requestMsg = Empty.create(request)
     const result = await this.rpc.request(
       this.service,
@@ -277,5 +269,4 @@ Promise<Empty> {
     )
     return Empty.fromBinary(result)
   }
-
 }

package/go.mod

@@ -1,8 +1,8 @@
 module github.com/aperturerobotics/starpc
 
-go 1.23.0
+go 1.24
 
-toolchain go1.24.0
+toolchain go1.24.2
 
 replace (
 	// This fork uses go-protobuf-lite and adds post-quantum crypto support.
@@ -13,16 +13,16 @@ replace (
 )
 
 require (
-	github.com/aperturerobotics/protobuf-go-lite v0.8.0 // latest
-	github.com/aperturerobotics/util v1.28.1 // latest
+	github.com/aperturerobotics/protobuf-go-lite v0.9.0 // latest
+	github.com/aperturerobotics/util v1.29.2 // latest
 )
 
 require (
-	github.com/coder/websocket v1.8.12 // latest
-	github.com/libp2p/go-libp2p v0.41.0 // latest
+	github.com/coder/websocket v1.8.13 // latest
+	github.com/libp2p/go-libp2p v0.41.1 // latest
 	github.com/pkg/errors v0.9.1 // latest
 	github.com/sirupsen/logrus v1.9.3 // latest
-	google.golang.org/protobuf v1.36.5 // latest
+	google.golang.org/protobuf v1.36.6 // latest
 )
 
 require github.com/libp2p/go-yamux/v4 v4.0.1
@@ -43,7 +43,7 @@ require (
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
+	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )

package/go.sum

@@ -2,17 +2,17 @@ github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:t
 github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0/go.mod h1:FJkAtQcP9XxqG1NNLNHKm+wLVIGSCQX2s6CEoD+w97g=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 h1:So9JeziaWKx2Fw8sK4AUN/szqKtJ0jEMhS6bU4sHbxs=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008/go.mod h1:snaApCEDtrHHP6UWSLKiYNOZU9A5NyzccKenx9oZEzg=
-github.com/aperturerobotics/protobuf-go-lite v0.8.0 h1:SoiTAVArmOrNTX31e6CC5Bem6HuOElg3YYNhp4AAPQc=
-github.com/aperturerobotics/protobuf-go-lite v0.8.0/go.mod h1:y49wVEezRHg78uQ2OzLLZbtTTWuox+ChmaTuh6FLJW8=
-github.com/aperturerobotics/util v1.28.1 h1:FpTOt/tsawTrxDz4lrdglK47ZR2p0UM+GBB3zHhSUsc=
-github.com/aperturerobotics/util v1.28.1/go.mod h1:tFCW8S1eUGvEohv9IebTxq5bgVZNfaKGLV9ELa6iKbI=
-github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
-github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
+github.com/aperturerobotics/protobuf-go-lite v0.9.0 h1:zY3+qG0FPZiqhmEMQbVPW3wFLJ//aitvYy1zdgO8Hwo=
+github.com/aperturerobotics/protobuf-go-lite v0.9.0/go.mod h1:fULrxQxEBWKQm7vvju9AfjTp9yfHoLgwMQWTiZQ2tg0=
+github.com/aperturerobotics/util v1.29.2 h1:4mF7PfltK2g9KuD5gYUx3zvfEQXA/7F/V6EIEwJA35Q=
+github.com/aperturerobotics/util v1.29.2/go.mod h1:wfEm6n6evCQCGu+NjR8qINo0feaPEgeXxDZK6/oSuk8=
+github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
+github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
 github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
@@ -51,18 +51,18 @@ github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0b
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4=
-golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
+golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {

package/srpc/common-rpc.go

@@ -45,21 +45,26 @@ func (c *commonRPC) Context() context.Context {
 // Wait waits for the RPC to finish (remote end closed the stream).
 func (c *commonRPC) Wait(ctx context.Context) error {
 	for {
-		var dataClosed bool
 		var err error
 		var waitCh <-chan struct{}
+		var rpcCtx context.Context
 		c.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {
-			dataClosed, err = c.dataClosed, c.remoteErr
+			rpcCtx, err = c.ctx, c.remoteErr
 			waitCh = getWaitCh()
 		})
 
-		if dataClosed {
+		if err != nil {
 			return err
 		}
+		if rpcCtx.Err() != nil {
+			// rpc must have ended w/o an error being set
+			return context.Canceled
+		}
 
 		select {
 		case <-ctx.Done():
 			return context.Canceled
+		case <-rpcCtx.Done():
 		case <-waitCh:
 		}
 	}

package/srpc/handle-stream-ctr.ts

@@ -0,0 +1,20 @@
+import { HandleStreamFunc } from './stream.js'
+import { ValueCtr } from './value-ctr.js'
+
+// HandleStreamCtr contains an OpenStream func which can be awaited.
+export class HandleStreamCtr extends ValueCtr<HandleStreamFunc> {
+  constructor(handleStreamFn?: HandleStreamFunc) {
+    super(handleStreamFn)
+  }
+
+  // handleStreamFunc returns an HandleStreamFunc which waits for the underlying HandleStreamFunc.
+  get handleStreamFunc(): HandleStreamFunc {
+    return async (stream) => {
+      let handleFn = this.value
+      if (!handleFn) {
+        handleFn = await this.wait()
+      }
+      return handleFn(stream)
+    }
+  }
+}

package/srpc/index.ts

@@ -12,6 +12,7 @@ export { WebSocketConn } from './websocket.js'
 export type {
   PacketHandler,
   OpenStreamFunc,
+  HandleStreamFunc,
   PacketStream,
   streamToPacketStream,
 } from './stream.js'
@@ -65,6 +66,7 @@ export {
 export { combineUint8ArrayListTransform } from './array-list.js'
 export { ValueCtr } from './value-ctr.js'
 export { OpenStreamCtr } from './open-stream-ctr.js'
+export { HandleStreamCtr } from './handle-stream-ctr.js'
 export {
   writeToPushable,
   buildPushableSink,

package/srpc/rpcproto.pb.ts

@@ -2,10 +2,10 @@
 // @generated from file github.com/aperturerobotics/starpc/srpc/rpcproto.proto (package srpc, syntax proto3)
 /* eslint-disable */
 
-import type { MessageType, PartialFieldInfo } from "@aptre/protobuf-es-lite";
-import { createMessageType, ScalarType } from "@aptre/protobuf-es-lite";
+import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
+import { createMessageType, ScalarType } from '@aptre/protobuf-es-lite'
 
-export const protobufPackage = "srpc";
+export const protobufPackage = 'srpc'
 
 /**
  * CallStart requests starting a new RPC call.
@@ -19,41 +19,40 @@ export interface CallStart {
    *
    * @generated from field: string rpc_service = 1;
    */
-  rpcService?: string;
+  rpcService?: string
   /**
    * RpcMethod is the RPC method to call.
    * Must be set.
    *
    * @generated from field: string rpc_method = 2;
    */
-  rpcMethod?: string;
+  rpcMethod?: string
   /**
    * Data contains the request or the first message in the stream.
    * Optional if streaming.
    *
    * @generated from field: bytes data = 3;
    */
-  data?: Uint8Array;
+  data?: Uint8Array
   /**
    * DataIsZero indicates Data is set with an empty message.
    *
    * @generated from field: bool data_is_zero = 4;
    */
-  dataIsZero?: boolean;
-
-};
+  dataIsZero?: boolean
+}
 
 // CallStart contains the message type declaration for CallStart.
 export const CallStart: MessageType<CallStart> = createMessageType({
-    typeName: "srpc.CallStart",
-    fields: [
-        { no: 1, name: "rpc_service", kind: "scalar", T: ScalarType.STRING },
-        { no: 2, name: "rpc_method", kind: "scalar", T: ScalarType.STRING },
-        { no: 3, name: "data", kind: "scalar", T: ScalarType.BYTES },
-        { no: 4, name: "data_is_zero", kind: "scalar", T: ScalarType.BOOL },
-    ] as readonly PartialFieldInfo[],
-    packedByDefault: true,
-});
+  typeName: 'srpc.CallStart',
+  fields: [
+    { no: 1, name: 'rpc_service', kind: 'scalar', T: ScalarType.STRING },
+    { no: 2, name: 'rpc_method', kind: 'scalar', T: ScalarType.STRING },
+    { no: 3, name: 'data', kind: 'scalar', T: ScalarType.BYTES },
+    { no: 4, name: 'data_is_zero', kind: 'scalar', T: ScalarType.BOOL },
+  ] as readonly PartialFieldInfo[],
+  packedByDefault: true,
+})
 
 /**
  * CallData contains a message in a streaming RPC sequence.
@@ -66,40 +65,39 @@ export interface CallData {
    *
    * @generated from field: bytes data = 1;
    */
-  data?: Uint8Array;
+  data?: Uint8Array
   /**
    * DataIsZero indicates Data is set with an empty message.
    *
    * @generated from field: bool data_is_zero = 2;
    */
-  dataIsZero?: boolean;
+  dataIsZero?: boolean
   /**
    * Complete indicates the RPC call is completed.
    *
    * @generated from field: bool complete = 3;
    */
-  complete?: boolean;
+  complete?: boolean
   /**
    * Error contains any error that caused the RPC to fail.
    * If set, implies complete=true.
    *
    * @generated from field: string error = 4;
    */
-  error?: string;
-
-};
+  error?: string
+}
 
 // CallData contains the message type declaration for CallData.
 export const CallData: MessageType<CallData> = createMessageType({
-    typeName: "srpc.CallData",
-    fields: [
-        { no: 1, name: "data", kind: "scalar", T: ScalarType.BYTES },
-        { no: 2, name: "data_is_zero", kind: "scalar", T: ScalarType.BOOL },
-        { no: 3, name: "complete", kind: "scalar", T: ScalarType.BOOL },
-        { no: 4, name: "error", kind: "scalar", T: ScalarType.STRING },
-    ] as readonly PartialFieldInfo[],
-    packedByDefault: true,
-});
+  typeName: 'srpc.CallData',
+  fields: [
+    { no: 1, name: 'data', kind: 'scalar', T: ScalarType.BYTES },
+    { no: 2, name: 'data_is_zero', kind: 'scalar', T: ScalarType.BOOL },
+    { no: 3, name: 'complete', kind: 'scalar', T: ScalarType.BOOL },
+    { no: 4, name: 'error', kind: 'scalar', T: ScalarType.STRING },
+  ] as readonly PartialFieldInfo[],
+  packedByDefault: true,
+})
 
 /**
  * Packet is a message sent over a srpc packet connection.
@@ -107,51 +105,70 @@ export const CallData: MessageType<CallData> = createMessageType({
  * @generated from message srpc.Packet
  */
 export interface Packet {
-
   /**
    * Body is the packet body.
    *
    * @generated from oneof srpc.Packet.body
    */
-  body?: {
-    value?: undefined,
-    case: undefined
-  } | {
-    /**
-     * CallStart initiates a new call.
-     *
-     * @generated from field: srpc.CallStart call_start = 1;
-     */
-    value: CallStart;
-    case: "callStart";
-  } | {
-    /**
-     * CallData is a message in a streaming RPC sequence.
-     *
-     * @generated from field: srpc.CallData call_data = 2;
-     */
-    value: CallData;
-    case: "callData";
-  } | {
-    /**
-     * CallCancel cancels the call.
-     *
-     * @generated from field: bool call_cancel = 3;
-     */
-    value: boolean;
-    case: "callCancel";
-  };
-
-};
+  body?:
+    | {
+        value?: undefined
+        case: undefined
+      }
+    | {
+        /**
+         * CallStart initiates a new call.
+         *
+         * @generated from field: srpc.CallStart call_start = 1;
+         */
+        value: CallStart
+        case: 'callStart'
+      }
+    | {
+        /**
+         * CallData is a message in a streaming RPC sequence.
+         *
+         * @generated from field: srpc.CallData call_data = 2;
+         */
+        value: CallData
+        case: 'callData'
+      }
+    | {
+        /**
+         * CallCancel cancels the call.
+         *
+         * @generated from field: bool call_cancel = 3;
+         */
+        value: boolean
+        case: 'callCancel'
+      }
+}
 
 // Packet contains the message type declaration for Packet.
 export const Packet: MessageType<Packet> = createMessageType({
-    typeName: "srpc.Packet",
-    fields: [
-        { no: 1, name: "call_start", kind: "message", T: () => CallStart, oneof: "body" },
-        { no: 2, name: "call_data", kind: "message", T: () => CallData, oneof: "body" },
-        { no: 3, name: "call_cancel", kind: "scalar", T: ScalarType.BOOL, oneof: "body" },
-    ] as readonly PartialFieldInfo[],
-    packedByDefault: true,
-});
-
+  typeName: 'srpc.Packet',
+  fields: [
+    {
+      no: 1,
+      name: 'call_start',
+      kind: 'message',
+      T: () => CallStart,
+      oneof: 'body',
+    },
+    {
+      no: 2,
+      name: 'call_data',
+      kind: 'message',
+      T: () => CallData,
+      oneof: 'body',
+    },
+    {
+      no: 3,
+      name: 'call_cancel',
+      kind: 'scalar',
+      T: ScalarType.BOOL,
+      oneof: 'body',
+    },
+  ] as readonly PartialFieldInfo[],
+  packedByDefault: true,
+})

package/srpc/server_test.go

@@ -94,6 +94,7 @@ func CheckServerStream(t *testing.T, out echo.SRPCEchoer_EchoServerStreamClient,
 			}
 			return err
 		}
+
 		body := echoMsg.GetBody()
 		bodyTxt := req.GetBody()
 		if body != bodyTxt {
@@ -101,10 +102,17 @@ func CheckServerStream(t *testing.T, out echo.SRPCEchoer_EchoServerStreamClient,
 		}
 		t.Logf("server->client message %d/%d", totalExpected-expectedRx+1, totalExpected)
 		expectedRx--
+
+		if out.Context().Err() != nil {
+			return errors.New("expected context not canceled yet")
+		}
 	}
 	if expectedRx < 0 {
 		return errors.Errorf("got %d more messages than expected", -1*expectedRx)
 	}
+	if expectedRx > 0 {
+		return errors.Errorf("got %d less messages than expected", expectedRx)
+	}
 	return nil
 }
 

package/srpc/stream.ts

@@ -22,6 +22,11 @@ export type PacketStream = Duplex<
 // OpenStreamFunc is a function to start a new RPC by opening a Stream.
 export type OpenStreamFunc = () => Promise<PacketStream>
 
+// HandleStreamFunc handles an incoming RPC stream.
+// Returns as soon as the stream has been passed off to be handled.
+// Throws an error if we can't handle the incoming stream.
+export type HandleStreamFunc = (ch: PacketStream) => Promise<void>
+
 // streamToPacketStream converts a Stream into a PacketStream using length-prefix framing.
 //
 // The stream is closed when the source writing to the sink ends.