From 4b318c2b594a438a0018b94aa3f5b8d68c99ad8d Mon Sep 17 00:00:00 2001 From: Andre-Philippe Paquet Date: Sat, 24 Apr 2021 12:30:25 -0400 Subject: [PATCH 1/3] transport/wasm-ext: fix for fully qualified p2p multiaddr --- transports/wasm-ext/src/websockets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transports/wasm-ext/src/websockets.js b/transports/wasm-ext/src/websockets.js index bc608c66157..e4056984bc7 100644 --- a/transports/wasm-ext/src/websockets.js +++ b/transports/wasm-ext/src/websockets.js @@ -31,7 +31,7 @@ export const websocket_transport = () => { /// Turns a string multiaddress into a WebSockets string URL. const multiaddr_to_ws = (addr) => { - let parsed = addr.match(/^\/(ip4|ip6|dns4|dns6|dns)\/(.*?)\/tcp\/(.*?)\/(ws|wss|x-parity-ws\/(.*)|x-parity-wss\/(.*))$/); + let parsed = addr.match(/^\/(ip4|ip6|dns4|dns6|dns)\/(.*?)\/tcp\/(.*?)\/(ws|wss|x-parity-ws\/(.*)|x-parity-wss\/(.*))(\/.*|)$/); if (parsed != null) { let proto = 'wss'; if (parsed[4] == 'ws' || parsed[4].startsWith('x-parity-ws/')) { From 912103fe5f5566db7f798929947cfe14b64fcca1 Mon Sep 17 00:00:00 2001 From: Andre-Philippe Paquet Date: Mon, 26 Apr 2021 13:18:18 -0400 Subject: [PATCH 2/3] transport/wasm-ext: p2p multiaddr parsing fix --- transports/wasm-ext/src/websockets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transports/wasm-ext/src/websockets.js b/transports/wasm-ext/src/websockets.js index e4056984bc7..290af968e70 100644 --- a/transports/wasm-ext/src/websockets.js +++ b/transports/wasm-ext/src/websockets.js @@ -31,7 +31,7 @@ export const websocket_transport = () => { /// Turns a string multiaddress into a WebSockets string URL. const multiaddr_to_ws = (addr) => { - let parsed = addr.match(/^\/(ip4|ip6|dns4|dns6|dns)\/(.*?)\/tcp\/(.*?)\/(ws|wss|x-parity-ws\/(.*)|x-parity-wss\/(.*))(\/.*|)$/); + let parsed = addr.match(/^\/(ip4|ip6|dns4|dns6|dns)\/(.*?)\/tcp\/(.*?)\/(ws|wss|x-parity-ws\/(.*)|x-parity-wss\/(.*))(|\/p2p\/[a-zA-Z0-9]+)$/); if (parsed != null) { let proto = 'wss'; if (parsed[4] == 'ws' || parsed[4].startsWith('x-parity-ws/')) { From bd6de5620300521f573571e95ef3af581d6770ca Mon Sep 17 00:00:00 2001 From: Andre-Philippe Paquet Date: Tue, 27 Apr 2021 10:15:09 -0400 Subject: [PATCH 3/3] Changelog --- CHANGELOG.md | 3 ++- Cargo.toml | 2 +- transports/wasm-ext/CHANGELOG.md | 6 +++++- transports/wasm-ext/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5848eeaa567..b6a2562b3b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,12 +45,13 @@ - Update individual crates. - `libp2p-core` + - `libp2p-gossipsub` + - `libp2p-wasm-ext` ## Version 0.37.1 [2021-04-14] - Update individual crates. - `libp2p-swarm-derive` - - `libp2p-gossipsub` ## Version 0.37.0 [2021-04-13] diff --git a/Cargo.toml b/Cargo.toml index 1b1a5cebbbb..1db703702bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,7 +79,7 @@ libp2p-request-response = { version = "0.11.0", path = "protocols/request-respon libp2p-swarm = { version = "0.29.0", path = "swarm" } libp2p-swarm-derive = { version = "0.23.0", path = "swarm-derive" } libp2p-uds = { version = "0.28.0", path = "transports/uds", optional = true } -libp2p-wasm-ext = { version = "0.28.1", path = "transports/wasm-ext", default-features = false, optional = true } +libp2p-wasm-ext = { version = "0.28.2", path = "transports/wasm-ext", default-features = false, optional = true } libp2p-yamux = { version = "0.32.0", path = "muxers/yamux", optional = true } multiaddr = { package = "parity-multiaddr", version = "0.11.2", path = "misc/multiaddr" } parking_lot = "0.11.0" diff --git a/transports/wasm-ext/CHANGELOG.md b/transports/wasm-ext/CHANGELOG.md index 01f205eb592..4db7ba5e39c 100644 --- a/transports/wasm-ext/CHANGELOG.md +++ b/transports/wasm-ext/CHANGELOG.md @@ -1,3 +1,8 @@ +# 0.28.2 [2021-04-27] + +- Support dialing `Multiaddr` with `/p2p` protocol [PR + 2058](https://github.com/libp2p/rust-libp2p/pull/2058). + # 0.28.1 [2021-04-01] - Require at least js-sys v0.3.50 [PR @@ -45,4 +50,3 @@ - Updated dependencies. - Support `/dns` in the websocket implementation ([PR 1626](https://github.com/libp2p/rust-libp2p/pull/1626)) - diff --git a/transports/wasm-ext/Cargo.toml b/transports/wasm-ext/Cargo.toml index 4d314573555..4825256dce9 100644 --- a/transports/wasm-ext/Cargo.toml +++ b/transports/wasm-ext/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-wasm-ext" -version = "0.28.1" +version = "0.28.2" authors = ["Pierre Krieger "] edition = "2018" description = "Allows passing in an external transport in a WASM environment"