starpc 0.9.1 → 0.10.1

package/echo/echo.pb.ts

@@ -1,60 +1,57 @@
 /* eslint-disable */
-import Long from 'long'
-import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js'
-import _m0 from 'protobufjs/minimal.js'
+import Long from "long";
+import _m0 from "protobufjs/minimal.js";
+import { RpcStreamPacket } from "../rpcstream/rpcstream.pb.js";
 
-export const protobufPackage = 'echo'
+export const protobufPackage = "echo";
 
 /** EchoMsg is the message body for Echo. */
 export interface EchoMsg {
-  body: string
+  body: string;
 }
 
 function createBaseEchoMsg(): EchoMsg {
-  return { body: '' }
+  return { body: "" };
 }
 
 export const EchoMsg = {
-  encode(
-    message: EchoMsg,
-    writer: _m0.Writer = _m0.Writer.create()
-  ): _m0.Writer {
-    if (message.body !== '') {
-      writer.uint32(10).string(message.body)
+  encode(message: EchoMsg, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.body !== "") {
+      writer.uint32(10).string(message.body);
     }
-    return writer
+    return writer;
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): EchoMsg {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input)
-    let end = length === undefined ? reader.len : reader.pos + length
-    const message = createBaseEchoMsg()
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseEchoMsg();
     while (reader.pos < end) {
-      const tag = reader.uint32()
+      const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          message.body = reader.string()
-          break
+          message.body = reader.string();
+          break;
         default:
-          reader.skipType(tag & 7)
-          break
+          reader.skipType(tag & 7);
+          break;
       }
     }
-    return message
+    return message;
   },
 
   // encodeTransform encodes a source of message objects.
   // Transform<EchoMsg, Uint8Array>
   async *encodeTransform(
-    source: AsyncIterable<EchoMsg | EchoMsg[]> | Iterable<EchoMsg | EchoMsg[]>
+    source: AsyncIterable<EchoMsg | EchoMsg[]> | Iterable<EchoMsg | EchoMsg[]>,
   ): AsyncIterable<Uint8Array> {
     for await (const pkt of source) {
       if (Array.isArray(pkt)) {
         for (const p of pkt) {
-          yield* [EchoMsg.encode(p).finish()]
+          yield* [EchoMsg.encode(p).finish()];
         }
       } else {
-        yield* [EchoMsg.encode(pkt).finish()]
+        yield* [EchoMsg.encode(pkt).finish()];
       }
     }
   },
@@ -62,124 +59,100 @@ export const EchoMsg = {
   // decodeTransform decodes a source of encoded messages.
   // Transform<Uint8Array, EchoMsg>
   async *decodeTransform(
-    source:
-      | AsyncIterable<Uint8Array | Uint8Array[]>
-      | Iterable<Uint8Array | Uint8Array[]>
+    source: AsyncIterable<Uint8Array | Uint8Array[]> | Iterable<Uint8Array | Uint8Array[]>,
   ): AsyncIterable<EchoMsg> {
     for await (const pkt of source) {
       if (Array.isArray(pkt)) {
         for (const p of pkt) {
-          yield* [EchoMsg.decode(p)]
+          yield* [EchoMsg.decode(p)];
         }
       } else {
-        yield* [EchoMsg.decode(pkt)]
+        yield* [EchoMsg.decode(pkt)];
       }
     }
   },
 
   fromJSON(object: any): EchoMsg {
-    return {
-      body: isSet(object.body) ? String(object.body) : '',
-    }
+    return { body: isSet(object.body) ? String(object.body) : "" };
   },
 
   toJSON(message: EchoMsg): unknown {
-    const obj: any = {}
-    message.body !== undefined && (obj.body = message.body)
-    return obj
+    const obj: any = {};
+    message.body !== undefined && (obj.body = message.body);
+    return obj;
   },
 
   fromPartial<I extends Exact<DeepPartial<EchoMsg>, I>>(object: I): EchoMsg {
-    const message = createBaseEchoMsg()
-    message.body = object.body ?? ''
-    return message
+    const message = createBaseEchoMsg();
+    message.body = object.body ?? "";
+    return message;
   },
-}
+};
 
 /** Echoer service returns the given message. */
 export interface Echoer {
   /** Echo returns the given message. */
-  Echo(request: EchoMsg): Promise<EchoMsg>
+  Echo(request: EchoMsg): Promise<EchoMsg>;
   /** EchoServerStream is an example of a server -> client one-way stream. */
-  EchoServerStream(request: EchoMsg): AsyncIterable<EchoMsg>
+  EchoServerStream(request: EchoMsg): AsyncIterable<EchoMsg>;
   /** EchoClientStream is an example of client->server one-way stream. */
-  EchoClientStream(request: AsyncIterable<EchoMsg>): Promise<EchoMsg>
+  EchoClientStream(request: AsyncIterable<EchoMsg>): Promise<EchoMsg>;
   /** EchoBidiStream is an example of a two-way stream. */
-  EchoBidiStream(request: AsyncIterable<EchoMsg>): AsyncIterable<EchoMsg>
+  EchoBidiStream(request: AsyncIterable<EchoMsg>): AsyncIterable<EchoMsg>;
   /** RpcStream opens a nested rpc call stream. */
-  RpcStream(
-    request: AsyncIterable<RpcStreamPacket>
-  ): AsyncIterable<RpcStreamPacket>
+  RpcStream(request: AsyncIterable<RpcStreamPacket>): AsyncIterable<RpcStreamPacket>;
 }
 
 export class EchoerClientImpl implements Echoer {
-  private readonly rpc: Rpc
+  private readonly rpc: Rpc;
   constructor(rpc: Rpc) {
-    this.rpc = rpc
-    this.Echo = this.Echo.bind(this)
-    this.EchoServerStream = this.EchoServerStream.bind(this)
-    this.EchoClientStream = this.EchoClientStream.bind(this)
-    this.EchoBidiStream = this.EchoBidiStream.bind(this)
-    this.RpcStream = this.RpcStream.bind(this)
+    this.rpc = rpc;
+    this.Echo = this.Echo.bind(this);
+    this.EchoServerStream = this.EchoServerStream.bind(this);
+    this.EchoClientStream = this.EchoClientStream.bind(this);
+    this.EchoBidiStream = this.EchoBidiStream.bind(this);
+    this.RpcStream = this.RpcStream.bind(this);
   }
   Echo(request: EchoMsg): Promise<EchoMsg> {
-    const data = EchoMsg.encode(request).finish()
-    const promise = this.rpc.request('echo.Echoer', 'Echo', data)
-    return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)))
+    const data = EchoMsg.encode(request).finish();
+    const promise = this.rpc.request("echo.Echoer", "Echo", data);
+    return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)));
   }
 
   EchoServerStream(request: EchoMsg): AsyncIterable<EchoMsg> {
-    const data = EchoMsg.encode(request).finish()
-    const result = this.rpc.serverStreamingRequest(
-      'echo.Echoer',
-      'EchoServerStream',
-      data
-    )
-    return EchoMsg.decodeTransform(result)
+    const data = EchoMsg.encode(request).finish();
+    const result = this.rpc.serverStreamingRequest("echo.Echoer", "EchoServerStream", data);
+    return EchoMsg.decodeTransform(result);
   }
 
   EchoClientStream(request: AsyncIterable<EchoMsg>): Promise<EchoMsg> {
-    const data = EchoMsg.encodeTransform(request)
-    const promise = this.rpc.clientStreamingRequest(
-      'echo.Echoer',
-      'EchoClientStream',
-      data
-    )
-    return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)))
+    const data = EchoMsg.encodeTransform(request);
+    const promise = this.rpc.clientStreamingRequest("echo.Echoer", "EchoClientStream", data);
+    return promise.then((data) => EchoMsg.decode(new _m0.Reader(data)));
   }
 
   EchoBidiStream(request: AsyncIterable<EchoMsg>): AsyncIterable<EchoMsg> {
-    const data = EchoMsg.encodeTransform(request)
-    const result = this.rpc.bidirectionalStreamingRequest(
-      'echo.Echoer',
-      'EchoBidiStream',
-      data
-    )
-    return EchoMsg.decodeTransform(result)
+    const data = EchoMsg.encodeTransform(request);
+    const result = this.rpc.bidirectionalStreamingRequest("echo.Echoer", "EchoBidiStream", data);
+    return EchoMsg.decodeTransform(result);
   }
 
-  RpcStream(
-    request: AsyncIterable<RpcStreamPacket>
-  ): AsyncIterable<RpcStreamPacket> {
-    const data = RpcStreamPacket.encodeTransform(request)
-    const result = this.rpc.bidirectionalStreamingRequest(
-      'echo.Echoer',
-      'RpcStream',
-      data
-    )
-    return RpcStreamPacket.decodeTransform(result)
+  RpcStream(request: AsyncIterable<RpcStreamPacket>): AsyncIterable<RpcStreamPacket> {
+    const data = RpcStreamPacket.encodeTransform(request);
+    const result = this.rpc.bidirectionalStreamingRequest("echo.Echoer", "RpcStream", data);
+    return RpcStreamPacket.decodeTransform(result);
   }
 }
 
 /** Echoer service returns the given message. */
-export type EchoerDefinition = typeof EchoerDefinition
+export type EchoerDefinition = typeof EchoerDefinition;
 export const EchoerDefinition = {
-  name: 'Echoer',
-  fullName: 'echo.Echoer',
+  name: "Echoer",
+  fullName: "echo.Echoer",
   methods: {
     /** Echo returns the given message. */
     echo: {
-      name: 'Echo',
+      name: "Echo",
       requestType: EchoMsg,
       requestStream: false,
       responseType: EchoMsg,
@@ -188,7 +161,7 @@ export const EchoerDefinition = {
     },
     /** EchoServerStream is an example of a server -> client one-way stream. */
     echoServerStream: {
-      name: 'EchoServerStream',
+      name: "EchoServerStream",
       requestType: EchoMsg,
       requestStream: false,
       responseType: EchoMsg,
@@ -197,7 +170,7 @@ export const EchoerDefinition = {
     },
     /** EchoClientStream is an example of client->server one-way stream. */
     echoClientStream: {
-      name: 'EchoClientStream',
+      name: "EchoClientStream",
       requestType: EchoMsg,
       requestStream: true,
       responseType: EchoMsg,
@@ -206,7 +179,7 @@ export const EchoerDefinition = {
     },
     /** EchoBidiStream is an example of a two-way stream. */
     echoBidiStream: {
-      name: 'EchoBidiStream',
+      name: "EchoBidiStream",
       requestType: EchoMsg,
       requestStream: true,
       responseType: EchoMsg,
@@ -215,7 +188,7 @@ export const EchoerDefinition = {
     },
     /** RpcStream opens a nested rpc call stream. */
     rpcStream: {
-      name: 'RpcStream',
+      name: "RpcStream",
       requestType: RpcStreamPacket,
       requestStream: true,
       responseType: RpcStreamPacket,
@@ -223,69 +196,37 @@ export const EchoerDefinition = {
       options: {},
     },
   },
-} as const
+} as const;
 
 interface Rpc {
-  request(
-    service: string,
-    method: string,
-    data: Uint8Array
-  ): Promise<Uint8Array>
-  clientStreamingRequest(
-    service: string,
-    method: string,
-    data: AsyncIterable<Uint8Array>
-  ): Promise<Uint8Array>
-  serverStreamingRequest(
-    service: string,
-    method: string,
-    data: Uint8Array
-  ): AsyncIterable<Uint8Array>
+  request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;
+  clientStreamingRequest(service: string, method: string, data: AsyncIterable<Uint8Array>): Promise<Uint8Array>;
+  serverStreamingRequest(service: string, method: string, data: Uint8Array): AsyncIterable<Uint8Array>;
   bidirectionalStreamingRequest(
     service: string,
     method: string,
-    data: AsyncIterable<Uint8Array>
-  ): AsyncIterable<Uint8Array>
+    data: AsyncIterable<Uint8Array>,
+  ): AsyncIterable<Uint8Array>;
 }
 
-type Builtin =
-  | Date
-  | Function
-  | Uint8Array
-  | string
-  | number
-  | boolean
-  | undefined
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
-export type DeepPartial<T> = T extends Builtin
-  ? T
-  : T extends Long
-  ? string | number | Long
-  : T extends Array<infer U>
-  ? Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U>
-  ? ReadonlyArray<DeepPartial<U>>
-  : T extends { $case: string }
-  ? { [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]> } & {
-      $case: T['$case']
-    }
-  : T extends {}
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends { $case: string } ? { [K in keyof Omit<T, "$case">]?: DeepPartial<T[K]> } & { $case: T["$case"] }
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
 
-type KeysOfUnion<T> = T extends T ? keyof T : never
-export type Exact<P, I extends P> = P extends Builtin
-  ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & Record<
-        Exclude<keyof I, KeysOfUnion<P>>,
-        never
-      >
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
 
 if (_m0.util.Long !== Long) {
-  _m0.util.Long = Long as any
-  _m0.configure()
+  _m0.util.Long = Long as any;
+  _m0.configure();
 }
 
 function isSet(value: any): boolean {
-  return value !== null && value !== undefined
+  return value !== null && value !== undefined;
 }

package/echo/echo_srpc.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-srpc. DO NOT EDIT.
-// protoc-gen-srpc version: v0.8.6
+// protoc-gen-srpc version: v0.9.2
 // 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.20220531071333-dfd3d322ffb6
+// protoc-gen-go-vtproto version: v0.3.1-0.20220817155510-0ae748fd2007
 // source: github.com/aperturerobotics/starpc/echo/echo.proto
 
 package echo
@@ -21,9 +21,9 @@ const (
 
 func (this *EchoMsg) EqualVT(that *EchoMsg) bool {
 	if this == nil {
-		return that == nil || that.String() == ""
+		return that == nil
 	} else if that == nil {
-		return this.String() == ""
+		return false
 	}
 	if this.Body != that.Body {
 		return false

package/go.mod

@@ -2,8 +2,6 @@ module github.com/aperturerobotics/starpc
 
 go 1.18
 
-replace github.com/libp2p/go-libp2p => github.com/paralin/go-libp2p v0.20.1-0.20220702024301-86e6932dc57e // aperture
-
 require (
 	github.com/pkg/errors v0.9.1
 	google.golang.org/protobuf v1.28.1
@@ -11,39 +9,38 @@ require (
 )
 
 require (
-	github.com/libp2p/go-libp2p v0.21.0
-	github.com/libp2p/go-libp2p-core v0.19.1
-	github.com/libp2p/go-mplex v0.7.1-0.20220702225122-8cbdf39b21f5
+	github.com/libp2p/go-libp2p v0.22.0
+	github.com/libp2p/go-libp2p-core v0.20.1
+	github.com/libp2p/go-mplex v0.7.1-0.20220825125536-a00a1352b54f
 	github.com/sirupsen/logrus v1.9.0
 )
 
 require (
-	github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	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.2.0 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
 	github.com/klauspost/compress v1.15.1 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
-	github.com/libp2p/go-buffer-pool v0.0.2 // indirect
-	github.com/libp2p/go-openssl v0.0.7 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
+	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/libp2p/go-openssl v0.1.0 // indirect
+	github.com/mattn/go-isatty v0.0.16 // 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.0.3 // indirect
+	github.com/multiformats/go-base32 v0.0.4 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
 	github.com/multiformats/go-multiaddr v0.6.0 // indirect
-	github.com/multiformats/go-multibase v0.0.3 // indirect
-	github.com/multiformats/go-multicodec v0.4.1 // indirect
-	github.com/multiformats/go-multihash v0.1.0 // indirect
+	github.com/multiformats/go-multibase v0.1.1 // indirect
+	github.com/multiformats/go-multicodec v0.5.0 // indirect
+	github.com/multiformats/go-multihash v0.2.1 // indirect
 	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
-	lukechampine.com/blake3 v1.1.6 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.22.0 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
+	lukechampine.com/blake3 v1.1.7 // indirect
 )