starpc 0.18.1 → 0.18.3

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

@@ -13,19 +13,23 @@ export const MockMsg = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseMockMsg();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.body = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
             }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -83,7 +87,7 @@ export class MockClientImpl {
     MockRequest(request, abortSignal) {
         const data = MockMsg.encode(request).finish();
         const promise = this.rpc.request(this.service, 'MockRequest', data, abortSignal || undefined);
-        return promise.then((data) => MockMsg.decode(new _m0.Reader(data)));
+        return promise.then((data) => MockMsg.decode(_m0.Reader.create(data)));
     }
 }
 export const MockDefinition = {

package/dist/echo/echo.pb.js

@@ -14,19 +14,23 @@ export const EchoMsg = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseEchoMsg();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.body = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
             }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -88,7 +92,7 @@ export class EchoerClientImpl {
     Echo(request, abortSignal) {
         const data = EchoMsg.encode(request).finish();
         const promise = this.rpc.request(this.service, 'Echo', data, abortSignal || undefined);
-        return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)));
+        return promise.then((data) => EchoMsg.decode(_m0.Reader.create(data)));
     }
     EchoServerStream(request, abortSignal) {
         const data = EchoMsg.encode(request).finish();
@@ -98,7 +102,7 @@ export class EchoerClientImpl {
     EchoClientStream(request, abortSignal) {
         const data = EchoMsg.encodeTransform(request);
         const promise = this.rpc.clientStreamingRequest(this.service, 'EchoClientStream', data, abortSignal || undefined);
-        return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)));
+        return promise.then((data) => EchoMsg.decode(_m0.Reader.create(data)));
     }
     EchoBidiStream(request, abortSignal) {
         const data = EchoMsg.encodeTransform(request);

package/dist/rpcstream/rpcstream.pb.js

@@ -7,43 +7,55 @@ function createBaseRpcStreamPacket() {
 }
 export const RpcStreamPacket = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.body?.$case === 'init') {
-            RpcStreamInit.encode(message.body.init, writer.uint32(10).fork()).ldelim();
-        }
-        if (message.body?.$case === 'ack') {
-            RpcAck.encode(message.body.ack, writer.uint32(18).fork()).ldelim();
-        }
-        if (message.body?.$case === 'data') {
-            writer.uint32(26).bytes(message.body.data);
+        switch (message.body?.$case) {
+            case 'init':
+                RpcStreamInit.encode(message.body.init, writer.uint32(10).fork()).ldelim();
+                break;
+            case 'ack':
+                RpcAck.encode(message.body.ack, writer.uint32(18).fork()).ldelim();
+                break;
+            case 'data':
+                writer.uint32(26).bytes(message.body.data);
+                break;
         }
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseRpcStreamPacket();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.body = {
                         $case: 'init',
                         init: RpcStreamInit.decode(reader, reader.uint32()),
                     };
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.body = {
                         $case: 'ack',
                         ack: RpcAck.decode(reader, reader.uint32()),
                     };
-                    break;
+                    continue;
                 case 3:
+                    if (tag != 26) {
+                        break;
+                    }
                     message.body = { $case: 'data', data: reader.bytes() };
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -140,19 +152,23 @@ export const RpcStreamInit = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseRpcStreamInit();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.componentId = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
             }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -214,19 +230,23 @@ export const RpcAck = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseRpcAck();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.error = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },

package/dist/srpc/rpcproto.pb.js

@@ -7,43 +7,55 @@ function createBasePacket() {
 }
 export const Packet = {
     encode(message, writer = _m0.Writer.create()) {
-        if (message.body?.$case === 'callStart') {
-            CallStart.encode(message.body.callStart, writer.uint32(10).fork()).ldelim();
-        }
-        if (message.body?.$case === 'callData') {
-            CallData.encode(message.body.callData, writer.uint32(18).fork()).ldelim();
-        }
-        if (message.body?.$case === 'callCancel') {
-            writer.uint32(24).bool(message.body.callCancel);
+        switch (message.body?.$case) {
+            case 'callStart':
+                CallStart.encode(message.body.callStart, writer.uint32(10).fork()).ldelim();
+                break;
+            case 'callData':
+                CallData.encode(message.body.callData, writer.uint32(18).fork()).ldelim();
+                break;
+            case 'callCancel':
+                writer.uint32(24).bool(message.body.callCancel);
+                break;
         }
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBasePacket();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.body = {
                         $case: 'callStart',
                         callStart: CallStart.decode(reader, reader.uint32()),
                     };
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.body = {
                         $case: 'callData',
                         callData: CallData.decode(reader, reader.uint32()),
                     };
-                    break;
+                    continue;
                 case 3:
+                    if (tag != 24) {
+                        break;
+                    }
                     message.body = { $case: 'callCancel', callCancel: reader.bool() };
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -157,28 +169,41 @@ export const CallStart = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseCallStart();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.rpcService = reader.string();
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 18) {
+                        break;
+                    }
                     message.rpcMethod = reader.string();
-                    break;
+                    continue;
                 case 3:
+                    if (tag != 26) {
+                        break;
+                    }
                     message.data = reader.bytes();
-                    break;
+                    continue;
                 case 4:
+                    if (tag != 32) {
+                        break;
+                    }
                     message.dataIsZero = reader.bool();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
             }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
         }
         return message;
     },
@@ -266,28 +291,41 @@ export const CallData = {
         return writer;
     },
     decode(input, length) {
-        const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+        const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = createBaseCallData();
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
+                    if (tag != 10) {
+                        break;
+                    }
                     message.data = reader.bytes();
-                    break;
+                    continue;
                 case 2:
+                    if (tag != 16) {
+                        break;
+                    }
                     message.dataIsZero = reader.bool();
-                    break;
+                    continue;
                 case 3:
+                    if (tag != 24) {
+                        break;
+                    }
                     message.complete = reader.bool();
-                    break;
+                    continue;
                 case 4:
+                    if (tag != 34) {
+                        break;
+                    }
                     message.error = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
+                    continue;
+            }
+            if ((tag & 7) == 4 || tag == 0) {
+                break;
             }
+            reader.skipType(tag & 7);
         }
         return message;
     },

package/e2e/mock/mock.pb.go

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

package/e2e/mock/mock.pb.ts

@@ -25,19 +25,25 @@ export const MockMsg = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MockMsg {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input)
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input)
     let end = length === undefined ? reader.len : reader.pos + length
     const message = createBaseMockMsg()
     while (reader.pos < end) {
       const tag = reader.uint32()
       switch (tag >>> 3) {
         case 1:
+          if (tag != 10) {
+            break
+          }
+
           message.body = reader.string()
-          break
-        default:
-          reader.skipType(tag & 7)
-          break
+          continue
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break
       }
+      reader.skipType(tag & 7)
     }
     return message
   },
@@ -119,7 +125,7 @@ export class MockClientImpl implements Mock {
       data,
       abortSignal || undefined
     )
-    return promise.then((data) => MockMsg.decode(new _m0.Reader(data)))
+    return promise.then((data) => MockMsg.decode(_m0.Reader.create(data)))
   }
 }
 

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.16.1
+// protoc-gen-srpc version: v0.18.1
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock

package/e2e/mock/mock_vtproto.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.3.1-0.20220817155510-0ae748fd2007
+// protoc-gen-go-vtproto version: v0.4.0
 // source: github.com/aperturerobotics/starpc/e2e/mock/mock.proto
 
 package e2e_mock
@@ -34,14 +34,14 @@ func (m *MockMsg) CloneVT() *MockMsg {
 	return r
 }
 
-func (m *MockMsg) CloneGenericVT() proto.Message {
+func (m *MockMsg) CloneMessageVT() proto.Message {
 	return m.CloneVT()
 }
 
 func (this *MockMsg) EqualVT(that *MockMsg) bool {
-	if this == nil {
-		return that == nil
-	} else if that == nil {
+	if this == that {
+		return true
+	} else if this == nil || that == nil {
 		return false
 	}
 	if this.Body != that.Body {
@@ -50,6 +50,13 @@ func (this *MockMsg) EqualVT(that *MockMsg) bool {
 	return string(this.unknownFields) == string(that.unknownFields)
 }
 
+func (this *MockMsg) EqualMessageVT(thatMsg proto.Message) bool {
+	that, ok := thatMsg.(*MockMsg)
+	if !ok {
+		return false
+	}
+	return this.EqualVT(that)
+}
 func (m *MockMsg) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -204,6 +211,7 @@ func (m *MockMsg) UnmarshalVT(dAtA []byte) error {
 	}
 	return nil
 }
+
 func skip(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

package/echo/echo.pb.go

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

package/echo/echo.pb.ts

@@ -26,19 +26,25 @@ export const EchoMsg = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): EchoMsg {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input)
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input)
     let end = length === undefined ? reader.len : reader.pos + length
     const message = createBaseEchoMsg()
     while (reader.pos < end) {
       const tag = reader.uint32()
       switch (tag >>> 3) {
         case 1:
+          if (tag != 10) {
+            break
+          }
+
           message.body = reader.string()
-          break
-        default:
-          reader.skipType(tag & 7)
-          break
+          continue
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break
       }
+      reader.skipType(tag & 7)
     }
     return message
   },
@@ -144,7 +150,7 @@ export class EchoerClientImpl implements Echoer {
       data,
       abortSignal || undefined
     )
-    return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)))
+    return promise.then((data) => EchoMsg.decode(_m0.Reader.create(data)))
   }
 
   EchoServerStream(
@@ -172,7 +178,7 @@ export class EchoerClientImpl implements Echoer {
       data,
       abortSignal || undefined
     )
-    return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)))
+    return promise.then((data) => EchoMsg.decode(_m0.Reader.create(data)))
   }
 
   EchoBidiStream(

package/echo/echo_srpc.pb.go

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

package/echo/echo_vtproto.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.3.1-0.20220817155510-0ae748fd2007
+// protoc-gen-go-vtproto version: v0.4.0
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo
@@ -34,14 +34,14 @@ func (m *EchoMsg) CloneVT() *EchoMsg {
 	return r
 }
 
-func (m *EchoMsg) CloneGenericVT() proto.Message {
+func (m *EchoMsg) CloneMessageVT() proto.Message {
 	return m.CloneVT()
 }
 
 func (this *EchoMsg) EqualVT(that *EchoMsg) bool {
-	if this == nil {
-		return that == nil
-	} else if that == nil {
+	if this == that {
+		return true
+	} else if this == nil || that == nil {
 		return false
 	}
 	if this.Body != that.Body {
@@ -50,6 +50,13 @@ func (this *EchoMsg) EqualVT(that *EchoMsg) bool {
 	return string(this.unknownFields) == string(that.unknownFields)
 }
 
+func (this *EchoMsg) EqualMessageVT(thatMsg proto.Message) bool {
+	that, ok := thatMsg.(*EchoMsg)
+	if !ok {
+		return false
+	}
+	return this.EqualVT(that)
+}
 func (m *EchoMsg) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -204,6 +211,7 @@ func (m *EchoMsg) UnmarshalVT(dAtA []byte) error {
 	}
 	return nil
 }
+
 func skip(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

package/go.mod

@@ -3,27 +3,24 @@ module github.com/aperturerobotics/starpc
 go 1.18
 
 require (
-	github.com/pkg/errors v0.9.1
-	google.golang.org/protobuf v1.28.1
-	nhooyr.io/websocket v1.8.8-0.20221213223501-14fb98eba64e
+	github.com/pkg/errors v0.9.1 // latest
+	google.golang.org/protobuf v1.30.0 // latest
+	nhooyr.io/websocket v1.8.8-0.20221213223501-14fb98eba64e // master
 )
 
 require (
-	github.com/aperturerobotics/util v1.0.3-0.20230130061818-dab10b56858b
-	github.com/libp2p/go-libp2p v0.24.2
-	github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1
-	github.com/sirupsen/logrus v1.9.0
+	github.com/aperturerobotics/util v1.0.6-0.20230313071030-6260e05b62e5 // latest
+	github.com/libp2p/go-libp2p v0.26.3 // latest
+	github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1 // master
+	github.com/sirupsen/logrus v1.9.0 // latest
 )
 
 require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/ipfs/go-cid v0.3.2 // indirect
 	github.com/klauspost/compress v1.15.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.1 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-openssl v0.1.0 // indirect
-	github.com/mattn/go-pointer v0.0.1 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
@@ -32,10 +29,11 @@ require (
 	github.com/multiformats/go-multibase v0.1.1 // indirect
 	github.com/multiformats/go-multicodec v0.7.0 // indirect
 	github.com/multiformats/go-multihash v0.2.1 // indirect
+	github.com/multiformats/go-multistream v0.4.1 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	golang.org/x/crypto v0.3.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/crypto v0.4.0 // indirect
+	golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	lukechampine.com/blake3 v1.1.7 // indirect
 )

package/go.sum

@@ -1,5 +1,5 @@
-github.com/aperturerobotics/util v1.0.3-0.20230130061818-dab10b56858b h1:E+riBVCoYAZL2ATHTlDZYZRZj/6FPb+UGHVTQdU03UU=
-github.com/aperturerobotics/util v1.0.3-0.20230130061818-dab10b56858b/go.mod h1:gFLdglkzXYEWP/iYrOGeJEKzfjarlMDPrLNLgwDHC1o=
+github.com/aperturerobotics/util v1.0.6-0.20230313071030-6260e05b62e5 h1:SVQsecow4oFN4ra6SURikAJROdvSYY2lI0vujic5veU=
+github.com/aperturerobotics/util v1.0.6-0.20230313071030-6260e05b62e5/go.mod h1:45zfYCir2T5/KE+O9CyYdZPrsXZtOEAuA4UU79rRMN4=
 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=
@@ -23,8 +23,6 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -33,14 +31,12 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/ipfs/go-cid v0.3.2 h1:OGgOd+JCFM+y1DjWPmVH+2/4POtpDzwcr7VgnB7mZXc=
 github.com/ipfs/go-cid v0.3.2/go.mod h1:gQ8pKqT/sUxGY+tIwy1RPpAojYu7jAyCp5Tz1svoupw=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
 github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
@@ -52,17 +48,13 @@ 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.24.2 h1:iMViPIcLY0D6zr/f+1Yq9EavCZu2i7eDstsr1nEwSAk=
-github.com/libp2p/go-libp2p v0.24.2/go.mod h1:WuxtL2V8yGjam03D93ZBC19tvOUiPpewYv1xdFGWu1k=
+github.com/libp2p/go-libp2p v0.26.3 h1:6g/psubqwdaBqNNoidbRKSTBEYgaOuKBhHl8Q5tO+PM=
+github.com/libp2p/go-libp2p v0.26.3/go.mod h1:x75BN32YbwuY0Awm2Uix4d4KOz+/4piInkp4Wr3yOo8=
 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=
 github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1 h1:fxyHejZvFIBqlznQDuHUkw9BThYKyoT3DclP/C2g8Wc=
 github.com/libp2p/go-yamux/v4 v4.0.1-0.20220919134236-1c09f2ab3ec1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0=
-github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
@@ -83,6 +75,8 @@ github.com/multiformats/go-multicodec v0.7.0 h1:rTUjGOwjlhGHbEMbPoSUJowG1spZTVsI
 github.com/multiformats/go-multicodec v0.7.0/go.mod h1:GUC8upxSBE4oG+q3kWZRw/+6yC1BqO550bjhWsJbZlw=
 github.com/multiformats/go-multihash v0.2.1 h1:aem8ZT0VA2nCHHk7bPJ1BjUbHNciqZC/d16Vve9l108=
 github.com/multiformats/go-multihash v0.2.1/go.mod h1:WxoMcYG85AZVQUyRyo9s4wULvW5qrI9vb2Lt6evduFc=
+github.com/multiformats/go-multistream v0.4.1 h1:rFy0Iiyn3YT0asivDUIR05leAdwZq3de4741sbiSdfo=
+github.com/multiformats/go-multistream v0.4.1/go.mod h1:Mz5eykRVAjJWckE2U78c6xqdtyNUEhKSM0Lwar2p77Q=
 github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
 github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -91,8 +85,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 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=
@@ -104,46 +96,22 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de h1:VO/n/VqVQnSnxYKbExOquQRm9FLLepZKkpYyXf1+6l8=
+golang.org/x/sys v0.4.1-0.20230131160137-e7d7f63158de/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -60,28 +60,28 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aperturerobotics/ts-common": "^0.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2",
+    "@aperturerobotics/ts-common": "^0.3.4",
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
+    "@typescript-eslint/parser": "^5.56.0",
     "bufferutil": "^4.0.7",
     "depcheck": "^1.4.3",
-    "esbuild": "^0.17.1",
-    "eslint": "^8.32.0",
-    "eslint-config-prettier": "^8.6.0",
-    "prettier": "^2.8.3",
-    "rimraf": "^4.1.0",
-    "ts-proto": "^1.138.0",
-    "typescript": "^4.9.5",
-    "utf-8-validate": "^6.0.0"
+    "esbuild": "^0.17.12",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.8.0",
+    "prettier": "^2.8.5",
+    "rimraf": "^4.4.0",
+    "ts-proto": "^1.143.0",
+    "typescript": "^5.0.2",
+    "utf-8-validate": "^6.0.3"
   },
   "dependencies": {
-    "@chainsafe/libp2p-yamux": "^3.0.5",
-    "@libp2p/interface-connection": "^3.0.7",
+    "@chainsafe/libp2p-yamux": "^3.0.7",
+    "@libp2p/interface-connection": "^3.1.1",
     "@libp2p/interface-stream-muxer": "^3.0.4",
     "event-iterator": "^2.0.0",
     "is-promise": "^4.0.0",
     "isomorphic-ws": "^5.0.0",
-    "it-first": "^2.0.0",
+    "it-first": "^2.0.1",
     "it-length-prefixed": "^8.0.4",
     "it-pipe": "^2.0.5",
     "it-pushable": "^3.1.2",
@@ -92,6 +92,6 @@
     "patch-package": "^6.5.1",
     "protobufjs": "^7.1.2",
     "uint8arraylist": "^2.4.3",
-    "ws": "^8.12.0"
+    "ws": "^8.13.0"
   }
 }

package/srpc/rpcproto.pb.go

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

package/srpc/rpcproto.pb.ts

@@ -60,47 +60,66 @@ export const Packet = {
     message: Packet,
     writer: _m0.Writer = _m0.Writer.create()
   ): _m0.Writer {
-    if (message.body?.$case === 'callStart') {
-      CallStart.encode(
-        message.body.callStart,
-        writer.uint32(10).fork()
-      ).ldelim()
-    }
-    if (message.body?.$case === 'callData') {
-      CallData.encode(message.body.callData, writer.uint32(18).fork()).ldelim()
-    }
-    if (message.body?.$case === 'callCancel') {
-      writer.uint32(24).bool(message.body.callCancel)
+    switch (message.body?.$case) {
+      case 'callStart':
+        CallStart.encode(
+          message.body.callStart,
+          writer.uint32(10).fork()
+        ).ldelim()
+        break
+      case 'callData':
+        CallData.encode(
+          message.body.callData,
+          writer.uint32(18).fork()
+        ).ldelim()
+        break
+      case 'callCancel':
+        writer.uint32(24).bool(message.body.callCancel)
+        break
     }
     return writer
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Packet {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input)
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input)
     let end = length === undefined ? reader.len : reader.pos + length
     const message = createBasePacket()
     while (reader.pos < end) {
       const tag = reader.uint32()
       switch (tag >>> 3) {
         case 1:
+          if (tag != 10) {
+            break
+          }
+
           message.body = {
             $case: 'callStart',
             callStart: CallStart.decode(reader, reader.uint32()),
           }
-          break
+          continue
         case 2:
+          if (tag != 18) {
+            break
+          }
+
           message.body = {
             $case: 'callData',
             callData: CallData.decode(reader, reader.uint32()),
           }
-          break
+          continue
         case 3:
+          if (tag != 24) {
+            break
+          }
+
           message.body = { $case: 'callCancel', callCancel: reader.bool() }
-          break
-        default:
-          reader.skipType(tag & 7)
-          break
+          continue
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break
       }
+      reader.skipType(tag & 7)
     }
     return message
   },
@@ -236,28 +255,46 @@ export const CallStart = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CallStart {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input)
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input)
     let end = length === undefined ? reader.len : reader.pos + length
     const message = createBaseCallStart()
     while (reader.pos < end) {
       const tag = reader.uint32()
       switch (tag >>> 3) {
         case 1:
+          if (tag != 10) {
+            break
+          }
+
           message.rpcService = reader.string()
-          break
+          continue
         case 2:
+          if (tag != 18) {
+            break
+          }
+
           message.rpcMethod = reader.string()
-          break
+          continue
         case 3:
+          if (tag != 26) {
+            break
+          }
+
           message.data = reader.bytes()
-          break
+          continue
         case 4:
+          if (tag != 32) {
+            break
+          }
+
           message.dataIsZero = reader.bool()
-          break
-        default:
-          reader.skipType(tag & 7)
-          break
+          continue
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break
       }
+      reader.skipType(tag & 7)
     }
     return message
   },
@@ -367,28 +404,46 @@ export const CallData = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CallData {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input)
+    const reader =
+      input instanceof _m0.Reader ? input : _m0.Reader.create(input)
     let end = length === undefined ? reader.len : reader.pos + length
     const message = createBaseCallData()
     while (reader.pos < end) {
       const tag = reader.uint32()
       switch (tag >>> 3) {
         case 1:
+          if (tag != 10) {
+            break
+          }
+
           message.data = reader.bytes()
-          break
+          continue
         case 2:
+          if (tag != 16) {
+            break
+          }
+
           message.dataIsZero = reader.bool()
-          break
+          continue
         case 3:
+          if (tag != 24) {
+            break
+          }
+
           message.complete = reader.bool()
-          break
+          continue
         case 4:
+          if (tag != 34) {
+            break
+          }
+
           message.error = reader.string()
-          break
-        default:
-          reader.skipType(tag & 7)
-          break
+          continue
+      }
+      if ((tag & 7) == 4 || tag == 0) {
+        break
       }
+      reader.skipType(tag & 7)
     }
     return message
   },

package/srpc/rpcproto_vtproto.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// protoc-gen-go-vtproto version: v0.3.1-0.20220817155510-0ae748fd2007
+// protoc-gen-go-vtproto version: v0.4.0
 // source: github.com/aperturerobotics/starpc/srpc/rpcproto.proto
 
 package srpc
@@ -35,7 +35,7 @@ func (m *Packet) CloneVT() *Packet {
 	return r
 }
 
-func (m *Packet) CloneGenericVT() proto.Message {
+func (m *Packet) CloneMessageVT() proto.Message {
 	return m.CloneVT()
 }
 
@@ -90,7 +90,7 @@ func (m *CallStart) CloneVT() *CallStart {
 	return r
 }
 
-func (m *CallStart) CloneGenericVT() proto.Message {
+func (m *CallStart) CloneMessageVT() proto.Message {
 	return m.CloneVT()
 }
 
@@ -115,14 +115,14 @@ func (m *CallData) CloneVT() *CallData {
 	return r
 }
 
-func (m *CallData) CloneGenericVT() proto.Message {
+func (m *CallData) CloneMessageVT() proto.Message {
 	return m.CloneVT()
 }
 
 func (this *Packet) EqualVT(that *Packet) bool {
-	if this == nil {
-		return that == nil
-	} else if that == nil {
+	if this == that {
+		return true
+	} else if this == nil || that == nil {
 		return false
 	}
 	if this.Body == nil && that.Body != nil {
@@ -138,6 +138,13 @@ func (this *Packet) EqualVT(that *Packet) bool {
 	return string(this.unknownFields) == string(that.unknownFields)
 }
 
+func (this *Packet) EqualMessageVT(thatMsg proto.Message) bool {
+	that, ok := thatMsg.(*Packet)
+	if !ok {
+		return false
+	}
+	return this.EqualVT(that)
+}
 func (this *Packet_CallStart) EqualVT(thatIface isPacket_Body) bool {
 	that, ok := thatIface.(*Packet_CallStart)
 	if !ok {
@@ -206,9 +213,9 @@ func (this *Packet_CallCancel) EqualVT(thatIface isPacket_Body) bool {
 }
 
 func (this *CallStart) EqualVT(that *CallStart) bool {
-	if this == nil {
-		return that == nil
-	} else if that == nil {
+	if this == that {
+		return true
+	} else if this == nil || that == nil {
 		return false
 	}
 	if this.RpcService != that.RpcService {
@@ -226,10 +233,17 @@ func (this *CallStart) EqualVT(that *CallStart) bool {
 	return string(this.unknownFields) == string(that.unknownFields)
 }
 
+func (this *CallStart) EqualMessageVT(thatMsg proto.Message) bool {
+	that, ok := thatMsg.(*CallStart)
+	if !ok {
+		return false
+	}
+	return this.EqualVT(that)
+}
 func (this *CallData) EqualVT(that *CallData) bool {
-	if this == nil {
-		return that == nil
-	} else if that == nil {
+	if this == that {
+		return true
+	} else if this == nil || that == nil {
 		return false
 	}
 	if string(this.Data) != string(that.Data) {
@@ -247,6 +261,13 @@ func (this *CallData) EqualVT(that *CallData) bool {
 	return string(this.unknownFields) == string(that.unknownFields)
 }
 
+func (this *CallData) EqualMessageVT(thatMsg proto.Message) bool {
+	that, ok := thatMsg.(*CallData)
+	if !ok {
+		return false
+	}
+	return this.EqualVT(that)
+}
 func (m *Packet) MarshalVT() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -1067,6 +1088,7 @@ func (m *CallData) UnmarshalVT(dAtA []byte) error {
 	}
 	return nil
 }
+
 func skip(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0