@libp2p/utils
Advanced tools
Comparing version 4.0.1 to 4.0.2-32825633
@@ -1,2 +0,2 @@ | ||
import { Address4, Address6 } from '@achingbrain/ip-address'; | ||
import { isIPv4, isIPv6 } from '@chainsafe/is-ip'; | ||
import { CodeError } from '@libp2p/interface/errors'; | ||
@@ -24,21 +24,12 @@ import { logger } from '@libp2p/logger'; | ||
} | ||
try { | ||
// Test valid IPv4 | ||
new Address4(ip); // eslint-disable-line no-new | ||
if (isIPv4(ip)) { | ||
return multiaddr(`/ip4/${ip}/tcp/${port}`); | ||
} | ||
catch { } | ||
try { | ||
// Test valid IPv6 | ||
const ip6 = new Address6(ip); | ||
return ip6.is4() | ||
? multiaddr(`/ip4/${ip6.to4().correctForm()}/tcp/${port}`) | ||
: multiaddr(`/ip6/${ip}/tcp/${port}`); | ||
if (isIPv6(ip)) { | ||
return multiaddr(`/ip6/${ip}/tcp/${port}`); | ||
} | ||
catch (err) { | ||
const errMsg = `invalid ip:port for creating a multiaddr: ${ip}:${port}`; | ||
log.error(errMsg); | ||
throw new CodeError(errMsg, Errors.ERR_INVALID_IP); | ||
} | ||
const errMsg = `invalid ip:port for creating a multiaddr: ${ip}:${port}`; | ||
log.error(errMsg); | ||
throw new CodeError(errMsg, Errors.ERR_INVALID_IP); | ||
} | ||
//# sourceMappingURL=ip-port-to-multiaddr.js.map |
{ | ||
"name": "@libp2p/utils", | ||
"version": "4.0.1", | ||
"version": "4.0.2-32825633", | ||
"description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem", | ||
@@ -88,6 +88,6 @@ "license": "Apache-2.0 OR MIT", | ||
"dependencies": { | ||
"@achingbrain/ip-address": "^8.1.0", | ||
"@libp2p/interface": "^0.1.1", | ||
"@libp2p/logger": "^3.0.1", | ||
"@multiformats/multiaddr": "^12.1.3", | ||
"@chainsafe/is-ip": "^2.0.2", | ||
"@libp2p/interface": "0.1.2-32825633", | ||
"@libp2p/logger": "3.0.2-32825633", | ||
"@multiformats/multiaddr": "^12.1.5", | ||
"is-loopback-addr": "^2.0.1", | ||
@@ -99,3 +99,3 @@ "it-stream-types": "^2.0.1", | ||
"devDependencies": { | ||
"aegir": "^40.0.1", | ||
"aegir": "^40.0.8", | ||
"it-all": "^3.0.1", | ||
@@ -102,0 +102,0 @@ "it-pair": "^2.0.6", |
@@ -1,2 +0,2 @@ | ||
import { Address4, Address6 } from '@achingbrain/ip-address' | ||
import { isIPv4, isIPv6 } from '@chainsafe/is-ip' | ||
import { CodeError } from '@libp2p/interface/errors' | ||
@@ -30,19 +30,13 @@ import { logger } from '@libp2p/logger' | ||
try { | ||
// Test valid IPv4 | ||
new Address4(ip) // eslint-disable-line no-new | ||
if (isIPv4(ip)) { | ||
return multiaddr(`/ip4/${ip}/tcp/${port}`) | ||
} catch {} | ||
} | ||
try { | ||
// Test valid IPv6 | ||
const ip6 = new Address6(ip) | ||
return ip6.is4() | ||
? multiaddr(`/ip4/${ip6.to4().correctForm()}/tcp/${port}`) | ||
: multiaddr(`/ip6/${ip}/tcp/${port}`) | ||
} catch (err) { | ||
const errMsg = `invalid ip:port for creating a multiaddr: ${ip}:${port}` | ||
log.error(errMsg) | ||
throw new CodeError(errMsg, Errors.ERR_INVALID_IP) | ||
if (isIPv6(ip)) { | ||
return multiaddr(`/ip6/${ip}/tcp/${port}`) | ||
} | ||
const errMsg = `invalid ip:port for creating a multiaddr: ${ip}:${port}` | ||
log.error(errMsg) | ||
throw new CodeError(errMsg, Errors.ERR_INVALID_IP) | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
28170
39
478
1
+ Added@chainsafe/is-ip@^2.0.2
+ Added@libp2p/interface@0.1.2-32825633(transitive)
+ Added@libp2p/logger@3.0.2-32825633(transitive)
- Removed@achingbrain/ip-address@^8.1.0
- Removed@achingbrain/ip-address@8.1.0(transitive)
- Removed@libp2p/interface@0.1.6(transitive)
- Removed@libp2p/logger@3.1.0(transitive)
- Removedjsbn@1.1.0(transitive)
- Removedrace-signal@1.1.0(transitive)
- Removedsprintf-js@1.1.2(transitive)