Review comments (libp2p#84)

* Review comments * address review from Marco * Tidy * Undo extends change * Tidy Co-authored-by: Chinmay Kousik <[email protected]>
maschad · Jan 23, 2023 · 08687c3 · 08687c3
1 parent 99e3b86
commit 08687c3
Show file tree

Hide file tree

Showing 10 changed files with 481 additions and 426 deletions.
diff --git a/examples/browser-to-server/index.js b/examples/browser-to-server/index.js
@@ -1,20 +1,21 @@
 import { createLibp2p } from 'libp2p'
-import { Noise } from '@chainsafe/libp2p-noise'
+import { noise } from '@chainsafe/libp2p-noise'
 import { multiaddr } from '@multiformats/multiaddr'
-import first from "it-first";
 import { pipe } from "it-pipe";
 import { fromString, toString } from "uint8arrays";
 import { webRTC } from 'js-libp2p-webrtc'
+import { pushable } from 'it-pushable';
 
 let stream;
 const output = document.getElementById('output')
 const sendSection = document.getElementById('send-section')
 const appendOutput = (line) => output.innerText += `${line}\n`
 const clean = (line) => line.replaceAll('\n', '')
+const sender = pushable()
 
 const node = await createLibp2p({
  transports: [webRTC()],
- connectionEncryption: [() => new Noise()],
+ connectionEncryption: [noise()],
 });
 
 await node.start()
@@ -28,12 +29,16 @@ window.connect.onclick = async () => {
  const ma = multiaddr(window.peer.value)
  appendOutput(`Dialing ${ma}`)
  stream = await node.dialProtocol(ma, ['/echo/1.0.0'])
+ pipe(sender, stream, async (src) => {
+ for await(const buf of src) {
+ const response = toString(buf.subarray())
+ appendOutput(`Received message '${clean(response)}'`)
+ }
+ })
 }
 
 window.send.onclick = async () => {
  const message = `${window.message.value}\n`
  appendOutput(`Sending message '${clean(message)}'`)
- const response = await pipe([fromString(message)], stream, async (source) => await first(source))
- const responseDecoded = toString(response.slice(0, response.length));
- appendOutput(`Received message '${clean(responseDecoded)}'`)
+ sender.push(fromString(message))
 }
diff --git a/examples/browser-to-server/package.json b/examples/browser-to-server/package.json
@@ -8,11 +8,11 @@
  "go-libp2p-server": "cd ../go-libp2p-server && go build && ./go-libp2p-server"
  },
  "dependencies": {
- "@chainsafe/libp2p-noise": "^9.0.0",
+ "@chainsafe/libp2p-noise": "^11.0.0",
  "@multiformats/multiaddr": "^11.0.5",
- "js-libp2p-webrtc": "github:little-bear-labs/js-libp2p-webrtc#libp2p-demo-2022",
+ "js-libp2p-webrtc": "../../",
  "it-pushable": "^3.1.0",
- "libp2p": "^0.40.0",
+ "libp2p": "^0.42.0",
  "vite": "^3.1.0"
  }
 }
diff --git a/examples/go-libp2p-server/go.mod b/examples/go-libp2p-server/go.mod
@@ -2,16 +2,16 @@ module github.com/little-bear-labs/js-libp2p/go-libp2p-server
 
 go 1.18
 
-replace github.com/libp2p/go-libp2p => github.com/ckousik/go-libp2p v0.23.3-0.20221029141116-67b7c6290b11
+replace github.com/libp2p/go-libp2p => github.com/ckousik/go-libp2p v0.24.3-0.20230114095059-115caff3ca87
 
 require github.com/libp2p/go-libp2p v0.23.2
 
 require (
  github.com/benbjohnson/clock v1.3.0 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/containerd/cgroups v1.0.4 // indirect
- github.com/coreos/go-systemd/v22 v22.4.0 // indirect
+ github.com/coreos/go-systemd/v22 v22.5.0 // indirect
  github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
  github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
  github.com/docker/go-units v0.5.0 // indirect
@@ -24,88 +24,90 @@ require (
  github.com/golang/mock v1.6.0 // indirect
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/google/gopacket v1.1.19 // indirect
- github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+ github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/gorilla/websocket v1.5.0 // indirect
  github.com/huin/goupnp v1.0.3 // indirect
  github.com/ipfs/go-cid v0.3.2 // indirect
  github.com/ipfs/go-log/v2 v2.5.1 // indirect
  github.com/jackpal/go-nat-pmp v1.0.2 // indirect
  github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
- github.com/klauspost/compress v1.15.10 // indirect
- github.com/klauspost/cpuid/v2 v2.1.1 // indirect
+ github.com/klauspost/compress v1.15.12 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.3 // indirect
  github.com/koron/go-ssdp v0.0.3 // indirect
  github.com/libp2p/go-buffer-pool v0.1.0 // indirect
  github.com/libp2p/go-cidranger v1.1.0 // indirect
  github.com/libp2p/go-flow-metrics v0.1.0 // indirect
  github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
- github.com/libp2p/go-msgio v0.2.0 // indirect
+ github.com/libp2p/go-msgio v0.3.0 // indirect
  github.com/libp2p/go-nat v0.1.0 // indirect
- github.com/libp2p/go-netroute v0.2.0 // indirect
- github.com/libp2p/go-openssl v0.1.0 // indirect
+ github.com/libp2p/go-netroute v0.2.1 // indirect
  github.com/libp2p/go-reuseport v0.2.0 // indirect
  github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
- github.com/lucas-clemente/quic-go v0.30.0 // indirect
+ github.com/lucas-clemente/quic-go v0.31.1 // indirect
+ github.com/marten-seemann/qpack v0.3.0 // indirect
  github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
  github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
  github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
- github.com/mattn/go-isatty v0.0.16 // indirect
- github.com/mattn/go-pointer v0.0.1 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/marten-seemann/webtransport-go v0.4.3 // indirect
+ github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/miekg/dns v1.1.50 // indirect
  github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
  github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
  github.com/minio/sha256-simd v1.0.0 // indirect
  github.com/mr-tron/base58 v1.2.0 // indirect
  github.com/multiformats/go-base32 v0.1.0 // indirect
- github.com/multiformats/go-base36 v0.1.0 // indirect
- github.com/multiformats/go-multiaddr v0.7.0 // indirect
+ github.com/multiformats/go-base36 v0.2.0 // indirect
+ github.com/multiformats/go-multiaddr v0.8.0 // indirect
  github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
  github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
  github.com/multiformats/go-multibase v0.1.1 // indirect
- github.com/multiformats/go-multicodec v0.6.0 // indirect
+ github.com/multiformats/go-multicodec v0.7.0 // indirect
  github.com/multiformats/go-multihash v0.2.1 // indirect
  github.com/multiformats/go-multistream v0.3.3 // indirect
- github.com/multiformats/go-varint v0.0.6 // indirect
- github.com/onsi/ginkgo/v2 v2.2.0 // indirect
+ github.com/multiformats/go-varint v0.0.7 // indirect
+ github.com/onsi/ginkgo/v2 v2.5.1 // indirect
  github.com/opencontainers/runtime-spec v1.0.2 // indirect
  github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
- github.com/pion/datachannel v1.5.2 // indirect
+ github.com/pion/datachannel v1.5.5 // indirect
  github.com/pion/dtls/v2 v2.1.5 // indirect
- github.com/pion/ice/v2 v2.2.6 // indirect
+ github.com/pion/ice/v2 v2.2.13 // indirect
  github.com/pion/interceptor v0.1.12 // indirect
  github.com/pion/logging v0.2.2 // indirect
  github.com/pion/mdns v0.0.5 // indirect
  github.com/pion/randutil v0.1.0 // indirect
  github.com/pion/rtcp v1.2.10 // indirect
  github.com/pion/rtp v1.7.13 // indirect
- github.com/pion/sctp v1.8.2 // indirect
+ github.com/pion/sctp v1.8.5 // indirect
  github.com/pion/sdp/v3 v3.0.6 // indirect
- github.com/pion/srtp/v2 v2.0.10 // indirect
+ github.com/pion/srtp/v2 v2.0.11 // indirect
  github.com/pion/stun v0.3.5 // indirect
- github.com/pion/transport v0.13.1 // indirect
- github.com/pion/turn/v2 v2.0.8 // indirect
+ github.com/pion/transport v0.14.1 // indirect
+ github.com/pion/turn/v2 v2.0.9 // indirect
  github.com/pion/udp v0.1.1 // indirect
- github.com/pion/webrtc/v3 v3.1.43 // indirect
+ github.com/pion/webrtc/v3 v3.1.50 // indirect
  github.com/pkg/errors v0.9.1 // indirect
- github.com/prometheus/client_golang v1.13.0 // indirect
- github.com/prometheus/client_model v0.2.0 // indirect
+ github.com/prometheus/client_golang v1.14.0 // indirect
+ github.com/prometheus/client_model v0.3.0 // indirect
  github.com/prometheus/common v0.37.0 // indirect
  github.com/prometheus/procfs v0.8.0 // indirect
  github.com/raulk/go-watchdog v1.3.0 // indirect
  github.com/rogpeppe/go-internal v1.9.0 // indirect
- github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
  github.com/spaolacci/murmur3 v1.1.0 // indirect
  go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/multierr v1.8.0 // indirect
- go.uber.org/zap v1.23.0 // indirect
- golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
- golang.org/x/exp v0.0.0-20220916125017-b168a2c6b86b // indirect
- golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
- golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5 // indirect
- golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
- golang.org/x/sys v0.0.0-20220913175220-63ea55921009 // indirect
- golang.org/x/tools v0.1.12 // indirect
+ go.uber.org/dig v1.15.0 // indirect
+ go.uber.org/fx v1.18.2 // indirect
+ go.uber.org/multierr v1.9.0 // indirect
+ go.uber.org/zap v1.24.0 // indirect
+ golang.org/x/crypto v0.5.0 // indirect
+ golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
+ golang.org/x/mod v0.7.0 // indirect
+ golang.org/x/net v0.5.0 // indirect
+ golang.org/x/sync v0.1.0 // indirect
+ golang.org/x/sys v0.4.0 // indirect
+ golang.org/x/text v0.6.0 // indirect
+ golang.org/x/tools v0.3.0 // indirect
  google.golang.org/protobuf v1.28.1 // indirect
  lukechampine.com/blake3 v1.1.7 // indirect
 )