fluencelabs/js-libp2p-utils
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-utils synced 2025-04-24 17:52:19 +00:00
Code Issues Projects Releases Wiki Activity

bump dependencies

Browse Source
This commit is contained in:
Pavel Murygin 2021-04-09 18:12:25 +03:00
parent 4326d714d9
commit 5bfad1908b
7 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -57,7 +57,7 @@
"err-code": "^3.0.1", "err-code": "^3.0.1",
"ip-address": "^7.1.0", "ip-address": "^7.1.0",
"is-loopback-addr": "^1.0.0", "is-loopback-addr": "^1.0.0",
"multiaddr": "^8.1.2", "multiaddr": "^9.0.1",
"private-ip": "^2.1.1" "private-ip": "^2.1.1"
}, },
"contributors": [ "contributors": [

6
src/ip-port-to-multiaddr.js
View File

@ -36,15 +36,15 @@ function ipPortToMultiaddr (ip, port) {
try { try {
// Test valid IPv4 // Test valid IPv4
new Address4(ip) // eslint-disable-line no-new new Address4(ip) // eslint-disable-line no-new
return multiaddr(`/ip4/${ip}/tcp/${port}`) return new multiaddr.Multiaddr(`/ip4/${ip}/tcp/${port}`)
} catch {} } catch {}
try { try {
// Test valid IPv6 // Test valid IPv6
const ip6 = new Address6(ip) const ip6 = new Address6(ip)
return ip6.is4() return ip6.is4()
? multiaddr(`/ip4/${ip6.to4().correctForm()}/tcp/${port}`) ? new multiaddr.Multiaddr(`/ip4/${ip6.to4().correctForm()}/tcp/${port}`)
: multiaddr(`/ip6/${ip}/tcp/${port}`) : new multiaddr.Multiaddr(`/ip6/${ip}/tcp/${port}`)
} catch (err) { } catch (err) {
const errMsg = `invalid ip:port for creating a multiaddr: ${ip}:${port}` const errMsg = `invalid ip:port for creating a multiaddr: ${ip}:${port}`
log.error(errMsg) log.error(errMsg)

24
test/address-sort.spec.js
View File

@ -10,44 +10,44 @@ describe('address-sort', () => {
it('should sort public addresses first', () => { it('should sort public addresses first', () => {
const addresses = [ const addresses = [
{ {
multiaddr: multiaddr('/ip4/127.0.0.1/tcp/4000'), multiaddr: new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/4000'),
isCertified: false isCertified: false
}, },
{ {
multiaddr: multiaddr('/ip4/30.0.0.1/tcp/4000'), multiaddr: new multiaddr.Multiaddr('/ip4/30.0.0.1/tcp/4000'),
isCertified: false isCertified: false
}, },
{ {
multiaddr: multiaddr('/ip4/31.0.0.1/tcp/4000'), multiaddr: new multiaddr.Multiaddr('/ip4/31.0.0.1/tcp/4000'),
isCertified: false isCertified: false
} }
] ]
const sortedAddresses = publicAddressesFirst(addresses) const sortedAddresses = publicAddressesFirst(addresses)
expect(sortedAddresses[0].multiaddr.equals(multiaddr('/ip4/30.0.0.1/tcp/4000'))).to.eql(true) expect(sortedAddresses[0].multiaddr.equals(new multiaddr.Multiaddr('/ip4/30.0.0.1/tcp/4000'))).to.eql(true)
expect(sortedAddresses[1].multiaddr.equals(multiaddr('/ip4/31.0.0.1/tcp/4000'))).to.eql(true) expect(sortedAddresses[1].multiaddr.equals(new multiaddr.Multiaddr('/ip4/31.0.0.1/tcp/4000'))).to.eql(true)
expect(sortedAddresses[2].multiaddr.equals(multiaddr('/ip4/127.0.0.1/tcp/4000'))).to.eql(true) expect(sortedAddresses[2].multiaddr.equals(new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/4000'))).to.eql(true)
}) })
it('should sort public certified addresses first', () => { it('should sort public certified addresses first', () => {
const addresses = [ const addresses = [
{ {
multiaddr: multiaddr('/ip4/127.0.0.1/tcp/4000'), multiaddr: new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/4000'),
isCertified: false isCertified: false
}, },
{ {
multiaddr: multiaddr('/ip4/30.0.0.1/tcp/4000'), multiaddr: new multiaddr.Multiaddr('/ip4/30.0.0.1/tcp/4000'),
isCertified: false isCertified: false
}, },
{ {
multiaddr: multiaddr('/ip4/31.0.0.1/tcp/4000'), multiaddr: new multiaddr.Multiaddr('/ip4/31.0.0.1/tcp/4000'),
isCertified: true isCertified: true
} }
] ]
const sortedAddresses = publicAddressesFirst(addresses) const sortedAddresses = publicAddressesFirst(addresses)
expect(sortedAddresses[0].multiaddr.equals(multiaddr('/ip4/31.0.0.1/tcp/4000'))).to.eql(true) expect(sortedAddresses[0].multiaddr.equals(new multiaddr.Multiaddr('/ip4/31.0.0.1/tcp/4000'))).to.eql(true)
expect(sortedAddresses[1].multiaddr.equals(multiaddr('/ip4/30.0.0.1/tcp/4000'))).to.eql(true) expect(sortedAddresses[1].multiaddr.equals(new multiaddr.Multiaddr('/ip4/30.0.0.1/tcp/4000'))).to.eql(true)
expect(sortedAddresses[2].multiaddr.equals(multiaddr('/ip4/127.0.0.1/tcp/4000'))).to.eql(true) expect(sortedAddresses[2].multiaddr.equals(new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/4000'))).to.eql(true)
}) })
}) })

46
test/array-equals.spec.js
View File

@ -9,15 +9,15 @@ const arrayEquals = require('../src/array-equals')
describe('non primitive array equals', () => { describe('non primitive array equals', () => {
it('returns true if two arrays of multiaddrs are equal', () => { it('returns true if two arrays of multiaddrs are equal', () => {
const a = [ const a = [
multiaddr('/ip4/127.0.0.1/tcp/8000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000'),
multiaddr('/ip4/127.0.0.1/tcp/3000/ws'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/3000/ws'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
const b = [ const b = [
multiaddr('/ip4/127.0.0.1/tcp/8000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000'),
multiaddr('/ip4/127.0.0.1/tcp/3000/ws'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/3000/ws'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
expect(arrayEquals(a, b)).to.eql(true) expect(arrayEquals(a, b)).to.eql(true)
@ -25,15 +25,15 @@ describe('non primitive array equals', () => {
it('returns true if two arrays of multiaddrs have the same content but different orders', () => { it('returns true if two arrays of multiaddrs have the same content but different orders', () => {
const a = [ const a = [
multiaddr('/ip4/127.0.0.1/tcp/8000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000'),
multiaddr('/ip4/127.0.0.1/tcp/3000/ws'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/3000/ws'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
const b = [ const b = [
multiaddr('/ip4/127.0.0.1/tcp/3000/ws'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/3000/ws'),
multiaddr('/ip4/127.0.0.1/tcp/8000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
expect(arrayEquals(a, b)).to.eql(true) expect(arrayEquals(a, b)).to.eql(true)
@ -41,15 +41,15 @@ describe('non primitive array equals', () => {
it('returns false if two arrays of multiaddrs are different', () => { it('returns false if two arrays of multiaddrs are different', () => {
const a = [ const a = [
multiaddr('/ip4/127.0.0.1/tcp/8000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000'),
multiaddr('/ip4/127.0.0.1/tcp/3000/ws'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/3000/ws'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
const b = [ const b = [
multiaddr('/ip4/127.0.0.1/tcp/8001'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8001'),
multiaddr('/ip4/127.0.0.1/tcp/3000/ws'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/3000/ws'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
expect(arrayEquals(a, b)).to.eql(false) expect(arrayEquals(a, b)).to.eql(false)
@ -57,14 +57,14 @@ describe('non primitive array equals', () => {
it('returns false if two arrays of multiaddrs are partially equal, but different lengths', () => { it('returns false if two arrays of multiaddrs are partially equal, but different lengths', () => {
const a = [ const a = [
multiaddr('/ip4/127.0.0.1/tcp/8000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000'),
multiaddr('/ip4/127.0.0.1/tcp/3000/ws'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/3000/ws'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
const b = [ const b = [
multiaddr('/ip4/127.0.0.1/tcp/8000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000'),
multiaddr('/dns4/test.libp2p.io') new multiaddr.Multiaddr('/dns4/test.libp2p.io')
] ]
expect(arrayEquals(a, b)).to.eql(false) expect(arrayEquals(a, b)).to.eql(false)

26
test/multiaddr/is-loopback.spec.js
View File

@ -9,10 +9,10 @@ const isLoopback = require('../../src/multiaddr/is-loopback')
describe('multiaddr isLoopback', () => { describe('multiaddr isLoopback', () => {
it('identifies loopback ip4 multiaddrs', () => { it('identifies loopback ip4 multiaddrs', () => {
[ [
multiaddr('/ip4/127.0.0.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/1000'),
multiaddr('/ip4/127.0.1.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/127.0.1.1/tcp/1000'),
multiaddr('/ip4/127.1.1.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/127.1.1.1/tcp/1000'),
multiaddr('/ip4/127.255.255.255/tcp/1000') new multiaddr.Multiaddr('/ip4/127.255.255.255/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isLoopback(ma)).to.eql(true) expect(isLoopback(ma)).to.eql(true)
}) })
@ -20,10 +20,10 @@ describe('multiaddr isLoopback', () => {
it('identifies non loopback ip4 multiaddrs', () => { it('identifies non loopback ip4 multiaddrs', () => {
[ [
multiaddr('/ip4/101.0.26.90/tcp/1000'), new multiaddr.Multiaddr('/ip4/101.0.26.90/tcp/1000'),
multiaddr('/ip4/10.0.0.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/10.0.0.1/tcp/1000'),
multiaddr('/ip4/192.168.0.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/192.168.0.1/tcp/1000'),
multiaddr('/ip4/172.16.0.1/tcp/1000') new multiaddr.Multiaddr('/ip4/172.16.0.1/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isLoopback(ma)).to.eql(false) expect(isLoopback(ma)).to.eql(false)
}) })
@ -31,7 +31,7 @@ describe('multiaddr isLoopback', () => {
it('identifies loopback ip6 multiaddrs', () => { it('identifies loopback ip6 multiaddrs', () => {
[ [
multiaddr('/ip6/::1/tcp/1000') new multiaddr.Multiaddr('/ip6/::1/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isLoopback(ma)).to.eql(true) expect(isLoopback(ma)).to.eql(true)
}) })
@ -39,8 +39,8 @@ describe('multiaddr isLoopback', () => {
it('identifies non loopback ip6 multiaddrs', () => { it('identifies non loopback ip6 multiaddrs', () => {
[ [
multiaddr('/ip6/2001:8a0:7ac5:4201:3ac9:86ff:fe31:7095/tcp/1000'), new multiaddr.Multiaddr('/ip6/2001:8a0:7ac5:4201:3ac9:86ff:fe31:7095/tcp/1000'),
multiaddr('/ip6/::/tcp/1000') new multiaddr.Multiaddr('/ip6/::/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isLoopback(ma)).to.eql(false) expect(isLoopback(ma)).to.eql(false)
}) })
@ -48,8 +48,8 @@ describe('multiaddr isLoopback', () => {
it('identifies other multiaddrs as not loopback addresses', () => { it('identifies other multiaddrs as not loopback addresses', () => {
[ [
multiaddr('/dns4/wss0.bootstrap.libp2p.io/tcp/443'), new multiaddr.Multiaddr('/dns4/wss0.bootstrap.libp2p.io/tcp/443'),
multiaddr('/dns6/wss0.bootstrap.libp2p.io/tcp/443') new multiaddr.Multiaddr('/dns6/wss0.bootstrap.libp2p.io/tcp/443')
].forEach(ma => { ].forEach(ma => {
expect(isLoopback(ma)).to.eql(false) expect(isLoopback(ma)).to.eql(false)
}) })

28
test/multiaddr/is-private.spec.js
View File

@ -9,10 +9,10 @@ const isPrivate = require('../../src/multiaddr/is-private')
describe('multiaddr isPrivate', () => { describe('multiaddr isPrivate', () => {
it('identifies private ip4 multiaddrs', () => { it('identifies private ip4 multiaddrs', () => {
[ [
multiaddr('/ip4/127.0.0.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/1000'),
multiaddr('/ip4/10.0.0.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/10.0.0.1/tcp/1000'),
multiaddr('/ip4/192.168.0.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/192.168.0.1/tcp/1000'),
multiaddr('/ip4/172.16.0.1/tcp/1000') new multiaddr.Multiaddr('/ip4/172.16.0.1/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isPrivate(ma)).to.eql(true) expect(isPrivate(ma)).to.eql(true)
}) })
@ -20,10 +20,10 @@ describe('multiaddr isPrivate', () => {
it('identifies public ip4 multiaddrs', () => { it('identifies public ip4 multiaddrs', () => {
[ [
multiaddr('/ip4/101.0.26.90/tcp/1000'), new multiaddr.Multiaddr('/ip4/101.0.26.90/tcp/1000'),
multiaddr('/ip4/40.1.20.9/tcp/1000'), new multiaddr.Multiaddr('/ip4/40.1.20.9/tcp/1000'),
multiaddr('/ip4/92.168.0.1/tcp/1000'), new multiaddr.Multiaddr('/ip4/92.168.0.1/tcp/1000'),
multiaddr('/ip4/2.16.0.1/tcp/1000') new multiaddr.Multiaddr('/ip4/2.16.0.1/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isPrivate(ma)).to.eql(false) expect(isPrivate(ma)).to.eql(false)
}) })
@ -31,8 +31,8 @@ describe('multiaddr isPrivate', () => {
it('identifies private ip6 multiaddrs', () => { it('identifies private ip6 multiaddrs', () => {
[ [
multiaddr('/ip6/fd52:8342:fc46:6c91:3ac9:86ff:fe31:7095/tcp/1000'), new multiaddr.Multiaddr('/ip6/fd52:8342:fc46:6c91:3ac9:86ff:fe31:7095/tcp/1000'),
multiaddr('/ip6/fd52:8342:fc46:6c91:3ac9:86ff:fe31:1/tcp/1000') new multiaddr.Multiaddr('/ip6/fd52:8342:fc46:6c91:3ac9:86ff:fe31:1/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isPrivate(ma)).to.eql(true) expect(isPrivate(ma)).to.eql(true)
}) })
@ -40,8 +40,8 @@ describe('multiaddr isPrivate', () => {
it('identifies public ip6 multiaddrs', () => { it('identifies public ip6 multiaddrs', () => {
[ [
multiaddr('/ip6/2001:8a0:7ac5:4201:3ac9:86ff:fe31:7095/tcp/1000'), new multiaddr.Multiaddr('/ip6/2001:8a0:7ac5:4201:3ac9:86ff:fe31:7095/tcp/1000'),
multiaddr('/ip6/2000:8a0:7ac5:4201:3ac9:86ff:fe31:7095/tcp/1000') new multiaddr.Multiaddr('/ip6/2000:8a0:7ac5:4201:3ac9:86ff:fe31:7095/tcp/1000')
].forEach(ma => { ].forEach(ma => {
expect(isPrivate(ma)).to.eql(false) expect(isPrivate(ma)).to.eql(false)
}) })
@ -49,8 +49,8 @@ describe('multiaddr isPrivate', () => {
it('identifies other multiaddrs as not private addresses', () => { it('identifies other multiaddrs as not private addresses', () => {
[ [
multiaddr('/dns4/wss0.bootstrap.libp2p.io/tcp/443'), new multiaddr.Multiaddr('/dns4/wss0.bootstrap.libp2p.io/tcp/443'),
multiaddr('/dns6/wss0.bootstrap.libp2p.io/tcp/443') new multiaddr.Multiaddr('/dns6/wss0.bootstrap.libp2p.io/tcp/443')
].forEach(ma => { ].forEach(ma => {
expect(isPrivate(ma)).to.eql(false) expect(isPrivate(ma)).to.eql(false)
}) })

4
test/stream-to-ma-conn.spec.js
View File

@ -12,8 +12,8 @@ const streamToMaConn = require('../src/stream-to-ma-conn')
describe('Convert stream into a multiaddr connection', () => { describe('Convert stream into a multiaddr connection', () => {
it('converts a stream and adds the provided metadata', () => { it('converts a stream and adds the provided metadata', () => {
const stream = pair() const stream = pair()
const localAddr = multiaddr('/ip4/101.45.75.219/tcp/6000') const localAddr = new multiaddr.Multiaddr('/ip4/101.45.75.219/tcp/6000')
const remoteAddr = multiaddr('/ip4/100.46.74.201/tcp/6002') const remoteAddr = new multiaddr.Multiaddr('/ip4/100.46.74.201/tcp/6002')
const maConn = streamToMaConn({ const maConn = streamToMaConn({
stream, stream,