starpc 0.32.16 → 0.32.18

package/dist/mock/mock.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 = "e2e.mock";
 /**
  * MockMsg is the mock message body.

package/dist/mock/mock.pb.js

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

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

@@ -1,6 +1,6 @@
-import { MockMsg } from './mock.pb.js';
-import { MethodKind } from '@aptre/protobuf-es-lite';
-import { ProtoRpc } from 'starpc';
+import { MockMsg } from "./mock.pb.js";
+import { MethodKind } from "@aptre/protobuf-es-lite";
+import { ProtoRpc } from "starpc";
 /**
  * Mock service mocks some RPCs for the e2e tests.
  *

package/dist/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)
+// @generated from file github.com/aperturerobotics/starpc/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
-import { MockMsg } from './mock.pb.js';
-import { MethodKind } from '@aptre/protobuf-es-lite';
+import { MockMsg } from "./mock.pb.js";
+import { MethodKind } from "@aptre/protobuf-es-lite";
 /**
  * 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/echo/echo_srpc.pb.go

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

package/go.mod

@@ -13,11 +13,11 @@ replace nhooyr.io/websocket => github.com/paralin/nhooyr-websocket v1.8.12-0.202
 
 require (
 	github.com/aperturerobotics/protobuf-go-lite v0.6.5 // latest
-	github.com/aperturerobotics/util v1.23.8 // latest
+	github.com/aperturerobotics/util v1.23.10 // latest
 )
 
 require (
-	github.com/libp2p/go-libp2p v0.35.1 // latest
+	github.com/libp2p/go-libp2p v0.35.3 // 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
@@ -42,7 +42,7 @@ require (
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )

package/go.sum

@@ -4,8 +4,8 @@ github.com/aperturerobotics/json-iterator-lite v1.0.0 h1:cihbrYWoK/S2RYXhJLpDZd+
 github.com/aperturerobotics/json-iterator-lite v1.0.0/go.mod h1:snaApCEDtrHHP6UWSLKiYNOZU9A5NyzccKenx9oZEzg=
 github.com/aperturerobotics/protobuf-go-lite v0.6.5 h1:AuPPcZ7ZaJe9ZYYC4gF7/5/Xbn9Mt9uXyV3+ADWy+Ys=
 github.com/aperturerobotics/protobuf-go-lite v0.6.5/go.mod h1:YTbfnUj3feSULhs8VgepAHFnF3wUc0CPj4jd2axy21I=
-github.com/aperturerobotics/util v1.23.8 h1:hQGchdyAzLhhnBwE2MD4skAMsJf/bVcyxk1+OmA4wx0=
-github.com/aperturerobotics/util v1.23.8/go.mod h1:QsU/CKKewQCPqcB/FCM2JvkttO2DZramYWE1dgZObkw=
+github.com/aperturerobotics/util v1.23.10 h1:igX3/8E6bCp9DSQApn+Kkz4MoltnsadiIgX2AWJ+mjM=
+github.com/aperturerobotics/util v1.23.10/go.mod h1:QiSWcOha1HhCI4f48w6rd3gia9jIMGpfoeJiZMU+jLM=
 github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
 github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -57,8 +57,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 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.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=

package/mock/mock.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-lite. DO NOT EDIT.
 // protoc-gen-go-lite version: v0.6.5
-// source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
+// source: github.com/aperturerobotics/starpc/mock/mock.proto
 
 package e2e_mock
 

package/mock/mock.pb.ts

@@ -1,11 +1,11 @@
 // @generated by protoc-gen-es-lite unknown with parameter "target=ts,ts_nocheck=false"
-// @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
+// @generated from file github.com/aperturerobotics/starpc/mock/mock.proto (package e2e.mock, 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 = 'e2e.mock'
+export const protobufPackage = "e2e.mock";
 
 /**
  * MockMsg is the mock message body.
@@ -16,14 +16,16 @@ export interface MockMsg {
   /**
    * @generated from field: string body = 1;
    */
-  body?: string
-}
+  body?: string;
+
+};
 
 // MockMsg contains the message type declaration for MockMsg.
 export const MockMsg: MessageType<MockMsg> = createMessageType({
-  typeName: 'e2e.mock.MockMsg',
-  fields: [
-    { no: 1, name: 'body', kind: 'scalar', T: ScalarType.STRING },
-  ] as readonly PartialFieldInfo[],
-  packedByDefault: true,
-})
+    typeName: "e2e.mock.MockMsg",
+    fields: [
+        { no: 1, name: "body", kind: "scalar", T: ScalarType.STRING },
+    ] as readonly PartialFieldInfo[],
+    packedByDefault: true,
+});
+

package/mock/mock_srpc.pb.go

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

package/mock/mock_srpc.pb.ts

@@ -1,10 +1,10 @@
 // @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)
+// @generated from file github.com/aperturerobotics/starpc/mock/mock.proto (package e2e.mock, syntax proto3)
 /* eslint-disable */
 
-import { MockMsg } from './mock.pb.js'
-import { MethodKind } from '@aptre/protobuf-es-lite'
-import { ProtoRpc } from 'starpc'
+import { MockMsg } from "./mock.pb.js";
+import { MethodKind } from "@aptre/protobuf-es-lite";
+import { ProtoRpc } from "starpc";
 
 /**
  * Mock service mocks some RPCs for the e2e tests.
@@ -12,7 +12,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.
@@ -20,13 +20,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.
@@ -39,7 +39,11 @@ export interface Mock {
    *
    * @generated from rpc e2e.mock.Mock.MockRequest
    */
-  MockRequest(request: MockMsg, abortSignal?: AbortSignal): Promise<MockMsg>
+  MockRequest(
+request: MockMsg, abortSignal?: AbortSignal
+): 
+Promise<MockMsg>
+
 }
 
 export const MockServiceName = MockDefinition.typeName
@@ -58,9 +62,9 @@ export class MockClient implements Mock {
    * @generated from rpc e2e.mock.Mock.MockRequest
    */
   async MockRequest(
-    request: MockMsg,
-    abortSignal?: AbortSignal,
-  ): Promise<MockMsg> {
+request: MockMsg, abortSignal?: AbortSignal
+): 
+Promise<MockMsg> {
     const requestMsg = MockMsg.create(request)
     const result = await this.rpc.request(
       this.service,
@@ -70,4 +74,5 @@ export class MockClient implements Mock {
     )
     return MockMsg.fromBinary(result)
   }
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.32.16",
+  "version": "0.32.18",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -92,10 +92,10 @@
     "lint-staged": "^15.2.2",
     "pre-commit": "^1.2.2",
     "prettier": "^3.2.4",
-    "rimraf": "^5.0.7",
+    "rimraf": "^6.0.1",
     "tsx": "^4.15.7",
     "typescript": "^5.5.2",
-    "vitest": "^1.6.0"
+    "vitest": "^2.0.2"
   },
   "dependencies": {
     "@aptre/it-ws": "^1.0.1",

package/srpc/client-rpc.go

@@ -26,12 +26,12 @@ func NewClientRPC(ctx context.Context, service, method string) *ClientRPC {
 // Start sets the writer and writes the MsgSend message.
 // must only be called once!
 func (r *ClientRPC) Start(writer PacketWriter, writeFirstMsg bool, firstMsg []byte) error {
-	select {
-	case <-r.ctx.Done():
+	if err := r.ctx.Err(); err != nil {
 		r.ctxCancel()
+		_ = writer.Close()
 		return context.Canceled
-	default:
 	}
+
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 	defer r.bcast.Broadcast()

package/srpc/muxed-conn.go

@@ -75,6 +75,12 @@ func NewOpenStreamWithMuxedConn(conn network.MuxedConn) OpenStreamFunc {
 	return func(ctx context.Context, msgHandler PacketDataHandler, closeHandler CloseHandler) (PacketWriter, error) {
 		mstrm, err := conn.OpenStream(ctx)
 		if err != nil {
+			// If the error is a timeout, context may be canceled.
+			// Prefer the context canceled error (yamux returns timeout for context cancel.)
+			timeoutErr, ok := err.(interface{ Timeout() bool })
+			if ok && timeoutErr.Timeout() && ctx.Err() != nil {
+				return nil, context.Canceled
+			}
 			return nil, err
 		}
 		rw := NewPacketReadWriter(mstrm)