Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

Commit

Permalink
deps!: update stream types (#66)
Browse files Browse the repository at this point in the history 
libp2p streams are now explicit about the types of sync/sources they provide, showing that they are `AsyncGenerator`s and not just `AsyncIterable`s.

Refs: achingbrain/it-stream-types#45

BREAKING CHANGE: the type of the source/sink properties have changed
  • Loading branch information
@achingbrain
achingbrain committed Apr 28, 2023
1 parent 2ed9b66 commit 3772060
Show file tree
Hide file tree
Showing 7 changed files with 172 additions and 508 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/examples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ jobs:
working-directory: .
- name: Install dependencies
run: npm install
- name: Install Playwright
run: npx -y playwright install --with-deps
- name: Run tests
run: npm run test
env:
Expand Down
16 changes: 8 additions & 8 deletions examples/fetch-file-from-kubo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
"start": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"test": "npm run build && playwright test tests"
"test": "npm run build && test-browser-example tests"
},
"dependencies": {
"@chainsafe/libp2p-noise": "^11.0.0",
"@libp2p/webtransport": "../..",
"@multiformats/multiaddr": "^11.1.5",
"blockstore-core": "^3.0.0",
"ipfs-bitswap": "^15.0.0",
"libp2p": "^0.42.0",
"test-util-ipfs-example": "^1.0.2"
"@multiformats/multiaddr": "^12.1.2",
"blockstore-core": "^4.1.0",
"ipfs-bitswap": "^17.0.2",
"libp2p": "^0.44.0",
"multiformats": "^11.0.2"
},
"devDependencies": {
"@playwright/test": "^1.27.1",
"test-ipfs-example": "^1.0.0",
"typescript": "^4.6.4",
"vite": "^3.1.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/fetch-file-from-kubo/src/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ declare global {
window.fetchBtn.onclick = async () => {
const c = CID.parse(window.cidInput.value)
window.statusEl.hidden = false
const val = await bitswap.get(c)
const val = await bitswap.want(c)
window.statusEl.hidden = true

window.downloadEl.href = window.URL.createObjectURL(new Blob([val], { type: 'bytes' }))
Expand Down
19 changes: 8 additions & 11 deletions examples/fetch-file-from-kubo/tests/test.js → ...s/fetch-file-from-kubo/tests/test.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
/* eslint-disable no-console */
import { test, expect } from '@playwright/test'
import { playwright } from 'test-util-ipfs-example'
import { setup, expect } from 'test-ipfs-example/browser'
import { spawn, exec } from 'child_process'
import { existsSync } from 'fs'

// Setup
const play = test.extend({
...playwright.servers()
})
const test = setup()

async function spinUpGoLibp2p() {
if (!existsSync('../../go-libp2p-webtransport-server/main')) {
Expand Down Expand Up @@ -41,7 +38,7 @@ async function spinUpGoLibp2p() {
return { server, serverAddr }
}

play.describe('bundle ipfs with parceljs:', () => {
test.describe('bundle ipfs with parceljs:', () => {
// DOM
const connectBtn = '#connectBtn'
const connectAddr = '#peerInput'
Expand All @@ -51,23 +48,23 @@ play.describe('bundle ipfs with parceljs:', () => {
let serverAddr

// eslint-disable-next-line no-empty-pattern
play.beforeAll(async ({ }, testInfo) => {
test.beforeAll(async ({ }, testInfo) => {
testInfo.setTimeout(5 * 60_000)
const s = await spinUpGoLibp2p()
server = s.server
serverAddr = s.serverAddr
console.log('Server addr:', serverAddr)
}, {})

play.afterAll(() => {
test.afterAll(() => {
server.kill('SIGINT')
})

play.beforeEach(async ({ servers, page }) => {
await page.goto(`http://localhost:${servers[0].port}/`)
test.beforeEach(async ({ servers, page }) => {
await page.goto(servers[0].url)
})

play('should connect to a go-libp2p node over webtransport', async ({ page }) => {
test('should connect to a go-libp2p node over webtransport', async ({ page }) => {
await page.fill(connectAddr, serverAddr)
await page.click(connectBtn)

Expand Down
78 changes: 38 additions & 40 deletions go-libp2p-webtransport-server/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,51 @@ module github.com/libp2p/js-libp2p-webtransport/go-libp2p-webtransport-server/m/
go 1.19

require (
github.com/libp2p/go-libp2p v0.24.2
github.com/multiformats/go-multiaddr v0.8.0
github.com/libp2p/go-libp2p v0.27.1
github.com/multiformats/go-multiaddr v0.9.0
)

require (
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/cgroups v1.1.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
github.com/elastic/gosigar v0.14.2 // indirect
github.com/flynn/noise v1.0.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b // 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/huin/goupnp v1.1.0 // indirect
github.com/ipfs/go-cid v0.4.1 // 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.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.1 // indirect
github.com/koron/go-ssdp v0.0.3 // indirect
github.com/klauspost/compress v1.16.4 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/koron/go-ssdp v0.0.4 // 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-libp2p-asn-util v0.3.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.1 // indirect
github.com/libp2p/go-openssl v0.1.0 // 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.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/marten-seemann/webtransport-go v0.4.3 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-pointer v0.0.1 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/miekg/dns v1.1.50 // indirect
github.com/miekg/dns v1.1.53 // 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
Expand All @@ -63,35 +56,40 @@ require (
github.com/multiformats/go-base36 v0.2.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.7.0 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multicodec v0.8.1 // indirect
github.com/multiformats/go-multihash v0.2.1 // indirect
github.com/multiformats/go-multistream v0.3.3 // indirect
github.com/multiformats/go-multistream v0.4.1 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/onsi/ginkgo/v2 v2.5.1 // indirect
github.com/onsi/ginkgo/v2 v2.9.2 // indirect
github.com/opencontainers/runtime-spec v1.0.2 // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pkg/errors v0.9.1 // 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/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
github.com/quic-go/quic-go v0.33.0 // indirect
github.com/quic-go/webtransport-go v0.5.2 // indirect
github.com/raulk/go-watchdog v1.3.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/dig v1.15.0 // indirect
go.uber.org/fx v1.18.2 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/dig v1.16.1 // indirect
go.uber.org/fx v1.19.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.3.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.3.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/tools v0.3.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
nhooyr.io/websocket v1.8.7 // indirect
)
Loading

0 comments on commit 3772060

Please sign in to comment.