@libp2p/utils 6.6.3 → 6.6.4-776cb432d

package/dist/src/stream-to-ma-conn.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-to-ma-conn.js","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream-to-ma-conn.js","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "6.6.3",
+  "version": "6.6.4-776cb432d",
   "description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/utils#readme",
@@ -105,6 +105,10 @@
       "types": "./dist/src/link-local-ip.d.ts",
       "import": "./dist/src/link-local-ip.js"
     },
+    "./merge-options": {
+      "types": "./dist/src/merge-options.d.ts",
+      "import": "./dist/src/merge-options.js"
+    },
     "./moving-average": {
       "types": "./dist/src/moving-average.d.ts",
       "import": "./dist/src/moving-average.js"
@@ -170,13 +174,6 @@
       "import": "./dist/src/tracked-map.js"
     }
   },
-  "eslintConfig": {
-    "extends": "ipfs",
-    "parserOptions": {
-      "project": true,
-      "sourceType": "module"
-    }
-  },
   "scripts": {
     "clean": "aegir clean",
     "lint": "aegir lint",
@@ -192,46 +189,47 @@
     "test:electron-main": "aegir test -t electron-main"
   },
   "dependencies": {
-    "@chainsafe/is-ip": "^2.0.2",
+    "@chainsafe/is-ip": "^2.1.0",
     "@chainsafe/netmask": "^2.0.0",
-    "@libp2p/crypto": "^5.1.2",
-    "@libp2p/interface": "^2.10.0",
-    "@libp2p/logger": "^5.1.16",
-    "@multiformats/multiaddr": "^12.3.3",
+    "@libp2p/crypto": "5.1.3-776cb432d",
+    "@libp2p/interface": "2.10.1-776cb432d",
+    "@libp2p/logger": "5.1.17-776cb432d",
+    "@multiformats/multiaddr": "^12.4.0",
     "@sindresorhus/fnv1a": "^3.1.0",
     "any-signal": "^4.1.1",
     "delay": "^6.0.0",
     "get-iterator": "^2.0.1",
     "is-loopback-addr": "^2.0.2",
-    "it-foreach": "^2.1.1",
+    "is-plain-obj": "^4.1.0",
+    "it-foreach": "^2.1.3",
     "it-pipe": "^3.0.1",
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.2",
     "netmask": "^2.0.2",
     "p-defer": "^4.0.1",
     "race-event": "^1.3.0",
-    "race-signal": "^1.1.2",
+    "race-signal": "^1.1.3",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/peer-id": "^5.1.3",
+    "@libp2p/peer-id": "5.1.4-776cb432d",
     "@types/netmask": "^2.0.5",
-    "aegir": "^45.1.1",
+    "aegir": "^47.0.6",
     "benchmark": "^2.1.4",
     "delay": "^6.0.0",
-    "it-all": "^3.0.6",
-    "it-drain": "^3.0.7",
+    "it-all": "^3.0.8",
+    "it-drain": "^3.0.9",
     "it-pair": "^2.0.6",
-    "sinon": "^19.0.2",
+    "sinon": "^20.0.0",
     "sinon-ts": "^2.0.0",
     "wherearewe": "^2.0.1"
   },
-  "sideEffects": false,
   "browser": {
     "./dist/src/get-thin-waist-addresses.js": "./dist/src/get-thin-waist-addresses.browser.js"
   },
   "react-native": {
     "./dist/src/get-thin-waist-addresses.js": "./dist/src/get-thin-waist-addresses.js"
-  }
+  },
+  "sideEffects": false
 }

package/src/abstract-stream.ts

@@ -1,13 +1,14 @@
 import { StreamResetError, StreamStateError } from '@libp2p/interface'
-import { type Pushable, pushable } from 'it-pushable'
-import defer, { type DeferredPromise } from 'p-defer'
-import pDefer from 'p-defer'
+import { pushable } from 'it-pushable'
+import defer from 'p-defer'
 import { raceSignal } from 'race-signal'
 import { Uint8ArrayList } from 'uint8arraylist'
 import { closeSource } from './close-source.js'
 import type { AbortOptions, Direction, ReadStatus, Stream, StreamStatus, StreamTimeline, WriteStatus } from '@libp2p/interface'
 import type { Logger } from '@libp2p/logger'
+import type { Pushable } from 'it-pushable'
 import type { Source } from 'it-stream-types'
+import type { DeferredPromise } from 'p-defer'
 
 const DEFAULT_SEND_CLOSE_WRITE_TIMEOUT = 5000
 
@@ -35,7 +36,7 @@ export interface AbstractStreamInit {
   /**
    * Invoked when the stream ends
    */
-  onEnd?(err?: Error | undefined): void
+  onEnd?(err?: Error): void
 
   /**
    * Invoked when the readable end of the stream is closed
@@ -99,7 +100,7 @@ export abstract class AbstractStream implements Stream {
   private readonly closed: DeferredPromise<void>
   private endErr: Error | undefined
   private readonly streamSource: Pushable<Uint8ArrayList>
-  private readonly onEnd?: (err?: Error | undefined) => void
+  private readonly onEnd?: (err?: Error) => void
   private readonly onCloseRead?: () => void
   private readonly onCloseWrite?: () => void
   private readonly onReset?: () => void
@@ -127,10 +128,10 @@ export abstract class AbstractStream implements Stream {
     this.sendCloseWriteTimeout = init.sendCloseWriteTimeout ?? DEFAULT_SEND_CLOSE_WRITE_TIMEOUT
 
     this.onEnd = init.onEnd
-    this.onCloseRead = init?.onCloseRead
-    this.onCloseWrite = init?.onCloseWrite
-    this.onReset = init?.onReset
-    this.onAbort = init?.onAbort
+    this.onCloseRead = init.onCloseRead
+    this.onCloseWrite = init.onCloseWrite
+    this.onReset = init.onReset
+    this.onAbort = init.onAbort
 
     this.source = this.streamSource = pushable<Uint8ArrayList>({
       onEnd: (err) => {
@@ -183,7 +184,7 @@ export abstract class AbstractStream implements Stream {
           const res = this.sendData(data, options)
 
           if (isPromise(res)) {
-            this.sendingData = pDefer()
+            this.sendingData = defer()
             await res
             this.sendingData.resolve()
             this.sendingData = undefined

package/src/adaptive-timeout.ts

@@ -1,7 +1,8 @@
 import { setMaxListeners } from '@libp2p/interface'
-import { anySignal, type ClearableSignal } from 'any-signal'
+import { anySignal } from 'any-signal'
 import { MovingAverage } from './moving-average.js'
 import type { MetricGroup, Metrics } from '@libp2p/interface'
+import type { ClearableSignal } from 'any-signal'
 
 export const DEFAULT_TIMEOUT_MULTIPLIER = 1.2
 export const DEFAULT_FAILURE_MULTIPLIER = 2

package/src/debounce.ts

@@ -21,8 +21,8 @@ export function debounce (func: () => void | Promise<void>, wait: number): Debou
     clearTimeout(timeout)
     timeout = setTimeout(later, wait)
   }
-  output.start = () => {}
-  output.stop = () => {
+  output.start = (): void => {}
+  output.stop = (): void => {
     clearTimeout(timeout)
   }
 

package/src/filters/cuckoo-filter.ts

@@ -1,8 +1,9 @@
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { Bucket } from './bucket.js'
 import { Fingerprint, MAX_FINGERPRINT_SIZE } from './fingerprint.js'
-import { fnv1a, type Hash } from './hashes.js'
+import { fnv1a } from './hashes.js'
 import { getRandomInt } from './utils.js'
+import type { Hash } from './hashes.js'
 import type { Filter } from './index.js'
 
 const maxCuckooCount = 500

package/src/filters/fingerprint.ts

@@ -1,6 +1,6 @@
 import { alloc as uint8ArrayAlloc } from 'uint8arrays/alloc'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
-import type { Hash } from './hashes'
+import type { Hash } from './hashes.js'
 
 export const MAX_FINGERPRINT_SIZE = 64
 

package/src/filters/scalable-cuckoo-filter.ts

@@ -1,7 +1,9 @@
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { CuckooFilter, optimize, type CuckooFilterInit } from './cuckoo-filter.js'
-import { fnv1a, type Hash } from './hashes.js'
+import { CuckooFilter, optimize } from './cuckoo-filter.js'
+import { fnv1a } from './hashes.js'
 import { getRandomInt } from './utils.js'
+import type { CuckooFilterInit } from './cuckoo-filter.js'
+import type { Hash } from './hashes.js'
 import type { Filter } from './index.js'
 
 export interface ScalableCuckooFilterInit extends CuckooFilterInit {

package/src/ip-port-to-multiaddr.ts

@@ -1,13 +1,14 @@
 import { isIPv4, isIPv6 } from '@chainsafe/is-ip'
 import { InvalidParametersError } from '@libp2p/interface'
-import { type Multiaddr, multiaddr } from '@multiformats/multiaddr'
+import { multiaddr } from '@multiformats/multiaddr'
+import type { Multiaddr } from '@multiformats/multiaddr'
 
 /**
  * Transform an IP, Port pair into a multiaddr
  */
 export function ipPortToMultiaddr (ip: string, port: number | string): Multiaddr {
   if (typeof ip !== 'string') {
-    throw new InvalidParametersError(`invalid ip provided: ${ip}`) // eslint-disable-line @typescript-eslint/restrict-template-expressions
+    throw new InvalidParametersError(`invalid ip provided: ${ip}`)
   }
 
   if (typeof port === 'string') {

package/src/merge-options.ts

@@ -0,0 +1,161 @@
+import isOptionObject from 'is-plain-obj'
+
+const { hasOwnProperty } = Object.prototype
+const { propertyIsEnumerable } = Object
+const defineProperty = (object: any, name: any, value: any): void => {
+  Object.defineProperty(object, name, {
+    value,
+    writable: true,
+    enumerable: true,
+    configurable: true
+  })
+}
+
+const globalThis = this
+const defaultMergeOptions = {
+  concatArrays: false,
+  ignoreUndefined: false
+}
+
+const getEnumerableOwnPropertyKeys = (value: any): any[] => {
+  const keys = []
+
+  for (const key in value) {
+    if (hasOwnProperty.call(value, key)) {
+      keys.push(key)
+    }
+  }
+
+  /* istanbul ignore else  */
+  if (Object.getOwnPropertySymbols) {
+    const symbols = Object.getOwnPropertySymbols(value)
+
+    for (const symbol of symbols) {
+      if (propertyIsEnumerable.call(value, symbol)) {
+        keys.push(symbol)
+      }
+    }
+  }
+
+  return keys
+}
+
+function clone <T> (value: T): T
+function clone <T> (value: T[]): T[]
+function clone (value: any): any {
+  if (Array.isArray(value)) {
+    return cloneArray(value)
+  }
+
+  if (isOptionObject(value)) {
+    return cloneOptionObject(value)
+  }
+
+  return value
+}
+
+function cloneArray <T> (array: T[]): T[] {
+  const result = array.slice(0, 0)
+
+  getEnumerableOwnPropertyKeys(array).forEach(key => {
+    defineProperty(result, key, clone(array[key]))
+  })
+
+  return result
+}
+
+function cloneOptionObject (object: any): any {
+  const result = Object.getPrototypeOf(object) === null ? Object.create(null) : {}
+
+  getEnumerableOwnPropertyKeys(object).forEach(key => {
+    defineProperty(result, key, clone(object[key]))
+  })
+
+  return result
+}
+
+const mergeKeys = (merged: any, source: any, keys: any[], config: any): any => {
+  keys.forEach(key => {
+    if (typeof source[key] === 'undefined' && config.ignoreUndefined) {
+      return
+    }
+
+    // Do not recurse into prototype chain of merged
+    if (key in merged && merged[key] !== Object.getPrototypeOf(merged)) {
+      defineProperty(merged, key, merge(merged[key], source[key], config))
+    } else {
+      defineProperty(merged, key, clone(source[key]))
+    }
+  })
+
+  return merged
+}
+
+/**
+ * see [Array.prototype.concat ( ...arguments )](http://www.ecma-international.org/ecma-262/6.0/#sec-array.prototype.concat)
+ */
+const concatArrays = (merged: any, source: any, config: any): any => {
+  let result = merged.slice(0, 0)
+  let resultIndex = 0;
+
+  [merged, source].forEach(array => {
+    const indices: any[] = []
+
+    // `result.concat(array)` with cloning
+    for (let k = 0; k < array.length; k++) {
+      if (!hasOwnProperty.call(array, k)) {
+        continue
+      }
+
+      indices.push(String(k))
+
+      if (array === merged) {
+        // Already cloned
+        defineProperty(result, resultIndex++, array[k])
+      } else {
+        defineProperty(result, resultIndex++, clone(array[k]))
+      }
+    }
+
+    // Merge non-index keys
+    result = mergeKeys(result, array, getEnumerableOwnPropertyKeys(array).filter(key => !indices.includes(key)), config)
+  })
+
+  return result
+}
+
+function merge (merged: any, source: any, config: any): any {
+  if (config.concatArrays && Array.isArray(merged) && Array.isArray(source)) {
+    return concatArrays(merged, source, config)
+  }
+
+  if (!isOptionObject(source) || !isOptionObject(merged)) {
+    return clone(source)
+  }
+
+  return mergeKeys(merged, source, getEnumerableOwnPropertyKeys(source), config)
+}
+
+/**
+ * Port of `merge-options` to typescript
+ *
+ * @see https://github.com/schnittstabil/merge-options/pull/28
+ */
+export function mergeOptions (this: any, ...options: any[]): any {
+  const config = merge(clone(defaultMergeOptions), (this !== globalThis && this) || {}, defaultMergeOptions)
+  let merged = { _: {} }
+
+  for (const option of options) {
+    if (option === undefined) {
+      continue
+    }
+
+    if (!isOptionObject(option)) {
+      throw new TypeError('`' + option + '` is not an Option Object')
+    }
+
+    merged = merge(merged, { _: option }, config)
+  }
+
+  return merged._
+}

package/src/private-ip.ts

@@ -32,7 +32,7 @@ const NETMASK_RANGES = PRIVATE_IP_RANGES.map(ipRange => new Netmask(ipRange))
 
 function ipv4Check (ipAddr: string): boolean {
   for (const r of NETMASK_RANGES) {
-    if (r.contains(ipAddr)) return true
+    if (r.contains(ipAddr)) { return true }
   }
 
   return false
@@ -89,9 +89,5 @@ function ipv6Check (ipAddr: string): boolean {
 }
 
 export function isPrivateIp (ip: string): boolean | undefined {
-  if (isIPv4(ip)) return ipv4Check(ip)
-  else if (isIpv4MappedIpv6(ip)) return ipv4MappedIpv6Check(ip)
-  else if (isIpv4EmbeddedIpv6(ip)) return ipv4EmbeddedIpv6Check(ip)
-  else if (isIPv6(ip)) return ipv6Check(ip)
-  else return undefined
+  if (isIPv4(ip)) { return ipv4Check(ip) } else if (isIpv4MappedIpv6(ip)) { return ipv4MappedIpv6Check(ip) } else if (isIpv4EmbeddedIpv6(ip)) { return ipv4EmbeddedIpv6Check(ip) } else if (isIPv6(ip)) { return ipv6Check(ip) } else { return undefined }
 }

package/src/queue/index.ts

@@ -71,49 +71,49 @@ export interface QueueEvents<JobReturnType, JobOptions extends AbortOptions = Ab
   /**
    * A job is about to start running
    */
-  'active': CustomEvent
+  active: CustomEvent
 
   /**
    * All jobs have finished and the queue is empty
    */
-  'idle': CustomEvent
+  idle: CustomEvent
 
   /**
    * The queue is empty, jobs may be running
    */
-  'empty': CustomEvent
+  empty: CustomEvent
 
   /**
    * A job was added to the queue
    */
-  'add': CustomEvent
+  add: CustomEvent
 
   /**
    * A job has finished or failed
    */
-  'next': CustomEvent
+  next: CustomEvent
 
   /**
    * A job has finished successfully
    */
-  'completed': CustomEvent<JobReturnType>
+  completed: CustomEvent<JobReturnType>
 
   /**
    * A job has failed
    */
-  'error': CustomEvent<Error>
+  error: CustomEvent<Error>
 
   /**
    * Emitted just after `"completed", a job has finished successfully - this
    * event gives access to the job and it's result
    */
-  'success': CustomEvent<QueueJobSuccess<JobReturnType, JobOptions>>
+  success: CustomEvent<QueueJobSuccess<JobReturnType, JobOptions>>
 
   /**
    * Emitted just after `"error", a job has failed - this event gives access to
    * the job and the thrown error
    */
-  'failure': CustomEvent<QueueJobFailure<JobReturnType, JobOptions>>
+  failure: CustomEvent<QueueJobFailure<JobReturnType, JobOptions>>
 }
 
 /**

package/src/repeating-task.ts

@@ -18,7 +18,7 @@ export interface RepeatingTask {
    * Update the amount of time a task will run before the passed abort signal
    * will fire.
    *
-   * * This only affects the next iteration of the task, if it is currently
+   * This only affects the next iteration of the task, if it is currently
    * running, that run will not be interrupted.
    */
   setTimeout(ms: number): void
@@ -83,7 +83,7 @@ export function repeatingTask (fn: (options?: AbortOptions) => void | Promise<vo
   let started = false
 
   return {
-    setInterval: (ms) => {
+    setInterval: (ms): void => {
       interval = ms
 
       // maybe reschedule
@@ -92,14 +92,11 @@ export function repeatingTask (fn: (options?: AbortOptions) => void | Promise<vo
         timeout = setTimeout(runTask, interval)
       }
     },
-    setTimeout: (ms) => {
-      if (options == null) {
-        options = {}
-      }
-
+    setTimeout: (ms): void => {
+      options ??= {}
       options.timeout = ms
     },
-    start: () => {
+    start: (): void => {
       if (started) {
         return
       }
@@ -118,7 +115,7 @@ export function repeatingTask (fn: (options?: AbortOptions) => void | Promise<vo
         timeout = setTimeout(runTask, interval)
       }
     },
-    stop: () => {
+    stop: (): void => {
       clearTimeout(timeout)
       shutdownController?.abort()
       started = false

package/src/stream-to-ma-conn.ts

@@ -34,21 +34,21 @@ export function streamToMaConnection (props: StreamProperties): MultiaddrConnect
 
   // piggyback on `stream.close` invocations to close multiaddr connection
   const streamClose = stream.close.bind(stream)
-  stream.close = async (options) => {
+  stream.close = async (options): Promise<void> => {
     await streamClose(options)
     close(true)
   }
 
   // piggyback on `stream.abort` invocations to close multiaddr connection
   const streamAbort = stream.abort.bind(stream)
-  stream.abort = (err) => {
+  stream.abort = (err): void => {
     streamAbort(err)
     close(true)
   }
 
   // piggyback on `stream.sink` invocations to close multiaddr connection
   const streamSink = stream.sink.bind(stream)
-  stream.sink = async (source) => {
+  stream.sink = async (source): Promise<void> => {
     try {
       await streamSink(
         pipe(
@@ -73,7 +73,7 @@ export function streamToMaConnection (props: StreamProperties): MultiaddrConnect
   const maConn: MultiaddrConnection = {
     log,
     sink: stream.sink,
-    source: (async function * () {
+    source: (async function * (): AsyncGenerator<Uint8ArrayList> {
       try {
         for await (const buf of stream.source) {
           onDataRead?.(buf)