@libp2p/utils 6.0.5-82bd42bcf → 6.0.5-dad979f9b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "6.0.5-82bd42bcf",
+  "version": "6.0.5-dad979f9b",
   "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/main/packages/utils#readme",
@@ -56,10 +56,6 @@
       "types": "./dist/src/adaptive-timeout.d.ts",
       "import": "./dist/src/adaptive-timeout.js"
     },
-    "./address-sort": {
-      "types": "./dist/src/address-sort.d.ts",
-      "import": "./dist/src/address-sort.js"
-    },
     "./array-equals": {
       "types": "./dist/src/array-equals.d.ts",
       "import": "./dist/src/array-equals.js"
@@ -152,11 +148,10 @@
   },
   "dependencies": {
     "@chainsafe/is-ip": "^2.0.2",
-    "@libp2p/crypto": "5.0.4-82bd42bcf",
-    "@libp2p/interface": "2.1.2-82bd42bcf",
-    "@libp2p/logger": "5.1.0-82bd42bcf",
+    "@libp2p/crypto": "5.0.4-dad979f9b",
+    "@libp2p/interface": "2.1.2-dad979f9b",
+    "@libp2p/logger": "5.1.0-dad979f9b",
     "@multiformats/multiaddr": "^12.2.3",
-    "@multiformats/multiaddr-matcher": "^1.2.1",
     "@sindresorhus/fnv1a": "^3.1.0",
     "@types/murmurhash3js-revisited": "^3.0.3",
     "any-signal": "^4.1.1",

package/dist/src/address-sort.d.ts

@@ -1,39 +0,0 @@
-/**
- * @packageDocumentation
- *
- * Provides strategies to sort a list of multiaddrs.
- *
- * @example
- *
- * ```typescript
- * import { publicAddressesFirst } from '@libp2p/utils/address-sort'
- * import { multiaddr } from '@multformats/multiaddr'
- *
- *
- * const addresses = [
- *   multiaddr('/ip4/127.0.0.1/tcp/9000'),
- *   multiaddr('/ip4/82.41.53.1/tcp/9000')
- * ].sort(publicAddressesFirst)
- *
- * console.info(addresses)
- * // ['/ip4/82.41.53.1/tcp/9000', '/ip4/127.0.0.1/tcp/9000']
- * ```
- */
-import type { Address } from '@libp2p/interface';
-/**
- * Compare function for array.sort() that moves public addresses to the start
- * of the array.
- */
-export declare function publicAddressesFirst(a: Address, b: Address): -1 | 0 | 1;
-/**
- * Compare function for array.sort() that moves certified addresses to the start
- * of the array.
- */
-export declare function certifiedAddressesFirst(a: Address, b: Address): -1 | 0 | 1;
-/**
- * Compare function for array.sort() that moves circuit relay addresses to the
- * start of the array.
- */
-export declare function circuitRelayAddressesLast(a: Address, b: Address): -1 | 0 | 1;
-export declare function defaultAddressSort(a: Address, b: Address): -1 | 0 | 1;
-//# sourceMappingURL=address-sort.d.ts.map

package/dist/src/address-sort.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"address-sort.d.ts","sourceRoot":"","sources":["../../src/address-sort.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEhD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAWxE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAQ3E;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAW7E;AAED,wBAAgB,kBAAkB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAgBtE"}

package/dist/src/address-sort.js

@@ -1,79 +0,0 @@
-/**
- * @packageDocumentation
- *
- * Provides strategies to sort a list of multiaddrs.
- *
- * @example
- *
- * ```typescript
- * import { publicAddressesFirst } from '@libp2p/utils/address-sort'
- * import { multiaddr } from '@multformats/multiaddr'
- *
- *
- * const addresses = [
- *   multiaddr('/ip4/127.0.0.1/tcp/9000'),
- *   multiaddr('/ip4/82.41.53.1/tcp/9000')
- * ].sort(publicAddressesFirst)
- *
- * console.info(addresses)
- * // ['/ip4/82.41.53.1/tcp/9000', '/ip4/127.0.0.1/tcp/9000']
- * ```
- */
-import { Circuit } from '@multiformats/multiaddr-matcher';
-import { isPrivate } from './multiaddr/is-private.js';
-/**
- * Compare function for array.sort() that moves public addresses to the start
- * of the array.
- */
-export function publicAddressesFirst(a, b) {
-    const isAPrivate = isPrivate(a.multiaddr);
-    const isBPrivate = isPrivate(b.multiaddr);
-    if (isAPrivate && !isBPrivate) {
-        return 1;
-    }
-    else if (!isAPrivate && isBPrivate) {
-        return -1;
-    }
-    return 0;
-}
-/**
- * Compare function for array.sort() that moves certified addresses to the start
- * of the array.
- */
-export function certifiedAddressesFirst(a, b) {
-    if (a.isCertified && !b.isCertified) {
-        return -1;
-    }
-    else if (!a.isCertified && b.isCertified) {
-        return 1;
-    }
-    return 0;
-}
-/**
- * Compare function for array.sort() that moves circuit relay addresses to the
- * start of the array.
- */
-export function circuitRelayAddressesLast(a, b) {
-    const isACircuit = Circuit.exactMatch(a.multiaddr);
-    const isBCircuit = Circuit.exactMatch(b.multiaddr);
-    if (isACircuit && !isBCircuit) {
-        return 1;
-    }
-    else if (!isACircuit && isBCircuit) {
-        return -1;
-    }
-    return 0;
-}
-export function defaultAddressSort(a, b) {
-    const publicResult = publicAddressesFirst(a, b);
-    if (publicResult !== 0) {
-        return publicResult;
-    }
-    const relayResult = circuitRelayAddressesLast(a, b);
-    if (relayResult !== 0) {
-        return relayResult;
-    }
-    const certifiedResult = certifiedAddressesFirst(a, b);
-    return certifiedResult;
-}
-//# sourceMappingURL=address-sort.js.map

package/dist/src/address-sort.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"address-sort.js","sourceRoot":"","sources":["../../src/address-sort.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAGrD;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAE,CAAU,EAAE,CAAU;IAC1D,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAEzC,IAAI,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAA;IACV,CAAC;SAAM,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE,CAAC;QACrC,OAAO,CAAC,CAAC,CAAA;IACX,CAAC;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAE,CAAU,EAAE,CAAU;IAC7D,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACpC,OAAO,CAAC,CAAC,CAAA;IACX,CAAC;SAAM,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3C,OAAO,CAAC,CAAA;IACV,CAAC;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAE,CAAU,EAAE,CAAU;IAC/D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAClD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAElD,IAAI,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAA;IACV,CAAC;SAAM,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE,CAAC;QACrC,OAAO,CAAC,CAAC,CAAA;IACX,CAAC;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAE,CAAU,EAAE,CAAU;IACxD,MAAM,YAAY,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAE/C,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,yBAAyB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEnD,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,MAAM,eAAe,GAAG,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAErD,OAAO,eAAe,CAAA;AACxB,CAAC"}

package/src/address-sort.ts

@@ -1,91 +0,0 @@
-/**
- * @packageDocumentation
- *
- * Provides strategies to sort a list of multiaddrs.
- *
- * @example
- *
- * ```typescript
- * import { publicAddressesFirst } from '@libp2p/utils/address-sort'
- * import { multiaddr } from '@multformats/multiaddr'
- *
- *
- * const addresses = [
- *   multiaddr('/ip4/127.0.0.1/tcp/9000'),
- *   multiaddr('/ip4/82.41.53.1/tcp/9000')
- * ].sort(publicAddressesFirst)
- *
- * console.info(addresses)
- * // ['/ip4/82.41.53.1/tcp/9000', '/ip4/127.0.0.1/tcp/9000']
- * ```
- */
-
-import { Circuit } from '@multiformats/multiaddr-matcher'
-import { isPrivate } from './multiaddr/is-private.js'
-import type { Address } from '@libp2p/interface'
-
-/**
- * Compare function for array.sort() that moves public addresses to the start
- * of the array.
- */
-export function publicAddressesFirst (a: Address, b: Address): -1 | 0 | 1 {
-  const isAPrivate = isPrivate(a.multiaddr)
-  const isBPrivate = isPrivate(b.multiaddr)
-
-  if (isAPrivate && !isBPrivate) {
-    return 1
-  } else if (!isAPrivate && isBPrivate) {
-    return -1
-  }
-
-  return 0
-}
-
-/**
- * Compare function for array.sort() that moves certified addresses to the start
- * of the array.
- */
-export function certifiedAddressesFirst (a: Address, b: Address): -1 | 0 | 1 {
-  if (a.isCertified && !b.isCertified) {
-    return -1
-  } else if (!a.isCertified && b.isCertified) {
-    return 1
-  }
-
-  return 0
-}
-
-/**
- * Compare function for array.sort() that moves circuit relay addresses to the
- * start of the array.
- */
-export function circuitRelayAddressesLast (a: Address, b: Address): -1 | 0 | 1 {
-  const isACircuit = Circuit.exactMatch(a.multiaddr)
-  const isBCircuit = Circuit.exactMatch(b.multiaddr)
-
-  if (isACircuit && !isBCircuit) {
-    return 1
-  } else if (!isACircuit && isBCircuit) {
-    return -1
-  }
-
-  return 0
-}
-
-export function defaultAddressSort (a: Address, b: Address): -1 | 0 | 1 {
-  const publicResult = publicAddressesFirst(a, b)
-
-  if (publicResult !== 0) {
-    return publicResult
-  }
-
-  const relayResult = circuitRelayAddressesLast(a, b)
-
-  if (relayResult !== 0) {
-    return relayResult
-  }
-
-  const certifiedResult = certifiedAddressesFirst(a, b)
-
-  return certifiedResult
-}