Merge branch 'main' into dependabot/npm_and_yarn/types/sinon-20.0.0

Author: achingbrain

packages/floodsub/package.json

@@ -72,7 +72,7 @@
     "@multiformats/multiaddr": "^13.0.1",
     "@types/sinon": "^20.0.0",
     "aegir": "^47.0.22",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "p-wait-for": "^6.0.0",
     "protons": "^7.7.0",
     "sinon": "^21.0.0",

packages/gossipsub/package.json

@@ -98,7 +98,7 @@
     "abortable-iterator": "^5.1.0",
     "aegir": "^47.0.21",
     "datastore-core": "^11.0.1",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "it-all": "^3.0.6",
     "mkdirp": "^3.0.1",
     "p-defer": "^4.0.0",

packages/integration-tests/package.json

@@ -54,7 +54,7 @@
     "@multiformats/multiaddr": "^13.0.1",
     "@multiformats/multiaddr-matcher": "^3.0.1",
     "aegir": "^47.0.22",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "detect-browser": "^5.3.0",
     "execa": "^9.6.0",
     "go-libp2p": "^1.6.0",

packages/interface-compliance-tests/package.json

@@ -93,7 +93,7 @@
     "@multiformats/multiaddr": "^13.0.1",
     "@multiformats/multiaddr-matcher": "^3.0.1",
     "aegir": "^47.0.22",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "it-all": "^3.0.9",
     "it-drain": "^3.0.10",
     "it-map": "^3.1.4",

packages/interop/package.json

@@ -46,7 +46,7 @@
     "@libp2p/interface": "^3.1.0",
     "@libp2p/utils": "^7.0.7",
     "@multiformats/multiaddr": "^13.0.1",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "it-all": "^3.0.9",
     "it-first": "^3.0.9",
     "multiformats": "^13.4.0",

packages/kad-dht/package.json

@@ -89,7 +89,7 @@
     "aegir": "^47.0.22",
     "benchmark": "^2.1.4",
     "datastore-core": "^11.0.1",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "execa": "^9.6.0",
     "it-filter": "^3.1.4",
     "it-first": "^3.0.9",
@@ -101,7 +101,7 @@
     "protons": "^7.7.0",
     "sinon": "^21.0.0",
     "sinon-ts": "^2.0.0",
-    "which": "^5.0.0"
+    "which": "^6.0.0"
   },
   "browser": {
     "./dist/src/routing-table/generated-prefix-list.js": "./dist/src/routing-table/generated-prefix-list-browser.js"

packages/libp2p/package.json

@@ -108,7 +108,7 @@
   },
   "devDependencies": {
     "aegir": "^47.0.22",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "it-all": "^3.0.9",
     "it-drain": "^3.0.10",
     "it-length-prefixed": "^10.0.1",

packages/logger/src/index.ts

@@ -80,7 +80,7 @@ debug.formatters.a = (v?: Multiaddr): string => {
   return v == null ? 'undefined' : v.toString()
 }
 
-function formatError (v: Error): string {
+function formatError (v: Error, indent = ''): string {
   const message = notEmpty(v.message)
   const stack = notEmpty(v.stack)
 
@@ -89,41 +89,38 @@ function formatError (v: Error): string {
   // sometimes is isn't so try to do *something* useful
   if (message != null && stack != null) {
     if (stack.includes(message)) {
-      return stack
+      return `${stack.split('\n').join(`\n${indent}`)}`
     }
 
-    return `${message}\n${stack}`
+    return `${message}\n${indent}${stack.split('\n').join(`\n${indent}`)}`
   }
 
   if (stack != null) {
-    return stack
+    return `${stack.split('\n').join(`\n${indent}`)}`
   }
 
   if (message != null) {
-    return message
+    return `${message}`
   }
 
-  return v.toString()
+  return `${v.toString()}`
 }
 
 function isAggregateError (err?: any): err is AggregateError {
   return err instanceof AggregateError || (err?.name === 'AggregateError' && Array.isArray(err.errors))
 }
 
-// Add a formatter for stringifying Errors
-debug.formatters.e = (v?: Error): string => {
-  if (v == null) {
-    return 'undefined'
-  }
-
-  if (isAggregateError(v)) {
-    const indent = '      '
+function printError (err: Error, indent = ''): string {
+  if (isAggregateError(err)) {
+    let output = formatError(err, indent)
 
-    let output = formatError(v)
+    if (err.errors.length > 0) {
+      indent = `${indent}    `
 
-    if (v.errors.length > 0) {
-      output += `\n${indent}${
-        v.errors.map(err => `  ${formatError(err).split('\n').join(`\n${indent}`)}`).join(`\n${indent}`)
+      output += `${
+        err.errors
+        .map(err => `\n${indent}${printError(err, `${indent}`)}`)
+        .join(`\n${indent}`)
       }`
     } else {
       output += `\n${indent}[Error list was empty]`
@@ -132,7 +129,16 @@ debug.formatters.e = (v?: Error): string => {
     return output.trim()
   }
 
-  return formatError(v)
+  return formatError(err, indent)
+}
+
+// Add a formatter for stringifying Errors
+debug.formatters.e = (v?: Error): string => {
+  if (v == null) {
+    return 'undefined'
+  }
+
+  return printError(v)
 }
 
 export type { Logger, ComponentLogger }

packages/peer-store/package.json

@@ -69,7 +69,7 @@
     "aegir": "^47.0.22",
     "benchmark": "^2.1.4",
     "datastore-core": "^11.0.1",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "p-defer": "^4.0.1",
     "p-event": "^7.0.0",
     "protons": "^7.7.0",

packages/protocol-autonat-v2/package.json

@@ -61,7 +61,7 @@
     "@libp2p/logger": "^6.2.0",
     "@libp2p/peer-id": "^6.0.4",
     "aegir": "^47.0.22",
-    "delay": "^6.0.0",
+    "delay": "^7.0.0",
     "it-all": "^3.0.9",
     "it-length-prefixed": "^10.0.1",
     "it-pipe": "^3.0.1",