starpc 0.22.8 → 0.23.0

package/dist/integration/integration.js

@@ -7,12 +7,12 @@ async function runRPC() {
     const ws = new WebSocket(addr);
     const channel = new WebSocketConn(ws, 'outbound');
     const client = channel.buildClient();
-    console.log('Running RpcStream test via WebSocket..');
-    await runRpcStreamTest(client);
     console.log('Running client test via WebSocket..');
     await runClientTest(client);
     console.log('Running abort controller test via WebSocket..');
     await runAbortControllerTest(client);
+    console.log('Running RpcStream test via WebSocket..');
+    await runRpcStreamTest(client);
 }
 process.on('unhandledRejection', (ev) => {
     console.error('Unhandled rejection', ev);

package/dist/srpc/conn.d.ts

@@ -1,5 +1,4 @@
-import type { Direction, Stream } from '@libp2p/interface/connection';
-import type { StreamMuxerFactory } from '@libp2p/interface/stream-muxer';
+import type { Direction, Stream, StreamMuxerFactory } from '@libp2p/interface';
 import type { Duplex, Source } from 'it-stream-types';
 import { Uint8ArrayList } from 'uint8arraylist';
 import type { OpenStreamFunc, Stream as SRPCStream } from './stream.js';
@@ -16,8 +15,8 @@ export declare class Conn implements Duplex<AsyncGenerator<Uint8Array | Uint8Arr
     private muxer;
     private server?;
     constructor(server?: StreamHandler, connParams?: ConnParams);
-    get sink(): import("it-stream-types").Sink<Source<Uint8Array | Uint8ArrayList>, Promise<void>>;
-    get source(): AsyncGenerator<Uint8Array, any, unknown>;
+    get sink(): import("it-stream-types").Sink<AsyncGenerator<Uint8Array | Uint8ArrayList, any, unknown>, unknown>;
+    get source(): AsyncGenerator<Uint8Array | Uint8ArrayList, any, unknown>;
     get streams(): Stream[];
     buildClient(): Client;
     openStream(): Promise<SRPCStream>;

package/dist/srpc/conn.js

@@ -2,6 +2,7 @@ import { yamux } from '@chainsafe/libp2p-yamux';
 import { pipe } from 'it-pipe';
 import isPromise from 'is-promise';
 import { pushable } from 'it-pushable';
+import { defaultLogger } from '@libp2p/logger';
 import { Client } from './client.js';
 import { combineUint8ArrayListTransform } from './array-list.js';
 import { parseLengthPrefixTransform, prependLengthPrefixTransform, } from './packet.js';
@@ -25,7 +26,10 @@ export class Conn {
         if (server) {
             this.server = server;
         }
-        const muxerFactory = connParams?.muxerFactory ?? yamux()();
+        const muxerFactory = connParams?.muxerFactory ??
+            yamux({ enableKeepAlive: false })({
+                logger: defaultLogger(),
+            });
         this.muxer = muxerFactory.createStreamMuxer({
             onIncomingStream: this.handleIncomingStream.bind(this),
             direction: connParams?.direction || 'outbound',

package/dist/srpc/index.d.ts

@@ -11,7 +11,7 @@ export { Mux, StaticMux, createMux } from './mux.js';
 export { BroadcastChannelDuplex, newBroadcastChannelDuplex, BroadcastChannelConn, } from './broadcast-channel.js';
 export { MessagePortDuplex, newMessagePortDuplex, MessagePortConn, } from './message-port.js';
 export { MessageDefinition, DecodeMessageTransform, buildDecodeMessageTransform, EncodeMessageTransform, buildEncodeMessageTransform, memoProto, memoProtoDecode, } from './message.js';
-export { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketSource, encodePacketSource, } from './packet.js';
+export { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketSource, encodePacketSource, uint32LEDecode, uint32LEEncode, decodeUint32Le, encodeUint32Le, lengthPrefixDecode, lengthPrefixEncode, prependPacketLen, } from './packet.js';
 export { combineUint8ArrayListTransform } from './array-list.js';
 export { ValueCtr } from './value-ctr.js';
 export { OpenStreamCtr } from './open-stream-ctr.js';

package/dist/srpc/index.js

@@ -10,7 +10,7 @@ export { StaticMux, createMux } from './mux.js';
 export { BroadcastChannelDuplex, newBroadcastChannelDuplex, BroadcastChannelConn, } from './broadcast-channel.js';
 export { MessagePortDuplex, newMessagePortDuplex, MessagePortConn, } from './message-port.js';
 export { buildDecodeMessageTransform, buildEncodeMessageTransform, memoProto, memoProtoDecode, } from './message.js';
-export { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketSource, encodePacketSource, } from './packet.js';
+export { parseLengthPrefixTransform, prependLengthPrefixTransform, decodePacketSource, encodePacketSource, uint32LEDecode, uint32LEEncode, decodeUint32Le, encodeUint32Le, lengthPrefixDecode, lengthPrefixEncode, prependPacketLen, } from './packet.js';
 export { combineUint8ArrayListTransform } from './array-list.js';
 export { ValueCtr } from './value-ctr.js';
 export { OpenStreamCtr } from './open-stream-ctr.js';

package/dist/srpc/length-prefix.js

@@ -0,0 +1 @@
+"use strict";

package/dist/srpc/message.js

@@ -15,7 +15,7 @@ export function memoProtoDecode(def) {
 //
 // set memoize if you expect to repeatedly see the same message.
 export function buildDecodeMessageTransform(def, memoize) {
-    const decode = memoize ? memoProtoDecode(def) : def.decode.bind(def);
+    const decode = !memoize ? def.decode.bind(def) : memoProtoDecode(def);
     // decodeMessageSource unmarshals and async yields encoded Messages.
     return async function* decodeMessageSource(source) {
         for await (const pkt of source) {
@@ -33,11 +33,11 @@ export function buildDecodeMessageTransform(def, memoize) {
 // buildEncodeMessageTransform builds a source of decoded messages.
 // set memoize if you expect to repeatedly encode the same message.
 export function buildEncodeMessageTransform(def, memoize) {
-    const encode = memoize
-        ? memoProto(def)
-        : (msg) => {
+    const encode = !memoize
+        ? (msg) => {
             return def.encode(msg).finish();
-        };
+        }
+        : memoProto(def);
     // encodeMessageSource encodes messages to byte arrays.
     return async function* encodeMessageSource(source) {
         for await (const pkt of source) {

package/dist/srpc/packet.d.ts

@@ -1,11 +1,26 @@
 import { Uint8ArrayList } from 'uint8arraylist';
-import { Packet } from './rpcproto.pb.js';
 import { Source, Transform } from 'it-stream-types';
+import { Packet } from './rpcproto.pb.js';
 export declare const decodePacketSource: import("./message.js").DecodeMessageTransform<Packet>;
 export declare const encodePacketSource: import("./message.js").EncodeMessageTransform<Packet>;
-export declare function prependLengthPrefixTransform(): Transform<Source<Uint8Array | Uint8ArrayList>, AsyncGenerator<Uint8Array, void, undefined> | Generator<Uint8Array, void, undefined>>;
-export declare function parseLengthPrefixTransform(): Transform<Source<Uint8Array | Uint8ArrayList>, // Allow both AsyncIterable and Iterable
-AsyncGenerator<Uint8ArrayList, void, unknown> | Generator<Uint8ArrayList, void, unknown>>;
+export declare const uint32LEDecode: {
+    (data: Uint8ArrayList): number;
+    bytes: number;
+};
+export declare const uint32LEEncode: {
+    (value: number): Uint8ArrayList;
+    bytes: number;
+};
+export declare function lengthPrefixEncode(source: Source<Uint8Array | Uint8ArrayList>, lengthEncoder: typeof uint32LEEncode): AsyncGenerator<Uint8ArrayList, void, unknown>;
+export declare function lengthPrefixDecode(source: Source<Uint8Array | Uint8ArrayList>, lengthDecoder: typeof uint32LEDecode): AsyncGenerator<Uint8ArrayList, void, unknown>;
+export declare function prependLengthPrefixTransform(lengthEncoder?: {
+    (value: number): Uint8ArrayList;
+    bytes: number;
+}): Transform<Source<Uint8Array | Uint8ArrayList>, AsyncGenerator<Uint8ArrayList, void, undefined> | Generator<Uint8ArrayList, void, undefined>>;
+export declare function parseLengthPrefixTransform(lengthDecoder?: {
+    (data: Uint8ArrayList): number;
+    bytes: number;
+}): Transform<Source<Uint8Array | Uint8ArrayList>, AsyncGenerator<Uint8ArrayList, void, unknown> | Generator<Uint8ArrayList, void, unknown>>;
 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,4 +1,3 @@
-import { encode as lengthPrefixEncode, decode as lengthPrefixDecode, } from 'it-length-prefixed';
 import { Uint8ArrayList } from 'uint8arraylist';
 import { Packet } from './rpcproto.pb.js';
 import { buildDecodeMessageTransform, buildEncodeMessageTransform, } from './message.js';
@@ -7,7 +6,7 @@ export const decodePacketSource = buildDecodeMessageTransform(Packet);
 // encodePacketSource encodes packets from a packet object stream.
 export const encodePacketSource = buildEncodeMessageTransform(Packet);
 // uint32LEDecode removes the length prefix.
-const uint32LEDecode = (data) => {
+export const uint32LEDecode = (data) => {
     if (data.length < 4) {
         throw RangeError('Could not decode int32BE');
     }
@@ -15,24 +14,53 @@ const uint32LEDecode = (data) => {
 };
 uint32LEDecode.bytes = 4;
 // uint32LEEncode adds the length prefix.
-const uint32LEEncode = (value) => {
+export const uint32LEEncode = (value) => {
     const data = new Uint8ArrayList(new Uint8Array(4));
     data.setUint32(0, value, true);
     return data;
 };
 uint32LEEncode.bytes = 4;
+// lengthPrefixEncode transforms a source to a length-prefixed Uint8ArrayList stream.
+export async function* lengthPrefixEncode(source, lengthEncoder) {
+    for await (const chunk of source) {
+        // Encode the length of the chunk.
+        const length = chunk instanceof Uint8Array ? chunk.length : chunk.byteLength;
+        const lengthEncoded = lengthEncoder(length);
+        // Concatenate the length prefix and the data.
+        yield new Uint8ArrayList(lengthEncoded, chunk);
+    }
+}
+// lengthPrefixDecode decodes a length-prefixed source to a Uint8ArrayList stream.
+export async function* lengthPrefixDecode(source, lengthDecoder) {
+    const buffer = new Uint8ArrayList();
+    for await (const chunk of source) {
+        buffer.append(chunk);
+        // Continue extracting messages while buffer contains enough data for decoding.
+        while (buffer.length >= lengthDecoder.bytes) {
+            const messageLength = lengthDecoder(buffer);
+            const totalLength = lengthDecoder.bytes + messageLength;
+            if (buffer.length < totalLength)
+                break; // Wait for more data if the full message hasn't arrived.
+            // Extract the message excluding the length prefix.
+            const message = buffer.sublist(lengthDecoder.bytes, totalLength);
+            yield message;
+            // Remove the processed message from the buffer.
+            buffer.consume(totalLength);
+        }
+    }
+}
 // prependLengthPrefixTransform adds a length prefix to a message source.
 // little-endian uint32
-export function prependLengthPrefixTransform() {
+export function prependLengthPrefixTransform(lengthEncoder = uint32LEEncode) {
     return (source) => {
-        return lengthPrefixEncode(source, { lengthEncoder: uint32LEEncode });
+        return lengthPrefixEncode(source, lengthEncoder);
     };
 }
 // parseLengthPrefixTransform parses the length prefix from a message source.
 // little-endian uint32
-export function parseLengthPrefixTransform() {
+export function parseLengthPrefixTransform(lengthDecoder = uint32LEDecode) {
     return (source) => {
-        return lengthPrefixDecode(source, { lengthDecoder: uint32LEDecode });
+        return lengthPrefixDecode(source, lengthDecoder);
     };
 }
 // encodeUint32Le encodes the number as a uint32 with little endian.

package/dist/srpc/websocket.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="ws" />
-import { Direction } from '@libp2p/interface/connection';
+import { Direction } from '@libp2p/interface';
 import type WebSocket from '@aptre/it-ws/web-socket';
 import { Conn } from './conn.js';
 import { Server } from './server.js';

package/dist/srpc/websocket.js

@@ -1,13 +1,16 @@
 import { pipe } from 'it-pipe';
 import duplex from '@aptre/it-ws/duplex';
 import { Conn } from './conn.js';
+import { combineUint8ArrayListTransform } from './array-list.js';
 // WebSocketConn implements a connection with a WebSocket and optional Server.
 export class WebSocketConn extends Conn {
     constructor(socket, direction, server) {
         super(server, { direction });
         this.socket = socket;
         const socketDuplex = duplex(socket);
-        pipe(socketDuplex, this, socketDuplex);
+        pipe(socketDuplex, this, 
+        // it-ws only supports sending Uint8Array.
+        combineUint8ArrayListTransform(), socketDuplex);
     }
     // getSocket returns the websocket.
     getSocket() {

package/go.mod

@@ -9,7 +9,7 @@ require (
 )
 
 require (
-	github.com/aperturerobotics/util v1.13.2 // latest
+	github.com/aperturerobotics/util v1.13.3 // latest
 	github.com/libp2p/go-libp2p v0.32.2 // latest
 	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240206065824-7222fbc3459d // master
 	github.com/sirupsen/logrus v1.9.3 // latest
@@ -35,6 +35,6 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )

package/go.sum

@@ -1,5 +1,7 @@
 github.com/aperturerobotics/util v1.13.2 h1:MTe8MO+Tfo9d3Z4Zi6Akm//rIymy5gyoAOIEHQdFrOU=
 github.com/aperturerobotics/util v1.13.2/go.mod h1:d84OAQAGXCpl7JOBstnal91Lm6nKgk+vBgtHPgxBYrQ=
+github.com/aperturerobotics/util v1.13.3 h1:N4JXKYql0R/A2hMuV79SZ2vaftf8tiN8DUJ8sGc7Rso=
+github.com/aperturerobotics/util v1.13.3/go.mod h1:JdziNd9tR6lWqc9bSMIe1At8Gagrg986rmtZuPCv6+w=
 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=
@@ -63,6 +65,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

package/integration/integration.bash

@@ -6,7 +6,7 @@ unset GOARCH
 
 echo "Compiling ts..."
 # ../node_modules/.bin/tsc --out integration.js --project tsconfig.json
-../node_modules/.bin/esbuild integration.ts --bundle --platform=node --outfile=integration.js
+../node_modules/.bin/esbuild integration.ts --bundle --sourcemap --platform=node --outfile=integration.js
 
 echo "Compiling go..."
 go build -o integration -v ./

package/integration/integration.ts

@@ -13,14 +13,14 @@ async function runRPC() {
   const channel = new WebSocketConn(ws, 'outbound')
   const client = channel.buildClient()
 
-  console.log('Running RpcStream test via WebSocket..')
-  await runRpcStreamTest(client)
-
   console.log('Running client test via WebSocket..')
   await runClientTest(client)
 
   console.log('Running abort controller test via WebSocket..')
   await runAbortControllerTest(client)
+
+  console.log('Running RpcStream test via WebSocket..')
+  await runRpcStreamTest(client)
 }
 
 process.on('unhandledRejection', (ev) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.22.8",
+  "version": "0.23.0",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {
@@ -74,13 +74,13 @@
   },
   "dependencies": {
     "@aptre/it-ws": "^1.0.0",
-    "@chainsafe/libp2p-yamux": "^5.0.0",
-    "@libp2p/interface": "^0.1.2",
+    "@chainsafe/libp2p-yamux": "^6.0.2",
+    "@libp2p/interface": "^1.1.3",
+    "@libp2p/logger": "^4.0.6",
     "event-iterator": "^2.0.0",
     "is-promise": "^4.0.0",
     "isomorphic-ws": "^5.0.0",
     "it-first": "^3.0.3",
-    "it-length-prefixed": "^9.0.4",
     "it-pipe": "^3.0.1",
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.1",

package/srpc/conn.ts

@@ -1,14 +1,16 @@
 import { yamux } from '@chainsafe/libp2p-yamux'
-import type { Direction, Stream } from '@libp2p/interface/connection'
 import type {
+  Direction,
+  Stream,
   StreamMuxer,
   StreamMuxerFactory,
-} from '@libp2p/interface/stream-muxer'
+} from '@libp2p/interface'
 import { pipe } from 'it-pipe'
 import type { Duplex, Source } from 'it-stream-types'
 import { Uint8ArrayList } from 'uint8arraylist'
 import isPromise from 'is-promise'
 import { pushable, Pushable } from 'it-pushable'
+import { defaultLogger } from '@libp2p/logger'
 
 import type { OpenStreamFunc, Stream as SRPCStream } from './stream.js'
 import { Client } from './client.js'
@@ -73,7 +75,11 @@ export class Conn
     if (server) {
       this.server = server
     }
-    const muxerFactory = connParams?.muxerFactory ?? yamux()()
+    const muxerFactory =
+      connParams?.muxerFactory ??
+      yamux({ enableKeepAlive: false })({
+        logger: defaultLogger(),
+      })
     this.muxer = muxerFactory.createStreamMuxer({
       onIncomingStream: this.handleIncomingStream.bind(this),
       direction: connParams?.direction || 'outbound',

package/srpc/index.ts

@@ -32,6 +32,13 @@ export {
   prependLengthPrefixTransform,
   decodePacketSource,
   encodePacketSource,
+  uint32LEDecode,
+  uint32LEEncode,
+  decodeUint32Le,
+  encodeUint32Le,
+  lengthPrefixDecode,
+  lengthPrefixEncode,
+  prependPacketLen,
 } from './packet.js'
 export { combineUint8ArrayListTransform } from './array-list.js'
 export { ValueCtr } from './value-ctr.js'

package/srpc/message.ts

@@ -42,7 +42,7 @@ export function buildDecodeMessageTransform<T>(
   def: MessageDefinition<T>,
   memoize?: boolean,
 ): DecodeMessageTransform<T> {
-  const decode = memoize ? memoProtoDecode(def) : def.decode.bind(def)
+  const decode = !memoize ? def.decode.bind(def) : memoProtoDecode(def)
 
   // decodeMessageSource unmarshals and async yields encoded Messages.
   return async function* decodeMessageSource(
@@ -71,11 +71,11 @@ export function buildEncodeMessageTransform<T>(
   def: MessageDefinition<T>,
   memoize?: boolean,
 ): EncodeMessageTransform<T> {
-  const encode = memoize
-    ? memoProto(def)
-    : (msg: T): Uint8Array => {
+  const encode = !memoize
+    ? (msg: T): Uint8Array => {
         return def.encode(msg).finish()
       }
+    : memoProto(def)
 
   // encodeMessageSource encodes messages to byte arrays.
   return async function* encodeMessageSource(

package/srpc/packet.ts

@@ -1,15 +1,11 @@
-import {
-  encode as lengthPrefixEncode,
-  decode as lengthPrefixDecode,
-} from 'it-length-prefixed'
 import { Uint8ArrayList } from 'uint8arraylist'
+import { Source, Transform } from 'it-stream-types'
 
 import { Packet } from './rpcproto.pb.js'
 import {
   buildDecodeMessageTransform,
   buildEncodeMessageTransform,
 } from './message.js'
-import { Source, Transform } from 'it-stream-types'
 
 // decodePacketSource decodes packets from a binary data stream.
 export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
@@ -18,7 +14,7 @@ export const decodePacketSource = buildDecodeMessageTransform<Packet>(Packet)
 export const encodePacketSource = buildEncodeMessageTransform<Packet>(Packet)
 
 // uint32LEDecode removes the length prefix.
-const uint32LEDecode = (data: Uint8ArrayList) => {
+export const uint32LEDecode = (data: Uint8ArrayList) => {
   if (data.length < 4) {
     throw RangeError('Could not decode int32BE')
   }
@@ -28,34 +24,80 @@ const uint32LEDecode = (data: Uint8ArrayList) => {
 uint32LEDecode.bytes = 4
 
 // uint32LEEncode adds the length prefix.
-const uint32LEEncode = (value: number) => {
+export const uint32LEEncode = (value: number) => {
   const data = new Uint8ArrayList(new Uint8Array(4))
   data.setUint32(0, value, true)
   return data
 }
 uint32LEEncode.bytes = 4
 
+// lengthPrefixEncode transforms a source to a length-prefixed Uint8ArrayList stream.
+export async function* lengthPrefixEncode(
+  source: Source<Uint8Array | Uint8ArrayList>,
+  lengthEncoder: typeof uint32LEEncode,
+) {
+  for await (const chunk of source) {
+    // Encode the length of the chunk.
+    const length = chunk instanceof Uint8Array ? chunk.length : chunk.byteLength
+    const lengthEncoded = lengthEncoder(length)
+
+    // Concatenate the length prefix and the data.
+    yield new Uint8ArrayList(lengthEncoded, chunk)
+  }
+}
+
+// lengthPrefixDecode decodes a length-prefixed source to a Uint8ArrayList stream.
+export async function* lengthPrefixDecode(
+  source: Source<Uint8Array | Uint8ArrayList>,
+  lengthDecoder: typeof uint32LEDecode,
+) {
+  const buffer = new Uint8ArrayList()
+
+  for await (const chunk of source) {
+    buffer.append(chunk)
+
+    // Continue extracting messages while buffer contains enough data for decoding.
+    while (buffer.length >= lengthDecoder.bytes) {
+      const messageLength = lengthDecoder(buffer)
+      const totalLength = lengthDecoder.bytes + messageLength
+
+      if (buffer.length < totalLength) break // Wait for more data if the full message hasn't arrived.
+
+      // Extract the message excluding the length prefix.
+      const message = buffer.sublist(lengthDecoder.bytes, totalLength)
+      yield message
+
+      // Remove the processed message from the buffer.
+      buffer.consume(totalLength)
+    }
+  }
+}
+
 // prependLengthPrefixTransform adds a length prefix to a message source.
 // little-endian uint32
-export function prependLengthPrefixTransform(): Transform<
+export function prependLengthPrefixTransform(
+  lengthEncoder = uint32LEEncode,
+): Transform<
   Source<Uint8Array | Uint8ArrayList>,
-  | AsyncGenerator<Uint8Array, void, undefined>
-  | Generator<Uint8Array, void, undefined>
+  | AsyncGenerator<Uint8ArrayList, void, undefined>
+  | Generator<Uint8ArrayList, void, undefined>
 > {
   return (source: Source<Uint8Array | Uint8ArrayList>) => {
-    return lengthPrefixEncode(source, { lengthEncoder: uint32LEEncode })
+    return lengthPrefixEncode(source, lengthEncoder)
   }
 }
 
 // parseLengthPrefixTransform parses the length prefix from a message source.
 // little-endian uint32
-export function parseLengthPrefixTransform(): Transform<
-  Source<Uint8Array | Uint8ArrayList>, // Allow both AsyncIterable and Iterable
+export function parseLengthPrefixTransform(
+  lengthDecoder = uint32LEDecode,
+): Transform<
+  Source<Uint8Array | Uint8ArrayList>,
   | AsyncGenerator<Uint8ArrayList, void, unknown>
   | Generator<Uint8ArrayList, void, unknown>
 > {
   return (source: Source<Uint8Array | Uint8ArrayList>) => {
-    return lengthPrefixDecode(source, { lengthDecoder: uint32LEDecode })
+    return lengthPrefixDecode(source, lengthDecoder)
   }
 }
 

package/srpc/websocket.ts

@@ -1,11 +1,12 @@
 import { pipe } from 'it-pipe'
-import { Direction } from '@libp2p/interface/connection'
+import { Direction } from '@libp2p/interface'
 
 import duplex from '@aptre/it-ws/duplex'
 import type WebSocket from '@aptre/it-ws/web-socket'
 
 import { Conn } from './conn.js'
 import { Server } from './server.js'
+import { combineUint8ArrayListTransform } from './array-list.js'
 
 // WebSocketConn implements a connection with a WebSocket and optional Server.
 export class WebSocketConn extends Conn {
@@ -16,7 +17,13 @@ export class WebSocketConn extends Conn {
     super(server, { direction })
     this.socket = socket
     const socketDuplex = duplex(socket)
-    pipe(socketDuplex, this, socketDuplex)
+    pipe(
+      socketDuplex,
+      this,
+      // it-ws only supports sending Uint8Array.
+      combineUint8ArrayListTransform(),
+      socketDuplex,
+    )
   }
 
   // getSocket returns the websocket.