diff --git a/doc/package.json b/doc/package.json index 0251b86486..a85aaffc77 100644 --- a/doc/package.json +++ b/doc/package.json @@ -17,7 +17,7 @@ "doc-check": "aegir doc-check" }, "devDependencies": { - "aegir": "^47.0.22" + "aegir": "^48.0.11" }, "private": true } diff --git a/interop/package.json b/interop/package.json index ab9ec3a501..fa05fa782d 100644 --- a/interop/package.json +++ b/interop/package.json @@ -24,7 +24,7 @@ "@libp2p/websockets": "^10.1.13", "@libp2p/webtransport": "^6.0.27", "@multiformats/multiaddr": "^13.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "libp2p": "^3.3.2", "p-event": "^7.0.0", "redis": "^4.7.1" diff --git a/package.json b/package.json index df4aa9725a..5d5bcd46ba 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "docs:no-publish": "aegir docs --publish false -- --exclude interop --exclude doc" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "npm-run-all": "^4.1.5" }, "workspaces": [ @@ -48,7 +48,6 @@ "packages/*" ], "overrides": { - "playwright-core": "1.58.0", "@multiformats/multiaddr": "13.0.1" } } diff --git a/packages/config/package.json b/packages/config/package.json index 5c0e639911..bfc968cc4b 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -47,7 +47,7 @@ "interface-datastore": "^9.0.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "datastore-core": "^11.0.1" }, "sideEffects": false diff --git a/packages/config/test/load-private-key.spec.ts b/packages/config/test/load-private-key.spec.ts index 3407773ed8..1448e5e707 100644 --- a/packages/config/test/load-private-key.spec.ts +++ b/packages/config/test/load-private-key.spec.ts @@ -3,7 +3,7 @@ import { keychain } from '@libp2p/keychain' import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core' -import { loadOrCreateSelfKey } from '../src/index.js' +import { loadOrCreateSelfKey } from '../src/index.ts' describe('load-private-key', () => { it('should load a private key', async () => { diff --git a/packages/connection-encrypter-plaintext/package.json b/packages/connection-encrypter-plaintext/package.json index fcab35117f..a0d8c321fb 100644 --- a/packages/connection-encrypter-plaintext/package.json +++ b/packages/connection-encrypter-plaintext/package.json @@ -52,12 +52,12 @@ "@libp2p/utils": "^7.2.1", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/crypto": "^5.1.18", "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "protons": "^8.1.1", "sinon": "^21.0.0" }, diff --git a/packages/connection-encrypter-plaintext/test/index.spec.ts b/packages/connection-encrypter-plaintext/test/index.spec.ts index 1bab131283..4b86c9382d 100644 --- a/packages/connection-encrypter-plaintext/test/index.spec.ts +++ b/packages/connection-encrypter-plaintext/test/index.spec.ts @@ -4,7 +4,7 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { streamPair } from '@libp2p/utils' import { expect } from 'aegir/chai' import sinon from 'sinon' -import { plaintext } from '../src/index.js' +import { plaintext } from '../src/index.ts' import type { ConnectionEncrypter, PeerId } from '@libp2p/interface' describe('plaintext', () => { diff --git a/packages/connection-encrypter-tls/package.json b/packages/connection-encrypter-tls/package.json index 592a911e6f..a9c400851e 100644 --- a/packages/connection-encrypter-tls/package.json +++ b/packages/connection-encrypter-tls/package.json @@ -76,11 +76,11 @@ "protons-runtime": "^6.0.1", "reflect-metadata": "^0.2.2", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "protons": "^8.1.1", "sinon": "^21.0.0", "sinon-ts": "^2.0.0" diff --git a/packages/connection-encrypter-tls/src/utils.ts b/packages/connection-encrypter-tls/src/utils.ts index 3b7bc385ac..a11536b8f3 100644 --- a/packages/connection-encrypter-tls/src/utils.ts +++ b/packages/connection-encrypter-tls/src/utils.ts @@ -16,6 +16,7 @@ import { Uint8ArrayList } from 'uint8arraylist' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' import { InvalidCertificateError } from './errors.ts' import { KeyType, PublicKey } from './pb/index.ts' import type { PeerId, PublicKey as Libp2pPublicKey, Logger, PrivateKey, AbortOptions, MessageStream, StreamCloseEvent } from '@libp2p/interface' @@ -34,7 +35,7 @@ const CERT_VALIDITY_PERIOD_TO = 100 * 365 * 24 * 60 * 60 * 1000 // ~100 years export async function verifyPeerCertificate (rawCertificate: Uint8Array, expectedPeerId?: PeerId, log?: Logger): Promise { const now = Date.now() - const x509Cert = new x509.X509Certificate(rawCertificate) + const x509Cert = new x509.X509Certificate(withArrayBuffer(rawCertificate)) if (x509Cert.notBefore.getTime() > now) { log?.error('the certificate was not valid yet') diff --git a/packages/connection-encrypter-tls/test/index.spec.ts b/packages/connection-encrypter-tls/test/index.spec.ts index 030417797b..3b7fc971df 100644 --- a/packages/connection-encrypter-tls/test/index.spec.ts +++ b/packages/connection-encrypter-tls/test/index.spec.ts @@ -5,7 +5,7 @@ import { multiaddrConnectionPair, streamPair } from '@libp2p/utils' import { expect } from 'aegir/chai' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { tls } from '../src/index.js' +import { tls } from '../src/index.ts' import type { StreamMuxerFactory, ConnectionEncrypter, PeerId, Upgrader } from '@libp2p/interface' describe('tls', () => { diff --git a/packages/connection-encrypter-tls/test/utils.spec.ts b/packages/connection-encrypter-tls/test/utils.spec.ts index e9612fc0c4..e06e8f6ba0 100644 --- a/packages/connection-encrypter-tls/test/utils.spec.ts +++ b/packages/connection-encrypter-tls/test/utils.spec.ts @@ -8,7 +8,7 @@ import { expect } from 'aegir/chai' import { pEvent } from 'p-event' import { stubInterface } from 'sinon-ts' import { Uint8ArrayList } from 'uint8arraylist' -import { toMessageStream, toNodeDuplex, verifyPeerCertificate } from '../src/utils.js' +import { toMessageStream, toNodeDuplex, verifyPeerCertificate } from '../src/utils.ts' import * as testVectors from './fixtures/test-vectors.ts' const crypto = new Crypto() diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 561d1b422b..9d46dd364c 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -96,11 +96,11 @@ "multiformats": "^13.4.0", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@types/mocha": "^10.0.10", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "asn1js": "^3.0.6", "benchmark": "^2.1.4", "protons": "^8.1.1" @@ -111,8 +111,7 @@ "./dist/src/keys/ecdh/index.js": "./dist/src/keys/ecdh/index.browser.js", "./dist/src/keys/ed25519/index.js": "./dist/src/keys/ed25519/index.browser.js", "./dist/src/keys/rsa/index.js": "./dist/src/keys/rsa/index.browser.js", - "./dist/src/keys/secp256k1/index.js": "./dist/src/keys/secp256k1/index.browser.js", - "./dist/src/webcrypto/webcrypto.js": "./dist/src/webcrypto/webcrypto.browser.js" + "./dist/src/keys/secp256k1/index.js": "./dist/src/keys/secp256k1/index.browser.js" }, "sideEffects": false } diff --git a/packages/crypto/src/ciphers/aes-gcm.browser.ts b/packages/crypto/src/ciphers/aes-gcm.browser.ts index 40307f6b67..4e7036fbf2 100644 --- a/packages/crypto/src/ciphers/aes-gcm.browser.ts +++ b/packages/crypto/src/ciphers/aes-gcm.browser.ts @@ -1,6 +1,7 @@ import { concat } from 'uint8arrays/concat' import { fromString } from 'uint8arrays/from-string' -import webcrypto from '../webcrypto/index.js' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' +import webcrypto from '../webcrypto/index.ts' import type { CreateAESCipherOptions, AESCipher } from './interface.ts' // WebKit on Linux does not support deriving a key from an empty PBKDF2 key. @@ -53,7 +54,7 @@ export function create (opts?: CreateAESCipherOptions): AESCipher { cryptoKey = await crypto.subtle.importKey('jwk', derivedEmptyPasswordKey, { name: 'AES-GCM' }, true, ['encrypt']) try { const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } } - const runtimeDerivedEmptyPassword = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']) + const runtimeDerivedEmptyPassword = await crypto.subtle.importKey('raw', withArrayBuffer(password), { name: 'PBKDF2' }, false, ['deriveKey']) cryptoKey = await crypto.subtle.deriveKey(deriveParams, runtimeDerivedEmptyPassword, { name: algorithm, length: keyLength }, true, ['encrypt']) } catch { cryptoKey = await crypto.subtle.importKey('jwk', derivedEmptyPasswordKey, { name: 'AES-GCM' }, true, ['encrypt']) @@ -61,12 +62,12 @@ export function create (opts?: CreateAESCipherOptions): AESCipher { } else { // Derive a key using PBKDF2. const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } } - const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']) + const rawKey = await crypto.subtle.importKey('raw', withArrayBuffer(password), { name: 'PBKDF2' }, false, ['deriveKey']) cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['encrypt']) } // Encrypt the string. - const ciphertext = await crypto.subtle.encrypt(aesGcm, cryptoKey, data) + const ciphertext = await crypto.subtle.encrypt(aesGcm, cryptoKey, withArrayBuffer(data)) return concat([salt, aesGcm.iv, new Uint8Array(ciphertext)]) } @@ -90,7 +91,7 @@ export function create (opts?: CreateAESCipherOptions): AESCipher { if (password.length === 0) { try { const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } } - const runtimeDerivedEmptyPassword = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']) + const runtimeDerivedEmptyPassword = await crypto.subtle.importKey('raw', withArrayBuffer(password), { name: 'PBKDF2' }, false, ['deriveKey']) cryptoKey = await crypto.subtle.deriveKey(deriveParams, runtimeDerivedEmptyPassword, { name: algorithm, length: keyLength }, true, ['decrypt']) } catch { cryptoKey = await crypto.subtle.importKey('jwk', derivedEmptyPasswordKey, { name: 'AES-GCM' }, true, ['decrypt']) @@ -98,12 +99,12 @@ export function create (opts?: CreateAESCipherOptions): AESCipher { } else { // Derive the key using PBKDF2. const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } } - const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']) + const rawKey = await crypto.subtle.importKey('raw', withArrayBuffer(password), { name: 'PBKDF2' }, false, ['deriveKey']) cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['decrypt']) } // Decrypt the string. - const plaintext = await crypto.subtle.decrypt(aesGcm, cryptoKey, ciphertext) + const plaintext = await crypto.subtle.decrypt(aesGcm, cryptoKey, withArrayBuffer(ciphertext)) return new Uint8Array(plaintext) } diff --git a/packages/crypto/src/hmac/index.browser.ts b/packages/crypto/src/hmac/index.browser.ts index ea116f9c49..9452b725d8 100644 --- a/packages/crypto/src/hmac/index.browser.ts +++ b/packages/crypto/src/hmac/index.browser.ts @@ -1,4 +1,5 @@ -import webcrypto from '../webcrypto/index.js' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' +import webcrypto from '../webcrypto/index.ts' import lengths from './lengths.ts' const hashTypes = { @@ -8,7 +9,7 @@ const hashTypes = { } const sign = async (key: CryptoKey, data: Uint8Array): Promise => { - const buf = await webcrypto.get().subtle.sign({ name: 'HMAC' }, key, data) + const buf = await webcrypto.get().subtle.sign({ name: 'HMAC' }, key, withArrayBuffer(data)) return new Uint8Array(buf, 0, buf.byteLength) } @@ -17,7 +18,7 @@ export async function create (hashType: 'SHA1' | 'SHA256' | 'SHA512', secret: Ui const key = await webcrypto.get().subtle.importKey( 'raw', - secret, + withArrayBuffer(secret), { name: 'HMAC', hash: { name: hash } diff --git a/packages/crypto/src/keys/ecdh/index.browser.ts b/packages/crypto/src/keys/ecdh/index.browser.ts index b18ac51549..e710eb6141 100644 --- a/packages/crypto/src/keys/ecdh/index.browser.ts +++ b/packages/crypto/src/keys/ecdh/index.browser.ts @@ -2,10 +2,10 @@ import { InvalidParametersError } from '@libp2p/interface' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { base64urlToBuffer } from '../../util.js' -import webcrypto from '../../webcrypto/index.js' +import { base64urlToBuffer } from '../../util.ts' +import webcrypto from '../../webcrypto/index.ts' import type { Curve } from './index.ts' -import type { ECDHKey, ECDHKeyPair, JWKEncodedPrivateKey, JWKEncodedPublicKey } from '../interface.js' +import type { ECDHKey, ECDHKeyPair, JWKEncodedPrivateKey, JWKEncodedPublicKey } from '../interface.ts' const curveLengths = { 'P-256': 32, diff --git a/packages/crypto/src/keys/ecdh/index.ts b/packages/crypto/src/keys/ecdh/index.ts index dd4d957663..009ee0e924 100644 --- a/packages/crypto/src/keys/ecdh/index.ts +++ b/packages/crypto/src/keys/ecdh/index.ts @@ -1,6 +1,6 @@ import crypto from 'crypto' import { InvalidParametersError } from '@libp2p/interface' -import type { ECDHKey, ECDHKeyPair } from '../interface.js' +import type { ECDHKey, ECDHKeyPair } from '../interface.ts' export type Curve = 'P-256' | 'P-384' | 'P-521' diff --git a/packages/crypto/src/keys/ecdsa/ecdsa.ts b/packages/crypto/src/keys/ecdsa/ecdsa.ts index c19e588f3f..f9265a247a 100644 --- a/packages/crypto/src/keys/ecdsa/ecdsa.ts +++ b/packages/crypto/src/keys/ecdsa/ecdsa.ts @@ -2,7 +2,7 @@ import { base58btc } from 'multiformats/bases/base58' import { CID } from 'multiformats/cid' import { identity } from 'multiformats/hashes/identity' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' -import { publicKeyToProtobuf } from '../index.js' +import { publicKeyToProtobuf } from '../index.ts' import { hashAndVerify, hashAndSign } from './index.ts' import { privateKeyToPKIMessage, publicKeyToPKIMessage } from './utils.ts' import type { ECDSAPublicKey as ECDSAPublicKeyInterface, ECDSAPrivateKey as ECDSAPrivateKeyInterface, AbortOptions } from '@libp2p/interface' diff --git a/packages/crypto/src/keys/ecdsa/index.ts b/packages/crypto/src/keys/ecdsa/index.ts index e28138fded..e3f7ffa3fe 100644 --- a/packages/crypto/src/keys/ecdsa/index.ts +++ b/packages/crypto/src/keys/ecdsa/index.ts @@ -1,4 +1,5 @@ -import type { JWKKeyPair } from '../interface.js' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' +import type { JWKKeyPair } from '../interface.ts' import type { AbortOptions } from '@libp2p/interface' import type { Uint8ArrayList } from 'uint8arraylist' @@ -32,7 +33,7 @@ export async function hashAndSign (key: JsonWebKey, msg: Uint8Array | Uint8Array hash: { name: 'SHA-256' } - }, privateKey, msg.subarray()) + }, privateKey, withArrayBuffer(msg.subarray())) options?.signal?.throwIfAborted() return new Uint8Array(signature, 0, signature.byteLength) @@ -50,7 +51,7 @@ export async function hashAndVerify (key: JsonWebKey, sig: Uint8Array, msg: Uint hash: { name: 'SHA-256' } - }, publicKey, sig, msg.subarray()) + }, publicKey, withArrayBuffer(sig), withArrayBuffer(msg.subarray())) options?.signal?.throwIfAborted() return result diff --git a/packages/crypto/src/keys/ecdsa/utils.ts b/packages/crypto/src/keys/ecdsa/utils.ts index 3650b0d0b7..88e28f092c 100644 --- a/packages/crypto/src/keys/ecdsa/utils.ts +++ b/packages/crypto/src/keys/ecdsa/utils.ts @@ -2,10 +2,10 @@ import { InvalidParametersError } from '@libp2p/interface' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { decodeDer, encodeBitString, encodeInteger, encodeOctetString, encodeSequence } from '../rsa/der.js' +import { decodeDer, encodeBitString, encodeInteger, encodeOctetString, encodeSequence } from '../rsa/der.ts' import { ECDSAPrivateKey as ECDSAPrivateKeyClass, ECDSAPublicKey as ECDSAPublicKeyClass } from './ecdsa.ts' import { generateECDSAKey } from './index.ts' -import type { Curve } from '../ecdh/index.js' +import type { Curve } from '../ecdh/index.ts' import type { ECDSAPublicKey, ECDSAPrivateKey } from '@libp2p/interface' // 1.2.840.10045.3.1.7 prime256v1 (ANSI X9.62 named elliptic curve) diff --git a/packages/crypto/src/keys/ed25519/ed25519.ts b/packages/crypto/src/keys/ed25519/ed25519.ts index cf68ec29cf..7cb415402b 100644 --- a/packages/crypto/src/keys/ed25519/ed25519.ts +++ b/packages/crypto/src/keys/ed25519/ed25519.ts @@ -3,7 +3,7 @@ import { CID } from 'multiformats/cid' import { identity } from 'multiformats/hashes/identity' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { isPromise } from '../../util.ts' -import { publicKeyToProtobuf } from '../index.js' +import { publicKeyToProtobuf } from '../index.ts' import * as crypto from './index.ts' import { ensureEd25519Key } from './utils.ts' import type { Ed25519PublicKey as Ed25519PublicKeyInterface, Ed25519PrivateKey as Ed25519PrivateKeyInterface, AbortOptions } from '@libp2p/interface' diff --git a/packages/crypto/src/keys/ed25519/index.browser.ts b/packages/crypto/src/keys/ed25519/index.browser.ts index eddb2c14e1..c90b26083b 100644 --- a/packages/crypto/src/keys/ed25519/index.browser.ts +++ b/packages/crypto/src/keys/ed25519/index.browser.ts @@ -1,7 +1,8 @@ import { ed25519 as ed } from '@noble/curves/ed25519.js' import { toString as uint8arrayToString } from 'uint8arrays/to-string' -import crypto from '../../webcrypto/index.js' -import type { Uint8ArrayKeyPair } from '../interface.js' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' +import crypto from '../../webcrypto/index.ts' +import type { Uint8ArrayKeyPair } from '../interface.ts' import type { Uint8ArrayList } from 'uint8arraylist' const PUBLIC_KEY_BYTE_LENGTH = 32 @@ -73,7 +74,7 @@ async function hashAndSignWebCrypto (privateKey: Uint8Array, msg: Uint8Array | U } const key = await crypto.get().subtle.importKey('jwk', jwk, { name: 'Ed25519' }, true, ['sign']) - const sig = await crypto.get().subtle.sign({ name: 'Ed25519' }, key, msg instanceof Uint8Array ? msg : msg.subarray()) + const sig = await crypto.get().subtle.sign({ name: 'Ed25519' }, key, withArrayBuffer(msg instanceof Uint8Array ? msg : msg.subarray())) return new Uint8Array(sig, 0, sig.byteLength) } @@ -99,7 +100,7 @@ export async function hashAndSign (privateKey: Uint8Array, msg: Uint8Array | Uin async function hashAndVerifyWebCrypto (publicKey: Uint8Array, sig: Uint8Array, msg: Uint8Array | Uint8ArrayList): Promise { if (publicKey.buffer instanceof ArrayBuffer) { const key = await crypto.get().subtle.importKey('raw', publicKey.buffer, { name: 'Ed25519' }, false, ['verify']) - const isValid = await crypto.get().subtle.verify({ name: 'Ed25519' }, key, sig, msg instanceof Uint8Array ? msg : msg.subarray()) + const isValid = await crypto.get().subtle.verify({ name: 'Ed25519' }, key, withArrayBuffer(sig), withArrayBuffer(msg instanceof Uint8Array ? msg : msg.subarray())) return isValid } diff --git a/packages/crypto/src/keys/ed25519/index.ts b/packages/crypto/src/keys/ed25519/index.ts index 377d6903e7..282dbf364c 100644 --- a/packages/crypto/src/keys/ed25519/index.ts +++ b/packages/crypto/src/keys/ed25519/index.ts @@ -3,7 +3,7 @@ import { ed25519 as ed } from '@noble/curves/ed25519.js' import { concat as uint8arrayConcat } from 'uint8arrays/concat' import { fromString as uint8arrayFromString } from 'uint8arrays/from-string' import { toString as uint8arrayToString } from 'uint8arrays/to-string' -import type { Uint8ArrayKeyPair } from '../interface.js' +import type { Uint8ArrayKeyPair } from '../interface.ts' import type { Uint8ArrayList } from 'uint8arraylist' const keypair = crypto.generateKeyPairSync diff --git a/packages/crypto/src/keys/key-stretcher.ts b/packages/crypto/src/keys/key-stretcher.ts index dfd4382195..c0fac602b0 100644 --- a/packages/crypto/src/keys/key-stretcher.ts +++ b/packages/crypto/src/keys/key-stretcher.ts @@ -1,7 +1,7 @@ import { InvalidParametersError } from '@libp2p/interface' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import * as hmac from '../hmac/index.js' +import * as hmac from '../hmac/index.ts' import type { EnhancedKey, EnhancedKeyPair } from './interface.ts' interface Cipher { diff --git a/packages/crypto/src/keys/rsa/index.browser.ts b/packages/crypto/src/keys/rsa/index.browser.ts index ddf6b40636..db2e0319b5 100644 --- a/packages/crypto/src/keys/rsa/index.browser.ts +++ b/packages/crypto/src/keys/rsa/index.browser.ts @@ -1,9 +1,10 @@ import { InvalidParametersError } from '@libp2p/interface' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import randomBytes from '../../random-bytes.js' -import webcrypto from '../../webcrypto/index.js' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' +import randomBytes from '../../random-bytes.ts' +import webcrypto from '../../webcrypto/index.ts' import * as utils from './utils.ts' -import type { JWKKeyPair } from '../interface.js' +import type { JWKKeyPair } from '../interface.ts' import type { AbortOptions } from '@libp2p/interface' import type { Uint8ArrayList } from 'uint8arraylist' @@ -49,7 +50,7 @@ export async function hashAndSign (key: JsonWebKey, msg: Uint8Array | Uint8Array const sig = await webcrypto.get().subtle.sign( { name: 'RSASSA-PKCS1-v1_5' }, privateKey, - msg instanceof Uint8Array ? msg : msg.subarray() + withArrayBuffer(msg instanceof Uint8Array ? msg : msg.subarray()) ) options?.signal?.throwIfAborted() @@ -72,8 +73,8 @@ export async function hashAndVerify (key: JsonWebKey, sig: Uint8Array, msg: Uint const result = await webcrypto.get().subtle.verify( { name: 'RSASSA-PKCS1-v1_5' }, publicKey, - sig, - msg instanceof Uint8Array ? msg : msg.subarray() + withArrayBuffer(sig), + withArrayBuffer(msg instanceof Uint8Array ? msg : msg.subarray()) ) options?.signal?.throwIfAborted() diff --git a/packages/crypto/src/keys/rsa/index.ts b/packages/crypto/src/keys/rsa/index.ts index 47ed0823e1..0957cbc5d3 100644 --- a/packages/crypto/src/keys/rsa/index.ts +++ b/packages/crypto/src/keys/rsa/index.ts @@ -2,9 +2,9 @@ import crypto from 'node:crypto' import { promisify } from 'node:util' import { InvalidParametersError } from '@libp2p/interface' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import randomBytes from '../../random-bytes.js' +import randomBytes from '../../random-bytes.ts' import * as utils from './utils.ts' -import type { JWKKeyPair } from '../interface.js' +import type { JWKKeyPair } from '../interface.ts' import type { AbortOptions } from '@libp2p/interface' import type { Uint8ArrayList } from 'uint8arraylist' diff --git a/packages/crypto/src/keys/rsa/utils.ts b/packages/crypto/src/keys/rsa/utils.ts index 032cafb3be..c1e516e16e 100644 --- a/packages/crypto/src/keys/rsa/utils.ts +++ b/packages/crypto/src/keys/rsa/utils.ts @@ -3,11 +3,11 @@ import { sha256 } from '@noble/hashes/sha2.js' import { create } from 'multiformats/hashes/digest' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import * as pb from '../keys.js' +import * as pb from '../keys.ts' import { decodeDer, encodeBitString, encodeInteger, encodeSequence } from './der.ts' import { generateRSAKey, rsaKeySize } from './index.ts' import { RSAPrivateKey as RSAPrivateKeyClass, RSAPublicKey as RSAPublicKeyClass } from './rsa.ts' -import type { JWKKeyPair } from '../interface.js' +import type { JWKKeyPair } from '../interface.ts' import type { RSAPrivateKey, RSAPublicKey } from '@libp2p/interface' import type { Digest } from 'multiformats/hashes/digest' diff --git a/packages/crypto/src/keys/secp256k1/index.browser.ts b/packages/crypto/src/keys/secp256k1/index.browser.ts index c0545c7589..deaccf53d9 100644 --- a/packages/crypto/src/keys/secp256k1/index.browser.ts +++ b/packages/crypto/src/keys/secp256k1/index.browser.ts @@ -1,7 +1,7 @@ import { secp256k1 as secp } from '@noble/curves/secp256k1.js' import { sha256 } from 'multiformats/hashes/sha2' -import { SigningError, VerificationError } from '../../errors.js' -import { isPromise } from '../../util.js' +import { SigningError, VerificationError } from '../../errors.ts' +import { isPromise } from '../../util.ts' import type { AbortOptions } from '@libp2p/interface' import type { Uint8ArrayList } from 'uint8arraylist' diff --git a/packages/crypto/src/keys/secp256k1/index.ts b/packages/crypto/src/keys/secp256k1/index.ts index f97c7b2dc3..ee51dbd456 100644 --- a/packages/crypto/src/keys/secp256k1/index.ts +++ b/packages/crypto/src/keys/secp256k1/index.ts @@ -1,6 +1,6 @@ import crypto from 'node:crypto' import { secp256k1 as secp } from '@noble/curves/secp256k1.js' -import { SigningError, VerificationError } from '../../errors.js' +import { SigningError, VerificationError } from '../../errors.ts' import type { AbortOptions } from '@libp2p/interface' import type { Uint8ArrayList } from 'uint8arraylist' diff --git a/packages/crypto/src/keys/secp256k1/secp256k1.ts b/packages/crypto/src/keys/secp256k1/secp256k1.ts index 38605322b1..e5d6efe1c9 100644 --- a/packages/crypto/src/keys/secp256k1/secp256k1.ts +++ b/packages/crypto/src/keys/secp256k1/secp256k1.ts @@ -2,7 +2,7 @@ import { base58btc } from 'multiformats/bases/base58' import { CID } from 'multiformats/cid' import { identity } from 'multiformats/hashes/identity' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' -import { publicKeyToProtobuf } from '../index.js' +import { publicKeyToProtobuf } from '../index.ts' import { hashAndVerify, hashAndSign } from './index.ts' import { validateSecp256k1PublicKey, compressSecp256k1PublicKey, computeSecp256k1PublicKey, validateSecp256k1PrivateKey } from './utils.ts' import type { Secp256k1PublicKey as Secp256k1PublicKeyInterface, Secp256k1PrivateKey as Secp256k1PrivateKeyInterface, AbortOptions } from '@libp2p/interface' diff --git a/packages/crypto/src/webcrypto/index.ts b/packages/crypto/src/webcrypto/index.ts index f3fcbc6fbd..2422e5212e 100644 --- a/packages/crypto/src/webcrypto/index.ts +++ b/packages/crypto/src/webcrypto/index.ts @@ -1,3 +1,21 @@ -import webcrypto from './webcrypto.ts' +import { WebCryptoMissingError } from '../errors.ts' -export default webcrypto +// Check native crypto exists and is enabled (in insecure browser contexts +// `globalThis.crypto` exists but `globalThis.crypto.subtle` does not). +export default { + get (win = globalThis): Crypto { + const nativeCrypto = win.crypto + + if (nativeCrypto?.subtle == null) { + throw new WebCryptoMissingError( + 'Missing Web Crypto API. ' + + 'The most likely cause of this error is that this page is being accessed ' + + 'from an insecure context (i.e. not HTTPS). For more information and ' + + 'possible resolutions see ' + + 'https://github.com/libp2p/js-libp2p/blob/main/packages/crypto/README.md#web-crypto-api' + ) + } + + return nativeCrypto + } +} diff --git a/packages/crypto/src/webcrypto/webcrypto.browser.ts b/packages/crypto/src/webcrypto/webcrypto.browser.ts deleted file mode 100644 index 3902961370..0000000000 --- a/packages/crypto/src/webcrypto/webcrypto.browser.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-env browser */ - -import { WebCryptoMissingError } from '../errors.js' - -// Check native crypto exists and is enabled (In insecure context `self.crypto` -// exists but `self.crypto.subtle` does not). -export default { - get (win = globalThis) { - const nativeCrypto = win.crypto - - if (nativeCrypto?.subtle == null) { - throw new WebCryptoMissingError( - 'Missing Web Crypto API. ' + - 'The most likely cause of this error is that this page is being accessed ' + - 'from an insecure context (i.e. not HTTPS). For more information and ' + - 'possible resolutions see ' + - 'https://github.com/libp2p/js-libp2p/blob/main/packages/crypto/README.md#web-crypto-api' - ) - } - - return nativeCrypto - } -} diff --git a/packages/crypto/src/webcrypto/webcrypto.ts b/packages/crypto/src/webcrypto/webcrypto.ts deleted file mode 100644 index d583e7bd68..0000000000 --- a/packages/crypto/src/webcrypto/webcrypto.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-env browser */ - -import { webcrypto } from 'crypto' - -// globalThis `SubtleCrypto` shipped in node.js 19.x, Electron currently uses -// v18.x so this override file is necessary until Electron updates -export default { - get (win = globalThis) { - return webcrypto - } -} diff --git a/packages/crypto/test/crypto.spec.ts b/packages/crypto/test/crypto.spec.ts index 7873bdeb69..f23ebcf8bf 100644 --- a/packages/crypto/test/crypto.spec.ts +++ b/packages/crypto/test/crypto.spec.ts @@ -3,9 +3,9 @@ import { expect } from 'aegir/chai' import { base58btc } from 'multiformats/bases/base58' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' -import { generateKeyPair, generateKeyPairFromSeed, privateKeyFromProtobuf, privateKeyToProtobuf, publicKeyFromProtobuf, publicKeyToProtobuf } from '../src/keys/index.js' -import pbkdf2 from '../src/pbkdf2.js' -import randomBytes from '../src/random-bytes.js' +import { generateKeyPair, generateKeyPairFromSeed, privateKeyFromProtobuf, privateKeyToProtobuf, publicKeyFromProtobuf, publicKeyToProtobuf } from '../src/keys/index.ts' +import pbkdf2 from '../src/pbkdf2.ts' +import randomBytes from '../src/random-bytes.ts' import fixtures from './fixtures/go-key-rsa.ts' import type { RSAPrivateKey } from '@libp2p/interface' diff --git a/packages/crypto/test/fixtures/go-elliptic-key.ts b/packages/crypto/test/fixtures/go-elliptic-key.ts index 476abc47f7..3b3de83708 100644 --- a/packages/crypto/test/fixtures/go-elliptic-key.ts +++ b/packages/crypto/test/fixtures/go-elliptic-key.ts @@ -1,4 +1,4 @@ -import type { Curve } from '../../src/keys/ecdh/index.js' +import type { Curve } from '../../src/keys/ecdh/index.ts' type GoEllipticKeys = { [key in Curve]: { diff --git a/packages/crypto/test/fixtures/rsa.ts b/packages/crypto/test/fixtures/rsa.ts index 2106e7649f..3981ddb48a 100644 --- a/packages/crypto/test/fixtures/rsa.ts +++ b/packages/crypto/test/fixtures/rsa.ts @@ -1,5 +1,5 @@ /* spell-checker: disable */ -import type { JWKKeyPair } from '../../src/keys/interface.js' +import type { JWKKeyPair } from '../../src/keys/interface.ts' /** * A 8200 bit RSA key diff --git a/packages/crypto/test/hmac/hmac.spec.ts b/packages/crypto/test/hmac/hmac.spec.ts index 8ead33bfae..11380df147 100644 --- a/packages/crypto/test/hmac/hmac.spec.ts +++ b/packages/crypto/test/hmac/hmac.spec.ts @@ -2,7 +2,7 @@ /* eslint-env mocha */ import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import * as crypto from '../../src/index.js' +import * as crypto from '../../src/index.ts' const hashes = ['SHA1', 'SHA256', 'SHA512'] as ['SHA1', 'SHA256', 'SHA512'] diff --git a/packages/crypto/test/keys/ecdsa.spec.ts b/packages/crypto/test/keys/ecdsa.spec.ts index ad2f731dc3..1ebe5ed792 100644 --- a/packages/crypto/test/keys/ecdsa.spec.ts +++ b/packages/crypto/test/keys/ecdsa.spec.ts @@ -4,14 +4,14 @@ import { expect } from 'aegir/chai' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { randomBytes } from '../../src/index.js' -import { unmarshalECDSAPrivateKey, unmarshalECDSAPublicKey } from '../../src/keys/ecdsa/utils.js' -import { privateKeyToCryptoKeyPair, generateKeyPair, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf, publicKeyFromRaw, privateKeyFromCryptoKeyPair } from '../../src/keys/index.js' -import { PrivateKey, PublicKey } from '../../src/keys/keys.js' -import pbKeys from '../fixtures/ecdsa.js' -import fixtures from '../fixtures/go-key-ed25519.js' -import { testGarbage } from '../helpers/test-garbage-error-handling.js' -import type { Curve } from '../../src/keys/index.js' +import { randomBytes } from '../../src/index.ts' +import { unmarshalECDSAPrivateKey, unmarshalECDSAPublicKey } from '../../src/keys/ecdsa/utils.ts' +import { privateKeyToCryptoKeyPair, generateKeyPair, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf, publicKeyFromRaw, privateKeyFromCryptoKeyPair } from '../../src/keys/index.ts' +import { PrivateKey, PublicKey } from '../../src/keys/keys.ts' +import pbKeys from '../fixtures/ecdsa.ts' +import fixtures from '../fixtures/go-key-ed25519.ts' +import { testGarbage } from '../helpers/test-garbage-error-handling.ts' +import type { Curve } from '../../src/keys/index.ts' import type { ECDSAPrivateKey } from '@libp2p/interface' const CURVES: Curve[] = ['P-256', 'P-384', 'P-521'] diff --git a/packages/crypto/test/keys/ed25519.spec.ts b/packages/crypto/test/keys/ed25519.spec.ts index aa78282029..c7624d5fad 100644 --- a/packages/crypto/test/keys/ed25519.spec.ts +++ b/packages/crypto/test/keys/ed25519.spec.ts @@ -3,12 +3,12 @@ import { isPrivateKey, isPublicKey } from '@libp2p/interface' import { expect } from 'aegir/chai' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { randomBytes } from '../../src/index.js' +import { randomBytes } from '../../src/index.ts' import { hashAndSignNoble, hashAndVerifyNoble } from '../../src/keys/ed25519/index.browser.ts' -import { unmarshalEd25519PrivateKey, unmarshalEd25519PublicKey } from '../../src/keys/ed25519/utils.js' -import { generateKeyPair, generateKeyPairFromSeed, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf, publicKeyFromRaw, privateKeyToCryptoKeyPair } from '../../src/keys/index.js' -import fixtures from '../fixtures/go-key-ed25519.js' -import { testGarbage } from '../helpers/test-garbage-error-handling.js' +import { unmarshalEd25519PrivateKey, unmarshalEd25519PublicKey } from '../../src/keys/ed25519/utils.ts' +import { generateKeyPair, generateKeyPairFromSeed, privateKeyFromProtobuf, privateKeyFromRaw, publicKeyFromProtobuf, publicKeyFromRaw, privateKeyToCryptoKeyPair } from '../../src/keys/index.ts' +import fixtures from '../fixtures/go-key-ed25519.ts' +import { testGarbage } from '../helpers/test-garbage-error-handling.ts' import type { Ed25519PrivateKey } from '@libp2p/interface' describe('ed25519', function () { diff --git a/packages/crypto/test/keys/ephemeral-keys.spec.ts b/packages/crypto/test/keys/ephemeral-keys.spec.ts index a564ea5e06..231640a755 100644 --- a/packages/crypto/test/keys/ephemeral-keys.spec.ts +++ b/packages/crypto/test/keys/ephemeral-keys.spec.ts @@ -1,9 +1,9 @@ /* eslint max-nested-callbacks: ["error", 8] */ /* eslint-env mocha */ import { expect } from 'aegir/chai' -import { generateEphemeralKeyPair } from '../../src/keys/index.js' -import fixtures from '../fixtures/go-elliptic-key.js' -import type { Curve } from '../../src/keys/ecdh/index.js' +import { generateEphemeralKeyPair } from '../../src/keys/index.ts' +import fixtures from '../fixtures/go-elliptic-key.ts' +import type { Curve } from '../../src/keys/ecdh/index.ts' const curves: Curve[] = ['P-256', 'P-384', 'P-521'] const lengths: Record = { diff --git a/packages/crypto/test/keys/key-stretcher.spec.ts b/packages/crypto/test/keys/key-stretcher.spec.ts index 5e06bf2815..85e6bdab07 100644 --- a/packages/crypto/test/keys/key-stretcher.spec.ts +++ b/packages/crypto/test/keys/key-stretcher.spec.ts @@ -1,9 +1,9 @@ /* eslint max-nested-callbacks: ["error", 8] */ /* eslint-env mocha */ import { expect } from 'aegir/chai' -import { keyStretcher, generateEphemeralKeyPair } from '../../src/keys/index.js' -import fixtures from '../fixtures/go-stretch-key.js' -import type { ECDHKey } from '../../src/keys/interface.js' +import { keyStretcher, generateEphemeralKeyPair } from '../../src/keys/index.ts' +import fixtures from '../fixtures/go-stretch-key.ts' +import type { ECDHKey } from '../../src/keys/interface.ts' describe('keyStretcher', () => { describe('generate', () => { diff --git a/packages/crypto/test/keys/rsa.spec.ts b/packages/crypto/test/keys/rsa.spec.ts index 72eead835f..ade913bd15 100644 --- a/packages/crypto/test/keys/rsa.spec.ts +++ b/packages/crypto/test/keys/rsa.spec.ts @@ -7,15 +7,15 @@ import * as asn1js from 'asn1js' import { create } from 'multiformats/hashes/digest' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { randomBytes } from '../../src/index.js' -import { privateKeyFromCryptoKeyPair, generateKeyPair, privateKeyFromProtobuf, privateKeyFromRaw, privateKeyToProtobuf, publicKeyFromProtobuf, publicKeyFromRaw, publicKeyToProtobuf, privateKeyToCryptoKeyPair } from '../../src/keys/index.js' -import * as pb from '../../src/keys/keys.js' -import { RSAPrivateKey as RSAPrivateKeyClass, RSAPublicKey as RSAPublicKeyClass } from '../../src/keys/rsa/rsa.js' -import { MAX_RSA_KEY_SIZE, jwkToPkcs1, jwkToPkix, jwkToRSAPrivateKey, pkcs1ToJwk, pkcs1ToRSAPrivateKey, pkixToJwk, pkixToRSAPublicKey } from '../../src/keys/rsa/utils.js' -import fixtures from '../fixtures/go-key-rsa.js' -import { RSA_KEY_1024_BITS, RSA_KEY_2048_BITS, RSA_KEY_512_BITS, RSA_KEY_8192_BITS, RSA_KEY_8200_BITS } from '../fixtures/rsa.js' -import { testGarbage } from '../helpers/test-garbage-error-handling.js' -import type { JWKKeyPair } from '../../src/keys/interface.js' +import { randomBytes } from '../../src/index.ts' +import { privateKeyFromCryptoKeyPair, generateKeyPair, privateKeyFromProtobuf, privateKeyFromRaw, privateKeyToProtobuf, publicKeyFromProtobuf, publicKeyFromRaw, publicKeyToProtobuf, privateKeyToCryptoKeyPair } from '../../src/keys/index.ts' +import * as pb from '../../src/keys/keys.ts' +import { RSAPrivateKey as RSAPrivateKeyClass, RSAPublicKey as RSAPublicKeyClass } from '../../src/keys/rsa/rsa.ts' +import { MAX_RSA_KEY_SIZE, jwkToPkcs1, jwkToPkix, jwkToRSAPrivateKey, pkcs1ToJwk, pkcs1ToRSAPrivateKey, pkixToJwk, pkixToRSAPublicKey } from '../../src/keys/rsa/utils.ts' +import fixtures from '../fixtures/go-key-rsa.ts' +import { RSA_KEY_1024_BITS, RSA_KEY_2048_BITS, RSA_KEY_512_BITS, RSA_KEY_8192_BITS, RSA_KEY_8200_BITS } from '../fixtures/rsa.ts' +import { testGarbage } from '../helpers/test-garbage-error-handling.ts' +import type { JWKKeyPair } from '../../src/keys/interface.ts' import type { RSAPrivateKey } from '@libp2p/interface' const SHA2_256_CODE = 0x12 diff --git a/packages/crypto/test/keys/secp256k1.spec.ts b/packages/crypto/test/keys/secp256k1.spec.ts index 5fb2d1dfad..2b16c4d896 100644 --- a/packages/crypto/test/keys/secp256k1.spec.ts +++ b/packages/crypto/test/keys/secp256k1.spec.ts @@ -4,12 +4,12 @@ import { isPrivateKey, isPublicKey } from '@libp2p/interface' import { expect } from 'aegir/chai' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { randomBytes } from '../../src/index.js' -import { generateKeyPair, privateKeyFromRaw, privateKeyToProtobuf, publicKeyFromRaw, publicKeyToProtobuf, privateKeyToCryptoKeyPair } from '../../src/keys/index.js' -import { KeyType, PrivateKey, PublicKey } from '../../src/keys/keys.js' -import { hashAndSign, hashAndVerify } from '../../src/keys/secp256k1/index.js' -import { unmarshalSecp256k1PrivateKey, unmarshalSecp256k1PublicKey, compressSecp256k1PublicKey, computeSecp256k1PublicKey, decompressSecp256k1PublicKey, generateSecp256k1PrivateKey, validateSecp256k1PrivateKey, validateSecp256k1PublicKey } from '../../src/keys/secp256k1/utils.js' -import fixtures from '../fixtures/go-key-secp256k1.js' +import { randomBytes } from '../../src/index.ts' +import { generateKeyPair, privateKeyFromRaw, privateKeyToProtobuf, publicKeyFromRaw, publicKeyToProtobuf, privateKeyToCryptoKeyPair } from '../../src/keys/index.ts' +import { KeyType, PrivateKey, PublicKey } from '../../src/keys/keys.ts' +import { hashAndSign, hashAndVerify } from '../../src/keys/secp256k1/index.ts' +import { unmarshalSecp256k1PrivateKey, unmarshalSecp256k1PublicKey, compressSecp256k1PublicKey, computeSecp256k1PublicKey, decompressSecp256k1PublicKey, generateSecp256k1PrivateKey, validateSecp256k1PrivateKey, validateSecp256k1PublicKey } from '../../src/keys/secp256k1/utils.ts' +import fixtures from '../fixtures/go-key-secp256k1.ts' import type { Secp256k1PrivateKey } from '@libp2p/interface' describe('secp256k1 keys', () => { diff --git a/packages/crypto/test/random-bytes.spec.ts b/packages/crypto/test/random-bytes.spec.ts index 4227a5fa90..36559026d8 100644 --- a/packages/crypto/test/random-bytes.spec.ts +++ b/packages/crypto/test/random-bytes.spec.ts @@ -1,6 +1,6 @@ /* eslint-env mocha */ import { expect } from 'aegir/chai' -import randomBytes from '../src/random-bytes.js' +import randomBytes from '../src/random-bytes.ts' describe('randomBytes', () => { it('produces random bytes', () => { diff --git a/packages/crypto/test/util.spec.ts b/packages/crypto/test/util.spec.ts index bae348b0b7..7b8650f60d 100644 --- a/packages/crypto/test/util.spec.ts +++ b/packages/crypto/test/util.spec.ts @@ -1,7 +1,7 @@ /* eslint max-nested-callbacks: ["error", 8] */ /* eslint-env mocha */ import { expect } from 'aegir/chai' -import * as util from '../src/util.js' +import * as util from '../src/util.ts' describe('Util', () => { it('should convert base64url encoded string to Uint8Array with padding', () => { diff --git a/packages/crypto/test/workaround.spec.ts b/packages/crypto/test/workaround.spec.ts index dc455f1ee2..b7a03c5869 100644 --- a/packages/crypto/test/workaround.spec.ts +++ b/packages/crypto/test/workaround.spec.ts @@ -1,6 +1,6 @@ /* eslint-env mocha */ import { expect } from 'aegir/chai' -import { derivedEmptyPasswordKey } from '../src/ciphers/aes-gcm.browser.js' +import { derivedEmptyPasswordKey } from '../src/ciphers/aes-gcm.browser.ts' describe('Constant derived key is generated correctly', () => { it('Generates correctly', async () => { diff --git a/packages/floodsub/package.json b/packages/floodsub/package.json index f253e22040..7300260c47 100644 --- a/packages/floodsub/package.json +++ b/packages/floodsub/package.json @@ -66,13 +66,13 @@ "p-queue": "^9.0.0", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", "@multiformats/multiaddr": "^13.0.1", "@types/sinon": "^21.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "p-wait-for": "^6.0.0", "protons": "^8.1.1", diff --git a/packages/floodsub/test/emit-self.spec.ts b/packages/floodsub/test/emit-self.spec.ts index 384ce881bd..69b8687ff7 100644 --- a/packages/floodsub/test/emit-self.spec.ts +++ b/packages/floodsub/test/emit-self.spec.ts @@ -4,8 +4,8 @@ import { defaultLogger } from '@libp2p/logger' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { floodsub } from '../src/index.js' -import type { FloodSub } from '../src/index.js' +import { floodsub } from '../src/index.ts' +import type { FloodSub } from '../src/index.ts' import type { Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/floodsub/test/floodsub.spec.ts b/packages/floodsub/test/floodsub.spec.ts index f5f0529f81..616a05be93 100644 --- a/packages/floodsub/test/floodsub.spec.ts +++ b/packages/floodsub/test/floodsub.spec.ts @@ -10,11 +10,11 @@ import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { FloodSub } from '../src/floodsub.js' -import { protocol, StrictNoSign } from '../src/index.js' -import { PeerStreams } from '../src/peer-streams.js' -import type { PubSubRPC } from '../src/floodsub.js' -import type { Message } from '../src/index.js' +import { FloodSub } from '../src/floodsub.ts' +import { protocol, StrictNoSign } from '../src/index.ts' +import { PeerStreams } from '../src/peer-streams.ts' +import type { PubSubRPC } from '../src/floodsub.ts' +import type { Message } from '../src/index.ts' import type { Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/floodsub/test/lifecycle.spec.ts b/packages/floodsub/test/lifecycle.spec.ts index a9a05f0e7a..d79dec64bf 100644 --- a/packages/floodsub/test/lifecycle.spec.ts +++ b/packages/floodsub/test/lifecycle.spec.ts @@ -5,9 +5,9 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { floodsub } from '../src/index.js' +import { floodsub } from '../src/index.ts' import { connectionPair } from './fixtures/connection.ts' -import type { FloodSub } from '../src/index.js' +import type { FloodSub } from '../src/index.ts' import type { PeerId } from '@libp2p/interface' import type { Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/floodsub/test/message.spec.ts b/packages/floodsub/test/message.spec.ts index 35f6535683..31f2e9b4ea 100644 --- a/packages/floodsub/test/message.spec.ts +++ b/packages/floodsub/test/message.spec.ts @@ -6,9 +6,9 @@ import { expect } from 'aegir/chai' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { floodsub } from '../src/index.js' -import { randomSeqno } from '../src/utils.js' -import type { FloodSub } from '../src/index.js' +import { floodsub } from '../src/index.ts' +import { randomSeqno } from '../src/utils.ts' +import type { FloodSub } from '../src/index.ts' import type { PeerId } from '@libp2p/interface' import type { Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/floodsub/test/peer-streams.spec.ts b/packages/floodsub/test/peer-streams.spec.ts index 80c7222c7c..3518571408 100644 --- a/packages/floodsub/test/peer-streams.spec.ts +++ b/packages/floodsub/test/peer-streams.spec.ts @@ -5,7 +5,7 @@ import { expect } from 'aegir/chai' import * as lp from 'it-length-prefixed' import { Uint8ArrayList } from 'uint8arraylist' import { RPC } from '../src/message/rpc.ts' -import { PeerStreams } from '../src/peer-streams.js' +import { PeerStreams } from '../src/peer-streams.ts' import type { PubSubRPC } from '../src/floodsub.ts' import type { PeerId } from '@libp2p/interface' diff --git a/packages/floodsub/test/pubsub.spec.ts b/packages/floodsub/test/pubsub.spec.ts index 22b8440c92..8521bcede0 100644 --- a/packages/floodsub/test/pubsub.spec.ts +++ b/packages/floodsub/test/pubsub.spec.ts @@ -10,12 +10,12 @@ import pWaitFor from 'p-wait-for' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { floodsub } from '../src/index.js' -import { PeerStreams } from '../src/peer-streams.js' -import { noSignMsgId } from '../src/utils.js' +import { floodsub } from '../src/index.ts' +import { PeerStreams } from '../src/peer-streams.ts' +import { noSignMsgId } from '../src/utils.ts' import { connectionPair } from './fixtures/connection.ts' -import type { PubSubRPC } from '../src/floodsub.js' -import type { FloodSub, FloodSubComponents, Message } from '../src/index.js' +import type { PubSubRPC } from '../src/floodsub.ts' +import type { FloodSub, FloodSubComponents, Message } from '../src/index.ts' import type { PeerId } from '@libp2p/interface' import type { Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/floodsub/test/sign.spec.ts b/packages/floodsub/test/sign.spec.ts index c79606d732..90930b619c 100644 --- a/packages/floodsub/test/sign.spec.ts +++ b/packages/floodsub/test/sign.spec.ts @@ -3,14 +3,14 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { RPC } from '../src/message/rpc.js' +import { RPC } from '../src/message/rpc.ts' import { signMessage, SignPrefix, verifySignature -} from '../src/sign.js' -import { randomSeqno, toRpcMessage } from '../src/utils.js' -import type { PubSubRPCMessage } from '../src/floodsub.js' +} from '../src/sign.ts' +import { randomSeqno, toRpcMessage } from '../src/utils.ts' +import type { PubSubRPCMessage } from '../src/floodsub.ts' import type { Message } from '../src/index.ts' import type { PeerId, PrivateKey } from '@libp2p/interface' diff --git a/packages/floodsub/test/topic-validators.spec.ts b/packages/floodsub/test/topic-validators.spec.ts index 4f3bffc00f..c49c1e3a29 100644 --- a/packages/floodsub/test/topic-validators.spec.ts +++ b/packages/floodsub/test/topic-validators.spec.ts @@ -8,10 +8,10 @@ import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { floodsub, TopicValidatorResult } from '../src/index.js' -import { PeerStreams } from '../src/peer-streams.js' -import type { PubSubRPC } from '../src/floodsub.js' -import type { FloodSub } from '../src/index.js' +import { floodsub, TopicValidatorResult } from '../src/index.ts' +import { PeerStreams } from '../src/peer-streams.ts' +import type { PubSubRPC } from '../src/floodsub.ts' +import type { FloodSub } from '../src/index.ts' import type { PeerId } from '@libp2p/interface' import type { Registrar } from '@libp2p/interface-internal' diff --git a/packages/floodsub/test/utils.spec.ts b/packages/floodsub/test/utils.spec.ts index d034e416cd..c553f005f7 100644 --- a/packages/floodsub/test/utils.spec.ts +++ b/packages/floodsub/test/utils.spec.ts @@ -1,9 +1,9 @@ import { generateKeyPair, publicKeyToProtobuf } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey, peerIdFromString } from '@libp2p/peer-id' import { expect } from 'aegir/chai' -import * as utils from '../src/utils.js' -import type { PubSubRPCMessage } from '../src/floodsub.js' -import type { Message } from '../src/index.js' +import * as utils from '../src/utils.ts' +import type { PubSubRPCMessage } from '../src/floodsub.ts' +import type { Message } from '../src/index.ts' describe('utils', () => { it('randomSeqno', () => { diff --git a/packages/gossipsub/package.json b/packages/gossipsub/package.json index 92ba1a9b19..f8bae90060 100644 --- a/packages/gossipsub/package.json +++ b/packages/gossipsub/package.json @@ -92,7 +92,7 @@ "multiformats": "^13.0.1", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.0.1" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@chainsafe/as-sha256": "^1.2.0", @@ -103,7 +103,7 @@ "@types/node": "^22.18.1", "@types/sinon": "^21.0.1", "abortable-iterator": "^5.1.0", - "aegir": "^47.0.21", + "aegir": "^48.0.11", "benchmark": "^2.1.4", "datastore-core": "^11.0.1", "delay": "^7.0.0", diff --git a/packages/gossipsub/src/score/message-deliveries.ts b/packages/gossipsub/src/score/message-deliveries.ts index 70cce2ac55..fcdd01f51c 100644 --- a/packages/gossipsub/src/score/message-deliveries.ts +++ b/packages/gossipsub/src/score/message-deliveries.ts @@ -1,5 +1,5 @@ import Denque from 'denque' -import { TimeCacheDuration } from '../constants.js' +import { TimeCacheDuration } from '../constants.ts' export enum DeliveryRecordStatus { /** diff --git a/packages/gossipsub/src/score/peer-score-params.ts b/packages/gossipsub/src/score/peer-score-params.ts index 8048d28150..973c8c38da 100644 --- a/packages/gossipsub/src/score/peer-score-params.ts +++ b/packages/gossipsub/src/score/peer-score-params.ts @@ -1,4 +1,4 @@ -import { InvalidPeerScoreParamsError } from '../errors.js' +import { InvalidPeerScoreParamsError } from '../errors.ts' // This file defines PeerScoreParams and TopicScoreParams interfaces // as well as constructors, default constructors, and validation functions diff --git a/packages/gossipsub/src/score/peer-score-thresholds.ts b/packages/gossipsub/src/score/peer-score-thresholds.ts index b50225b0c0..0f5474495b 100644 --- a/packages/gossipsub/src/score/peer-score-thresholds.ts +++ b/packages/gossipsub/src/score/peer-score-thresholds.ts @@ -1,4 +1,4 @@ -import { InvalidPeerScoreThresholdsError } from '../errors.js' +import { InvalidPeerScoreThresholdsError } from '../errors.ts' // This file defines PeerScoreThresholds interface // as well as a constructor, default constructor, and validation function diff --git a/packages/gossipsub/src/score/peer-score.ts b/packages/gossipsub/src/score/peer-score.ts index a220204844..1615077cb4 100644 --- a/packages/gossipsub/src/score/peer-score.ts +++ b/packages/gossipsub/src/score/peer-score.ts @@ -1,12 +1,12 @@ -import { RejectReason } from '../types.js' -import { MapDef } from '../utils/set.js' +import { RejectReason } from '../types.ts' +import { MapDef } from '../utils/set.ts' import { computeScore } from './compute-score.ts' import { MessageDeliveries, DeliveryRecordStatus } from './message-deliveries.ts' import { validatePeerScoreParams } from './peer-score-params.ts' -import type { MsgIdStr, PeerIdStr, TopicStr, IPStr } from '../types.js' +import type { MsgIdStr, PeerIdStr, TopicStr, IPStr } from '../types.ts' import type { PeerScoreParams } from './peer-score-params.ts' import type { PeerStats, TopicStats } from './peer-stats.ts' -import type { Metrics, ScorePenalty } from '../metrics.js' +import type { Metrics, ScorePenalty } from '../metrics.ts' import type { ComponentLogger, Logger } from '@libp2p/interface' interface PeerScoreOpts { diff --git a/packages/gossipsub/src/score/peer-stats.ts b/packages/gossipsub/src/score/peer-stats.ts index 3401168561..4945d94f48 100644 --- a/packages/gossipsub/src/score/peer-stats.ts +++ b/packages/gossipsub/src/score/peer-stats.ts @@ -1,4 +1,4 @@ -import type { TopicStr } from '../types.js' +import type { TopicStr } from '../types.ts' export interface PeerStats { /** true if the peer is currently connected */ diff --git a/packages/gossipsub/src/utils/buildRawMessage.ts b/packages/gossipsub/src/utils/buildRawMessage.ts index dfb8dc3760..bfd19dbd3e 100644 --- a/packages/gossipsub/src/utils/buildRawMessage.ts +++ b/packages/gossipsub/src/utils/buildRawMessage.ts @@ -5,10 +5,10 @@ import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { StrictSign, StrictNoSign } from '../index.ts' -import { RPC } from '../message/rpc.js' -import { PublishConfigType, ValidateError } from '../types.js' +import { RPC } from '../message/rpc.ts' +import { PublishConfigType, ValidateError } from '../types.ts' import type { Message } from '../index.ts' -import type { PublishConfig, TopicStr } from '../types.js' +import type { PublishConfig, TopicStr } from '../types.ts' import type { PublicKey, PeerId } from '@libp2p/interface' export const SignPrefix = uint8ArrayFromString('libp2p-pubsub:') diff --git a/packages/gossipsub/src/utils/create-gossip-rpc.ts b/packages/gossipsub/src/utils/create-gossip-rpc.ts index efd59fcb1c..7a7a95b983 100644 --- a/packages/gossipsub/src/utils/create-gossip-rpc.ts +++ b/packages/gossipsub/src/utils/create-gossip-rpc.ts @@ -1,4 +1,4 @@ -import type { RPC } from '../message/rpc.js' +import type { RPC } from '../message/rpc.ts' /** * Create a gossipsub RPC object diff --git a/packages/gossipsub/src/utils/msgIdFn.ts b/packages/gossipsub/src/utils/msgIdFn.ts index 7dc4b2da5f..95eb72ef2d 100644 --- a/packages/gossipsub/src/utils/msgIdFn.ts +++ b/packages/gossipsub/src/utils/msgIdFn.ts @@ -1,7 +1,7 @@ import { publicKeyToProtobuf } from '@libp2p/crypto/keys' import { sha256 } from 'multiformats/hashes/sha2' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import type { Message } from '../index.js' +import type { Message } from '../index.ts' import type { PublicKey } from '@libp2p/interface' /** diff --git a/packages/gossipsub/src/utils/publishConfig.ts b/packages/gossipsub/src/utils/publishConfig.ts index 4516b7026e..ba9ef79112 100644 --- a/packages/gossipsub/src/utils/publishConfig.ts +++ b/packages/gossipsub/src/utils/publishConfig.ts @@ -1,7 +1,7 @@ import { publicKeyToProtobuf } from '@libp2p/crypto/keys' import { StrictSign, StrictNoSign } from '../index.ts' -import { PublishConfigType } from '../types.js' -import type { PublishConfig } from '../types.js' +import { PublishConfigType } from '../types.ts' +import type { PublishConfig } from '../types.ts' import type { PeerId, PrivateKey } from '@libp2p/interface' /** diff --git a/packages/gossipsub/test/2-nodes.spec.ts b/packages/gossipsub/test/2-nodes.spec.ts index 474feb91c4..be1d76a52d 100644 --- a/packages/gossipsub/test/2-nodes.spec.ts +++ b/packages/gossipsub/test/2-nodes.spec.ts @@ -12,7 +12,7 @@ import { } from './utils/create-pubsub.ts' import type { GossipSubAndComponents } from './utils/create-pubsub.ts' -import type { Message, SubscriptionChangeData } from '../src/index.js' +import type { Message, SubscriptionChangeData } from '../src/index.ts' const shouldNotHappen = (): never => expect.fail() diff --git a/packages/gossipsub/test/accept-from.spec.ts b/packages/gossipsub/test/accept-from.spec.ts index 1da29b5e38..2e684db2fb 100644 --- a/packages/gossipsub/test/accept-from.spec.ts +++ b/packages/gossipsub/test/accept-from.spec.ts @@ -4,7 +4,7 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { GossipSub as GossipSubClass } from '../src/gossipsub.js' +import { GossipSub as GossipSubClass } from '../src/gossipsub.ts' import { fastMsgIdFn } from './utils/msgId.ts' import type { PeerStore } from '@libp2p/interface' import type { ConnectionManager, Registrar } from '@libp2p/interface-internal' diff --git a/packages/gossipsub/test/benchmark/asyncIterable.test.ts b/packages/gossipsub/test/benchmark/asyncIterable.test.ts index 48ac4beca5..0096c3ac56 100644 --- a/packages/gossipsub/test/benchmark/asyncIterable.test.ts +++ b/packages/gossipsub/test/benchmark/asyncIterable.test.ts @@ -1,7 +1,7 @@ import { abortableSource } from 'abortable-iterator' import all from 'it-all' import { pipe } from 'it-pipe' -import { runBenchmark } from '../utils/benchmark.js' +import { runBenchmark } from '../utils/benchmark.ts' describe('abortableSource cost', function () { const n = 10000 diff --git a/packages/gossipsub/test/benchmark/index.test.ts b/packages/gossipsub/test/benchmark/index.test.ts index 34a8be74f1..acdd02b064 100644 --- a/packages/gossipsub/test/benchmark/index.test.ts +++ b/packages/gossipsub/test/benchmark/index.test.ts @@ -1,13 +1,13 @@ import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { runBenchmark } from '../utils/benchmark.js' +import { runBenchmark } from '../utils/benchmark.ts' import { connectPubsubNodes, createComponentsArray, denseConnect -} from '../utils/create-pubsub.js' -import { awaitEvents, checkReceivedSubscriptions, checkReceivedSubscription } from '../utils/events.js' +} from '../utils/create-pubsub.ts' +import { awaitEvents, checkReceivedSubscriptions, checkReceivedSubscription } from '../utils/events.ts' describe('heartbeat', function () { const topic = 'foobar' diff --git a/packages/gossipsub/test/benchmark/protobuf.test.ts b/packages/gossipsub/test/benchmark/protobuf.test.ts index 86522374b8..1b26e6ab8e 100644 --- a/packages/gossipsub/test/benchmark/protobuf.test.ts +++ b/packages/gossipsub/test/benchmark/protobuf.test.ts @@ -1,6 +1,6 @@ import crypto from 'node:crypto' -import { RPC } from '../../src/message/rpc.js' -import { runBenchmark } from '../utils/benchmark.js' +import { RPC } from '../../src/message/rpc.ts' +import { runBenchmark } from '../utils/benchmark.ts' describe('protobuf', function () { const testCases: Array<{ name: string, length: number }> = [ diff --git a/packages/gossipsub/test/benchmark/time-cache.test.ts b/packages/gossipsub/test/benchmark/time-cache.test.ts index ac5d0d8e7f..d09e6f72f2 100644 --- a/packages/gossipsub/test/benchmark/time-cache.test.ts +++ b/packages/gossipsub/test/benchmark/time-cache.test.ts @@ -1,7 +1,7 @@ // @ts-expect-error no types import TimeCache from 'time-cache' -import { SimpleTimeCache } from '../../src/utils/time-cache.js' -import { runBenchmark } from '../utils/benchmark.js' +import { SimpleTimeCache } from '../../src/utils/time-cache.ts' +import { runBenchmark } from '../utils/benchmark.ts' // TODO: errors with "Error: root suite not found" describe('npm TimeCache vs SimpleTimeCache', () => { diff --git a/packages/gossipsub/test/decode-rpc-limits.spec.ts b/packages/gossipsub/test/decode-rpc-limits.spec.ts index 63574a7357..aca38f4bd4 100644 --- a/packages/gossipsub/test/decode-rpc-limits.spec.ts +++ b/packages/gossipsub/test/decode-rpc-limits.spec.ts @@ -1,7 +1,7 @@ import { stop } from '@libp2p/interface' import { expect } from 'aegir/chai' import { MaxLengthError } from 'protons-runtime' -import { RPC } from '../src/message/rpc.js' +import { RPC } from '../src/message/rpc.ts' import { createComponents } from './utils/create-pubsub.ts' import type { GossipSubAndComponents } from './utils/create-pubsub.ts' diff --git a/packages/gossipsub/test/e2e/go-gossipsub.spec.ts b/packages/gossipsub/test/e2e/go-gossipsub.spec.ts index b629fa954d..e72721892b 100644 --- a/packages/gossipsub/test/e2e/go-gossipsub.spec.ts +++ b/packages/gossipsub/test/e2e/go-gossipsub.spec.ts @@ -6,8 +6,8 @@ import pRetry from 'p-retry' import pWaitFor from 'p-wait-for' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { GossipsubD } from '../../src/constants.js' -import { TopicValidatorResult } from '../../src/index.js' +import { GossipsubD } from '../../src/constants.ts' +import { TopicValidatorResult } from '../../src/index.ts' import { sparseConnect, denseConnect, @@ -16,13 +16,13 @@ import { createComponents, connectPubsubNodes -} from '../utils/create-pubsub.js' -import { awaitEvents, checkReceivedSubscription, checkReceivedSubscriptions } from '../utils/events.js' -import { fastMsgIdFn } from '../utils/index.js' -import type { Message } from '../../src/index.js' -import type { RPC } from '../../src/message/rpc.js' -import type { TopicScoreParams } from '../../src/score/peer-score-params.js' -import type { GossipSubAndComponents } from '../utils/create-pubsub.js' +} from '../utils/create-pubsub.ts' +import { awaitEvents, checkReceivedSubscription, checkReceivedSubscriptions } from '../utils/events.ts' +import { fastMsgIdFn } from '../utils/index.ts' +import type { Message } from '../../src/index.ts' +import type { RPC } from '../../src/message/rpc.ts' +import type { TopicScoreParams } from '../../src/score/peer-score-params.ts' +import type { GossipSubAndComponents } from '../utils/create-pubsub.ts' import type { Libp2pEvents } from '@libp2p/interface' /** diff --git a/packages/gossipsub/test/floodsub.spec.ts b/packages/gossipsub/test/floodsub.spec.ts index 191dfa2aa6..96cf43408c 100644 --- a/packages/gossipsub/test/floodsub.spec.ts +++ b/packages/gossipsub/test/floodsub.spec.ts @@ -7,7 +7,7 @@ import pRetry from 'p-retry' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { connectPubsubNodes, createComponents } from './utils/create-pubsub.ts' import type { GossipSubAndComponents } from './utils/create-pubsub.ts' -import type { SubscriptionChangeData, Message } from '../src/index.js' +import type { SubscriptionChangeData, Message } from '../src/index.ts' describe('gossipsub fallbacks to floodsub', () => { describe('basics', () => { diff --git a/packages/gossipsub/test/gossip.spec.ts b/packages/gossipsub/test/gossip.spec.ts index 6808111fb9..52f10f1201 100644 --- a/packages/gossipsub/test/gossip.spec.ts +++ b/packages/gossipsub/test/gossip.spec.ts @@ -10,8 +10,8 @@ import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { concat } from 'uint8arrays' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { GossipsubDhi } from '../src/constants.js' -import { GossipSub as GossipSubClass } from '../src/gossipsub.js' +import { GossipsubDhi } from '../src/constants.ts' +import { GossipSub as GossipSubClass } from '../src/gossipsub.ts' import { connectAllPubSubNodes, createComponentsArray } from './utils/create-pubsub.ts' import type { GossipSubAndComponents } from './utils/create-pubsub.ts' import type { PeerStore } from '@libp2p/interface' diff --git a/packages/gossipsub/test/handler-iteration-bound.spec.ts b/packages/gossipsub/test/handler-iteration-bound.spec.ts index 38ab7b973e..c991f7ea6a 100644 --- a/packages/gossipsub/test/handler-iteration-bound.spec.ts +++ b/packages/gossipsub/test/handler-iteration-bound.spec.ts @@ -1,6 +1,6 @@ import { stop } from '@libp2p/interface' import { expect } from 'aegir/chai' -import { GossipsubMaxIHaveLength, GossipsubMaxIWantMessages } from '../src/constants.js' +import { GossipsubMaxIHaveLength, GossipsubMaxIWantMessages } from '../src/constants.ts' import { createComponents } from './utils/create-pubsub.ts' import type { GossipSubAndComponents } from './utils/create-pubsub.ts' diff --git a/packages/gossipsub/test/heartbeat.spec.ts b/packages/gossipsub/test/heartbeat.spec.ts index 2e7a523bec..afe5e3fe1e 100644 --- a/packages/gossipsub/test/heartbeat.spec.ts +++ b/packages/gossipsub/test/heartbeat.spec.ts @@ -1,7 +1,7 @@ import { stop } from '@libp2p/interface' import { expect } from 'aegir/chai' import { pEvent } from 'p-event' -import { GossipsubHeartbeatInterval } from '../src/constants.js' +import { GossipsubHeartbeatInterval } from '../src/constants.ts' import { createComponents } from './utils/create-pubsub.ts' import type { GossipSubAndComponents } from './utils/create-pubsub.ts' diff --git a/packages/gossipsub/test/mesh.spec.ts b/packages/gossipsub/test/mesh.spec.ts index 08bdd945ae..864625cd9e 100644 --- a/packages/gossipsub/test/mesh.spec.ts +++ b/packages/gossipsub/test/mesh.spec.ts @@ -2,7 +2,7 @@ import { stop } from '@libp2p/interface' import { expect } from 'aegir/chai' import delay from 'delay' import { pEvent } from 'p-event' -import { GossipsubDhi } from '../src/constants.js' +import { GossipsubDhi } from '../src/constants.ts' import { connectAllPubSubNodes, createComponentsArray } from './utils/create-pubsub.ts' import type { GossipSubAndComponents } from './utils/create-pubsub.ts' diff --git a/packages/gossipsub/test/message-cache.spec.ts b/packages/gossipsub/test/message-cache.spec.ts index 0178988c2b..9b65768cb8 100644 --- a/packages/gossipsub/test/message-cache.spec.ts +++ b/packages/gossipsub/test/message-cache.spec.ts @@ -2,11 +2,11 @@ import { randomBytes } from '@libp2p/crypto' import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { MessageCache } from '../src/message-cache.js' -import { messageIdToString } from '../src/utils/messageIdToString.js' +import { MessageCache } from '../src/message-cache.ts' +import { messageIdToString } from '../src/utils/messageIdToString.ts' import { getMsgId } from './utils/index.ts' -import type { RPC } from '../src/message/rpc.js' -import type { MessageId } from '../src/types.js' +import type { RPC } from '../src/message/rpc.ts' +import type { MessageId } from '../src/types.ts' function randomSeqno (): bigint { return BigInt(`0x${uint8ArrayToString(randomBytes(8), 'base16')}`) diff --git a/packages/gossipsub/test/peer-score-params.spec.ts b/packages/gossipsub/test/peer-score-params.spec.ts index 0da8a4b3cf..bd010ef14b 100644 --- a/packages/gossipsub/test/peer-score-params.spec.ts +++ b/packages/gossipsub/test/peer-score-params.spec.ts @@ -1,11 +1,11 @@ import { expect } from 'aegir/chai' -import * as constants from '../src/constants.js' +import * as constants from '../src/constants.ts' import { createTopicScoreParams, validateTopicScoreParams, createPeerScoreParams, validatePeerScoreParams -} from '../src/score/index.js' +} from '../src/score/index.ts' describe('TopicScoreParams validation', () => { it('should not throw on default TopicScoreParams', () => { diff --git a/packages/gossipsub/test/peer-score-thresholds.spec.ts b/packages/gossipsub/test/peer-score-thresholds.spec.ts index 4b0d7df771..b55345eced 100644 --- a/packages/gossipsub/test/peer-score-thresholds.spec.ts +++ b/packages/gossipsub/test/peer-score-thresholds.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { createPeerScoreThresholds, validatePeerScoreThresholds } from '../src/score/index.js' +import { createPeerScoreThresholds, validatePeerScoreThresholds } from '../src/score/index.ts' describe('PeerScoreThresholds validation', () => { it('should throw on invalid PeerScoreThresholds', () => { diff --git a/packages/gossipsub/test/peer-score.spec.ts b/packages/gossipsub/test/peer-score.spec.ts index b2e2494bfb..344a880838 100644 --- a/packages/gossipsub/test/peer-score.spec.ts +++ b/packages/gossipsub/test/peer-score.spec.ts @@ -4,12 +4,12 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import delay from 'delay' import sinon from 'sinon' -import { ScorePenalty } from '../src/metrics.js' -import { PeerScore, createPeerScoreParams, createTopicScoreParams } from '../src/score/index.js' -import { RejectReason } from '../src/types.js' +import { ScorePenalty } from '../src/metrics.ts' +import { PeerScore, createPeerScoreParams, createTopicScoreParams } from '../src/score/index.ts' +import { RejectReason } from '../src/types.ts' import { getMsgIdStr, makeTestMessage } from './utils/index.ts' -import type { PeerScoreParams, TopicScoreParams } from '../src/score/peer-score-params.js' -import type { PeerStats } from '../src/score/peer-stats.js' +import type { PeerScoreParams, TopicScoreParams } from '../src/score/peer-score-params.ts' +import type { PeerStats } from '../src/score/peer-stats.ts' /** Placeholder for some ScorePenalty value, only used for metrics */ const scorePenaltyAny = ScorePenalty.BrokenPromise diff --git a/packages/gossipsub/test/scoreMetrics.spec.ts b/packages/gossipsub/test/scoreMetrics.spec.ts index 4c9575ec3b..2796786d60 100644 --- a/packages/gossipsub/test/scoreMetrics.spec.ts +++ b/packages/gossipsub/test/scoreMetrics.spec.ts @@ -2,9 +2,9 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { defaultLogger } from '@libp2p/logger' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' -import { ScorePenalty } from '../src/metrics.js' -import { createPeerScoreParams, createTopicScoreParams, PeerScore } from '../src/score/index.js' -import { computeAllPeersScoreWeights } from '../src/score/scoreMetrics.js' +import { ScorePenalty } from '../src/metrics.ts' +import { createPeerScoreParams, createTopicScoreParams, PeerScore } from '../src/score/index.ts' +import { computeAllPeersScoreWeights } from '../src/score/scoreMetrics.ts' describe('score / scoreMetrics', () => { const logger = defaultLogger() diff --git a/packages/gossipsub/test/time-cache.spec.ts b/packages/gossipsub/test/time-cache.spec.ts index 632d7d210f..c676348881 100644 --- a/packages/gossipsub/test/time-cache.spec.ts +++ b/packages/gossipsub/test/time-cache.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import sinon from 'sinon' -import { SimpleTimeCache } from '../src/utils/time-cache.js' +import { SimpleTimeCache } from '../src/utils/time-cache.ts' describe('SimpleTimeCache', () => { const validityMs = 1000 diff --git a/packages/gossipsub/test/tracer.spec.ts b/packages/gossipsub/test/tracer.spec.ts index 8efb223995..bd41848305 100644 --- a/packages/gossipsub/test/tracer.spec.ts +++ b/packages/gossipsub/test/tracer.spec.ts @@ -2,9 +2,9 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import delay from 'delay' -import * as constants from '../src/constants.js' -import { IWantTracer } from '../src/tracer.js' -import { messageIdToString } from '../src/utils/messageIdToString.js' +import * as constants from '../src/constants.ts' +import { IWantTracer } from '../src/tracer.ts' +import { messageIdToString } from '../src/utils/messageIdToString.ts' import { makeTestMessage, getMsgId, getMsgIdStr } from './utils/index.ts' describe('IWantTracer', () => { diff --git a/packages/gossipsub/test/unit/set.spec.ts b/packages/gossipsub/test/unit/set.spec.ts index 6718c05695..5b5d2cad97 100644 --- a/packages/gossipsub/test/unit/set.spec.ts +++ b/packages/gossipsub/test/unit/set.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { removeFirstNItemsFromSet, removeItemsFromSet } from '../../src/utils/set.js' +import { removeFirstNItemsFromSet, removeItemsFromSet } from '../../src/utils/set.ts' describe('Set util', function () { describe('removeItemsFromSet', function () { diff --git a/packages/gossipsub/test/utils/create-pubsub.ts b/packages/gossipsub/test/utils/create-pubsub.ts index 24b14c9526..dd65c7cb00 100644 --- a/packages/gossipsub/test/utils/create-pubsub.ts +++ b/packages/gossipsub/test/utils/create-pubsub.ts @@ -9,8 +9,8 @@ import { multiaddr } from '@multiformats/multiaddr' import { MemoryDatastore } from 'datastore-core' import { stubInterface } from 'sinon-ts' import { GossipSub as GossipSubClass } from '../../src/gossipsub.ts' -import { gossipsub } from '../../src/index.js' -import type { GossipsubOpts } from '../../src/index.js' +import { gossipsub } from '../../src/index.ts' +import type { GossipsubOpts } from '../../src/index.ts' import type { TypedEventTarget, Libp2pEvents, PeerStore, PrivateKey, PeerId, ComponentLogger, Connection } from '@libp2p/interface' import type { ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/gossipsub/test/utils/events.ts b/packages/gossipsub/test/utils/events.ts index 6b96b3caaf..ba20b9c40b 100644 --- a/packages/gossipsub/test/utils/events.ts +++ b/packages/gossipsub/test/utils/events.ts @@ -1,7 +1,7 @@ import { expect } from 'aegir/chai' import pWaitFor from 'p-wait-for' import type { GossipSubAndComponents } from './create-pubsub.ts' -import type { GossipSubEvents, SubscriptionChangeData } from '../../src/index.js' +import type { GossipSubEvents, SubscriptionChangeData } from '../../src/index.ts' import type { TypedEventTarget } from '@libp2p/interface' export const checkReceivedSubscription = async ( diff --git a/packages/gossipsub/test/utils/index.ts b/packages/gossipsub/test/utils/index.ts index 3fe7aad2ed..ec6b6858eb 100644 --- a/packages/gossipsub/test/utils/index.ts +++ b/packages/gossipsub/test/utils/index.ts @@ -1,8 +1,8 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import type { RPC } from '../../src/message/rpc.js' -import type { TopicStr } from '../../src/types.js' +import type { RPC } from '../../src/message/rpc.ts' +import type { TopicStr } from '../../src/types.ts' import type { PeerId } from '@libp2p/interface' export * from './msgId.ts' diff --git a/packages/gossipsub/test/utils/msgId.ts b/packages/gossipsub/test/utils/msgId.ts index 1c4ee636f2..3ac0f27136 100644 --- a/packages/gossipsub/test/utils/msgId.ts +++ b/packages/gossipsub/test/utils/msgId.ts @@ -1,7 +1,7 @@ import { digest } from '@chainsafe/as-sha256' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { messageIdToString } from '../../src/utils/messageIdToString.js' -import type { RPC } from '../../src/message/rpc.js' +import { messageIdToString } from '../../src/utils/messageIdToString.ts' +import type { RPC } from '../../src/message/rpc.ts' export const getMsgId = (msg: RPC.Message): Uint8Array => { const from = msg.from ?? new Uint8Array(0) diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 4f968d4310..27b78b8984 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -53,7 +53,7 @@ "@multiformats/dns": "^1.0.6", "@multiformats/multiaddr": "^13.0.1", "@multiformats/multiaddr-matcher": "^3.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "detect-browser": "^5.3.0", "execa": "^9.6.0", @@ -69,7 +69,7 @@ "sinon": "^21.0.0", "sinon-ts": "^2.0.0", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0", + "uint8arrays": "^6.1.1", "wherearewe": "^2.0.1" }, "browser": { diff --git a/packages/integration-tests/test/compliance/transport/webrtc-direct.spec.ts b/packages/integration-tests/test/compliance/transport/webrtc-direct.spec.ts index 16a3a6f4fe..f38102bb8b 100644 --- a/packages/integration-tests/test/compliance/transport/webrtc-direct.spec.ts +++ b/packages/integration-tests/test/compliance/transport/webrtc-direct.spec.ts @@ -3,7 +3,7 @@ import { webRTCDirect } from '@libp2p/webrtc' import { multiaddr } from '@multiformats/multiaddr' import { WebRTCDirect } from '@multiformats/multiaddr-matcher' import { isNode, isElectronMain, isWebWorker } from 'wherearewe' -import { isFirefox } from '../../fixtures/utils.js' +import { isFirefox } from '../../fixtures/utils.ts' describe('WebRTC-Direct interface-transport compliance', () => { if (isWebWorker) { diff --git a/packages/integration-tests/test/node.ts b/packages/integration-tests/test/node.ts index ff940f168e..c56e390cf7 100644 --- a/packages/integration-tests/test/node.ts +++ b/packages/integration-tests/test/node.ts @@ -1,5 +1,5 @@ -import './circuit-relay-discovery.node.js' -import './circuit-relay.node.js' -import './dcutr.node.js' -import './identify.node.js' -import './mdns.node.js' +import './circuit-relay-discovery.node.ts' +import './circuit-relay.node.ts' +import './dcutr.node.ts' +import './identify.node.ts' +import './mdns.node.ts' diff --git a/packages/interface-compliance-tests/package.json b/packages/interface-compliance-tests/package.json index 364067cdb0..7573cc6a40 100644 --- a/packages/interface-compliance-tests/package.json +++ b/packages/interface-compliance-tests/package.json @@ -97,7 +97,7 @@ "@libp2p/utils": "^7.2.1", "@multiformats/multiaddr": "^13.0.1", "@multiformats/multiaddr-matcher": "^3.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "it-all": "^3.0.9", "it-drain": "^3.0.10", @@ -113,7 +113,7 @@ "race-signal": "^2.0.0", "sinon": "^21.0.0", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "protons": "^8.1.1" diff --git a/packages/interface-compliance-tests/src/connection-encryption/index.ts b/packages/interface-compliance-tests/src/connection-encryption/index.ts index 180f6b2a5e..430bda4aa8 100644 --- a/packages/interface-compliance-tests/src/connection-encryption/index.ts +++ b/packages/interface-compliance-tests/src/connection-encryption/index.ts @@ -6,7 +6,7 @@ import all from 'it-all' import toBuffer from 'it-to-buffer' import { pEvent } from 'p-event' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import type { TestSetup } from '../index.js' +import type { TestSetup } from '../index.ts' import type { ConnectionEncrypter, PeerId, PrivateKey } from '@libp2p/interface' export interface ConnectionEncrypterSetupArgs { diff --git a/packages/interface-compliance-tests/src/peer-discovery/index.ts b/packages/interface-compliance-tests/src/peer-discovery/index.ts index 908891f1d4..9a9ad1b101 100644 --- a/packages/interface-compliance-tests/src/peer-discovery/index.ts +++ b/packages/interface-compliance-tests/src/peer-discovery/index.ts @@ -3,7 +3,7 @@ import { isMultiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import delay from 'delay' import pDefer from 'p-defer' -import type { TestSetup } from '../index.js' +import type { TestSetup } from '../index.ts' import type { PeerDiscovery } from '@libp2p/interface' export default (common: TestSetup): void => { diff --git a/packages/interface-compliance-tests/src/stream-muxer/base-test.ts b/packages/interface-compliance-tests/src/stream-muxer/base-test.ts index 27a4fc0400..3332e46bba 100644 --- a/packages/interface-compliance-tests/src/stream-muxer/base-test.ts +++ b/packages/interface-compliance-tests/src/stream-muxer/base-test.ts @@ -2,7 +2,7 @@ import { multiaddrConnectionPair, byteStream } from '@libp2p/utils' import { expect } from 'aegir/chai' import { pEvent } from 'p-event' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import type { TestSetup } from '../index.js' +import type { TestSetup } from '../index.ts' import type { Stream, StreamMuxer, StreamMuxerFactory } from '@libp2p/interface' export default (common: TestSetup): void => { diff --git a/packages/interface-compliance-tests/src/stream-muxer/close-test.ts b/packages/interface-compliance-tests/src/stream-muxer/close-test.ts index 3f6abd4596..4b646346bd 100644 --- a/packages/interface-compliance-tests/src/stream-muxer/close-test.ts +++ b/packages/interface-compliance-tests/src/stream-muxer/close-test.ts @@ -8,7 +8,7 @@ import { pEvent } from 'p-event' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { Message } from './fixtures/pb/message.ts' -import type { TestSetup } from '../index.js' +import type { TestSetup } from '../index.ts' import type { MultiaddrConnection, Stream, StreamCloseEvent, StreamMuxer, StreamMuxerFactory } from '@libp2p/interface' function randomBuffer (): Uint8Array { diff --git a/packages/interface-compliance-tests/src/stream-muxer/index.ts b/packages/interface-compliance-tests/src/stream-muxer/index.ts index 8baa9c38ef..b0276fb1f7 100644 --- a/packages/interface-compliance-tests/src/stream-muxer/index.ts +++ b/packages/interface-compliance-tests/src/stream-muxer/index.ts @@ -2,7 +2,7 @@ import baseTest from './base-test.ts' import closeTest from './close-test.ts' import steamTest from './stream-test.ts' import stressTest from './stress-test.ts' -import type { TestSetup } from '../index.js' +import type { TestSetup } from '../index.ts' import type { StreamMuxerFactory } from '@libp2p/interface' export default (common: TestSetup): void => { diff --git a/packages/interface-compliance-tests/src/stream-muxer/stress-test.ts b/packages/interface-compliance-tests/src/stream-muxer/stress-test.ts index 2076d552f2..bb2eb10e06 100644 --- a/packages/interface-compliance-tests/src/stream-muxer/stress-test.ts +++ b/packages/interface-compliance-tests/src/stream-muxer/stress-test.ts @@ -3,7 +3,7 @@ import { expect } from 'aegir/chai' import { pEvent } from 'p-event' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import type { TestSetup } from '../index.js' +import type { TestSetup } from '../index.ts' import type { StreamMuxerFactory, StreamMuxer, MultiaddrConnection } from '@libp2p/interface' async function * messages (nMsg: number): AsyncGenerator { diff --git a/packages/interface-compliance-tests/src/transport/index.ts b/packages/interface-compliance-tests/src/transport/index.ts index a77bd15f93..45b0256331 100644 --- a/packages/interface-compliance-tests/src/transport/index.ts +++ b/packages/interface-compliance-tests/src/transport/index.ts @@ -12,9 +12,9 @@ import pWaitFor from 'p-wait-for' import { raceSignal } from 'race-signal' import { Uint8ArrayList } from 'uint8arraylist' import { concat as uint8ArrayConcat } from 'uint8arrays' -import { isValidTick } from '../is-valid-tick.js' +import { isValidTick } from '../is-valid-tick.ts' import { createPeer, getTransportManager, getUpgrader } from './utils.ts' -import type { TestSetup } from '../index.js' +import type { TestSetup } from '../index.ts' import type { Echo } from '@libp2p/echo' import type { Connection, Libp2p, Stream, StreamHandler } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/interface-compliance-tests/test/is-valid-tick.spec.ts b/packages/interface-compliance-tests/test/is-valid-tick.spec.ts index e4c1d065eb..5329bdd0f4 100644 --- a/packages/interface-compliance-tests/test/is-valid-tick.spec.ts +++ b/packages/interface-compliance-tests/test/is-valid-tick.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { isValidTick } from '../src/is-valid-tick.js' +import { isValidTick } from '../src/is-valid-tick.ts' describe('is-valid-tick', () => { it('should validate tick', async () => { diff --git a/packages/interface-internal/package.json b/packages/interface-internal/package.json index 5535d28175..2ecc29432b 100644 --- a/packages/interface-internal/package.json +++ b/packages/interface-internal/package.json @@ -48,7 +48,7 @@ "progress-events": "^1.0.1" }, "devDependencies": { - "aegir": "^47.0.22" + "aegir": "^48.0.11" }, "sideEffects": false } diff --git a/packages/interface/package.json b/packages/interface/package.json index 1b2a81ba60..1b31143659 100644 --- a/packages/interface/package.json +++ b/packages/interface/package.json @@ -50,7 +50,7 @@ "uint8arraylist": "^2.4.8" }, "devDependencies": { - "aegir": "^47.0.22" + "aegir": "^48.0.11" }, "sideEffects": false } diff --git a/packages/interop/package.json b/packages/interop/package.json index a698c78e43..12b3f86122 100644 --- a/packages/interop/package.json +++ b/packages/interop/package.json @@ -55,13 +55,13 @@ "p-wait-for": "^6.0.0", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "protons": "^8.1.1" }, "peerDependencies": { - "aegir": "^47.0.22" + "aegir": "^48.0.11" } } diff --git a/packages/interop/src/connect/index.ts b/packages/interop/src/connect/index.ts index 4558b8cb04..5e523233ab 100644 --- a/packages/interop/src/connect/index.ts +++ b/packages/interop/src/connect/index.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions, TransportType } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions, TransportType } from '../index.ts' export function connectTests (factory: DaemonFactory): void { const nodeTypes: NodeType[] = ['js', 'go'] diff --git a/packages/interop/src/dht/content-fetching.ts b/packages/interop/src/dht/content-fetching.ts index 595f62df55..9a59fa34c6 100644 --- a/packages/interop/src/dht/content-fetching.ts +++ b/packages/interop/src/dht/content-fetching.ts @@ -2,7 +2,7 @@ import { expect } from 'aegir/chai' import delay from 'delay' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.ts' const record = { key: uint8ArrayConcat([ diff --git a/packages/interop/src/dht/content-routing.ts b/packages/interop/src/dht/content-routing.ts index b47613e4b8..5bba77d800 100644 --- a/packages/interop/src/dht/content-routing.ts +++ b/packages/interop/src/dht/content-routing.ts @@ -1,7 +1,7 @@ import { expect } from 'aegir/chai' import all from 'it-all' import { CID } from 'multiformats/cid' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.ts' import type { IdentifyResult } from '@libp2p/daemon-client' export function contentRoutingTests (factory: DaemonFactory): void { diff --git a/packages/interop/src/dht/index.ts b/packages/interop/src/dht/index.ts index b959aa1ccb..9a3ac30bdc 100644 --- a/packages/interop/src/dht/index.ts +++ b/packages/interop/src/dht/index.ts @@ -1,7 +1,7 @@ import { contentFetchingTests } from './content-fetching.ts' import { contentRoutingTests } from './content-routing.ts' import { peerRoutingTests } from './peer-routing.ts' -import type { DaemonFactory } from '../index.js' +import type { DaemonFactory } from '../index.ts' export async function dhtTests (factory: DaemonFactory): Promise { contentFetchingTests(factory) diff --git a/packages/interop/src/dht/peer-routing.ts b/packages/interop/src/dht/peer-routing.ts index 00c2a18c60..d8425039bf 100644 --- a/packages/interop/src/dht/peer-routing.ts +++ b/packages/interop/src/dht/peer-routing.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import pRetry from 'p-retry' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.ts' import type { PeerInfo } from '@libp2p/interface' export function peerRoutingTests (factory: DaemonFactory): void { diff --git a/packages/interop/src/pubsub/floodsub.ts b/packages/interop/src/pubsub/floodsub.ts index 93af4b5894..e96e433bd6 100644 --- a/packages/interop/src/pubsub/floodsub.ts +++ b/packages/interop/src/pubsub/floodsub.ts @@ -2,7 +2,7 @@ import { expect } from 'aegir/chai' import first from 'it-first' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { waitForSubscribed } from './utils.ts' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.ts' export function floodsubTests (factory: DaemonFactory): void { const nodeTypes: NodeType[] = ['js', 'go'] diff --git a/packages/interop/src/pubsub/gossipsub.ts b/packages/interop/src/pubsub/gossipsub.ts index 8317774197..8638ed5279 100644 --- a/packages/interop/src/pubsub/gossipsub.ts +++ b/packages/interop/src/pubsub/gossipsub.ts @@ -2,7 +2,7 @@ import { expect } from 'aegir/chai' import first from 'it-first' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { waitForSubscribed } from './utils.ts' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.ts' export function gossipsubTests (factory: DaemonFactory): void { const nodeTypes: NodeType[] = ['js', 'go'] diff --git a/packages/interop/src/pubsub/hybrid.ts b/packages/interop/src/pubsub/hybrid.ts index 7c5935a222..0c4f396f65 100644 --- a/packages/interop/src/pubsub/hybrid.ts +++ b/packages/interop/src/pubsub/hybrid.ts @@ -2,7 +2,7 @@ import { expect } from 'aegir/chai' import first from 'it-first' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { waitForSubscribed } from './utils.ts' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.ts' export function hybridTests (factory: DaemonFactory): void { const nodeTypes: NodeType[] = ['js', 'go'] diff --git a/packages/interop/src/pubsub/index.ts b/packages/interop/src/pubsub/index.ts index b39d5d02a6..b0dc890528 100644 --- a/packages/interop/src/pubsub/index.ts +++ b/packages/interop/src/pubsub/index.ts @@ -1,7 +1,7 @@ import { floodsubTests } from './floodsub.ts' import { gossipsubTests } from './gossipsub.ts' import { hybridTests } from './hybrid.ts' -import type { DaemonFactory } from '../index.js' +import type { DaemonFactory } from '../index.ts' export async function pubsubTests (factory: DaemonFactory): Promise { floodsubTests(factory) diff --git a/packages/interop/src/pubsub/utils.ts b/packages/interop/src/pubsub/utils.ts index f2edc384b9..14a1e7efcf 100644 --- a/packages/interop/src/pubsub/utils.ts +++ b/packages/interop/src/pubsub/utils.ts @@ -1,6 +1,6 @@ import delay from 'delay' import pWaitFor from 'p-wait-for' -import type { Daemon } from '../index.js' +import type { Daemon } from '../index.ts' /** * Wait for daemon a to see daemon b in it's subscriber list diff --git a/packages/interop/src/relay/index.ts b/packages/interop/src/relay/index.ts index 69d5267094..867114fd00 100644 --- a/packages/interop/src/relay/index.ts +++ b/packages/interop/src/relay/index.ts @@ -4,7 +4,7 @@ import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { Status } from './pb/index.ts' import { echoHandler, reserve } from './util.ts' -import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, NodeType, SpawnOptions } from '../index.ts' import type { IdentifyResult } from '@libp2p/daemon-client' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/interop/src/relay/util.ts b/packages/interop/src/relay/util.ts index efc6568f89..0bac16671e 100644 --- a/packages/interop/src/relay/util.ts +++ b/packages/interop/src/relay/util.ts @@ -1,6 +1,6 @@ import { pbStream, echo } from '@libp2p/utils' import { HopMessage } from './pb/index.ts' -import type { Daemon } from '../index.js' +import type { Daemon } from '../index.ts' import type { PeerId, Stream } from '@libp2p/interface' const RELAY_V2_HOP = '/libp2p/circuit/relay/0.2.0/hop' diff --git a/packages/interop/src/resources/keys/index.ts b/packages/interop/src/resources/keys/index.ts index ee2b859ea9..d0a28148c5 100644 --- a/packages/interop/src/resources/keys/index.ts +++ b/packages/interop/src/resources/keys/index.ts @@ -1,6 +1,6 @@ import path from 'node:path' import { fileURLToPath } from 'node:url' -import type { NodeType, PeerIdType } from '../../index.js' +import type { NodeType, PeerIdType } from '../../index.ts' const __dirname = path.dirname(fileURLToPath(import.meta.url)) diff --git a/packages/interop/src/streams/echo.ts b/packages/interop/src/streams/echo.ts index 3334172afa..3aa1a0b1c5 100644 --- a/packages/interop/src/streams/echo.ts +++ b/packages/interop/src/streams/echo.ts @@ -2,7 +2,7 @@ import { lpStream } from '@libp2p/utils' import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { echoHandler } from '../relay/util.ts' -import type { Daemon, DaemonFactory, SpawnOptions } from '../index.js' +import type { Daemon, DaemonFactory, SpawnOptions } from '../index.ts' export function echoStreamTests (name: string, factory: DaemonFactory, optionsA: SpawnOptions, optionsB: SpawnOptions): void { describe(name, () => { diff --git a/packages/interop/src/streams/index.ts b/packages/interop/src/streams/index.ts index 72914eb2dc..5fa7e7be57 100644 --- a/packages/interop/src/streams/index.ts +++ b/packages/interop/src/streams/index.ts @@ -1,6 +1,6 @@ -import { runTests } from '../utils/test-matrix.js' +import { runTests } from '../utils/test-matrix.ts' import { echoStreamTests } from './echo.ts' -import type { DaemonFactory } from '../index.js' +import type { DaemonFactory } from '../index.ts' export async function streamTests (factory: DaemonFactory): Promise { runTests('echo', echoStreamTests, factory) diff --git a/packages/interop/src/utils/test-matrix.ts b/packages/interop/src/utils/test-matrix.ts index b7978248cd..4ad2afa128 100644 --- a/packages/interop/src/utils/test-matrix.ts +++ b/packages/interop/src/utils/test-matrix.ts @@ -1,5 +1,5 @@ -import { keys } from '../resources/keys/index.js' -import type { DaemonFactory, Encryption, Muxer, NodeType, PeerIdType, SpawnOptions } from '../index.js' +import { keys } from '../resources/keys/index.ts' +import type { DaemonFactory, Encryption, Muxer, NodeType, PeerIdType, SpawnOptions } from '../index.ts' export interface TestFunction { (name: string, factory: DaemonFactory, optionsA: SpawnOptions, optionsB: SpawnOptions): void diff --git a/packages/kad-dht/package.json b/packages/kad-dht/package.json index 87f0d95041..c9bdd385b3 100644 --- a/packages/kad-dht/package.json +++ b/packages/kad-dht/package.json @@ -78,7 +78,7 @@ "race-signal": "^2.0.0", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", @@ -87,7 +87,7 @@ "@types/lodash.range": "^3.2.9", "@types/sinon": "^21.0.1", "@types/which": "^3.0.4", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "benchmark": "^2.1.4", "datastore-core": "^11.0.1", "delay": "^7.0.0", diff --git a/packages/kad-dht/src/content-fetching/index.ts b/packages/kad-dht/src/content-fetching/index.ts index 25e06c1d4c..0122e8fc1e 100644 --- a/packages/kad-dht/src/content-fetching/index.ts +++ b/packages/kad-dht/src/content-fetching/index.ts @@ -6,22 +6,22 @@ import { pipe } from 'it-pipe' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { ALPHA -} from '../constants.js' -import { QueryError } from '../errors.js' -import { MessageType } from '../message/dht.js' +} from '../constants.ts' +import { QueryError } from '../errors.ts' +import { MessageType } from '../message/dht.ts' import { valueEvent, queryErrorEvent -} from '../query/events.js' -import { bestRecord } from '../record/selectors.js' -import { verifyRecord } from '../record/validators.js' -import { createPutRecord, bufferToRecordKey } from '../utils.js' -import type { KadDHTComponents, Validators, Selectors, ValueEvent, QueryEvent } from '../index.js' -import type { Message } from '../message/dht.js' -import type { Network, SendMessageOptions } from '../network.js' -import type { PeerRouting } from '../peer-routing/index.js' -import type { QueryManager } from '../query/manager.js' -import type { QueryFunc } from '../query/types.js' +} from '../query/events.ts' +import { bestRecord } from '../record/selectors.ts' +import { verifyRecord } from '../record/validators.ts' +import { createPutRecord, bufferToRecordKey } from '../utils.ts' +import type { KadDHTComponents, Validators, Selectors, ValueEvent, QueryEvent } from '../index.ts' +import type { Message } from '../message/dht.ts' +import type { Network, SendMessageOptions } from '../network.ts' +import type { PeerRouting } from '../peer-routing/index.ts' +import type { QueryManager } from '../query/manager.ts' +import type { QueryFunc } from '../query/types.ts' import type { AbortOptions, Logger, RoutingOptions } from '@libp2p/interface' export interface ContentFetchingInit { diff --git a/packages/kad-dht/src/content-routing/index.ts b/packages/kad-dht/src/content-routing/index.ts index 8039c7c968..656191cb03 100644 --- a/packages/kad-dht/src/content-routing/index.ts +++ b/packages/kad-dht/src/content-routing/index.ts @@ -1,22 +1,22 @@ import { PeerSet } from '@libp2p/peer-collections' import { Queue } from '@libp2p/utils' import { pushable } from 'it-pushable' -import { ALPHA } from '../constants.js' -import { MessageType } from '../message/dht.js' -import { toPbPeerInfo } from '../message/utils.js' +import { ALPHA } from '../constants.ts' +import { MessageType } from '../message/dht.ts' +import { toPbPeerInfo } from '../message/utils.ts' import { queryErrorEvent, peerResponseEvent, providerEvent -} from '../query/events.js' -import type { FinalPeerEvent, KadDHTComponents, PeerResponseEvent, ProviderEvent, QueryEvent } from '../index.js' -import type { Message } from '../message/dht.js' -import type { Network } from '../network.js' -import type { PeerRouting } from '../peer-routing/index.js' -import type { Providers } from '../providers.js' -import type { QueryManager } from '../query/manager.js' -import type { QueryFunc } from '../query/types.js' -import type { RoutingTable } from '../routing-table/index.js' +} from '../query/events.ts' +import type { FinalPeerEvent, KadDHTComponents, PeerResponseEvent, ProviderEvent, QueryEvent } from '../index.ts' +import type { Message } from '../message/dht.ts' +import type { Network } from '../network.ts' +import type { PeerRouting } from '../peer-routing/index.ts' +import type { Providers } from '../providers.ts' +import type { QueryManager } from '../query/manager.ts' +import type { QueryFunc } from '../query/types.ts' +import type { RoutingTable } from '../routing-table/index.ts' import type { Logger, PeerInfo, RoutingOptions } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' import type { CID } from 'multiformats/cid' diff --git a/packages/kad-dht/src/peer-routing/index.ts b/packages/kad-dht/src/peer-routing/index.ts index ce10abb290..10968012d7 100644 --- a/packages/kad-dht/src/peer-routing/index.ts +++ b/packages/kad-dht/src/peer-routing/index.ts @@ -3,22 +3,22 @@ import { InvalidPublicKeyError, NotFoundError } from '@libp2p/interface' import { peerIdFromPublicKey, peerIdFromMultihash } from '@libp2p/peer-id' import { Libp2pRecord } from '@libp2p/record' import * as Digest from 'multiformats/hashes/digest' -import { QueryError, InvalidRecordError } from '../errors.js' -import { MessageType } from '../message/dht.js' -import { PeerDistanceList } from '../peer-distance-list.js' +import { QueryError, InvalidRecordError } from '../errors.ts' +import { MessageType } from '../message/dht.ts' +import { PeerDistanceList } from '../peer-distance-list.ts' import { queryErrorEvent, finalPeerEvent, valueEvent -} from '../query/events.js' -import { verifyRecord } from '../record/validators.js' -import { convertBuffer, keyForPublicKey } from '../utils.js' -import type { DHTRecord, FinalPeerEvent, QueryEvent, Validators } from '../index.js' -import type { Message } from '../message/dht.js' -import type { Network, SendMessageOptions } from '../network.js' -import type { QueryManager, QueryOptions } from '../query/manager.js' -import type { QueryFunc } from '../query/types.js' -import type { RoutingTable } from '../routing-table/index.js' +} from '../query/events.ts' +import { verifyRecord } from '../record/validators.ts' +import { convertBuffer, keyForPublicKey } from '../utils.ts' +import type { DHTRecord, FinalPeerEvent, QueryEvent, Validators } from '../index.ts' +import type { Message } from '../message/dht.ts' +import type { Network, SendMessageOptions } from '../network.ts' +import type { QueryManager, QueryOptions } from '../query/manager.ts' +import type { QueryFunc } from '../query/types.ts' +import type { RoutingTable } from '../routing-table/index.ts' import type { GetClosestPeersOptions } from '../routing-table/k-bucket.ts' import type { ComponentLogger, Logger, Metrics, PeerId, PeerInfo, PeerStore, RoutingOptions } from '@libp2p/interface' import type { AbortOptions } from 'it-pushable' diff --git a/packages/kad-dht/src/query/events.ts b/packages/kad-dht/src/query/events.ts index ed6e07f053..dc8178272b 100644 --- a/packages/kad-dht/src/query/events.ts +++ b/packages/kad-dht/src/query/events.ts @@ -1,4 +1,4 @@ -import type { MessageType, SendQueryEvent, PeerResponseEvent, AddPeerEvent, ValueEvent, ProviderEvent, QueryErrorEvent, FinalPeerEvent, DisjointPath, PathEndedEvent, DialPeerEvent } from '../index.js' +import type { MessageType, SendQueryEvent, PeerResponseEvent, AddPeerEvent, ValueEvent, ProviderEvent, QueryErrorEvent, FinalPeerEvent, DisjointPath, PathEndedEvent, DialPeerEvent } from '../index.ts' import type { PeerId, PeerInfo } from '@libp2p/interface' import type { Libp2pRecord } from '@libp2p/record' import type { ProgressOptions } from 'progress-events' diff --git a/packages/kad-dht/src/query/manager.ts b/packages/kad-dht/src/query/manager.ts index 8f43dcf251..9ee21f8611 100644 --- a/packages/kad-dht/src/query/manager.ts +++ b/packages/kad-dht/src/query/manager.ts @@ -7,12 +7,12 @@ import { raceSignal } from 'race-signal' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { ALPHA, K, DEFAULT_QUERY_TIMEOUT -} from '../constants.js' -import { convertBuffer } from '../utils.js' +} from '../constants.ts' +import { convertBuffer } from '../utils.ts' import { queryPath } from './query-path.ts' import type { QueryFunc } from './types.ts' -import type { QueryEvent } from '../index.js' -import type { RoutingTable } from '../routing-table/index.js' +import type { QueryEvent } from '../index.ts' +import type { RoutingTable } from '../routing-table/index.ts' import type { ComponentLogger, Metrics, PeerId, RoutingOptions, Startable } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { DeferredPromise } from 'p-defer' diff --git a/packages/kad-dht/src/query/query-path.ts b/packages/kad-dht/src/query/query-path.ts index cddf19ac3f..d79e695a75 100644 --- a/packages/kad-dht/src/query/query-path.ts +++ b/packages/kad-dht/src/query/query-path.ts @@ -3,10 +3,10 @@ import { Queue } from '@libp2p/utils' import { pushable } from 'it-pushable' import { xor as uint8ArrayXor } from 'uint8arrays/xor' import { xorCompare as uint8ArrayXorCompare } from 'uint8arrays/xor-compare' -import { convertPeerId, convertBuffer } from '../utils.js' +import { convertPeerId, convertBuffer } from '../utils.ts' import { pathEndedEvent, queryErrorEvent } from './events.ts' -import type { QueryEvent } from '../index.js' -import type { QueryFunc } from '../query/types.js' +import type { QueryEvent } from '../index.ts' +import type { QueryFunc } from '../query/types.ts' import type { Logger, PeerId, RoutingOptions, AbortOptions, PeerInfo } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { Filter } from '@libp2p/utils' diff --git a/packages/kad-dht/src/query/types.ts b/packages/kad-dht/src/query/types.ts index 2cb7670aee..69d5a1985f 100644 --- a/packages/kad-dht/src/query/types.ts +++ b/packages/kad-dht/src/query/types.ts @@ -1,4 +1,4 @@ -import type { DisjointPath, QueryEvent } from '../index.js' +import type { DisjointPath, QueryEvent } from '../index.ts' import type { PeerInfo } from '@libp2p/interface' export interface QueryContext { diff --git a/packages/kad-dht/src/record/selectors.ts b/packages/kad-dht/src/record/selectors.ts index 34bc49b2fe..1af7571d5a 100644 --- a/packages/kad-dht/src/record/selectors.ts +++ b/packages/kad-dht/src/record/selectors.ts @@ -1,7 +1,7 @@ import { InvalidParametersError } from '@libp2p/interface' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { MissingSelectorError } from '../errors.js' -import type { Selectors } from '../index.js' +import { MissingSelectorError } from '../errors.ts' +import type { Selectors } from '../index.ts' /** * Select the best record out of the given records diff --git a/packages/kad-dht/src/record/validators.ts b/packages/kad-dht/src/record/validators.ts index f7d7dd9f2b..d708661157 100644 --- a/packages/kad-dht/src/record/validators.ts +++ b/packages/kad-dht/src/record/validators.ts @@ -2,7 +2,7 @@ import { publicKeyFromProtobuf } from '@libp2p/crypto/keys' import { InvalidParametersError } from '@libp2p/interface' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import type { Validators } from '../index.js' +import type { Validators } from '../index.ts' import type { Libp2pRecord } from '@libp2p/record' import type { AbortOptions } from 'it-pushable' diff --git a/packages/kad-dht/src/routing-table/closest-peers.ts b/packages/kad-dht/src/routing-table/closest-peers.ts index 1df350c6c0..2bb619ee1e 100644 --- a/packages/kad-dht/src/routing-table/closest-peers.ts +++ b/packages/kad-dht/src/routing-table/closest-peers.ts @@ -1,7 +1,7 @@ import { PeerSet } from '@libp2p/peer-collections' -import { KEEP_ALIVE_TAG } from '../constants.js' -import { PeerDistanceList } from '../peer-distance-list.js' -import { convertPeerId } from '../utils.js' +import { KEEP_ALIVE_TAG } from '../constants.ts' +import { PeerDistanceList } from '../peer-distance-list.ts' +import { convertPeerId } from '../utils.ts' import type { RoutingTable } from './index.ts' import type { ComponentLogger, Logger, Metrics, PeerId, PeerStore, Startable } from '@libp2p/interface' diff --git a/packages/kad-dht/src/routing-table/index.ts b/packages/kad-dht/src/routing-table/index.ts index dcd2bfa809..19d66795c7 100644 --- a/packages/kad-dht/src/routing-table/index.ts +++ b/packages/kad-dht/src/routing-table/index.ts @@ -3,11 +3,11 @@ import { AdaptiveTimeout, PeerQueue } from '@libp2p/utils' import { anySignal } from 'any-signal' import parallel from 'it-parallel' import { TypedEventEmitter, setMaxListeners } from 'main-event' -import * as utils from '../utils.js' +import * as utils from '../utils.ts' import { ClosestPeers } from './closest-peers.ts' import { KBucket, isLeafBucket } from './k-bucket.ts' import type { Bucket, GetClosestPeersOptions, LeafBucket, Peer } from './k-bucket.ts' -import type { Network } from '../network.js' +import type { Network } from '../network.ts' import type { AbortOptions, ComponentLogger, CounterGroup, Logger, Metric, Metrics, PeerId, PeerStore, Startable, Stream } from '@libp2p/interface' import type { Ping } from '@libp2p/ping' import type { AdaptiveTimeoutInit } from '@libp2p/utils' diff --git a/packages/kad-dht/src/routing-table/k-bucket.ts b/packages/kad-dht/src/routing-table/k-bucket.ts index b844fc908b..91cb289240 100644 --- a/packages/kad-dht/src/routing-table/k-bucket.ts +++ b/packages/kad-dht/src/routing-table/k-bucket.ts @@ -3,8 +3,8 @@ import map from 'it-map' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { xor as uint8ArrayXor } from 'uint8arrays/xor' -import { PeerDistanceList } from '../peer-distance-list.js' -import { convertPeerId } from '../utils.js' +import { PeerDistanceList } from '../peer-distance-list.ts' +import { convertPeerId } from '../utils.ts' import { KBUCKET_SIZE, LAST_PING_THRESHOLD, PING_OLD_CONTACT_COUNT, PREFIX_LENGTH } from './index.ts' import type { PeerId, AbortOptions, Metrics } from '@libp2p/interface' diff --git a/packages/kad-dht/src/routing-table/refresh.ts b/packages/kad-dht/src/routing-table/refresh.ts index d08f3f4b39..387c03d6d7 100644 --- a/packages/kad-dht/src/routing-table/refresh.ts +++ b/packages/kad-dht/src/routing-table/refresh.ts @@ -6,10 +6,10 @@ import { setMaxListeners } from 'main-event' import * as Digest from 'multiformats/hashes/digest' import { sha256 } from 'multiformats/hashes/sha2' import { xor as uint8ArrayXor } from 'uint8arrays/xor' -import { TABLE_REFRESH_INTERVAL, TABLE_REFRESH_QUERY_TIMEOUT } from '../constants.js' +import { TABLE_REFRESH_INTERVAL, TABLE_REFRESH_QUERY_TIMEOUT } from '../constants.ts' import GENERATED_PREFIXES from './generated-prefix-list.ts' import type { RoutingTable } from './index.ts' -import type { PeerRouting } from '../peer-routing/index.js' +import type { PeerRouting } from '../peer-routing/index.ts' import type { AbortOptions, ComponentLogger, Logger, PeerId } from '@libp2p/interface' /** diff --git a/packages/kad-dht/src/rpc/handlers/add-provider.ts b/packages/kad-dht/src/rpc/handlers/add-provider.ts index 9b6443f8c5..262a8b7ee4 100644 --- a/packages/kad-dht/src/rpc/handlers/add-provider.ts +++ b/packages/kad-dht/src/rpc/handlers/add-provider.ts @@ -3,9 +3,9 @@ import { peerIdFromMultihash } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { CID } from 'multiformats/cid' import * as Digest from 'multiformats/hashes/digest' -import type { Message } from '../../message/dht.js' -import type { Providers } from '../../providers.js' -import type { DHTMessageHandler } from '../index.js' +import type { Message } from '../../message/dht.ts' +import type { Providers } from '../../providers.ts' +import type { DHTMessageHandler } from '../index.ts' import type { ComponentLogger, Logger, PeerId, PeerStore } from '@libp2p/interface' export interface AddProviderComponents { diff --git a/packages/kad-dht/src/rpc/handlers/find-node.ts b/packages/kad-dht/src/rpc/handlers/find-node.ts index c233e5a187..a50e63ca31 100644 --- a/packages/kad-dht/src/rpc/handlers/find-node.ts +++ b/packages/kad-dht/src/rpc/handlers/find-node.ts @@ -1,11 +1,11 @@ import { InvalidMessageError } from '@libp2p/interface' import { CODE_P2P } from '@multiformats/multiaddr' import { equals as uint8ArrayEquals } from 'uint8arrays' -import { MessageType } from '../../message/dht.js' -import type { PeerInfoMapper } from '../../index.js' -import type { Message } from '../../message/dht.js' -import type { PeerRouting } from '../../peer-routing/index.js' -import type { DHTMessageHandler } from '../index.js' +import { MessageType } from '../../message/dht.ts' +import type { PeerInfoMapper } from '../../index.ts' +import type { Message } from '../../message/dht.ts' +import type { PeerRouting } from '../../peer-routing/index.ts' +import type { DHTMessageHandler } from '../index.ts' import type { ComponentLogger, Logger, PeerId, PeerInfo } from '@libp2p/interface' import type { AddressManager } from '@libp2p/interface-internal' diff --git a/packages/kad-dht/src/rpc/handlers/get-providers.ts b/packages/kad-dht/src/rpc/handlers/get-providers.ts index c695a4af2d..ab6148f629 100644 --- a/packages/kad-dht/src/rpc/handlers/get-providers.ts +++ b/packages/kad-dht/src/rpc/handlers/get-providers.ts @@ -2,12 +2,12 @@ import { InvalidMessageError } from '@libp2p/interface' import all from 'it-all' import map from 'it-map' import { CID } from 'multiformats/cid' -import { MessageType } from '../../message/dht.js' -import type { PeerInfoMapper } from '../../index.js' -import type { Message } from '../../message/dht.js' -import type { PeerRouting } from '../../peer-routing/index.js' -import type { Providers } from '../../providers.js' -import type { DHTMessageHandler } from '../index.js' +import { MessageType } from '../../message/dht.ts' +import type { PeerInfoMapper } from '../../index.ts' +import type { Message } from '../../message/dht.ts' +import type { PeerRouting } from '../../peer-routing/index.ts' +import type { Providers } from '../../providers.ts' +import type { DHTMessageHandler } from '../index.ts' import type { ComponentLogger, Logger, PeerId, PeerInfo, PeerStore } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/kad-dht/src/rpc/handlers/get-value.ts b/packages/kad-dht/src/rpc/handlers/get-value.ts index 5d8eb7a256..56463e9618 100644 --- a/packages/kad-dht/src/rpc/handlers/get-value.ts +++ b/packages/kad-dht/src/rpc/handlers/get-value.ts @@ -3,12 +3,12 @@ import { InvalidMessageError, NotFoundError } from '@libp2p/interface' import { Libp2pRecord } from '@libp2p/record' import { PROVIDERS_VALIDITY -} from '../../constants.js' -import { MessageType } from '../../message/dht.js' -import { bufferToRecordKey, isPublicKeyKey, fromPublicKeyKey } from '../../utils.js' -import type { Message } from '../../message/dht.js' -import type { PeerRouting } from '../../peer-routing/index.js' -import type { DHTMessageHandler } from '../index.js' +} from '../../constants.ts' +import { MessageType } from '../../message/dht.ts' +import { bufferToRecordKey, isPublicKeyKey, fromPublicKeyKey } from '../../utils.ts' +import type { Message } from '../../message/dht.ts' +import type { PeerRouting } from '../../peer-routing/index.ts' +import type { DHTMessageHandler } from '../index.ts' import type { ComponentLogger, Logger, PeerId, PeerStore } from '@libp2p/interface' import type { Datastore } from 'interface-datastore' diff --git a/packages/kad-dht/src/rpc/handlers/ping.ts b/packages/kad-dht/src/rpc/handlers/ping.ts index f1e16357c7..b02bf26051 100644 --- a/packages/kad-dht/src/rpc/handlers/ping.ts +++ b/packages/kad-dht/src/rpc/handlers/ping.ts @@ -1,5 +1,5 @@ -import type { Message } from '../../message/dht.js' -import type { DHTMessageHandler } from '../index.js' +import type { Message } from '../../message/dht.ts' +import type { DHTMessageHandler } from '../index.ts' import type { ComponentLogger, Logger, PeerId } from '@libp2p/interface' export interface PingComponents { diff --git a/packages/kad-dht/src/rpc/handlers/put-value.ts b/packages/kad-dht/src/rpc/handlers/put-value.ts index 6582703a36..32f3a0d398 100644 --- a/packages/kad-dht/src/rpc/handlers/put-value.ts +++ b/packages/kad-dht/src/rpc/handlers/put-value.ts @@ -1,10 +1,10 @@ import { InvalidMessageError } from '@libp2p/interface' import { Libp2pRecord } from '@libp2p/record' -import { verifyRecord } from '../../record/validators.js' -import { bufferToRecordKey } from '../../utils.js' -import type { Validators } from '../../index.js' -import type { Message } from '../../message/dht.js' -import type { DHTMessageHandler } from '../index.js' +import { verifyRecord } from '../../record/validators.ts' +import { bufferToRecordKey } from '../../utils.ts' +import type { Validators } from '../../index.ts' +import type { Message } from '../../message/dht.ts' +import type { DHTMessageHandler } from '../index.ts' import type { ComponentLogger, Logger, PeerId } from '@libp2p/interface' import type { Datastore } from 'interface-datastore' diff --git a/packages/kad-dht/src/rpc/index.ts b/packages/kad-dht/src/rpc/index.ts index 0f2a3cd996..35a1ee5800 100644 --- a/packages/kad-dht/src/rpc/index.ts +++ b/packages/kad-dht/src/rpc/index.ts @@ -1,20 +1,20 @@ import { InvalidMessageError, TimeoutError } from '@libp2p/interface' import { pbStream } from '@libp2p/utils' -import { Message, MessageType } from '../message/dht.js' +import { Message, MessageType } from '../message/dht.ts' import { AddProviderHandler } from './handlers/add-provider.ts' import { FindNodeHandler } from './handlers/find-node.ts' import { GetProvidersHandler } from './handlers/get-providers.ts' import { GetValueHandler } from './handlers/get-value.ts' import { PingHandler } from './handlers/ping.ts' import { PutValueHandler } from './handlers/put-value.ts' -import type { PeerInfoMapper, Validators } from '../index.js' -import type { PeerRouting } from '../peer-routing/index.js' -import type { Providers } from '../providers.js' +import type { PeerInfoMapper, Validators } from '../index.ts' +import type { PeerRouting } from '../peer-routing/index.ts' +import type { Providers } from '../providers.ts' import type { FindNodeHandlerComponents } from './handlers/find-node.ts' import type { GetProvidersHandlerComponents } from './handlers/get-providers.ts' import type { GetValueHandlerComponents } from './handlers/get-value.ts' import type { PutValueHandlerComponents } from './handlers/put-value.ts' -import type { RoutingTable } from '../routing-table/index.js' +import type { RoutingTable } from '../routing-table/index.ts' import type { CounterGroup, Logger, Metrics, PeerId, MetricGroup, Connection, Stream } from '@libp2p/interface' export interface DHTMessageHandler { diff --git a/packages/kad-dht/test/closest-peers.spec.ts b/packages/kad-dht/test/closest-peers.spec.ts index d6f50edf9c..1f6612b03f 100644 --- a/packages/kad-dht/test/closest-peers.spec.ts +++ b/packages/kad-dht/test/closest-peers.spec.ts @@ -7,10 +7,10 @@ import delay from 'delay' import { stubInterface } from 'sinon-ts' import { xor } from 'uint8arrays/xor' import { xorCompare } from 'uint8arrays/xor-compare' -import { KEEP_ALIVE_TAG } from '../src/constants.js' -import { ClosestPeers } from '../src/routing-table/closest-peers.js' -import { convertPeerId } from '../src/utils.js' -import type { RoutingTable } from '../src/routing-table/index.js' +import { KEEP_ALIVE_TAG } from '../src/constants.ts' +import { ClosestPeers } from '../src/routing-table/closest-peers.ts' +import { convertPeerId } from '../src/utils.ts' +import type { RoutingTable } from '../src/routing-table/index.ts' import type { ComponentLogger, PeerId, PeerStore } from '@libp2p/interface' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/kad-dht/test/content-routing.spec.ts b/packages/kad-dht/test/content-routing.spec.ts index 001dee4fb1..39191eab8a 100644 --- a/packages/kad-dht/test/content-routing.spec.ts +++ b/packages/kad-dht/test/content-routing.spec.ts @@ -6,12 +6,12 @@ import delay from 'delay' import all from 'it-all' import drain from 'it-drain' import sinon from 'sinon' -import { MessageType } from '../src/index.js' -import * as kadUtils from '../src/utils.js' +import { MessageType } from '../src/index.ts' +import * as kadUtils from '../src/utils.ts' import { createValues } from './utils/create-values.ts' import { sortDHTs } from './utils/sort-closest-peers.ts' import { TestDHT } from './utils/test-dht.ts' -import type { QueryEvent } from '../src/index.js' +import type { QueryEvent } from '../src/index.ts' import type { PeerId } from '@libp2p/interface' import type { CID } from 'multiformats/cid' diff --git a/packages/kad-dht/test/generate-peers/generate-peers.node.ts b/packages/kad-dht/test/generate-peers/generate-peers.node.ts index 871d680317..9da852b6fc 100644 --- a/packages/kad-dht/test/generate-peers/generate-peers.node.ts +++ b/packages/kad-dht/test/generate-peers/generate-peers.node.ts @@ -9,12 +9,12 @@ import { execa } from 'execa' import { stubInterface } from 'sinon-ts' import { toString as uintArrayToString } from 'uint8arrays/to-string' import which from 'which' -import { RoutingTable } from '../../src/routing-table/index.js' -import { RoutingTableRefresh } from '../../src/routing-table/refresh.js' +import { RoutingTable } from '../../src/routing-table/index.ts' +import { RoutingTableRefresh } from '../../src/routing-table/refresh.ts' import { convertPeerId -} from '../../src/utils.js' -import type { Network } from '../../src/network.js' +} from '../../src/utils.ts' +import type { Network } from '../../src/network.ts' import type { PeerStore } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { Ping } from '@libp2p/ping' diff --git a/packages/kad-dht/test/kad-dht.spec.ts b/packages/kad-dht/test/kad-dht.spec.ts index d6508c28d3..5b20e71345 100644 --- a/packages/kad-dht/test/kad-dht.spec.ts +++ b/packages/kad-dht/test/kad-dht.spec.ts @@ -10,14 +10,14 @@ import filter from 'it-filter' import last from 'it-last' import sinon from 'sinon' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { MessageType } from '../src/index.js' -import { peerResponseEvent } from '../src/query/events.js' -import * as kadUtils from '../src/utils.js' +import { MessageType } from '../src/index.ts' +import { peerResponseEvent } from '../src/query/events.ts' +import * as kadUtils from '../src/utils.ts' import { createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' import { sortDHTs } from './utils/sort-closest-peers.ts' import { TestDHT } from './utils/test-dht.ts' import type { PeerAndKey } from './utils/create-peer-id.ts' -import type { FinalPeerEvent, QueryEvent, ValueEvent } from '../src/index.js' +import type { FinalPeerEvent, QueryEvent, ValueEvent } from '../src/index.ts' import type { AbortOptions, PeerId } from '@libp2p/interface' async function findEvent (events: AsyncIterable, name: 'FINAL_PEER'): Promise diff --git a/packages/kad-dht/test/kad-utils.spec.ts b/packages/kad-dht/test/kad-utils.spec.ts index afc5d940d7..b5e0c4a015 100644 --- a/packages/kad-dht/test/kad-utils.spec.ts +++ b/packages/kad-dht/test/kad-utils.spec.ts @@ -3,7 +3,7 @@ import { expect } from 'aegir/chai' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import * as utils from '../src/utils.js' +import * as utils from '../src/utils.ts' import { createPeerIdWithPrivateKey, createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' describe('kad utils', () => { diff --git a/packages/kad-dht/test/libp2p-routing.spec.ts b/packages/kad-dht/test/libp2p-routing.spec.ts index 4477dccdaf..10e9db2458 100644 --- a/packages/kad-dht/test/libp2p-routing.spec.ts +++ b/packages/kad-dht/test/libp2p-routing.spec.ts @@ -12,12 +12,12 @@ import { TypedEventEmitter } from 'main-event' import { CID } from 'multiformats/cid' import pDefer from 'p-defer' import { stubInterface } from 'sinon-ts' -import { kadDHT, passthroughMapper } from '../src/index.js' -import { Message, MessageType } from '../src/message/dht.js' -import { convertBuffer } from '../src/utils.js' +import { kadDHT, passthroughMapper } from '../src/index.ts' +import { Message, MessageType } from '../src/message/dht.ts' +import { convertBuffer } from '../src/utils.ts' import { createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' import { sortClosestPeers } from './utils/sort-closest-peers.ts' -import type { KadDHT } from '../src/index.js' +import type { KadDHT } from '../src/index.ts' import type { PeerAndKey } from './utils/create-peer-id.ts' import type { ContentRouting, PeerStore, PeerId, ComponentLogger, Connection, Peer, Stream, PeerRouting, PrivateKey } from '@libp2p/interface' import type { AddressManager, ConnectionManager, Registrar } from '@libp2p/interface-internal' diff --git a/packages/kad-dht/test/message.node.ts b/packages/kad-dht/test/message.node.ts index 60e15e76ee..71657f9ae5 100644 --- a/packages/kad-dht/test/message.node.ts +++ b/packages/kad-dht/test/message.node.ts @@ -6,7 +6,7 @@ import { Libp2pRecord } from '@libp2p/record' import { expect } from 'aegir/chai' import range from 'lodash.range' import * as Digest from 'multiformats/hashes/digest' -import { Message } from '../src/message/dht.js' +import { Message } from '../src/message/dht.ts' describe('Message', () => { it('go-interop', () => { diff --git a/packages/kad-dht/test/message.spec.ts b/packages/kad-dht/test/message.spec.ts index df3fbd0e28..c54121646c 100644 --- a/packages/kad-dht/test/message.spec.ts +++ b/packages/kad-dht/test/message.spec.ts @@ -5,8 +5,8 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import random from 'lodash.random' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { Message, MessageType } from '../src/message/dht.js' -import { toPbPeerInfo } from '../src/message/utils.js' +import { Message, MessageType } from '../src/message/dht.ts' +import { toPbPeerInfo } from '../src/message/utils.ts' describe('Message', () => { it('serialize & deserialize', async function () { diff --git a/packages/kad-dht/test/multiple-nodes.spec.ts b/packages/kad-dht/test/multiple-nodes.spec.ts index e1b409f642..55239abe5f 100644 --- a/packages/kad-dht/test/multiple-nodes.spec.ts +++ b/packages/kad-dht/test/multiple-nodes.spec.ts @@ -2,7 +2,7 @@ import { expect } from 'aegir/chai' import drain from 'it-drain' import last from 'it-last' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { convertBuffer } from '../src/utils.js' +import { convertBuffer } from '../src/utils.ts' import { sortDHTs } from './utils/sort-closest-peers.ts' import { TestDHT } from './utils/test-dht.ts' import type { KadDHTPeer } from './utils/test-dht.ts' diff --git a/packages/kad-dht/test/network.spec.ts b/packages/kad-dht/test/network.spec.ts index 660c064051..4acc78218c 100644 --- a/packages/kad-dht/test/network.spec.ts +++ b/packages/kad-dht/test/network.spec.ts @@ -4,7 +4,7 @@ import all from 'it-all' import * as lp from 'it-length-prefixed' import pDefer from 'p-defer' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { Message, MessageType } from '../src/message/dht.js' +import { Message, MessageType } from '../src/message/dht.ts' import { TestDHT } from './utils/test-dht.ts' import type { KadDHTPeer } from './utils/test-dht.ts' import type { DialTarget } from '@libp2p/interface' diff --git a/packages/kad-dht/test/peer-distance-list.spec.ts b/packages/kad-dht/test/peer-distance-list.spec.ts index 8507deea3d..d7ac48b442 100644 --- a/packages/kad-dht/test/peer-distance-list.spec.ts +++ b/packages/kad-dht/test/peer-distance-list.spec.ts @@ -1,7 +1,7 @@ import { peerIdFromString } from '@libp2p/peer-id' import { expect } from 'aegir/chai' -import { PeerDistanceList } from '../src/peer-distance-list.js' -import * as kadUtils from '../src/utils.js' +import { PeerDistanceList } from '../src/peer-distance-list.ts' +import * as kadUtils from '../src/utils.ts' describe('PeerDistanceList', () => { const p1 = { id: peerIdFromString('12D3KooWSExt8hTzoaHEhn435BTK6BPNSY1LpTc1j2o9Gw53tXE1'), multiaddrs: [] } diff --git a/packages/kad-dht/test/peer-routing.spec.ts b/packages/kad-dht/test/peer-routing.spec.ts index c28da08661..e455b6947f 100644 --- a/packages/kad-dht/test/peer-routing.spec.ts +++ b/packages/kad-dht/test/peer-routing.spec.ts @@ -4,16 +4,16 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { K } from '../src/constants.js' -import { PeerRouting } from '../src/peer-routing/index.js' -import { convertBuffer } from '../src/utils.js' +import { K } from '../src/constants.ts' +import { PeerRouting } from '../src/peer-routing/index.ts' +import { convertBuffer } from '../src/utils.ts' import { createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' import { sortClosestPeers } from './utils/sort-closest-peers.ts' import type { PeerAndKey } from './utils/create-peer-id.ts' -import type { Validators } from '../src/index.js' -import type { Network } from '../src/network.js' -import type { QueryManager } from '../src/query/manager.js' -import type { RoutingTable } from '../src/routing-table/index.js' +import type { Validators } from '../src/index.ts' +import type { Network } from '../src/network.ts' +import type { QueryManager } from '../src/query/manager.ts' +import type { RoutingTable } from '../src/routing-table/index.ts' import type { Peer, ComponentLogger, PeerId, PeerStore } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/kad-dht/test/providers.spec.ts b/packages/kad-dht/test/providers.spec.ts index 81b4d5e99b..c164b5bca9 100644 --- a/packages/kad-dht/test/providers.spec.ts +++ b/packages/kad-dht/test/providers.spec.ts @@ -3,7 +3,7 @@ import { peerIdFromString } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core/memory' import { CID } from 'multiformats/cid' -import { Providers } from '../src/providers.js' +import { Providers } from '../src/providers.ts' import { createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' import type { PeerAndKey } from './utils/create-peer-id.ts' diff --git a/packages/kad-dht/test/query-self.spec.ts b/packages/kad-dht/test/query-self.spec.ts index 90535d0aac..85108d1834 100644 --- a/packages/kad-dht/test/query-self.spec.ts +++ b/packages/kad-dht/test/query-self.spec.ts @@ -6,10 +6,10 @@ import delay from 'delay' import { TypedEventEmitter } from 'main-event' import pDefer from 'p-defer' import { stubInterface } from 'sinon-ts' -import { finalPeerEvent } from '../src/query/events.js' -import { QuerySelf } from '../src/query-self.js' -import type { PeerRouting } from '../src/peer-routing/index.js' -import type { RoutingTable } from '../src/routing-table/index.js' +import { finalPeerEvent } from '../src/query/events.ts' +import { QuerySelf } from '../src/query-self.ts' +import type { PeerRouting } from '../src/peer-routing/index.ts' +import type { RoutingTable } from '../src/routing-table/index.ts' import type { PeerId } from '@libp2p/interface' import type { DeferredPromise } from 'p-defer' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/kad-dht/test/query.spec.ts b/packages/kad-dht/test/query.spec.ts index 7efa74857f..0bb5081aeb 100644 --- a/packages/kad-dht/test/query.spec.ts +++ b/packages/kad-dht/test/query.spec.ts @@ -6,23 +6,23 @@ import drain from 'it-drain' import pDefer from 'p-defer' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { K } from '../src/constants.js' -import { EventTypes } from '../src/index.js' -import { MessageType } from '../src/message/dht.js' +import { K } from '../src/constants.ts' +import { EventTypes } from '../src/index.ts' +import { MessageType } from '../src/message/dht.ts' import { peerResponseEvent, valueEvent, queryErrorEvent -} from '../src/query/events.js' -import { QueryManager } from '../src/query/manager.js' -import { convertBuffer } from '../src/utils.js' +} from '../src/query/events.ts' +import { QueryManager } from '../src/query/manager.ts' +import { convertBuffer } from '../src/utils.ts' import { createPeerIdWithPrivateKey, createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' import { sortClosestPeers } from './utils/sort-closest-peers.ts' import type { PeerAndKey } from './utils/create-peer-id.ts' -import type { QueryEvent } from '../src/index.js' -import type { QueryManagerInit } from '../src/query/manager.js' -import type { QueryContext, QueryFunc } from '../src/query/types.js' -import type { RoutingTable } from '../src/routing-table/index.js' +import type { QueryEvent } from '../src/index.ts' +import type { QueryManagerInit } from '../src/query/manager.ts' +import type { QueryContext, QueryFunc } from '../src/query/types.ts' +import type { RoutingTable } from '../src/routing-table/index.ts' import type { PeerId } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/kad-dht/test/record/selection.spec.ts b/packages/kad-dht/test/record/selection.spec.ts index 8ec3f5d7ab..82dd8dc7be 100644 --- a/packages/kad-dht/test/record/selection.spec.ts +++ b/packages/kad-dht/test/record/selection.spec.ts @@ -1,8 +1,8 @@ /* eslint max-nested-callbacks: ["error", 8] */ import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import * as selection from '../../src/record/selectors.js' -import type { Selectors } from '../../src/index.js' +import * as selection from '../../src/record/selectors.ts' +import type { Selectors } from '../../src/index.ts' const records = [new Uint8Array(), uint8ArrayFromString('hello')] diff --git a/packages/kad-dht/test/record/validator.spec.ts b/packages/kad-dht/test/record/validator.spec.ts index 183f971c3d..ddff278d54 100644 --- a/packages/kad-dht/test/record/validator.spec.ts +++ b/packages/kad-dht/test/record/validator.spec.ts @@ -4,9 +4,9 @@ import { Libp2pRecord } from '@libp2p/record' import { expect } from 'aegir/chai' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import * as validator from '../../src/record/validators.js' -import * as fixture from '../fixtures/record/go-key-records.js' -import type { Validators } from '../../src/index.js' +import * as validator from '../../src/record/validators.ts' +import * as fixture from '../fixtures/record/go-key-records.ts' +import type { Validators } from '../../src/index.ts' import type { RSAPrivateKey } from '@libp2p/interface' interface Cases { diff --git a/packages/kad-dht/test/reprovider.spec.ts b/packages/kad-dht/test/reprovider.spec.ts index 2be63d4415..837925311c 100644 --- a/packages/kad-dht/test/reprovider.spec.ts +++ b/packages/kad-dht/test/reprovider.spec.ts @@ -6,11 +6,11 @@ import delay from 'delay' import { CID } from 'multiformats/cid' import { pEvent } from 'p-event' import { stubInterface } from 'sinon-ts' -import { Providers } from '../src/providers.js' -import { Reprovider } from '../src/reprovider.js' +import { Providers } from '../src/providers.ts' +import { Reprovider } from '../src/reprovider.ts' import { createPeerIdWithPrivateKey, createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' import type { PeerAndKey } from './utils/create-peer-id.ts' -import type { ContentRouting } from '../src/content-routing/index.js' +import type { ContentRouting } from '../src/content-routing/index.ts' import type { ComponentLogger, PeerId } from '@libp2p/interface' import type { AddressManager } from '@libp2p/interface-internal' import type { Datastore } from 'interface-datastore' diff --git a/packages/kad-dht/test/routing-table.spec.ts b/packages/kad-dht/test/routing-table.spec.ts index de2ccea4c6..7707425a40 100644 --- a/packages/kad-dht/test/routing-table.spec.ts +++ b/packages/kad-dht/test/routing-table.spec.ts @@ -12,16 +12,16 @@ import { TypedEventEmitter } from 'main-event' import { CID } from 'multiformats/cid' import { pEvent } from 'p-event' import { stubInterface } from 'sinon-ts' -import { PROTOCOL } from '../src/constants.js' -import { MessageType } from '../src/message/dht.js' -import { peerResponseEvent } from '../src/query/events.js' -import { KAD_PEER_TAG_NAME, KAD_PEER_TAG_VALUE, RoutingTable } from '../src/routing-table/index.js' -import { isLeafBucket } from '../src/routing-table/k-bucket.js' -import * as kadUtils from '../src/utils.js' +import { PROTOCOL } from '../src/constants.ts' +import { MessageType } from '../src/message/dht.ts' +import { peerResponseEvent } from '../src/query/events.ts' +import { KAD_PEER_TAG_NAME, KAD_PEER_TAG_VALUE, RoutingTable } from '../src/routing-table/index.ts' +import { isLeafBucket } from '../src/routing-table/k-bucket.ts' +import * as kadUtils from '../src/utils.ts' import { createPeerIdWithPrivateKey, createPeerIdsWithPrivateKey } from './utils/create-peer-id.ts' -import type { Network } from '../src/network.js' -import type { RoutingTableComponents } from '../src/routing-table/index.js' -import type { Bucket } from '../src/routing-table/k-bucket.js' +import type { Network } from '../src/network.ts' +import type { RoutingTableComponents } from '../src/routing-table/index.ts' +import type { Bucket } from '../src/routing-table/k-bucket.ts' import type { Libp2pEvents, PeerId, PeerStore, Peer } from '@libp2p/interface' import type { Ping } from '@libp2p/ping' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/kad-dht/test/rpc/handlers/add-provider.spec.ts b/packages/kad-dht/test/rpc/handlers/add-provider.spec.ts index 8764a13888..1dc5b9791c 100644 --- a/packages/kad-dht/test/rpc/handlers/add-provider.spec.ts +++ b/packages/kad-dht/test/rpc/handlers/add-provider.spec.ts @@ -5,14 +5,14 @@ import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core' import { TypedEventEmitter } from 'main-event' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { MessageType } from '../../../src/message/dht.js' -import { Providers } from '../../../src/providers.js' -import { AddProviderHandler } from '../../../src/rpc/handlers/add-provider.js' -import { createPeerIdsWithPrivateKey } from '../../utils/create-peer-id.js' -import { createValues } from '../../utils/create-values.js' -import type { Message } from '../../../src/message/dht.js' -import type { DHTMessageHandler } from '../../../src/rpc/index.js' -import type { PeerAndKey } from '../../utils/create-peer-id.js' +import { MessageType } from '../../../src/message/dht.ts' +import { Providers } from '../../../src/providers.ts' +import { AddProviderHandler } from '../../../src/rpc/handlers/add-provider.ts' +import { createPeerIdsWithPrivateKey } from '../../utils/create-peer-id.ts' +import { createValues } from '../../utils/create-values.ts' +import type { Message } from '../../../src/message/dht.ts' +import type { DHTMessageHandler } from '../../../src/rpc/index.ts' +import type { PeerAndKey } from '../../utils/create-peer-id.ts' import type { Libp2pEvents, PeerStore } from '@libp2p/interface' import type { CID } from 'multiformats' diff --git a/packages/kad-dht/test/rpc/handlers/find-node.spec.ts b/packages/kad-dht/test/rpc/handlers/find-node.spec.ts index cbe8aa704f..55919602da 100644 --- a/packages/kad-dht/test/rpc/handlers/find-node.spec.ts +++ b/packages/kad-dht/test/rpc/handlers/find-node.spec.ts @@ -5,14 +5,14 @@ import { expect } from 'aegir/chai' import * as Digest from 'multiformats/hashes/digest' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { MessageType } from '../../../src/message/dht.js' -import { PeerRouting } from '../../../src/peer-routing/index.js' -import { FindNodeHandler } from '../../../src/rpc/handlers/find-node.js' -import { passthroughMapper, removePrivateAddressesMapper, removePublicAddressesMapper } from '../../../src/utils.js' -import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.js' -import type { Message } from '../../../src/message/dht.js' -import type { DHTMessageHandler } from '../../../src/rpc/index.js' -import type { PeerAndKey } from '../../utils/create-peer-id.js' +import { MessageType } from '../../../src/message/dht.ts' +import { PeerRouting } from '../../../src/peer-routing/index.ts' +import { FindNodeHandler } from '../../../src/rpc/handlers/find-node.ts' +import { passthroughMapper, removePrivateAddressesMapper, removePublicAddressesMapper } from '../../../src/utils.ts' +import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.ts' +import type { Message } from '../../../src/message/dht.ts' +import type { DHTMessageHandler } from '../../../src/rpc/index.ts' +import type { PeerAndKey } from '../../utils/create-peer-id.ts' import type { AddressManager } from '@libp2p/interface-internal' import type { SinonStubbedInstance } from 'sinon' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/kad-dht/test/rpc/handlers/get-providers.spec.ts b/packages/kad-dht/test/rpc/handlers/get-providers.spec.ts index 6cef9ba26c..d71f94d30f 100644 --- a/packages/kad-dht/test/rpc/handlers/get-providers.spec.ts +++ b/packages/kad-dht/test/rpc/handlers/get-providers.spec.ts @@ -8,17 +8,17 @@ import { TypedEventEmitter } from 'main-event' import * as Digest from 'multiformats/hashes/digest' import Sinon from 'sinon' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { MessageType } from '../../../src/message/dht.js' -import { PeerRouting } from '../../../src/peer-routing/index.js' -import { Providers } from '../../../src/providers.js' -import { GetProvidersHandler } from '../../../src/rpc/handlers/get-providers.js' -import { passthroughMapper } from '../../../src/utils.js' -import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.js' -import { createValues } from '../../utils/create-values.js' -import type { Message } from '../../../src/message/dht.js' -import type { GetProvidersHandlerComponents } from '../../../src/rpc/handlers/get-providers.js' -import type { PeerAndKey } from '../../utils/create-peer-id.js' -import type { Value } from '../../utils/create-values.js' +import { MessageType } from '../../../src/message/dht.ts' +import { PeerRouting } from '../../../src/peer-routing/index.ts' +import { Providers } from '../../../src/providers.ts' +import { GetProvidersHandler } from '../../../src/rpc/handlers/get-providers.ts' +import { passthroughMapper } from '../../../src/utils.ts' +import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.ts' +import { createValues } from '../../utils/create-values.ts' +import type { Message } from '../../../src/message/dht.ts' +import type { GetProvidersHandlerComponents } from '../../../src/rpc/handlers/get-providers.ts' +import type { PeerAndKey } from '../../utils/create-peer-id.ts' +import type { Value } from '../../utils/create-values.ts' import type { Libp2pEvents, PeerInfo, PeerStore } from '@libp2p/interface' import type { SinonStubbedInstance } from 'sinon' diff --git a/packages/kad-dht/test/rpc/handlers/get-value.spec.ts b/packages/kad-dht/test/rpc/handlers/get-value.spec.ts index a692a5f411..b566181c9d 100644 --- a/packages/kad-dht/test/rpc/handlers/get-value.spec.ts +++ b/packages/kad-dht/test/rpc/handlers/get-value.spec.ts @@ -7,15 +7,15 @@ import { MemoryDatastore } from 'datastore-core' import { TypedEventEmitter } from 'main-event' import Sinon from 'sinon' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { PROVIDERS_VALIDITY } from '../../../src/constants.js' -import { MessageType } from '../../../src/message/dht.js' -import { PeerRouting } from '../../../src/peer-routing/index.js' -import { GetValueHandler } from '../../../src/rpc/handlers/get-value.js' -import * as utils from '../../../src/utils.js' -import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.js' -import type { Message } from '../../../src/message/dht.js' -import type { GetValueHandlerComponents } from '../../../src/rpc/handlers/get-value.js' -import type { PeerAndKey } from '../../utils/create-peer-id.js' +import { PROVIDERS_VALIDITY } from '../../../src/constants.ts' +import { MessageType } from '../../../src/message/dht.ts' +import { PeerRouting } from '../../../src/peer-routing/index.ts' +import { GetValueHandler } from '../../../src/rpc/handlers/get-value.ts' +import * as utils from '../../../src/utils.ts' +import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.ts' +import type { Message } from '../../../src/message/dht.ts' +import type { GetValueHandlerComponents } from '../../../src/rpc/handlers/get-value.ts' +import type { PeerAndKey } from '../../utils/create-peer-id.ts' import type { Libp2pEvents, PeerStore } from '@libp2p/interface' import type { Datastore } from 'interface-datastore' import type { SinonStubbedInstance } from 'sinon' diff --git a/packages/kad-dht/test/rpc/handlers/ping.spec.ts b/packages/kad-dht/test/rpc/handlers/ping.spec.ts index 4dd72acd43..3ce6603760 100644 --- a/packages/kad-dht/test/rpc/handlers/ping.spec.ts +++ b/packages/kad-dht/test/rpc/handlers/ping.spec.ts @@ -1,11 +1,11 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' -import { MessageType } from '../../../src/message/dht.js' -import { PingHandler } from '../../../src/rpc/handlers/ping.js' -import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.js' -import type { Message } from '../../../src/message/dht.js' -import type { DHTMessageHandler } from '../../../src/rpc/index.js' -import type { PeerAndKey } from '../../utils/create-peer-id.js' +import { MessageType } from '../../../src/message/dht.ts' +import { PingHandler } from '../../../src/rpc/handlers/ping.ts' +import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.ts' +import type { Message } from '../../../src/message/dht.ts' +import type { DHTMessageHandler } from '../../../src/rpc/index.ts' +import type { PeerAndKey } from '../../utils/create-peer-id.ts' const T = MessageType.PING diff --git a/packages/kad-dht/test/rpc/handlers/put-value.spec.ts b/packages/kad-dht/test/rpc/handlers/put-value.spec.ts index d49659d3de..e72c6db633 100644 --- a/packages/kad-dht/test/rpc/handlers/put-value.spec.ts +++ b/packages/kad-dht/test/rpc/handlers/put-value.spec.ts @@ -7,13 +7,13 @@ import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core' import delay from 'delay' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { MessageType } from '../../../src/message/dht.js' -import { PutValueHandler } from '../../../src/rpc/handlers/put-value.js' -import * as utils from '../../../src/utils.js' -import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.js' -import type { Validators } from '../../../src/index.js' -import type { Message } from '../../../src/message/dht.js' -import type { PeerAndKey } from '../../utils/create-peer-id.js' +import { MessageType } from '../../../src/message/dht.ts' +import { PutValueHandler } from '../../../src/rpc/handlers/put-value.ts' +import * as utils from '../../../src/utils.ts' +import { createPeerIdWithPrivateKey } from '../../utils/create-peer-id.ts' +import type { Validators } from '../../../src/index.ts' +import type { Message } from '../../../src/message/dht.ts' +import type { PeerAndKey } from '../../utils/create-peer-id.ts' import type { Datastore } from 'interface-datastore' const T = MessageType.PUT_VALUE diff --git a/packages/kad-dht/test/rpc/index.spec.ts b/packages/kad-dht/test/rpc/index.spec.ts index 003bff53ee..495939fe36 100644 --- a/packages/kad-dht/test/rpc/index.spec.ts +++ b/packages/kad-dht/test/rpc/index.spec.ts @@ -11,16 +11,16 @@ import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { Message, MessageType } from '../../src/message/dht.js' -import { PeerRouting } from '../../src/peer-routing/index.js' -import { Providers } from '../../src/providers.js' -import { RoutingTable } from '../../src/routing-table/index.js' -import { RPC } from '../../src/rpc/index.js' -import { passthroughMapper } from '../../src/utils.js' -import { createPeerIdWithPrivateKey } from '../utils/create-peer-id.js' -import type { Validators } from '../../src/index.js' -import type { RPCComponents } from '../../src/rpc/index.js' -import type { PeerAndKey } from '../utils/create-peer-id.js' +import { Message, MessageType } from '../../src/message/dht.ts' +import { PeerRouting } from '../../src/peer-routing/index.ts' +import { Providers } from '../../src/providers.ts' +import { RoutingTable } from '../../src/routing-table/index.ts' +import { RPC } from '../../src/rpc/index.ts' +import { passthroughMapper } from '../../src/utils.ts' +import { createPeerIdWithPrivateKey } from '../utils/create-peer-id.ts' +import type { Validators } from '../../src/index.ts' +import type { RPCComponents } from '../../src/rpc/index.ts' +import type { PeerAndKey } from '../utils/create-peer-id.ts' import type { Libp2pEvents, Connection, PeerStore } from '@libp2p/interface' import type { AddressManager } from '@libp2p/interface-internal' import type { Datastore } from 'interface-datastore' diff --git a/packages/kad-dht/test/utils/sort-closest-peers.ts b/packages/kad-dht/test/utils/sort-closest-peers.ts index a0a370e5fd..729d15a836 100644 --- a/packages/kad-dht/test/utils/sort-closest-peers.ts +++ b/packages/kad-dht/test/utils/sort-closest-peers.ts @@ -2,7 +2,7 @@ import all from 'it-all' import map from 'it-map' import { xor as uint8ArrayXor } from 'uint8arrays/xor' import { xorCompare as uint8ArrayXorCompare } from 'uint8arrays/xor-compare' -import { convertPeerId } from '../../src/utils.js' +import { convertPeerId } from '../../src/utils.ts' import type { PeerAndKey } from './create-peer-id.ts' import type { KadDHTPeer } from './test-dht.ts' diff --git a/packages/kad-dht/test/utils/test-dht.ts b/packages/kad-dht/test/utils/test-dht.ts index 2467d3221c..72e5defc63 100644 --- a/packages/kad-dht/test/utils/test-dht.ts +++ b/packages/kad-dht/test/utils/test-dht.ts @@ -11,8 +11,8 @@ import { TypedEventEmitter } from 'main-event' import pRetry from 'p-retry' import { stubInterface } from 'sinon-ts' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { KadDHT as KadDHTClass } from '../../src/kad-dht.js' -import type { KadDHTInit } from '../../src/index.js' +import { KadDHT as KadDHTClass } from '../../src/kad-dht.ts' +import type { KadDHTInit } from '../../src/index.ts' import type { ComponentLogger, Connection, Libp2pEvents, PeerId, PeerStore, PrivateKey, TypedEventTarget } from '@libp2p/interface' import type { AddressManager, ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { Ping } from '@libp2p/ping' diff --git a/packages/keychain/package.json b/packages/keychain/package.json index 29c52b8037..3ba935359f 100644 --- a/packages/keychain/package.json +++ b/packages/keychain/package.json @@ -60,11 +60,11 @@ "interface-datastore": "^9.0.1", "multiformats": "^13.4.0", "sanitize-filename": "^1.6.3", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "datastore-core": "^11.0.1" }, "sideEffects": false diff --git a/packages/keychain/src/utils/export.ts b/packages/keychain/src/utils/export.ts index afc06ce2e1..8f3cc4a267 100644 --- a/packages/keychain/src/utils/export.ts +++ b/packages/keychain/src/utils/export.ts @@ -8,6 +8,7 @@ import { sha512 } from '@noble/hashes/sha2.js' import * as asn1js from 'asn1js' import { base64 } from 'multiformats/bases/base64' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' import { ITERATIONS, KEY_SIZE, SALT_LENGTH } from './constants.ts' import type { ECDSAPrivateKey, Ed25519PrivateKey, PrivateKey, RSAPrivateKey, Secp256k1PrivateKey } from '@libp2p/interface' import type { Multibase } from 'multiformats/bases/interface' @@ -141,11 +142,11 @@ export async function exportToPem (privateKey: RSAPrivateKey, password: string): ) const iv = randomBytes(16) - const cryptoKey = await crypto.subtle.importKey('raw', encryptionKey, 'AES-CBC', false, ['encrypt']) + const cryptoKey = await crypto.subtle.importKey('raw', withArrayBuffer(encryptionKey), 'AES-CBC', false, ['encrypt']) const encrypted = await crypto.subtle.encrypt({ name: 'AES-CBC', - iv - }, cryptoKey, keyArr) + iv: withArrayBuffer(iv) + }, cryptoKey, withArrayBuffer(keyArr)) const pbkdf2Params = new asn1js.Sequence({ value: [ diff --git a/packages/keychain/src/utils/import.ts b/packages/keychain/src/utils/import.ts index 84da52b4b4..9701d9d783 100644 --- a/packages/keychain/src/utils/import.ts +++ b/packages/keychain/src/utils/import.ts @@ -7,6 +7,7 @@ import { sha512 } from '@noble/hashes/sha2.js' import * as asn1js from 'asn1js' import { base64 } from 'multiformats/bases/base64' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' import { ITERATIONS, KEY_SIZE } from './constants.ts' import type { PrivateKey, RSAPrivateKey } from '@libp2p/interface' @@ -74,11 +75,11 @@ export async function importFromPem (pem: string, password: string): Promise { describe('Ed25519', () => { diff --git a/packages/libp2p-daemon-client/package.json b/packages/libp2p-daemon-client/package.json index 668c8c6329..b573b566f7 100644 --- a/packages/libp2p-daemon-client/package.json +++ b/packages/libp2p-daemon-client/package.json @@ -56,12 +56,12 @@ "@libp2p/daemon-server": "^9.0.27", "@libp2p/gossipsub": "^16.0.0", "@libp2p/kad-dht": "^16.3.0", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "it-all": "^3.0.9", "p-event": "^7.0.0", "sinon": "^21.0.0", "sinon-ts": "^2.0.0", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" } } diff --git a/packages/libp2p-daemon-client/test/dht.spec.ts b/packages/libp2p-daemon-client/test/dht.spec.ts index 90d7a4e5e1..91d5020fa5 100644 --- a/packages/libp2p-daemon-client/test/dht.spec.ts +++ b/packages/libp2p-daemon-client/test/dht.spec.ts @@ -8,9 +8,9 @@ import { CID } from 'multiformats/cid' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { createClient } from '../src/index.js' +import { createClient } from '../src/index.ts' import { matchBytes } from './fixtures/match-bytes.ts' -import type { DaemonClient } from '../src/index.js' +import type { DaemonClient } from '../src/index.ts' import type { Libp2pServer } from '@libp2p/daemon-server' import type { GossipSub } from '@libp2p/gossipsub' import type { Libp2p } from '@libp2p/interface' diff --git a/packages/libp2p-daemon-client/test/index.spec.ts b/packages/libp2p-daemon-client/test/index.spec.ts index 486f534265..9dac6902b9 100644 --- a/packages/libp2p-daemon-client/test/index.spec.ts +++ b/packages/libp2p-daemon-client/test/index.spec.ts @@ -5,8 +5,8 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { createClient } from '../src/index.js' -import type { DaemonClient } from '../src/index.js' +import { createClient } from '../src/index.ts' +import type { DaemonClient } from '../src/index.ts' import type { Libp2pServer } from '@libp2p/daemon-server' import type { GossipSub } from '@libp2p/gossipsub' import type { Connection, Libp2p, PeerStore } from '@libp2p/interface' diff --git a/packages/libp2p-daemon-client/test/pubsub.spec.ts b/packages/libp2p-daemon-client/test/pubsub.spec.ts index 54bbd29460..6644d26e4f 100644 --- a/packages/libp2p-daemon-client/test/pubsub.spec.ts +++ b/packages/libp2p-daemon-client/test/pubsub.spec.ts @@ -5,8 +5,8 @@ import { expect } from 'aegir/chai' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { createClient } from '../src/index.js' -import type { DaemonClient } from '../src/index.js' +import { createClient } from '../src/index.ts' +import type { DaemonClient } from '../src/index.ts' import type { Libp2pServer } from '@libp2p/daemon-server' import type { GossipSub } from '@libp2p/gossipsub' import type { Libp2p } from '@libp2p/interface' diff --git a/packages/libp2p-daemon-client/test/stream.spec.ts b/packages/libp2p-daemon-client/test/stream.spec.ts index a35dcf5bb2..e98fa596da 100644 --- a/packages/libp2p-daemon-client/test/stream.spec.ts +++ b/packages/libp2p-daemon-client/test/stream.spec.ts @@ -8,8 +8,8 @@ import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { createClient } from '../src/index.js' -import type { DaemonClient } from '../src/index.js' +import { createClient } from '../src/index.ts' +import type { DaemonClient } from '../src/index.ts' import type { Libp2pServer } from '@libp2p/daemon-server' import type { GossipSub } from '@libp2p/gossipsub' import type { Connection, Libp2p, PeerStore, StreamMessageEvent } from '@libp2p/interface' diff --git a/packages/libp2p-daemon-protocol/package.json b/packages/libp2p-daemon-protocol/package.json index aadf55930b..3180c22666 100644 --- a/packages/libp2p-daemon-protocol/package.json +++ b/packages/libp2p-daemon-protocol/package.json @@ -69,10 +69,10 @@ "any-signal": "^4.1.1", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "protons": "^8.1.1" } } diff --git a/packages/libp2p-daemon-server/package.json b/packages/libp2p-daemon-server/package.json index 5fc871203a..7b4d7be5bd 100644 --- a/packages/libp2p-daemon-server/package.json +++ b/packages/libp2p-daemon-server/package.json @@ -58,10 +58,10 @@ "it-pushable": "^3.2.3", "multiformats": "^13.4.0", "p-event": "^7.0.0", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon-ts": "^2.0.0" } } diff --git a/packages/libp2p-daemon-server/test/index.spec.ts b/packages/libp2p-daemon-server/test/index.spec.ts index 890aa8fe53..397904cf82 100644 --- a/packages/libp2p-daemon-server/test/index.spec.ts +++ b/packages/libp2p-daemon-server/test/index.spec.ts @@ -4,7 +4,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { createServer } from '../src/index.js' +import { createServer } from '../src/index.ts' import type { GossipSub } from '@libp2p/gossipsub' import type { Libp2p } from '@libp2p/interface' import type { KadDHT } from '@libp2p/kad-dht' diff --git a/packages/libp2p-daemon/package.json b/packages/libp2p-daemon/package.json index 3603c20668..6a91e700c4 100644 --- a/packages/libp2p-daemon/package.json +++ b/packages/libp2p-daemon/package.json @@ -53,7 +53,7 @@ }, "devDependencies": { "@types/yargs": "^17.0.33", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon": "^21.0.0" } } diff --git a/packages/libp2p-daemon/test/cli.spec.ts b/packages/libp2p-daemon/test/cli.spec.ts index af99088d34..3a56746669 100644 --- a/packages/libp2p-daemon/test/cli.spec.ts +++ b/packages/libp2p-daemon/test/cli.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import sinon from 'sinon' -import cli from '../src/index.js' +import cli from '../src/index.ts' describe.skip('cli', () => { const daemon = { createDaemon: (options: any) => {} } diff --git a/packages/libp2p/package.json b/packages/libp2p/package.json index 55a0b65a50..a512934be3 100644 --- a/packages/libp2p/package.json +++ b/packages/libp2p/package.json @@ -107,10 +107,10 @@ "p-retry": "^8.0.0", "progress-events": "^1.1.0", "race-signal": "^2.0.0", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "it-all": "^3.0.9", "it-drain": "^3.0.10", diff --git a/packages/libp2p/src/connection-manager/dial-queue.ts b/packages/libp2p/src/connection-manager/dial-queue.ts index cea4f00245..5963199b98 100644 --- a/packages/libp2p/src/connection-manager/dial-queue.ts +++ b/packages/libp2p/src/connection-manager/dial-queue.ts @@ -8,8 +8,8 @@ import { anySignal } from 'any-signal' import { setMaxListeners } from 'main-event' import { CustomProgressEvent } from 'progress-events' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { DialDeniedError, NoValidAddressesError } from '../errors.js' -import { getPeerAddress } from '../get-peer.js' +import { DialDeniedError, NoValidAddressesError } from '../errors.ts' +import { getPeerAddress } from '../get-peer.ts' import { defaultAddressSorter } from './address-sorter.ts' import { ADDRESS_DIAL_TIMEOUT, diff --git a/packages/libp2p/src/connection-manager/index.ts b/packages/libp2p/src/connection-manager/index.ts index 5ed1ca770a..f967e69a80 100644 --- a/packages/libp2p/src/connection-manager/index.ts +++ b/packages/libp2p/src/connection-manager/index.ts @@ -4,7 +4,7 @@ import { getNetConfig, isNetworkAddress, RateLimiter } from '@libp2p/utils' import { multiaddr } from '@multiformats/multiaddr' import { pEvent } from 'p-event' import { CustomProgressEvent } from 'progress-events' -import { getPeerAddress } from '../get-peer.js' +import { getPeerAddress } from '../get-peer.ts' import { ConnectionPruner } from './connection-pruner.ts' import { ADDRESS_DIAL_TIMEOUT, DIAL_TIMEOUT, INBOUND_CONNECTION_THRESHOLD, MAX_CONNECTIONS, MAX_DIAL_QUEUE_LENGTH, MAX_INCOMING_PENDING_CONNECTIONS, MAX_PARALLEL_DIALS, MAX_PEER_ADDRS_TO_DIAL } from './constants.ts' import { DialQueue } from './dial-queue.ts' diff --git a/packages/libp2p/test/addresses/address-manager.spec.ts b/packages/libp2p/test/addresses/address-manager.spec.ts index 431cd80312..e1ba900143 100644 --- a/packages/libp2p/test/addresses/address-manager.spec.ts +++ b/packages/libp2p/test/addresses/address-manager.spec.ts @@ -8,8 +8,8 @@ import { TypedEventEmitter } from 'main-event' import pWaitFor from 'p-wait-for' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { AddressManager } from '../../src/address-manager/index.js' -import type { AddressFilter } from '../../src/address-manager/index.js' +import { AddressManager } from '../../src/address-manager/index.ts' +import type { AddressFilter } from '../../src/address-manager/index.ts' import type { Libp2pEvents, PeerId, PeerStore, Peer, Listener } from '@libp2p/interface' import type { NodeAddress, TransportManager } from '@libp2p/interface-internal' import type { TypedEventTarget } from 'main-event' diff --git a/packages/libp2p/test/connection-manager/address-sorter.spec.ts b/packages/libp2p/test/connection-manager/address-sorter.spec.ts index 43a2cc1bdc..12df7c6237 100644 --- a/packages/libp2p/test/connection-manager/address-sorter.spec.ts +++ b/packages/libp2p/test/connection-manager/address-sorter.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { defaultAddressSorter } from '../../src/connection-manager/address-sorter.js' +import { defaultAddressSorter } from '../../src/connection-manager/address-sorter.ts' describe('address-sort', () => { describe('public addresses first', () => { diff --git a/packages/libp2p/test/connection-manager/connection-gater.spec.ts b/packages/libp2p/test/connection-manager/connection-gater.spec.ts index 0a2798196f..9a956433f2 100644 --- a/packages/libp2p/test/connection-manager/connection-gater.spec.ts +++ b/packages/libp2p/test/connection-manager/connection-gater.spec.ts @@ -7,9 +7,9 @@ import { expect } from 'aegir/chai' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { Uint8ArrayList } from 'uint8arraylist' -import { DefaultConnectionManager } from '../../src/connection-manager/index.js' -import { Upgrader } from '../../src/upgrader.js' -import { createDefaultUpgraderComponents } from '../upgrading/utils.js' +import { DefaultConnectionManager } from '../../src/connection-manager/index.ts' +import { Upgrader } from '../../src/upgrader.ts' +import { createDefaultUpgraderComponents } from '../upgrading/utils.ts' import { createDefaultConnectionManagerComponents } from './utils.ts' import type { Transport, MultiaddrConnection, StreamMuxerFactory } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' diff --git a/packages/libp2p/test/connection-manager/connection-pruner.spec.ts b/packages/libp2p/test/connection-manager/connection-pruner.spec.ts index f2c1e08a1a..b8f3a2f76f 100644 --- a/packages/libp2p/test/connection-manager/connection-pruner.spec.ts +++ b/packages/libp2p/test/connection-manager/connection-pruner.spec.ts @@ -9,7 +9,7 @@ import { TypedEventEmitter } from 'main-event' import { pEvent } from 'p-event' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { ConnectionPruner } from '../../src/connection-manager/connection-pruner.js' +import { ConnectionPruner } from '../../src/connection-manager/connection-pruner.ts' import type { Libp2pEvents, PeerStore, Stream, Connection, AbortOptions, ComponentLogger, Peer } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { TypedEventTarget } from 'main-event' diff --git a/packages/libp2p/test/connection-manager/dial-queue.spec.ts b/packages/libp2p/test/connection-manager/dial-queue.spec.ts index a9898cb508..bf503caccd 100644 --- a/packages/libp2p/test/connection-manager/dial-queue.spec.ts +++ b/packages/libp2p/test/connection-manager/dial-queue.spec.ts @@ -10,7 +10,7 @@ import pDefer from 'p-defer' import { raceSignal } from 'race-signal' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { DialQueue } from '../../src/connection-manager/dial-queue.js' +import { DialQueue } from '../../src/connection-manager/dial-queue.ts' import type { ComponentLogger, Connection, ConnectionGater, MultiaddrResolver, PeerId, PeerRouting, PeerStore, Transport } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/connection-manager/index.spec.ts b/packages/libp2p/test/connection-manager/index.spec.ts index 67ae2fe997..20931561fc 100644 --- a/packages/libp2p/test/connection-manager/index.spec.ts +++ b/packages/libp2p/test/connection-manager/index.spec.ts @@ -6,9 +6,9 @@ import { expect } from 'aegir/chai' import pWaitFor from 'p-wait-for' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { DefaultConnectionManager } from '../../src/connection-manager/index.js' -import { createLibp2p } from '../../src/index.js' -import { getComponent } from '../fixtures/get-component.js' +import { DefaultConnectionManager } from '../../src/connection-manager/index.ts' +import { createLibp2p } from '../../src/index.ts' +import { getComponent } from '../fixtures/get-component.ts' import { createDefaultConnectionManagerComponents } from './utils.ts' import type { StubbedDefaultConnectionManagerComponents } from './utils.ts' import type { Libp2p, Connection, MultiaddrConnection } from '@libp2p/interface' diff --git a/packages/libp2p/test/connection-manager/multiaddr-to-ipnet.spec.ts b/packages/libp2p/test/connection-manager/multiaddr-to-ipnet.spec.ts index b35595cec2..f9e6936558 100644 --- a/packages/libp2p/test/connection-manager/multiaddr-to-ipnet.spec.ts +++ b/packages/libp2p/test/connection-manager/multiaddr-to-ipnet.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { multiaddrToIpNet } from '../../src/connection-manager/utils.js' +import { multiaddrToIpNet } from '../../src/connection-manager/utils.ts' describe('multiaddrToIpNet', () => { it('should convert a simple IPv4 multiaddr to an IpNet', () => { diff --git a/packages/libp2p/test/connection-manager/reconnect-queue.spec.ts b/packages/libp2p/test/connection-manager/reconnect-queue.spec.ts index 9de94e665a..7031f35e03 100644 --- a/packages/libp2p/test/connection-manager/reconnect-queue.spec.ts +++ b/packages/libp2p/test/connection-manager/reconnect-queue.spec.ts @@ -8,7 +8,7 @@ import { TypedEventEmitter } from 'main-event' import pRetry from 'p-retry' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { ReconnectQueue } from '../../src/connection-manager/reconnect-queue.js' +import { ReconnectQueue } from '../../src/connection-manager/reconnect-queue.ts' import type { ComponentLogger, Libp2pEvents, PeerStore, Peer } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { TypedEventTarget } from 'main-event' diff --git a/packages/libp2p/test/connection-manager/resolvers.spec.ts b/packages/libp2p/test/connection-manager/resolvers.spec.ts index 11f16b3c77..355f5d4959 100644 --- a/packages/libp2p/test/connection-manager/resolvers.spec.ts +++ b/packages/libp2p/test/connection-manager/resolvers.spec.ts @@ -4,7 +4,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { dnsaddrResolver, resolveMultiaddr } from '../../src/connection-manager/resolvers/index.js' +import { dnsaddrResolver, resolveMultiaddr } from '../../src/connection-manager/resolvers/index.ts' import type { Logger, MultiaddrResolver } from '@libp2p/interface' import type { DNS } from '@multiformats/dns' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/connection-manager/utils.spec.ts b/packages/libp2p/test/connection-manager/utils.spec.ts index 51ba442fc9..5c9118a0c0 100644 --- a/packages/libp2p/test/connection-manager/utils.spec.ts +++ b/packages/libp2p/test/connection-manager/utils.spec.ts @@ -1,7 +1,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { findExistingConnection, safelyCloseConnectionIfUnused } from '../../src/connection-manager/utils.js' +import { findExistingConnection, safelyCloseConnectionIfUnused } from '../../src/connection-manager/utils.ts' import type { Connection, Stream } from '@libp2p/interface' describe('findExistingConnection', () => { diff --git a/packages/libp2p/test/connection-manager/utils.ts b/packages/libp2p/test/connection-manager/utils.ts index 76d9a7aab0..4fac34bfb3 100644 --- a/packages/libp2p/test/connection-manager/utils.ts +++ b/packages/libp2p/test/connection-manager/utils.ts @@ -3,7 +3,7 @@ import { defaultLogger } from '@libp2p/logger' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' -import type { DefaultConnectionManagerComponents } from '../../src/connection-manager/index.js' +import type { DefaultConnectionManagerComponents } from '../../src/connection-manager/index.ts' import type { ConnectionGater, PeerId, PeerStore, PeerRouting, Libp2pEvents, ComponentLogger } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' import type { TypedEventTarget } from 'main-event' diff --git a/packages/libp2p/test/connection-monitor/index.spec.ts b/packages/libp2p/test/connection-monitor/index.spec.ts index 1bdf0d1307..72c0a6dcc2 100644 --- a/packages/libp2p/test/connection-monitor/index.spec.ts +++ b/packages/libp2p/test/connection-monitor/index.spec.ts @@ -6,7 +6,7 @@ import delay from 'delay' import pWaitFor from 'p-wait-for' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { ConnectionMonitor } from '../../src/connection-monitor.js' +import { ConnectionMonitor } from '../../src/connection-monitor.ts' import type { ComponentLogger, Stream, Connection } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/connection/index.spec.ts b/packages/libp2p/test/connection/index.spec.ts index df97511479..0dd1f0fa2c 100644 --- a/packages/libp2p/test/connection/index.spec.ts +++ b/packages/libp2p/test/connection/index.spec.ts @@ -9,9 +9,9 @@ import { encode } from 'it-length-prefixed' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { createConnection } from '../../src/connection.js' +import { createConnection } from '../../src/connection.ts' import { UnhandledProtocolError } from '../../src/errors.ts' -import type { ConnectionComponents, ConnectionInit } from '../../src/connection.js' +import type { ConnectionComponents, ConnectionInit } from '../../src/connection.ts' import type { MultiaddrConnection, PeerStore, Stream, StreamMuxer } from '@libp2p/interface' import type { Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/content-routing/content-routing.spec.ts b/packages/libp2p/test/content-routing/content-routing.spec.ts index 748abab5ca..148aa478ba 100644 --- a/packages/libp2p/test/content-routing/content-routing.spec.ts +++ b/packages/libp2p/test/content-routing/content-routing.spec.ts @@ -9,8 +9,8 @@ import { CID } from 'multiformats/cid' import pDefer from 'p-defer' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { createLibp2p } from '../../src/index.js' -import type { Libp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' +import type { Libp2p } from '../../src/index.ts' import type { ContentRouting, Provider } from '@libp2p/interface' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/core/core.spec.ts b/packages/libp2p/test/core/core.spec.ts index 8628d9a52a..0fd9108048 100644 --- a/packages/libp2p/test/core/core.spec.ts +++ b/packages/libp2p/test/core/core.spec.ts @@ -1,7 +1,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { createLibp2p, isLibp2p } from '../../src/index.js' +import { createLibp2p, isLibp2p } from '../../src/index.ts' import type { Libp2p, Transport } from '@libp2p/interface' describe('core', () => { diff --git a/packages/libp2p/test/core/events.spec.ts b/packages/libp2p/test/core/events.spec.ts index 744cac36fe..23f73a024e 100644 --- a/packages/libp2p/test/core/events.spec.ts +++ b/packages/libp2p/test/core/events.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import { pEvent } from 'p-event' -import { createLibp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' import type { Libp2p } from '@libp2p/interface' describe('events', () => { diff --git a/packages/libp2p/test/core/get-public-key.spec.ts b/packages/libp2p/test/core/get-public-key.spec.ts index 3d6d90f24a..1d1288c3af 100644 --- a/packages/libp2p/test/core/get-public-key.spec.ts +++ b/packages/libp2p/test/core/get-public-key.spec.ts @@ -3,7 +3,7 @@ import { contentRoutingSymbol } from '@libp2p/interface' import { peerIdFromMultihash, peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { createLibp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' import type { ContentRouting, ContentRoutingProvider, Libp2p } from '@libp2p/interface' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/core/peer-id.spec.ts b/packages/libp2p/test/core/peer-id.spec.ts index 7a2898850a..417c0cc80e 100644 --- a/packages/libp2p/test/core/peer-id.spec.ts +++ b/packages/libp2p/test/core/peer-id.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' -import { createLibp2p } from '../../src/index.js' -import type { Libp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' +import type { Libp2p } from '../../src/index.ts' describe('peer-id', () => { let libp2p: Libp2p diff --git a/packages/libp2p/test/core/random-walk.spec.ts b/packages/libp2p/test/core/random-walk.spec.ts index 4da03ca089..dce63c88db 100644 --- a/packages/libp2p/test/core/random-walk.spec.ts +++ b/packages/libp2p/test/core/random-walk.spec.ts @@ -11,7 +11,7 @@ import map from 'it-map' import take from 'it-take' import pDefer from 'p-defer' import { stubInterface } from 'sinon-ts' -import { RandomWalk as RandomWalkClass } from '../../src/random-walk.js' +import { RandomWalk as RandomWalkClass } from '../../src/random-walk.ts' import type { PeerRouting, PeerInfo, AbortOptions } from '@libp2p/interface' import type { RandomWalk } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/core/service-dependencies.spec.ts b/packages/libp2p/test/core/service-dependencies.spec.ts index ddc6cbdf23..df90310e23 100644 --- a/packages/libp2p/test/core/service-dependencies.spec.ts +++ b/packages/libp2p/test/core/service-dependencies.spec.ts @@ -1,6 +1,6 @@ import { serviceCapabilities, serviceDependencies, stop } from '@libp2p/interface' import { expect } from 'aegir/chai' -import { createLibp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' import type { Libp2p } from '@libp2p/interface' /** diff --git a/packages/libp2p/test/core/status.spec.ts b/packages/libp2p/test/core/status.spec.ts index 457d64c200..50972667cc 100644 --- a/packages/libp2p/test/core/status.spec.ts +++ b/packages/libp2p/test/core/status.spec.ts @@ -1,6 +1,6 @@ import { stop } from '@libp2p/interface' import { expect } from 'aegir/chai' -import { createLibp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' import type { Libp2p } from '@libp2p/interface' describe('status', () => { diff --git a/packages/libp2p/test/core/user-agent.spec.ts b/packages/libp2p/test/core/user-agent.spec.ts index 481599bfab..f8df88b224 100644 --- a/packages/libp2p/test/core/user-agent.spec.ts +++ b/packages/libp2p/test/core/user-agent.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import { isNode, isElectronMain, isBrowser, isWebWorker } from 'wherearewe' -import { userAgent } from '../../src/user-agent.js' +import { userAgent } from '../../src/user-agent.ts' describe('user-agent', () => { it('should include runtime in user agent', () => { diff --git a/packages/libp2p/test/peer-discovery/peer-discovery.spec.ts b/packages/libp2p/test/peer-discovery/peer-discovery.spec.ts index 2ed69b559e..7727968d62 100644 --- a/packages/libp2p/test/peer-discovery/peer-discovery.spec.ts +++ b/packages/libp2p/test/peer-discovery/peer-discovery.spec.ts @@ -3,7 +3,7 @@ import { expect } from 'aegir/chai' import { TypedEventEmitter } from 'main-event' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { createLibp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' import type { PeerDiscovery, PeerDiscoveryEvents, Startable, Libp2p } from '@libp2p/interface' describe('peer discovery', () => { diff --git a/packages/libp2p/test/peer-routing/peer-routing.spec.ts b/packages/libp2p/test/peer-routing/peer-routing.spec.ts index 69cc7bc5a1..0b36fbd126 100644 --- a/packages/libp2p/test/peer-routing/peer-routing.spec.ts +++ b/packages/libp2p/test/peer-routing/peer-routing.spec.ts @@ -9,7 +9,7 @@ import drain from 'it-drain' import pDefer from 'p-defer' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { createLibp2p } from '../../src/index.js' +import { createLibp2p } from '../../src/index.ts' import type { Libp2p, PeerId, PeerInfo, PeerRouting } from '@libp2p/interface' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/registrar/errors.spec.ts b/packages/libp2p/test/registrar/errors.spec.ts index d84068c219..35ea1a4787 100644 --- a/packages/libp2p/test/registrar/errors.spec.ts +++ b/packages/libp2p/test/registrar/errors.spec.ts @@ -5,10 +5,10 @@ import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core/memory' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' -import { defaultComponents } from '../../src/components.js' -import { DefaultConnectionManager } from '../../src/connection-manager/index.js' -import { Registrar } from '../../src/registrar.js' -import type { Components } from '../../src/components.js' +import { defaultComponents } from '../../src/components.ts' +import { DefaultConnectionManager } from '../../src/connection-manager/index.ts' +import { Registrar } from '../../src/registrar.ts' +import type { Components } from '../../src/components.ts' import type { Upgrader, ConnectionGater, PeerId } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' diff --git a/packages/libp2p/test/registrar/protocols.spec.ts b/packages/libp2p/test/registrar/protocols.spec.ts index af89b6421a..253f153c40 100644 --- a/packages/libp2p/test/registrar/protocols.spec.ts +++ b/packages/libp2p/test/registrar/protocols.spec.ts @@ -1,7 +1,7 @@ import { expect } from 'aegir/chai' import pDefer from 'p-defer' -import { createLibp2p } from '../../src/index.js' -import type { Components } from '../../src/components.js' +import { createLibp2p } from '../../src/index.ts' +import type { Components } from '../../src/components.ts' import type { Libp2p } from '@libp2p/interface' import type { Registrar } from '@libp2p/interface-internal' diff --git a/packages/libp2p/test/registrar/registrar.spec.ts b/packages/libp2p/test/registrar/registrar.spec.ts index 30d4107b43..ffa2db0da8 100644 --- a/packages/libp2p/test/registrar/registrar.spec.ts +++ b/packages/libp2p/test/registrar/registrar.spec.ts @@ -7,7 +7,7 @@ import { TypedEventEmitter } from 'main-event' import pDefer from 'p-defer' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { Registrar } from '../../src/registrar.js' +import { Registrar } from '../../src/registrar.ts' import type { Libp2pEvents, PeerId, PeerStore, Topology, TopologyFilter, Peer, Connection } from '@libp2p/interface' import type { TypedEventTarget } from 'main-event' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/libp2p/test/transports/transport-manager.spec.ts b/packages/libp2p/test/transports/transport-manager.spec.ts index ae7ec14920..928a8f2723 100644 --- a/packages/libp2p/test/transports/transport-manager.spec.ts +++ b/packages/libp2p/test/transports/transport-manager.spec.ts @@ -12,9 +12,9 @@ import { pEvent } from 'p-event' import pWaitFor from 'p-wait-for' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { AddressManager } from '../../src/address-manager/index.js' -import { DefaultTransportManager } from '../../src/transport-manager.js' -import type { Components } from '../../src/components.js' +import { AddressManager } from '../../src/address-manager/index.ts' +import { DefaultTransportManager } from '../../src/transport-manager.ts' +import type { Components } from '../../src/components.ts' import type { Connection, Transport, Upgrader, Listener } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/libp2p/test/upgrading/upgrader.spec.ts b/packages/libp2p/test/upgrading/upgrader.spec.ts index 36ac3037b1..373949e5cf 100644 --- a/packages/libp2p/test/upgrading/upgrader.spec.ts +++ b/packages/libp2p/test/upgrading/upgrader.spec.ts @@ -8,9 +8,9 @@ import * as lp from 'it-length-prefixed' import { pEvent } from 'p-event' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { Upgrader } from '../../src/upgrader.js' +import { Upgrader } from '../../src/upgrader.ts' import { createDefaultUpgraderComponents } from './utils.ts' -import type { UpgraderComponents, UpgraderInit } from '../../src/upgrader.js' +import type { UpgraderComponents, UpgraderInit } from '../../src/upgrader.ts' import type { ConnectionEncrypter, StreamMuxerFactory, StreamMuxer, ConnectionProtector, PeerId, SecuredConnection, Connection } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' diff --git a/packages/libp2p/test/upgrading/utils.ts b/packages/libp2p/test/upgrading/utils.ts index 31965bc1b2..b9bc1ad1cb 100644 --- a/packages/libp2p/test/upgrading/utils.ts +++ b/packages/libp2p/test/upgrading/utils.ts @@ -3,7 +3,7 @@ import { defaultLogger } from '@libp2p/logger' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' -import type { UpgraderComponents } from '../../src/upgrader.js' +import type { UpgraderComponents } from '../../src/upgrader.ts' import type { ConnectionGater, PeerId, PeerStore, Libp2pEvents, ComponentLogger, Metrics, ConnectionProtector } from '@libp2p/interface' import type { ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { TypedEventTarget } from 'main-event' diff --git a/packages/logger/package.json b/packages/logger/package.json index 29b185a772..cea0ddd603 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -56,9 +56,9 @@ }, "devDependencies": { "@libp2p/peer-id": "^6.0.9", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon": "^21.0.0", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "browser": { "./dist/src/debug/node.js": "./dist/src/debug/browser.js" diff --git a/packages/logger/src/index.ts b/packages/logger/src/index.ts index aa19925697..cf4ba68175 100644 --- a/packages/logger/src/index.ts +++ b/packages/logger/src/index.ts @@ -41,7 +41,7 @@ import type { PeerId, Logger, ComponentLogger } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' import type { Key } from 'interface-datastore' import type { CID } from 'multiformats/cid' -import type { Options as LoggerOptions } from 'weald' +import type { Debugger, Options as LoggerOptions } from 'weald' export type { LoggerOptions } @@ -143,7 +143,7 @@ debug.formatters.e = (v?: Error): string => { export type { Logger, ComponentLogger } -function createDisabledLogger (namespace: string): debug.Debugger { +function createDisabledLogger (namespace: string): Debugger { const logger = (): void => {} logger.enabled = false logger.color = '' @@ -152,6 +152,7 @@ function createDisabledLogger (namespace: string): debug.Debugger { logger.namespace = namespace logger.destroy = () => true logger.extend = () => logger + logger.useColors = () => false return logger } @@ -246,7 +247,7 @@ export function defaultLogger (options?: LoggerOptions): ComponentLogger { */ export function logger (name: string, options?: LoggerOptions): Logger { // trace logging is a no-op by default - let trace: debug.Debugger = createDisabledLogger(`${name}:trace`) + let trace: Debugger = createDisabledLogger(`${name}:trace`) // look at all the debug names and see if trace logging has explicitly been enabled if (debug.enabled(`${name}:trace`) && debug.names.map((r: any) => r.toString()).find((n: string) => n.includes(':trace')) != null) { diff --git a/packages/logger/test/index.spec.ts b/packages/logger/test/index.spec.ts index 1b754b6af9..13f8419641 100644 --- a/packages/logger/test/index.spec.ts +++ b/packages/logger/test/index.spec.ts @@ -12,7 +12,7 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import debug from 'weald' import { format } from 'weald/format' -import { disable, enable, logger, peerLogger } from '../src/index.js' +import { disable, enable, logger, peerLogger } from '../src/index.ts' describe('logger', () => { afterEach(() => { diff --git a/packages/logger/test/utils.spec.ts b/packages/logger/test/utils.spec.ts index f91d5fce9f..d81a19d0e2 100644 --- a/packages/logger/test/utils.spec.ts +++ b/packages/logger/test/utils.spec.ts @@ -1,7 +1,7 @@ import { peerIdFromCID } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import { CID } from 'multiformats/cid' -import { truncatePeerId } from '../src/utils.js' +import { truncatePeerId } from '../src/utils.ts' describe('utils', () => { it('should truncate a peer id', () => { diff --git a/packages/metrics-opentelemetry/package.json b/packages/metrics-opentelemetry/package.json index 97caf4ab71..ecc637e8df 100644 --- a/packages/metrics-opentelemetry/package.json +++ b/packages/metrics-opentelemetry/package.json @@ -47,7 +47,7 @@ }, "devDependencies": { "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22" + "aegir": "^48.0.11" }, "browser": { "./dist/src/system-metrics.js": "./dist/src/system-metrics.browser.js" diff --git a/packages/metrics-opentelemetry/src/index.ts b/packages/metrics-opentelemetry/src/index.ts index e8a3ef1333..d3e2c8d8a7 100644 --- a/packages/metrics-opentelemetry/src/index.ts +++ b/packages/metrics-opentelemetry/src/index.ts @@ -597,6 +597,9 @@ function wrapGenerator (gen: Generator, span: Span, attributes: TraceAttributes, }, [Symbol.iterator]: () => { return wrapped + }, + [Symbol.dispose]: () => { + iter[Symbol.dispose]?.() } } @@ -637,6 +640,9 @@ function wrapAsyncGenerator (gen: AsyncGenerator, span: Span, attributes: TraceA }, [Symbol.asyncIterator]: () => { return wrapped + }, + [Symbol.asyncDispose]: async () => { + await iter[Symbol.asyncDispose]?.() } } diff --git a/packages/metrics-opentelemetry/test/index.spec.ts b/packages/metrics-opentelemetry/test/index.spec.ts index 986a5a0d5e..4b711186d3 100644 --- a/packages/metrics-opentelemetry/test/index.spec.ts +++ b/packages/metrics-opentelemetry/test/index.spec.ts @@ -1,7 +1,7 @@ import { start, stop } from '@libp2p/interface' import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' -import { openTelemetryMetrics } from '../src/index.js' +import { openTelemetryMetrics } from '../src/index.ts' describe('opentelemetry-metrics', () => { it('should wrap a method', async () => { diff --git a/packages/metrics-prometheus/package.json b/packages/metrics-prometheus/package.json index 49fd1ad4c0..e1663c8449 100644 --- a/packages/metrics-prometheus/package.json +++ b/packages/metrics-prometheus/package.json @@ -48,7 +48,7 @@ "devDependencies": { "@libp2p/logger": "^6.2.7", "@libp2p/utils": "^7.2.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "p-event": "^7.0.0" }, "sideEffects": false diff --git a/packages/metrics-prometheus/test/counter-groups.spec.ts b/packages/metrics-prometheus/test/counter-groups.spec.ts index ebd17121f2..af5203dc19 100644 --- a/packages/metrics-prometheus/test/counter-groups.spec.ts +++ b/packages/metrics-prometheus/test/counter-groups.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('counter groups', () => { diff --git a/packages/metrics-prometheus/test/counters.spec.ts b/packages/metrics-prometheus/test/counters.spec.ts index 2fc2749d4d..0985768123 100644 --- a/packages/metrics-prometheus/test/counters.spec.ts +++ b/packages/metrics-prometheus/test/counters.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('counters', () => { diff --git a/packages/metrics-prometheus/test/custom-registry.spec.ts b/packages/metrics-prometheus/test/custom-registry.spec.ts index 300e7bc000..8edf528f49 100644 --- a/packages/metrics-prometheus/test/custom-registry.spec.ts +++ b/packages/metrics-prometheus/test/custom-registry.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client, { Registry } from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('custom registry', () => { diff --git a/packages/metrics-prometheus/test/histogram-groups.spec.ts b/packages/metrics-prometheus/test/histogram-groups.spec.ts index d7fa0af0f5..a430055311 100644 --- a/packages/metrics-prometheus/test/histogram-groups.spec.ts +++ b/packages/metrics-prometheus/test/histogram-groups.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('histogram groups', () => { diff --git a/packages/metrics-prometheus/test/histograms.spec.ts b/packages/metrics-prometheus/test/histograms.spec.ts index 1d5ace317d..7b87753f89 100644 --- a/packages/metrics-prometheus/test/histograms.spec.ts +++ b/packages/metrics-prometheus/test/histograms.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('histograms', () => { diff --git a/packages/metrics-prometheus/test/index.spec.ts b/packages/metrics-prometheus/test/index.spec.ts index cb248aadba..f8a5e301c7 100644 --- a/packages/metrics-prometheus/test/index.spec.ts +++ b/packages/metrics-prometheus/test/index.spec.ts @@ -1,7 +1,7 @@ import { start, stop } from '@libp2p/interface' import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import type { Metrics } from '@libp2p/interface' describe('simple-metrics', () => { diff --git a/packages/metrics-prometheus/test/metric-groups.spec.ts b/packages/metrics-prometheus/test/metric-groups.spec.ts index b92131e4df..0e47a0513e 100644 --- a/packages/metrics-prometheus/test/metric-groups.spec.ts +++ b/packages/metrics-prometheus/test/metric-groups.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('metric groups', () => { diff --git a/packages/metrics-prometheus/test/metrics.spec.ts b/packages/metrics-prometheus/test/metrics.spec.ts index fc8aba9ae8..648cef0cb6 100644 --- a/packages/metrics-prometheus/test/metrics.spec.ts +++ b/packages/metrics-prometheus/test/metrics.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('metrics', () => { diff --git a/packages/metrics-prometheus/test/streams.spec.ts b/packages/metrics-prometheus/test/streams.spec.ts index aceff0789a..d29b04c09a 100644 --- a/packages/metrics-prometheus/test/streams.spec.ts +++ b/packages/metrics-prometheus/test/streams.spec.ts @@ -3,7 +3,7 @@ import { multiaddrConnectionPair, streamPair } from '@libp2p/utils' import { expect } from 'aegir/chai' import { pEvent } from 'p-event' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' describe('streams', () => { it('should track bytes sent over outbound connections', async () => { diff --git a/packages/metrics-prometheus/test/summaries.spec.ts b/packages/metrics-prometheus/test/summaries.spec.ts index ea34eff773..3ecc6e64cf 100644 --- a/packages/metrics-prometheus/test/summaries.spec.ts +++ b/packages/metrics-prometheus/test/summaries.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('summaries', () => { diff --git a/packages/metrics-prometheus/test/summary-groups.spec.ts b/packages/metrics-prometheus/test/summary-groups.spec.ts index cb37dfd0c3..3f4500e9ce 100644 --- a/packages/metrics-prometheus/test/summary-groups.spec.ts +++ b/packages/metrics-prometheus/test/summary-groups.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import client from 'prom-client' -import { prometheusMetrics } from '../src/index.js' +import { prometheusMetrics } from '../src/index.ts' import { randomMetricName } from './fixtures/random-metric-name.ts' describe('summary groups', () => { diff --git a/packages/metrics-prometheus/test/utils.spec.ts b/packages/metrics-prometheus/test/utils.spec.ts index c224d5f412..027d250c44 100644 --- a/packages/metrics-prometheus/test/utils.spec.ts +++ b/packages/metrics-prometheus/test/utils.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { normalizeString } from '../src/utils.js' +import { normalizeString } from '../src/utils.ts' describe('utils', () => { describe('normalizeString', () => { diff --git a/packages/metrics-simple/package.json b/packages/metrics-simple/package.json index aac2b4b32c..3f3b2f3c33 100644 --- a/packages/metrics-simple/package.json +++ b/packages/metrics-simple/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "@types/tdigest": "^0.1.5", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "p-defer": "^4.0.1" }, "sideEffects": false diff --git a/packages/metrics-simple/test/index.spec.ts b/packages/metrics-simple/test/index.spec.ts index bcb07b407f..133768d4ae 100644 --- a/packages/metrics-simple/test/index.spec.ts +++ b/packages/metrics-simple/test/index.spec.ts @@ -2,7 +2,7 @@ import { start, stop } from '@libp2p/interface' import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import pDefer from 'p-defer' -import { simpleMetrics } from '../src/index.js' +import { simpleMetrics } from '../src/index.ts' import type { Metrics } from '@libp2p/interface' describe('simple-metrics', () => { diff --git a/packages/multistream-select/package.json b/packages/multistream-select/package.json index d8dffbf7c4..bb20079b8e 100644 --- a/packages/multistream-select/package.json +++ b/packages/multistream-select/package.json @@ -56,10 +56,10 @@ "@libp2p/utils": "^7.2.1", "it-length-prefixed": "^10.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "iso-random-stream": "^2.0.2", "it-all": "^3.0.9", "it-drain": "^3.0.10", diff --git a/packages/multistream-select/test/dialer.spec.ts b/packages/multistream-select/test/dialer.spec.ts index 9d06ba1208..db2f0f3ad9 100644 --- a/packages/multistream-select/test/dialer.spec.ts +++ b/packages/multistream-select/test/dialer.spec.ts @@ -9,7 +9,7 @@ import { pEvent } from 'p-event' import pTimeout from 'p-timeout' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import * as mss from '../src/index.js' +import * as mss from '../src/index.ts' describe('Dialer', () => { describe('dialer.select', () => { diff --git a/packages/multistream-select/test/integration.spec.ts b/packages/multistream-select/test/integration.spec.ts index b9f6c8e479..eacc765deb 100644 --- a/packages/multistream-select/test/integration.spec.ts +++ b/packages/multistream-select/test/integration.spec.ts @@ -5,7 +5,7 @@ import all from 'it-all' import { pipe } from 'it-pipe' import { pEvent } from 'p-event' import { Uint8ArrayList } from 'uint8arraylist' -import * as mss from '../src/index.js' +import * as mss from '../src/index.ts' describe('Dialer and Listener integration', () => { it('should handle and select', async () => { diff --git a/packages/multistream-select/test/listener.spec.ts b/packages/multistream-select/test/listener.spec.ts index 6fa347aa19..248b016f2d 100644 --- a/packages/multistream-select/test/listener.spec.ts +++ b/packages/multistream-select/test/listener.spec.ts @@ -4,7 +4,7 @@ import randomBytes from 'iso-random-stream/src/random.js' import drain from 'it-drain' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import * as mss from '../src/index.js' +import * as mss from '../src/index.ts' describe('Listener', () => { describe('listener.handle', () => { diff --git a/packages/multistream-select/test/multistream.spec.ts b/packages/multistream-select/test/multistream.spec.ts index db163f5bfe..c94d648371 100644 --- a/packages/multistream-select/test/multistream.spec.ts +++ b/packages/multistream-select/test/multistream.spec.ts @@ -4,7 +4,7 @@ import { streamPair, lpStream } from '@libp2p/utils' import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { readString } from '../src/multistream.js' +import { readString } from '../src/multistream.ts' describe('Multistream', () => { describe('Multistream.read', () => { diff --git a/packages/peer-collections/package.json b/packages/peer-collections/package.json index e952eb3409..0d88d005c4 100644 --- a/packages/peer-collections/package.json +++ b/packages/peer-collections/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@libp2p/crypto": "^5.1.18", "@types/sinon": "^21.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon": "^21.0.0", "sinon-ts": "^2.0.0" }, diff --git a/packages/peer-collections/test/filter.spec.ts b/packages/peer-collections/test/filter.spec.ts index 19d930473c..b3a6b4aeca 100644 --- a/packages/peer-collections/test/filter.spec.ts +++ b/packages/peer-collections/test/filter.spec.ts @@ -1,7 +1,7 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' -import { PeerFilter } from '../src/index.js' +import { PeerFilter } from '../src/index.ts' describe('peer-filter', () => { it('should filter a peer', async () => { diff --git a/packages/peer-collections/test/list.spec.ts b/packages/peer-collections/test/list.spec.ts index 647cb65a49..9ec20f7cf2 100644 --- a/packages/peer-collections/test/list.spec.ts +++ b/packages/peer-collections/test/list.spec.ts @@ -1,7 +1,7 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromMultihash, peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' -import { PeerList } from '../src/index.js' +import { PeerList } from '../src/index.ts' describe('peer-list', () => { it('should return a list', async () => { diff --git a/packages/peer-collections/test/map.spec.ts b/packages/peer-collections/test/map.spec.ts index 321c1fcf1d..8348a35f45 100644 --- a/packages/peer-collections/test/map.spec.ts +++ b/packages/peer-collections/test/map.spec.ts @@ -1,7 +1,7 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromMultihash, peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' -import { PeerMap } from '../src/index.js' +import { PeerMap } from '../src/index.ts' describe('peer-map', () => { it('should return a map', async () => { diff --git a/packages/peer-collections/test/set.spec.ts b/packages/peer-collections/test/set.spec.ts index 99d426e096..72ca8afdfa 100644 --- a/packages/peer-collections/test/set.spec.ts +++ b/packages/peer-collections/test/set.spec.ts @@ -1,7 +1,7 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromMultihash, peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' -import { PeerSet } from '../src/index.js' +import { PeerSet } from '../src/index.ts' import type { PeerId } from '@libp2p/interface' describe('peer-set', () => { diff --git a/packages/peer-collections/test/tracked-list.spec.ts b/packages/peer-collections/test/tracked-list.spec.ts index 8d659dbd53..cfc67f0c2d 100644 --- a/packages/peer-collections/test/tracked-list.spec.ts +++ b/packages/peer-collections/test/tracked-list.spec.ts @@ -2,8 +2,8 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { PeerList } from '../src/list.js' -import { trackedPeerList } from '../src/tracked-list.js' +import { PeerList } from '../src/list.ts' +import { trackedPeerList } from '../src/tracked-list.ts' import type { Metric, Metrics, PeerId } from '@libp2p/interface' import type { SinonStubbedInstance } from 'sinon' diff --git a/packages/peer-collections/test/tracked-map.spec.ts b/packages/peer-collections/test/tracked-map.spec.ts index 206f48f728..6adb432f5e 100644 --- a/packages/peer-collections/test/tracked-map.spec.ts +++ b/packages/peer-collections/test/tracked-map.spec.ts @@ -2,8 +2,8 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { PeerMap } from '../src/map.js' -import { trackedPeerMap } from '../src/tracked-map.js' +import { PeerMap } from '../src/map.ts' +import { trackedPeerMap } from '../src/tracked-map.ts' import type { Metric, Metrics, PeerId } from '@libp2p/interface' import type { SinonStubbedInstance } from 'sinon' diff --git a/packages/peer-collections/test/tracked-set.spec.ts b/packages/peer-collections/test/tracked-set.spec.ts index c40512d0d3..14578d6e01 100644 --- a/packages/peer-collections/test/tracked-set.spec.ts +++ b/packages/peer-collections/test/tracked-set.spec.ts @@ -2,8 +2,8 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { PeerSet } from '../src/set.js' -import { trackedPeerSet } from '../src/tracked-set.js' +import { PeerSet } from '../src/set.ts' +import { trackedPeerSet } from '../src/tracked-set.ts' import type { Metric, Metrics, PeerId } from '@libp2p/interface' import type { SinonStubbedInstance } from 'sinon' diff --git a/packages/peer-discovery-bootstrap/package.json b/packages/peer-discovery-bootstrap/package.json index 61c82be975..217af053ea 100644 --- a/packages/peer-discovery-bootstrap/package.json +++ b/packages/peer-discovery-bootstrap/package.json @@ -58,7 +58,7 @@ "devDependencies": { "@libp2p/interface-compliance-tests": "^7.0.23", "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon-ts": "^2.0.0" }, "sideEffects": false diff --git a/packages/peer-discovery-bootstrap/test/bootstrap.spec.ts b/packages/peer-discovery-bootstrap/test/bootstrap.spec.ts index e13a5ae9ca..ad3794288b 100644 --- a/packages/peer-discovery-bootstrap/test/bootstrap.spec.ts +++ b/packages/peer-discovery-bootstrap/test/bootstrap.spec.ts @@ -4,7 +4,7 @@ import { peerIdFromString } from '@libp2p/peer-id' import { CODE_P2P, multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { bootstrap } from '../src/index.js' +import { bootstrap } from '../src/index.ts' import peerList from './fixtures/default-peers.ts' import partialValidPeerList from './fixtures/some-invalid-peers.ts' import type { ComponentLogger, PeerStore } from '@libp2p/interface' diff --git a/packages/peer-discovery-bootstrap/test/compliance.spec.ts b/packages/peer-discovery-bootstrap/test/compliance.spec.ts index 85db08f2bb..34174ea944 100644 --- a/packages/peer-discovery-bootstrap/test/compliance.spec.ts +++ b/packages/peer-discovery-bootstrap/test/compliance.spec.ts @@ -1,7 +1,7 @@ import tests from '@libp2p/interface-compliance-tests/peer-discovery' import { defaultLogger } from '@libp2p/logger' import { stubInterface } from 'sinon-ts' -import { bootstrap } from '../src/index.js' +import { bootstrap } from '../src/index.ts' import peerList from './fixtures/default-peers.ts' import type { PeerStore } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' diff --git a/packages/peer-discovery-mdns/package.json b/packages/peer-discovery-mdns/package.json index e3928931f7..ac1de90cbe 100644 --- a/packages/peer-discovery-mdns/package.json +++ b/packages/peer-discovery-mdns/package.json @@ -58,7 +58,7 @@ "@libp2p/crypto": "^5.1.18", "@libp2p/interface-compliance-tests": "^7.0.23", "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "p-event": "^7.0.0", "p-wait-for": "^6.0.0", "sinon-ts": "^2.0.0" diff --git a/packages/peer-discovery-mdns/test/compliance.spec.ts b/packages/peer-discovery-mdns/test/compliance.spec.ts index e9ec7fe840..9e434a6f70 100644 --- a/packages/peer-discovery-mdns/test/compliance.spec.ts +++ b/packages/peer-discovery-mdns/test/compliance.spec.ts @@ -4,7 +4,7 @@ import { defaultLogger } from '@libp2p/logger' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { stubInterface } from 'sinon-ts' -import { MulticastDNS } from '../src/mdns.js' +import { MulticastDNS } from '../src/mdns.ts' import type { AddressManager } from '@libp2p/interface-internal' const isCI = Boolean(process.env.CI) diff --git a/packages/peer-id/package.json b/packages/peer-id/package.json index 3eb5a1681d..f8654b7fae 100644 --- a/packages/peer-id/package.json +++ b/packages/peer-id/package.json @@ -51,10 +51,10 @@ "@libp2p/crypto": "^5.1.18", "@libp2p/interface": "^3.2.2", "multiformats": "^13.4.0", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon": "^21.0.0" }, "sideEffects": false diff --git a/packages/peer-id/test/index.spec.ts b/packages/peer-id/test/index.spec.ts index 343363aba9..955f37f418 100644 --- a/packages/peer-id/test/index.spec.ts +++ b/packages/peer-id/test/index.spec.ts @@ -8,7 +8,7 @@ import { CID } from 'multiformats/cid' import { identity } from 'multiformats/hashes/identity' import Sinon from 'sinon' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { peerIdFromCID, peerIdFromMultihash, peerIdFromPrivateKey, peerIdFromString } from '../src/index.js' +import { peerIdFromCID, peerIdFromMultihash, peerIdFromPrivateKey, peerIdFromString } from '../src/index.ts' import type { KeyType, PeerId } from '@libp2p/interface' // these values are from https://github.com/multiformats/multicodec/blob/master/table.csv diff --git a/packages/peer-record/package.json b/packages/peer-record/package.json index 1f6740c137..9b09579f0d 100644 --- a/packages/peer-record/package.json +++ b/packages/peer-record/package.json @@ -57,10 +57,10 @@ "protons-runtime": "^6.0.1", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "protons": "^8.1.1" }, "sideEffects": false diff --git a/packages/peer-record/test/envelope.spec.ts b/packages/peer-record/test/envelope.spec.ts index 7c51e9b279..a43d90aea1 100644 --- a/packages/peer-record/test/envelope.spec.ts +++ b/packages/peer-record/test/envelope.spec.ts @@ -2,7 +2,7 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { expect } from 'aegir/chai' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { fromString as uint8arrayFromString } from 'uint8arrays/from-string' -import { RecordEnvelope } from '../src/envelope/index.js' +import { RecordEnvelope } from '../src/envelope/index.ts' import type { PrivateKey, Record } from '@libp2p/interface' const domain = 'libp2p-testing' diff --git a/packages/peer-record/test/peer-record.spec.ts b/packages/peer-record/test/peer-record.spec.ts index ff4a0a28a8..f0e17aaf10 100644 --- a/packages/peer-record/test/peer-record.spec.ts +++ b/packages/peer-record/test/peer-record.spec.ts @@ -2,8 +2,8 @@ import { generateKeyPair, privateKeyFromProtobuf } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { RecordEnvelope } from '../src/envelope/index.js' -import { PeerRecord } from '../src/peer-record/index.js' +import { RecordEnvelope } from '../src/envelope/index.ts' +import { PeerRecord } from '../src/peer-record/index.ts' import type { PeerId, PrivateKey } from '@libp2p/interface' describe('PeerRecord', () => { diff --git a/packages/peer-record/test/peer-record/utils.spec.ts b/packages/peer-record/test/peer-record/utils.spec.ts index c2e71f1eb3..14ca8a1d78 100644 --- a/packages/peer-record/test/peer-record/utils.spec.ts +++ b/packages/peer-record/test/peer-record/utils.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { arrayEquals } from '../../src/peer-record/utils.js' +import { arrayEquals } from '../../src/peer-record/utils.ts' describe('non primitive array equals', () => { it('returns true if two arrays of multiaddrs are equal', () => { diff --git a/packages/peer-store/package.json b/packages/peer-store/package.json index db6d16a197..52c8ed2c75 100644 --- a/packages/peer-store/package.json +++ b/packages/peer-store/package.json @@ -62,12 +62,12 @@ "multiformats": "^13.4.0", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", "@types/sinon": "^21.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "benchmark": "^2.1.4", "datastore-core": "^11.0.1", "delay": "^7.0.0", diff --git a/packages/peer-store/src/utils/bytes-to-peer.ts b/packages/peer-store/src/utils/bytes-to-peer.ts index 87215ec455..9a452d8b61 100644 --- a/packages/peer-store/src/utils/bytes-to-peer.ts +++ b/packages/peer-store/src/utils/bytes-to-peer.ts @@ -1,7 +1,7 @@ import { publicKeyFromProtobuf } from '@libp2p/crypto/keys' import { peerIdFromPublicKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' -import { Peer as PeerPB } from '../pb/peer.js' +import { Peer as PeerPB } from '../pb/peer.ts' import type { PeerId, Peer, Tag } from '@libp2p/interface' import type { Digest } from 'multiformats/hashes/digest' diff --git a/packages/peer-store/src/utils/dedupe-addresses.ts b/packages/peer-store/src/utils/dedupe-addresses.ts index fad9fdf6b7..cf52ecf13f 100644 --- a/packages/peer-store/src/utils/dedupe-addresses.ts +++ b/packages/peer-store/src/utils/dedupe-addresses.ts @@ -1,7 +1,7 @@ import { InvalidParametersError } from '@libp2p/interface' import { CODE_P2P, isMultiaddr, multiaddr } from '@multiformats/multiaddr' -import type { AddressFilter } from '../index.js' -import type { Address as AddressPB } from '../pb/peer.js' +import type { AddressFilter } from '../index.ts' +import type { Address as AddressPB } from '../pb/peer.ts' import type { PeerId, Address, AbortOptions } from '@libp2p/interface' export async function dedupeFilterAndSortAddresses (peerId: PeerId, filter: AddressFilter, addresses: Array
, existingAddresses?: AddressPB[], options?: AbortOptions): Promise { diff --git a/packages/peer-store/src/utils/peer-equals.ts b/packages/peer-store/src/utils/peer-equals.ts index 7fb2b2a959..b9ebade3e6 100644 --- a/packages/peer-store/src/utils/peer-equals.ts +++ b/packages/peer-store/src/utils/peer-equals.ts @@ -1,5 +1,5 @@ import { equals as uint8ArrayEquals } from 'uint8arrays/equals' -import type { Peer, Address, Tag } from '../pb/peer.js' +import type { Peer, Address, Tag } from '../pb/peer.ts' export function peerEquals (peerA: Peer, peerB: Peer): boolean { return addressesEqual(peerA.addresses, peerB.addresses) && diff --git a/packages/peer-store/src/utils/to-peer-pb.ts b/packages/peer-store/src/utils/to-peer-pb.ts index bd579fc96c..691d8213da 100644 --- a/packages/peer-store/src/utils/to-peer-pb.ts +++ b/packages/peer-store/src/utils/to-peer-pb.ts @@ -3,9 +3,9 @@ import { publicKeyToProtobuf } from '@libp2p/crypto/keys' import { InvalidParametersError } from '@libp2p/interface' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { dedupeFilterAndSortAddresses } from './dedupe-addresses.ts' -import type { AddressFilter } from '../index.js' -import type { Tag, Peer as PeerPB } from '../pb/peer.js' -import type { ExistingPeer } from '../store.js' +import type { AddressFilter } from '../index.ts' +import type { Tag, Peer as PeerPB } from '../pb/peer.ts' +import type { ExistingPeer } from '../store.ts' import type { PeerId, Address, PeerData, TagOptions, AbortOptions } from '@libp2p/interface' export interface ToPBPeerOptions extends AbortOptions { diff --git a/packages/peer-store/test/index.spec.ts b/packages/peer-store/test/index.spec.ts index e221ce2a7f..03a032375e 100644 --- a/packages/peer-store/test/index.spec.ts +++ b/packages/peer-store/test/index.spec.ts @@ -10,8 +10,8 @@ import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core/memory' import delay from 'delay' import { TypedEventEmitter } from 'main-event' -import { persistentPeerStore } from '../src/index.js' -import type { PersistentPeerStoreComponents } from '../src/index.js' +import { persistentPeerStore } from '../src/index.ts' +import type { PersistentPeerStoreComponents } from '../src/index.ts' import type { Libp2pEvents, PeerId, PrivateKey, PeerStore } from '@libp2p/interface' import type { TypedEventTarget } from 'main-event' diff --git a/packages/peer-store/test/merge.spec.ts b/packages/peer-store/test/merge.spec.ts index ac25d8033e..50aa8a693b 100644 --- a/packages/peer-store/test/merge.spec.ts +++ b/packages/peer-store/test/merge.spec.ts @@ -9,8 +9,8 @@ import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core/memory' import { TypedEventEmitter } from 'main-event' import { pEvent } from 'p-event' -import { persistentPeerStore } from '../src/index.js' -import { peerIdToDatastoreKey } from '../src/utils/peer-id-to-datastore-key.js' +import { persistentPeerStore } from '../src/index.ts' +import { peerIdToDatastoreKey } from '../src/utils/peer-id-to-datastore-key.ts' import type { Libp2pEvents, PeerId, PeerStore, PeerData } from '@libp2p/interface' import type { Datastore } from 'interface-datastore' import type { TypedEventTarget } from 'main-event' diff --git a/packages/peer-store/test/patch.spec.ts b/packages/peer-store/test/patch.spec.ts index 5356e21245..646e486e46 100644 --- a/packages/peer-store/test/patch.spec.ts +++ b/packages/peer-store/test/patch.spec.ts @@ -9,7 +9,7 @@ import { expect } from 'aegir/chai' import { MemoryDatastore } from 'datastore-core/memory' import { TypedEventEmitter } from 'main-event' import { pEvent } from 'p-event' -import { persistentPeerStore } from '../src/index.js' +import { persistentPeerStore } from '../src/index.ts' import type { Libp2pEvents, PeerId, PeerStore, PeerData } from '@libp2p/interface' import type { TypedEventTarget } from 'main-event' diff --git a/packages/peer-store/test/save.spec.ts b/packages/peer-store/test/save.spec.ts index 18cf2f6d12..f0a1396903 100644 --- a/packages/peer-store/test/save.spec.ts +++ b/packages/peer-store/test/save.spec.ts @@ -11,8 +11,8 @@ import { TypedEventEmitter } from 'main-event' import pDefer from 'p-defer' import { pEvent } from 'p-event' import sinon from 'sinon' -import { persistentPeerStore } from '../src/index.js' -import { Peer as PeerPB } from '../src/pb/peer.js' +import { persistentPeerStore } from '../src/index.ts' +import { Peer as PeerPB } from '../src/pb/peer.ts' import type { Libp2pEvents, PeerId, PeerStore, PeerData, PeerUpdate } from '@libp2p/interface' import type { TypedEventTarget } from 'main-event' diff --git a/packages/peer-store/test/utils/dedupe-addresses.spec.ts b/packages/peer-store/test/utils/dedupe-addresses.spec.ts index 9191739440..37097ef1ba 100644 --- a/packages/peer-store/test/utils/dedupe-addresses.spec.ts +++ b/packages/peer-store/test/utils/dedupe-addresses.spec.ts @@ -2,7 +2,7 @@ import { generateKeyPair } from '@libp2p/crypto/keys' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { dedupeFilterAndSortAddresses } from '../../src/utils/dedupe-addresses.js' +import { dedupeFilterAndSortAddresses } from '../../src/utils/dedupe-addresses.ts' import type { PeerId } from '@libp2p/interface' const addr1 = multiaddr('/ip4/127.0.0.1/tcp/8000') diff --git a/packages/pnet/package.json b/packages/pnet/package.json index b5ae84a550..1cdc041d5d 100644 --- a/packages/pnet/package.json +++ b/packages/pnet/package.json @@ -48,12 +48,12 @@ "@libp2p/interface": "^3.2.2", "@libp2p/utils": "^7.2.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0", + "uint8arrays": "^6.1.1", "xsalsa20": "^1.2.0" }, "devDependencies": { "@types/xsalsa20": "^1.1.3", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "p-event": "^7.0.0" }, "sideEffects": false diff --git a/packages/pnet/test/index.spec.ts b/packages/pnet/test/index.spec.ts index e8a7069a1d..61a3bb8759 100644 --- a/packages/pnet/test/index.spec.ts +++ b/packages/pnet/test/index.spec.ts @@ -2,8 +2,8 @@ import { multiaddrConnectionPair } from '@libp2p/utils' import { expect } from 'aegir/chai' import { pEvent } from 'p-event' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { INVALID_PSK } from '../src/errors.js' -import { preSharedKey, generateKey } from '../src/index.js' +import { INVALID_PSK } from '../src/errors.ts' +import { preSharedKey, generateKey } from '../src/index.ts' const swarmKeyBuffer = new Uint8Array(95) const wrongSwarmKeyBuffer = new Uint8Array(95) diff --git a/packages/protocol-autonat-v2/package.json b/packages/protocol-autonat-v2/package.json index 3fe8041f90..668017c8a1 100644 --- a/packages/protocol-autonat-v2/package.json +++ b/packages/protocol-autonat-v2/package.json @@ -55,13 +55,13 @@ "main-event": "^1.0.1", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/crypto": "^5.1.18", "@libp2p/logger": "^6.2.7", "@libp2p/peer-id": "^6.0.9", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "it-all": "^3.0.9", "it-length-prefixed": "^10.0.1", diff --git a/packages/protocol-autonat/package.json b/packages/protocol-autonat/package.json index 10d1e7f9c7..18e2ee419a 100644 --- a/packages/protocol-autonat/package.json +++ b/packages/protocol-autonat/package.json @@ -61,7 +61,7 @@ "devDependencies": { "@libp2p/crypto": "^5.1.18", "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "it-all": "^3.0.9", "it-length-prefixed": "^10.0.1", diff --git a/packages/protocol-autonat/test/index.spec.ts b/packages/protocol-autonat/test/index.spec.ts index 57c2fe9e3f..9aa25647b9 100644 --- a/packages/protocol-autonat/test/index.spec.ts +++ b/packages/protocol-autonat/test/index.spec.ts @@ -17,10 +17,10 @@ import pRetry from 'p-retry' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { Uint8ArrayList } from 'uint8arraylist' -import { AutoNATService } from '../src/autonat.js' -import { PROTOCOL_NAME, PROTOCOL_PREFIX, PROTOCOL_VERSION } from '../src/constants.js' -import { Message } from '../src/pb/index.js' -import type { AutoNATComponents, AutoNATServiceInit } from '../src/index.js' +import { AutoNATService } from '../src/autonat.ts' +import { PROTOCOL_NAME, PROTOCOL_PREFIX, PROTOCOL_VERSION } from '../src/constants.ts' +import { Message } from '../src/pb/index.ts' +import type { AutoNATComponents, AutoNATServiceInit } from '../src/index.ts' import type { Connection, PeerId, Transport, Libp2pEvents, PeerStore, Peer } from '@libp2p/interface' import type { AddressManager, ConnectionManager, RandomWalk, Registrar, TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/protocol-dcutr/package.json b/packages/protocol-dcutr/package.json index 512f8c9d93..98b06cae1c 100644 --- a/packages/protocol-dcutr/package.json +++ b/packages/protocol-dcutr/package.json @@ -56,7 +56,7 @@ "uint8arraylist": "^2.4.8" }, "devDependencies": { - "aegir": "^47.0.22", + "aegir": "^48.0.11", "protons": "^8.1.1", "sinon": "^21.0.0", "sinon-ts": "^2.0.0" diff --git a/packages/protocol-dcutr/test/utils.spec.ts b/packages/protocol-dcutr/test/utils.spec.ts index 840d06b2cd..b260dfa58a 100644 --- a/packages/protocol-dcutr/test/utils.spec.ts +++ b/packages/protocol-dcutr/test/utils.spec.ts @@ -2,7 +2,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { isPublicAndDialable } from '../src/utils.js' +import { isPublicAndDialable } from '../src/utils.ts' import type { Transport } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' diff --git a/packages/protocol-echo/package.json b/packages/protocol-echo/package.json index e480a4bf85..b90d5e36fa 100644 --- a/packages/protocol-echo/package.json +++ b/packages/protocol-echo/package.json @@ -53,7 +53,7 @@ }, "devDependencies": { "@multiformats/multiaddr": "^13.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "it-all": "^3.0.9", "sinon": "^21.0.0", "sinon-ts": "^2.0.0" diff --git a/packages/protocol-echo/test/index.spec.ts b/packages/protocol-echo/test/index.spec.ts index fe5ea27df9..b7167d54ad 100644 --- a/packages/protocol-echo/test/index.spec.ts +++ b/packages/protocol-echo/test/index.spec.ts @@ -6,7 +6,7 @@ import all from 'it-all' import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { Uint8ArrayList } from 'uint8arraylist' -import { Echo } from '../src/echo.js' +import { Echo } from '../src/echo.ts' import type { Connection } from '@libp2p/interface' import type { ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/protocol-fetch/package.json b/packages/protocol-fetch/package.json index 404f73f4be..649057af05 100644 --- a/packages/protocol-fetch/package.json +++ b/packages/protocol-fetch/package.json @@ -52,12 +52,12 @@ "main-event": "^1.0.1", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/crypto": "^5.1.18", "@libp2p/peer-id": "^6.0.9", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "protons": "^8.1.1", "sinon": "^21.0.0", "sinon-ts": "^2.0.0" diff --git a/packages/protocol-fetch/test/index.spec.ts b/packages/protocol-fetch/test/index.spec.ts index 498dba19b4..4619914177 100644 --- a/packages/protocol-fetch/test/index.spec.ts +++ b/packages/protocol-fetch/test/index.spec.ts @@ -7,8 +7,8 @@ import sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { fromString as uint8arrayFromString } from 'uint8arrays/from-string' import { toString as uint8arrayToString } from 'uint8arrays/to-string' -import { Fetch } from '../src/fetch.js' -import { FetchRequest, FetchResponse } from '../src/pb/proto.js' +import { Fetch } from '../src/fetch.ts' +import { FetchRequest, FetchResponse } from '../src/pb/proto.ts' import type { Connection, Stream, PeerId } from '@libp2p/interface' import type { ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/protocol-identify/package.json b/packages/protocol-identify/package.json index ddb3dce34e..7259556c25 100644 --- a/packages/protocol-identify/package.json +++ b/packages/protocol-identify/package.json @@ -59,11 +59,11 @@ "main-event": "^1.0.1", "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "it-length-prefixed": "^10.0.1", "protons": "^8.1.1", diff --git a/packages/protocol-identify/test/index.spec.ts b/packages/protocol-identify/test/index.spec.ts index 3f632cc6f0..0924dd422b 100644 --- a/packages/protocol-identify/test/index.spec.ts +++ b/packages/protocol-identify/test/index.spec.ts @@ -10,8 +10,8 @@ import * as lp from 'it-length-prefixed' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { Identify } from '../src/identify.js' -import { Identify as IdentifyMessage } from '../src/pb/message.js' +import { Identify } from '../src/identify.ts' +import { Identify as IdentifyMessage } from '../src/pb/message.ts' import type { Libp2pEvents, PeerStore, Connection, PeerId, PrivateKey, TypedEventTarget, ComponentLogger, NodeInfo } from '@libp2p/interface' import type { AddressManager, Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/protocol-identify/test/push.spec.ts b/packages/protocol-identify/test/push.spec.ts index 36274d8e00..11c3e4a156 100644 --- a/packages/protocol-identify/test/push.spec.ts +++ b/packages/protocol-identify/test/push.spec.ts @@ -9,8 +9,8 @@ import { expect } from 'aegir/chai' import delay from 'delay' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' -import { IdentifyPush } from '../src/identify-push.js' -import { Identify as IdentifyMessage } from '../src/pb/message.js' +import { IdentifyPush } from '../src/identify-push.ts' +import { Identify as IdentifyMessage } from '../src/pb/message.ts' import type { ComponentLogger, Connection, Libp2pEvents, NodeInfo, PeerId, PeerStore, PrivateKey, TypedEventTarget } from '@libp2p/interface' import type { AddressManager, ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/protocol-identify/test/utils.spec.ts b/packages/protocol-identify/test/utils.spec.ts index 919131cd6b..959691296f 100644 --- a/packages/protocol-identify/test/utils.spec.ts +++ b/packages/protocol-identify/test/utils.spec.ts @@ -3,8 +3,8 @@ import { streamPair } from '@libp2p/utils' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import * as lp from 'it-length-prefixed' -import { Identify as IdentifyMessage } from '../src/pb/message.js' -import { mergeIdentifyMessages, readIdentifyMessages } from '../src/utils.js' +import { Identify as IdentifyMessage } from '../src/pb/message.ts' +import { mergeIdentifyMessages, readIdentifyMessages } from '../src/utils.ts' describe('mergeIdentifyMessages', () => { it('returns a single message unchanged', () => { diff --git a/packages/protocol-perf/package.json b/packages/protocol-perf/package.json index 11ce8325a7..275c74d2a8 100644 --- a/packages/protocol-perf/package.json +++ b/packages/protocol-perf/package.json @@ -56,7 +56,7 @@ "devDependencies": { "@libp2p/logger": "^6.2.7", "@libp2p/utils": "^7.2.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "it-last": "^3.0.9", "sinon-ts": "^2.0.0" }, diff --git a/packages/protocol-perf/test/index.spec.ts b/packages/protocol-perf/test/index.spec.ts index a577a43bcd..0df69a7adc 100644 --- a/packages/protocol-perf/test/index.spec.ts +++ b/packages/protocol-perf/test/index.spec.ts @@ -5,7 +5,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import last from 'it-last' import { stubInterface } from 'sinon-ts' -import { Perf } from '../src/perf-service.js' +import { Perf } from '../src/perf-service.ts' import type { ComponentLogger, Connection } from '@libp2p/interface' import type { ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/protocol-ping/package.json b/packages/protocol-ping/package.json index ea78918535..cd4ba4b06d 100644 --- a/packages/protocol-ping/package.json +++ b/packages/protocol-ping/package.json @@ -50,12 +50,12 @@ "p-event": "^7.0.0", "race-signal": "^2.0.0", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/peer-id": "^6.0.9", "@libp2p/utils": "^7.2.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "sinon": "^21.0.0", "sinon-ts": "^2.0.0" diff --git a/packages/protocol-ping/test/index.spec.ts b/packages/protocol-ping/test/index.spec.ts index caf2238d44..b607a3ecff 100644 --- a/packages/protocol-ping/test/index.spec.ts +++ b/packages/protocol-ping/test/index.spec.ts @@ -6,8 +6,8 @@ import { expect } from 'aegir/chai' import delay from 'delay' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { PING_LENGTH, PING_PROTOCOL } from '../src/constants.js' -import { Ping } from '../src/ping.js' +import { PING_LENGTH, PING_PROTOCOL } from '../src/constants.ts' +import { Ping } from '../src/ping.ts' import type { Connection } from '@libp2p/interface' import type { ConnectionManager, Registrar } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/record/package.json b/packages/record/package.json index 2b6abae6bb..f4a79db062 100644 --- a/packages/record/package.json +++ b/packages/record/package.json @@ -50,13 +50,13 @@ "dependencies": { "protons-runtime": "^6.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@types/lodash.random": "^3.2.9", "@types/lodash.range": "^3.2.9", "@types/which": "^3.0.4", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "multiformats": "^13.4.0", "protons": "^8.1.1" }, diff --git a/packages/record/test/record.spec.ts b/packages/record/test/record.spec.ts index e0ee1065bf..8f37fd247e 100644 --- a/packages/record/test/record.spec.ts +++ b/packages/record/test/record.spec.ts @@ -1,7 +1,7 @@ /* eslint-env mocha */ import { expect } from 'aegir/chai' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { Libp2pRecord } from '../src/index.js' +import { Libp2pRecord } from '../src/index.ts' import * as fixture from './fixtures/go-record.ts' const date = new Date() diff --git a/packages/record/test/utils.spec.ts b/packages/record/test/utils.spec.ts index 4637c18650..877ab59648 100644 --- a/packages/record/test/utils.spec.ts +++ b/packages/record/test/utils.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import * as utils from '../src/utils.js' +import * as utils from '../src/utils.ts' const dates = [{ obj: new Date(Date.UTC(2016, 0, 1, 8, 22, 33, 392)), diff --git a/packages/stream-multiplexer-mplex/package.json b/packages/stream-multiplexer-mplex/package.json index 86c0a6d1d2..f44f25422b 100644 --- a/packages/stream-multiplexer-mplex/package.json +++ b/packages/stream-multiplexer-mplex/package.json @@ -61,12 +61,12 @@ "it-pushable": "^3.2.3", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/interface-compliance-tests": "^7.0.23", "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "benchmark": "^2.1.4", "iso-random-stream": "^2.0.2", "it-all": "^3.0.9", diff --git a/packages/stream-multiplexer-mplex/test/coder.spec.ts b/packages/stream-multiplexer-mplex/test/coder.spec.ts index ac035feb1b..275515223d 100644 --- a/packages/stream-multiplexer-mplex/test/coder.spec.ts +++ b/packages/stream-multiplexer-mplex/test/coder.spec.ts @@ -6,10 +6,10 @@ import all from 'it-all' import { Uint8ArrayList } from 'uint8arraylist' import { concat as uint8ArrayConcat } from 'uint8arrays/concat' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { encode } from '../src/encode.js' +import { encode } from '../src/encode.ts' import { decode } from './fixtures/decode.ts' import { messageWithBytes } from './fixtures/utils.ts' -import type { Message, NewStreamMessage } from '../src/message-types.js' +import type { Message, NewStreamMessage } from '../src/message-types.ts' describe('coder', () => { it('should encode header', async () => { diff --git a/packages/stream-multiplexer-mplex/test/compliance.spec.ts b/packages/stream-multiplexer-mplex/test/compliance.spec.ts index ad2b2a3c4c..77cac65e7f 100644 --- a/packages/stream-multiplexer-mplex/test/compliance.spec.ts +++ b/packages/stream-multiplexer-mplex/test/compliance.spec.ts @@ -1,5 +1,5 @@ import tests from '@libp2p/interface-compliance-tests/stream-muxer' -import { mplex } from '../src/index.js' +import { mplex } from '../src/index.ts' describe('compliance', () => { tests({ diff --git a/packages/stream-multiplexer-mplex/test/fixtures/decode.ts b/packages/stream-multiplexer-mplex/test/fixtures/decode.ts index e3295d36b9..8e5352ee61 100644 --- a/packages/stream-multiplexer-mplex/test/fixtures/decode.ts +++ b/packages/stream-multiplexer-mplex/test/fixtures/decode.ts @@ -1,5 +1,5 @@ -import { Decoder, MAX_MSG_QUEUE_SIZE, MAX_MSG_SIZE } from '../../src/decode.js' -import type { Message } from '../../src/message-types.js' +import { Decoder, MAX_MSG_QUEUE_SIZE, MAX_MSG_SIZE } from '../../src/decode.ts' +import type { Message } from '../../src/message-types.ts' import type { Source } from 'it-stream-types' import type { Uint8ArrayList } from 'uint8arraylist' diff --git a/packages/stream-multiplexer-mplex/test/fixtures/utils.ts b/packages/stream-multiplexer-mplex/test/fixtures/utils.ts index be0fb2c512..03d94cd414 100644 --- a/packages/stream-multiplexer-mplex/test/fixtures/utils.ts +++ b/packages/stream-multiplexer-mplex/test/fixtures/utils.ts @@ -1,5 +1,5 @@ -import { MessageTypes } from '../../src/message-types.js' -import type { Message } from '../../src/message-types.js' +import { MessageTypes } from '../../src/message-types.ts' +import type { Message } from '../../src/message-types.ts' export type MessageWithBytes = { [k in keyof Message]: Message[k] diff --git a/packages/stream-multiplexer-mplex/test/restrict-size.spec.ts b/packages/stream-multiplexer-mplex/test/restrict-size.spec.ts index 0d79f698e6..72b02e0d29 100644 --- a/packages/stream-multiplexer-mplex/test/restrict-size.spec.ts +++ b/packages/stream-multiplexer-mplex/test/restrict-size.spec.ts @@ -5,10 +5,10 @@ import drain from 'it-drain' import each from 'it-foreach' import { pipe } from 'it-pipe' import { Uint8ArrayList } from 'uint8arraylist' -import { MessageTypes } from '../src/message-types.js' +import { MessageTypes } from '../src/message-types.ts' import { decode } from './fixtures/decode.ts' import { encode } from './fixtures/encode.ts' -import type { Message } from '../src/message-types.js' +import type { Message } from '../src/message-types.ts' describe('restrict size', () => { it('should throw when size is too big', async () => { diff --git a/packages/stream-multiplexer-mplex/test/stream.spec.ts b/packages/stream-multiplexer-mplex/test/stream.spec.ts index 09b01eb3e8..bd1ea52ee6 100644 --- a/packages/stream-multiplexer-mplex/test/stream.spec.ts +++ b/packages/stream-multiplexer-mplex/test/stream.spec.ts @@ -9,11 +9,11 @@ import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays' import { MAX_MSG_SIZE } from '../src/decode.ts' import { mplex } from '../src/index.ts' -import { MessageTypes, MessageTypeNames } from '../src/message-types.js' +import { MessageTypes, MessageTypeNames } from '../src/message-types.ts' import { decode } from './fixtures/decode.ts' import { messageWithBytes } from './fixtures/utils.ts' -import type { Message } from '../src/message-types.js' -import type { MplexStream } from '../src/stream.js' +import type { Message } from '../src/message-types.ts' +import type { MplexStream } from '../src/stream.ts' import type { MessageStream } from '@libp2p/interface' function randomInput (min = 1, max = 100): Uint8ArrayList[] { diff --git a/packages/transport-circuit-relay-v2/package.json b/packages/transport-circuit-relay-v2/package.json index bb52dc247b..2cf951ecee 100644 --- a/packages/transport-circuit-relay-v2/package.json +++ b/packages/transport-circuit-relay-v2/package.json @@ -63,11 +63,11 @@ "protons-runtime": "^6.0.1", "retimeable-signal": "^1.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "it-all": "^3.0.9", "it-protobuf-stream": "^2.0.3", diff --git a/packages/transport-circuit-relay-v2/src/server/index.ts b/packages/transport-circuit-relay-v2/src/server/index.ts index a2d4a53030..65e9ca03fe 100644 --- a/packages/transport-circuit-relay-v2/src/server/index.ts +++ b/packages/transport-circuit-relay-v2/src/server/index.ts @@ -12,13 +12,13 @@ import { RELAY_SOURCE_TAG, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC -} from '../constants.js' -import { HopMessage, Status, StopMessage } from '../pb/index.js' -import { createLimitedRelay } from '../utils.js' +} from '../constants.ts' +import { HopMessage, Status, StopMessage } from '../pb/index.ts' +import { createLimitedRelay } from '../utils.ts' import { ReservationStore } from './reservation-store.ts' import { ReservationVoucherRecord } from './reservation-voucher.ts' -import type { CircuitRelayServerComponents, CircuitRelayServerInit, CircuitRelayService, RelayReservation } from '../index.js' -import type { Reservation } from '../pb/index.js' +import type { CircuitRelayServerComponents, CircuitRelayServerInit, CircuitRelayService, RelayReservation } from '../index.ts' +import type { Reservation } from '../pb/index.ts' import type { Logger, Connection, Stream, PeerId, Startable, AbortOptions } from '@libp2p/interface' import type { PeerMap } from '@libp2p/peer-collections' import type { ProtobufStream } from '@libp2p/utils' diff --git a/packages/transport-circuit-relay-v2/src/server/reservation-store.ts b/packages/transport-circuit-relay-v2/src/server/reservation-store.ts index 8ac85b7423..03e5f8a20d 100644 --- a/packages/transport-circuit-relay-v2/src/server/reservation-store.ts +++ b/packages/transport-circuit-relay-v2/src/server/reservation-store.ts @@ -1,9 +1,9 @@ import { trackedPeerMap } from '@libp2p/peer-collections' import { retimeableSignal } from 'retimeable-signal' -import { DEFAULT_DATA_LIMIT, DEFAULT_DURATION_LIMIT, DEFAULT_MAX_RESERVATION_STORE_SIZE, DEFAULT_MAX_RESERVATION_TTL } from '../constants.js' -import { Status } from '../pb/index.js' -import type { RelayReservation, ServerReservationStoreInit } from '../index.js' -import type { Limit } from '../pb/index.js' +import { DEFAULT_DATA_LIMIT, DEFAULT_DURATION_LIMIT, DEFAULT_MAX_RESERVATION_STORE_SIZE, DEFAULT_MAX_RESERVATION_TTL } from '../constants.ts' +import { Status } from '../pb/index.ts' +import type { RelayReservation, ServerReservationStoreInit } from '../index.ts' +import type { Limit } from '../pb/index.ts' import type { ComponentLogger, Logger, Metrics, PeerId } from '@libp2p/interface' import type { PeerMap } from '@libp2p/peer-collections' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-circuit-relay-v2/src/server/reservation-voucher.ts b/packages/transport-circuit-relay-v2/src/server/reservation-voucher.ts index a16039326f..c4e4f2381e 100644 --- a/packages/transport-circuit-relay-v2/src/server/reservation-voucher.ts +++ b/packages/transport-circuit-relay-v2/src/server/reservation-voucher.ts @@ -1,4 +1,4 @@ -import { ReservationVoucher } from '../pb/index.js' +import { ReservationVoucher } from '../pb/index.ts' import type { PeerId, Record } from '@libp2p/interface' export interface ReservationVoucherOptions { diff --git a/packages/transport-circuit-relay-v2/src/transport/discovery.ts b/packages/transport-circuit-relay-v2/src/transport/discovery.ts index 83975408b3..96159a52b5 100644 --- a/packages/transport-circuit-relay-v2/src/transport/discovery.ts +++ b/packages/transport-circuit-relay-v2/src/transport/discovery.ts @@ -4,7 +4,7 @@ import { TypedEventEmitter, setMaxListeners } from 'main-event' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import { RELAY_V2_HOP_CODEC -} from '../constants.js' +} from '../constants.ts' import type { RelayDiscoveryComponents, RelayDiscoveryEvents, RelayDiscoveryInit } from '../index.ts' import type { Logger, Peer, PeerId, PeerInfo, Startable, TopologyFilter } from '@libp2p/interface' diff --git a/packages/transport-circuit-relay-v2/src/transport/index.ts b/packages/transport-circuit-relay-v2/src/transport/index.ts index 74e36b1f11..7d9ac9bcdf 100644 --- a/packages/transport-circuit-relay-v2/src/transport/index.ts +++ b/packages/transport-circuit-relay-v2/src/transport/index.ts @@ -7,9 +7,9 @@ import { Circuit } from '@multiformats/multiaddr-matcher' import { setMaxListeners } from 'main-event' import * as Digest from 'multiformats/hashes/digest' import { CustomProgressEvent } from 'progress-events' -import { DEFAULT_DISCOVERY_FILTER_ERROR_RATE, DEFAULT_DISCOVERY_FILTER_SIZE, MAX_CONNECTIONS, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from '../constants.js' -import { StopMessage, HopMessage, Status } from '../pb/index.js' -import { CircuitListen, CircuitSearch, LimitTracker } from '../utils.js' +import { DEFAULT_DISCOVERY_FILTER_ERROR_RATE, DEFAULT_DISCOVERY_FILTER_SIZE, MAX_CONNECTIONS, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from '../constants.ts' +import { StopMessage, HopMessage, Status } from '../pb/index.ts' +import { CircuitListen, CircuitSearch, LimitTracker } from '../utils.ts' import { RelayDiscovery } from './discovery.ts' import { createListener } from './listener.ts' import { ReservationStore } from './reservation-store.ts' diff --git a/packages/transport-circuit-relay-v2/src/transport/listener.ts b/packages/transport-circuit-relay-v2/src/transport/listener.ts index 465eefbc9c..6f513347ee 100644 --- a/packages/transport-circuit-relay-v2/src/transport/listener.ts +++ b/packages/transport-circuit-relay-v2/src/transport/listener.ts @@ -1,8 +1,8 @@ import { ListenError } from '@libp2p/interface' import { multiaddr } from '@multiformats/multiaddr' import { TypedEventEmitter, setMaxListeners } from 'main-event' -import { DEFAULT_RESERVATION_COMPLETION_TIMEOUT } from '../constants.js' -import { CircuitListen, CircuitSearch } from '../utils.js' +import { DEFAULT_RESERVATION_COMPLETION_TIMEOUT } from '../constants.ts' +import { CircuitListen, CircuitSearch } from '../utils.ts' import type { RelayReservation, ReservationStore } from './reservation-store.ts' import type { ComponentLogger, Logger, Listener, ListenerEvents, PeerId } from '@libp2p/interface' import type { AddressManager, ConnectionManager } from '@libp2p/interface-internal' diff --git a/packages/transport-circuit-relay-v2/src/transport/reservation-store.ts b/packages/transport-circuit-relay-v2/src/transport/reservation-store.ts index 7910f8ff11..e5c56363a5 100644 --- a/packages/transport-circuit-relay-v2/src/transport/reservation-store.ts +++ b/packages/transport-circuit-relay-v2/src/transport/reservation-store.ts @@ -5,12 +5,12 @@ import { CODE_P2P, multiaddr } from '@multiformats/multiaddr' import { Circuit } from '@multiformats/multiaddr-matcher' import { TypedEventEmitter, setMaxListeners } from 'main-event' import { nanoid } from 'nanoid' -import { DEFAULT_MAX_RESERVATION_QUEUE_LENGTH, DEFAULT_RESERVATION_COMPLETION_TIMEOUT, DEFAULT_RESERVATION_CONCURRENCY, KEEP_ALIVE_TAG, RELAY_V2_HOP_CODEC } from '../constants.js' -import { DoubleRelayError, HadEnoughRelaysError, RelayQueueFullError } from '../errors.js' -import { HopMessage, Status } from '../pb/index.js' -import { getExpirationMilliseconds } from '../utils.js' +import { DEFAULT_MAX_RESERVATION_QUEUE_LENGTH, DEFAULT_RESERVATION_COMPLETION_TIMEOUT, DEFAULT_RESERVATION_CONCURRENCY, KEEP_ALIVE_TAG, RELAY_V2_HOP_CODEC } from '../constants.ts' +import { DoubleRelayError, HadEnoughRelaysError, RelayQueueFullError } from '../errors.ts' +import { HopMessage, Status } from '../pb/index.ts' +import { getExpirationMilliseconds } from '../utils.ts' import type { TransportReservationStoreComponents, TransportReservationStoreInit } from '../index.ts' -import type { Reservation } from '../pb/index.js' +import type { Reservation } from '../pb/index.ts' import type { AbortOptions, Libp2pEvents, Logger, PeerId, PeerStore, Startable, Peer, Connection } from '@libp2p/interface' import type { ConnectionManager } from '@libp2p/interface-internal' import type { Filter } from '@libp2p/utils' diff --git a/packages/transport-circuit-relay-v2/test/hop.spec.ts b/packages/transport-circuit-relay-v2/test/hop.spec.ts index 416dd7a4a1..8e8190ed66 100644 --- a/packages/transport-circuit-relay-v2/test/hop.spec.ts +++ b/packages/transport-circuit-relay-v2/test/hop.spec.ts @@ -8,9 +8,9 @@ import { expect } from 'aegir/chai' import { TypedEventEmitter } from 'main-event' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { DEFAULT_MAX_RESERVATION_STORE_SIZE, RELAY_SOURCE_TAG, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from '../src/constants.js' -import { HopMessage, Status } from '../src/pb/index.js' -import { CircuitRelayServer } from '../src/server/index.js' +import { DEFAULT_MAX_RESERVATION_STORE_SIZE, RELAY_SOURCE_TAG, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from '../src/constants.ts' +import { HopMessage, Status } from '../src/pb/index.ts' +import { CircuitRelayServer } from '../src/server/index.ts' import { CircuitRelayTransport } from '../src/transport/index.ts' import type { Connection, Stream, PeerStore, Upgrader, ConnectionGater, TypedEventTarget, Libp2pEvents, PeerId, PrivateKey, ComponentLogger } from '@libp2p/interface' import type { RandomWalk, AddressManager, ConnectionManager, Registrar, TransportManager } from '@libp2p/interface-internal' diff --git a/packages/transport-circuit-relay-v2/test/listener.spec.ts b/packages/transport-circuit-relay-v2/test/listener.spec.ts index d6fe773e77..64cfdb35c5 100644 --- a/packages/transport-circuit-relay-v2/test/listener.spec.ts +++ b/packages/transport-circuit-relay-v2/test/listener.spec.ts @@ -4,8 +4,8 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { createListener } from '../src/transport/listener.js' -import type { ReservationStore } from '../src/transport/reservation-store.js' +import { createListener } from '../src/transport/listener.ts' +import type { ReservationStore } from '../src/transport/reservation-store.ts' import type { ComponentLogger, Connection, Listener, PeerId } from '@libp2p/interface' import type { AddressManager, ConnectionManager } from '@libp2p/interface-internal' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/transport-circuit-relay-v2/test/reservation-store.spec.ts b/packages/transport-circuit-relay-v2/test/reservation-store.spec.ts index 1f2a1c0824..58eb4f7a8a 100644 --- a/packages/transport-circuit-relay-v2/test/reservation-store.spec.ts +++ b/packages/transport-circuit-relay-v2/test/reservation-store.spec.ts @@ -3,9 +3,9 @@ import { defaultLogger } from '@libp2p/logger' import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { DEFAULT_DATA_LIMIT, DEFAULT_DURATION_LIMIT } from '../src/constants.js' -import { Status } from '../src/pb/index.js' -import { ReservationStore } from '../src/server/reservation-store.js' +import { DEFAULT_DATA_LIMIT, DEFAULT_DURATION_LIMIT } from '../src/constants.ts' +import { Status } from '../src/pb/index.ts' +import { ReservationStore } from '../src/server/reservation-store.ts' describe('circuit-relay server reservation store', function () { it('should add reservation', async function () { diff --git a/packages/transport-circuit-relay-v2/test/stop.spec.ts b/packages/transport-circuit-relay-v2/test/stop.spec.ts index 99d5a8f599..4945a2a2ee 100644 --- a/packages/transport-circuit-relay-v2/test/stop.spec.ts +++ b/packages/transport-circuit-relay-v2/test/stop.spec.ts @@ -9,8 +9,8 @@ import { anySignal } from 'any-signal' import { TypedEventEmitter } from 'main-event' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { Status, StopMessage } from '../src/pb/index.js' -import { CircuitRelayTransport } from '../src/transport/index.js' +import { Status, StopMessage } from '../src/pb/index.ts' +import { CircuitRelayTransport } from '../src/transport/index.ts' import type { ComponentLogger, Libp2pEvents, Connection, Stream, ConnectionGater, PeerId, PeerStore, Upgrader, StreamHandler } from '@libp2p/interface' import type { AddressManager, ConnectionManager, RandomWalk, Registrar, TransportManager } from '@libp2p/interface-internal' import type { MessageStream } from 'it-protobuf-stream' diff --git a/packages/transport-circuit-relay-v2/test/transport/reservation-store.spec.ts b/packages/transport-circuit-relay-v2/test/transport/reservation-store.spec.ts index 4aca0f84e3..54bf18dc28 100644 --- a/packages/transport-circuit-relay-v2/test/transport/reservation-store.spec.ts +++ b/packages/transport-circuit-relay-v2/test/transport/reservation-store.spec.ts @@ -6,8 +6,8 @@ import { expect } from 'aegir/chai' import delay from 'delay' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' -import { KEEP_ALIVE_TAG } from '../../src/constants.js' -import { ReservationStore } from '../../src/transport/reservation-store.js' +import { KEEP_ALIVE_TAG } from '../../src/constants.ts' +import { ReservationStore } from '../../src/transport/reservation-store.ts' import type { ComponentLogger, Libp2pEvents, Peer, PeerId, PeerStore } from '@libp2p/interface' import type { ConnectionManager, TransportManager } from '@libp2p/interface-internal' import type { TypedEventTarget } from 'main-event' diff --git a/packages/transport-circuit-relay-v2/test/transport/stream-to-conn.spec.ts b/packages/transport-circuit-relay-v2/test/transport/stream-to-conn.spec.ts index ec0c6c7940..db735cfdfe 100644 --- a/packages/transport-circuit-relay-v2/test/transport/stream-to-conn.spec.ts +++ b/packages/transport-circuit-relay-v2/test/transport/stream-to-conn.spec.ts @@ -6,7 +6,7 @@ import all from 'it-all' import { pEvent } from 'p-event' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { streamToMaConnection } from '../../src/transport/stream-to-conn.js' +import { streamToMaConnection } from '../../src/transport/stream-to-conn.ts' describe('Convert stream into a multiaddr connection', () => { const localAddr = multiaddr('/ip4/101.45.75.219/tcp/6000') diff --git a/packages/transport-circuit-relay-v2/test/utils.spec.ts b/packages/transport-circuit-relay-v2/test/utils.spec.ts index 86dbe519a9..b057539015 100644 --- a/packages/transport-circuit-relay-v2/test/utils.spec.ts +++ b/packages/transport-circuit-relay-v2/test/utils.spec.ts @@ -10,8 +10,8 @@ import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8arrayFromString } from 'uint8arrays/from-string' -import { createLimitedRelay, getExpirationMilliseconds, LimitTracker, namespaceToCid } from '../src/utils.js' -import type { Limit, RelayReservation } from '../src/index.js' +import { createLimitedRelay, getExpirationMilliseconds, LimitTracker, namespaceToCid } from '../src/utils.ts' +import type { Limit, RelayReservation } from '../src/index.ts' import type { Logger } from '@libp2p/interface' describe('circuit-relay utils', () => { diff --git a/packages/transport-circuit-relay-v2/test/utils.ts b/packages/transport-circuit-relay-v2/test/utils.ts index 64d7177b68..f769dbab9a 100644 --- a/packages/transport-circuit-relay-v2/test/utils.ts +++ b/packages/transport-circuit-relay-v2/test/utils.ts @@ -3,7 +3,7 @@ import { CODE_P2P } from '@multiformats/multiaddr' import { Circuit } from '@multiformats/multiaddr-matcher' import pWaitFor from 'p-wait-for' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { RELAY_V2_HOP_CODEC } from '../../../packages/transport-circuit-relay-v2/src/constants.js' +import { RELAY_V2_HOP_CODEC } from '../../../packages/transport-circuit-relay-v2/src/constants.ts' import type { Libp2p, AbortOptions, ContentRouting, PeerId, Provider } from '@libp2p/interface' import type { AddressManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-memory/package.json b/packages/transport-memory/package.json index 7207c366e8..8c3c83e1b6 100644 --- a/packages/transport-memory/package.json +++ b/packages/transport-memory/package.json @@ -61,7 +61,7 @@ "devDependencies": { "@libp2p/logger": "^6.2.7", "@libp2p/peer-id": "^6.0.9", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon": "^21.0.0", "sinon-ts": "^2.0.0" }, diff --git a/packages/transport-memory/test/index.spec.ts b/packages/transport-memory/test/index.spec.ts index a18b307738..276a0f9615 100644 --- a/packages/transport-memory/test/index.spec.ts +++ b/packages/transport-memory/test/index.spec.ts @@ -4,7 +4,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { memory } from '../src/index.js' +import { memory } from '../src/index.ts' import type { Upgrader, Connection } from '@libp2p/interface' describe('memory', () => { diff --git a/packages/transport-tcp/package.json b/packages/transport-tcp/package.json index a4a4b003e8..ec23cd6896 100644 --- a/packages/transport-tcp/package.json +++ b/packages/transport-tcp/package.json @@ -66,7 +66,7 @@ "devDependencies": { "@libp2p/logger": "^6.2.7", "@types/sinon": "^21.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "delay": "^7.0.0", "p-defer": "^4.0.1", "p-wait-for": "^6.0.0", diff --git a/packages/transport-tcp/test/browser.ts b/packages/transport-tcp/test/browser.ts index 0500f93b74..5c4983416b 100644 --- a/packages/transport-tcp/test/browser.ts +++ b/packages/transport-tcp/test/browser.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import { isBrowser, isWebWorker } from 'wherearewe' -import { tcp } from '../src/index.js' +import { tcp } from '../src/index.ts' describe('browser non-support', () => { it('should throw in browsers', function () { diff --git a/packages/transport-tcp/test/connection-limits.spec.ts b/packages/transport-tcp/test/connection-limits.spec.ts index 5518be9fa7..d6f056e7a1 100644 --- a/packages/transport-tcp/test/connection-limits.spec.ts +++ b/packages/transport-tcp/test/connection-limits.spec.ts @@ -5,8 +5,8 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { tcp } from '../src/index.js' -import type { TCPListener } from '../src/listener.js' +import { tcp } from '../src/index.ts' +import type { TCPListener } from '../src/listener.ts' import type { Connection, Upgrader } from '@libp2p/interface' const buildSocketAssertions = (port: number, closeCallbacks: Array<() => Promise | any>): { assertConnectedSocket(i: number): Promise, assertRefusedSocket(i: number): Promise } => { diff --git a/packages/transport-tcp/test/connection.spec.ts b/packages/transport-tcp/test/connection.spec.ts index 956755bd9c..b2442113da 100644 --- a/packages/transport-tcp/test/connection.spec.ts +++ b/packages/transport-tcp/test/connection.spec.ts @@ -4,7 +4,7 @@ import { expect } from 'aegir/chai' import pWaitFor from 'p-wait-for' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { tcp } from '../src/index.js' +import { tcp } from '../src/index.ts' import type { Connection, Transport, Upgrader } from '@libp2p/interface' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/transport-tcp/test/filter.spec.ts b/packages/transport-tcp/test/filter.spec.ts index d4601af66e..2640457087 100644 --- a/packages/transport-tcp/test/filter.spec.ts +++ b/packages/transport-tcp/test/filter.spec.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { tcp } from '../src/index.js' +import { tcp } from '../src/index.ts' import type { Transport } from '@libp2p/interface' describe('filter addrs', () => { diff --git a/packages/transport-tcp/test/listen-dial.spec.ts b/packages/transport-tcp/test/listen-dial.spec.ts index b4e8cfcda6..5559d179e4 100644 --- a/packages/transport-tcp/test/listen-dial.spec.ts +++ b/packages/transport-tcp/test/listen-dial.spec.ts @@ -7,7 +7,7 @@ import { expect } from 'aegir/chai' import pDefer from 'p-defer' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { tcp } from '../src/index.js' +import { tcp } from '../src/index.ts' import type { Connection, Listener, Transport, Upgrader } from '@libp2p/interface' const isCI = process.env.CI diff --git a/packages/transport-tcp/test/max-connections.spec.ts b/packages/transport-tcp/test/max-connections.spec.ts index 3d5546e23e..bcd2b5d1f7 100644 --- a/packages/transport-tcp/test/max-connections.spec.ts +++ b/packages/transport-tcp/test/max-connections.spec.ts @@ -5,7 +5,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { tcp } from '../src/index.js' +import { tcp } from '../src/index.ts' import type { Connection, Upgrader } from '@libp2p/interface' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/transport-tcp/test/socket-to-conn.spec.ts b/packages/transport-tcp/test/socket-to-conn.spec.ts index 17fcd2aae3..95fede0fc2 100644 --- a/packages/transport-tcp/test/socket-to-conn.spec.ts +++ b/packages/transport-tcp/test/socket-to-conn.spec.ts @@ -4,7 +4,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import delay from 'delay' import { pEvent } from 'p-event' -import { toMultiaddrConnection } from '../src/socket-to-conn.js' +import { toMultiaddrConnection } from '../src/socket-to-conn.ts' import type { Server, ServerOpts, SocketConstructorOpts } from 'node:net' interface TestOptions { diff --git a/packages/transport-webrtc/package.json b/packages/transport-webrtc/package.json index d9240aec69..5653054ab8 100644 --- a/packages/transport-webrtc/package.json +++ b/packages/transport-webrtc/package.json @@ -77,12 +77,12 @@ "reflect-metadata": "^0.2.2", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/logger": "^6.2.7", "@types/sinon": "^21.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "any-signal": "^4.1.1", "datastore-core": "^11.0.1", "delay": "^7.0.0", diff --git a/packages/transport-webrtc/src/private-to-private/initiate-connection.ts b/packages/transport-webrtc/src/private-to-private/initiate-connection.ts index c23f4afab7..062e583ce6 100644 --- a/packages/transport-webrtc/src/private-to-private/initiate-connection.ts +++ b/packages/transport-webrtc/src/private-to-private/initiate-connection.ts @@ -1,15 +1,15 @@ import { pbStream } from '@libp2p/utils' import { pEvent } from 'p-event' import { CustomProgressEvent } from 'progress-events' -import { SIGNALING_PROTOCOL } from '../constants.js' -import { SDPHandshakeFailedError } from '../error.js' -import { DataChannelMuxerFactory } from '../muxer.js' -import { RTCPeerConnection, RTCSessionDescription } from '../webrtc/index.js' +import { SIGNALING_PROTOCOL } from '../constants.ts' +import { SDPHandshakeFailedError } from '../error.ts' +import { DataChannelMuxerFactory } from '../muxer.ts' +import { RTCPeerConnection, RTCSessionDescription } from '../webrtc/index.ts' import { Message } from './pb/message.ts' import { splitAddr } from './transport.ts' import { readCandidatesUntilConnected } from './util.ts' import type { WebRTCDialEvents, WebRTCTransportMetrics } from './transport.ts' -import type { DataChannelOptions } from '../index.js' +import type { DataChannelOptions } from '../index.ts' import type { LoggerOptions, Connection, ComponentLogger, AbortOptions } from '@libp2p/interface' import type { ConnectionManager, TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts b/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts index 1ffc0cca48..077d7f6ada 100644 --- a/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts +++ b/packages/transport-webrtc/src/private-to-private/signaling-stream-handler.ts @@ -1,10 +1,10 @@ import { pbStream } from '@libp2p/utils' import { multiaddr } from '@multiformats/multiaddr' -import { SDPHandshakeFailedError } from '../error.js' -import { RTCSessionDescription } from '../webrtc/index.js' +import { SDPHandshakeFailedError } from '../error.ts' +import { RTCSessionDescription } from '../webrtc/index.ts' import { Message } from './pb/message.ts' import { getRemotePeer, readCandidatesUntilConnected } from './util.ts' -import type { RTCPeerConnection } from '../webrtc/index.js' +import type { RTCPeerConnection } from '../webrtc/index.ts' import type { AbortOptions, Connection, Logger, PeerId, Stream } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/src/private-to-private/transport.ts b/packages/transport-webrtc/src/private-to-private/transport.ts index bd27e659d9..6b4fcc6a0d 100644 --- a/packages/transport-webrtc/src/private-to-private/transport.ts +++ b/packages/transport-webrtc/src/private-to-private/transport.ts @@ -3,16 +3,16 @@ import { peerIdFromString } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { WebRTC } from '@multiformats/multiaddr-matcher' import { setMaxListeners } from 'main-event' -import { SIGNALING_PROTOCOL } from '../constants.js' -import { DataChannelMuxerFactory } from '../muxer.js' +import { SIGNALING_PROTOCOL } from '../constants.ts' +import { DataChannelMuxerFactory } from '../muxer.ts' import { toMultiaddrConnection } from '../rtcpeerconnection-to-conn.ts' -import { getRtcConfiguration } from '../util.js' -import { RTCPeerConnection } from '../webrtc/index.js' +import { getRtcConfiguration } from '../util.ts' +import { RTCPeerConnection } from '../webrtc/index.ts' import { initiateConnection } from './initiate-connection.ts' import { WebRTCPeerListener } from './listener.ts' import { handleIncomingStream } from './signaling-stream-handler.ts' import { getRemotePeer } from './util.ts' -import type { DataChannelOptions } from '../index.js' +import type { DataChannelOptions } from '../index.ts' import type { OutboundConnectionUpgradeEvents, CreateListenerOptions, DialTransportOptions, Transport, Listener, Upgrader, ComponentLogger, Logger, Connection, PeerId, CounterGroup, Metrics, Startable, OpenConnectionProgressEvents, Libp2pEvents, MultiaddrConnection, Stream } from '@libp2p/interface' import type { Registrar, ConnectionManager, TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/src/private-to-private/util.ts b/packages/transport-webrtc/src/private-to-private/util.ts index 420147a987..8b5127fa4f 100644 --- a/packages/transport-webrtc/src/private-to-private/util.ts +++ b/packages/transport-webrtc/src/private-to-private/util.ts @@ -1,10 +1,10 @@ import { ConnectionFailedError, InvalidMessageError, InvalidMultiaddrError } from '@libp2p/interface' import { peerIdFromString } from '@libp2p/peer-id' import { CustomProgressEvent } from 'progress-events' -import { RTCIceCandidate } from '../webrtc/index.js' +import { RTCIceCandidate } from '../webrtc/index.ts' import { Message } from './pb/message.ts' import type { WebRTCDialEvents } from './transport.ts' -import type { RTCPeerConnection } from '../webrtc/index.js' +import type { RTCPeerConnection } from '../webrtc/index.ts' import type { AbortOptions, LoggerOptions, PeerId, Stream } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' import type { MessageStream } from 'it-protobuf-stream' diff --git a/packages/transport-webrtc/src/private-to-public/listener.browser.ts b/packages/transport-webrtc/src/private-to-public/listener.browser.ts index 8966ce9943..fa10c173b4 100644 --- a/packages/transport-webrtc/src/private-to-public/listener.browser.ts +++ b/packages/transport-webrtc/src/private-to-public/listener.browser.ts @@ -1,5 +1,5 @@ import { TypedEventEmitter } from 'main-event' -import { UnimplementedError } from '../error.js' +import { UnimplementedError } from '../error.ts' import type { PeerId, ListenerEvents, Listener } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/src/private-to-public/listener.ts b/packages/transport-webrtc/src/private-to-public/listener.ts index 8a8f10fad5..fdb8c6ac02 100644 --- a/packages/transport-webrtc/src/private-to-public/listener.ts +++ b/packages/transport-webrtc/src/private-to-public/listener.ts @@ -9,7 +9,7 @@ import pWaitFor from 'p-wait-for' import { connect } from './utils/connect.ts' import { createDialerRTCPeerConnection } from './utils/get-rtcpeerconnection.ts' import { stunListener } from './utils/stun-listener.ts' -import type { DataChannelOptions, TransportCertificate } from '../index.js' +import type { DataChannelOptions, TransportCertificate } from '../index.ts' import type { WebRTCDirectTransportCertificateEvents } from './transport.ts' import type { DirectRTCPeerConnection } from './utils/get-rtcpeerconnection.ts' import type { StunServer } from './utils/stun-listener.ts' diff --git a/packages/transport-webrtc/src/private-to-public/transport.browser.ts b/packages/transport-webrtc/src/private-to-public/transport.browser.ts index 8a72666d02..1491e80fd9 100644 --- a/packages/transport-webrtc/src/private-to-public/transport.browser.ts +++ b/packages/transport-webrtc/src/private-to-public/transport.browser.ts @@ -3,11 +3,11 @@ import { peerIdFromString } from '@libp2p/peer-id' import { CODE_P2P } from '@multiformats/multiaddr' import { WebRTCDirect } from '@multiformats/multiaddr-matcher' import { UnimplementedError } from '../error.ts' -import { genUfrag } from '../util.js' +import { genUfrag } from '../util.ts' import { connect } from './utils/connect.ts' import { createDialerRTCPeerConnection } from './utils/get-rtcpeerconnection.ts' -import type { DataChannelOptions } from '../index.js' -import type { WebRTCDialEvents } from '../private-to-private/transport.js' +import type { DataChannelOptions } from '../index.ts' +import type { WebRTCDialEvents } from '../private-to-private/transport.ts' import type { CreateListenerOptions, Transport, Listener, ComponentLogger, Logger, Connection, CounterGroup, Metrics, PeerId, DialTransportOptions, PrivateKey, Upgrader } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' import type { Keychain } from '@libp2p/keychain' diff --git a/packages/transport-webrtc/src/private-to-public/transport.ts b/packages/transport-webrtc/src/private-to-public/transport.ts index 0e8a80cce0..329733188e 100644 --- a/packages/transport-webrtc/src/private-to-public/transport.ts +++ b/packages/transport-webrtc/src/private-to-public/transport.ts @@ -9,11 +9,12 @@ import { base64url } from 'multiformats/bases/base64' import { sha256 } from 'multiformats/hashes/sha2' import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -import { DEFAULT_CERTIFICATE_DATASTORE_KEY, DEFAULT_CERTIFICATE_LIFESPAN, DEFAULT_CERTIFICATE_PRIVATE_KEY_NAME, DEFAULT_CERTIFICATE_RENEWAL_THRESHOLD } from '../constants.js' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' +import { DEFAULT_CERTIFICATE_DATASTORE_KEY, DEFAULT_CERTIFICATE_LIFESPAN, DEFAULT_CERTIFICATE_PRIVATE_KEY_NAME, DEFAULT_CERTIFICATE_RENEWAL_THRESHOLD } from '../constants.ts' import { WebRTCDirectListener } from './listener.ts' import { WebRTCDirectTransport as WebRTCDirectBrowserTransport } from './transport.browser.ts' import { formatAsPem } from './utils/pem.ts' -import type { TransportCertificate } from '../index.js' +import type { TransportCertificate } from '../index.ts' import type { WebRTCTransportDirectInit as WebRTCTransportDirectBrowserInit, WebRTCMetrics, WebRTCDirectTransportComponents } from './transport.browser.ts' import type { CreateListenerOptions, Transport, Listener, PrivateKey, Startable } from '@libp2p/interface' import type { Keychain } from '@libp2p/keychain' @@ -244,7 +245,7 @@ export class WebRTCDirectTransport extends WebRTCDirectBrowserTransport implemen async loadCertificate (dsKey: Key, keyPair: CryptoKeyPair): Promise { const buf = await this.components.datastore.get(dsKey) - const cert = new X509Certificate(buf) + const cert = new X509Certificate(withArrayBuffer(buf)) // check expiry date const expiryTime = cert.notAfter.getTime() - (this.certInit.certificateRenewalThreshold ?? DEFAULT_CERTIFICATE_RENEWAL_THRESHOLD) diff --git a/packages/transport-webrtc/src/private-to-public/utils/connect.ts b/packages/transport-webrtc/src/private-to-public/utils/connect.ts index 4feb0bba58..4aae1e5c49 100644 --- a/packages/transport-webrtc/src/private-to-public/utils/connect.ts +++ b/packages/transport-webrtc/src/private-to-public/utils/connect.ts @@ -1,13 +1,13 @@ import { noise } from '@chainsafe/libp2p-noise' import { pEvent } from 'p-event' -import { WebRTCTransportError } from '../../error.js' -import { DataChannelMuxerFactory } from '../../muxer.js' +import { WebRTCTransportError } from '../../error.ts' +import { DataChannelMuxerFactory } from '../../muxer.ts' import { toMultiaddrConnection } from '../../rtcpeerconnection-to-conn.ts' -import { createStream } from '../../stream.js' +import { createStream } from '../../stream.ts' import { generateNoisePrologue } from './generate-noise-prologue.ts' import * as sdp from './sdp.ts' import type { DirectRTCPeerConnection } from './get-rtcpeerconnection.ts' -import type { DataChannelOptions } from '../../index.js' +import type { DataChannelOptions } from '../../index.ts' import type { ComponentLogger, Connection, CounterGroup, Logger, PeerId, PrivateKey, Upgrader } from '@libp2p/interface' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/src/private-to-public/utils/generate-certificates.ts b/packages/transport-webrtc/src/private-to-public/utils/generate-certificates.ts index 318790884e..953c8351be 100644 --- a/packages/transport-webrtc/src/private-to-public/utils/generate-certificates.ts +++ b/packages/transport-webrtc/src/private-to-public/utils/generate-certificates.ts @@ -4,7 +4,7 @@ import * as x509 from '@peculiar/x509' import { base64url } from 'multiformats/bases/base64' import { sha256 } from 'multiformats/hashes/sha2' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import type { TransportCertificate } from '../../index.js' +import type { TransportCertificate } from '../../index.ts' const crypto = new Crypto() x509.cryptoProvider.set(crypto) diff --git a/packages/transport-webrtc/src/private-to-public/utils/get-rtcpeerconnection.ts b/packages/transport-webrtc/src/private-to-public/utils/get-rtcpeerconnection.ts index 7931bc14b0..dcd2c37770 100644 --- a/packages/transport-webrtc/src/private-to-public/utils/get-rtcpeerconnection.ts +++ b/packages/transport-webrtc/src/private-to-public/utils/get-rtcpeerconnection.ts @@ -1,10 +1,10 @@ import { Crypto } from '@peculiar/webcrypto' import { PeerConnection } from 'node-datachannel' import { RTCPeerConnection } from 'node-datachannel/polyfill' -import { DEFAULT_ICE_SERVERS, MAX_MESSAGE_SIZE } from '../../constants.js' +import { DEFAULT_ICE_SERVERS, MAX_MESSAGE_SIZE } from '../../constants.ts' import { DataChannelMuxerFactory } from '../../muxer.ts' import { generateTransportCertificate } from './generate-certificates.ts' -import type { DataChannelOptions, TransportCertificate } from '../../index.js' +import type { DataChannelOptions, TransportCertificate } from '../../index.ts' import type { CounterGroup } from '@libp2p/interface' import type { CertificateFingerprint } from 'node-datachannel' diff --git a/packages/transport-webrtc/src/private-to-public/utils/sdp.ts b/packages/transport-webrtc/src/private-to-public/utils/sdp.ts index 3f93a1c13e..76b9561f13 100644 --- a/packages/transport-webrtc/src/private-to-public/utils/sdp.ts +++ b/packages/transport-webrtc/src/private-to-public/utils/sdp.ts @@ -5,8 +5,8 @@ import { base64url } from 'multiformats/bases/base64' import { bases, digest } from 'multiformats/basics' import * as Digest from 'multiformats/hashes/digest' import { sha256 } from 'multiformats/hashes/sha2' -import { MAX_MESSAGE_SIZE } from '../../constants.js' -import { InvalidFingerprintError, UnsupportedHashAlgorithmError } from '../../error.js' +import { MAX_MESSAGE_SIZE } from '../../constants.ts' +import { InvalidFingerprintError, UnsupportedHashAlgorithmError } from '../../error.ts' import type { Multiaddr } from '@multiformats/multiaddr' import type { MultihashDigest } from 'multiformats/hashes/interface' diff --git a/packages/transport-webrtc/src/stream.ts b/packages/transport-webrtc/src/stream.ts index 5d3dc64e82..a75229c7ff 100644 --- a/packages/transport-webrtc/src/stream.ts +++ b/packages/transport-webrtc/src/stream.ts @@ -5,6 +5,7 @@ import { pushable } from 'it-pushable' import { pEvent } from 'p-event' import { raceSignal } from 'race-signal' import { Uint8ArrayList } from 'uint8arraylist' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' import { DEFAULT_FIN_ACK_TIMEOUT, MAX_BUFFERED_AMOUNT, MAX_MESSAGE_SIZE, PROTOBUF_OVERHEAD } from './constants.ts' import { Message } from './private-to-public/pb/message.ts' import type { DataChannelOptions } from './index.ts' @@ -142,7 +143,7 @@ export class WebRTCStream extends AbstractStream { try { // send message without copying data for (const buf of data) { - this.channel.send(buf) + this.channel.send(withArrayBuffer(buf)) } } catch (err: any) { // channel.send can throw synchronously if the polyfill's cached readyState is stale diff --git a/packages/transport-webrtc/test/certificates.spec.ts b/packages/transport-webrtc/test/certificates.spec.ts index 2e2679f34f..b6221a9f8d 100644 --- a/packages/transport-webrtc/test/certificates.spec.ts +++ b/packages/transport-webrtc/test/certificates.spec.ts @@ -10,8 +10,8 @@ import { MemoryDatastore } from 'datastore-core' import delay from 'delay' import { stubInterface } from 'sinon-ts' import { isNode, isElectronMain } from 'wherearewe' -import { WebRTCDirectTransport } from '../src/private-to-public/transport.js' -import type { WebRTCDirectTransportComponents } from '../src/private-to-public/transport.js' +import { WebRTCDirectTransport } from '../src/private-to-public/transport.ts' +import type { WebRTCDirectTransportComponents } from '../src/private-to-public/transport.ts' import type { Upgrader, Listener, Transport } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/test/listener.spec.ts b/packages/transport-webrtc/test/listener.spec.ts index 6f797fac69..ff64c366cf 100644 --- a/packages/transport-webrtc/test/listener.spec.ts +++ b/packages/transport-webrtc/test/listener.spec.ts @@ -5,7 +5,7 @@ import { expect } from 'aegir/chai' import { TypedEventEmitter } from 'main-event' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { WebRTCPeerListener } from '../src/private-to-private/listener.js' +import { WebRTCPeerListener } from '../src/private-to-private/listener.ts' import type { Listener } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' diff --git a/packages/transport-webrtc/test/maconn.spec.ts b/packages/transport-webrtc/test/maconn.spec.ts index 6905f5ca47..3731eccde9 100644 --- a/packages/transport-webrtc/test/maconn.spec.ts +++ b/packages/transport-webrtc/test/maconn.spec.ts @@ -5,7 +5,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubObject } from 'sinon-ts' import { toMultiaddrConnection } from '../src/rtcpeerconnection-to-conn.ts' -import { RTCPeerConnection } from '../src/webrtc/index.js' +import { RTCPeerConnection } from '../src/webrtc/index.ts' import type { CounterGroup } from '@libp2p/interface' describe('Multiaddr Connection', () => { diff --git a/packages/transport-webrtc/test/muxer.spec.ts b/packages/transport-webrtc/test/muxer.spec.ts index bb2ea0f5b0..311a76b804 100644 --- a/packages/transport-webrtc/test/muxer.spec.ts +++ b/packages/transport-webrtc/test/muxer.spec.ts @@ -2,7 +2,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import pRetry from 'p-retry' import { stubInterface } from 'sinon-ts' -import { DataChannelMuxerFactory } from '../src/muxer.js' +import { DataChannelMuxerFactory } from '../src/muxer.ts' import type { MultiaddrConnection } from '@libp2p/interface' describe('muxer', () => { diff --git a/packages/transport-webrtc/test/peer.spec.ts b/packages/transport-webrtc/test/peer.spec.ts index bc0aced1bf..2ad6b8d477 100644 --- a/packages/transport-webrtc/test/peer.spec.ts +++ b/packages/transport-webrtc/test/peer.spec.ts @@ -9,12 +9,12 @@ import { TypedEventEmitter } from 'main-event' import pRetry from 'p-retry' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' -import { SIGNALING_PROTOCOL } from '../src/constants.js' -import { initiateConnection } from '../src/private-to-private/initiate-connection.js' -import { Message } from '../src/private-to-private/pb/message.js' -import { handleIncomingStream } from '../src/private-to-private/signaling-stream-handler.js' -import { WebRTCTransport, splitAddr } from '../src/private-to-private/transport.js' -import { RTCPeerConnection, RTCSessionDescription } from '../src/webrtc/index.js' +import { SIGNALING_PROTOCOL } from '../src/constants.ts' +import { initiateConnection } from '../src/private-to-private/initiate-connection.ts' +import { Message } from '../src/private-to-private/pb/message.ts' +import { handleIncomingStream } from '../src/private-to-private/signaling-stream-handler.ts' +import { WebRTCTransport, splitAddr } from '../src/private-to-private/transport.ts' +import { RTCPeerConnection, RTCSessionDescription } from '../src/webrtc/index.ts' import type { Logger, Connection, Stream, ComponentLogger, Upgrader } from '@libp2p/interface' import type { ConnectionManager, Registrar, TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/test/sdp.spec.ts b/packages/transport-webrtc/test/sdp.spec.ts index 3d8f1bcd32..cac03c6a9e 100644 --- a/packages/transport-webrtc/test/sdp.spec.ts +++ b/packages/transport-webrtc/test/sdp.spec.ts @@ -1,7 +1,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { MAX_MESSAGE_SIZE } from '../src/constants.js' -import * as underTest from '../src/private-to-public/utils/sdp.js' +import { MAX_MESSAGE_SIZE } from '../src/constants.ts' +import * as underTest from '../src/private-to-public/utils/sdp.ts' const sampleMultiAddr = multiaddr('/ip4/0.0.0.0/udp/56093/webrtc/certhash/uEiByaEfNSLBexWBNFZy_QB1vAKEj7JAXDizRs4_SnTflsQ') /* spell-checker:disable-next-line */ diff --git a/packages/transport-webrtc/test/stream.spec.ts b/packages/transport-webrtc/test/stream.spec.ts index 196a6fae45..03e0354118 100644 --- a/packages/transport-webrtc/test/stream.spec.ts +++ b/packages/transport-webrtc/test/stream.spec.ts @@ -6,12 +6,12 @@ import { bytes } from 'multiformats' import { pEvent } from 'p-event' import { stubInterface } from 'sinon-ts' import { isNode, isElectronMain } from 'wherearewe' -import { MAX_MESSAGE_SIZE, PROTOBUF_OVERHEAD } from '../src/constants.js' -import { Message } from '../src/private-to-public/pb/message.js' -import { createStream } from '../src/stream.js' -import { RTCPeerConnection } from '../src/webrtc/index.js' +import { MAX_MESSAGE_SIZE, PROTOBUF_OVERHEAD } from '../src/constants.ts' +import { Message } from '../src/private-to-public/pb/message.ts' +import { createStream } from '../src/stream.ts' +import { RTCPeerConnection } from '../src/webrtc/index.ts' import { receiveFinAck, receiveRemoteCloseWrite } from './util.ts' -import type { WebRTCStream } from '../src/stream.js' +import type { WebRTCStream } from '../src/stream.ts' import type { Stream, StreamCloseEvent } from '@libp2p/interface' describe('Max message size', () => { diff --git a/packages/transport-webrtc/test/transport.spec.ts b/packages/transport-webrtc/test/transport.spec.ts index c358c32b0d..90749e8d1d 100644 --- a/packages/transport-webrtc/test/transport.spec.ts +++ b/packages/transport-webrtc/test/transport.spec.ts @@ -11,9 +11,9 @@ import { anySignal } from 'any-signal' import { MemoryDatastore } from 'datastore-core' import { stubInterface } from 'sinon-ts' import { isNode, isElectronMain } from 'wherearewe' -import { WebRTCDirectTransport } from '../src/private-to-public/transport.js' +import { WebRTCDirectTransport } from '../src/private-to-public/transport.ts' import { supportsIpV6 } from './util.ts' -import type { WebRTCDirectTransportComponents } from '../src/private-to-public/transport.js' +import type { WebRTCDirectTransportComponents } from '../src/private-to-public/transport.ts' import type { Upgrader, Listener, Transport } from '@libp2p/interface' import type { TransportManager } from '@libp2p/interface-internal' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/transport-webrtc/test/util.ts b/packages/transport-webrtc/test/util.ts index e93aab6537..fa31f3b7b2 100644 --- a/packages/transport-webrtc/test/util.ts +++ b/packages/transport-webrtc/test/util.ts @@ -2,7 +2,7 @@ import os from 'node:os' import { isIPv6 } from '@chainsafe/is-ip' import * as lengthPrefixed from 'it-length-prefixed' import { isNode, isElectronMain } from 'wherearewe' -import { Message } from '../src/private-to-public/pb/message.js' +import { Message } from '../src/private-to-public/pb/message.ts' /** * simulates receiving a FIN_ACK on the passed datachannel diff --git a/packages/transport-websockets/package.json b/packages/transport-websockets/package.json index 2ec061bbc0..a7b62f3687 100644 --- a/packages/transport-websockets/package.json +++ b/packages/transport-websockets/package.json @@ -78,13 +78,13 @@ "p-event": "^7.0.0", "progress-events": "^1.0.1", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0", + "uint8arrays": "^6.1.1", "ws": "^8.18.3" }, "devDependencies": { "@libp2p/logger": "^6.2.7", "@types/ws": "^8.18.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "is-loopback-addr": "^2.0.2", "p-wait-for": "^6.0.0", "sinon": "^21.0.0", diff --git a/packages/transport-websockets/src/websocket-to-conn.ts b/packages/transport-websockets/src/websocket-to-conn.ts index 45ccfd9d3c..80ca8aed56 100644 --- a/packages/transport-websockets/src/websocket-to-conn.ts +++ b/packages/transport-websockets/src/websocket-to-conn.ts @@ -1,6 +1,7 @@ import { AbstractMultiaddrConnection, repeatingTask } from '@libp2p/utils' import { Uint8ArrayList } from 'uint8arraylist' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' import type { AbortOptions, MultiaddrConnection } from '@libp2p/interface' import type { AbstractMultiaddrConnectionInit, RepeatingTask, SendResult } from '@libp2p/utils' @@ -59,7 +60,7 @@ class WebSocketMultiaddrConnection extends AbstractMultiaddrConnection { sendData (data: Uint8ArrayList): SendResult { for (const buf of data) { - this.websocket.send(buf) + this.websocket.send(withArrayBuffer(buf)) } const canSendMore = this.websocket.bufferedAmount < this.maxBufferedAmount diff --git a/packages/transport-websockets/test/browser.ts b/packages/transport-websockets/test/browser.ts index ebcbdff325..30e7af881e 100644 --- a/packages/transport-websockets/test/browser.ts +++ b/packages/transport-websockets/test/browser.ts @@ -1,7 +1,7 @@ import { defaultLogger } from '@libp2p/logger' import { expect } from 'aegir/chai' import { TypedEventEmitter } from 'main-event' -import { webSockets } from '../src/index.js' +import { webSockets } from '../src/index.ts' describe('libp2p-websockets', () => { it('.createServer throws in browser', () => { diff --git a/packages/transport-websockets/test/node.ts b/packages/transport-websockets/test/node.ts index 404af0fac2..8fcf87dd6b 100644 --- a/packages/transport-websockets/test/node.ts +++ b/packages/transport-websockets/test/node.ts @@ -15,7 +15,7 @@ import pWaitFor from 'p-wait-for' import Sinon from 'sinon' import { stubInterface } from 'sinon-ts' import { setGlobalDispatcher, Agent } from 'undici' -import { webSockets } from '../src/index.js' +import { webSockets } from '../src/index.ts' import type { Connection, Libp2pEvents, Listener, Transport, Upgrader, TLSCertificate } from '@libp2p/interface' import type { StubbedInstance } from 'sinon-ts' diff --git a/packages/transport-webtransport/package.json b/packages/transport-webtransport/package.json index 1566dce525..1a5a2c2cb5 100644 --- a/packages/transport-webtransport/package.json +++ b/packages/transport-webtransport/package.json @@ -55,7 +55,7 @@ "progress-events": "^1.0.1", "race-signal": "^2.0.0", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/crypto": "^5.1.18", @@ -63,7 +63,7 @@ "@libp2p/logger": "^6.2.7", "@libp2p/ping": "^3.1.5", "@noble/hashes": "^2.0.1", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "execa": "^9.6.0", "go-libp2p": "^1.6.0", "it-all": "^3.0.9", diff --git a/packages/transport-webtransport/src/index.ts b/packages/transport-webtransport/src/index.ts index 5d9047f8c4..e37349293f 100644 --- a/packages/transport-webtransport/src/index.ts +++ b/packages/transport-webtransport/src/index.ts @@ -31,6 +31,7 @@ import { noise } from '@chainsafe/libp2p-noise' import { InvalidCryptoExchangeError, InvalidParametersError, serviceCapabilities, transportSymbol } from '@libp2p/interface' import { WebTransport as WebTransportMatcher } from '@multiformats/multiaddr-matcher' import { CustomProgressEvent } from 'progress-events' +import { withArrayBuffer } from 'uint8arrays/with-array-buffer' import createListener from './listener.ts' import { webtransportMuxer } from './muxer.ts' import { toMultiaddrConnection } from './session-to-conn.ts' @@ -140,7 +141,7 @@ class WebTransportTransport implements Transport { const wt = new WebTransport(`${url}/.well-known/libp2p-webtransport?type=noise`, { serverCertificateHashes: certhashes.map(certhash => ({ algorithm: 'sha-256', - value: certhash.digest + value: withArrayBuffer(certhash.digest) })) }) diff --git a/packages/transport-webtransport/src/utils/generate-certificates.ts b/packages/transport-webtransport/src/utils/generate-certificates.ts index 57d3d2692a..5f6020116e 100644 --- a/packages/transport-webtransport/src/utils/generate-certificates.ts +++ b/packages/transport-webtransport/src/utils/generate-certificates.ts @@ -1,4 +1,4 @@ -import type { WebTransportCertificate } from '../../src/index.js' +import type { WebTransportCertificate } from '../../src/index.ts' export interface GenerateWebTransportCertificateOptions { days: number diff --git a/packages/transport-webtransport/test/browser.ts b/packages/transport-webtransport/test/browser.ts index cb5b4ea141..5e05b90a4b 100644 --- a/packages/transport-webtransport/test/browser.ts +++ b/packages/transport-webtransport/test/browser.ts @@ -7,7 +7,7 @@ import all from 'it-all' import { createLibp2p } from 'libp2p' import { pEvent } from 'p-event' import { Uint8ArrayList } from 'uint8arraylist' -import { webTransport } from '../src/index.js' +import { webTransport } from '../src/index.ts' import type { Ping } from '@libp2p/ping' import type { Libp2p } from 'libp2p' diff --git a/packages/transport-webtransport/test/transport.spec.ts b/packages/transport-webtransport/test/transport.spec.ts index a001110876..80f670791d 100644 --- a/packages/transport-webtransport/test/transport.spec.ts +++ b/packages/transport-webtransport/test/transport.spec.ts @@ -4,8 +4,8 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id' import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { webTransport } from '../src/index.js' -import type { WebTransportComponents } from '../src/index.js' +import { webTransport } from '../src/index.ts' +import type { WebTransportComponents } from '../src/index.ts' import type { Upgrader } from '@libp2p/interface' describe('WebTransport Transport', () => { diff --git a/packages/transport-webtransport/test/utils/is-subset.spec.ts b/packages/transport-webtransport/test/utils/is-subset.spec.ts index 9d3e7128d9..f2ade64616 100644 --- a/packages/transport-webtransport/test/utils/is-subset.spec.ts +++ b/packages/transport-webtransport/test/utils/is-subset.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { isSubset } from '../../src/utils/is-subset.js' +import { isSubset } from '../../src/utils/is-subset.ts' describe('test helpers', () => { it('correctly checks subsets', () => { diff --git a/packages/transport-webtransport/test/utils/parse-multiaddr.spec.ts b/packages/transport-webtransport/test/utils/parse-multiaddr.spec.ts index c2eaacb3bd..e6cac47b7e 100644 --- a/packages/transport-webtransport/test/utils/parse-multiaddr.spec.ts +++ b/packages/transport-webtransport/test/utils/parse-multiaddr.spec.ts @@ -1,7 +1,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { base64url } from 'multiformats/bases/base64' -import { parseMultiaddr } from '../../src/utils/parse-multiaddr.js' +import { parseMultiaddr } from '../../src/utils/parse-multiaddr.ts' describe('parse multiaddr', () => { describe('valid addresses', () => { diff --git a/packages/upnp-nat/package.json b/packages/upnp-nat/package.json index 68ac855cb1..3dbd29bae1 100644 --- a/packages/upnp-nat/package.json +++ b/packages/upnp-nat/package.json @@ -63,7 +63,7 @@ "@libp2p/crypto": "^5.1.18", "@libp2p/logger": "^6.2.7", "@libp2p/peer-id": "^6.0.9", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "sinon-ts": "^2.0.0", "wherearewe": "^2.0.1" }, diff --git a/packages/upnp-nat/test/browser.ts b/packages/upnp-nat/test/browser.ts index d945193b83..8013102c6e 100644 --- a/packages/upnp-nat/test/browser.ts +++ b/packages/upnp-nat/test/browser.ts @@ -5,7 +5,7 @@ import { expect } from 'aegir/chai' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' import { isBrowser, isWebWorker } from 'wherearewe' -import { uPnPNAT } from '../src/index.js' +import { uPnPNAT } from '../src/index.ts' import type { AddressManager } from '@libp2p/interface-internal' describe('browser non-support', () => { diff --git a/packages/upnp-nat/test/index.spec.ts b/packages/upnp-nat/test/index.spec.ts index ebd601e96c..653974d535 100644 --- a/packages/upnp-nat/test/index.spec.ts +++ b/packages/upnp-nat/test/index.spec.ts @@ -6,8 +6,8 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { TypedEventEmitter } from 'main-event' import { stubInterface } from 'sinon-ts' -import { UPnPNAT } from '../src/upnp-nat.js' -import type { UPnPNATInit } from '../src/index.js' +import { UPnPNAT } from '../src/upnp-nat.ts' +import type { UPnPNATInit } from '../src/index.ts' import type { Gateway, UPnPNAT as UPnPNATClient } from '@achingbrain/nat-port-mapper' import type { ComponentLogger, Libp2pEvents, NodeInfo, PeerId } from '@libp2p/interface' import type { AddressManager } from '@libp2p/interface-internal' diff --git a/packages/utils/package.json b/packages/utils/package.json index 4973792813..6078a5c9ad 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -69,12 +69,12 @@ "race-signal": "^2.0.0", "uint8-varint": "^2.0.4", "uint8arraylist": "^2.4.8", - "uint8arrays": "^5.1.0" + "uint8arrays": "^6.1.1" }, "devDependencies": { "@libp2p/peer-id": "^6.0.9", "@types/netmask": "^2.0.5", - "aegir": "^47.0.22", + "aegir": "^48.0.11", "benchmark": "^2.1.4", "it-all": "^3.0.9", "it-drain": "^3.0.10", diff --git a/packages/utils/src/multiaddr/is-private.ts b/packages/utils/src/multiaddr/is-private.ts index bcfc9cf12e..6eb0ee5322 100644 --- a/packages/utils/src/multiaddr/is-private.ts +++ b/packages/utils/src/multiaddr/is-private.ts @@ -1,4 +1,4 @@ -import { isPrivateIp } from '../private-ip.js' +import { isPrivateIp } from '../private-ip.ts' import { getNetConfig } from './get-net-config.ts' import type { Multiaddr } from '@multiformats/multiaddr' diff --git a/packages/utils/src/queue/index.ts b/packages/utils/src/queue/index.ts index c7ac27249e..8e86fb3c4b 100644 --- a/packages/utils/src/queue/index.ts +++ b/packages/utils/src/queue/index.ts @@ -2,8 +2,8 @@ import { AbortError } from '@libp2p/interface' import { pushable } from 'it-pushable' import { TypedEventEmitter } from 'main-event' import { pEvent } from 'p-event' -import { debounce } from '../debounce.js' -import { QueueFullError } from '../errors.js' +import { debounce } from '../debounce.ts' +import { QueueFullError } from '../errors.ts' import { Job } from './job.ts' import type { AbortOptions, Metrics } from '@libp2p/interface' import type { ProgressOptions } from 'progress-events' diff --git a/packages/utils/test/adaptive-timeout.spec.ts b/packages/utils/test/adaptive-timeout.spec.ts index 71835ce42a..7af69c2e39 100644 --- a/packages/utils/test/adaptive-timeout.spec.ts +++ b/packages/utils/test/adaptive-timeout.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import Sinon from 'sinon' -import { AdaptiveTimeout, DEFAULT_MIN_TIMEOUT, DEFAULT_TIMEOUT_MULTIPLIER } from '../src/adaptive-timeout.js' +import { AdaptiveTimeout, DEFAULT_MIN_TIMEOUT, DEFAULT_TIMEOUT_MULTIPLIER } from '../src/adaptive-timeout.ts' import type { SinonFakeTimers } from 'sinon' describe('adaptive-timeout', () => { diff --git a/packages/utils/test/debounce.spec.ts b/packages/utils/test/debounce.spec.ts index 9423836123..345303be2e 100644 --- a/packages/utils/test/debounce.spec.ts +++ b/packages/utils/test/debounce.spec.ts @@ -1,7 +1,7 @@ import { stop } from '@libp2p/interface' import { expect } from 'aegir/chai' import delay from 'delay' -import { debounce } from '../src/debounce.js' +import { debounce } from '../src/debounce.ts' describe('debounce', () => { it('should debounce function', async () => { diff --git a/packages/utils/test/get-thin-waist-addresses.spec.ts b/packages/utils/test/get-thin-waist-addresses.spec.ts index 4f3ee4e418..85e1cccb90 100644 --- a/packages/utils/test/get-thin-waist-addresses.spec.ts +++ b/packages/utils/test/get-thin-waist-addresses.spec.ts @@ -1,7 +1,7 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' import { isNode, isElectronMain } from 'wherearewe' -import { getThinWaistAddresses } from '../src/get-thin-waist-addresses.js' +import { getThinWaistAddresses } from '../src/get-thin-waist-addresses.ts' describe('get-thin-waist-addresses', () => { it('should not return addresses when not passed anything', () => { diff --git a/packages/utils/test/global-unicast-ip.spec.ts b/packages/utils/test/global-unicast-ip.spec.ts index 3974c65a93..ce09030f78 100644 --- a/packages/utils/test/global-unicast-ip.spec.ts +++ b/packages/utils/test/global-unicast-ip.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { isGlobalUnicastIp } from '../src/global-unicast-ip.js' +import { isGlobalUnicastIp } from '../src/global-unicast-ip.ts' describe('isGlobalUnicastIp', () => { it('identifies ip4 multiaddrs as non-global unicast', () => { diff --git a/packages/utils/test/ip-port-to-multiaddr.spec.ts b/packages/utils/test/ip-port-to-multiaddr.spec.ts index b8050d02e8..084d675b71 100644 --- a/packages/utils/test/ip-port-to-multiaddr.spec.ts +++ b/packages/utils/test/ip-port-to-multiaddr.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { ipPortToMultiaddr } from '../src/ip-port-to-multiaddr.js' +import { ipPortToMultiaddr } from '../src/ip-port-to-multiaddr.ts' describe('IP and port to Multiaddr', () => { it('creates multiaddr from valid IPv4 IP and port', () => { diff --git a/packages/utils/test/is-async-generator.spec.ts b/packages/utils/test/is-async-generator.spec.ts index bf2ff133f2..f8e425cf95 100644 --- a/packages/utils/test/is-async-generator.spec.ts +++ b/packages/utils/test/is-async-generator.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { isAsyncGenerator } from '../src/is-async-generator.js' +import { isAsyncGenerator } from '../src/is-async-generator.ts' describe('is-async-generator', () => { it('should return true if the value is an async generator', () => { diff --git a/packages/utils/test/is-generator.spec.ts b/packages/utils/test/is-generator.spec.ts index 4d6576462d..2d93ec028c 100644 --- a/packages/utils/test/is-generator.spec.ts +++ b/packages/utils/test/is-generator.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { isGenerator } from '../src/is-generator.js' +import { isGenerator } from '../src/is-generator.ts' describe('is-generator', () => { it('should return true if the value is a generator', () => { diff --git a/packages/utils/test/is-promise.spec.ts b/packages/utils/test/is-promise.spec.ts index f407328c20..4e0cc784ed 100644 --- a/packages/utils/test/is-promise.spec.ts +++ b/packages/utils/test/is-promise.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { isPromise } from '../src/is-promise.js' +import { isPromise } from '../src/is-promise.ts' describe('is-promise', () => { it('should detect Promise.resolve', () => { diff --git a/packages/utils/test/link-local-ip.spec.ts b/packages/utils/test/link-local-ip.spec.ts index 37b6ff7656..7afd02963c 100644 --- a/packages/utils/test/link-local-ip.spec.ts +++ b/packages/utils/test/link-local-ip.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { isLinkLocalIp } from '../src/link-local-ip.js' +import { isLinkLocalIp } from '../src/link-local-ip.ts' describe('isLinkLocalIp', () => { it('identifies link-local ip4 multiaddrs', () => { diff --git a/packages/utils/test/moving-average.spec.ts b/packages/utils/test/moving-average.spec.ts index 9f1a1c07bd..2f2a930239 100644 --- a/packages/utils/test/moving-average.spec.ts +++ b/packages/utils/test/moving-average.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { MovingAverage } from '../src/moving-average.js' +import { MovingAverage } from '../src/moving-average.ts' describe('moving-average', () => { it('moving average with one value gets that value', () => { diff --git a/packages/utils/test/multiaddr/is-global-unicast.spec.ts b/packages/utils/test/multiaddr/is-global-unicast.spec.ts index 9b753f219b..e7c68e39d0 100644 --- a/packages/utils/test/multiaddr/is-global-unicast.spec.ts +++ b/packages/utils/test/multiaddr/is-global-unicast.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { isGlobalUnicast } from '../../src/multiaddr/is-global-unicast.js' +import { isGlobalUnicast } from '../../src/multiaddr/is-global-unicast.ts' describe('multiaddr isGlobalUnicast', () => { it('identifies ip4 multiaddrs as non-global unicast', () => { diff --git a/packages/utils/test/multiaddr/is-link-local.spec.ts b/packages/utils/test/multiaddr/is-link-local.spec.ts index cb7082147d..6c3dcfff89 100644 --- a/packages/utils/test/multiaddr/is-link-local.spec.ts +++ b/packages/utils/test/multiaddr/is-link-local.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { isLinkLocal } from '../../src/multiaddr/is-link-local.js' +import { isLinkLocal } from '../../src/multiaddr/is-link-local.ts' describe('multiaddr isLinkLocal', () => { it('identifies link-local ip4 multiaddrs', () => { diff --git a/packages/utils/test/multiaddr/is-loopback.spec.ts b/packages/utils/test/multiaddr/is-loopback.spec.ts index fc87c623ed..cd8abcb6c5 100644 --- a/packages/utils/test/multiaddr/is-loopback.spec.ts +++ b/packages/utils/test/multiaddr/is-loopback.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { isLoopback } from '../../src/multiaddr/is-loopback.js' +import { isLoopback } from '../../src/multiaddr/is-loopback.ts' describe('multiaddr isLoopback', () => { it('identifies loopback ip4 multiaddrs', () => { diff --git a/packages/utils/test/multiaddr/is-network-address.spec.ts b/packages/utils/test/multiaddr/is-network-address.spec.ts index ef5112aabc..d0a9c8d875 100644 --- a/packages/utils/test/multiaddr/is-network-address.spec.ts +++ b/packages/utils/test/multiaddr/is-network-address.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { isNetworkAddress } from '../../src/multiaddr/is-network-address.js' +import { isNetworkAddress } from '../../src/multiaddr/is-network-address.ts' describe('multiaddr isNetworkAddress', () => { it('identifies network multiaddrs', () => { diff --git a/packages/utils/test/multiaddr/is-private.spec.ts b/packages/utils/test/multiaddr/is-private.spec.ts index 2b3cda21fe..0386de1a7d 100644 --- a/packages/utils/test/multiaddr/is-private.spec.ts +++ b/packages/utils/test/multiaddr/is-private.spec.ts @@ -1,6 +1,6 @@ import { multiaddr } from '@multiformats/multiaddr' import { expect } from 'aegir/chai' -import { isPrivate } from '../../src/multiaddr/is-private.js' +import { isPrivate } from '../../src/multiaddr/is-private.ts' describe('multiaddr isPrivate', () => { it('identifies private ip4 multiaddrs', () => { diff --git a/packages/utils/test/multiaddr/sorters.spec.ts b/packages/utils/test/multiaddr/sorters.spec.ts index 625b1b35dd..5f054c80e0 100644 --- a/packages/utils/test/multiaddr/sorters.spec.ts +++ b/packages/utils/test/multiaddr/sorters.spec.ts @@ -6,7 +6,7 @@ import { publicAddressesFirst, circuitRelayAddressesLast, defaultMultiaddrSorter -} from '../../src/multiaddr/sorters.js' +} from '../../src/multiaddr/sorters.ts' describe('multiaddr sorters', () => { describe('reliableTransportsFirst', () => { diff --git a/packages/utils/test/peer-job-queue.spec.ts b/packages/utils/test/peer-job-queue.spec.ts index b44e7b63bc..5ff6b79e39 100644 --- a/packages/utils/test/peer-job-queue.spec.ts +++ b/packages/utils/test/peer-job-queue.spec.ts @@ -4,9 +4,9 @@ import { expect } from 'aegir/chai' import delay from 'delay' import pDefer from 'p-defer' import { pEvent } from 'p-event' -import { PeerQueue } from '../src/peer-queue.js' -import type { PeerQueueJobOptions } from '../src/peer-queue.js' -import type { QueueJobFailure, QueueJobSuccess } from '../src/queue/index.js' +import { PeerQueue } from '../src/peer-queue.ts' +import type { PeerQueueJobOptions } from '../src/peer-queue.ts' +import type { QueueJobFailure, QueueJobSuccess } from '../src/queue/index.ts' describe('peer queue', () => { it('should have jobs', async () => { diff --git a/packages/utils/test/priority-queue.spec.ts b/packages/utils/test/priority-queue.spec.ts index e45cb5ef8a..ff6920391f 100644 --- a/packages/utils/test/priority-queue.spec.ts +++ b/packages/utils/test/priority-queue.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'aegir/chai' -import { PriorityQueue } from '../src/priority-queue.js' +import { PriorityQueue } from '../src/priority-queue.ts' describe('priority-queue', () => { it('adds with priority', async () => { diff --git a/packages/utils/test/private-ip.spec.ts b/packages/utils/test/private-ip.spec.ts index e491782475..9cb2d6d9eb 100644 --- a/packages/utils/test/private-ip.spec.ts +++ b/packages/utils/test/private-ip.spec.ts @@ -1,6 +1,6 @@ /* spell-checker:disable */ import { expect } from 'aegir/chai' -import { isPrivateIp } from '../src/private-ip.js' +import { isPrivateIp } from '../src/private-ip.ts' describe('private-ip', function () { const pubIps = [ diff --git a/packages/utils/test/queue.spec.ts b/packages/utils/test/queue.spec.ts index f4f7575edb..ca5baa1c1f 100644 --- a/packages/utils/test/queue.spec.ts +++ b/packages/utils/test/queue.spec.ts @@ -3,7 +3,7 @@ import delay from 'delay' import all from 'it-all' import pDefer from 'p-defer' import { CustomProgressEvent } from 'progress-events' -import { Queue } from '../src/queue/index.js' +import { Queue } from '../src/queue/index.ts' import { TestSignal } from './fixtures/test-signal.ts' import type { AbortOptions } from '@libp2p/interface' import type { ProgressOptions } from 'progress-events' diff --git a/packages/utils/test/rate-limiter.spec.ts b/packages/utils/test/rate-limiter.spec.ts index 2a1dba952e..6267421bb7 100644 --- a/packages/utils/test/rate-limiter.spec.ts +++ b/packages/utils/test/rate-limiter.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import delay from 'delay' -import { RateLimiter } from '../src/rate-limiter.js' +import { RateLimiter } from '../src/rate-limiter.ts' describe('RateLimiter with fixed window', function () { this.timeout(5000) diff --git a/packages/utils/test/repeating-task.spec.ts b/packages/utils/test/repeating-task.spec.ts index 1f5b37a682..272e814d9c 100644 --- a/packages/utils/test/repeating-task.spec.ts +++ b/packages/utils/test/repeating-task.spec.ts @@ -1,8 +1,8 @@ import { expect } from 'aegir/chai' import delay from 'delay' import pDefer from 'p-defer' -import { repeatingTask } from '../src/repeating-task.js' -import type { RepeatingTask } from '../src/repeating-task.js' +import { repeatingTask } from '../src/repeating-task.ts' +import type { RepeatingTask } from '../src/repeating-task.ts' describe('repeating-task', () => { let task: RepeatingTask diff --git a/packages/utils/test/stream-utils-test.spec.ts b/packages/utils/test/stream-utils-test.spec.ts index 878d3a23e8..e0f4cef50e 100644 --- a/packages/utils/test/stream-utils-test.spec.ts +++ b/packages/utils/test/stream-utils-test.spec.ts @@ -7,7 +7,7 @@ import { pEvent } from 'p-event' import Sinon from 'sinon' import { Uint8ArrayList } from 'uint8arraylist' import { streamPair } from '../src/stream-pair.ts' -import { echo, pipe, messageStreamToDuplex, byteStream } from '../src/stream-utils.js' +import { echo, pipe, messageStreamToDuplex, byteStream } from '../src/stream-utils.ts' describe('messageStreamToDuplex', () => { it('should source all reads', async () => { diff --git a/packages/utils/test/tracked-list.spec.ts b/packages/utils/test/tracked-list.spec.ts index 3bf61602f7..dc184aaecb 100644 --- a/packages/utils/test/tracked-list.spec.ts +++ b/packages/utils/test/tracked-list.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { trackedList } from '../src/tracked-list.js' +import { trackedList } from '../src/tracked-list.ts' import type { Metric, Metrics } from '@libp2p/interface' import type { SinonStubbedInstance } from 'sinon' diff --git a/packages/utils/test/tracked-map.spec.ts b/packages/utils/test/tracked-map.spec.ts index 8c589818c4..748965da20 100644 --- a/packages/utils/test/tracked-map.spec.ts +++ b/packages/utils/test/tracked-map.spec.ts @@ -1,6 +1,6 @@ import { expect } from 'aegir/chai' import { stubInterface } from 'sinon-ts' -import { trackedMap } from '../src/tracked-map.js' +import { trackedMap } from '../src/tracked-map.ts' import type { Metric, Metrics } from '@libp2p/interface' import type { SinonStubbedInstance } from 'sinon'