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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"docs:no-publish": "aegir docs --publish false"
},
"devDependencies": {
"aegir": "^45.0.1",
"aegir": "^46.0.0",
"npm-run-all": "^4.1.5",
"patch-package": "^8.0.0",
"rimraf": "^6.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
},
"devDependencies": {
"@libp2p/crypto": "^5.0.1",
"aegir": "^45.0.1",
"aegir": "^46.0.0",
"body-parser": "^1.20.3",
"it-all": "^3.0.6",
"wherearewe": "^2.0.1"
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { peerIdFromString } from '@libp2p/peer-id'
import { multiaddr } from '@multiformats/multiaddr'
import { anySignal } from 'any-signal'
import toIt from 'browser-readablestream-to-it'
import { unmarshalIPNSRecord, type IPNSRecord, marshalIPNSRecord, multihashToIPNSRoutingKey } from 'ipns'
import { unmarshalIPNSRecord, marshalIPNSRecord, multihashToIPNSRoutingKey } from 'ipns'
import { ipnsValidator } from 'ipns/validator'
import { parse as ndjson } from 'it-ndjson'
import defer from 'p-defer'
Expand All @@ -14,6 +14,7 @@ import { DelegatedRoutingV1HttpApiClientContentRouting, DelegatedRoutingV1HttpAp
import type { DelegatedRoutingV1HttpApiClient, DelegatedRoutingV1HttpApiClientInit, GetProvidersOptions, GetPeersOptions, GetIPNSOptions, PeerRecord } from './index.js'
import type { ContentRouting, PeerRouting, AbortOptions, PeerId } from '@libp2p/interface'
import type { Multiaddr } from '@multiformats/multiaddr'
import type { IPNSRecord } from 'ipns'
import type { CID } from 'multiformats'

const log = logger('delegated-routing-v1-http-api-client')
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/routings.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { type ContentRouting, type PeerRouting, type AbortOptions, type PeerId, type PeerInfo, NotFoundError } from '@libp2p/interface'
import { NotFoundError } from '@libp2p/interface'
import { marshalIPNSRecord, multihashFromIPNSRoutingKey, unmarshalIPNSRecord } from 'ipns'
import first from 'it-first'
import map from 'it-map'
import { CID } from 'multiformats/cid'
import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
import type { DelegatedRoutingV1HttpApiClient } from './index.js'
import type { ContentRouting, PeerRouting, AbortOptions, PeerId, PeerInfo } from '@libp2p/interface'

const IPNS_PREFIX = uint8ArrayFromString('/ipns/')

Expand Down
3 changes: 2 additions & 1 deletion packages/client/test/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import { expect } from 'aegir/chai'
import { createIPNSRecord, marshalIPNSRecord } from 'ipns'
import all from 'it-all'
import { CID } from 'multiformats/cid'
import { createDelegatedRoutingV1HttpApiClient, type DelegatedRoutingV1HttpApiClient } from '../src/index.js'
import { createDelegatedRoutingV1HttpApiClient } from '../src/index.js'
import { itBrowser } from './fixtures/it.js'
import type { DelegatedRoutingV1HttpApiClient } from '../src/index.js'

if (process.env.ECHO_SERVER == null) {
throw new Error('Echo server not configured correctly')
Expand Down
3 changes: 2 additions & 1 deletion packages/client/test/routings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import all from 'it-all'
import { CID } from 'multiformats/cid'
import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
import { createDelegatedRoutingV1HttpApiClient, type DelegatedRoutingV1HttpApiClient } from '../src/index.js'
import { createDelegatedRoutingV1HttpApiClient } from '../src/index.js'
import type { DelegatedRoutingV1HttpApiClient } from '../src/index.js'
import type { PeerRouting, ContentRouting } from '@libp2p/interface'

const serverUrl = process.env.ECHO_SERVER
Expand Down
2 changes: 1 addition & 1 deletion packages/interop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"@libp2p/identify": "^3.0.1",
"@libp2p/interface": "^2.0.1",
"@libp2p/kad-dht": "^14.0.1",
"aegir": "^45.0.1",
"aegir": "^46.0.0",
"fastify": "^5.0.0",
"helia": "^5.1.0",
"ipns": "^10.0.0",
Expand Down
6 changes: 4 additions & 2 deletions packages/interop/test/fixtures/create-helia.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { identify } from '@libp2p/identify'
import { kadDHT, removePublicAddressesMapper, type KadDHT } from '@libp2p/kad-dht'
import { createHelia as createNode, type HeliaInit, type HeliaLibp2p } from 'helia'
import { kadDHT, removePublicAddressesMapper } from '@libp2p/kad-dht'
import { createHelia as createNode } from 'helia'
import { ipnsSelector } from 'ipns/selector'
import { ipnsValidator } from 'ipns/validator'
import type { Libp2p } from '@libp2p/interface'
import type { KadDHT } from '@libp2p/kad-dht'
import type { HeliaInit, HeliaLibp2p } from 'helia'

export async function createHelia (init?: Partial<HeliaInit>): Promise<HeliaLibp2p<Libp2p<{ dht: KadDHT }>>> {
const helia = await createNode({
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"@libp2p/crypto": "^5.0.1",
"@multiformats/multiaddr": "^12.3.1",
"@types/sinon": "^17.0.3",
"aegir": "^45.0.1",
"aegir": "^46.0.0",
"sinon": "^19.0.2",
"sinon-ts": "^2.0.0"
}
Expand Down
6 changes: 2 additions & 4 deletions packages/server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@
*/

import cors from '@fastify/cors'
import fastify, {
type FastifyListenOptions,
type FastifyInstance
} from 'fastify'
import fastify from 'fastify'
import routes from './routes/index.js'
import type { Helia } from '@helia/interface'
import type { FastifyListenOptions, FastifyInstance } from 'fastify'

export interface ServerInit {
fastify?: FastifyInstance
Expand Down