This repository was archived by the owner on Jul 21, 2023. It is now read-only.
File tree 3 files changed +16
-3
lines changed
3 files changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -21,6 +21,18 @@ export function all (multiaddrs: Multiaddr[]) {
21
21
} )
22
22
}
23
23
24
+ export function wss ( multiaddrs : Multiaddr [ ] ) {
25
+ return multiaddrs . filter ( ( ma ) => {
26
+ if ( ma . protoCodes ( ) . includes ( CODE_CIRCUIT ) ) {
27
+ return false
28
+ }
29
+
30
+ const testMa = ma . decapsulateCode ( CODE_P2P )
31
+
32
+ return mafmt . WebSocketsSecure . matches ( testMa )
33
+ } )
34
+ }
35
+
24
36
export function dnsWss ( multiaddrs : Multiaddr [ ] ) {
25
37
return multiaddrs . filter ( ( ma ) => {
26
38
if ( ma . protoCodes ( ) . includes ( CODE_CIRCUIT ) ) {
Original file line number Diff line number Diff line change @@ -133,7 +133,7 @@ class WebSockets implements Transport {
133
133
134
134
// Browser
135
135
if ( isBrowser || isWebWorker ) {
136
- return filters . dnsWss ( multiaddrs )
136
+ return filters . wss ( multiaddrs )
137
137
}
138
138
139
139
return filters . all ( multiaddrs )
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ describe('libp2p-websockets', () => {
40
40
expect ( res [ 0 ] . subarray ( ) ) . to . equalBytes ( data )
41
41
} )
42
42
43
- it ( 'should filter out no DNS websocket addresses' , function ( ) {
43
+ it ( 'should filter out no wss websocket addresses' , function ( ) {
44
44
const ma1 = multiaddr ( '/ip4/127.0.0.1/tcp/80/ws' )
45
45
const ma2 = multiaddr ( '/ip4/127.0.0.1/tcp/443/wss' )
46
46
const ma3 = multiaddr ( '/ip6/::1/tcp/80/ws' )
@@ -49,7 +49,8 @@ describe('libp2p-websockets', () => {
49
49
const valid = ws . filter ( [ ma1 , ma2 , ma3 , ma4 ] )
50
50
51
51
if ( isBrowser || isWebWorker ) {
52
- expect ( valid . length ) . to . equal ( 0 )
52
+ expect ( valid . length ) . to . equal ( 2 )
53
+ expect ( valid ) . to . deep . equal ( [ ma2 , ma4 ] )
53
54
} else {
54
55
expect ( valid . length ) . to . equal ( 4 )
55
56
}
You can’t perform that action at this time.
0 commit comments