starpc 0.31.4 → 0.31.6

package/Makefile

@@ -1,4 +1,4 @@
-# https://github.com/aperturerobotics/protobuf-project
+# https://github.com/aperturerobotics/template
 
 SHELL:=bash
 PROTOWRAP=hack/bin/protowrap
@@ -8,7 +8,6 @@ GOIMPORTS=hack/bin/goimports
 GOFUMPT=hack/bin/gofumpt
 GOLANGCI_LINT=hack/bin/golangci-lint
 GO_MOD_OUTDATED=hack/bin/go-mod-outdated
-ESBUILD=hack/bin/esbuild
 GOLIST=go list -f "{{ .Dir }}" -m
 
 export GO111MODULE=on
@@ -62,12 +61,6 @@ $(PROTOC_GEN_STARPC):
 		-o ./bin/protoc-gen-go-starpc \
 		github.com/aperturerobotics/starpc/cmd/protoc-gen-go-starpc
 
-$(ESBUILD):
-	cd ./hack; \
-	go build -v \
-		-o ./bin/esbuild \
-		github.com/evanw/esbuild/cmd/esbuild
-
 node_modules:
 	yarn install
 
@@ -77,11 +70,12 @@ genproto: vendor node_modules $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTO
 	set -eo pipefail; \
 	export PROJECT=$$(go list -m); \
 	export PATH=$$(pwd)/hack/bin:$${PATH}; \
-	export OUT=$$(pwd)/vendor; \
+	export OUT=./vendor; \
 	mkdir -p $${OUT}/$$(dirname $${PROJECT}); \
-	rm $$(pwd)/vendor/$${PROJECT} || true; \
-	ln -s $$(pwd) $$(pwd)/vendor/$${PROJECT} ; \
+	rm ./vendor/$${PROJECT} || true; \
+	ln -s $$(pwd) ./vendor/$${PROJECT} ; \
 	protogen() { \
+		PROTO_FILES=$$(git ls-files "$$1"); \
 		$(PROTOWRAP) \
 			-I $${OUT} \
 			--plugin=./node_modules/.bin/protoc-gen-es \
@@ -98,16 +92,33 @@ genproto: vendor node_modules $(GOIMPORTS) $(PROTOWRAP) $(PROTOC_GEN_GO) $(PROTO
 			--proto_path $${OUT} \
 			--print_structure \
 			--only_specified_files \
-			$$(\
-				git \
-					ls-files "$$1" |\
-					xargs printf -- \
-					"$$(pwd)/vendor/$${PROJECT}/%s "); \
+			$$(echo "$$PROTO_FILES" | xargs printf -- "./vendor/$${PROJECT}/%s "); \
+		for proto_file in $${PROTO_FILES}; do \
+			proto_dir=$$(dirname $$proto_file); \
+			proto_name=$${proto_file%".proto"}; \
+			TS_FILES=$$(git ls-files ":(glob)$${proto_dir}/${proto_name}*_pb.ts"); \
+			if [ -z "$$TS_FILES" ]; then continue; fi; \
+			for ts_file in $${TS_FILES}; do \
+				prettier -w $$ts_file; \
+				ts_file_dir=$$(dirname $$ts_file); \
+				relative_path=$${ts_file_dir#"./"}; \
+				depth=$$(echo $$relative_path | awk -F/ '{print NF+1}'); \
+				prefix=$$(printf '../%0.s' $$(seq 1 $$depth)); \
+				istmts=$$(grep -oE "from\s+\"$$prefix[^\"]+\"" $$ts_file) || continue; \
+				if [ -z "$$istmts" ]; then continue; fi; \
+				ipaths=$$(echo "$$istmts" | awk -F'"' '{print $$2}'); \
+				for import_path in $$ipaths; do \
+					rel_import_path=$$(realpath -s --relative-to=./vendor \
+						"./vendor/$${PROJECT}/$${ts_file_dir}/$${import_path}"); \
+					go_import_path=$$(echo $$rel_import_path | sed -e "s|^|@go/|"); \
+					sed -i -e "s|$$import_path|$$go_import_path|g" $$ts_file; \
+				done; \
+			done; \
+		done; \
 	}; \
 	protogen "./*.proto"; \
-	rm $$(pwd)/vendor/$${PROJECT} || true
+	rm -f ./vendor/$${PROJECT}
 	$(GOIMPORTS) -w ./
-	npm run format:js
 
 .PHONY: gen
 gen: genproto

package/dist/e2e/mock/mock_pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
 import { Message, proto3 } from '@bufbuild/protobuf';

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

@@ -1,7 +1,7 @@
-import { MockMsg } from './mock_pb.js';
-import type { PartialMessage } from '@bufbuild/protobuf';
-import { MethodKind } from '@bufbuild/protobuf';
-import { ProtoRpc } from 'starpc';
+import { MockMsg } from "./mock_pb.js";
+import type { PartialMessage } from "@bufbuild/protobuf";
+import { MethodKind } from "@bufbuild/protobuf";
+import { ProtoRpc } from "starpc";
 /**
  * Mock service mocks some RPCs for the e2e tests.
  *

package/dist/e2e/mock/mock_srpc.pb.js

@@ -1,15 +1,15 @@
 // @generated by protoc-gen-es-starpc none with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
-import { MockMsg } from './mock_pb.js';
-import { MethodKind } from '@bufbuild/protobuf';
+import { MockMsg } from "./mock_pb.js";
+import { MethodKind } from "@bufbuild/protobuf";
 /**
  * Mock service mocks some RPCs for the e2e tests.
  *
  * @generated from service e2e.mock.Mock
  */
 export const MockDefinition = {
-    typeName: 'e2e.mock.Mock',
+    typeName: "e2e.mock.Mock",
     methods: {
         /**
          * MockRequest runs a mock unary request.
@@ -17,12 +17,12 @@ export const MockDefinition = {
          * @generated from rpc e2e.mock.Mock.MockRequest
          */
         MockRequest: {
-            name: 'MockRequest',
+            name: "MockRequest",
             I: MockMsg,
             O: MockMsg,
             kind: MethodKind.Unary,
         },
-    },
+    }
 };
 export const MockServiceName = MockDefinition.typeName;
 export class MockClient {

package/dist/echo/echo_pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 import { Message, proto3 } from '@bufbuild/protobuf';

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

@@ -1,8 +1,8 @@
-import { EchoMsg } from './echo_pb.js';
-import type { PartialMessage } from '@bufbuild/protobuf';
-import { MethodKind } from '@bufbuild/protobuf';
-import { RpcStreamPacket } from '../rpcstream/rpcstream_pb.js';
-import { MessageStream, ProtoRpc } from 'starpc';
+import { EchoMsg } from "./echo_pb.js";
+import type { PartialMessage } from "@bufbuild/protobuf";
+import { MethodKind } from "@bufbuild/protobuf";
+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 { MethodKind } from '@bufbuild/protobuf';
-import { RpcStreamPacket } from '../rpcstream/rpcstream_pb.js';
-import { buildDecodeMessageTransform, buildEncodeMessageTransform, } from 'starpc';
+import { EchoMsg } from "./echo_pb.js";
+import { MethodKind } from "@bufbuild/protobuf";
+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,12 +63,12 @@ export const EchoerDefinition = {
          * @generated from rpc echo.Echoer.RpcStream
          */
         RpcStream: {
-            name: 'RpcStream',
+            name: "RpcStream",
             I: RpcStreamPacket,
             O: RpcStreamPacket,
             kind: MethodKind.BiDiStreaming,
         },
-    },
+    }
 };
 export const EchoerServiceName = EchoerDefinition.typeName;
 export class EchoerClient {

package/dist/rpcstream/rpcstream_pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/rpcstream/rpcstream.proto (package rpcstream, syntax proto3)
 /* eslint-disable */
 import { Message, proto3 } from '@bufbuild/protobuf';

package/dist/srpc/rpcproto_pb.js

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/srpc/rpcproto.proto (package srpc, syntax proto3)
 /* eslint-disable */
 import { Message, proto3 } from '@bufbuild/protobuf';

package/e2e/mock/mock.pb.go

@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
-// protoc-gen-go-lite version: v0.5.0
+// protoc-gen-go-lite version: v0.6.0
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock
 
 import (
+	fmt "fmt"
 	io "io"
 	strconv "strconv"
 	strings "strings"
 
 	protobuf_go_lite "github.com/aperturerobotics/protobuf-go-lite"
 	json "github.com/aperturerobotics/protobuf-go-lite/json"
-	errors "github.com/pkg/errors"
 )
 
 // MockMsg is the mock message body.
@@ -99,7 +99,7 @@ func (x *MockMsg) UnmarshalProtoJSON(s *json.UnmarshalState) {
 	s.ReadObject(func(key string) {
 		switch key {
 		default:
-			s.ReadAny() // ignore unknown field
+			s.Skip() // ignore unknown field
 		case "body":
 			s.AddField("body")
 			x.Body = s.ReadString()
@@ -202,15 +202,15 @@ func (m *MockMsg) UnmarshalVT(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return errors.Errorf("proto: MockMsg: wiretype end group for non-group")
+			return fmt.Errorf("proto: MockMsg: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return errors.Errorf("proto: MockMsg: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MockMsg: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field Body", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Body", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {

package/e2e/mock/mock_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
 

package/e2e/mock/mock_srpc.pb.ts

@@ -2,10 +2,10 @@
 // @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
 
-import { MockMsg } from './mock_pb.js'
-import type { PartialMessage } from '@bufbuild/protobuf'
-import { MethodKind } from '@bufbuild/protobuf'
-import { ProtoRpc } from 'starpc'
+import { MockMsg } from "./mock_pb.js";
+import type { PartialMessage } from "@bufbuild/protobuf";
+import { MethodKind } from "@bufbuild/protobuf";
+import { ProtoRpc } from "starpc";
 
 /**
  * Mock service mocks some RPCs for the e2e tests.
@@ -13,7 +13,7 @@ import { ProtoRpc } from 'starpc'
  * @generated from service e2e.mock.Mock
  */
 export const MockDefinition = {
-  typeName: 'e2e.mock.Mock',
+  typeName: "e2e.mock.Mock",
   methods: {
     /**
      * MockRequest runs a mock unary request.
@@ -21,13 +21,13 @@ export const MockDefinition = {
      * @generated from rpc e2e.mock.Mock.MockRequest
      */
     MockRequest: {
-      name: 'MockRequest',
+      name: "MockRequest",
       I: MockMsg,
       O: MockMsg,
       kind: MethodKind.Unary,
     },
-  },
-} as const
+  }
+} as const;
 
 /**
  * Mock service mocks some RPCs for the e2e tests.
@@ -41,9 +41,10 @@ export interface Mock {
    * @generated from rpc e2e.mock.Mock.MockRequest
    */
   MockRequest(
-    request: PartialMessage<MockMsg>,
-    abortSignal?: AbortSignal,
-  ): Promise<PartialMessage<MockMsg>>
+request: PartialMessage<MockMsg>, abortSignal?: AbortSignal
+): 
+Promise<PartialMessage<MockMsg>>
+
 }
 
 export const MockServiceName = MockDefinition.typeName
@@ -62,9 +63,9 @@ export class MockClient implements Mock {
    * @generated from rpc e2e.mock.Mock.MockRequest
    */
   async MockRequest(
-    request: PartialMessage<MockMsg>,
-    abortSignal?: AbortSignal,
-  ): Promise<PartialMessage<MockMsg>> {
+request: PartialMessage<MockMsg>, abortSignal?: AbortSignal
+): 
+Promise<PartialMessage<MockMsg>> {
     const requestMsg = new MockMsg(request)
     const result = await this.rpc.request(
       this.service,
@@ -74,4 +75,5 @@ export class MockClient implements Mock {
     )
     return MockMsg.fromBinary(result)
   }
+
 }

package/echo/echo.pb.go

@@ -1,10 +1,11 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
-// protoc-gen-go-lite version: v0.5.0
+// protoc-gen-go-lite version: v0.6.0
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo
 
 import (
+	fmt "fmt"
 	io "io"
 	strconv "strconv"
 	strings "strings"
@@ -12,7 +13,6 @@ import (
 	protobuf_go_lite "github.com/aperturerobotics/protobuf-go-lite"
 	json "github.com/aperturerobotics/protobuf-go-lite/json"
 	_ "github.com/aperturerobotics/starpc/rpcstream"
-	errors "github.com/pkg/errors"
 )
 
 // EchoMsg is the message body for Echo.
@@ -100,7 +100,7 @@ func (x *EchoMsg) UnmarshalProtoJSON(s *json.UnmarshalState) {
 	s.ReadObject(func(key string) {
 		switch key {
 		default:
-			s.ReadAny() // ignore unknown field
+			s.Skip() // ignore unknown field
 		case "body":
 			s.AddField("body")
 			x.Body = s.ReadString()
@@ -203,15 +203,15 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return errors.Errorf("proto: EchoMsg: wiretype end group for non-group")
+			return fmt.Errorf("proto: EchoMsg: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return errors.Errorf("proto: EchoMsg: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: EchoMsg: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field Body", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Body", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {

package/echo/echo_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 

package/echo/echo_srpc.pb.ts

@@ -2,16 +2,11 @@
 // @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
 /* eslint-disable */
 
-import { EchoMsg } from './echo_pb.js'
-import type { PartialMessage } from '@bufbuild/protobuf'
-import { MethodKind } from '@bufbuild/protobuf'
-import { RpcStreamPacket } from '../rpcstream/rpcstream_pb.js'
-import {
-  buildDecodeMessageTransform,
-  buildEncodeMessageTransform,
-  MessageStream,
-  ProtoRpc,
-} from 'starpc'
+import { EchoMsg } from "./echo_pb.js";
+import type { PartialMessage } from "@bufbuild/protobuf";
+import { MethodKind } from "@bufbuild/protobuf";
+import { RpcStreamPacket } from "../rpcstream/rpcstream_pb.js";
+import { buildDecodeMessageTransform, buildEncodeMessageTransform, MessageStream, ProtoRpc } from "starpc";
 
 /**
  * Echoer service returns the given message.
@@ -19,7 +14,7 @@ import {
  * @generated from service echo.Echoer
  */
 export const EchoerDefinition = {
-  typeName: 'echo.Echoer',
+  typeName: "echo.Echoer",
   methods: {
     /**
      * Echo returns the given message.
@@ -27,7 +22,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.Echo
      */
     Echo: {
-      name: 'Echo',
+      name: "Echo",
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.Unary,
@@ -38,7 +33,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.EchoServerStream
      */
     EchoServerStream: {
-      name: 'EchoServerStream',
+      name: "EchoServerStream",
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.ServerStreaming,
@@ -49,7 +44,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.EchoClientStream
      */
     EchoClientStream: {
-      name: 'EchoClientStream',
+      name: "EchoClientStream",
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.ClientStreaming,
@@ -60,7 +55,7 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.EchoBidiStream
      */
     EchoBidiStream: {
-      name: 'EchoBidiStream',
+      name: "EchoBidiStream",
       I: EchoMsg,
       O: EchoMsg,
       kind: MethodKind.BiDiStreaming,
@@ -71,13 +66,13 @@ export const EchoerDefinition = {
      * @generated from rpc echo.Echoer.RpcStream
      */
     RpcStream: {
-      name: 'RpcStream',
+      name: "RpcStream",
       I: RpcStreamPacket,
       O: RpcStreamPacket,
       kind: MethodKind.BiDiStreaming,
     },
-  },
-} as const
+  }
+} as const;
 
 /**
  * Echoer service returns the given message.
@@ -91,9 +86,9 @@ export interface Echoer {
    * @generated from rpc echo.Echoer.Echo
    */
   Echo(
-    request: PartialMessage<EchoMsg>,
-    abortSignal?: AbortSignal,
-  ): Promise<PartialMessage<EchoMsg>>
+request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+): 
+Promise<PartialMessage<EchoMsg>>
 
   /**
    * EchoServerStream is an example of a server -> client one-way stream.
@@ -101,9 +96,9 @@ export interface Echoer {
    * @generated from rpc echo.Echoer.EchoServerStream
    */
   EchoServerStream(
-    request: PartialMessage<EchoMsg>,
-    abortSignal?: AbortSignal,
-  ): MessageStream<EchoMsg>
+request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+): 
+MessageStream<EchoMsg>
 
   /**
    * EchoClientStream is an example of client->server one-way stream.
@@ -111,9 +106,9 @@ export interface Echoer {
    * @generated from rpc echo.Echoer.EchoClientStream
    */
   EchoClientStream(
-    request: MessageStream<EchoMsg>,
-    abortSignal?: AbortSignal,
-  ): Promise<PartialMessage<EchoMsg>>
+request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
+): 
+Promise<PartialMessage<EchoMsg>>
 
   /**
    * EchoBidiStream is an example of a two-way stream.
@@ -121,9 +116,9 @@ export interface Echoer {
    * @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.
@@ -131,9 +126,10 @@ export interface Echoer {
    * @generated from rpc echo.Echoer.RpcStream
    */
   RpcStream(
-    request: MessageStream<RpcStreamPacket>,
-    abortSignal?: AbortSignal,
-  ): MessageStream<RpcStreamPacket>
+request: MessageStream<RpcStreamPacket>, abortSignal?: AbortSignal
+): 
+MessageStream<RpcStreamPacket>
+
 }
 
 export const EchoerServiceName = EchoerDefinition.typeName
@@ -156,9 +152,9 @@ export class EchoerClient implements Echoer {
    * @generated from rpc echo.Echoer.Echo
    */
   async Echo(
-    request: PartialMessage<EchoMsg>,
-    abortSignal?: AbortSignal,
-  ): Promise<PartialMessage<EchoMsg>> {
+request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+): 
+Promise<PartialMessage<EchoMsg>> {
     const requestMsg = new EchoMsg(request)
     const result = await this.rpc.request(
       this.service,
@@ -175,9 +171,9 @@ export class EchoerClient implements Echoer {
    * @generated from rpc echo.Echoer.EchoServerStream
    */
   EchoServerStream(
-    request: PartialMessage<EchoMsg>,
-    abortSignal?: AbortSignal,
-  ): MessageStream<EchoMsg> {
+request: PartialMessage<EchoMsg>, abortSignal?: AbortSignal
+): 
+MessageStream<EchoMsg> {
     const requestMsg = new EchoMsg(request)
     const result = this.rpc.serverStreamingRequest(
       this.service,
@@ -194,9 +190,9 @@ export class EchoerClient implements Echoer {
    * @generated from rpc echo.Echoer.EchoClientStream
    */
   async EchoClientStream(
-    request: MessageStream<EchoMsg>,
-    abortSignal?: AbortSignal,
-  ): Promise<PartialMessage<EchoMsg>> {
+request: MessageStream<EchoMsg>, abortSignal?: AbortSignal
+): 
+Promise<PartialMessage<EchoMsg>> {
     const result = await this.rpc.clientStreamingRequest(
       this.service,
       EchoerDefinition.methods.EchoClientStream.name,
@@ -212,9 +208,9 @@ export class EchoerClient implements Echoer {
    * @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,
@@ -230,9 +226,9 @@ export class EchoerClient implements Echoer {
    * @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,
@@ -241,4 +237,5 @@ export class EchoerClient implements Echoer {
     )
     return buildDecodeMessageTransform(RpcStreamPacket)(result)
   }
+
 }

package/go.mod

@@ -3,28 +3,27 @@ module github.com/aperturerobotics/starpc
 go 1.22
 
 require (
-	github.com/aperturerobotics/protobuf-go-lite v0.5.0 // latest
-	github.com/aperturerobotics/util v1.18.1 // latest
+	github.com/aperturerobotics/protobuf-go-lite v0.6.0 // latest
+	github.com/aperturerobotics/util v1.20.1 // latest
 )
 
 require (
 	github.com/libp2p/go-libp2p v0.33.2 // latest
 	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240322071716-53ef5820bd48 // master
-	github.com/pkg/errors v0.9.1 // latest
 	github.com/sirupsen/logrus v1.9.3 // latest
 	google.golang.org/protobuf v1.33.0 // latest
 	nhooyr.io/websocket v1.8.11 // latest
 )
 
+require github.com/pkg/errors v0.9.1
+
 require (
+	github.com/aperturerobotics/json-iterator-lite v1.0.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect

package/go.sum

@@ -1,7 +1,9 @@
-github.com/aperturerobotics/protobuf-go-lite v0.5.0 h1:JmTfiOeTQv06EYIFyVkjkmGXxI7JoCRuokVK2SOvo3I=
-github.com/aperturerobotics/protobuf-go-lite v0.5.0/go.mod h1:/EduuzDxtr5s0e9s10XYG35+pPgvrgg3UmBliivOaSs=
-github.com/aperturerobotics/util v1.18.1 h1:Iu8toMYRKs3d0TH8JkAMwfEYY8bEekDaTEvLOVVqh44=
-github.com/aperturerobotics/util v1.18.1/go.mod h1:Oz7Rmq5sKS1UgTRJkDWYfyf1LiA2rIRbnO341Xd91bU=
+github.com/aperturerobotics/json-iterator-lite v1.0.0 h1:cihbrYWoK/S2RYXhJLpDZd+GUjVvFJN+D3w1VOqqHRI=
+github.com/aperturerobotics/json-iterator-lite v1.0.0/go.mod h1:snaApCEDtrHHP6UWSLKiYNOZU9A5NyzccKenx9oZEzg=
+github.com/aperturerobotics/protobuf-go-lite v0.6.0 h1:EE168e2oov6wmDv8AdSAlz2G1nHbf0HlYG917CgJ+ug=
+github.com/aperturerobotics/protobuf-go-lite v0.6.0/go.mod h1:6Bp+C+fI1uh0NmIKpxlxyHMkKtCP9Kb3PHkhOzxG4B8=
+github.com/aperturerobotics/util v1.20.1 h1:A4lcyULNtpID2pykIBLr7putGXFjjGi5EX0BpaVcdtY=
+github.com/aperturerobotics/util v1.20.1/go.mod h1:m6rsllH5ubGZvwFmdY3Tvm6LMgBtghqxPTynimEevl0=
 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=
@@ -11,11 +13,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etly
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
 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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
@@ -28,10 +27,6 @@ github.com/libp2p/go-yamux/v4 v4.0.2-0.20240322071716-53ef5820bd48 h1:KI65sCCL2h
 github.com/libp2p/go-yamux/v4 v4.0.2-0.20240322071716-53ef5820bd48/go.mod h1:PGP+3py2ZWDKABvqstBZtMnixEHNC7U/odnGylzur5o=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
@@ -59,7 +54,6 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 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=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.31.4",
+  "version": "0.31.6",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -67,12 +67,12 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@bufbuild/protoc-gen-es": "^1.8.0",
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
-    "@typescript-eslint/parser": "^7.7.0",
+    "@bufbuild/protoc-gen-es": "^1.9.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
     "depcheck": "^1.4.6",
     "esbuild": "^0.20.0",
-    "eslint": "^9.1.0",
+    "eslint": "^9.1.1",
     "eslint-config-prettier": "^9.1.0",
     "prettier": "^3.2.4",
     "rimraf": "^5.0.1",
@@ -81,8 +81,7 @@
   },
   "dependencies": {
     "@aptre/it-ws": "^1.0.0",
-    "@bufbuild/protobuf": "^1.8.0",
-    "@bufbuild/protoplugin": "^1.8.0",
+    "@bufbuild/protoplugin": "^1.9.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
     "@libp2p/interface": "^1.1.3",
     "@libp2p/logger": "^4.0.6",
@@ -95,5 +94,8 @@
     "memoize-one": "^6.0.0",
     "uint8arraylist": "^2.4.7",
     "ws": "^8.15.1"
+  },
+  "peerDependencies": {
+    "@bufbuild/protobuf": "1.9.0"
   }
 }

package/srpc/rpcproto.pb.go

@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
-// protoc-gen-go-lite version: v0.5.0
+// protoc-gen-go-lite version: v0.6.0
 // source: github.com/aperturerobotics/starpc/srpc/rpcproto.proto
 
 package srpc
 
 import (
 	base64 "encoding/base64"
+	fmt "fmt"
 	io "io"
 	strconv "strconv"
 	strings "strings"
 
 	protobuf_go_lite "github.com/aperturerobotics/protobuf-go-lite"
 	json "github.com/aperturerobotics/protobuf-go-lite/json"
-	errors "github.com/pkg/errors"
 )
 
 // Packet is a message sent over a srpc packet connection.
@@ -469,7 +469,7 @@ func (x *Packet) UnmarshalProtoJSON(s *json.UnmarshalState) {
 	s.ReadObject(func(key string) {
 		switch key {
 		default:
-			s.ReadAny() // ignore unknown field
+			s.Skip() // ignore unknown field
 		case "call_start", "callStart":
 			ov := &Packet_CallStart{}
 			x.Body = ov
@@ -546,7 +546,7 @@ func (x *CallStart) UnmarshalProtoJSON(s *json.UnmarshalState) {
 	s.ReadObject(func(key string) {
 		switch key {
 		default:
-			s.ReadAny() // ignore unknown field
+			s.Skip() // ignore unknown field
 		case "rpc_service", "rpcService":
 			s.AddField("rpc_service")
 			x.RpcService = s.ReadString()
@@ -612,7 +612,7 @@ func (x *CallData) UnmarshalProtoJSON(s *json.UnmarshalState) {
 	s.ReadObject(func(key string) {
 		switch key {
 		default:
-			s.ReadAny() // ignore unknown field
+			s.Skip() // ignore unknown field
 		case "data":
 			s.AddField("data")
 			x.Data = s.ReadBytes()
@@ -1072,15 +1072,15 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return errors.Errorf("proto: Packet: wiretype end group for non-group")
+			return fmt.Errorf("proto: Packet: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return errors.Errorf("proto: Packet: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: Packet: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field CallStart", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field CallStart", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -1121,7 +1121,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field CallData", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field CallData", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -1162,7 +1162,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
 			iNdEx = postIndex
 		case 3:
 			if wireType != 0 {
-				return errors.Errorf("proto: wrong wireType = %d for field CallCancel", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field CallCancel", wireType)
 			}
 			var v int
 			for shift := uint(0); ; shift += 7 {
@@ -1226,15 +1226,15 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return errors.Errorf("proto: CallStart: wiretype end group for non-group")
+			return fmt.Errorf("proto: CallStart: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return errors.Errorf("proto: CallStart: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: CallStart: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field RpcService", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field RpcService", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1266,7 +1266,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field RpcMethod", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field RpcMethod", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -1298,7 +1298,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
 			iNdEx = postIndex
 		case 3:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field Data", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType)
 			}
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
@@ -1332,7 +1332,7 @@ func (m *CallStart) UnmarshalVT(dAtA []byte) error {
 			iNdEx = postIndex
 		case 4:
 			if wireType != 0 {
-				return errors.Errorf("proto: wrong wireType = %d for field DataIsZero", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field DataIsZero", wireType)
 			}
 			var v int
 			for shift := uint(0); ; shift += 7 {
@@ -1395,15 +1395,15 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return errors.Errorf("proto: CallData: wiretype end group for non-group")
+			return fmt.Errorf("proto: CallData: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return errors.Errorf("proto: CallData: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: CallData: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field Data", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType)
 			}
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
@@ -1437,7 +1437,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 0 {
-				return errors.Errorf("proto: wrong wireType = %d for field DataIsZero", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field DataIsZero", wireType)
 			}
 			var v int
 			for shift := uint(0); ; shift += 7 {
@@ -1457,7 +1457,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
 			m.DataIsZero = bool(v != 0)
 		case 3:
 			if wireType != 0 {
-				return errors.Errorf("proto: wrong wireType = %d for field Complete", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Complete", wireType)
 			}
 			var v int
 			for shift := uint(0); ; shift += 7 {
@@ -1477,7 +1477,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
 			m.Complete = bool(v != 0)
 		case 4:
 			if wireType != 2 {
-				return errors.Errorf("proto: wrong wireType = %d for field Error", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {

package/srpc/rpcproto_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.8.0 with parameter "target=ts,ts_nocheck=false"
+// @generated by protoc-gen-es v1.9.0 with parameter "target=ts,ts_nocheck=false"
 // @generated from file github.com/aperturerobotics/starpc/srpc/rpcproto.proto (package srpc, syntax proto3)
 /* eslint-disable */