@libp2p/utils 3.0.12-8b0e6bef → 3.0.12-b1024c6c

package/dist/src/stream-to-ma-conn.d.ts

@@ -1,26 +1,7 @@
-import type { MultiaddrConnection } from '@libp2p/interface/connection';
+import type { MultiaddrConnection, Stream } from '@libp2p/interface/connection';
 import type { Multiaddr } from '@multiformats/multiaddr';
-import type { Duplex, Source } from 'it-stream-types';
-import type { Uint8ArrayList } from 'uint8arraylist';
-export interface Timeline {
-    /**
-     * Connection opening timestamp
-     */
-    open: number;
-    /**
-     * Connection upgraded timestamp
-     */
-    upgraded?: number;
-    /**
-     * Connection closed timestamp
-     */
-    close?: number;
-}
-export interface StreamOptions {
-    signal?: AbortSignal;
-}
 export interface StreamProperties {
-    stream: Duplex<AsyncIterable<Uint8ArrayList>, Source<Uint8ArrayList | Uint8Array>>;
+    stream: Stream;
     remoteAddr: Multiaddr;
     localAddr: Multiaddr;
 }
@@ -28,5 +9,5 @@ export interface StreamProperties {
  * Convert a duplex iterable into a MultiaddrConnection.
  * https://github.com/libp2p/interface-transport#multiaddrconnection
  */
-export declare function streamToMaConnection(props: StreamProperties, options?: StreamOptions): MultiaddrConnection;
+export declare function streamToMaConnection(props: StreamProperties): MultiaddrConnection;
 //# sourceMappingURL=stream-to-ma-conn.d.ts.map

package/dist/src/stream-to-ma-conn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-to-ma-conn.d.ts","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIpD,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,WAAW,CAAA;CAErB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC,CAAA;IAClF,UAAU,EAAE,SAAS,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;CACrB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,KAAK,EAAE,gBAAgB,EAAE,OAAO,GAAE,aAAkB,GAAG,mBAAmB,CAoD/G"}
+{"version":3,"file":"stream-to-ma-conn.d.ts","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,SAAS,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;CACrB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,KAAK,EAAE,gBAAgB,GAAG,mBAAmB,CAiDlF"}

package/dist/src/stream-to-ma-conn.js

@@ -1,11 +1,10 @@
 import { logger } from '@libp2p/logger';
-import { abortableSource } from 'abortable-iterator';
 const log = logger('libp2p:stream:converter');
 /**
  * Convert a duplex iterable into a MultiaddrConnection.
  * https://github.com/libp2p/interface-transport#multiaddrconnection
  */
-export function streamToMaConnection(props, options = {}) {
+export function streamToMaConnection(props) {
     const { stream, remoteAddr } = props;
     const { sink, source } = stream;
     const mapSource = (async function* () {
@@ -20,12 +19,9 @@ export function streamToMaConnection(props, options = {}) {
     }());
     const maConn = {
         async sink(source) {
-            if (options.signal != null) {
-                source = abortableSource(source, options.signal);
-            }
             try {
                 await sink(source);
-                await close();
+                close();
             }
             catch (err) {
                 // If aborted we can safely ignore
@@ -37,21 +33,22 @@ export function streamToMaConnection(props, options = {}) {
                 }
             }
         },
-        source: (options.signal != null) ? abortableSource(mapSource, options.signal) : mapSource,
+        source: mapSource,
         remoteAddr,
         timeline: { open: Date.now(), close: undefined },
-        async close() {
-            await sink(async function* () {
-                yield new Uint8Array(0);
-            }());
-            await close();
+        async close(options) {
+            close();
+            await stream.close(options);
+        },
+        abort(err) {
+            close();
+            stream.abort(err);
         }
     };
-    async function close() {
+    function close() {
         if (maConn.timeline.close == null) {
             maConn.timeline.close = Date.now();
         }
-        await Promise.resolve();
     }
     return maConn;
 }

package/dist/src/stream-to-ma-conn.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-to-ma-conn.js","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAMpD,MAAM,GAAG,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAA;AA8B7C;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAE,KAAuB,EAAE,UAAyB,EAAE;IACxF,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IACpC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IAE/B,MAAM,SAAS,GAAG,CAAC,KAAK,SAAU,CAAC;QACjC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,EAAE;YAC/B,IAAI,IAAI,YAAY,UAAU,EAAE;gBAC9B,MAAM,IAAI,CAAA;aACX;iBAAM;gBACL,KAAM,CAAC,CAAC,IAAI,CAAA;aACb;SACF;IACH,CAAC,EAAE,CAAC,CAAA;IAEJ,MAAM,MAAM,GAAwB;QAClC,KAAK,CAAC,IAAI,CAAE,MAAM;YAChB,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE;gBAC1B,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;aACjD;YAED,IAAI;gBACF,MAAM,IAAI,CAAC,MAAM,CAAC,CAAA;gBAClB,MAAM,KAAK,EAAE,CAAA;aACd;YAAC,OAAO,GAAQ,EAAE;gBACjB,kCAAkC;gBAClC,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC1B,uEAAuE;oBACvE,gEAAgE;oBAChE,uEAAuE;oBACvE,GAAG,CAAC,GAAG,CAAC,CAAA;iBACT;aACF;QACH,CAAC;QACD,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACzF,UAAU;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;QAChD,KAAK,CAAC,KAAK;YACT,MAAM,IAAI,CAAC,KAAK,SAAU,CAAC;gBACzB,MAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;YACzB,CAAC,EAAE,CAAC,CAAA;YACJ,MAAM,KAAK,EAAE,CAAA;QACf,CAAC;KACF,CAAA;IAED,KAAK,UAAU,KAAK;QAClB,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI,EAAE;YACjC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;SACnC;QACD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;IACzB,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"stream-to-ma-conn.js","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAKvC,MAAM,GAAG,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAA;AAQ7C;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAE,KAAuB;IAC3D,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAA;IACpC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IAE/B,MAAM,SAAS,GAAG,CAAC,KAAK,SAAU,CAAC;QACjC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,EAAE;YAC/B,IAAI,IAAI,YAAY,UAAU,EAAE;gBAC9B,MAAM,IAAI,CAAA;aACX;iBAAM;gBACL,KAAM,CAAC,CAAC,IAAI,CAAA;aACb;SACF;IACH,CAAC,EAAE,CAAC,CAAA;IAEJ,MAAM,MAAM,GAAwB;QAClC,KAAK,CAAC,IAAI,CAAE,MAAM;YAChB,IAAI;gBACF,MAAM,IAAI,CAAC,MAAM,CAAC,CAAA;gBAClB,KAAK,EAAE,CAAA;aACR;YAAC,OAAO,GAAQ,EAAE;gBACjB,kCAAkC;gBAClC,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC1B,uEAAuE;oBACvE,gEAAgE;oBAChE,uEAAuE;oBACvE,GAAG,CAAC,GAAG,CAAC,CAAA;iBACT;aACF;QACH,CAAC;QACD,MAAM,EAAE,SAAS;QACjB,UAAU;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;QAChD,KAAK,CAAC,KAAK,CAAE,OAAsB;YACjC,KAAK,EAAE,CAAA;YACP,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC7B,CAAC;QACD,KAAK,CAAE,GAAU;YACf,KAAK,EAAE,CAAA;YACP,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC;KACF,CAAA;IAED,SAAS,KAAK;QACZ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI,EAAE;YACjC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;SACnC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "3.0.12-8b0e6bef",
+  "version": "3.0.12-b1024c6c",
   "description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/master/packages/utils#readme",
@@ -86,21 +86,20 @@
   },
   "dependencies": {
     "@achingbrain/ip-address": "^8.1.0",
-    "@libp2p/interface": "0.0.1-8b0e6bef",
-    "@libp2p/logger": "2.1.1-8b0e6bef",
+    "@libp2p/interface": "0.0.1-b1024c6c",
+    "@libp2p/logger": "2.1.1-b1024c6c",
     "@multiformats/multiaddr": "^12.1.3",
-    "abortable-iterator": "^5.0.1",
     "is-loopback-addr": "^2.0.1",
     "it-stream-types": "^2.0.1",
     "private-ip": "^3.0.0",
     "uint8arraylist": "^2.4.3"
   },
   "devDependencies": {
-    "aegir": "^39.0.10",
+    "aegir": "^39.0.13",
     "it-all": "^3.0.1",
     "it-pair": "^2.0.6",
     "it-pipe": "^3.0.1",
-    "uint8arrays": "^4.0.3"
+    "uint8arrays": "^4.0.4"
   },
   "typedoc": {
     "entryPoint": "./src/index.ts"

package/src/stream-to-ma-conn.ts

@@ -1,36 +1,12 @@
 import { logger } from '@libp2p/logger'
-import { abortableSource } from 'abortable-iterator'
-import type { MultiaddrConnection } from '@libp2p/interface/connection'
+import type { AbortOptions } from '@libp2p/interface'
+import type { MultiaddrConnection, Stream } from '@libp2p/interface/connection'
 import type { Multiaddr } from '@multiformats/multiaddr'
-import type { Duplex, Source } from 'it-stream-types'
-import type { Uint8ArrayList } from 'uint8arraylist'
 
 const log = logger('libp2p:stream:converter')
 
-export interface Timeline {
-  /**
-   * Connection opening timestamp
-   */
-  open: number
-
-  /**
-   * Connection upgraded timestamp
-   */
-  upgraded?: number
-
-  /**
-   * Connection closed timestamp
-   */
-  close?: number
-}
-
-export interface StreamOptions {
-  signal?: AbortSignal
-
-}
-
 export interface StreamProperties {
-  stream: Duplex<AsyncIterable<Uint8ArrayList>, Source<Uint8ArrayList | Uint8Array>>
+  stream: Stream
   remoteAddr: Multiaddr
   localAddr: Multiaddr
 }
@@ -39,7 +15,7 @@ export interface StreamProperties {
  * Convert a duplex iterable into a MultiaddrConnection.
  * https://github.com/libp2p/interface-transport#multiaddrconnection
  */
-export function streamToMaConnection (props: StreamProperties, options: StreamOptions = {}): MultiaddrConnection {
+export function streamToMaConnection (props: StreamProperties): MultiaddrConnection {
   const { stream, remoteAddr } = props
   const { sink, source } = stream
 
@@ -55,13 +31,9 @@ export function streamToMaConnection (props: StreamProperties, options: StreamOp
 
   const maConn: MultiaddrConnection = {
     async sink (source) {
-      if (options.signal != null) {
-        source = abortableSource(source, options.signal)
-      }
-
       try {
         await sink(source)
-        await close()
+        close()
       } catch (err: any) {
         // If aborted we can safely ignore
         if (err.type !== 'aborted') {
@@ -72,22 +44,23 @@ export function streamToMaConnection (props: StreamProperties, options: StreamOp
         }
       }
     },
-    source: (options.signal != null) ? abortableSource(mapSource, options.signal) : mapSource,
+    source: mapSource,
     remoteAddr,
     timeline: { open: Date.now(), close: undefined },
-    async close () {
-      await sink(async function * () {
-        yield new Uint8Array(0)
-      }())
-      await close()
+    async close (options?: AbortOptions) {
+      close()
+      await stream.close(options)
+    },
+    abort (err: Error): void {
+      close()
+      stream.abort(err)
     }
   }
 
-  async function close (): Promise<void> {
+  function close (): void {
     if (maConn.timeline.close == null) {
       maConn.timeline.close = Date.now()
     }
-    await Promise.resolve()
   }
 
   return maConn