pzp
/
pzp-net
mirror of https://codeberg.org/pzp/pzp-net.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Multiaddr.fromMs to support tunnel

This commit is contained in:
Andre Staltz 2024-01-16 15:47:29 +02:00
parent e979aa0a9d
commit 1a0d39cdb6
No known key found for this signature in database
GPG Key ID: 9EDE23EA7E8A4890
2 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/multiaddr.js
View File

@ -9,16 +9,24 @@ const Multiaddr = {
*/ */
fromMs(msaddr) { fromMs(msaddr) {
const [msTransport, msTransform] = msaddr.split('~') const [msTransport, msTransform] = msaddr.split('~')
const [label1, host, port] = msTransport.split(':') const [label1, ...pieces] = msTransport.split(':')
const hostFormat = IP.isV4Format(host) /**@type {string}*/
? 'ip4' let soFar
: IP.isV6Format('ipv6') if (label1 === 'tunnel') {
? 'ip6' const [hubPubkey, targetPubkey] = pieces
: 'dns' soFar = `tunnel/${hubPubkey}.${targetPubkey}`
const transport = label1 === 'net' ? 'tcp' : label1 === 'ws' ? 'ws' : null } else {
if (!transport) throw new Error(`Unknown transport "${label1}"`) const transport = label1 === 'net' ? 'tcp' : label1 === 'ws' ? 'ws' : null
const soFar = `${hostFormat}/${host}/${transport}/${port}` if (!transport) throw new Error(`Unknown transport "${label1}"`)
const [host, port] = pieces
const hostFormat = IP.isV4Format(host)
? 'ip4'
: IP.isV6Format('ipv6')
? 'ip6'
: 'dns'
soFar = `${hostFormat}/${host}/${transport}/${port}`
}
if (msTransform) { if (msTransform) {
const [label2, pubkey, token] = msTransform.split(':') const [label2, pubkey, token] = msTransform.split(':')

80
test/multiaddr.test.js
View File

@ -6,59 +6,59 @@ const PUBKEY = 'EqTMFv7zm8hpPyAkj789qdJgqtz81AEbcinpAs24RRUC'
const PUBKEY2 = 'EqTMFv7zm8hpPyAkj789qdJgqtz81AEbcinpAs35RRUC' const PUBKEY2 = 'EqTMFv7zm8hpPyAkj789qdJgqtz81AEbcinpAs35RRUC'
test('Multiaddr', async (t) => { test('Multiaddr', async (t) => {
await t.test('toMs ip4+tcp', async () => { await t.test('ip4+tcp', async () => {
assert.equal( const multiaddr = '/ip4/127.0.0.1/tcp/8008'
Multiaddr.toMs('/ip4/127.0.0.1/tcp/8008'), const ms = 'net:127.0.0.1:8008'
'net:127.0.0.1:8008' assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
await t.test('toMs ip4+tcp+shse', async () => { await t.test('ip4+tcp+shse', async () => {
assert.equal( const multiaddr = `/ip4/127.0.0.1/tcp/8008/shse/${PUBKEY}`
Multiaddr.toMs(`/ip4/127.0.0.1/tcp/8008/shse/${PUBKEY}`), const ms = `net:127.0.0.1:8008~shse:${PUBKEY}`
`net:127.0.0.1:8008~shse:${PUBKEY}` assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
await t.test('toMs ip4+tcp+shse+token', async () => { await t.test('ip4+tcp+shse+token', async () => {
assert.equal( const multiaddr = `/ip4/127.0.0.1/tcp/8008/shse/${PUBKEY}.TOKEN`
Multiaddr.toMs(`/ip4/127.0.0.1/tcp/8008/shse/${PUBKEY}.TOKEN`), const ms = `net:127.0.0.1:8008~shse:${PUBKEY}:TOKEN`
`net:127.0.0.1:8008~shse:${PUBKEY}:TOKEN` assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
await t.test('toMs dns+tcp+shse', async () => { await t.test('dns+tcp+shse', async () => {
assert.equal( const multiaddr = `/dns/staltz.com/tcp/8008/shse/${PUBKEY}`
Multiaddr.toMs(`/dns/staltz.com/tcp/8008/shse/${PUBKEY}`), const ms = `net:staltz.com:8008~shse:${PUBKEY}`
`net:staltz.com:8008~shse:${PUBKEY}` assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
await t.test('toMs dns+tcp+shse+token', async () => { await t.test('dns+tcp+shse+token', async () => {
assert.equal( const multiaddr = `/dns/staltz.com/tcp/8008/shse/${PUBKEY}.TOKEN`
Multiaddr.toMs(`/dns/staltz.com/tcp/8008/shse/${PUBKEY}.TOKEN`), const ms = `net:staltz.com:8008~shse:${PUBKEY}:TOKEN`
`net:staltz.com:8008~shse:${PUBKEY}:TOKEN` assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
await t.test('toMs tunnel', async () => { await t.test('tunnel', async () => {
assert.equal( const multiaddr = `/tunnel/${PUBKEY}.${PUBKEY2}`
Multiaddr.toMs(`/tunnel/${PUBKEY}.${PUBKEY2}`), const ms = `tunnel:${PUBKEY}:${PUBKEY2}`
`tunnel:${PUBKEY}:${PUBKEY2}` assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
await t.test('toMs tunnel+shse', async () => { await t.test('tunnel+shse', async () => {
assert.equal( const multiaddr = `/tunnel/${PUBKEY}.${PUBKEY2}/shse/${PUBKEY2}`
Multiaddr.toMs(`/tunnel/${PUBKEY}.${PUBKEY2}/shse/${PUBKEY2}`), const ms = `tunnel:${PUBKEY}:${PUBKEY2}~shse:${PUBKEY2}`
`tunnel:${PUBKEY}:${PUBKEY2}~shse:${PUBKEY2}` assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
await t.test('toMs tunnel+shse+token', async () => { await t.test('tunnel+shse+token', async () => {
assert.equal( const multiaddr = `/tunnel/${PUBKEY}.${PUBKEY2}/shse/${PUBKEY2}.TOKEN`
Multiaddr.toMs(`/tunnel/${PUBKEY}.${PUBKEY2}/shse/${PUBKEY2}.TOKEN`), const ms = `tunnel:${PUBKEY}:${PUBKEY2}~shse:${PUBKEY2}:TOKEN`
`tunnel:${PUBKEY}:${PUBKEY2}~shse:${PUBKEY2}:TOKEN` assert.equal(Multiaddr.toMs(multiaddr), ms)
) assert.equal(Multiaddr.fromMs(ms), multiaddr)
}) })
}) })