starpc 0.9.2 → 0.10.2

package/Makefile

@@ -145,7 +145,7 @@ fix: $(GOLANGCI_LINT)
 
 .PHONY: test
 test:
-	go test -v ./...
+	go test -timeout=30s -v ./...
 
 .PHONY: integration
 integration: node_modules vendor

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

@@ -1,6 +1,6 @@
 import Long from 'long';
-import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
 import _m0 from 'protobufjs/minimal.js';
+import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
 export declare const protobufPackage = "echo";
 /** EchoMsg is the message body for Echo. */
 export interface EchoMsg {
@@ -17,7 +17,7 @@ export declare const EchoMsg: {
         body?: string | undefined;
     } & {
         body?: string | undefined;
-    } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+    } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
 };
 /** Echoer service returns the given message. */
 export interface Echoer {
@@ -61,7 +61,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly requestStream: false;
             readonly responseType: {
@@ -75,7 +75,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly responseStream: false;
             readonly options: {};
@@ -94,7 +94,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly requestStream: false;
             readonly responseType: {
@@ -108,7 +108,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly responseStream: true;
             readonly options: {};
@@ -127,7 +127,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly requestStream: true;
             readonly responseType: {
@@ -141,7 +141,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly responseStream: false;
             readonly options: {};
@@ -160,7 +160,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly requestStream: true;
             readonly responseType: {
@@ -174,7 +174,7 @@ export declare const EchoerDefinition: {
                     body?: string | undefined;
                 } & {
                     body?: string | undefined;
-                } & Record<Exclude<keyof I, "body">, never>>(object: I): EchoMsg;
+                } & { [K in Exclude<keyof I, "body">]: never; }>(object: I): EchoMsg;
             };
             readonly responseStream: true;
             readonly options: {};
@@ -219,9 +219,9 @@ export declare const EchoerDefinition: {
                             componentId?: string | undefined;
                         } & {
                             componentId?: string | undefined;
-                        } & Record<Exclude<keyof I_1["body"]["init"], "componentId">, never>) | undefined;
+                        } & { [K in Exclude<keyof I_1["body"]["init"], "componentId">]: never; }) | undefined;
                         $case: "init";
-                    } & Record<Exclude<keyof I_1["body"], "$case" | "init">, never>) | ({
+                    } & { [K_1 in Exclude<keyof I_1["body"], "$case" | "init">]: never; }) | ({
                         ack?: {
                             error?: string | undefined;
                         } | undefined;
@@ -232,17 +232,17 @@ export declare const EchoerDefinition: {
                             error?: string | undefined;
                         } & {
                             error?: string | undefined;
-                        } & Record<Exclude<keyof I_1["body"]["ack"], "error">, never>) | undefined;
+                        } & { [K_2 in Exclude<keyof I_1["body"]["ack"], "error">]: never; }) | undefined;
                         $case: "ack";
-                    } & Record<Exclude<keyof I_1["body"], "$case" | "ack">, never>) | ({
+                    } & { [K_3 in Exclude<keyof I_1["body"], "$case" | "ack">]: never; }) | ({
                         data?: Uint8Array | undefined;
                     } & {
                         $case: "data";
                     } & {
                         data?: Uint8Array | undefined;
                         $case: "data";
-                    } & Record<Exclude<keyof I_1["body"], "$case" | "data">, never>) | undefined;
-                } & Record<Exclude<keyof I_1, "body">, never>>(object: I_1): RpcStreamPacket;
+                    } & { [K_4 in Exclude<keyof I_1["body"], "$case" | "data">]: never; }) | undefined;
+                } & { [K_5 in Exclude<keyof I_1, "body">]: never; }>(object: I_1): RpcStreamPacket;
             };
             readonly requestStream: true;
             readonly responseType: {
@@ -282,9 +282,9 @@ export declare const EchoerDefinition: {
                             componentId?: string | undefined;
                         } & {
                             componentId?: string | undefined;
-                        } & Record<Exclude<keyof I_1["body"]["init"], "componentId">, never>) | undefined;
+                        } & { [K in Exclude<keyof I_1["body"]["init"], "componentId">]: never; }) | undefined;
                         $case: "init";
-                    } & Record<Exclude<keyof I_1["body"], "$case" | "init">, never>) | ({
+                    } & { [K_1 in Exclude<keyof I_1["body"], "$case" | "init">]: never; }) | ({
                         ack?: {
                             error?: string | undefined;
                         } | undefined;
@@ -295,17 +295,17 @@ export declare const EchoerDefinition: {
                             error?: string | undefined;
                         } & {
                             error?: string | undefined;
-                        } & Record<Exclude<keyof I_1["body"]["ack"], "error">, never>) | undefined;
+                        } & { [K_2 in Exclude<keyof I_1["body"]["ack"], "error">]: never; }) | undefined;
                         $case: "ack";
-                    } & Record<Exclude<keyof I_1["body"], "$case" | "ack">, never>) | ({
+                    } & { [K_3 in Exclude<keyof I_1["body"], "$case" | "ack">]: never; }) | ({
                         data?: Uint8Array | undefined;
                     } & {
                         $case: "data";
                     } & {
                         data?: Uint8Array | undefined;
                         $case: "data";
-                    } & Record<Exclude<keyof I_1["body"], "$case" | "data">, never>) | undefined;
-                } & Record<Exclude<keyof I_1, "body">, never>>(object: I_1): RpcStreamPacket;
+                    } & { [K_4 in Exclude<keyof I_1["body"], "$case" | "data">]: never; }) | undefined;
+                } & { [K_5 in Exclude<keyof I_1, "body">]: never; }>(object: I_1): RpcStreamPacket;
             };
             readonly responseStream: true;
             readonly options: {};
@@ -331,5 +331,7 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? st
 declare type KeysOfUnion<T> = T extends T ? keyof T : never;
 export declare 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>;
+} & {
+    [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+};
 export {};

package/dist/echo/echo.pb.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from 'long';
-import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
 import _m0 from 'protobufjs/minimal.js';
+import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js';
 export const protobufPackage = 'echo';
 function createBaseEchoMsg() {
     return { body: '' };
@@ -59,9 +59,7 @@ export const EchoMsg = {
         }
     },
     fromJSON(object) {
-        return {
-            body: isSet(object.body) ? String(object.body) : '',
-        };
+        return { body: isSet(object.body) ? String(object.body) : '' };
     },
     toJSON(message) {
         const obj = {};

package/dist/rpcstream/rpcstream.d.ts

@@ -2,15 +2,16 @@ import { RpcStreamPacket } from './rpcstream.pb.js';
 import { OpenStreamFunc, Stream } from '../srpc/stream.js';
 import { Pushable } from 'it-pushable';
 import { Duplex, Source, Sink } from 'it-stream-types';
+import { Uint8ArrayList } from 'uint8arraylist';
 export declare type RpcStreamCaller = (request: AsyncIterable<RpcStreamPacket>) => AsyncIterable<RpcStreamPacket>;
 export declare function openRpcStream(componentId: string, caller: RpcStreamCaller): Promise<Stream>;
 export declare function buildRpcStreamOpenStream(componentId: string, caller: RpcStreamCaller): OpenStreamFunc;
-export declare type RpcStreamHandler = (stream: Duplex<Uint8Array>) => void;
+export declare type RpcStreamHandler = (stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>) => void;
 export declare type RpcStreamGetter = (componentId: string) => Promise<RpcStreamHandler | null>;
 export declare function handleRpcStream(packetStream: AsyncIterator<RpcStreamPacket>, getter: RpcStreamGetter): AsyncIterable<RpcStreamPacket>;
 export declare class RpcStream implements Stream {
-    readonly source: Source<Uint8Array>;
-    readonly sink: Sink<Uint8Array>;
+    readonly source: Source<Uint8ArrayList>;
+    readonly sink: Sink<Uint8ArrayList | Uint8Array>;
     private readonly _packetStream;
     private readonly _packetSink;
     constructor(packetSink: Pushable<RpcStreamPacket>, packetStream: AsyncIterator<RpcStreamPacket>);

package/dist/rpcstream/rpcstream.js

@@ -1,4 +1,5 @@
 import { pushable } from 'it-pushable';
+import { Uint8ArrayList } from 'uint8arraylist';
 // openRpcStream attempts to open a stream over a RPC call.
 // waits for the remote to ack the stream before returning.
 export async function openRpcStream(componentId, caller) {
@@ -106,10 +107,19 @@ export class RpcStream {
     _createSink() {
         return async (source) => {
             try {
-                for await (const msg of source) {
-                    this._packetSink.push({
-                        body: { $case: 'data', data: msg },
-                    });
+                for await (const arr of source) {
+                    if (arr instanceof Uint8Array) {
+                        this._packetSink.push({
+                            body: { $case: 'data', data: arr },
+                        });
+                    }
+                    else {
+                        for (const msg of arr) {
+                            this._packetSink.push({
+                                body: { $case: 'data', data: msg },
+                            });
+                        }
+                    }
                 }
                 this._packetSink.end();
             }
@@ -132,7 +142,7 @@ export class RpcStream {
                 if (!body || body.$case !== 'data') {
                     continue;
                 }
-                yield* [body.data];
+                yield* [new Uint8ArrayList(body.data)];
             }
         })();
     }

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

@@ -61,9 +61,9 @@ export declare const RpcStreamPacket: {
                 componentId?: string | undefined;
             } & {
                 componentId?: string | undefined;
-            } & Record<Exclude<keyof I["body"]["init"], "componentId">, never>) | undefined;
+            } & { [K in Exclude<keyof I["body"]["init"], "componentId">]: never; }) | undefined;
             $case: "init";
-        } & Record<Exclude<keyof I["body"], "$case" | "init">, never>) | ({
+        } & { [K_1 in Exclude<keyof I["body"], "$case" | "init">]: never; }) | ({
             ack?: {
                 error?: string | undefined;
             } | undefined;
@@ -74,17 +74,17 @@ export declare const RpcStreamPacket: {
                 error?: string | undefined;
             } & {
                 error?: string | undefined;
-            } & Record<Exclude<keyof I["body"]["ack"], "error">, never>) | undefined;
+            } & { [K_2 in Exclude<keyof I["body"]["ack"], "error">]: never; }) | undefined;
             $case: "ack";
-        } & Record<Exclude<keyof I["body"], "$case" | "ack">, never>) | ({
+        } & { [K_3 in Exclude<keyof I["body"], "$case" | "ack">]: never; }) | ({
             data?: Uint8Array | undefined;
         } & {
             $case: "data";
         } & {
             data?: Uint8Array | undefined;
             $case: "data";
-        } & Record<Exclude<keyof I["body"], "$case" | "data">, never>) | undefined;
-    } & Record<Exclude<keyof I, "body">, never>>(object: I): RpcStreamPacket;
+        } & { [K_4 in Exclude<keyof I["body"], "$case" | "data">]: never; }) | undefined;
+    } & { [K_5 in Exclude<keyof I, "body">]: never; }>(object: I): RpcStreamPacket;
 };
 export declare const RpcStreamInit: {
     encode(message: RpcStreamInit, writer?: _m0.Writer): _m0.Writer;
@@ -97,7 +97,7 @@ export declare const RpcStreamInit: {
         componentId?: string | undefined;
     } & {
         componentId?: string | undefined;
-    } & Record<Exclude<keyof I, "componentId">, never>>(object: I): RpcStreamInit;
+    } & { [K in Exclude<keyof I, "componentId">]: never; }>(object: I): RpcStreamInit;
 };
 export declare const RpcAck: {
     encode(message: RpcAck, writer?: _m0.Writer): _m0.Writer;
@@ -110,7 +110,7 @@ export declare const RpcAck: {
         error?: string | undefined;
     } & {
         error?: string | undefined;
-    } & Record<Exclude<keyof I, "error">, never>>(object: I): RpcAck;
+    } & { [K in Exclude<keyof I, "error">]: never; }>(object: I): RpcAck;
 };
 declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export declare 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 {
@@ -125,5 +125,7 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? st
 declare type KeysOfUnion<T> = T extends T ? keyof T : never;
 export declare 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>;
+} & {
+    [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+};
 export {};

package/dist/rpcstream/rpcstream.pb.js

@@ -253,9 +253,7 @@ export const RpcAck = {
         }
     },
     fromJSON(object) {
-        return {
-            error: isSet(object.error) ? String(object.error) : '',
-        };
+        return { error: isSet(object.error) ? String(object.error) : '' };
     },
     toJSON(message) {
         const obj = {};
@@ -269,34 +267,44 @@ export const RpcAck = {
     },
 };
 var globalThis = (() => {
-    if (typeof globalThis !== 'undefined')
+    if (typeof globalThis !== 'undefined') {
         return globalThis;
-    if (typeof self !== 'undefined')
+    }
+    if (typeof self !== 'undefined') {
         return self;
-    if (typeof window !== 'undefined')
+    }
+    if (typeof window !== 'undefined') {
         return window;
-    if (typeof global !== 'undefined')
+    }
+    if (typeof global !== 'undefined') {
         return global;
+    }
     throw 'Unable to locate global object';
 })();
-const atob = globalThis.atob ||
-    ((b64) => globalThis.Buffer.from(b64, 'base64').toString('binary'));
 function bytesFromBase64(b64) {
-    const bin = atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-        arr[i] = bin.charCodeAt(i);
+    if (globalThis.Buffer) {
+        return Uint8Array.from(globalThis.Buffer.from(b64, 'base64'));
+    }
+    else {
+        const bin = globalThis.atob(b64);
+        const arr = new Uint8Array(bin.length);
+        for (let i = 0; i < bin.length; ++i) {
+            arr[i] = bin.charCodeAt(i);
+        }
+        return arr;
     }
-    return arr;
 }
-const btoa = globalThis.btoa ||
-    ((bin) => globalThis.Buffer.from(bin, 'binary').toString('base64'));
 function base64FromBytes(arr) {
-    const bin = [];
-    arr.forEach((byte) => {
-        bin.push(String.fromCharCode(byte));
-    });
-    return btoa(bin.join(''));
+    if (globalThis.Buffer) {
+        return globalThis.Buffer.from(arr).toString('base64');
+    }
+    else {
+        const bin = [];
+        arr.forEach((byte) => {
+            bin.push(String.fromCharCode(byte));
+        });
+        return globalThis.btoa(bin.join(''));
+    }
 }
 if (_m0.util.Long !== Long) {
     _m0.util.Long = Long;

package/dist/srpc/client.js

@@ -101,7 +101,7 @@ export class Client {
         const openStreamFn = await this.openStreamFn;
         const conn = await openStreamFn();
         const call = new ClientRPC(rpcService, rpcMethod);
-        pipe(conn, parseLengthPrefixTransform(), combineUint8ArrayListTransform(), decodePacketSource, call, encodePacketSource, prependLengthPrefixTransform(), combineUint8ArrayListTransform(), conn);
+        pipe(conn, parseLengthPrefixTransform(), combineUint8ArrayListTransform(), decodePacketSource, call, encodePacketSource, prependLengthPrefixTransform(), conn);
         await call.writeCallStart(data || undefined);
         return call;
     }

package/dist/srpc/conn.d.ts

@@ -1,6 +1,7 @@
 import type { Direction, Stream } from '@libp2p/interface-connection';
 import type { StreamMuxerFactory } from '@libp2p/interface-stream-muxer';
 import type { Duplex } from 'it-stream-types';
+import { Uint8ArrayList } from 'uint8arraylist';
 import type { OpenStreamFunc, Stream as SRPCStream } from './stream.js';
 import { Client } from './client.js';
 export interface ConnParams {
@@ -8,7 +9,7 @@ export interface ConnParams {
     direction?: Direction;
 }
 export interface StreamHandler {
-    handleStream(strm: Duplex<Uint8Array>): void;
+    handleStream(strm: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>): void;
 }
 export declare class Conn implements Duplex<Uint8Array> {
     private muxer;

package/dist/srpc/packet.d.ts

@@ -3,7 +3,7 @@ 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 | Uint8ArrayList, Uint8ArrayList>;
+export declare function prependLengthPrefixTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8Array>;
 export declare function parseLengthPrefixTransform(): Transform<Uint8Array | Uint8ArrayList, Uint8ArrayList>;
 export declare function encodeUint32Le(value: number): Uint8Array;
 export declare function decodeUint32Le(data: Uint8Array): number;

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

@@ -93,9 +93,9 @@ export declare const Packet: {
                 rpcMethod?: string | undefined;
                 data?: Uint8Array | undefined;
                 dataIsZero?: boolean | undefined;
-            } & Record<Exclude<keyof I["body"]["callStart"], keyof CallStart>, never>) | undefined;
+            } & { [K in Exclude<keyof I["body"]["callStart"], keyof CallStart>]: never; }) | undefined;
             $case: "callStart";
-        } & Record<Exclude<keyof I["body"], "callStart" | "$case">, never>) | ({
+        } & { [K_1 in Exclude<keyof I["body"], "callStart" | "$case">]: never; }) | ({
             callData?: {
                 data?: Uint8Array | undefined;
                 dataIsZero?: boolean | undefined;
@@ -115,10 +115,10 @@ export declare const Packet: {
                 dataIsZero?: boolean | undefined;
                 complete?: boolean | undefined;
                 error?: string | undefined;
-            } & Record<Exclude<keyof I["body"]["callData"], keyof CallData>, never>) | undefined;
+            } & { [K_2 in Exclude<keyof I["body"]["callData"], keyof CallData>]: never; }) | undefined;
             $case: "callData";
-        } & Record<Exclude<keyof I["body"], "callData" | "$case">, never>) | undefined;
-    } & Record<Exclude<keyof I, "body">, never>>(object: I): Packet;
+        } & { [K_3 in Exclude<keyof I["body"], "callData" | "$case">]: never; }) | undefined;
+    } & { [K_4 in Exclude<keyof I, "body">]: never; }>(object: I): Packet;
 };
 export declare const CallStart: {
     encode(message: CallStart, writer?: _m0.Writer): _m0.Writer;
@@ -137,7 +137,7 @@ export declare const CallStart: {
         rpcMethod?: string | undefined;
         data?: Uint8Array | undefined;
         dataIsZero?: boolean | undefined;
-    } & Record<Exclude<keyof I, keyof CallStart>, never>>(object: I): CallStart;
+    } & { [K in Exclude<keyof I, keyof CallStart>]: never; }>(object: I): CallStart;
 };
 export declare const CallData: {
     encode(message: CallData, writer?: _m0.Writer): _m0.Writer;
@@ -156,7 +156,7 @@ export declare const CallData: {
         dataIsZero?: boolean | undefined;
         complete?: boolean | undefined;
         error?: string | undefined;
-    } & Record<Exclude<keyof I, keyof CallData>, never>>(object: I): CallData;
+    } & { [K in Exclude<keyof I, keyof CallData>]: never; }>(object: I): CallData;
 };
 declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export declare 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 {
@@ -171,5 +171,7 @@ export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? st
 declare type KeysOfUnion<T> = T extends T ? keyof T : never;
 export declare 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>;
+} & {
+    [K in Exclude<keyof I, KeysOfUnion<P>>]: never;
+};
 export {};

package/dist/srpc/rpcproto.pb.js

@@ -327,34 +327,44 @@ export const CallData = {
     },
 };
 var globalThis = (() => {
-    if (typeof globalThis !== 'undefined')
+    if (typeof globalThis !== 'undefined') {
         return globalThis;
-    if (typeof self !== 'undefined')
+    }
+    if (typeof self !== 'undefined') {
         return self;
-    if (typeof window !== 'undefined')
+    }
+    if (typeof window !== 'undefined') {
         return window;
-    if (typeof global !== 'undefined')
+    }
+    if (typeof global !== 'undefined') {
         return global;
+    }
     throw 'Unable to locate global object';
 })();
-const atob = globalThis.atob ||
-    ((b64) => globalThis.Buffer.from(b64, 'base64').toString('binary'));
 function bytesFromBase64(b64) {
-    const bin = atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-        arr[i] = bin.charCodeAt(i);
+    if (globalThis.Buffer) {
+        return Uint8Array.from(globalThis.Buffer.from(b64, 'base64'));
+    }
+    else {
+        const bin = globalThis.atob(b64);
+        const arr = new Uint8Array(bin.length);
+        for (let i = 0; i < bin.length; ++i) {
+            arr[i] = bin.charCodeAt(i);
+        }
+        return arr;
     }
-    return arr;
 }
-const btoa = globalThis.btoa ||
-    ((bin) => globalThis.Buffer.from(bin, 'binary').toString('base64'));
 function base64FromBytes(arr) {
-    const bin = [];
-    arr.forEach((byte) => {
-        bin.push(String.fromCharCode(byte));
-    });
-    return btoa(bin.join(''));
+    if (globalThis.Buffer) {
+        return globalThis.Buffer.from(arr).toString('base64');
+    }
+    else {
+        const bin = [];
+        arr.forEach((byte) => {
+            bin.push(String.fromCharCode(byte));
+        });
+        return globalThis.btoa(bin.join(''));
+    }
 }
 if (_m0.util.Long !== Long) {
     _m0.util.Long = Long;

package/dist/srpc/server.d.ts

@@ -1,5 +1,6 @@
 import { Stream } from '@libp2p/interface-connection';
 import { Duplex } from 'it-stream-types';
+import { Uint8ArrayList } from 'uint8arraylist';
 import { LookupMethod } from './mux.js';
 import { ServerRPC } from './server-rpc.js';
 import { Packet } from './rpcproto.pb.js';
@@ -11,7 +12,7 @@ export declare class Server implements StreamHandler {
     get rpcStreamHandler(): RpcStreamHandler;
     startRpc(): ServerRPC;
     handleStream(stream: Stream): ServerRPC;
-    handleDuplex(stream: Duplex<Uint8Array>): ServerRPC;
+    handleDuplex(stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>): ServerRPC;
     handlePacketDuplex(stream: Duplex<Uint8Array>): ServerRPC;
     handlePacketStream(stream: Duplex<Packet>): ServerRPC;
 }

package/dist/srpc/server.js

@@ -23,7 +23,7 @@ export class Server {
     // handleDuplex handles an incoming message duplex.
     handleDuplex(stream) {
         const rpc = this.startRpc();
-        pipe(stream, parseLengthPrefixTransform(), combineUint8ArrayListTransform(), decodePacketSource, rpc, encodePacketSource, prependLengthPrefixTransform(), combineUint8ArrayListTransform(), stream);
+        pipe(stream, parseLengthPrefixTransform(), combineUint8ArrayListTransform(), decodePacketSource, rpc, encodePacketSource, prependLengthPrefixTransform(), stream);
         return rpc;
     }
     // handlePacketDuplex handles an incoming Uint8Array duplex.

package/dist/srpc/stream.d.ts

@@ -1,5 +1,6 @@
 import type { Packet } from './rpcproto.pb.js';
 import type { Duplex } from 'it-stream-types';
+import { Uint8ArrayList } from 'uint8arraylist';
 export declare type PacketHandler = (packet: Packet) => Promise<void>;
-export declare type Stream = Duplex<Uint8Array>;
+export declare type Stream = Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>;
 export declare type OpenStreamFunc = () => Promise<Stream>;

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, {direction: 'inbound'})
+  const serverConn = new Conn(server, { direction: 'inbound' })
   pipe(clientConn, serverConn, clientConn)
   const client = new Client(clientConn.buildOpenStreamFunc())
 

package/echo/echo.pb.go

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

package/echo/echo.pb.ts

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from 'long'
-import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js'
 import _m0 from 'protobufjs/minimal.js'
+import { RpcStreamPacket } from '../rpcstream/rpcstream.pb.js'
 
 export const protobufPackage = 'echo'
 
@@ -78,9 +78,7 @@ export const EchoMsg = {
   },
 
   fromJSON(object: any): EchoMsg {
-    return {
-      body: isSet(object.body) ? String(object.body) : '',
-    }
+    return { body: isSet(object.body) ? String(object.body) : '' }
   },
 
   toJSON(message: EchoMsg): unknown {
@@ -276,10 +274,9 @@ export type DeepPartial<T> = T extends Builtin
 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
-      >
+  : 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

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