Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions examples/express-server-over-libp2p/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
"test": "test-node-example test/*"
},
"dependencies": {
"@chainsafe/libp2p-noise": "^16.1.3",
"@chainsafe/libp2p-yamux": "^7.0.1",
"@chainsafe/libp2p-noise": "^17.0.0",
"@chainsafe/libp2p-yamux": "^8.0.0",
"@libp2p/http": "^1.0.0",
"@libp2p/http-server": "^1.0.0",
"@libp2p/tcp": "^10.1.13",
"@multiformats/multiaddr": "^12.4.0",
"@libp2p/tcp": "^11.0.4",
"@multiformats/multiaddr": "^13.0.1",
"express": "^5.1.0",
"libp2p": "^2.8.8"
"libp2p": "^3.0.5"
},
"devDependencies": {
"aegir": "^47.0.16",
"aegir": "^47.0.22",
"test-ipfs-example": "^1.3.3"
},
"private": true,
Expand Down
14 changes: 7 additions & 7 deletions examples/hono-server-over-libp2p/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"test": "test-node-example test/*"
},
"dependencies": {
"@chainsafe/libp2p-noise": "^16.1.3",
"@chainsafe/libp2p-yamux": "^7.0.1",
"@chainsafe/libp2p-noise": "^17.0.0",
"@chainsafe/libp2p-yamux": "^8.0.0",
"@libp2p/http": "^1.0.0",
"@libp2p/http-server": "^1.0.0",
"@libp2p/tcp": "^10.1.13",
"@multiformats/multiaddr": "^12.4.0",
"hono": "^4.7.10",
"libp2p": "^2.8.8"
"@libp2p/tcp": "^11.0.4",
"@multiformats/multiaddr": "^13.0.1",
"hono": "^4.9.9",
"libp2p": "^3.0.5"
},
"devDependencies": {
"aegir": "^47.0.16",
"aegir": "^47.0.22",
"test-ipfs-example": "^1.3.3"
},
"private": true,
Expand Down
12 changes: 6 additions & 6 deletions examples/libp2p-as-http-transport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"test": "test-node-example test/*"
},
"dependencies": {
"@chainsafe/libp2p-noise": "^16.1.3",
"@chainsafe/libp2p-yamux": "^7.0.1",
"@chainsafe/libp2p-noise": "^17.0.0",
"@chainsafe/libp2p-yamux": "^8.0.0",
"@libp2p/http": "^1.0.0",
"@libp2p/http-server": "^1.0.0",
"@libp2p/tcp": "^10.1.13",
"@multiformats/multiaddr": "^12.4.0",
"@libp2p/tcp": "^11.0.4",
"@multiformats/multiaddr": "^13.0.1",
"express": "^5.1.0",
"libp2p": "^2.8.8"
"libp2p": "^3.0.5"
},
"devDependencies": {
"aegir": "^47.0.16",
"aegir": "^47.0.22",
"test-ipfs-example": "^1.3.3"
},
"private": true,
Expand Down
6 changes: 3 additions & 3 deletions examples/libp2p-over-http-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
"dependencies": {
"@libp2p/http": "^1.0.0",
"@libp2p/http-server": "^1.0.0",
"@libp2p/http-ping": "^1.0.0",
"libp2p": "^2.8.8"
"@libp2p/http-server": "^1.0.0",
"libp2p": "^3.0.5"
},
"devDependencies": {
"aegir": "^47.0.16",
"aegir": "^47.0.22",
"test-ipfs-example": "^1.3.3"
},
"private": true,
Expand Down
4 changes: 2 additions & 2 deletions examples/peer-id-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"@libp2p/http": "^1.0.0",
"@libp2p/http-peer-id-auth": "^1.0.0",
"@libp2p/http-server": "^1.0.0",
"libp2p": "^2.8.8"
"libp2p": "^3.0.5"
},
"devDependencies": {
"aegir": "^47.0.16",
"aegir": "^47.0.22",
"test-ipfs-example": "^1.3.3"
},
"private": true,
Expand Down
26 changes: 13 additions & 13 deletions examples/serving-websites-from-web-browsers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@
"dep-check": "aegir dep-check"
},
"dependencies": {
"@chainsafe/libp2p-noise": "^16.1.3",
"@chainsafe/libp2p-yamux": "^7.0.1",
"@libp2p/circuit-relay-v2": "^3.2.14",
"@chainsafe/libp2p-noise": "^17.0.0",
"@chainsafe/libp2p-yamux": "^8.0.0",
"@libp2p/circuit-relay-v2": "^4.0.4",
"@libp2p/http": "^1.0.0",
"@libp2p/http-server": "^1.0.0",
"@libp2p/identify": "^3.0.32",
"@libp2p/ping": "^2.0.32",
"@libp2p/webrtc": "^5.2.15",
"@libp2p/websockets": "^9.2.13",
"@multiformats/multiaddr": "^12.4.0",
"@multiformats/multiaddr-matcher": "^2.0.1",
"it-byte-stream": "^2.0.2",
"libp2p": "^2.8.8"
"@libp2p/identify": "^4.0.4",
"@libp2p/ping": "^3.0.4",
"@libp2p/utils": "^7.0.4",
"@libp2p/webrtc": "^6.0.5",
"@libp2p/websockets": "^10.0.5",
"@multiformats/multiaddr": "^13.0.1",
"@multiformats/multiaddr-matcher": "^3.0.1",
"libp2p": "^3.0.5"
},
"devDependencies": {
"aegir": "^47.0.16",
"aegir": "^47.0.22",
"test-ipfs-example": "^1.3.3",
"vite": "^7.0.0"
"vite": "^7.1.8"
},
"private": true,
"type": "module"
Expand Down
2 changes: 1 addition & 1 deletion examples/serving-websites-from-web-browsers/src/proxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { circuitRelayServer, circuitRelayTransport } from '@libp2p/circuit-relay
import { HTTP_PROTOCOL } from '@libp2p/http'
import { identify } from '@libp2p/identify'
import { ping } from '@libp2p/ping'
import { byteStream } from '@libp2p/utils'
import { webRTC } from '@libp2p/webrtc'
import { webSockets } from '@libp2p/websockets'
import { multiaddr } from '@multiformats/multiaddr'
import { byteStream } from 'it-byte-stream'
import { createLibp2p } from 'libp2p'

const args = process.argv.slice(2)
Expand Down
12 changes: 6 additions & 6 deletions examples/websockets-over-libp2p/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"test": "test-node-example test/*"
},
"dependencies": {
"@chainsafe/libp2p-noise": "^16.1.3",
"@chainsafe/libp2p-yamux": "^7.0.1",
"@chainsafe/libp2p-noise": "^17.0.0",
"@chainsafe/libp2p-yamux": "^8.0.0",
"@libp2p/http": "^1.0.0",
"@libp2p/http-server": "^1.0.0",
"@libp2p/tcp": "^10.1.13",
"@multiformats/multiaddr": "^12.4.0",
"libp2p": "^2.8.8"
"@libp2p/tcp": "^11.0.4",
"@multiformats/multiaddr": "^13.0.1",
"libp2p": "^3.0.5"
},
"devDependencies": {
"aegir": "^47.0.16",
"aegir": "^47.0.22",
"test-ipfs-example": "^1.3.3"
},
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"private": true,
"scripts": {
"reset": "aegir run clean && aegir clean interop/node_modules packages/*/node_modules node_modules package-lock.json packages/*/package-lock.json interop/*/package-lock.json",
"reset": "aegir run clean && aegir clean examples/*/node_modules packages/*/node_modules node_modules package-lock.json examples/*/package-lock.json packages/*/package-lock.json",
"test": "aegir run test",
"test:node": "aegir run test:node",
"test:chrome": "aegir run test:chrome",
Expand Down
10 changes: 3 additions & 7 deletions packages/http-fetch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,12 @@
"dependencies": {
"@achingbrain/http-parser-js": "^0.5.9",
"@libp2p/http-utils": "^1.0.0",
"@libp2p/interface": "^2.10.2",
"it-byte-stream": "^2.0.2",
"@libp2p/interface": "^3.0.2",
"uint8arrays": "^5.1.0"
},
"devDependencies": {
"@libp2p/logger": "^5.1.18",
"aegir": "^47.0.16",
"it-drain": "^3.0.9",
"it-pair": "^2.0.6",
"sinon-ts": "^2.0.0"
"@libp2p/utils": "^7.0.4",
"aegir": "^47.0.22"
},
"sideEffects": false
}
34 changes: 20 additions & 14 deletions packages/http-fetch/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@
* socket.
*/

import { byteStream } from 'it-byte-stream'
import { readResponse } from './read-response.js'
import { sendRequest } from './send-request.js'
import type { ComponentLogger, Logger, Stream } from '@libp2p/interface'
import type { Logger, Stream } from '@libp2p/interface'

export interface FetchInit extends RequestInit {
logger: ComponentLogger

/**
* The maximum number of bytes that will be parsed as headers, defaults to
* 80KB
Expand All @@ -28,18 +25,27 @@ export interface SendRequestInit extends RequestInit {
maxHeaderSize?: number
}

export async function fetch (stream: Stream, resource: string | URL, init: FetchInit): Promise<Response> {
const log = init.logger.forComponent('libp2p:http:fetch')
export async function fetch (stream: Stream, resource: string | URL, init: FetchInit = {}): Promise<Response> {
const log = stream.log.newScope('http-fetch')
resource = typeof resource === 'string' ? new URL(resource) : resource
const bytes = byteStream(stream)

await sendRequest(bytes, resource, {
...init,
log
})
const [
response
] = await Promise.all([
readResponse(stream, resource, {
...init,
log
}),
sendRequest(stream, resource, {
...init,
log
})
])

return readResponse(bytes, resource, {
...init,
log
// close our writable end we've sent the request
await stream.close({
signal: init.signal ?? undefined
})

return response
}
Loading