starpc 0.8.4 → 0.9.0

package/dist/e2e/e2e.js

@@ -8,7 +8,7 @@ async function runRPC() {
     const echoer = new EchoerServer(server);
     mux.register(createHandler(EchoerDefinition, echoer));
     const clientConn = new Conn();
-    const serverConn = new Conn(server);
+    const serverConn = new Conn(server, { direction: 'inbound' });
     pipe(clientConn, serverConn, clientConn);
     const client = new Client(clientConn.buildOpenStreamFunc());
     await runRpcStreamTest(client);

package/dist/echo/echo.pb.d.ts

@@ -1,6 +1,6 @@
 import Long from 'long';
 import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
-import * as _m0 from 'protobufjs/minimal';
+import _m0 from 'protobufjs/minimal.js';
 export declare const protobufPackage = "echo";
 /** EchoMsg is the message body for Echo. */
 export interface EchoMsg {

package/dist/echo/echo.pb.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from 'long';
 import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
-import * as _m0 from 'protobufjs/minimal';
+import _m0 from 'protobufjs/minimal.js';
 export const protobufPackage = 'echo';
 function createBaseEchoMsg() {
     return { body: '' };

package/dist/integration/integration.js

@@ -5,7 +5,7 @@ async function runRPC() {
     const addr = 'ws://localhost:5000/demo';
     console.log(`Connecting to ${addr}`);
     const ws = new WebSocket(addr);
-    const channel = new WebSocketConn(ws);
+    const channel = new WebSocketConn(ws, 'outbound');
     const client = channel.buildClient();
     console.log('Running client test via WebSocket..');
     await runClientTest(client);

package/dist/rpcstream/rpcstream.pb.d.ts

@@ -1,5 +1,5 @@
 import Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
+import _m0 from 'protobufjs/minimal.js';
 export declare const protobufPackage = "rpcstream";
 /** RpcStreamPacket is a packet encapsulating data for a RPC stream. */
 export interface RpcStreamPacket {

package/dist/rpcstream/rpcstream.pb.js

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
+import _m0 from 'protobufjs/minimal.js';
 export const protobufPackage = 'rpcstream';
 function createBaseRpcStreamPacket() {
     return { body: undefined };

package/dist/srpc/array-list.d.ts

@@ -0,0 +1,3 @@
+import { Uint8ArrayList } from 'uint8arraylist';
+import type { Transform } from 'it-stream-types';
+export declare function combineUint8ArrayListTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8Array>;

package/dist/srpc/array-list.js

@@ -0,0 +1,15 @@
+import { isUint8ArrayList } from 'uint8arraylist';
+// combineUint8ArrayListTransform combines a Uint8ArrayList into a Uint8Array.
+export function combineUint8ArrayListTransform() {
+    // decodeMessageSource unmarshals and async yields encoded Messages.
+    return async function* decodeMessageSource(source) {
+        for await (const obj of source) {
+            if (isUint8ArrayList(obj)) {
+                yield* [obj.subarray()];
+            }
+            else {
+                yield* [obj];
+            }
+        }
+    };
+}

package/dist/srpc/client.js

@@ -3,6 +3,7 @@ import { pushable } from 'it-pushable';
 import { ClientRPC } from './client-rpc.js';
 import { writeToPushable } from './pushable.js';
 import { decodePacketSource, encodePacketSource, parseLengthPrefixTransform, prependLengthPrefixTransform, } from './packet.js';
+import { combineUint8ArrayListTransform } from './array-list.js';
 // Client implements the ts-proto Rpc interface with the drpcproto protocol.
 export class Client {
     constructor(openStreamFn) {
@@ -100,7 +101,7 @@ export class Client {
         const openStreamFn = await this.openStreamFn;
         const conn = await openStreamFn();
         const call = new ClientRPC(rpcService, rpcMethod);
-        pipe(conn, parseLengthPrefixTransform(), decodePacketSource, call, encodePacketSource, prependLengthPrefixTransform(), conn);
+        pipe(conn, parseLengthPrefixTransform(), combineUint8ArrayListTransform(), decodePacketSource, call, encodePacketSource, prependLengthPrefixTransform(), combineUint8ArrayListTransform(), conn);
         await call.writeCallStart(data || undefined);
         return call;
     }

package/dist/srpc/conn.d.ts

@@ -1,10 +1,11 @@
-import type { Stream } from '@libp2p/interface-connection';
+import type { Direction, Stream } from '@libp2p/interface-connection';
 import type { StreamMuxerFactory } from '@libp2p/interface-stream-muxer';
 import type { Duplex } from 'it-stream-types';
 import type { OpenStreamFunc, Stream as SRPCStream } from './stream.js';
 import { Client } from './client.js';
 export interface ConnParams {
     muxerFactory?: StreamMuxerFactory;
+    direction?: Direction;
 }
 export interface StreamHandler {
     handleStream(strm: Duplex<Uint8Array>): void;

package/dist/srpc/conn.js

@@ -15,6 +15,7 @@ export class Conn {
         }
         this.muxer = muxerFactory.createStreamMuxer({
             onIncomingStream: this.handleIncomingStream.bind(this),
+            direction: connParams?.direction || 'outbound',
         });
     }
     // sink returns the message sink.

package/dist/srpc/packet.d.ts

@@ -1,9 +1,10 @@
-import type { Transform } from 'it-stream-types';
 import { Packet } from './rpcproto.pb.js';
+import { Uint8ArrayList } from 'uint8arraylist';
+import { Transform } from 'it-pipe';
 export declare const decodePacketSource: (source: import("it-stream-types").Source<Uint8Array | Uint8Array[]>) => AsyncIterable<Packet>;
 export declare const encodePacketSource: (source: import("it-stream-types").Source<Packet | Packet[]>) => AsyncIterable<Uint8Array>;
-export declare function prependLengthPrefixTransform(): Transform<Uint8Array>;
-export declare function parseLengthPrefixTransform(): Transform<Uint8Array>;
+export declare function prependLengthPrefixTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8ArrayList>;
+export declare function parseLengthPrefixTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8ArrayList>;
 export declare function encodeUint32Le(value: number): Uint8Array;
 export declare function decodeUint32Le(data: Uint8Array): number;
 export declare function prependPacketLen(msgData: Uint8Array): Uint8Array;

package/dist/srpc/packet.js

@@ -1,6 +1,7 @@
 import { encode as lengthPrefixEncode, decode as lengthPrefixDecode, } from 'it-length-prefixed';
 import { Packet } from './rpcproto.pb.js';
 import { buildDecodeMessageTransform, buildEncodeMessageTransform, } from './message.js';
+import { Uint8ArrayList } from 'uint8arraylist';
 // decodePacketSource decodes packets from a binary data stream.
 export const decodePacketSource = buildDecodeMessageTransform(Packet);
 // encodePacketSource encodes packets from a packet object stream.
@@ -10,16 +11,14 @@ const uint32LEDecode = (data) => {
     if (data.length < 4) {
         throw RangeError('Could not decode int32BE');
     }
-    const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
-    return view.getUint32(0, true);
+    return data.getUint32(0, true);
 };
 uint32LEDecode.bytes = 4;
 // uint32LEEncode adds the length prefix.
-const uint32LEEncode = (value, target, offset) => {
-    target = target ?? new Uint8Array(4);
-    const view = new DataView(target.buffer, target.byteOffset, target.byteLength);
-    view.setUint32(offset ?? 0, value, true);
-    return target;
+const uint32LEEncode = (value) => {
+    const data = new Uint8ArrayList(new Uint8Array(4));
+    data.setUint32(0, value, true);
+    return data;
 };
 uint32LEEncode.bytes = 4;
 // prependLengthPrefixTransform adds a length prefix to a message source.

package/dist/srpc/rpcproto.pb.d.ts

@@ -1,5 +1,5 @@
 import Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
+import _m0 from 'protobufjs/minimal.js';
 export declare const protobufPackage = "srpc";
 /** Packet is a message sent over a srpc packet connection. */
 export interface Packet {

package/dist/srpc/rpcproto.pb.js

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import Long from 'long';
-import * as _m0 from 'protobufjs/minimal';
+import _m0 from 'protobufjs/minimal.js';
 export const protobufPackage = 'srpc';
 function createBasePacket() {
     return { body: undefined };

package/dist/srpc/server.js

@@ -1,6 +1,7 @@
 import { pipe } from 'it-pipe';
 import { ServerRPC } from './server-rpc.js';
 import { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketSource, encodePacketSource, } from './packet.js';
+import { combineUint8ArrayListTransform } from './array-list.js';
 // Server implements the SRPC server in TypeScript with a Mux.
 export class Server {
     constructor(lookupMethod) {
@@ -22,7 +23,7 @@ export class Server {
     // handleDuplex handles an incoming message duplex.
     handleDuplex(stream) {
         const rpc = this.startRpc();
-        pipe(stream, parseLengthPrefixTransform(), decodePacketSource, rpc, encodePacketSource, prependLengthPrefixTransform(), stream);
+        pipe(stream, parseLengthPrefixTransform(), combineUint8ArrayListTransform(), decodePacketSource, rpc, encodePacketSource, prependLengthPrefixTransform(), combineUint8ArrayListTransform(), stream);
         return rpc;
     }
     // handlePacketDuplex handles an incoming Uint8Array duplex.

package/dist/srpc/websocket.d.ts

@@ -1,8 +1,9 @@
+import { Direction } from '@libp2p/interface-connection';
 import type WebSocket from 'isomorphic-ws';
 import { Conn } from './conn.js';
 import { Server } from './server.js';
 export declare class WebSocketConn extends Conn {
     private socket;
-    constructor(socket: WebSocket, server?: Server);
+    constructor(socket: WebSocket, direction: Direction, server?: Server);
     getSocket(): WebSocket;
 }

package/dist/srpc/websocket.js

@@ -4,8 +4,9 @@ import { Mplex } from '@libp2p/mplex';
 import { Conn } from './conn.js';
 // WebSocketConn implements a connection with a WebSocket and optional Server.
 export class WebSocketConn extends Conn {
-    constructor(socket, server) {
+    constructor(socket, direction, server) {
         super(server, {
+            direction,
             muxerFactory: new Mplex(),
         });
         this.socket = socket;

package/e2e/e2e.ts

@@ -10,7 +10,7 @@ async function runRPC() {
   mux.register(createHandler(EchoerDefinition, echoer))
 
   const clientConn = new Conn()
-  const serverConn = new Conn(server)
+  const serverConn = new Conn(server, {direction: 'inbound'})
   pipe(clientConn, serverConn, clientConn)
   const client = new Client(clientConn.buildOpenStreamFunc())
 

package/e2e/e2e_test.go

@@ -32,14 +32,16 @@ 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)
+	// outbound=true
+	clientMp, err := mp.NewMultiplex(clientPipe, true, nil)
 	if err != nil {
 		t.Fatal(err.Error())
 	}
 	client := srpc.NewClientWithMuxedConn(mplex.NewMuxedConn(clientMp))
 
 	ctx := context.Background()
-	serverMp, _ := mp.NewMultiplex(serverPipe, true, nil)
+	// outbound=false
+	serverMp, _ := mp.NewMultiplex(serverPipe, false, nil)
 	go func() {
 		_ = server.AcceptMuxedConn(ctx, mplex.NewMuxedConn(serverMp))
 	}()

package/echo/echo.pb.ts

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from 'long'
 import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js'
-import * as _m0 from 'protobufjs/minimal'
+import _m0 from 'protobufjs/minimal.js'
 
 export const protobufPackage = 'echo'
 

package/echo/echo_srpc.pb.go

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

package/go.mod

@@ -6,27 +6,25 @@ replace github.com/libp2p/go-libp2p => github.com/paralin/go-libp2p v0.20.1-0.20
 
 require (
 	github.com/pkg/errors v0.9.1
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/protobuf v1.28.1
 	nhooyr.io/websocket v1.8.8-0.20210410000328-8dee580a7f74
 )
 
 require (
-	github.com/libp2p/go-libp2p v0.20.1-0.20220622205512-3cf611ad8c9c
-	github.com/libp2p/go-libp2p-core v0.19.0
-	github.com/libp2p/go-mplex v0.7.0
-	github.com/sirupsen/logrus v1.8.2-0.20220112234510-85981c045988
+	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/sirupsen/logrus v1.9.0
 )
 
 require (
-	github.com/btcsuite/btcd v0.22.1 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect
-	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // 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.12 // 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
@@ -45,7 +43,7 @@ require (
 	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-20220525230936-793ad666bf5e // indirect
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // 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
 )

package/go.sum

@@ -1,11 +1,9 @@
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
-github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3 h1:xM/n3yIhHAhHy04z4i43C8p4ehixJZMsnrVJkgl+MTE=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 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=
@@ -54,9 +52,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs
 github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A=
 github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.12 h1:p9dKCg8i4gmOxtv35DvrYoWqYzQrvEVdjQ762Y0OqZE=
-github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -64,11 +61,11 @@ 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.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs=
 github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
-github.com/libp2p/go-libp2p-core v0.19.0 h1:KDw7hanmh0EuVdZqsHCAzmkdiYMk5uR5h0UGSCVTxSU=
-github.com/libp2p/go-libp2p-core v0.19.0/go.mod h1:AkA+FUKQfYt1FLNef5fOPlo/naAWjKy/RCjkcPjqzYg=
+github.com/libp2p/go-libp2p-core v0.19.1 h1:zaZQQCeCrFMtxFa1wHy6AhsVynyNmZAvwgWqSSPT3WE=
+github.com/libp2p/go-libp2p-core v0.19.1/go.mod h1:2uLhmmqDiFY+dw+70KkBLeKvvsJHGWUINRDdeV1ip7k=
 github.com/libp2p/go-libp2p-testing v0.10.0 h1:LO7wuUPPNAe1D1s0HZ+9WoROaGIn/MEl1wtugXuTRzg=
-github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
-github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
+github.com/libp2p/go-mplex v0.7.1-0.20220702225122-8cbdf39b21f5 h1:ik8jmF64ZDxAn5K9zJ74ZHed6SBoomwcrP+p6QT7OOQ=
+github.com/libp2p/go-mplex v0.7.1-0.20220702225122-8cbdf39b21f5/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
 github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
 github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
@@ -106,8 +103,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.8.2-0.20220112234510-85981c045988 h1:MF2lii450TvZhyAadvfiBGAr37d/U/ug5+N8eMvK89o=
-github.com/sirupsen/logrus v1.8.2-0.20220112234510-85981c045988/go.mod h1:x/wqQ2RFrvQZEw5sMa05JQ/UbAAIfbzwTyMeXz9S0YI=
+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=
@@ -136,8 +133,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 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.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -163,9 +160,8 @@ golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -184,8 +180,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 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.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

package/integration/integration.ts

@@ -6,7 +6,7 @@ async function runRPC() {
   const addr = 'ws://localhost:5000/demo'
   console.log(`Connecting to ${addr}`)
   const ws = new WebSocket(addr)
-  const channel = new WebSocketConn(ws)
+  const channel = new WebSocketConn(ws, 'outbound')
   const client = channel.buildClient()
 
   console.log('Running client test via WebSocket..')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -59,34 +59,35 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.30.5",
-    "@typescript-eslint/parser": "^5.30.5",
+    "@typescript-eslint/eslint-plugin": "^5.31.0",
+    "@typescript-eslint/parser": "^5.31.0",
     "bufferutil": "^4.0.6",
     "depcheck": "^1.4.3",
-    "esbuild": "^0.14.48",
-    "eslint": "^8.19.0",
+    "esbuild": "^0.14.51",
+    "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "ts-proto": "^1.117.0",
+    "ts-proto": "^1.121.1",
     "typescript": "^4.7.4",
     "utf-8-validate": "^5.0.9"
   },
   "dependencies": {
     "@libp2p/interface-connection": "^2.1.1",
     "@libp2p/interface-stream-muxer": "^2.0.1",
-    "@libp2p/mplex": "^4.0.0",
+    "@libp2p/mplex": "^4.0.2",
     "event-iterator": "^2.0.0",
     "isomorphic-ws": "^5.0.0",
     "it-first": "^1.0.7",
-    "it-length-prefixed": "^7.0.1",
+    "it-length-prefixed": "^8.0.0",
     "it-pipe": "^2.0.3",
     "it-pushable": "^3.0.0",
     "it-stream-types": "^1.0.4",
     "it-ws": "^5.0.2",
     "long": "^5.2.0",
     "patch-package": "^6.4.7",
-    "protobufjs": "^6.11.3",
-    "ws": "^8.8.0"
+    "protobufjs": "^7.0.0",
+    "uint8arraylist": "^2.0.0",
+    "ws": "^8.8.1"
   }
 }

package/srpc/accept.go

@@ -15,7 +15,7 @@ func AcceptMuxedListener(ctx context.Context, lis net.Listener, srv *Server) err
 			return err
 		}
 
-		mc, err := NewMuxedConn(nc, true)
+		mc, err := NewMuxedConn(nc, false)
 		if err != nil {
 			_ = nc.Close()
 			continue

package/srpc/array-list.ts

@@ -0,0 +1,19 @@
+import type { Source } from 'it-stream-types'
+import { isUint8ArrayList, Uint8ArrayList } from 'uint8arraylist'
+import type { Transform } from 'it-stream-types'
+
+// combineUint8ArrayListTransform combines a Uint8ArrayList into a Uint8Array.
+export function combineUint8ArrayListTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8Array> {
+  // decodeMessageSource unmarshals and async yields encoded Messages.
+  return async function* decodeMessageSource(
+    source: Source<Uint8Array | Uint8ArrayList>
+  ): AsyncIterable<Uint8Array> {
+    for await (const obj of source) {
+      if (isUint8ArrayList(obj)) {
+        yield* [obj.subarray()]
+      } else {
+        yield* [obj]
+      }
+    }
+  }
+}

package/srpc/client-rpc.go

@@ -2,6 +2,7 @@ package srpc
 
 import (
 	"context"
+	"io"
 
 	"github.com/pkg/errors"
 )
@@ -86,6 +87,24 @@ func (r *ClientRPC) ReadAll() ([][]byte, error) {
 	}
 }
 
+// ReadOne reads a single message and returns.
+//
+// returns io.EOF if the stream ended.
+func (r *ClientRPC) ReadOne() ([]byte, error) {
+	select {
+	case <-r.ctx.Done():
+		return nil, context.Canceled
+	case data, ok := <-r.dataCh:
+		if !ok {
+			if err := r.serverErr; err != nil {
+				return nil, err
+			}
+			return nil, io.EOF
+		}
+		return data, nil
+	}
+}
+
 // Context is canceled when the ClientRPC is no longer valid.
 func (r *ClientRPC) Context() context.Context {
 	return r.ctx

package/srpc/client.go

@@ -2,7 +2,6 @@ package srpc
 
 import (
 	"context"
-	"io"
 
 	"github.com/pkg/errors"
 )
@@ -55,17 +54,12 @@ func (c *client) Invoke(rctx context.Context, service, method string, in, out Me
 	if err := clientRPC.Start(writer, true, firstMsg); err != nil {
 		return err
 	}
-	msgs, err := clientRPC.ReadAll()
+	msg, err := clientRPC.ReadOne()
 	if err != nil {
 		// this includes any server returned error.
 		return err
 	}
-	if len(msgs) == 0 {
-		// no reply? return eof.
-		return io.EOF
-	}
-	// parse first message to out
-	if err := out.UnmarshalVT(msgs[0]); err != nil {
+	if err := out.UnmarshalVT(msg); err != nil {
 		return errors.Wrap(ErrInvalidMessage, err.Error())
 	}
 	// done

package/srpc/client.ts

@@ -11,6 +11,7 @@ import {
   parseLengthPrefixTransform,
   prependLengthPrefixTransform,
 } from './packet.js'
+import { combineUint8ArrayListTransform } from './array-list.js'
 
 // Client implements the ts-proto Rpc interface with the drpcproto protocol.
 export class Client implements TsProtoRpc {
@@ -142,10 +143,12 @@ export class Client implements TsProtoRpc {
     pipe(
       conn,
       parseLengthPrefixTransform(),
+      combineUint8ArrayListTransform(),
       decodePacketSource,
       call,
       encodePacketSource,
       prependLengthPrefixTransform(),
+      combineUint8ArrayListTransform(),
       conn
     )
     await call.writeCallStart(data || undefined)

package/srpc/conn.ts

@@ -1,4 +1,4 @@
-import type { Stream } from '@libp2p/interface-connection'
+import type { Direction, Stream } from '@libp2p/interface-connection'
 import type {
   StreamMuxer,
   StreamMuxerFactory,
@@ -13,6 +13,9 @@ import { Client } from './client.js'
 export interface ConnParams {
   // muxerFactory overrides using the default factory (@libp2p/mplex).
   muxerFactory?: StreamMuxerFactory
+  // direction is the muxer connection direction.
+  // defaults to outbound.
+  direction?: Direction
 }
 
 // StreamHandler handles incoming streams.
@@ -42,6 +45,7 @@ export class Conn implements Duplex<Uint8Array> {
     }
     this.muxer = muxerFactory.createStreamMuxer({
       onIncomingStream: this.handleIncomingStream.bind(this),
+      direction: connParams?.direction || 'outbound',
     })
   }
 

package/srpc/muxed-conn.go

@@ -2,6 +2,7 @@ package srpc
 
 import (
 	"context"
+	"io"
 	"net"
 
 	"github.com/libp2p/go-libp2p-core/network"
@@ -9,9 +10,9 @@ import (
 	mp "github.com/libp2p/go-mplex"
 )
 
-// NewMuxedConn constructs a new MuxedConn from a Conn.
-func NewMuxedConn(conn net.Conn, isServer bool) (network.MuxedConn, error) {
-	m, err := mp.NewMultiplex(conn, isServer, nil)
+// NewMuxedConn constructs a new MuxedConn from a ReadWriteCloser.
+func NewMuxedConn(conn io.ReadWriteCloser, outbound bool) (network.MuxedConn, error) {
+	m, err := mp.NewMultiplex(conn, outbound, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -21,8 +22,8 @@ func NewMuxedConn(conn net.Conn, isServer bool) (network.MuxedConn, error) {
 // NewClientWithConn constructs the muxer and the client.
 //
 // uses libp2p mplex
-func NewClientWithConn(conn net.Conn, isServer bool) (Client, error) {
-	mconn, err := NewMuxedConn(conn, isServer)
+func NewClientWithConn(conn net.Conn, outbound bool) (Client, error) {
+	mconn, err := NewMuxedConn(conn, outbound)
 	if err != nil {
 		return nil, err
 	}

package/srpc/packet-rw.go

@@ -35,7 +35,15 @@ func (r *PacketReaderWriter) WritePacket(p *Packet) error {
 	if err != nil {
 		return err
 	}
-	_, err = r.rw.Write(data)
+	var n int
+	written := 0
+	for written < len(data) {
+		n, err = r.rw.Write(data)
+		if err != nil {
+			return err
+		}
+		written += n
+	}
 	return err
 }
 

package/srpc/packet.ts

@@ -1,4 +1,3 @@
-import type { Transform } from 'it-stream-types'
 import {
   encode as lengthPrefixEncode,
   decode as lengthPrefixDecode,
@@ -9,6 +8,8 @@ import {
   buildDecodeMessageTransform,
   buildEncodeMessageTransform,
 } from './message.js'
+import { Uint8ArrayList } from 'uint8arraylist'
+import { Transform } from 'it-pipe'
 
 // decodePacketSource decodes packets from a binary data stream.
 export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
@@ -17,38 +18,34 @@ export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
 export const encodePacketSource = buildEncodeMessageTransform<Packet>(Packet)
 
 // uint32LEDecode removes the length prefix.
-const uint32LEDecode = (data: Uint8Array) => {
+const uint32LEDecode = (data: Uint8ArrayList) => {
   if (data.length < 4) {
     throw RangeError('Could not decode int32BE')
   }
 
-  const view = new DataView(data.buffer, data.byteOffset, data.byteLength)
-  return view.getUint32(0, true)
+  return data.getUint32(0, true)
 }
 uint32LEDecode.bytes = 4
 
 // uint32LEEncode adds the length prefix.
 const uint32LEEncode = (
   value: number,
-  target?: Uint8Array,
-  offset?: number
 ) => {
-  target = target ?? new Uint8Array(4)
-  const view = new DataView(target.buffer, target.byteOffset, target.byteLength)
-  view.setUint32(offset ?? 0, value, true)
-  return target
+  const data = new Uint8ArrayList(new Uint8Array(4))
+  data.setUint32(0, value, true)
+  return data
 }
 uint32LEEncode.bytes = 4
 
 // prependLengthPrefixTransform adds a length prefix to a message source.
 // little-endian uint32
-export function prependLengthPrefixTransform(): Transform<Uint8Array> {
+export function prependLengthPrefixTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8ArrayList> {
   return lengthPrefixEncode({ lengthEncoder: uint32LEEncode })
 }
 
 // parseLengthPrefixTransform parses the length prefix from a message source.
 // little-endian uint32
-export function parseLengthPrefixTransform(): Transform<Uint8Array> {
+export function parseLengthPrefixTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8ArrayList> {
   return lengthPrefixDecode({ lengthDecoder: uint32LEDecode })
 }
 

package/srpc/rpcproto.pb.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import Long from 'long'
-import * as _m0 from 'protobufjs/minimal'
+import _m0 from 'protobufjs/minimal.js'
 
 export const protobufPackage = 'srpc'
 

package/srpc/server-rpc.go

@@ -3,8 +3,6 @@ package srpc
 import (
 	"context"
 	"io"
-	"runtime"
-	"time"
 
 	"github.com/pkg/errors"
 )
@@ -173,14 +171,6 @@ func (r *ServerRPC) invokeRPC() {
 	}
 	outPkt := NewCallDataPacket(nil, false, true, err)
 	_ = r.writer.WritePacket(outPkt)
-
-	// HACK: some multiplexers will drop the last packet if Close is called too
-	// soon after Write. Add a brief delay to ensure the packet is written.
-	//
-	// See: https://github.com/lucas-clemente/quic-go/issues/3472
-	runtime.Gosched()
-	time.Sleep(time.Millisecond)
-
 	_ = r.writer.Close()
 	r.ctxCancel()
 }

package/srpc/server.ts

@@ -13,6 +13,7 @@ import {
 } from './packet.js'
 import { StreamHandler } from './conn.js'
 import { RpcStreamHandler } from '../rpcstream/rpcstream.js'
+import { combineUint8ArrayListTransform } from './array-list.js'
 
 // Server implements the SRPC server in TypeScript with a Mux.
 export class Server implements StreamHandler {
@@ -45,10 +46,12 @@ export class Server implements StreamHandler {
     pipe(
       stream,
       parseLengthPrefixTransform(),
+      combineUint8ArrayListTransform(),
       decodePacketSource,
       rpc,
       encodePacketSource,
       prependLengthPrefixTransform(),
+      combineUint8ArrayListTransform(),
       stream
     )
     return rpc

package/srpc/websocket.ts

@@ -1,6 +1,7 @@
 import { duplex } from 'it-ws'
 import { pipe } from 'it-pipe'
 import { Mplex } from '@libp2p/mplex'
+import { Direction } from '@libp2p/interface-connection'
 import type WebSocket from 'isomorphic-ws'
 
 import { Conn } from './conn.js'
@@ -11,8 +12,9 @@ export class WebSocketConn extends Conn {
   // socket is the web socket
   private socket: WebSocket
 
-  constructor(socket: WebSocket, server?: Server) {
+  constructor(socket: WebSocket, direction: Direction, server?: Server) {
     super(server, {
+      direction,
       muxerFactory: new Mplex(),
     })
     this.socket = socket