Skip to content
This repository was archived by the owner on Jun 19, 2023. It is now read-only.

Commit 08687c3

Browse files
MarcoPolockousik
MarcoPolo
and
ckousik
authored
Review comments (#84)
* Review comments * address review from Marco * Tidy * Undo extends change * Tidy Co-authored-by: Chinmay Kousik <[email protected]>
1 parent 99e3b86 commit 08687c3

File tree

10 files changed

+481
-426
lines changed

10 files changed

+481
-426
lines changed

‎examples/browser-to-server/index.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
import { createLibp2p } from 'libp2p'
2-
import { Noise } from '@chainsafe/libp2p-noise'
2+
import { noise } from '@chainsafe/libp2p-noise'
33
import { multiaddr } from '@multiformats/multiaddr'
4-
import first from "it-first";
54
import { pipe } from "it-pipe";
65
import { fromString, toString } from "uint8arrays";
76
import { webRTC } from 'js-libp2p-webrtc'
7+
import { pushable } from 'it-pushable';
88

99
let stream;
1010
const output = document.getElementById('output')
1111
const sendSection = document.getElementById('send-section')
1212
const appendOutput = (line) => output.innerText += `${line}\n`
1313
const clean = (line) => line.replaceAll('\n', '')
14+
const sender = pushable()
1415

1516
const node = await createLibp2p({
1617
transports: [webRTC()],
17-
connectionEncryption: [() => new Noise()],
18+
connectionEncryption: [noise()],
1819
});
1920

2021
await node.start()
@@ -28,12 +29,16 @@ window.connect.onclick = async () => {
2829
const ma = multiaddr(window.peer.value)
2930
appendOutput(`Dialing ${ma}`)
3031
stream = await node.dialProtocol(ma, ['/echo/1.0.0'])
32+
pipe(sender, stream, async (src) => {
33+
for await(const buf of src) {
34+
const response = toString(buf.subarray())
35+
appendOutput(`Received message '${clean(response)}'`)
36+
}
37+
})
3138
}
3239

3340
window.send.onclick = async () => {
3441
const message = `${window.message.value}\n`
3542
appendOutput(`Sending message '${clean(message)}'`)
36-
const response = await pipe([fromString(message)], stream, async (source) => await first(source))
37-
const responseDecoded = toString(response.slice(0, response.length));
38-
appendOutput(`Received message '${clean(responseDecoded)}'`)
43+
sender.push(fromString(message))
3944
}

‎examples/browser-to-server/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"go-libp2p-server": "cd ../go-libp2p-server && go build && ./go-libp2p-server"
99
},
1010
"dependencies": {
11-
"@chainsafe/libp2p-noise": "^9.0.0",
11+
"@chainsafe/libp2p-noise": "^11.0.0",
1212
"@multiformats/multiaddr": "^11.0.5",
13-
"js-libp2p-webrtc": "github:little-bear-labs/js-libp2p-webrtc#libp2p-demo-2022",
13+
"js-libp2p-webrtc": "../../",
1414
"it-pushable": "^3.1.0",
15-
"libp2p": "^0.40.0",
15+
"libp2p": "^0.42.0",
1616
"vite": "^3.1.0"
1717
}
1818
}

‎examples/go-libp2p-server/go.mod

+39-37
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ module github.com/little-bear-labs/js-libp2p/go-libp2p-server
22

33
go 1.18
44

5-
replace github.com/libp2p/go-libp2p => github.com/ckousik/go-libp2p v0.23.3-0.20221029141116-67b7c6290b11
5+
replace github.com/libp2p/go-libp2p => github.com/ckousik/go-libp2p v0.24.3-0.20230114095059-115caff3ca87
66

77
require github.com/libp2p/go-libp2p v0.23.2
88

99
require (
1010
github.com/benbjohnson/clock v1.3.0 // indirect
1111
github.com/beorn7/perks v1.0.1 // indirect
12-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
12+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1313
github.com/containerd/cgroups v1.0.4 // indirect
14-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
14+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
1515
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
1616
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
1717
github.com/docker/go-units v0.5.0 // indirect
@@ -24,88 +24,90 @@ require (
2424
github.com/golang/mock v1.6.0 // indirect
2525
github.com/golang/protobuf v1.5.2 // indirect
2626
github.com/google/gopacket v1.1.19 // indirect
27-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
27+
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
2828
github.com/google/uuid v1.3.0 // indirect
2929
github.com/gorilla/websocket v1.5.0 // indirect
3030
github.com/huin/goupnp v1.0.3 // indirect
3131
github.com/ipfs/go-cid v0.3.2 // indirect
3232
github.com/ipfs/go-log/v2 v2.5.1 // indirect
3333
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
3434
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
35-
github.com/klauspost/compress v1.15.10 // indirect
36-
github.com/klauspost/cpuid/v2 v2.1.1 // indirect
35+
github.com/klauspost/compress v1.15.12 // indirect
36+
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
3737
github.com/koron/go-ssdp v0.0.3 // indirect
3838
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
3939
github.com/libp2p/go-cidranger v1.1.0 // indirect
4040
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
4141
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
42-
github.com/libp2p/go-msgio v0.2.0 // indirect
42+
github.com/libp2p/go-msgio v0.3.0 // indirect
4343
github.com/libp2p/go-nat v0.1.0 // indirect
44-
github.com/libp2p/go-netroute v0.2.0 // indirect
45-
github.com/libp2p/go-openssl v0.1.0 // indirect
44+
github.com/libp2p/go-netroute v0.2.1 // indirect
4645
github.com/libp2p/go-reuseport v0.2.0 // indirect
4746
github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
48-
github.com/lucas-clemente/quic-go v0.30.0 // indirect
47+
github.com/lucas-clemente/quic-go v0.31.1 // indirect
48+
github.com/marten-seemann/qpack v0.3.0 // indirect
4949
github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
5050
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
5151
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
52-
github.com/mattn/go-isatty v0.0.16 // indirect
53-
github.com/mattn/go-pointer v0.0.1 // indirect
54-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
52+
github.com/marten-seemann/webtransport-go v0.4.3 // indirect
53+
github.com/mattn/go-isatty v0.0.17 // indirect
54+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5555
github.com/miekg/dns v1.1.50 // indirect
5656
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
5757
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
5858
github.com/minio/sha256-simd v1.0.0 // indirect
5959
github.com/mr-tron/base58 v1.2.0 // indirect
6060
github.com/multiformats/go-base32 v0.1.0 // indirect
61-
github.com/multiformats/go-base36 v0.1.0 // indirect
62-
github.com/multiformats/go-multiaddr v0.7.0 // indirect
61+
github.com/multiformats/go-base36 v0.2.0 // indirect
62+
github.com/multiformats/go-multiaddr v0.8.0 // indirect
6363
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
6464
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
6565
github.com/multiformats/go-multibase v0.1.1 // indirect
66-
github.com/multiformats/go-multicodec v0.6.0 // indirect
66+
github.com/multiformats/go-multicodec v0.7.0 // indirect
6767
github.com/multiformats/go-multihash v0.2.1 // indirect
6868
github.com/multiformats/go-multistream v0.3.3 // indirect
69-
github.com/multiformats/go-varint v0.0.6 // indirect
70-
github.com/onsi/ginkgo/v2 v2.2.0 // indirect
69+
github.com/multiformats/go-varint v0.0.7 // indirect
70+
github.com/onsi/ginkgo/v2 v2.5.1 // indirect
7171
github.com/opencontainers/runtime-spec v1.0.2 // indirect
7272
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
73-
github.com/pion/datachannel v1.5.2 // indirect
73+
github.com/pion/datachannel v1.5.5 // indirect
7474
github.com/pion/dtls/v2 v2.1.5 // indirect
75-
github.com/pion/ice/v2 v2.2.6 // indirect
75+
github.com/pion/ice/v2 v2.2.13 // indirect
7676
github.com/pion/interceptor v0.1.12 // indirect
7777
github.com/pion/logging v0.2.2 // indirect
7878
github.com/pion/mdns v0.0.5 // indirect
7979
github.com/pion/randutil v0.1.0 // indirect
8080
github.com/pion/rtcp v1.2.10 // indirect
8181
github.com/pion/rtp v1.7.13 // indirect
82-
github.com/pion/sctp v1.8.2 // indirect
82+
github.com/pion/sctp v1.8.5 // indirect
8383
github.com/pion/sdp/v3 v3.0.6 // indirect
84-
github.com/pion/srtp/v2 v2.0.10 // indirect
84+
github.com/pion/srtp/v2 v2.0.11 // indirect
8585
github.com/pion/stun v0.3.5 // indirect
86-
github.com/pion/transport v0.13.1 // indirect
87-
github.com/pion/turn/v2 v2.0.8 // indirect
86+
github.com/pion/transport v0.14.1 // indirect
87+
github.com/pion/turn/v2 v2.0.9 // indirect
8888
github.com/pion/udp v0.1.1 // indirect
89-
github.com/pion/webrtc/v3 v3.1.43 // indirect
89+
github.com/pion/webrtc/v3 v3.1.50 // indirect
9090
github.com/pkg/errors v0.9.1 // indirect
91-
github.com/prometheus/client_golang v1.13.0 // indirect
92-
github.com/prometheus/client_model v0.2.0 // indirect
91+
github.com/prometheus/client_golang v1.14.0 // indirect
92+
github.com/prometheus/client_model v0.3.0 // indirect
9393
github.com/prometheus/common v0.37.0 // indirect
9494
github.com/prometheus/procfs v0.8.0 // indirect
9595
github.com/raulk/go-watchdog v1.3.0 // indirect
9696
github.com/rogpeppe/go-internal v1.9.0 // indirect
97-
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
9897
github.com/spaolacci/murmur3 v1.1.0 // indirect
9998
go.uber.org/atomic v1.10.0 // indirect
100-
go.uber.org/multierr v1.8.0 // indirect
101-
go.uber.org/zap v1.23.0 // indirect
102-
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
103-
golang.org/x/exp v0.0.0-20220916125017-b168a2c6b86b // indirect
104-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
105-
golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5 // indirect
106-
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
107-
golang.org/x/sys v0.0.0-20220913175220-63ea55921009 // indirect
108-
golang.org/x/tools v0.1.12 // indirect
99+
go.uber.org/dig v1.15.0 // indirect
100+
go.uber.org/fx v1.18.2 // indirect
101+
go.uber.org/multierr v1.9.0 // indirect
102+
go.uber.org/zap v1.24.0 // indirect
103+
golang.org/x/crypto v0.5.0 // indirect
104+
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
105+
golang.org/x/mod v0.7.0 // indirect
106+
golang.org/x/net v0.5.0 // indirect
107+
golang.org/x/sync v0.1.0 // indirect
108+
golang.org/x/sys v0.4.0 // indirect
109+
golang.org/x/text v0.6.0 // indirect
110+
golang.org/x/tools v0.3.0 // indirect
109111
google.golang.org/protobuf v1.28.1 // indirect
110112
lukechampine.com/blake3 v1.1.7 // indirect
111113
)

0 commit comments

Comments
 (0)