@libp2p/utils 6.5.2-d98cc46e4 → 6.5.3-2a3cec922

package/dist/src/multiaddr/is-ip-based.d.ts

@@ -0,0 +1,6 @@
+import type { Multiaddr } from '@multiformats/multiaddr';
+/**
+ * Check if a given multiaddr is IP-based
+ */
+export declare function isIpBased(ma: Multiaddr): boolean;
+//# sourceMappingURL=is-ip-based.d.ts.map

package/dist/src/multiaddr/is-ip-based.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-ip-based.d.ts","sourceRoot":"","sources":["../../../src/multiaddr/is-ip-based.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKxD;;GAEG;AACH,wBAAgB,SAAS,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAUjD"}

package/dist/src/multiaddr/is-ip-based.js

@@ -0,0 +1,15 @@
+const CODEC_IP4 = 0x04;
+const CODEC_IP6 = 0x29;
+/**
+ * Check if a given multiaddr is IP-based
+ */
+export function isIpBased(ma) {
+    try {
+        const [[codec]] = ma.stringTuples();
+        return codec === CODEC_IP4 || codec === CODEC_IP6;
+    }
+    catch {
+    }
+    return false;
+}
+//# sourceMappingURL=is-ip-based.js.map

package/dist/src/multiaddr/is-ip-based.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-ip-based.js","sourceRoot":"","sources":["../../../src/multiaddr/is-ip-based.ts"],"names":[],"mappings":"AAEA,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AAEtB;;GAEG;AACH,MAAM,UAAU,SAAS,CAAE,EAAa;IACtC,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;QAEnC,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,CAAA;IACnD,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/src/multiaddr/is-loopback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-loopback.d.ts","sourceRoot":"","sources":["../../../src/multiaddr/is-loopback.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD;;GAEG;AACH,wBAAgB,UAAU,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAIlD"}
+{"version":3,"file":"is-loopback.d.ts","sourceRoot":"","sources":["../../../src/multiaddr/is-loopback.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD;;GAEG;AACH,wBAAgB,UAAU,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CASlD"}

package/dist/src/multiaddr/is-loopback.js

@@ -1,8 +1,13 @@
 import { isLoopbackAddr } from 'is-loopback-addr';
+import { isIpBased } from './is-ip-based.js';
 /**
  * Check if a given multiaddr is a loopback address.
  */
 export function isLoopback(ma) {
+    if (!isIpBased(ma)) {
+        // not an IP based multiaddr, cannot be private
+        return false;
+    }
     const { address } = ma.nodeAddress();
     return isLoopbackAddr(address);
 }

package/dist/src/multiaddr/is-loopback.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-loopback.js","sourceRoot":"","sources":["../../../src/multiaddr/is-loopback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAGjD;;GAEG;AACH,MAAM,UAAU,UAAU,CAAE,EAAa;IACvC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;IAEpC,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;AAChC,CAAC"}
+{"version":3,"file":"is-loopback.js","sourceRoot":"","sources":["../../../src/multiaddr/is-loopback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAG5C;;GAEG;AACH,MAAM,UAAU,UAAU,CAAE,EAAa;IACvC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;QACnB,+CAA+C;QAC/C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;IAEpC,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;AAChC,CAAC"}

package/dist/src/multiaddr/is-network-address.d.ts

@@ -0,0 +1,6 @@
+import type { Multiaddr } from '@multiformats/multiaddr';
+/**
+ * Check if a given multiaddr is a network address
+ */
+export declare function isNetworkAddress(ma: Multiaddr): boolean;
+//# sourceMappingURL=is-network-address.d.ts.map

package/dist/src/multiaddr/is-network-address.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-network-address.d.ts","sourceRoot":"","sources":["../../../src/multiaddr/is-network-address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAkBxD;;GAEG;AACH,wBAAgB,gBAAgB,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAUxD"}

package/dist/src/multiaddr/is-network-address.js

@@ -0,0 +1,27 @@
+const CODEC_IP4 = 0x04;
+const CODEC_IP6 = 0x29;
+const CODEC_DNS = 0x35;
+const CODEC_DNS4 = 0x36;
+const CODEC_DNS6 = 0x37;
+const CODEC_DNSADDR = 0x38;
+const NETWORK_CODECS = [
+    CODEC_IP4,
+    CODEC_IP6,
+    CODEC_DNS,
+    CODEC_DNS4,
+    CODEC_DNS6,
+    CODEC_DNSADDR
+];
+/**
+ * Check if a given multiaddr is a network address
+ */
+export function isNetworkAddress(ma) {
+    try {
+        const [[codec]] = ma.stringTuples();
+        return NETWORK_CODECS.includes(codec);
+    }
+    catch {
+    }
+    return false;
+}
+//# sourceMappingURL=is-network-address.js.map

package/dist/src/multiaddr/is-network-address.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-network-address.js","sourceRoot":"","sources":["../../../src/multiaddr/is-network-address.ts"],"names":[],"mappings":"AAEA,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,UAAU,GAAG,IAAI,CAAA;AACvB,MAAM,UAAU,GAAG,IAAI,CAAA;AACvB,MAAM,aAAa,GAAG,IAAI,CAAA;AAE1B,MAAM,cAAc,GAAG;IACrB,SAAS;IACT,SAAS;IACT,SAAS;IACT,UAAU;IACV,UAAU;IACV,aAAa;CACd,CAAA;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAE,EAAa;IAC7C,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;QAEnC,OAAO,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/src/multiaddr/is-private.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-private.d.ts","sourceRoot":"","sources":["../../../src/multiaddr/is-private.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AASxD;;GAEG;AACH,wBAAgB,SAAS,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAoBjD"}
+{"version":3,"file":"is-private.d.ts","sourceRoot":"","sources":["../../../src/multiaddr/is-private.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD;;GAEG;AACH,wBAAgB,SAAS,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAmBjD"}

package/dist/src/multiaddr/is-private.js

@@ -1,25 +1,19 @@
 import { isPrivateIp } from '../private-ip.js';
-const CODEC_IP4 = 0x04;
-const CODEC_IP6 = 0x29;
-const CODEC_DNS = 0x35;
-const CODEC_DNS4 = 0x36;
-const CODEC_DNS6 = 0x37;
-const CODEC_DNSADDR = 0x38;
+import { isIpBased } from './is-ip-based.js';
 /**
  * Check if a given multiaddr starts with a private address
  */
 export function isPrivate(ma) {
     try {
-        const [[codec, value]] = ma.stringTuples();
-        if (value == null) {
-            return true;
-        }
-        if (codec === CODEC_DNS || codec === CODEC_DNS4 || codec === CODEC_DNS6 || codec === CODEC_DNSADDR) {
+        if (!isIpBased(ma)) {
+            // not an IP based multiaddr, cannot be private
             return false;
         }
-        if (codec === CODEC_IP4 || codec === CODEC_IP6) {
-            return isPrivateIp(value) ?? false;
+        const [[, value]] = ma.stringTuples();
+        if (value == null) {
+            return false;
         }
+        return isPrivateIp(value) ?? false;
     }
     catch {
     }

package/dist/src/multiaddr/is-private.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-private.js","sourceRoot":"","sources":["../../../src/multiaddr/is-private.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAG9C,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,UAAU,GAAG,IAAI,CAAA;AACvB,MAAM,UAAU,GAAG,IAAI,CAAA;AACvB,MAAM,aAAa,GAAG,IAAI,CAAA;AAE1B;;GAEG;AACH,MAAM,UAAU,SAAS,CAAE,EAAa;IACtC,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;QAE1C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;YACnG,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAC/C,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAA;QACpC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"is-private.js","sourceRoot":"","sources":["../../../src/multiaddr/is-private.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAG5C;;GAEG;AACH,MAAM,UAAU,SAAS,CAAE,EAAa;IACtC,IAAI,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YACnB,+CAA+C;YAC/C,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;QAErC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAA;IACpC,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "6.5.2-d98cc46e4",
+  "version": "6.5.3-2a3cec922",
   "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",
@@ -108,6 +108,10 @@
       "types": "./dist/src/multiaddr/is-global-unicast.d.ts",
       "import": "./dist/src/multiaddr/is-global-unicast.js"
     },
+    "./multiaddr/is-ip-based": {
+      "types": "./dist/src/multiaddr/is-ip-based.d.ts",
+      "import": "./dist/src/multiaddr/is-ip-based.js"
+    },
     "./multiaddr/is-link-local": {
       "types": "./dist/src/multiaddr/is-link-local.d.ts",
       "import": "./dist/src/multiaddr/is-link-local.js"
@@ -116,6 +120,10 @@
       "types": "./dist/src/multiaddr/is-loopback.d.ts",
       "import": "./dist/src/multiaddr/is-loopback.js"
     },
+    "./multiaddr/is-network-address": {
+      "types": "./dist/src/multiaddr/is-network-address.d.ts",
+      "import": "./dist/src/multiaddr/is-network-address.js"
+    },
     "./multiaddr/is-private": {
       "types": "./dist/src/multiaddr/is-private.d.ts",
       "import": "./dist/src/multiaddr/is-private.js"
@@ -181,9 +189,9 @@
   "dependencies": {
     "@chainsafe/is-ip": "^2.0.2",
     "@chainsafe/netmask": "^2.0.0",
-    "@libp2p/crypto": "5.0.12-d98cc46e4",
-    "@libp2p/interface": "2.6.0-d98cc46e4",
-    "@libp2p/logger": "5.1.9-d98cc46e4",
+    "@libp2p/crypto": "5.0.12-2a3cec922",
+    "@libp2p/interface": "2.6.0-2a3cec922",
+    "@libp2p/logger": "5.1.9-2a3cec922",
     "@multiformats/multiaddr": "^12.3.3",
     "@sindresorhus/fnv1a": "^3.1.0",
     "any-signal": "^4.1.1",
@@ -197,12 +205,12 @@
     "netmask": "^2.0.2",
     "p-defer": "^4.0.1",
     "race-event": "^1.3.0",
-    "race-signal": "^1.1.0",
+    "race-signal": "^1.1.2",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/peer-id": "5.0.13-d98cc46e4",
+    "@libp2p/peer-id": "5.0.13-2a3cec922",
     "@types/netmask": "^2.0.5",
     "aegir": "^45.0.5",
     "benchmark": "^2.1.4",

package/src/multiaddr/is-ip-based.ts

@@ -0,0 +1,19 @@
+import type { Multiaddr } from '@multiformats/multiaddr'
+
+const CODEC_IP4 = 0x04
+const CODEC_IP6 = 0x29
+
+/**
+ * Check if a given multiaddr is IP-based
+ */
+export function isIpBased (ma: Multiaddr): boolean {
+  try {
+    const [[codec]] = ma.stringTuples()
+
+    return codec === CODEC_IP4 || codec === CODEC_IP6
+  } catch {
+
+  }
+
+  return false
+}

package/src/multiaddr/is-loopback.ts

@@ -1,10 +1,16 @@
 import { isLoopbackAddr } from 'is-loopback-addr'
+import { isIpBased } from './is-ip-based.js'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
 /**
  * Check if a given multiaddr is a loopback address.
  */
 export function isLoopback (ma: Multiaddr): boolean {
+  if (!isIpBased(ma)) {
+    // not an IP based multiaddr, cannot be private
+    return false
+  }
+
   const { address } = ma.nodeAddress()
 
   return isLoopbackAddr(address)

package/src/multiaddr/is-network-address.ts

@@ -0,0 +1,32 @@
+import type { Multiaddr } from '@multiformats/multiaddr'
+
+const CODEC_IP4 = 0x04
+const CODEC_IP6 = 0x29
+const CODEC_DNS = 0x35
+const CODEC_DNS4 = 0x36
+const CODEC_DNS6 = 0x37
+const CODEC_DNSADDR = 0x38
+
+const NETWORK_CODECS = [
+  CODEC_IP4,
+  CODEC_IP6,
+  CODEC_DNS,
+  CODEC_DNS4,
+  CODEC_DNS6,
+  CODEC_DNSADDR
+]
+
+/**
+ * Check if a given multiaddr is a network address
+ */
+export function isNetworkAddress (ma: Multiaddr): boolean {
+  try {
+    const [[codec]] = ma.stringTuples()
+
+    return NETWORK_CODECS.includes(codec)
+  } catch {
+
+  }
+
+  return false
+}

package/src/multiaddr/is-private.ts

@@ -1,31 +1,24 @@
 import { isPrivateIp } from '../private-ip.js'
+import { isIpBased } from './is-ip-based.js'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
-const CODEC_IP4 = 0x04
-const CODEC_IP6 = 0x29
-const CODEC_DNS = 0x35
-const CODEC_DNS4 = 0x36
-const CODEC_DNS6 = 0x37
-const CODEC_DNSADDR = 0x38
-
 /**
  * Check if a given multiaddr starts with a private address
  */
 export function isPrivate (ma: Multiaddr): boolean {
   try {
-    const [[codec, value]] = ma.stringTuples()
-
-    if (value == null) {
-      return true
+    if (!isIpBased(ma)) {
+      // not an IP based multiaddr, cannot be private
+      return false
     }
 
-    if (codec === CODEC_DNS || codec === CODEC_DNS4 || codec === CODEC_DNS6 || codec === CODEC_DNSADDR) {
+    const [[, value]] = ma.stringTuples()
+
+    if (value == null) {
       return false
     }
 
-    if (codec === CODEC_IP4 || codec === CODEC_IP6) {
-      return isPrivateIp(value) ?? false
-    }
+    return isPrivateIp(value) ?? false
   } catch {
 
   }