From b482833c3cfd483ff519263a30d41cc7e6d3953a Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Fri, 6 Nov 2020 09:46:47 +0100 Subject: [PATCH] Fix the multiaddr parsing in the JS snippet (#1824) * Fix the multiaddr parsing in the JS snippet * Update CHANGELOG --- transports/wasm-ext/CHANGELOG.md | 1 + transports/wasm-ext/src/websockets.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/transports/wasm-ext/CHANGELOG.md b/transports/wasm-ext/CHANGELOG.md index 0be05d41..33f3bfae 100644 --- a/transports/wasm-ext/CHANGELOG.md +++ b/transports/wasm-ext/CHANGELOG.md @@ -1,5 +1,6 @@ # 0.24.0 [unreleased] +- Fix the WebSocket implementation parsing `x-parity-ws` multiaddresses as `x-parity-wss`. - Update dependencies. # 0.23.0 [2020-10-16] diff --git a/transports/wasm-ext/src/websockets.js b/transports/wasm-ext/src/websockets.js index 7b5fcbf1..bc608c66 100644 --- a/transports/wasm-ext/src/websockets.js +++ b/transports/wasm-ext/src/websockets.js @@ -34,7 +34,7 @@ const multiaddr_to_ws = (addr) => { 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] == 'x-parity-ws') { + if (parsed[4] == 'ws' || parsed[4].startsWith('x-parity-ws/')) { proto = 'ws'; } let url = decodeURIComponent(parsed[5] || parsed[6] || '');