starpc 0.4.6 → 0.4.9

package/dist/echo/index.d.ts

@@ -1,3 +1,3 @@
-export * from './echo.pb.js';
-export * from './server.js';
+export { EchoMsg, Echoer, EchoerClientImpl, EchoerDefinition, } from './echo.pb.js';
+export { EchoerServer } from './server.js';
 export { runClientTest } from './client-test.js';

package/dist/echo/index.js

@@ -1,3 +1,3 @@
-export * from './echo.pb.js';
-export * from './server.js';
+export { EchoMsg, EchoerClientImpl, EchoerDefinition, } from './echo.pb.js';
+export { EchoerServer } from './server.js';
 export { runClientTest } from './client-test.js';

package/dist/rpcstream/index.d.ts

@@ -1 +1,2 @@
-export * from './rpcstream.js';
+export { RpcStream, RpcStreamCaller, RpcStreamGetter, handleRpcStream, buildRpcStreamOpenStream, } from './rpcstream.js';
+export { RpcStreamPacket, RpcStreamInit } from './rpcstream.pb.js';

package/dist/rpcstream/index.js

@@ -1 +1,2 @@
-export * from './rpcstream.js';
+export { RpcStream, handleRpcStream, buildRpcStreamOpenStream, } from './rpcstream.js';
+export { RpcStreamPacket, RpcStreamInit } from './rpcstream.pb.js';

package/dist/rpcstream/rpcstream.js

@@ -11,7 +11,7 @@ export function buildRpcStreamOpenStream(componentId, caller) {
             body: {
                 $case: 'init',
                 init: { componentId },
-            }
+            },
         });
         // build & return the stream
         return new RpcStream(packetSink, packetSource);
@@ -67,7 +67,7 @@ export class RpcStream {
             try {
                 for await (const msg of source) {
                     this._packetSink.push({
-                        body: { $case: 'data', data: msg }
+                        body: { $case: 'data', data: msg },
                     });
                 }
                 this._packetSink.end();

package/dist/srpc/broadcast-channel.d.ts

@@ -2,7 +2,7 @@ import type { Duplex, Sink } from 'it-stream-types';
 import { ConnParams } from './conn.js';
 import { Server } from './server.js';
 import { DuplexConn } from './conn-duplex.js';
-export declare class BroadcastChannelIterable<T> implements Duplex<T> {
+export declare class BroadcastChannelDuplex<T> implements Duplex<T> {
     readonly readChannel: BroadcastChannel;
     readonly writeChannel: BroadcastChannel;
     sink: Sink<T>;
@@ -12,7 +12,7 @@ export declare class BroadcastChannelIterable<T> implements Duplex<T> {
     private _createSink;
     private _createSource;
 }
-export declare function newBroadcastChannelIterable<T>(readName: string, writeName: string): BroadcastChannelIterable<T>;
+export declare function newBroadcastChannelDuplex<T>(readName: string, writeName: string): BroadcastChannelDuplex<T>;
 export declare class BroadcastChannelConn extends DuplexConn {
     private broadcastChannel;
     constructor(readChannel: BroadcastChannel, writeChannel: BroadcastChannel, server?: Server, connParams?: ConnParams);

package/dist/srpc/broadcast-channel.js

@@ -1,7 +1,7 @@
 import { EventIterator } from 'event-iterator';
 import { DuplexConn } from './conn-duplex.js';
-// BroadcastChannelIterable is a AsyncIterable wrapper for BroadcastChannel.
-export class BroadcastChannelIterable {
+// BroadcastChannelDuplex is a AsyncIterable wrapper for BroadcastChannel.
+export class BroadcastChannelDuplex {
     constructor(readChannel, writeChannel) {
         this.readChannel = readChannel;
         this.writeChannel = writeChannel;
@@ -36,16 +36,16 @@ export class BroadcastChannelIterable {
         });
     }
 }
-// newBroadcastChannelIterable constructs a BroadcastChannelIterable with a channel name.
-export function newBroadcastChannelIterable(readName, writeName) {
-    return new BroadcastChannelIterable(new BroadcastChannel(readName), new BroadcastChannel(writeName));
+// newBroadcastChannelDuplex constructs a BroadcastChannelDuplex with a channel name.
+export function newBroadcastChannelDuplex(readName, writeName) {
+    return new BroadcastChannelDuplex(new BroadcastChannel(readName), new BroadcastChannel(writeName));
 }
 // BroadcastChannelConn implements a connection with a BroadcastChannel.
 //
 // expects Uint8Array objects over the BroadcastChannel.
 export class BroadcastChannelConn extends DuplexConn {
     constructor(readChannel, writeChannel, server, connParams) {
-        const broadcastChannel = new BroadcastChannelIterable(readChannel, writeChannel);
+        const broadcastChannel = new BroadcastChannelDuplex(readChannel, writeChannel);
         super(broadcastChannel, server, connParams);
         this.broadcastChannel = broadcastChannel;
     }

package/dist/srpc/index.d.ts

@@ -3,7 +3,8 @@ export { Client } from './client.js';
 export { Server } from './server.js';
 export { Conn, ConnParams } from './conn.js';
 export { Handler, InvokeFn, createHandler, createInvokeFn } from './handler.js';
+export { Packet, CallStart, CallData } from './rpcproto.pb.js';
 export { Mux, createMux } from './mux.js';
-export { BroadcastChannelIterable, newBroadcastChannelIterable, BroadcastChannelConn, } from './broadcast-channel.js';
+export { BroadcastChannelDuplex, newBroadcastChannelDuplex, BroadcastChannelConn, } from './broadcast-channel.js';
 export { MessagePortIterable, newMessagePortIterable, MessagePortConn, } from './message-port.js';
 export { ObservableSource } from './observable-source.js';

package/dist/srpc/index.js

@@ -2,7 +2,8 @@ export { Client } from './client.js';
 export { Server } from './server.js';
 export { Conn } from './conn.js';
 export { createHandler, createInvokeFn } from './handler.js';
+export { Packet, CallStart, CallData } from './rpcproto.pb.js';
 export { createMux } from './mux.js';
-export { BroadcastChannelIterable, newBroadcastChannelIterable, BroadcastChannelConn, } from './broadcast-channel.js';
+export { BroadcastChannelDuplex, newBroadcastChannelDuplex, BroadcastChannelConn, } from './broadcast-channel.js';
 export { MessagePortIterable, newMessagePortIterable, MessagePortConn, } from './message-port.js';
 export { ObservableSource } from './observable-source.js';

package/e2e/e2e_test.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"net"
 	"testing"
+	"time"
 
 	"github.com/aperturerobotics/starpc/echo"
 	"github.com/aperturerobotics/starpc/srpc"
@@ -30,17 +31,21 @@ func RunE2E(t *testing.T, cb func(client echo.SRPCEchoerClient) error) {
 	// construct the client
 	clientPipe, serverPipe := net.Pipe()
 
+	clientMp, err := mp.NewMultiplex(clientPipe, false, nil)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	client := srpc.NewClientWithMuxedConn(mplex.NewMuxedConn(clientMp))
+
 	ctx := context.Background()
+	serverMp, _ := mp.NewMultiplex(serverPipe, true, nil)
 	go func() {
-		serverMp, _ := mp.NewMultiplex(serverPipe, false, nil)
 		_ = server.AcceptMuxedConn(ctx, mplex.NewMuxedConn(serverMp))
 	}()
 
-	clientMp, err := mp.NewMultiplex(clientPipe, true, nil)
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-	client := srpc.NewClientWithMuxedConn(mplex.NewMuxedConn(clientMp))
+	// TODO: requires a moment for the listener to start: not sure why.
+	// the packets /should/ be buffered in the pipe.
+	<-time.After(time.Millisecond * 100)
 
 	// construct the client rpc interface
 	clientEcho := echo.NewSRPCEchoerClient(client)

package/echo/index.ts

@@ -1,3 +1,8 @@
-export * from './echo.pb.js'
-export * from './server.js'
+export {
+  EchoMsg,
+  Echoer,
+  EchoerClientImpl,
+  EchoerDefinition,
+} from './echo.pb.js'
+export { EchoerServer } from './server.js'
 export { runClientTest } from './client-test.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.4.6",
+  "version": "0.4.9",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -56,23 +56,23 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/parser": "^5.30.0",
     "depcheck": "^1.4.3",
-    "esbuild": "^0.14.46",
+    "esbuild": "^0.14.47",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "ts-proto": "^1.115.4",
+    "ts-proto": "^1.115.5",
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@libp2p/interface-connection": "^2.0.0",
-    "@libp2p/interface-stream-muxer": "^1.0.2",
-    "@libp2p/mplex": "^3.0.0",
+    "@libp2p/interface-connection": "^2.1.1",
+    "@libp2p/interface-stream-muxer": "^2.0.1",
+    "@libp2p/mplex": "^4.0.0",
     "event-iterator": "^2.0.0",
-    "isomorphic-ws": "^4.0.1",
+    "isomorphic-ws": "^5.0.0",
     "it-length-prefixed": "^7.0.1",
     "it-pipe": "^2.0.3",
     "it-pushable": "^3.0.0",

package/patches/{ts-poet+4.13.0.patch → ts-poet+4.14.0.patch}

@@ -1,5 +1,5 @@
 diff --git a/node_modules/ts-poet/build/Import.js b/node_modules/ts-poet/build/Import.js
-index c43569e..a77a1b1 100644
+index fe1f6d2..280df8f 100644
 --- a/node_modules/ts-poet/build/Import.js
 +++ b/node_modules/ts-poet/build/Import.js
 @@ -293,6 +293,14 @@ function emitImports(imports, ourModulePath, importMappings) {

package/srpc/broadcast-channel.ts

@@ -5,8 +5,8 @@ import { ConnParams } from './conn.js'
 import { Server } from './server.js'
 import { DuplexConn } from './conn-duplex.js'
 
-// BroadcastChannelIterable is a AsyncIterable wrapper for BroadcastChannel.
-export class BroadcastChannelIterable<T> implements Duplex<T> {
+// BroadcastChannelDuplex is a AsyncIterable wrapper for BroadcastChannel.
+export class BroadcastChannelDuplex<T> implements Duplex<T> {
   // readChannel is the incoming broadcast channel
   public readonly readChannel: BroadcastChannel
   // writeChannel is the outgoing broadcast channel
@@ -55,12 +55,12 @@ export class BroadcastChannelIterable<T> implements Duplex<T> {
   }
 }
 
-// newBroadcastChannelIterable constructs a BroadcastChannelIterable with a channel name.
-export function newBroadcastChannelIterable<T>(
+// newBroadcastChannelDuplex constructs a BroadcastChannelDuplex with a channel name.
+export function newBroadcastChannelDuplex<T>(
   readName: string,
   writeName: string
-): BroadcastChannelIterable<T> {
-  return new BroadcastChannelIterable<T>(
+): BroadcastChannelDuplex<T> {
+  return new BroadcastChannelDuplex<T>(
     new BroadcastChannel(readName),
     new BroadcastChannel(writeName)
   )
@@ -71,7 +71,7 @@ export function newBroadcastChannelIterable<T>(
 // expects Uint8Array objects over the BroadcastChannel.
 export class BroadcastChannelConn extends DuplexConn {
   // broadcastChannel is the broadcast channel iterable
-  private broadcastChannel: BroadcastChannelIterable<Uint8Array>
+  private broadcastChannel: BroadcastChannelDuplex<Uint8Array>
 
   constructor(
     readChannel: BroadcastChannel,
@@ -79,7 +79,7 @@ export class BroadcastChannelConn extends DuplexConn {
     server?: Server,
     connParams?: ConnParams
   ) {
-    const broadcastChannel = new BroadcastChannelIterable<Uint8Array>(
+    const broadcastChannel = new BroadcastChannelDuplex<Uint8Array>(
       readChannel,
       writeChannel
     )

package/srpc/index.ts

@@ -3,10 +3,11 @@ export { Client } from './client.js'
 export { Server } from './server.js'
 export { Conn, ConnParams } from './conn.js'
 export { Handler, InvokeFn, createHandler, createInvokeFn } from './handler.js'
+export { Packet, CallStart, CallData } from './rpcproto.pb.js'
 export { Mux, createMux } from './mux.js'
 export {
-  BroadcastChannelIterable,
-  newBroadcastChannelIterable,
+  BroadcastChannelDuplex,
+  newBroadcastChannelDuplex,
   BroadcastChannelConn,
 } from './broadcast-channel.js'
 export {