@libp2p/multistream-select 2.0.0 → 3.0.0

package/README.md

@@ -1,41 +1,39 @@
-# js-multistream-select <!-- omit in toc -->
+# @libp2p/multistream-select <!-- omit in toc -->
 
-[![test & maybe release](https://github.com/libp2p/js-libp2p-multistream-select/actions/workflows/js-test-and-release.yml/badge.svg)](https://github.com/libp2p/js-libp2p-multistream-select/actions/workflows/js-test-and-release.yml)
+[![libp2p.io](https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square)](http://libp2p.io/)
+[![IRC](https://img.shields.io/badge/freenode-%23libp2p-yellow.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23libp2p)
+[![Discuss](https://img.shields.io/discourse/https/discuss.libp2p.io/posts.svg?style=flat-square)](https://discuss.libp2p.io)
+[![codecov](https://img.shields.io/codecov/c/github/libp2p/js-libp2p-multistream-select.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-multistream-select)
+[![CI](https://img.shields.io/github/workflow/status/libp2p/js-libp2p-interfaces/test%20&%20maybe%20release/master?style=flat-square)](https://github.com/libp2p/js-libp2p-multistream-select/actions/workflows/js-test-and-release.yml)
 
-> JavaScript implementation of [multistream-select](https://github.com/multiformats/multistream-select)
+> JavaScript implementation of multistream-select
 
-## Table of Contents <!-- omit in toc -->
+## Table of contents <!-- omit in toc -->
 
+- [Install](#install)
 - [Background](#background)
   - [What is `multistream-select`?](#what-is-multistream-select)
     - [Select a protocol flow](#select-a-protocol-flow)
-- [Install](#install)
 - [Usage](#usage)
   - [Dialer](#dialer)
   - [Listener](#listener)
 - [API](#api)
-  - [`new Dialer(duplex)`](#new-dialerduplex)
+  - [`mss.select(dulpex, protocols, [options])`](#mssselectdulpex-protocols-options)
     - [Parameters](#parameters)
     - [Returns](#returns)
     - [Examples](#examples)
-  - [`dialer.select(protocols, [options])`](#dialerselectprotocols-options)
+  - [`mss.handle(duplex, protocols, [options])`](#msshandleduplex-protocols-options)
     - [Parameters](#parameters-1)
     - [Returns](#returns-1)
     - [Examples](#examples-1)
-  - [`dialer.ls([options])`](#dialerlsoptions)
-    - [Parameters](#parameters-2)
-    - [Returns](#returns-2)
-    - [Examples](#examples-2)
-  - [`new Listener(duplex)`](#new-listenerduplex)
-    - [Parameters](#parameters-3)
-    - [Returns](#returns-3)
-    - [Examples](#examples-3)
-  - [`listener.handle(protocols, [options])`](#listenerhandleprotocols-options)
-    - [Parameters](#parameters-4)
-    - [Returns](#returns-4)
-    - [Examples](#examples-4)
 - [License](#license)
-  - [Contribution](#contribution)
+- [Contribution](#contribution)
+
+## Install
+
+```console
+$ npm i @libp2p/multistream-select
+```
 
 ## Background
 
@@ -59,39 +57,29 @@ The caller will send "interactive" messages, expecting for some acknowledgement
 > <dht-message>
 ```
 
-This mode also packs a `ls` option, so that the callee can list the protocols it currently supports
-
-## Install
-
-```sh
-npm i @libp2p/multistream-select
-```
-
 ## Usage
 
 ```js
-import { Dialer, Listener } from '@libp2p/multistream-select'
+import { select, handle } from '@libp2p/multistream-select'
 // You can now use
-// Dialer - actively select a protocol with a remote
-// Listener - handle a protocol with a remote
+// select - actively select a protocol with a remote
+// handle - handle a protocol with a remote
 ```
 
 ### Dialer
 
 ```js
 import { pipe } from 'it-pipe'
-import { Dialer } from '@libp2p/multistream-select'
+import * as mss from '@libp2p/multistream-select'
 import { Mplex } from '@libp2p/mplex'
 
 const muxer = new Mplex()
 const muxedStream = muxer.newStream()
 
-const mss = new Dialer(muxedStream)
-
 // mss.select(protocol(s))
 // Select from one of the passed protocols (in priority order)
 // Returns selected stream and protocol
-const { stream: dhtStream, protocol } = await mss.select([
+const { stream: dhtStream, protocol } = await mss.select(muxedStream, [
   // This might just be different versions of DHT, but could be different impls
   '/ipfs-dht/2.0.0', // Most of the time this will probably just be one item.
   '/ipfs-dht/1.0.0'
@@ -118,16 +106,14 @@ const { stream: dhtStream, protocol } = await mss.select([
 
 ```js
 import { pipe } from 'it-pipe'
-import { Listener } from '@libp2p/multistream-select'
+import * as mss from '@libp2p/multistream-select'
 import { Mplex } from '@libp2p/mplex'
 
 const muxer = new Mplex({
   async onStream (muxedStream) {
-    const mss = new Listener(muxedStream)
-
     // mss.handle(handledProtocols)
     // Returns selected stream and protocol
-    const { stream, protocol } = await mss.handle([
+    const { stream, protocol } = await mss.handle(muxedStream, [
       '/ipfs-dht/1.0.0',
       '/ipfs-bitswap/1.0.0'
     ])
@@ -155,36 +141,19 @@ const muxer = new Mplex({
 
 ## API
 
-### `new Dialer(duplex)`
-
-Create a new multistream select "dialer" instance which can be used to negotiate a protocol to use, list all available protocols the remote supports, or do both.
-
-#### Parameters
-
-* `duplex` (`Object`) - A [duplex iterable stream](https://gist.github.com/alanshaw/591dc7dd54e4f99338a347ef568d6ee9#duplex-it) to dial on.
-
-#### Returns
-
-A new multistream select dialer instance.
-
-#### Examples
-
-```js
-const dialer = new MSS.Dialer(duplex)
-```
-
-### `dialer.select(protocols, [options])`
+### `mss.select(dulpex, protocols, [options])`
 
 Negotiate a protocol to use from a list of protocols.
 
 #### Parameters
 
-* `protocols` (`String[]`/`String`) - A list of protocols (or single protocol) to negotiate with. Protocols are attempted in order until a match is made.
-* `options` (`{ signal: AbortSignal }`) - an options object containing an AbortSignal
+- `duplex` (`Duplex`) - A [duplex iterable stream](https://gist.github.com/alanshaw/591dc7dd54e4f99338a347ef568d6ee9#duplex-it) to dial on.
+- `protocols` (`string[]`/`string`) - A list of protocols (or single protocol) to negotiate with. Protocols are attempted in order until a match is made.
+- `options` (`{ signal: AbortSignal, writeBytes?: boolean }`) - an options object containing an AbortSignal and an optional boolean `writeBytes` - if this is true, `Uint8Array`s will be written into `duplex`, otherwise `Uint8ArrayList`s will
 
 #### Returns
 
-`Promise<{ stream<Object>, protocol<String> }>` - A stream for the selected protocol and the protocol that was selected from the list of protocols provided to `select`.
+`Promise<{ stream<Duplex>, protocol<string> }>` - A stream for the selected protocol and the protocol that was selected from the list of protocols provided to `select`.
 
 Note that after a protocol is selected `dialer` can no longer be used.
 
@@ -199,68 +168,26 @@ const { stream, protocol } = await dialer.select([
 // Now talk `protocol` on `stream`
 ```
 
-### `dialer.ls([options])`
-
-List protocols that the remote supports.
-
-#### Parameters
-
-* `options` (`{ signal: AbortSignal }`) - an options object containing an AbortSignal
-
-#### Returns
-
-`String[]` - A list of all the protocols the remote supports.
-
-#### Examples
-
-```js
-const protocols = await dialer.ls()
-const wantedProto = '/ipfs-dht/2.0.0'
-
-if (!protocols.includes(wantedProto)) {
-  throw new Error('remote does not support ' + wantedProto)
-}
-
-// Now use dialer.select to use wantedProto, safe in the knowledge it is supported
-```
-
-### `new Listener(duplex)`
-
-Construct a new multistream select "listener" instance which can be used to handle multistream protocol selections for particular protocols.
-
-#### Parameters
-
-* `duplex` (`Object`) - A [duplex iterable stream](https://gist.github.com/alanshaw/591dc7dd54e4f99338a347ef568d6ee9#duplex-it) to listen on.
-
-#### Returns
-
-A new multistream select listener instance.
-
-#### Examples
-
-```js
-const listener = new MSS.Listener(duplex)
-```
-
-### `listener.handle(protocols, [options])`
+### `mss.handle(duplex, protocols, [options])`
 
 Handle multistream protocol selections for the given list of protocols.
 
 #### Parameters
 
-* `protocols` (`String[]`/`String`) - A list of protocols (or single protocol) that this listener is able to speak.
-* `options` (`{ signal: AbortSignal }`) - an options object containing an AbortSignal
+- `duplex` (`Duplex`) - A [duplex iterable stream](https://gist.github.com/alanshaw/591dc7dd54e4f99338a347ef568d6ee9#duplex-it) to listen on.
+- `protocols` (`String[]`/`String`) - A list of protocols (or single protocol) that this listener is able to speak.
+- `options` (`{ signal: AbortSignal, writeBytes?: boolean }`) - an options object containing an AbortSignal and an optional boolean `writeBytes` - if this is true, `Uint8Array`s will be written into `duplex`, otherwise `Uint8ArrayList`s will
 
 #### Returns
 
-`Promise<{ stream<Object>, protocol<String> }>` - A stream for the selected protocol and the protocol that was selected from the list of protocols provided to `select`.
+`Promise<{ stream<Duplex>, protocol<string> }>` - A stream for the selected protocol and the protocol that was selected from the list of protocols provided to `select`.
 
 Note that after a protocol is handled `listener` can no longer be used.
 
 #### Examples
 
 ```js
-const { stream, protocol } = await listener.handle([
+const { stream, protocol } = await mss.handle(duplex, [
   '/ipfs-dht/1.0.0',
   '/ipfs-bitswap/1.0.0'
 ])
@@ -271,9 +198,9 @@ const { stream, protocol } = await listener.handle([
 
 Licensed under either of
 
- * Apache 2.0, ([LICENSE-APACHE](LICENSE-APACHE) / http://www.apache.org/licenses/LICENSE-2.0)
- * MIT ([LICENSE-MIT](LICENSE-MIT) / http://opensource.org/licenses/MIT)
+- Apache 2.0, ([LICENSE-APACHE](LICENSE-APACHE) / <http://www.apache.org/licenses/LICENSE-2.0>)
+- MIT ([LICENSE-MIT](LICENSE-MIT) / <http://opensource.org/licenses/MIT>)
 
-### Contribution
+## Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.

package/dist/src/handle.d.ts

@@ -1,7 +1,6 @@
-import type { AbortOptions } from '@libp2p/interfaces';
+import { Uint8ArrayList } from 'uint8arraylist';
 import type { Duplex } from 'it-stream-types';
-export declare function handle(stream: Duplex<Uint8Array>, protocols: string | string[], options?: AbortOptions): Promise<{
-    stream: Duplex<Uint8Array, Uint8Array, Promise<void>>;
-    protocol: string;
-}>;
+import type { ByteArrayInit, ByteListInit, ProtocolStream } from './index.js';
+export declare function handle(stream: Duplex<Uint8Array>, protocols: string | string[], options: ByteArrayInit): Promise<ProtocolStream<Uint8Array>>;
+export declare function handle(stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>, protocols: string | string[], options?: ByteListInit): Promise<ProtocolStream<Uint8ArrayList, Uint8ArrayList | Uint8Array>>;
 //# sourceMappingURL=handle.d.ts.map

package/dist/src/handle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle.d.ts","sourceRoot":"","sources":["../../src/handle.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAI7C,wBAAsB,MAAM,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY;;;GA+B7G"}
+{"version":3,"file":"handle.d.ts","sourceRoot":"","sources":["../../src/handle.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAyB,cAAc,EAAE,MAAM,YAAY,CAAA;AAIpG,wBAAsB,MAAM,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAA;AACpJ,wBAAsB,MAAM,CAAE,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,cAAc,GAAG,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,UAAU,CAAC,CAAC,CAAA"}

package/dist/src/handle.js

@@ -13,22 +13,23 @@ export async function handle(stream, protocols, options) {
         log('read "%s"', protocol);
         if (protocol === PROTOCOL_ID) {
             log('respond with "%s" for "%s"', PROTOCOL_ID, protocol);
-            multistream.write(writer, uint8ArrayFromString(PROTOCOL_ID));
+            multistream.write(writer, uint8ArrayFromString(PROTOCOL_ID), options);
             continue;
         }
         if (protocols.includes(protocol)) {
-            multistream.write(writer, uint8ArrayFromString(protocol));
+            multistream.write(writer, uint8ArrayFromString(protocol), options);
             log('respond with "%s" for "%s"', protocol, protocol);
             rest();
             return { stream: shakeStream, protocol };
         }
         if (protocol === 'ls') {
             // <varint-msg-len><varint-proto-name-len><proto-name>\n<varint-proto-name-len><proto-name>\n\n
-            multistream.write(writer, new Uint8ArrayList(...protocols.map(p => multistream.encode(uint8ArrayFromString(p)))));
+            multistream.write(writer, new Uint8ArrayList(...protocols.map(p => multistream.encode(uint8ArrayFromString(p)))), options);
+            // multistream.writeAll(writer, protocols.map(p => uint8ArrayFromString(p)))
             log('respond with "%s" for %s', protocols, protocol);
             continue;
         }
-        multistream.write(writer, uint8ArrayFromString('na'));
+        multistream.write(writer, uint8ArrayFromString('na'), options);
         log('respond with "na" for "%s"', protocol);
     }
 }

package/dist/src/handle.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle.js","sourceRoot":"","sources":["../../src/handle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAI/C,MAAM,GAAG,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,MAAM,CAAE,MAA0B,EAAE,SAA4B,EAAE,OAAsB;IAC5G,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC9D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvE,OAAO,IAAI,EAAE;QACX,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QAE1B,IAAI,QAAQ,KAAK,WAAW,EAAE;YAC5B,GAAG,CAAC,4BAA4B,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;YACxD,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAA;YAC5D,SAAQ;SACT;QAED,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAChC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAA;YACzD,GAAG,CAAC,4BAA4B,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YACrD,IAAI,EAAE,CAAA;YACN,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;SACzC;QAED,IAAI,QAAQ,KAAK,IAAI,EAAE;YACrB,+FAA+F;YAC/F,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,cAAc,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACjH,GAAG,CAAC,0BAA0B,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;YACpD,SAAQ;SACT;QAED,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAA;QACrD,GAAG,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAA;KAC5C;AACH,CAAC"}
+{"version":3,"file":"handle.js","sourceRoot":"","sources":["../../src/handle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAI/C,MAAM,GAAG,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;AAIvC,MAAM,CAAC,KAAK,UAAU,MAAM,CAAE,MAAmB,EAAE,SAA4B,EAAE,OAA+B;IAC9G,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC9D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvE,OAAO,IAAI,EAAE;QACX,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QAE1B,IAAI,QAAQ,KAAK,WAAW,EAAE;YAC5B,GAAG,CAAC,4BAA4B,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;YACxD,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAA;YACrE,SAAQ;SACT;QAED,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAChC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;YAClE,GAAG,CAAC,4BAA4B,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YACrD,IAAI,EAAE,CAAA;YACN,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;SACzC;QAED,IAAI,QAAQ,KAAK,IAAI,EAAE;YACrB,+FAA+F;YAC/F,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,cAAc,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;YAC1H,4EAA4E;YAC5E,GAAG,CAAC,0BAA0B,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;YACpD,SAAQ;SACT;QAED,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAA;KAC5C;AACH,CAAC"}

package/dist/src/index.d.ts

@@ -2,25 +2,19 @@ import { PROTOCOL_ID } from './constants.js';
 import type { Duplex } from 'it-stream-types';
 import type { AbortOptions } from '@libp2p/interfaces';
 export { PROTOCOL_ID };
-export interface ProtocolStream {
-    stream: Duplex<Uint8Array>;
+export interface ProtocolStream<TSource, TSink = TSource> {
+    stream: Duplex<TSource, TSink>;
     protocol: string;
 }
-declare class MultistreamSelect {
-    protected stream: Duplex<Uint8Array>;
-    protected shaken: boolean;
-    constructor(stream: Duplex<Uint8Array>);
-    /**
-     * Perform the multistream-select handshake
-     *
-     * @param {AbortOptions} [options]
-     */
-    _handshake(options?: AbortOptions): Promise<void>;
+export interface ByteArrayInit extends AbortOptions {
+    writeBytes: true;
 }
-export declare class Dialer extends MultistreamSelect {
-    select(protocols: string | string[], options?: AbortOptions): Promise<ProtocolStream>;
+export interface ByteListInit extends AbortOptions {
+    writeBytes?: false;
 }
-export declare class Listener extends MultistreamSelect {
-    handle(protocols: string | string[], options?: AbortOptions): Promise<ProtocolStream>;
+export interface MultistreamSelectInit extends AbortOptions {
+    writeBytes?: boolean;
 }
+export { select } from './select.js';
+export { handle } from './handle.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,EAAE,WAAW,EAAE,CAAA;AAEtB,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,cAAM,iBAAiB;IACrB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IACpC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAA;gBAEZ,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC;IAKvC;;;;OAIG;IACG,UAAU,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CASzD;AAED,qBAAa,MAAO,SAAQ,iBAAiB;IACrC,MAAM,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC;CAG7F;AAED,qBAAa,QAAS,SAAQ,iBAAiB;IACvC,MAAM,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC;CAG7F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,EAAE,WAAW,EAAE,CAAA;AAEtB,MAAM,WAAW,cAAc,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO;IACtD,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC9B,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,UAAU,EAAE,IAAI,CAAA;CACjB;AAED,MAAM,WAAW,YAAa,SAAQ,YAAY;IAChD,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB;AAED,MAAM,WAAW,qBAAsB,SAAQ,YAAY;IACzD,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA"}

package/dist/src/index.js

@@ -1,34 +1,5 @@
-import { select } from './select.js';
-import { handle } from './handle.js';
 import { PROTOCOL_ID } from './constants.js';
 export { PROTOCOL_ID };
-class MultistreamSelect {
-    constructor(stream) {
-        this.stream = stream;
-        this.shaken = false;
-    }
-    /**
-     * Perform the multistream-select handshake
-     *
-     * @param {AbortOptions} [options]
-     */
-    async _handshake(options) {
-        if (this.shaken) {
-            return;
-        }
-        const { stream } = await select(this.stream, PROTOCOL_ID, undefined, options);
-        this.stream = stream;
-        this.shaken = true;
-    }
-}
-export class Dialer extends MultistreamSelect {
-    async select(protocols, options) {
-        return await select(this.stream, protocols, this.shaken ? undefined : PROTOCOL_ID, options);
-    }
-}
-export class Listener extends MultistreamSelect {
-    async handle(protocols, options) {
-        return await handle(this.stream, protocols, options);
-    }
-}
+export { select } from './select.js';
+export { handle } from './handle.js';
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5C,OAAO,EAAE,WAAW,EAAE,CAAA;AAOtB,MAAM,iBAAiB;IAIrB,YAAa,MAA0B;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;IACrB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAE,OAAsB;QACtC,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAM;SACP;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC7E,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;IACpB,CAAC;CACF;AAED,MAAM,OAAO,MAAO,SAAQ,iBAAiB;IAC3C,KAAK,CAAC,MAAM,CAAE,SAA4B,EAAE,OAAsB;QAChE,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAC7F,CAAC;CACF;AAED,MAAM,OAAO,QAAS,SAAQ,iBAAiB;IAC7C,KAAK,CAAC,MAAM,CAAE,SAA4B,EAAE,OAAsB;QAChE,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5C,OAAO,EAAE,WAAW,EAAE,CAAA;AAmBtB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA"}

package/dist/src/multistream.d.ts

@@ -2,15 +2,16 @@ import { Uint8ArrayList } from 'uint8arraylist';
 import type { Pushable } from 'it-pushable';
 import type { AbortOptions } from '@libp2p/interfaces';
 import type { Reader } from 'it-reader';
-export declare function encode(buffer: Uint8Array | Uint8ArrayList): Uint8Array;
+import type { MultistreamSelectInit } from '.';
+export declare function encode(buffer: Uint8Array | Uint8ArrayList): Uint8ArrayList;
 /**
  * `write` encodes and writes a single buffer
  */
-export declare function write(writer: Pushable<Uint8Array>, buffer: Uint8Array | Uint8ArrayList): void;
+export declare function write(writer: Pushable<any>, buffer: Uint8Array | Uint8ArrayList, options?: MultistreamSelectInit): void;
 /**
  * `writeAll` behaves like `write`, except it encodes an array of items as a single write
  */
-export declare function writeAll(writer: Pushable<Uint8Array>, buffers: Uint8Array[]): void;
-export declare function read(reader: Reader, options?: AbortOptions): Promise<Uint8Array>;
+export declare function writeAll(writer: Pushable<any>, buffers: Uint8Array[], options?: MultistreamSelectInit): void;
+export declare function read(reader: Reader, options?: AbortOptions): Promise<Uint8ArrayList>;
 export declare function readString(reader: Reader, options?: AbortOptions): Promise<string>;
 //# sourceMappingURL=multistream.d.ts.map

package/dist/src/multistream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multistream.d.ts","sourceRoot":"","sources":["../../src/multistream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAQ/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAIvC,wBAAgB,MAAM,CAAE,MAAM,EAAE,UAAU,GAAG,cAAc,GAAG,UAAU,CAIvE;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,GAAG,cAAc,QAEvF;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAQ5E;AAED,wBAAsB,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,uBAiCjE;AAED,wBAAsB,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,mBAIvE"}
+{"version":3,"file":"multistream.d.ts","sourceRoot":"","sources":["../../src/multistream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAQ/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAA;AAI9C,wBAAgB,MAAM,CAAE,MAAM,EAAE,UAAU,GAAG,cAAc,GAAG,cAAc,CAI3E;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,GAAG,cAAc,EAAE,OAAO,GAAE,qBAA0B,QAQrH;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,OAAO,GAAE,qBAA0B,QAY1G;AAED,wBAAsB,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAmC3F;AAED,wBAAsB,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,mBAIvE"}

package/dist/src/multistream.js

@@ -9,23 +9,34 @@ import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 const NewLine = uint8ArrayFromString('\n');
 export function encode(buffer) {
     const list = new Uint8ArrayList(buffer, NewLine);
-    return lp.encode.single(list).slice();
+    return lp.encode.single(list);
 }
 /**
  * `write` encodes and writes a single buffer
  */
-export function write(writer, buffer) {
-    writer.push(encode(buffer).slice());
+export function write(writer, buffer, options = {}) {
+    const encoded = encode(buffer);
+    if (options.writeBytes === true) {
+        writer.push(encoded.subarray());
+    }
+    else {
+        writer.push(encoded);
+    }
 }
 /**
  * `writeAll` behaves like `write`, except it encodes an array of items as a single write
  */
-export function writeAll(writer, buffers) {
+export function writeAll(writer, buffers, options = {}) {
     const list = new Uint8ArrayList();
     for (const buf of buffers) {
         list.append(encode(buf));
     }
-    writer.push(list.slice());
+    if (options.writeBytes === true) {
+        writer.push(list.subarray());
+    }
+    else {
+        writer.push(list);
+    }
 }
 export async function read(reader, options) {
     let byteLength = 1; // Read single byte chunks until the length is known
@@ -40,18 +51,20 @@ export async function read(reader, options) {
         input = abortableSource(varByteSource, options.signal);
     }
     // Once the length has been parsed, read chunk for that length
-    const onLength = (l) => { byteLength = l; };
+    const onLength = (l) => {
+        byteLength = l;
+    };
     const buf = await pipe(input, lp.decode({ onLength }), async (source) => await first(source));
     if (buf == null) {
         throw errCode(new Error('no buffer returned'), 'ERR_INVALID_MULTISTREAM_SELECT_MESSAGE');
     }
-    if (buf[buf.length - 1] !== NewLine[0]) {
+    if (buf.get(buf.byteLength - 1) !== NewLine[0]) {
         throw errCode(new Error('missing newline'), 'ERR_INVALID_MULTISTREAM_SELECT_MESSAGE');
     }
-    return buf.slice(0, -1); // Remove newline
+    return buf.sublist(0, -1); // Remove newline
 }
 export async function readString(reader, options) {
     const buf = await read(reader, options);
-    return uint8ArrayToString(buf);
+    return uint8ArrayToString(buf.subarray());
 }
 //# sourceMappingURL=multistream.js.map

package/dist/src/multistream.js.map

@@ -1 +1 @@
-{"version":3,"file":"multistream.js","sourceRoot":"","sources":["../../src/multistream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multistream.js","sourceRoot":"","sources":["../../src/multistream.ts"],"names":[],"mappings":"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"}

package/dist/src/select.d.ts

@@ -1,7 +1,6 @@
-import type { AbortOptions } from '@libp2p/interfaces';
 import type { Duplex } from 'it-stream-types';
-export declare function select(stream: Duplex<Uint8Array>, protocols: string | string[], protocolId?: string, options?: AbortOptions): Promise<{
-    stream: Duplex<Uint8Array, Uint8Array, Promise<void>>;
-    protocol: string;
-}>;
+import type { Uint8ArrayList } from 'uint8arraylist';
+import type { ByteArrayInit, ByteListInit, ProtocolStream } from './index.js';
+export declare function select(stream: Duplex<Uint8Array>, protocols: string | string[], options: ByteArrayInit): Promise<ProtocolStream<Uint8Array>>;
+export declare function select(stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>, protocols: string | string[], options?: ByteListInit): Promise<ProtocolStream<Uint8ArrayList, Uint8ArrayList | Uint8Array>>;
 //# sourceMappingURL=select.d.ts.map

package/dist/src/select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../src/select.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAI7C,wBAAsB,MAAM,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;;;GAgDlI"}
+{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../src/select.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAyB,cAAc,EAAE,MAAM,YAAY,CAAA;AAIpG,wBAAsB,MAAM,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAA;AACpJ,wBAAsB,MAAM,CAAE,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,cAAc,GAAG,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,UAAU,CAAC,CAAC,CAAA"}

package/dist/src/select.js

@@ -3,26 +3,23 @@ import errCode from 'err-code';
 import * as multistream from './multistream.js';
 import { handshake } from 'it-handshake';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
+import { PROTOCOL_ID } from './index.js';
 const log = logger('libp2p:mss:select');
-export async function select(stream, protocols, protocolId, options) {
+export async function select(stream, protocols, options = {}) {
     protocols = Array.isArray(protocols) ? [...protocols] : [protocols];
     const { reader, writer, rest, stream: shakeStream } = handshake(stream);
     const protocol = protocols.shift();
     if (protocol == null) {
         throw new Error('At least one protocol must be specified');
     }
-    if (protocolId != null) {
-        log('select: write ["%s", "%s"]', protocolId, protocol);
-        multistream.writeAll(writer, [uint8ArrayFromString(protocolId), uint8ArrayFromString(protocol)]);
-    }
-    else {
-        log('select: write "%s"', protocol);
-        multistream.write(writer, uint8ArrayFromString(protocol));
-    }
+    log('select: write ["%s", "%s"]', PROTOCOL_ID, protocol);
+    const p1 = uint8ArrayFromString(PROTOCOL_ID);
+    const p2 = uint8ArrayFromString(protocol);
+    multistream.writeAll(writer, [p1, p2], options);
     let response = await multistream.readString(reader, options);
     log('select: read "%s"', response);
     // Read the protocol response if we got the protocolId in return
-    if (response === protocolId) {
+    if (response === PROTOCOL_ID) {
         response = await multistream.readString(reader, options);
         log('select: read "%s"', response);
     }
@@ -34,7 +31,7 @@ export async function select(stream, protocols, protocolId, options) {
     // We haven't gotten a valid ack, try the other protocols
     for (const protocol of protocols) {
         log('select: write "%s"', protocol);
-        multistream.write(writer, uint8ArrayFromString(protocol));
+        multistream.write(writer, uint8ArrayFromString(protocol), options);
         const response = await multistream.readString(reader, options);
         log('select: read "%s" for "%s"', response, protocol);
         if (response === protocol) {

package/dist/src/select.js.map

@@ -1 +1 @@
-{"version":3,"file":"select.js","sourceRoot":"","sources":["../../src/select.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAI5E,MAAM,GAAG,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,MAAM,CAAE,MAA0B,EAAE,SAA4B,EAAE,UAAmB,EAAE,OAAsB;IACjI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACnE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvE,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,EAAE,CAAA;IAElC,IAAI,QAAQ,IAAI,IAAI,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;KAC3D;IAED,IAAI,UAAU,IAAI,IAAI,EAAE;QACtB,GAAG,CAAC,4BAA4B,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;QACvD,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;KACjG;SAAM;QACL,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;QACnC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAA;KAC1D;IAED,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5D,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;IAElC,gEAAgE;IAChE,IAAI,QAAQ,KAAK,UAAU,EAAE;QAC3B,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACxD,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;KACnC;IAED,aAAa;IACb,IAAI,QAAQ,KAAK,QAAQ,EAAE;QACzB,IAAI,EAAE,CAAA;QACN,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;KACzC;IAED,yDAAyD;IACzD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;QACnC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAA;QACzD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,4BAA4B,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAErD,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,IAAI,EAAE,CAAA,CAAC,uDAAuD;YAC9D,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;SACzC;KACF;IAED,IAAI,EAAE,CAAA;IACN,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,EAAE,0BAA0B,CAAC,CAAA;AACnF,CAAC"}
+{"version":3,"file":"select.js","sourceRoot":"","sources":["../../src/select.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAKxC,MAAM,GAAG,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;AAIvC,MAAM,CAAC,KAAK,UAAU,MAAM,CAAE,MAAmB,EAAE,SAA4B,EAAE,UAAiC,EAAE;IAClH,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACnE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAEvE,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,EAAE,CAAA;IAElC,IAAI,QAAQ,IAAI,IAAI,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;KAC3D;IAED,GAAG,CAAC,4BAA4B,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IACxD,MAAM,EAAE,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAA;IAC5C,MAAM,EAAE,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IACzC,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAA;IAE/C,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5D,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;IAElC,gEAAgE;IAChE,IAAI,QAAQ,KAAK,WAAW,EAAE;QAC5B,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACxD,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;KACnC;IAED,aAAa;IACb,IAAI,QAAQ,KAAK,QAAQ,EAAE;QACzB,IAAI,EAAE,CAAA;QACN,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;KACzC;IAED,yDAAyD;IACzD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;QACnC,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;QAClE,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,4BAA4B,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAErD,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,IAAI,EAAE,CAAA,CAAC,uDAAuD;YAC9D,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;SACzC;KACF;IAED,IAAI,EAAE,CAAA;IACN,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,EAAE,0BAA0B,CAAC,CAAA;AACnF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/multistream-select",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "JavaScript implementation of multistream-select",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-multistream-select#readme",
@@ -32,6 +32,7 @@
   ],
   "exports": {
     ".": {
+      "types": "./dist/src/index.d.ts",
       "import": "./dist/src/index.js"
     }
   },
@@ -68,15 +69,15 @@
               "release": "patch"
             },
             {
-              "type": "chore",
+              "type": "docs",
               "release": "patch"
             },
             {
-              "type": "docs",
+              "type": "test",
               "release": "patch"
             },
             {
-              "type": "test",
+              "type": "deps",
               "release": "patch"
             },
             {
@@ -106,7 +107,11 @@
               },
               {
                 "type": "docs",
-                "section": "Trivial Changes"
+                "section": "Documentation"
+              },
+              {
+                "type": "deps",
+                "section": "Dependencies"
               },
               {
                 "type": "test",
@@ -137,18 +142,19 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@libp2p/logger": "^1.1.0",
+    "@libp2p/interfaces": "^3.0.2",
+    "@libp2p/logger": "^2.0.0",
     "abortable-iterator": "^4.0.2",
     "err-code": "^3.0.1",
     "it-first": "^1.0.6",
-    "it-handshake": "^4.0.0",
-    "it-length-prefixed": "^7.0.1",
+    "it-handshake": "^4.0.1",
+    "it-length-prefixed": "^8.0.2",
     "it-pipe": "^2.0.3",
     "it-pushable": "^3.0.0",
-    "it-reader": "^5.0.0",
+    "it-reader": "^6.0.1",
     "it-stream-types": "^1.0.4",
     "p-defer": "^4.0.0",
-    "uint8arraylist": "^1.5.1",
+    "uint8arraylist": "^2.3.1",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
@@ -158,7 +164,7 @@
     "it-all": "^1.0.6",
     "it-map": "^1.0.6",
     "it-pair": "^2.0.2",
-    "p-timeout": "^5.0.2",
+    "p-timeout": "^6.0.0",
     "timeout-abort-controller": "^3.0.0",
     "util": "^0.12.4",
     "varint": "^6.0.0"

package/src/handle.ts

@@ -4,12 +4,14 @@ import { handshake } from 'it-handshake'
 import { PROTOCOL_ID } from './constants.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { Uint8ArrayList } from 'uint8arraylist'
-import type { AbortOptions } from '@libp2p/interfaces'
 import type { Duplex } from 'it-stream-types'
+import type { ByteArrayInit, ByteListInit, MultistreamSelectInit, ProtocolStream } from './index.js'
 
 const log = logger('libp2p:mss:handle')
 
-export async function handle (stream: Duplex<Uint8Array>, protocols: string | string[], options?: AbortOptions) {
+export async function handle (stream: Duplex<Uint8Array>, protocols: string | string[], options: ByteArrayInit): Promise<ProtocolStream<Uint8Array>>
+export async function handle (stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>, protocols: string | string[], options?: ByteListInit): Promise<ProtocolStream<Uint8ArrayList, Uint8ArrayList | Uint8Array>>
+export async function handle (stream: Duplex<any>, protocols: string | string[], options?: MultistreamSelectInit): Promise<ProtocolStream<any>> {
   protocols = Array.isArray(protocols) ? protocols : [protocols]
   const { writer, reader, rest, stream: shakeStream } = handshake(stream)
 
@@ -19,12 +21,12 @@ export async function handle (stream: Duplex<Uint8Array>, protocols: string | st
 
     if (protocol === PROTOCOL_ID) {
       log('respond with "%s" for "%s"', PROTOCOL_ID, protocol)
-      multistream.write(writer, uint8ArrayFromString(PROTOCOL_ID))
+      multistream.write(writer, uint8ArrayFromString(PROTOCOL_ID), options)
       continue
     }
 
     if (protocols.includes(protocol)) {
-      multistream.write(writer, uint8ArrayFromString(protocol))
+      multistream.write(writer, uint8ArrayFromString(protocol), options)
       log('respond with "%s" for "%s"', protocol, protocol)
       rest()
       return { stream: shakeStream, protocol }
@@ -32,12 +34,13 @@ export async function handle (stream: Duplex<Uint8Array>, protocols: string | st
 
     if (protocol === 'ls') {
       // <varint-msg-len><varint-proto-name-len><proto-name>\n<varint-proto-name-len><proto-name>\n\n
-      multistream.write(writer, new Uint8ArrayList(...protocols.map(p => multistream.encode(uint8ArrayFromString(p)))))
+      multistream.write(writer, new Uint8ArrayList(...protocols.map(p => multistream.encode(uint8ArrayFromString(p)))), options)
+      // multistream.writeAll(writer, protocols.map(p => uint8ArrayFromString(p)))
       log('respond with "%s" for %s', protocols, protocol)
       continue
     }
 
-    multistream.write(writer, uint8ArrayFromString('na'))
+    multistream.write(writer, uint8ArrayFromString('na'), options)
     log('respond with "na" for "%s"', protocol)
   }
 }

package/src/index.ts

@@ -1,49 +1,25 @@
-import { select } from './select.js'
-import { handle } from './handle.js'
 import { PROTOCOL_ID } from './constants.js'
 import type { Duplex } from 'it-stream-types'
 import type { AbortOptions } from '@libp2p/interfaces'
 
 export { PROTOCOL_ID }
 
-export interface ProtocolStream {
-  stream: Duplex<Uint8Array>
+export interface ProtocolStream<TSource, TSink = TSource> {
+  stream: Duplex<TSource, TSink>
   protocol: string
 }
 
-class MultistreamSelect {
-  protected stream: Duplex<Uint8Array>
-  protected shaken: boolean
-
-  constructor (stream: Duplex<Uint8Array>) {
-    this.stream = stream
-    this.shaken = false
-  }
-
-  /**
-   * Perform the multistream-select handshake
-   *
-   * @param {AbortOptions} [options]
-   */
-  async _handshake (options?: AbortOptions): Promise<void> {
-    if (this.shaken) {
-      return
-    }
-
-    const { stream } = await select(this.stream, PROTOCOL_ID, undefined, options)
-    this.stream = stream
-    this.shaken = true
-  }
+export interface ByteArrayInit extends AbortOptions {
+  writeBytes: true
 }
 
-export class Dialer extends MultistreamSelect {
-  async select (protocols: string | string[], options?: AbortOptions): Promise<ProtocolStream> {
-    return await select(this.stream, protocols, this.shaken ? undefined : PROTOCOL_ID, options)
-  }
+export interface ByteListInit extends AbortOptions {
+  writeBytes?: false
 }
 
-export class Listener extends MultistreamSelect {
-  async handle (protocols: string | string[], options?: AbortOptions): Promise<ProtocolStream> {
-    return await handle(this.stream, protocols, options)
-  }
+export interface MultistreamSelectInit extends AbortOptions {
+  writeBytes?: boolean
 }
+
+export { select } from './select.js'
+export { handle } from './handle.js'

package/src/multistream.ts

@@ -11,36 +11,47 @@ import type { Pushable } from 'it-pushable'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Source } from 'it-stream-types'
 import type { Reader } from 'it-reader'
+import type { MultistreamSelectInit } from '.'
 
 const NewLine = uint8ArrayFromString('\n')
 
-export function encode (buffer: Uint8Array | Uint8ArrayList): Uint8Array {
+export function encode (buffer: Uint8Array | Uint8ArrayList): Uint8ArrayList {
   const list = new Uint8ArrayList(buffer, NewLine)
 
-  return lp.encode.single(list).slice()
+  return lp.encode.single(list)
 }
 
 /**
  * `write` encodes and writes a single buffer
  */
-export function write (writer: Pushable<Uint8Array>, buffer: Uint8Array | Uint8ArrayList) {
-  writer.push(encode(buffer).slice())
+export function write (writer: Pushable<any>, buffer: Uint8Array | Uint8ArrayList, options: MultistreamSelectInit = {}) {
+  const encoded = encode(buffer)
+
+  if (options.writeBytes === true) {
+    writer.push(encoded.subarray())
+  } else {
+    writer.push(encoded)
+  }
 }
 
 /**
  * `writeAll` behaves like `write`, except it encodes an array of items as a single write
  */
-export function writeAll (writer: Pushable<Uint8Array>, buffers: Uint8Array[]) {
+export function writeAll (writer: Pushable<any>, buffers: Uint8Array[], options: MultistreamSelectInit = {}) {
   const list = new Uint8ArrayList()
 
   for (const buf of buffers) {
     list.append(encode(buf))
   }
 
-  writer.push(list.slice())
+  if (options.writeBytes === true) {
+    writer.push(list.subarray())
+  } else {
+    writer.push(list)
+  }
 }
 
-export async function read (reader: Reader, options?: AbortOptions) {
+export async function read (reader: Reader, options?: AbortOptions): Promise<Uint8ArrayList> {
   let byteLength = 1 // Read single byte chunks until the length is known
   const varByteSource = { // No return impl - we want the reader to remain readable
     [Symbol.asyncIterator]: () => varByteSource,
@@ -56,7 +67,9 @@ export async function read (reader: Reader, options?: AbortOptions) {
   }
 
   // Once the length has been parsed, read chunk for that length
-  const onLength = (l: number) => { byteLength = l }
+  const onLength = (l: number) => {
+    byteLength = l
+  }
 
   const buf = await pipe(
     input,
@@ -68,15 +81,15 @@ export async function read (reader: Reader, options?: AbortOptions) {
     throw errCode(new Error('no buffer returned'), 'ERR_INVALID_MULTISTREAM_SELECT_MESSAGE')
   }
 
-  if (buf[buf.length - 1] !== NewLine[0]) {
+  if (buf.get(buf.byteLength - 1) !== NewLine[0]) {
     throw errCode(new Error('missing newline'), 'ERR_INVALID_MULTISTREAM_SELECT_MESSAGE')
   }
 
-  return buf.slice(0, -1) // Remove newline
+  return buf.sublist(0, -1) // Remove newline
 }
 
 export async function readString (reader: Reader, options?: AbortOptions) {
   const buf = await read(reader, options)
 
-  return uint8ArrayToString(buf)
+  return uint8ArrayToString(buf.subarray())
 }

package/src/select.ts

@@ -3,12 +3,16 @@ import errCode from 'err-code'
 import * as multistream from './multistream.js'
 import { handshake } from 'it-handshake'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import type { AbortOptions } from '@libp2p/interfaces'
+import { PROTOCOL_ID } from './index.js'
 import type { Duplex } from 'it-stream-types'
+import type { Uint8ArrayList } from 'uint8arraylist'
+import type { ByteArrayInit, ByteListInit, MultistreamSelectInit, ProtocolStream } from './index.js'
 
 const log = logger('libp2p:mss:select')
 
-export async function select (stream: Duplex<Uint8Array>, protocols: string | string[], protocolId?: string, options?: AbortOptions) {
+export async function select (stream: Duplex<Uint8Array>, protocols: string | string[], options: ByteArrayInit): Promise<ProtocolStream<Uint8Array>>
+export async function select (stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>, protocols: string | string[], options?: ByteListInit): Promise<ProtocolStream<Uint8ArrayList, Uint8ArrayList | Uint8Array>>
+export async function select (stream: Duplex<any>, protocols: string | string[], options: MultistreamSelectInit = {}): Promise<ProtocolStream<any>> {
   protocols = Array.isArray(protocols) ? [...protocols] : [protocols]
   const { reader, writer, rest, stream: shakeStream } = handshake(stream)
 
@@ -18,19 +22,16 @@ export async function select (stream: Duplex<Uint8Array>, protocols: string | st
     throw new Error('At least one protocol must be specified')
   }
 
-  if (protocolId != null) {
-    log('select: write ["%s", "%s"]', protocolId, protocol)
-    multistream.writeAll(writer, [uint8ArrayFromString(protocolId), uint8ArrayFromString(protocol)])
-  } else {
-    log('select: write "%s"', protocol)
-    multistream.write(writer, uint8ArrayFromString(protocol))
-  }
+  log('select: write ["%s", "%s"]', PROTOCOL_ID, protocol)
+  const p1 = uint8ArrayFromString(PROTOCOL_ID)
+  const p2 = uint8ArrayFromString(protocol)
+  multistream.writeAll(writer, [p1, p2], options)
 
   let response = await multistream.readString(reader, options)
   log('select: read "%s"', response)
 
   // Read the protocol response if we got the protocolId in return
-  if (response === protocolId) {
+  if (response === PROTOCOL_ID) {
     response = await multistream.readString(reader, options)
     log('select: read "%s"', response)
   }
@@ -44,7 +45,7 @@ export async function select (stream: Duplex<Uint8Array>, protocols: string | st
   // We haven't gotten a valid ack, try the other protocols
   for (const protocol of protocols) {
     log('select: write "%s"', protocol)
-    multistream.write(writer, uint8ArrayFromString(protocol))
+    multistream.write(writer, uint8ArrayFromString(protocol), options)
     const response = await multistream.readString(reader, options)
     log('select: read "%s" for "%s"', response, protocol)