@libp2p/pnet 2.0.46-cf9aab5c8 → 2.0.47-a02cb0461

package/dist/src/crypto.d.ts

@@ -1,13 +1,24 @@
-import type { Source } from 'it-stream-types';
+import { AbstractMultiaddrConnection } from '@libp2p/utils';
+import type { AbortOptions, MultiaddrConnection } from '@libp2p/interface';
+import type { MessageStreamInit, SendResult } from '@libp2p/utils';
 import type { Uint8ArrayList } from 'uint8arraylist';
-/**
- * Creates a stream iterable to encrypt messages in a private network
- */
-export declare function createBoxStream(nonce: Uint8Array, psk: Uint8Array): (source: Source<Uint8Array | Uint8ArrayList>) => AsyncGenerator<Uint8Array | Uint8ArrayList>;
-/**
- * Creates a stream iterable to decrypt messages in a private network
- */
-export declare function createUnboxStream(nonce: Uint8Array, psk: Uint8Array): (source: Source<Uint8Array>) => AsyncGenerator<Uint8Array<ArrayBuffer>, void, unknown>;
+export interface BoxMessageStreamInit extends MessageStreamInit {
+    maConn: MultiaddrConnection;
+    localNonce: Uint8Array;
+    remoteNonce: Uint8Array;
+    psk: Uint8Array;
+}
+export declare class BoxMessageStream extends AbstractMultiaddrConnection {
+    private maConn;
+    private inboundXor;
+    private outboundXor;
+    constructor(init: BoxMessageStreamInit);
+    sendClose(options?: AbortOptions): Promise<void>;
+    sendData(data: Uint8ArrayList): SendResult;
+    sendReset(err: Error): void;
+    sendPause(): void;
+    sendResume(): void;
+}
 /**
  * Decode the version 1 psk from the given Uint8Array
  */

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

@@ -1 +1 @@
-{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD;;GAEG;AACH,wBAAgB,eAAe,CAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,GAAG,cAAc,CAAC,KAAK,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,CAQjK;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,IAC3D,QAAQ,MAAM,CAAC,UAAU,CAAC,4DAOnC;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAE,SAAS,EAAE,UAAU,GAAG;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,GAAG,EAAE,UAAU,CAAA;CAAE,CAyB/H"}
+{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAM3D,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,MAAM,EAAE,mBAAmB,CAAA;IAC3B,UAAU,EAAE,UAAU,CAAA;IACtB,WAAW,EAAE,UAAU,CAAA;IACvB,GAAG,EAAE,UAAU,CAAA;CAChB;AAED,qBAAa,gBAAiB,SAAQ,2BAA2B;IAC/D,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,WAAW,CAAc;gBAEpB,IAAI,EAAE,oBAAoB;IAoCjC,SAAS,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,QAAQ,CAAE,IAAI,EAAE,cAAc,GAAG,UAAU;IAO3C,SAAS,CAAE,GAAG,EAAE,KAAK,GAAG,IAAI;IAI5B,SAAS,IAAK,IAAI;IAIlB,UAAU,IAAK,IAAI;CAGpB;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAE,SAAS,EAAE,UAAU,GAAG;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,GAAG,EAAE,UAAU,CAAA;CAAE,CAyB/H"}

package/dist/src/crypto.js

@@ -1,29 +1,65 @@
+import { AbstractMultiaddrConnection } from '@libp2p/utils';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 import xsalsa20 from 'xsalsa20';
 import * as Errors from './errors.js';
 import { KEY_LENGTH } from './key-generator.js';
-/**
- * Creates a stream iterable to encrypt messages in a private network
- */
-export function createBoxStream(nonce, psk) {
-    const xor = xsalsa20(nonce, psk);
-    return (source) => (async function* () {
-        for await (const chunk of source) {
-            yield Uint8Array.from(xor.update(chunk.subarray()));
-        }
-    })();
-}
-/**
- * Creates a stream iterable to decrypt messages in a private network
- */
-export function createUnboxStream(nonce, psk) {
-    return (source) => (async function* () {
-        const xor = xsalsa20(nonce, psk);
-        for await (const chunk of source) {
-            yield Uint8Array.from(xor.update(chunk.subarray()));
-        }
-    })();
+export class BoxMessageStream extends AbstractMultiaddrConnection {
+    maConn;
+    inboundXor;
+    outboundXor;
+    constructor(init) {
+        super({
+            ...init,
+            remoteAddr: init.maConn.remoteAddr,
+            direction: init.maConn.direction
+        });
+        this.inboundXor = xsalsa20(init.remoteNonce, init.psk);
+        this.outboundXor = xsalsa20(init.localNonce, init.psk);
+        this.maConn = init.maConn;
+        this.maConn.addEventListener('message', (evt) => {
+            const data = evt.data;
+            if (data instanceof Uint8Array) {
+                this.onData(this.inboundXor.update(data));
+            }
+            else {
+                for (const buf of data) {
+                    this.onData(this.inboundXor.update(buf));
+                }
+            }
+        });
+        this.maConn.addEventListener('close', (evt) => {
+            if (evt.error != null) {
+                if (evt.local) {
+                    this.abort(evt.error);
+                }
+                else {
+                    this.onRemoteReset();
+                }
+            }
+            else {
+                this.onTransportClosed();
+            }
+        });
+    }
+    async sendClose(options) {
+        await this.maConn.close(options);
+    }
+    sendData(data) {
+        return {
+            sentBytes: data.byteLength,
+            canSendMore: this.maConn.send(this.outboundXor.update(data.subarray()))
+        };
+    }
+    sendReset(err) {
+        this.maConn.abort(err);
+    }
+    sendPause() {
+        this.maConn.pause();
+    }
+    sendResume() {
+        this.maConn.resume();
+    }
 }
 /**
  * Decode the version 1 psk from the given Uint8Array

package/dist/src/crypto.js.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAI/C;;GAEG;AACH,MAAM,UAAU,eAAe,CAAE,KAAiB,EAAE,GAAe;IACjE,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAEhC,OAAO,CAAC,MAA2C,EAAE,EAAE,CAAC,CAAC,KAAK,SAAU,CAAC;QACvE,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACjC,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QACrD,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAE,KAAiB,EAAE,GAAe;IACnE,OAAO,CAAC,MAA0B,EAAE,EAAE,CAAC,CAAC,KAAK,SAAU,CAAC;QACtD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAEhC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACjC,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QACrD,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAE,SAAqB;IAChD,IAAI,CAAC;QACH,0DAA0D;QAC1D,6DAA6D;QAC7D,yDAAyD;QACzD,2DAA2D;QAC3D,0BAA0B;QAC1B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;QAC/B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;QAC9B,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;QAClC,MAAM,GAAG,GAAG,oBAAoB,CAAC,SAAS,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAA;QAE3D,IAAI,GAAG,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACrC,CAAC;QAED,OAAO;YACL,GAAG,EAAE,MAAM;YACX,SAAS,EAAE,KAAK;YAChB,GAAG;SACJ,CAAA;IACH,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACrC,CAAC;AACH,CAAC"}
+{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -73,5 +73,5 @@ export interface ProtectorInit {
 export interface ProtectorComponents {
     logger: ComponentLogger;
 }
-export declare function preSharedKey(init: ProtectorInit): (components: ProtectorComponents) => ConnectionProtector;
+export declare function preSharedKey(init: ProtectorInit): () => ConnectionProtector;
 //# 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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AAcH,OAAO,KAAK,EAAE,eAAe,EAAU,mBAAmB,EAAuB,MAAM,mBAAmB,CAAA;AAG1G,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,GAAG,EAAE,UAAU,CAAA;IACf;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAA;CACxB;AA4ED,wBAAgB,YAAY,CAAE,IAAI,EAAE,aAAa,GAAG,CAAC,UAAU,EAAE,mBAAmB,KAAK,mBAAmB,CAE3G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAqC,MAAM,mBAAmB,CAAA;AAEhH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,GAAG,EAAE,UAAU,CAAA;IACf;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAA;CACxB;AAqED,wBAAgB,YAAY,CAAE,IAAI,EAAE,aAAa,GAAG,MAAM,mBAAmB,CAE5E"}

package/dist/src/index.js

@@ -57,24 +57,19 @@
  */
 import { randomBytes } from '@libp2p/crypto';
 import { InvalidParametersError } from '@libp2p/interface';
-import { byteStream } from 'it-byte-stream';
-import map from 'it-map';
-import { duplexPair } from 'it-pair/duplex';
-import { pipe } from 'it-pipe';
-import { createBoxStream, createUnboxStream, decodeV1PSK } from './crypto.js';
+import { byteStream } from '@libp2p/utils';
+import { BoxMessageStream, decodeV1PSK } from './crypto.js';
 import { NONCE_LENGTH } from './key-generator.js';
 export { generateKey } from './key-generator.js';
 class PreSharedKeyConnectionProtector {
     tag;
-    log;
     psk;
     timeout;
     /**
      * Takes a Private Shared Key (psk) and provides a `protect` method
      * for wrapping existing connections in a private encryption stream.
      */
-    constructor(components, init) {
-        this.log = components.logger.forComponent('libp2p:pnet');
+    constructor(init) {
         this.timeout = init.timeout ?? 1000;
         const decodedPSK = decodeV1PSK(init.psk);
         this.psk = decodedPSK.psk;
@@ -86,40 +81,40 @@ class PreSharedKeyConnectionProtector {
      * between its two peers from the PSK the Protector instance was
      * created with.
      */
-    async protect(connection) {
+    async protect(connection, options) {
         if (connection == null) {
             throw new InvalidParametersError('No connection for the handshake provided');
         }
         // Exchange nonces
-        this.log('protecting the connection');
+        const log = connection.log.newScope('pnet');
+        log('protecting the connection');
         const localNonce = randomBytes(NONCE_LENGTH);
-        const signal = AbortSignal.timeout(this.timeout);
+        if (options == null) {
+            options = {
+                signal: AbortSignal.timeout(this.timeout)
+            };
+        }
         const bytes = byteStream(connection);
-        const [, result] = await Promise.all([
-            bytes.write(localNonce, {
-                signal
-            }),
+        const [result] = await Promise.all([
             bytes.read({
                 bytes: NONCE_LENGTH,
-                signal
-            })
+                ...options
+            }),
+            bytes.write(localNonce, options)
         ]);
         const remoteNonce = result.subarray();
         // Create the boxing/unboxing pipe
-        this.log('exchanged nonces');
-        const [internal, external] = duplexPair();
-        pipe(external, 
-        // Encrypt all outbound traffic
-        createBoxStream(localNonce, this.psk), bytes.unwrap(), (source) => map(source, (buf) => buf.subarray()), 
-        // Decrypt all inbound traffic
-        createUnboxStream(remoteNonce, this.psk), external).catch(this.log.error);
-        return {
-            ...connection,
-            ...internal
-        };
+        log('exchanged nonces');
+        return new BoxMessageStream({
+            localNonce,
+            remoteNonce,
+            psk: this.psk,
+            maConn: connection,
+            log
+        });
     }
 }
 export function preSharedKey(init) {
-    return (components) => new PreSharedKeyConnectionProtector(components, init);
+    return () => new PreSharedKeyConnectionProtector(init);
 }
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAoBhD,MAAM,+BAA+B;IAC5B,GAAG,CAAQ;IACD,GAAG,CAAY;IACf,OAAO,CAAQ;IAEhC;;;OAGG;IACH,YAAa,IAAmB;QAC9B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAA;QAEnC,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACxC,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAA;QACzB,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,IAAI,EAAE,CAAA;IACjC,CAAC;IAEQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;IAE9C;;;;OAIG;IACH,KAAK,CAAC,OAAO,CAAE,UAA+B,EAAE,OAAsB;QACpE,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,sBAAsB,CAAC,0CAA0C,CAAC,CAAA;QAC9E,CAAC;QAED,kBAAkB;QAClB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC3C,GAAG,CAAC,2BAA2B,CAAC,CAAA;QAChC,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,CAAA;QAE5C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,GAAG;gBACR,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;aAC1C,CAAA;QACH,CAAC;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;QAEpC,MAAM,CACJ,MAAM,CACP,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC;gBACT,KAAK,EAAE,YAAY;gBACnB,GAAG,OAAO;aACX,CAAC;YACF,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC;SACjC,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;QAErC,kCAAkC;QAClC,GAAG,CAAC,kBAAkB,CAAC,CAAA;QAEvB,OAAO,IAAI,gBAAgB,CAAC;YAC1B,UAAU;YACV,WAAW;YACX,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,MAAM,EAAE,UAAU;YAClB,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC;CACF;AAED,MAAM,UAAU,YAAY,CAAE,IAAmB;IAC/C,OAAO,GAAG,EAAE,CAAC,IAAI,+BAA+B,CAAC,IAAI,CAAC,CAAA;AACxD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/pnet",
-  "version": "2.0.46-cf9aab5c8",
+  "version": "2.0.47-a02cb0461",
   "description": "Implementation of Connection protection management via a shared secret",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/pnet#readme",
@@ -43,25 +43,17 @@
     "doc-check": "aegir doc-check"
   },
   "dependencies": {
-    "@libp2p/crypto": "5.1.7-cf9aab5c8",
-    "@libp2p/interface": "2.10.5-cf9aab5c8",
-    "it-byte-stream": "^2.0.2",
-    "it-map": "^3.1.3",
-    "it-pair": "^2.0.6",
-    "it-pipe": "^3.0.1",
-    "it-stream-types": "^2.0.2",
+    "@libp2p/crypto": "5.1.8-a02cb0461",
+    "@libp2p/interface": "2.11.0-a02cb0461",
+    "@libp2p/utils": "6.7.2-a02cb0461",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0",
     "xsalsa20": "^1.2.0"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "6.4.16-cf9aab5c8",
-    "@libp2p/logger": "5.1.21-cf9aab5c8",
-    "@libp2p/peer-id": "5.1.8-cf9aab5c8",
-    "@multiformats/multiaddr": "^12.4.4",
     "@types/xsalsa20": "^1.1.3",
-    "aegir": "^47.0.14",
-    "it-all": "^3.0.8"
+    "aegir": "^47.0.21",
+    "p-event": "^6.0.1"
   },
   "sideEffects": false
 }

package/src/crypto.ts

@@ -1,35 +1,83 @@
+import { AbstractMultiaddrConnection } from '@libp2p/utils'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import xsalsa20 from 'xsalsa20'
 import * as Errors from './errors.js'
 import { KEY_LENGTH } from './key-generator.js'
-import type { Source } from 'it-stream-types'
+import type { AbortOptions, MultiaddrConnection } from '@libp2p/interface'
+import type { MessageStreamInit, SendResult } from '@libp2p/utils'
 import type { Uint8ArrayList } from 'uint8arraylist'
 
-/**
- * Creates a stream iterable to encrypt messages in a private network
- */
-export function createBoxStream (nonce: Uint8Array, psk: Uint8Array): (source: Source<Uint8Array | Uint8ArrayList>) => AsyncGenerator<Uint8Array | Uint8ArrayList> {
-  const xor = xsalsa20(nonce, psk)
-
-  return (source: Source<Uint8Array | Uint8ArrayList>) => (async function * () {
-    for await (const chunk of source) {
-      yield Uint8Array.from(xor.update(chunk.subarray()))
-    }
-  })()
+export interface BoxMessageStreamInit extends MessageStreamInit {
+  maConn: MultiaddrConnection
+  localNonce: Uint8Array
+  remoteNonce: Uint8Array
+  psk: Uint8Array
 }
 
-/**
- * Creates a stream iterable to decrypt messages in a private network
- */
-export function createUnboxStream (nonce: Uint8Array, psk: Uint8Array) {
-  return (source: Source<Uint8Array>) => (async function * () {
-    const xor = xsalsa20(nonce, psk)
+export class BoxMessageStream extends AbstractMultiaddrConnection {
+  private maConn: MultiaddrConnection
+  private inboundXor: xsalsa20.Xor
+  private outboundXor: xsalsa20.Xor
+
+  constructor (init: BoxMessageStreamInit) {
+    super({
+      ...init,
+      remoteAddr: init.maConn.remoteAddr,
+      direction: init.maConn.direction
+    })
+
+    this.inboundXor = xsalsa20(init.remoteNonce, init.psk)
+    this.outboundXor = xsalsa20(init.localNonce, init.psk)
+    this.maConn = init.maConn
+
+    this.maConn.addEventListener('message', (evt) => {
+      const data = evt.data
+
+      if (data instanceof Uint8Array) {
+        this.onData(this.inboundXor.update(data))
+      } else {
+        for (const buf of data) {
+          this.onData(this.inboundXor.update(buf))
+        }
+      }
+    })
+
+    this.maConn.addEventListener('close', (evt) => {
+      if (evt.error != null) {
+        if (evt.local) {
+          this.abort(evt.error)
+        } else {
+          this.onRemoteReset()
+        }
+      } else {
+        this.onTransportClosed()
+      }
+    })
+  }
+
+  async sendClose (options?: AbortOptions): Promise<void> {
+    await this.maConn.close(options)
+  }
 
-    for await (const chunk of source) {
-      yield Uint8Array.from(xor.update(chunk.subarray()))
+  sendData (data: Uint8ArrayList): SendResult {
+    return {
+      sentBytes: data.byteLength,
+      canSendMore: this.maConn.send(this.outboundXor.update(data.subarray()))
     }
-  })()
+  }
+
+  sendReset (err: Error): void {
+    this.maConn.abort(err)
+  }
+
+  sendPause (): void {
+    this.maConn.pause()
+  }
+
+  sendResume (): void {
+    this.maConn.resume()
+  }
 }
 
 /**

package/src/index.ts

@@ -58,18 +58,10 @@
 
 import { randomBytes } from '@libp2p/crypto'
 import { InvalidParametersError } from '@libp2p/interface'
-import { byteStream } from 'it-byte-stream'
-import map from 'it-map'
-import { duplexPair } from 'it-pair/duplex'
-import { pipe } from 'it-pipe'
-import {
-  createBoxStream,
-  createUnboxStream,
-  decodeV1PSK
-} from './crypto.js'
+import { byteStream } from '@libp2p/utils'
+import { BoxMessageStream, decodeV1PSK } from './crypto.js'
 import { NONCE_LENGTH } from './key-generator.js'
-import type { ComponentLogger, Logger, ConnectionProtector, MultiaddrConnection } from '@libp2p/interface'
-import type { Uint8ArrayList } from 'uint8arraylist'
+import type { ComponentLogger, ConnectionProtector, MultiaddrConnection, AbortOptions } from '@libp2p/interface'
 
 export { generateKey } from './key-generator.js'
 
@@ -93,7 +85,6 @@ export interface ProtectorComponents {
 
 class PreSharedKeyConnectionProtector implements ConnectionProtector {
   public tag: string
-  private readonly log: Logger
   private readonly psk: Uint8Array
   private readonly timeout: number
 
@@ -101,8 +92,7 @@ class PreSharedKeyConnectionProtector implements ConnectionProtector {
    * Takes a Private Shared Key (psk) and provides a `protect` method
    * for wrapping existing connections in a private encryption stream.
    */
-  constructor (components: ProtectorComponents, init: ProtectorInit) {
-    this.log = components.logger.forComponent('libp2p:pnet')
+  constructor (init: ProtectorInit) {
     this.timeout = init.timeout ?? 1000
 
     const decodedPSK = decodeV1PSK(init.psk)
@@ -117,54 +107,49 @@ class PreSharedKeyConnectionProtector implements ConnectionProtector {
    * between its two peers from the PSK the Protector instance was
    * created with.
    */
-  async protect (connection: MultiaddrConnection): Promise<MultiaddrConnection> {
+  async protect (connection: MultiaddrConnection, options?: AbortOptions): Promise<MultiaddrConnection> {
     if (connection == null) {
       throw new InvalidParametersError('No connection for the handshake provided')
     }
 
     // Exchange nonces
-    this.log('protecting the connection')
+    const log = connection.log.newScope('pnet')
+    log('protecting the connection')
     const localNonce = randomBytes(NONCE_LENGTH)
 
-    const signal = AbortSignal.timeout(this.timeout)
+    if (options == null) {
+      options = {
+        signal: AbortSignal.timeout(this.timeout)
+      }
+    }
 
     const bytes = byteStream(connection)
 
     const [
-      , result
+      result
     ] = await Promise.all([
-      bytes.write(localNonce, {
-        signal
-      }),
       bytes.read({
         bytes: NONCE_LENGTH,
-        signal
-      })
+        ...options
+      }),
+      bytes.write(localNonce, options)
     ])
 
     const remoteNonce = result.subarray()
 
     // Create the boxing/unboxing pipe
-    this.log('exchanged nonces')
-    const [internal, external] = duplexPair<Uint8Array | Uint8ArrayList>()
-    pipe(
-      external,
-      // Encrypt all outbound traffic
-      createBoxStream(localNonce, this.psk),
-      bytes.unwrap(),
-      (source) => map(source, (buf) => buf.subarray()),
-      // Decrypt all inbound traffic
-      createUnboxStream(remoteNonce, this.psk),
-      external
-    ).catch(this.log.error)
-
-    return {
-      ...connection,
-      ...internal
-    }
+    log('exchanged nonces')
+
+    return new BoxMessageStream({
+      localNonce,
+      remoteNonce,
+      psk: this.psk,
+      maConn: connection,
+      log
+    })
   }
 }
 
-export function preSharedKey (init: ProtectorInit): (components: ProtectorComponents) => ConnectionProtector {
-  return (components) => new PreSharedKeyConnectionProtector(components, init)
+export function preSharedKey (init: ProtectorInit): () => ConnectionProtector {
+  return () => new PreSharedKeyConnectionProtector(init)
 }