@libp2p/utils 6.2.1-4a85eb033 → 6.2.1-6ab85ea68

package/README.md

@@ -49,7 +49,7 @@ $ npm i @libp2p/utils
 
 ## Browser `<script>` tag
 
-Loading this module through a script tag will make it's exports available as `Libp2pUtils` in the global namespace.
+Loading this module through a script tag will make its exports available as `Libp2pUtils` in the global namespace.
 
 ```html
 <script src="https://unpkg.com/@libp2p/utils/dist/index.min.js"></script>

package/dist/src/global-unicast-ip.d.ts

@@ -0,0 +1,2 @@
+export declare function isGlobalUnicastIp(ip: string): boolean;
+//# sourceMappingURL=global-unicast-ip.d.ts.map

package/dist/src/global-unicast-ip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"global-unicast-ip.d.ts","sourceRoot":"","sources":["../../src/global-unicast-ip.ts"],"names":[],"mappings":"AAGA,wBAAgB,iBAAiB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAMtD"}

package/dist/src/global-unicast-ip.js

@@ -0,0 +1,9 @@
+import { isIPv6 } from '@chainsafe/is-ip';
+import { cidrContains } from '@chainsafe/netmask';
+export function isGlobalUnicastIp(ip) {
+    if (isIPv6(ip)) {
+        return cidrContains('2000::/3', ip);
+    }
+    return false;
+}
+//# sourceMappingURL=global-unicast-ip.js.map

package/dist/src/global-unicast-ip.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"global-unicast-ip.js","sourceRoot":"","sources":["../../src/global-unicast-ip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,UAAU,iBAAiB,CAAE,EAAU;IAC3C,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QACf,OAAO,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;IACrC,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

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

@@ -0,0 +1,2 @@
+export declare function isLinkLocalIp(ip: string): boolean;
+//# sourceMappingURL=link-local-ip.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,11 @@
+import { isIPv4, isIPv6 } from '@chainsafe/is-ip';
+export function isLinkLocalIp(ip) {
+    if (isIPv4(ip)) {
+        return ip.startsWith('169.254.');
+    }
+    if (isIPv6(ip)) {
+        return ip.toLowerCase().startsWith('fe80');
+    }
+    return false;
+}
+//# sourceMappingURL=link-local-ip.js.map

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

@@ -0,0 +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"}

package/dist/src/multiaddr/is-global-unicast.d.ts

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

package/dist/src/multiaddr/is-global-unicast.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-global-unicast.d.ts","sourceRoot":"","sources":["../../../src/multiaddr/is-global-unicast.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD;;GAEG;AACH,wBAAgB,eAAe,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAgBvD"}

package/dist/src/multiaddr/is-global-unicast.js

@@ -0,0 +1,20 @@
+import { cidrContains } from '@chainsafe/netmask';
+const CODEC_IP6 = 0x29;
+/**
+ * Check if a given multiaddr is an IPv6 global unicast address
+ */
+export function isGlobalUnicast(ma) {
+    try {
+        const [[codec, value]] = ma.stringTuples();
+        if (value == null) {
+            return false;
+        }
+        if (codec === CODEC_IP6) {
+            return cidrContains('2000::/3', value);
+        }
+    }
+    catch {
+    }
+    return false;
+}
+//# sourceMappingURL=is-global-unicast.js.map

package/dist/src/multiaddr/is-global-unicast.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-global-unicast.js","sourceRoot":"","sources":["../../../src/multiaddr/is-global-unicast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,MAAM,SAAS,GAAG,IAAI,CAAA;AAEtB;;GAEG;AACH,MAAM,UAAU,eAAe,CAAE,EAAa;IAC5C,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,KAAK,CAAA;QACd,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/src/multiaddr/is-link-local.d.ts

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

package/dist/src/multiaddr/is-link-local.d.ts.map

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

package/dist/src/multiaddr/is-link-local.js

@@ -0,0 +1,23 @@
+const CODEC_IP4 = 0x04;
+const CODEC_IP6 = 0x29;
+/**
+ * Check if a given multiaddr is a link-local address
+ */
+export function isLinkLocal(ma) {
+    try {
+        const [[codec, value]] = ma.stringTuples();
+        if (value == null) {
+            return false;
+        }
+        if (codec === CODEC_IP4) {
+            return value.startsWith('169.254.');
+        }
+        if (codec === CODEC_IP6) {
+            return value.toLowerCase().startsWith('fe80');
+        }
+    }
+    catch {
+    }
+    return false;
+}
+//# sourceMappingURL=is-link-local.js.map

package/dist/src/multiaddr/is-link-local.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-link-local.js","sourceRoot":"","sources":["../../../src/multiaddr/is-link-local.ts"],"names":[],"mappings":"AAEA,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AAEtB;;GAEG;AACH,MAAM,UAAU,WAAW,CAAE,EAAa;IACxC,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,KAAK,CAAA;QACd,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QACrC,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/C,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

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

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

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;AAExD;;GAEG;AACH,wBAAgB,SAAS,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO,CAQjD"}
+{"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"}

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

@@ -1,14 +1,28 @@
 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;
 /**
- * Check if a given multiaddr has a private address.
+ * Check if a given multiaddr starts with a private address
  */
 export function isPrivate(ma) {
     try {
-        const { address } = ma.nodeAddress();
-        return Boolean(isPrivateIp(address));
+        const [[codec, value]] = ma.stringTuples();
+        if (value == null) {
+            return true;
+        }
+        if (codec === CODEC_DNS || codec === CODEC_DNS4 || codec === CODEC_DNS6 || codec === CODEC_DNSADDR) {
+            return false;
+        }
+        if (codec === CODEC_IP4 || codec === CODEC_IP6) {
+            return isPrivateIp(value) ?? false;
+        }
     }
     catch {
-        return true;
     }
+    return true;
 }
 //# sourceMappingURL=is-private.js.map

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;;GAEG;AACH,MAAM,UAAU,SAAS,CAAE,EAAa;IACtC,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;QAEpC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "6.2.1-4a85eb033",
+  "version": "6.2.1-6ab85ea68",
   "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",
@@ -76,6 +76,10 @@
       "types": "./dist/src/filters/index.d.ts",
       "import": "./dist/src/filters/index.js"
     },
+    "./global-unicast-ip": {
+      "types": "./dist/src/global-unicast-ip.d.ts",
+      "import": "./dist/src/global-unicast-ip.js"
+    },
     "./ip-port-to-multiaddr": {
       "types": "./dist/src/ip-port-to-multiaddr.d.ts",
       "import": "./dist/src/ip-port-to-multiaddr.js"
@@ -84,10 +88,22 @@
       "types": "./dist/src/is-promise.d.ts",
       "import": "./dist/src/is-promise.js"
     },
+    "./link-local-ip": {
+      "types": "./dist/src/link-local-ip.d.ts",
+      "import": "./dist/src/link-local-ip.js"
+    },
     "./moving-average": {
       "types": "./dist/src/moving-average.d.ts",
       "import": "./dist/src/moving-average.js"
     },
+    "./multiaddr/is-global-unicast": {
+      "types": "./dist/src/multiaddr/is-global-unicast.d.ts",
+      "import": "./dist/src/multiaddr/is-global-unicast.js"
+    },
+    "./multiaddr/is-link-local": {
+      "types": "./dist/src/multiaddr/is-link-local.d.ts",
+      "import": "./dist/src/multiaddr/is-link-local.js"
+    },
     "./multiaddr/is-loopback": {
       "types": "./dist/src/multiaddr/is-loopback.d.ts",
       "import": "./dist/src/multiaddr/is-loopback.js"
@@ -156,10 +172,11 @@
   },
   "dependencies": {
     "@chainsafe/is-ip": "^2.0.2",
-    "@libp2p/crypto": "5.0.7-4a85eb033",
-    "@libp2p/interface": "2.2.1-4a85eb033",
-    "@libp2p/logger": "5.1.4-4a85eb033",
-    "@multiformats/multiaddr": "^12.2.3",
+    "@chainsafe/netmask": "^2.0.0",
+    "@libp2p/crypto": "5.0.7-6ab85ea68",
+    "@libp2p/interface": "2.2.1-6ab85ea68",
+    "@libp2p/logger": "5.1.4-6ab85ea68",
+    "@multiformats/multiaddr": "^12.3.3",
     "@sindresorhus/fnv1a": "^3.1.0",
     "@types/murmurhash3js-revisited": "^3.0.3",
     "any-signal": "^4.1.1",
@@ -169,25 +186,25 @@
     "it-foreach": "^2.1.1",
     "it-pipe": "^3.0.1",
     "it-pushable": "^3.2.3",
-    "it-stream-types": "^2.0.1",
+    "it-stream-types": "^2.0.2",
     "murmurhash3js-revisited": "^3.0.0",
     "netmask": "^2.0.2",
     "p-defer": "^4.0.1",
     "race-event": "^1.3.0",
-    "race-signal": "^1.0.2",
+    "race-signal": "^1.1.0",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/peer-id": "5.0.8-4a85eb033",
+    "@libp2p/peer-id": "5.0.8-6ab85ea68",
     "@types/netmask": "^2.0.5",
-    "aegir": "^44.0.1",
+    "aegir": "^45.0.5",
     "benchmark": "^2.1.4",
     "delay": "^6.0.0",
     "it-all": "^3.0.6",
     "it-drain": "^3.0.7",
     "it-pair": "^2.0.6",
-    "sinon": "^18.0.0",
+    "sinon": "^19.0.2",
     "sinon-ts": "^2.0.0"
   },
   "sideEffects": false

package/src/global-unicast-ip.ts

@@ -0,0 +1,10 @@
+import { isIPv6 } from '@chainsafe/is-ip'
+import { cidrContains } from '@chainsafe/netmask'
+
+export function isGlobalUnicastIp (ip: string): boolean {
+  if (isIPv6(ip)) {
+    return cidrContains('2000::/3', ip)
+  }
+
+  return false
+}

package/src/link-local-ip.ts

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

package/src/multiaddr/is-global-unicast.ts

@@ -0,0 +1,25 @@
+import { cidrContains } from '@chainsafe/netmask'
+import type { Multiaddr } from '@multiformats/multiaddr'
+
+const CODEC_IP6 = 0x29
+
+/**
+ * Check if a given multiaddr is an IPv6 global unicast address
+ */
+export function isGlobalUnicast (ma: Multiaddr): boolean {
+  try {
+    const [[codec, value]] = ma.stringTuples()
+
+    if (value == null) {
+      return false
+    }
+
+    if (codec === CODEC_IP6) {
+      return cidrContains('2000::/3', value)
+    }
+  } catch {
+
+  }
+
+  return false
+}

package/src/multiaddr/is-link-local.ts

@@ -0,0 +1,29 @@
+import type { Multiaddr } from '@multiformats/multiaddr'
+
+const CODEC_IP4 = 0x04
+const CODEC_IP6 = 0x29
+
+/**
+ * Check if a given multiaddr is a link-local address
+ */
+export function isLinkLocal (ma: Multiaddr): boolean {
+  try {
+    const [[codec, value]] = ma.stringTuples()
+
+    if (value == null) {
+      return false
+    }
+
+    if (codec === CODEC_IP4) {
+      return value.startsWith('169.254.')
+    }
+
+    if (codec === CODEC_IP6) {
+      return value.toLowerCase().startsWith('fe80')
+    }
+  } catch {
+
+  }
+
+  return false
+}

package/src/multiaddr/is-private.ts

@@ -1,15 +1,34 @@
 import { isPrivateIp } from '../private-ip.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 has a private address.
+ * Check if a given multiaddr starts with a private address
  */
 export function isPrivate (ma: Multiaddr): boolean {
   try {
-    const { address } = ma.nodeAddress()
+    const [[codec, value]] = ma.stringTuples()
+
+    if (value == null) {
+      return true
+    }
+
+    if (codec === CODEC_DNS || codec === CODEC_DNS4 || codec === CODEC_DNS6 || codec === CODEC_DNSADDR) {
+      return false
+    }
 
-    return Boolean(isPrivateIp(address))
+    if (codec === CODEC_IP4 || codec === CODEC_IP6) {
+      return isPrivateIp(value) ?? false
+    }
   } catch {
-    return true
+
   }
+
+  return true
 }

package/LICENSE

@@ -1,4 +0,0 @@
-This project is dual licensed under MIT and Apache-2.0.
-
-MIT: https://www.opensource.org/licenses/mit
-Apache-2.0: https://www.apache.org/licenses/license-2.0