@libp2p/utils 6.5.8-757577dd2 → 6.5.8-95909c3df

package/dist/src/get-thin-waist-addresses.browser.d.ts

@@ -1,7 +1,9 @@
-import { type Multiaddr } from '@multiformats/multiaddr';
+import type { Multiaddr } from '@multiformats/multiaddr';
 /**
- * Get all thin waist addresses that match the passed multiaddr. Wildcard IP4/6
- * addresses will be expanded into all available interfaces.
+ * Get all thin waist addresses on the current host that match the family of the
+ * passed multiaddr and optionally override the port.
+ *
+ * Wildcard IP4/6 addresses will be expanded into all available interfaces.
  */
-export declare function getThinWaistAddresses(ma: Multiaddr): Multiaddr[];
+export declare function getThinWaistAddresses(ma?: Multiaddr, port?: number): Multiaddr[];
 //# sourceMappingURL=get-thin-waist-addresses.browser.d.ts.map

package/dist/src/get-thin-waist-addresses.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-thin-waist-addresses.browser.d.ts","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAEnE;;;GAGG;AACH,wBAAgB,qBAAqB,CAAE,EAAE,EAAE,SAAS,GAAG,SAAS,EAAE,CAMjE"}
+{"version":3,"file":"get-thin-waist-addresses.browser.d.ts","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAE,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CAUjF"}

package/dist/src/get-thin-waist-addresses.browser.js

@@ -1,12 +1,17 @@
 import { multiaddr } from '@multiformats/multiaddr';
 /**
- * Get all thin waist addresses that match the passed multiaddr. Wildcard IP4/6
- * addresses will be expanded into all available interfaces.
+ * Get all thin waist addresses on the current host that match the family of the
+ * passed multiaddr and optionally override the port.
+ *
+ * Wildcard IP4/6 addresses will be expanded into all available interfaces.
  */
-export function getThinWaistAddresses(ma) {
+export function getThinWaistAddresses(ma, port) {
+    if (ma == null) {
+        return [];
+    }
     const options = ma.toOptions();
     return [
-        multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${options.port}`)
+        multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${port ?? options.port}`)
     ];
 }
 //# sourceMappingURL=get-thin-waist-addresses.browser.js.map

package/dist/src/get-thin-waist-addresses.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-thin-waist-addresses.browser.js","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAA;AAEnE;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAE,EAAa;IAClD,MAAM,OAAO,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;IAE9B,OAAO;QACL,SAAS,CAAC,MAAM,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;KACvF,CAAA;AACH,CAAC"}
+{"version":3,"file":"get-thin-waist-addresses.browser.js","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGnD;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAE,EAAc,EAAE,IAAa;IAClE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QACf,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;IAE9B,OAAO;QACL,SAAS,CAAC,MAAM,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;KAC/F,CAAA;AACH,CAAC"}

package/dist/src/get-thin-waist-addresses.d.ts

@@ -1,9 +1,9 @@
-import { type Multiaddr } from '@multiformats/multiaddr';
+import type { Multiaddr } from '@multiformats/multiaddr';
 /**
  * Get all thin waist addresses on the current host that match the family of the
- * passed multiaddr.
+ * passed multiaddr and optionally override the port.
  *
  * Wildcard IP4/6 addresses will be expanded into all available interfaces.
  */
-export declare function getThinWaistAddresses(ma: Multiaddr): Multiaddr[];
+export declare function getThinWaistAddresses(ma?: Multiaddr, port?: number): Multiaddr[];
 //# sourceMappingURL=get-thin-waist-addresses.d.ts.map

package/dist/src/get-thin-waist-addresses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-thin-waist-addresses.d.ts","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAyBnE;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAE,EAAE,EAAE,SAAS,GAAG,SAAS,EAAE,CAgBjE"}
+{"version":3,"file":"get-thin-waist-addresses.d.ts","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AA6BxD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAE,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CAoBjF"}

package/dist/src/get-thin-waist-addresses.js

@@ -1,5 +1,6 @@
 import os from 'node:os';
 import { multiaddr } from '@multiformats/multiaddr';
+import { isLinkLocalIp } from './link-local-ip.js';
 const FAMILIES = { 4: 'IPv4', 6: 'IPv6' };
 function isWildcard(ip) {
     return ['0.0.0.0', '::'].includes(ip);
@@ -10,6 +11,9 @@ function getNetworkAddrs(family) {
     for (const [, netAddrs] of Object.entries(networks)) {
         if (netAddrs != null) {
             for (const netAddr of netAddrs) {
+                if (isLinkLocalIp(netAddr.address)) {
+                    continue;
+                }
                 if (netAddr.family === FAMILIES[family]) {
                     addresses.push(netAddr.address);
                 }
@@ -20,21 +24,24 @@ function getNetworkAddrs(family) {
 }
 /**
  * Get all thin waist addresses on the current host that match the family of the
- * passed multiaddr.
+ * passed multiaddr and optionally override the port.
  *
  * Wildcard IP4/6 addresses will be expanded into all available interfaces.
  */
-export function getThinWaistAddresses(ma) {
+export function getThinWaistAddresses(ma, port) {
+    if (ma == null) {
+        return [];
+    }
     const options = ma.toOptions();
     if (isWildcard(options.host)) {
         const addrs = [];
         for (const host of getNetworkAddrs(options.family)) {
-            addrs.push(multiaddr(`/ip${options.family}/${host}/${options.transport}/${options.port}`));
+            addrs.push(multiaddr(`/ip${options.family}/${host}/${options.transport}/${port ?? options.port}`));
         }
         return addrs;
     }
     return [
-        multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${options.port}`)
+        multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${port ?? options.port}`)
     ];
 }
 //# sourceMappingURL=get-thin-waist-addresses.js.map

package/dist/src/get-thin-waist-addresses.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-thin-waist-addresses.js","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,SAAS,EAAkB,MAAM,yBAAyB,CAAA;AAEnE,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAA;AAEzC,SAAS,UAAU,CAAE,EAAU;IAC7B,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;AACvC,CAAC;AAED,SAAS,eAAe,CAAE,MAAa;IACrC,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAA;IAEvC,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACxC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAE,EAAa;IAClD,MAAM,OAAO,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;IAE9B,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,EAAE,CAAA;QAEhB,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,OAAO,CAAC,MAAM,IAAI,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QAC5F,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO;QACL,SAAS,CAAC,MAAM,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;KACvF,CAAA;AACH,CAAC"}
+{"version":3,"file":"get-thin-waist-addresses.js","sourceRoot":"","sources":["../../src/get-thin-waist-addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAGlD,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAA;AAEzC,SAAS,UAAU,CAAE,EAAU;IAC7B,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;AACvC,CAAC;AAED,SAAS,eAAe,CAAE,MAAa;IACrC,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAA;IAEvC,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;oBACnC,SAAQ;gBACV,CAAC;gBAED,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACxC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAE,EAAc,EAAE,IAAa;IAClE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QACf,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;IAE9B,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,EAAE,CAAA;QAEhB,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,OAAO,CAAC,MAAM,IAAI,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QACpG,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO;QACL,SAAS,CAAC,MAAM,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;KAC/F,CAAA;AACH,CAAC"}

package/dist/src/link-local-ip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-local-ip.d.ts","sourceRoot":"","sources":["../../src/link-local-ip.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAUlD"}
+{"version":3,"file":"link-local-ip.d.ts","sourceRoot":"","sources":["../../src/link-local-ip.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAUlD"}

package/dist/src/link-local-ip.js

@@ -1,10 +1,9 @@
-import { isIPv4, isIPv6 } from '@chainsafe/is-ip';
 export function isLinkLocalIp(ip) {
-    if (isIPv4(ip)) {
-        return ip.startsWith('169.254.');
+    if (ip.startsWith('169.254.')) {
+        return true;
     }
-    if (isIPv6(ip)) {
-        return ip.toLowerCase().startsWith('fe80');
+    if (ip.toLowerCase().startsWith('fe80')) {
+        return true;
     }
     return false;
 }

package/dist/src/link-local-ip.js.map

@@ -1 +1 @@
-{"version":3,"file":"link-local-ip.js","sourceRoot":"","sources":["../../src/link-local-ip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEjD,MAAM,UAAU,aAAa,CAAE,EAAU;IACvC,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QACf,OAAO,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QACf,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}
+{"version":3,"file":"link-local-ip.js","sourceRoot":"","sources":["../../src/link-local-ip.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,aAAa,CAAE,EAAU;IACvC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "6.5.8-757577dd2",
+  "version": "6.5.8-95909c3df",
   "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",
@@ -194,9 +194,9 @@
   "dependencies": {
     "@chainsafe/is-ip": "^2.0.2",
     "@chainsafe/netmask": "^2.0.0",
-    "@libp2p/crypto": "5.0.15-757577dd2",
-    "@libp2p/interface": "2.7.0-757577dd2",
-    "@libp2p/logger": "5.1.13-757577dd2",
+    "@libp2p/crypto": "5.0.15-95909c3df",
+    "@libp2p/interface": "2.7.0-95909c3df",
+    "@libp2p/logger": "5.1.13-95909c3df",
     "@multiformats/multiaddr": "^12.3.3",
     "@sindresorhus/fnv1a": "^3.1.0",
     "any-signal": "^4.1.1",
@@ -215,7 +215,7 @@
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/peer-id": "5.1.0-757577dd2",
+    "@libp2p/peer-id": "5.1.0-95909c3df",
     "@types/netmask": "^2.0.5",
     "aegir": "^45.1.1",
     "benchmark": "^2.1.4",

package/src/get-thin-waist-addresses.browser.ts

@@ -1,13 +1,20 @@
-import { multiaddr, type Multiaddr } from '@multiformats/multiaddr'
+import { multiaddr } from '@multiformats/multiaddr'
+import type { Multiaddr } from '@multiformats/multiaddr'
 
 /**
- * Get all thin waist addresses that match the passed multiaddr. Wildcard IP4/6
- * addresses will be expanded into all available interfaces.
+ * Get all thin waist addresses on the current host that match the family of the
+ * passed multiaddr and optionally override the port.
+ *
+ * Wildcard IP4/6 addresses will be expanded into all available interfaces.
  */
-export function getThinWaistAddresses (ma: Multiaddr): Multiaddr[] {
+export function getThinWaistAddresses (ma?: Multiaddr, port?: number): Multiaddr[] {
+  if (ma == null) {
+    return []
+  }
+
   const options = ma.toOptions()
 
   return [
-    multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${options.port}`)
+    multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${port ?? options.port}`)
   ]
 }

package/src/get-thin-waist-addresses.ts

@@ -1,5 +1,7 @@
 import os from 'node:os'
-import { multiaddr, type Multiaddr } from '@multiformats/multiaddr'
+import { multiaddr } from '@multiformats/multiaddr'
+import { isLinkLocalIp } from './link-local-ip.js'
+import type { Multiaddr } from '@multiformats/multiaddr'
 
 const FAMILIES = { 4: 'IPv4', 6: 'IPv6' }
 
@@ -14,6 +16,10 @@ function getNetworkAddrs (family: 4 | 6): string[] {
   for (const [, netAddrs] of Object.entries(networks)) {
     if (netAddrs != null) {
       for (const netAddr of netAddrs) {
+        if (isLinkLocalIp(netAddr.address)) {
+          continue
+        }
+
         if (netAddr.family === FAMILIES[family]) {
           addresses.push(netAddr.address)
         }
@@ -26,24 +32,28 @@ function getNetworkAddrs (family: 4 | 6): string[] {
 
 /**
  * Get all thin waist addresses on the current host that match the family of the
- * passed multiaddr.
+ * passed multiaddr and optionally override the port.
  *
  * Wildcard IP4/6 addresses will be expanded into all available interfaces.
  */
-export function getThinWaistAddresses (ma: Multiaddr): Multiaddr[] {
+export function getThinWaistAddresses (ma?: Multiaddr, port?: number): Multiaddr[] {
+  if (ma == null) {
+    return []
+  }
+
   const options = ma.toOptions()
 
   if (isWildcard(options.host)) {
     const addrs = []
 
     for (const host of getNetworkAddrs(options.family)) {
-      addrs.push(multiaddr(`/ip${options.family}/${host}/${options.transport}/${options.port}`))
+      addrs.push(multiaddr(`/ip${options.family}/${host}/${options.transport}/${port ?? options.port}`))
     }
 
     return addrs
   }
 
   return [
-    multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${options.port}`)
+    multiaddr(`/ip${options.family}/${options.host}/${options.transport}/${port ?? options.port}`)
   ]
 }

package/src/link-local-ip.ts

@@ -1,12 +1,10 @@
-import { isIPv4, isIPv6 } from '@chainsafe/is-ip'
-
 export function isLinkLocalIp (ip: string): boolean {
-  if (isIPv4(ip)) {
-    return ip.startsWith('169.254.')
+  if (ip.startsWith('169.254.')) {
+    return true
   }
 
-  if (isIPv6(ip)) {
-    return ip.toLowerCase().startsWith('fe80')
+  if (ip.toLowerCase().startsWith('fe80')) {
+    return true
   }
 
   return false