starpc 0.15.0 → 0.15.2

package/Makefile

@@ -119,7 +119,8 @@ gents: $(PROTOWRAP) node_modules
 			git \
 				ls-files "*.proto" |\
 				xargs printf -- \
-				"$$(pwd)/vendor/$${PROJECT}/%s "); \
+				"$$(pwd)/vendor/$${PROJECT}/%s ");
+	npm run format
 	go mod vendor
 
 .PHONY: genproto

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

@@ -32,7 +32,7 @@ export declare class MockClientImpl implements Mock {
     MockRequest(request: MockMsg): Promise<MockMsg>;
 }
 /** Mock service mocks some RPCs for the e2e tests. */
-export declare type MockDefinition = typeof MockDefinition;
+export type MockDefinition = typeof MockDefinition;
 export declare const MockDefinition: {
     readonly name: "Mock";
     readonly fullName: "e2e.mock.Mock";
@@ -75,8 +75,8 @@ export declare const MockDefinition: {
 interface Rpc {
     request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;
 }
-declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;
@@ -85,8 +85,8 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? st
 } : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;
 } : Partial<T>;
-declare type KeysOfUnion<T> = T extends T ? keyof T : never;
-export declare type Exact<P, I extends P> = P extends Builtin ? P : P & {
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P : P & {
     [K in keyof P]: Exact<P[K], I[K]>;
 } & {
     [K in Exclude<keyof I, KeysOfUnion<P>>]: never;

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

@@ -45,7 +45,7 @@ export declare class EchoerClientImpl implements Echoer {
     RpcStream(request: AsyncIterable<RpcStreamPacket>): AsyncIterable<RpcStreamPacket>;
 }
 /** Echoer service returns the given message. */
-export declare type EchoerDefinition = typeof EchoerDefinition;
+export type EchoerDefinition = typeof EchoerDefinition;
 export declare const EchoerDefinition: {
     readonly name: "Echoer";
     readonly fullName: "echo.Echoer";
@@ -321,8 +321,8 @@ interface Rpc {
     serverStreamingRequest(service: string, method: string, data: Uint8Array): AsyncIterable<Uint8Array>;
     bidirectionalStreamingRequest(service: string, method: string, data: AsyncIterable<Uint8Array>): AsyncIterable<Uint8Array>;
 }
-declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;
@@ -331,8 +331,8 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? st
 } : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;
 } : Partial<T>;
-declare type KeysOfUnion<T> = T extends T ? keyof T : never;
-export declare type Exact<P, I extends P> = P extends Builtin ? P : P & {
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P : P & {
     [K in keyof P]: Exact<P[K], I[K]>;
 } & {
     [K in Exclude<keyof I, KeysOfUnion<P>>]: never;

package/dist/rpcstream/rpcstream.d.ts

@@ -3,11 +3,11 @@ import { OpenStreamFunc, Stream } from '../srpc/stream.js';
 import { Pushable } from 'it-pushable';
 import { Source, Sink } from 'it-stream-types';
 import { Uint8ArrayList } from 'uint8arraylist';
-export declare type RpcStreamCaller = (request: AsyncIterable<RpcStreamPacket>) => AsyncIterable<RpcStreamPacket>;
+export type RpcStreamCaller = (request: AsyncIterable<RpcStreamPacket>) => AsyncIterable<RpcStreamPacket>;
 export declare function openRpcStream(componentId: string, caller: RpcStreamCaller): Promise<Stream>;
 export declare function buildRpcStreamOpenStream(componentId: string, caller: RpcStreamCaller): OpenStreamFunc;
-export declare type RpcStreamHandler = (stream: Stream) => void;
-export declare type RpcStreamGetter = (componentId: string) => Promise<RpcStreamHandler | null>;
+export type RpcStreamHandler = (stream: Stream) => void;
+export type RpcStreamGetter = (componentId: string) => Promise<RpcStreamHandler | null>;
 export declare function handleRpcStream(packetStream: AsyncIterator<RpcStreamPacket>, getter: RpcStreamGetter): AsyncIterable<RpcStreamPacket>;
 export declare class RpcStream implements Stream {
     readonly source: Source<Uint8Array>;

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

@@ -112,8 +112,8 @@ export declare const RpcAck: {
         error?: string | undefined;
     } & { [K in Exclude<keyof I, "error">]: never; }>(object: I): RpcAck;
 };
-declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;
@@ -122,8 +122,8 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? st
 } : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;
 } : Partial<T>;
-declare type KeysOfUnion<T> = T extends T ? keyof T : never;
-export declare type Exact<P, I extends P> = P extends Builtin ? P : P & {
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P : P & {
     [K in keyof P]: Exact<P[K], I[K]>;
 } & {
     [K in Exclude<keyof I, KeysOfUnion<P>>]: never;

package/dist/srpc/handler.d.ts

@@ -1,12 +1,12 @@
 import type { Sink, Source } from 'it-stream-types';
 import { Definition, MethodDefinition } from './definition.js';
-export declare type InvokeFn = (dataSource: Source<Uint8Array>, dataSink: Sink<Uint8Array>) => Promise<void>;
+export type InvokeFn = (dataSource: Source<Uint8Array>, dataSink: Sink<Uint8Array>) => Promise<void>;
 export interface Handler {
     getServiceID(): string;
     getMethodIDs(): string[];
     lookupMethod(serviceID: string, methodID: string): Promise<InvokeFn | null>;
 }
-export declare type MethodMap = {
+export type MethodMap = {
     [name: string]: InvokeFn;
 };
 export declare class StaticHandler implements Handler {
@@ -17,7 +17,7 @@ export declare class StaticHandler implements Handler {
     getMethodIDs(): string[];
     lookupMethod(serviceID: string, methodID: string): Promise<InvokeFn | null>;
 }
-declare type MethodProto<R, O> = ((request: R) => Promise<O>) | ((request: R) => AsyncIterable<O>) | ((request: AsyncIterable<R>) => Promise<O>) | ((request: AsyncIterable<R>) => AsyncIterable<O>);
+type MethodProto<R, O> = ((request: R) => Promise<O>) | ((request: R) => AsyncIterable<O>) | ((request: AsyncIterable<R>) => Promise<O>) | ((request: AsyncIterable<R>) => AsyncIterable<O>);
 export declare function createInvokeFn<R, O>(methodInfo: MethodDefinition<R, O>, methodProto: MethodProto<R, O>): InvokeFn;
 export declare function createHandler(definition: Definition, impl: any, serviceID?: string): Handler;
 export {};

package/dist/srpc/message.d.ts

@@ -4,8 +4,8 @@ export interface MessageDefinition<T> {
     encode(message: T, writer?: pbjs.Writer): pbjs.Writer;
     decode(input: pbjs.Reader | Uint8Array, length?: number): T;
 }
-declare type DecodeMessageTransform<T> = (source: Source<Uint8Array | Uint8Array[]>) => AsyncIterable<T>;
+type DecodeMessageTransform<T> = (source: Source<Uint8Array | Uint8Array[]>) => AsyncIterable<T>;
 export declare function buildDecodeMessageTransform<T>(def: MessageDefinition<T>): DecodeMessageTransform<T>;
-declare type EncodeMessageTransform<T> = (source: Source<T | T[]>) => AsyncIterable<Uint8Array>;
+type EncodeMessageTransform<T> = (source: Source<T | T[]>) => AsyncIterable<Uint8Array>;
 export declare function buildEncodeMessageTransform<T>(def: MessageDefinition<T>): EncodeMessageTransform<T>;
 export {};

package/dist/srpc/mux.d.ts

@@ -1,5 +1,5 @@
 import { InvokeFn, Handler } from './handler';
-export declare type LookupMethod = (serviceID: string, methodID: string) => Promise<InvokeFn | null>;
+export type LookupMethod = (serviceID: string, methodID: string) => Promise<InvokeFn | null>;
 export interface Mux {
     lookupMethod(serviceID: string, methodID: string): Promise<InvokeFn | null>;
 }

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

@@ -172,8 +172,8 @@ export declare const CallData: {
         error?: string | undefined;
     } & { [K in Exclude<keyof I, keyof CallData>]: never; }>(object: I): CallData;
 };
-declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {
     $case: string;
 } ? {
     [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]>;
@@ -182,8 +182,8 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? st
 } : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;
 } : Partial<T>;
-declare type KeysOfUnion<T> = T extends T ? keyof T : never;
-export declare type Exact<P, I extends P> = P extends Builtin ? P : P & {
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P : P & {
     [K in keyof P]: Exact<P[K], I[K]>;
 } & {
     [K in Exclude<keyof I, KeysOfUnion<P>>]: never;

package/dist/srpc/stream.d.ts

@@ -1,5 +1,5 @@
 import type { Packet } from './rpcproto.pb.js';
 import type { Duplex } from 'it-stream-types';
-export declare type PacketHandler = (packet: Packet) => Promise<void>;
-export declare type Stream = Duplex<Uint8Array>;
-export declare type OpenStreamFunc = () => Promise<Stream>;
+export type PacketHandler = (packet: Packet) => Promise<void>;
+export type Stream = Duplex<Uint8Array>;
+export type OpenStreamFunc = () => Promise<Stream>;

package/e2e/mock/mock.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1-devel
-// 	protoc        v3.19.3
+// 	protoc        v3.21.9
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock

package/e2e/mock/mock_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.13.2
+// protoc-gen-srpc version: v0.15.1
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock

package/echo/echo.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1-devel
-// 	protoc        v3.19.3
+// 	protoc        v3.21.9
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo

package/echo/echo_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.13.2
+// protoc-gen-srpc version: v0.15.1
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo

package/go.mod

@@ -9,8 +9,8 @@ require (
 )
 
 require (
-	github.com/aperturerobotics/util v0.0.0-20221125031036-d86bb72019f6
-	github.com/libp2p/go-libp2p v0.23.3-0.20221109121032-c334288f8fe4
+	github.com/aperturerobotics/util v0.0.0-20221202094321-2fde40039383
+	github.com/libp2p/go-libp2p v0.24.0-dev.0.20221202071826-2cc4de512664
 	github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1
 	github.com/sirupsen/logrus v1.9.0
 )
@@ -28,7 +28,7 @@ require (
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.1.1-0.20220823151017-f5af2eed4d9c // indirect
-	github.com/multiformats/go-multiaddr v0.7.0 // indirect
+	github.com/multiformats/go-multiaddr v0.8.0 // indirect
 	github.com/multiformats/go-multibase v0.1.2-0.20220823162309-7160a7347ed1 // indirect
 	github.com/multiformats/go-multicodec v0.7.1-0.20221017174837-a2baec7ca709 // indirect
 	github.com/multiformats/go-multihash v0.2.2-0.20221030163302-608669da49b6 // indirect

package/go.sum

@@ -1,5 +1,5 @@
-github.com/aperturerobotics/util v0.0.0-20221125031036-d86bb72019f6 h1:qABa0SjNgWhwcqM5RhB+PYaHxeYoiBfHcAkbkGnh1Nw=
-github.com/aperturerobotics/util v0.0.0-20221125031036-d86bb72019f6/go.mod h1:XEAYwKz5dN1eqc7LFyoprXBD7AR/X3UC6o6NqSxnAG0=
+github.com/aperturerobotics/util v0.0.0-20221202094321-2fde40039383 h1:r0TEmQAFN1Ji+1iMqBW1ymiofevQaUb3uOQTje2wp3Q=
+github.com/aperturerobotics/util v0.0.0-20221202094321-2fde40039383/go.mod h1:up2AYcp62UgmFVTm7QhM4USXAKGv73gpb5dHraKmzxQ=
 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=
@@ -52,8 +52,8 @@ github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-libp2p v0.23.3-0.20221109121032-c334288f8fe4 h1:Qo2C6xKnszNiB8nJ8M9E/wBakSktWccnm+ro+EGluX4=
-github.com/libp2p/go-libp2p v0.23.3-0.20221109121032-c334288f8fe4/go.mod h1:9lqLgktzI5Gn2bplyrZvFSuDirYRBMU+Tu/FYBIjvek=
+github.com/libp2p/go-libp2p v0.24.0-dev.0.20221202071826-2cc4de512664 h1:pv+MuIVoXKlPfxZ/dGjK+aDK3fFmfuo7ombAjrBN7z0=
+github.com/libp2p/go-libp2p v0.24.0-dev.0.20221202071826-2cc4de512664/go.mod h1:WVV1V9SPcZ0uV/sBB5X3zsKZW/EikukrgTp1ABOcqWk=
 github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
 github.com/libp2p/go-openssl v0.1.0 h1:LBkKEcUv6vtZIQLVTegAil8jbNpJErQ9AnT+bWV+Ooo=
 github.com/libp2p/go-openssl v0.1.0/go.mod h1:OiOxwPpL3n4xlenjx2h7AwSGaFSC/KZvf6gNdOBQMtc=
@@ -75,8 +75,8 @@ github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aG
 github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI=
 github.com/multiformats/go-base36 v0.1.1-0.20220823151017-f5af2eed4d9c h1:3eLctj5+2JpWf0E8PICebevkyD0KcZUhye8ggScrnEQ=
 github.com/multiformats/go-base36 v0.1.1-0.20220823151017-f5af2eed4d9c/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
-github.com/multiformats/go-multiaddr v0.7.0 h1:gskHcdaCyPtp9XskVwtvEeQOG465sCohbQIirSyqxrc=
-github.com/multiformats/go-multiaddr v0.7.0/go.mod h1:Fs50eBDWvZu+l3/9S6xAE7ZYj6yhxlvaVZjakWN7xRs=
+github.com/multiformats/go-multiaddr v0.8.0 h1:aqjksEcqK+iD/Foe1RRFsGZh8+XFiGo7FgUCZlpv3LU=
+github.com/multiformats/go-multiaddr v0.8.0/go.mod h1:Fs50eBDWvZu+l3/9S6xAE7ZYj6yhxlvaVZjakWN7xRs=
 github.com/multiformats/go-multibase v0.1.2-0.20220823162309-7160a7347ed1 h1:fts9VGSGzcENj3XnQ3iz9LGMAJAqT46fUGyaUDGFuxQ=
 github.com/multiformats/go-multibase v0.1.2-0.20220823162309-7160a7347ed1/go.mod h1:ReOVfKN5TNx1Z6d9Ba4GdcbPfPgAT8gC7lSG0ZJjEl4=
 github.com/multiformats/go-multicodec v0.7.1-0.20221017174837-a2baec7ca709 h1:XwgbSBFN6TU/aBJk0BLucpFL6I9zL9GMJp+WflbHkos=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -59,17 +59,17 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
     "bufferutil": "^4.0.7",
     "depcheck": "^1.4.3",
-    "esbuild": "^0.15.13",
-    "eslint": "^8.27.0",
+    "esbuild": "^0.15.16",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "rimraf": "^3.0.2",
-    "ts-proto": "^1.130.0",
-    "typescript": "^4.8.4",
+    "ts-proto": "^1.135.0",
+    "typescript": "^4.9.3",
     "utf-8-validate": "^5.0.10"
   },
   "dependencies": {
@@ -88,7 +88,7 @@
     "long": "^5.2.1",
     "patch-package": "^6.5.0",
     "protobufjs": "^7.1.2",
-    "uint8arraylist": "^2.3.3",
+    "uint8arraylist": "^2.4.2",
     "ws": "^8.11.0"
   }
 }

package/srpc/client-rpc.go

@@ -102,9 +102,8 @@ func (r *ClientRPC) Close() {
 	r.mtx.Lock()
 	if r.writer != nil {
 		_ = r.writeCancelLocked()
-		_ = r.writer.Close()
 	}
+	r.closeLocked()
 	r.bcast.Broadcast()
 	r.mtx.Unlock()
-	r.ctxCancel()
 }

package/srpc/common-rpc.go

@@ -50,7 +50,9 @@ func (c *commonRPC) Wait(ctx context.Context) error {
 	for {
 		c.mtx.Lock()
 		if c.dataClosed {
-			break
+			err := c.remoteErr
+			c.mtx.Unlock()
+			return err
 		}
 		waiter := c.bcast.GetWaitCh()
 		c.mtx.Unlock()
@@ -60,9 +62,6 @@ func (c *commonRPC) Wait(ctx context.Context) error {
 		case <-waiter:
 		}
 	}
-	err := c.remoteErr
-	c.mtx.Unlock()
-	return err
 }
 
 // ReadOne reads a single message and returns.
@@ -80,14 +79,14 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 			c.closeLocked()
 			err = context.Canceled
 			c.mtx.Unlock()
-			break
+			return nil, err
 		}
 		if len(c.dataQueue) != 0 {
 			msg = c.dataQueue[0]
 			c.dataQueue[0] = nil
 			c.dataQueue = c.dataQueue[1:]
 			c.mtx.Unlock()
-			break
+			return msg, nil
 		}
 		if c.dataClosed || c.remoteErr != nil {
 			err = c.remoteErr
@@ -95,7 +94,7 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 				err = io.EOF
 			}
 			c.mtx.Unlock()
-			break
+			return nil, err
 		}
 		c.mtx.Unlock()
 		select {
@@ -104,7 +103,6 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 		case <-waiter:
 		}
 	}
-	return msg, err
 }
 
 // WriteCallData writes a call data packet.
@@ -190,8 +188,8 @@ func (c *commonRPC) closeLocked() {
 		c.remoteErr = context.Canceled
 	}
 	if c.writer != nil {
-		_ = c.writeCancelLocked()
 		_ = c.writer.Close()
 	}
+	c.bcast.Broadcast()
 	c.ctxCancel()
 }

package/srpc/invoker.go

@@ -7,3 +7,26 @@ type Invoker interface {
 	// If service string is empty, ignore it.
 	InvokeMethod(serviceID, methodID string, strm Stream) (bool, error)
 }
+
+// InvokerSlice is a list of invokers.
+type InvokerSlice []Invoker
+
+// InvokeMethod invokes the method matching the service & method ID.
+// Returns false, nil if not found.
+// If service string is empty, ignore it.
+func (s InvokerSlice) InvokeMethod(serviceID, methodID string, strm Stream) (bool, error) {
+	for _, invoker := range s {
+		if invoker == nil {
+			continue
+		}
+
+		found, err := invoker.InvokeMethod(serviceID, methodID, strm)
+		if found || err != nil {
+			return found && err == nil, err
+		}
+	}
+	return false, nil
+}
+
+// _ is a type assertion
+var _ Invoker = (InvokerSlice)(nil)

package/srpc/message.go

@@ -5,3 +5,56 @@ type Message interface {
 	MarshalVT() ([]byte, error)
 	UnmarshalVT([]byte) error
 }
+
+// RawMessage is a raw protobuf message container.
+type RawMessage struct {
+	data []byte
+	copy bool
+}
+
+// NewRawMessage constructs a new raw message.
+// If copy=true, copies data in MarshalVT.
+// Note: the data buffer will be retained and used.
+// The data buffer will be written to and/or replaced in UnmarshalVT.
+func NewRawMessage(data []byte, copy bool) *RawMessage {
+	return &RawMessage{data: data, copy: copy}
+}
+
+// GetData returns the data buffer without copying.
+func (m *RawMessage) GetData() []byte {
+	return m.data
+}
+
+// SetData sets the data buffer.
+// if copy=true, copies the data to the internal slice.
+// otherwise retains the buffer.
+func (m *RawMessage) SetData(data []byte) {
+	if m.copy {
+		if cap(m.data) >= len(data) {
+			m.data = m.data[:len(data)]
+		} else {
+			m.data = make([]byte, len(data))
+		}
+		copy(m.data, data)
+	} else {
+		m.data = data
+	}
+}
+
+func (m *RawMessage) MarshalVT() ([]byte, error) {
+	if !m.copy {
+		return m.data, nil
+	}
+
+	data := make([]byte, len(m.data))
+	copy(data, m.data)
+	return data, nil
+}
+
+func (m *RawMessage) UnmarshalVT(data []byte) error {
+	m.SetData(data)
+	return nil
+}
+
+// _ is a type assertion
+var _ Message = ((*RawMessage)(nil))

package/srpc/message_test.go

@@ -0,0 +1,29 @@
+package srpc
+
+import (
+	"bytes"
+	"testing"
+)
+
+// TestRawMessage tests the raw message container.
+func TestRawMessage(t *testing.T) {
+	pkt := NewCallStartPacket("test-service", "test-method", nil, false)
+	data, err := pkt.MarshalVT()
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	rawMsg := &RawMessage{}
+	if err := rawMsg.UnmarshalVT(data); err != nil {
+		t.Fatal(err.Error())
+	}
+
+	outMsg, err := rawMsg.MarshalVT()
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	if !bytes.Equal(outMsg, data) {
+		t.Fatal("not equal")
+	}
+}

package/srpc/rpcproto.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1-devel
-// 	protoc        v3.19.3
+// 	protoc        v3.21.9
 // source: github.com/aperturerobotics/starpc/srpc/rpcproto.proto
 
 package srpc

package/srpc/server-rpc.go

@@ -73,13 +73,11 @@ func (r *ServerRPC) HandleCallStart(pkt *CallStart) error {
 
 // invokeRPC invokes the RPC after CallStart is received.
 func (r *ServerRPC) invokeRPC(serviceID, methodID string) {
-	// ctx := r.ctx
 	strm := NewMsgStream(r.ctx, r, r.ctxCancel)
 	ok, err := r.invoker.InvokeMethod(serviceID, methodID, strm)
 	if err == nil && !ok {
 		err = ErrUnimplemented
 	}
-	// TODO: close dataCh here?
 	outPkt := NewCallDataPacket(nil, false, true, err)
 	_ = r.writer.WritePacket(outPkt)
 	_ = r.writer.Close()