starpc 0.9.2 → 0.10.2

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.20220531071333-dfd3d322ffb6
+// protoc-gen-go-vtproto version: v0.3.1-0.20220817155510-0ae748fd2007
 // source: github.com/aperturerobotics/starpc/srpc/rpcproto.proto
 
 package srpc
@@ -21,9 +21,9 @@ const (
 
 func (this *Packet) EqualVT(that *Packet) bool {
 	if this == nil {
-		return that == nil || that.String() == ""
+		return that == nil
 	} else if that == nil {
-		return this.String() == ""
+		return false
 	}
 	if this.Body == nil && that.Body != nil {
 		return false
@@ -31,21 +31,68 @@ func (this *Packet) EqualVT(that *Packet) bool {
 		if that.Body == nil {
 			return false
 		}
-		if !this.GetCallStart().EqualVT(that.GetCallStart()) {
+		if !this.Body.(interface{ EqualVT(isPacket_Body) bool }).EqualVT(that.Body) {
 			return false
 		}
-		if !this.GetCallData().EqualVT(that.GetCallData()) {
+	}
+	return string(this.unknownFields) == string(that.unknownFields)
+}
+
+func (this *Packet_CallStart) EqualVT(thatIface isPacket_Body) bool {
+	that, ok := thatIface.(*Packet_CallStart)
+	if !ok {
+		return false
+	}
+	if this == that {
+		return true
+	}
+	if this == nil && that != nil || this != nil && that == nil {
+		return false
+	}
+	if p, q := this.CallStart, that.CallStart; p != q {
+		if p == nil {
+			p = &CallStart{}
+		}
+		if q == nil {
+			q = &CallStart{}
+		}
+		if !p.EqualVT(q) {
 			return false
 		}
 	}
-	return string(this.unknownFields) == string(that.unknownFields)
+	return true
+}
+
+func (this *Packet_CallData) EqualVT(thatIface isPacket_Body) bool {
+	that, ok := thatIface.(*Packet_CallData)
+	if !ok {
+		return false
+	}
+	if this == that {
+		return true
+	}
+	if this == nil && that != nil || this != nil && that == nil {
+		return false
+	}
+	if p, q := this.CallData, that.CallData; p != q {
+		if p == nil {
+			p = &CallData{}
+		}
+		if q == nil {
+			q = &CallData{}
+		}
+		if !p.EqualVT(q) {
+			return false
+		}
+	}
+	return true
 }
 
 func (this *CallStart) EqualVT(that *CallStart) bool {
 	if this == nil {
-		return that == nil || that.String() == ""
+		return that == nil
 	} else if that == nil {
-		return this.String() == ""
+		return false
 	}
 	if this.RpcService != that.RpcService {
 		return false
@@ -64,9 +111,9 @@ func (this *CallStart) EqualVT(that *CallStart) bool {
 
 func (this *CallData) EqualVT(that *CallData) bool {
 	if this == nil {
-		return that == nil || that.String() == ""
+		return that == nil
 	} else if that == nil {
-		return this.String() == ""
+		return false
 	}
 	if string(this.Data) != string(that.Data) {
 		return false
@@ -464,7 +511,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
 				if err := v.UnmarshalVT(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				}
-				m.Body = &Packet_CallStart{v}
+				m.Body = &Packet_CallStart{CallStart: v}
 			}
 			iNdEx = postIndex
 		case 2:
@@ -505,7 +552,7 @@ func (m *Packet) UnmarshalVT(dAtA []byte) error {
 				if err := v.UnmarshalVT(dAtA[iNdEx:postIndex]); err != nil {
 					return err
 				}
-				m.Body = &Packet_CallData{v}
+				m.Body = &Packet_CallData{CallData: v}
 			}
 			iNdEx = postIndex
 		default:

package/srpc/server.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p/core/network"
 )
 
 // Server handles incoming RPC streams with a mux.

package/srpc/server.ts

@@ -1,6 +1,7 @@
 import { Stream } from '@libp2p/interface-connection'
 import { Duplex } from 'it-stream-types'
 import { pipe } from 'it-pipe'
+import { Uint8ArrayList } from 'uint8arraylist'
 
 import { LookupMethod } from './mux.js'
 import { ServerRPC } from './server-rpc.js'
@@ -41,7 +42,9 @@ export class Server implements StreamHandler {
   }
 
   // handleDuplex handles an incoming message duplex.
-  public handleDuplex(stream: Duplex<Uint8Array>): ServerRPC {
+  public handleDuplex(
+    stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>
+  ): ServerRPC {
     const rpc = this.startRpc()
     pipe(
       stream,
@@ -51,7 +54,6 @@ export class Server implements StreamHandler {
       rpc,
       encodePacketSource,
       prependLengthPrefixTransform(),
-      combineUint8ArrayListTransform(),
       stream
     )
     return rpc

package/srpc/stream.ts

@@ -1,11 +1,12 @@
 import type { Packet } from './rpcproto.pb.js'
 import type { Duplex } from 'it-stream-types'
+import { Uint8ArrayList } from 'uint8arraylist'
 
 // PacketHandler handles incoming packets.
 export type PacketHandler = (packet: Packet) => Promise<void>
 
 // Stream is an open connection.
-export type Stream = Duplex<Uint8Array>
+export type Stream = Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>
 
 // OpenStreamFunc is a function to start a new RPC by opening a Stream.
 export type OpenStreamFunc = () => Promise<Stream>

package/srpc/websocket.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
 	"nhooyr.io/websocket"
 )

package/patches/ts-poet+4.15.0.patch

@@ -1,45 +0,0 @@
-diff --git a/node_modules/ts-poet/build/Import.js b/node_modules/ts-poet/build/Import.js
-index b92bea3..d35c845 100644
---- a/node_modules/ts-poet/build/Import.js
-+++ b/node_modules/ts-poet/build/Import.js
-@@ -26,6 +26,7 @@ exports.sameModule = exports.maybeRelativePath = exports.emitImports = exports.S
- const lodash_1 = __importDefault(require("lodash"));
- const path = __importStar(require("path"));
- const Node_1 = require("./Node");
-+const fs = require('fs');
- const typeImportMarker = '(?:t:)?';
- const fileNamePattern = '(?:[a-zA-Z0-9._-]+)';
- const modulePattern = `@?(?:(?:${fileNamePattern}(?:/${fileNamePattern})*))`;
-@@ -293,6 +294,16 @@ function emitImports(imports, ourModulePath, importMappings) {
-         return '';
-     }
-     let result = '';
-+    // HACK: take the project root import path from $PROJECT
-+    const thisProject = process.env.PROJECT;
-+    let ourModuleImportPath = path.normalize(ourModulePath);
-+    // HACK: if this is an import from our project, set the path accordingly
-+    // github.com/aperturerobotics/protobuf-project/example/example -> ./example/example
-+    if (thisProject && ourModuleImportPath.startsWith(thisProject)) {
-+        ourModuleImportPath = './' + ourModuleImportPath.substr(thisProject.length + 1);
-+    } else {
-+      ourModuleImportPath = './vendor/' + ourModuleImportPath;
-+    }
-     const augmentImports = lodash_1.default.groupBy(filterInstances(imports, Augmented), (a) => a.augmented);
-     // Group the imports by source module they're imported from
-     const importsByModule = lodash_1.default.groupBy(imports.filter((it) => it.source !== undefined &&
-@@ -307,7 +318,14 @@ function emitImports(imports, ourModulePath, importMappings) {
-         if (modulePath in importMappings) {
-             modulePath = importMappings[modulePath];
-         }
--        const importPath = maybeRelativePath(ourModulePath, modulePath);
-+        if (thisProject && modulePath.startsWith('./')) {
-+            if (!modulePath.substr(2).startsWith(thisProject)) {
-+                modulePath = './vendor/' + path.normalize(modulePath);
-+            } else {
-+                modulePath = './' + modulePath.substr(3 + thisProject.length);
-+            }
-+        }
-+        const importPath = maybeRelativePath(ourModuleImportPath, modulePath);
-         // Output star imports individually
-         unique(filterInstances(imports, ImportsAll).map((i) => i.symbol)).forEach((symbol) => {
-             result += `import * as ${symbol} from '${importPath}';\n`;