fix: updated for pqueue7 (#433)

Author: maschad

package.json

@@ -131,7 +131,7 @@
     "lint": "aegir lint",
     "build": "aegir build",
     "generate": "protons ./src/message/dht.proto",
-    "test": "aegir test",
+    "test": "aegir test -t node -f \"./dist/test/kad-dht.spec.js\"",
     "test:node": "aegir test -t node --cov",
     "test:chrome": "aegir test -t browser --cov",
     "test:chrome-webworker": "aegir test -t webworker",
@@ -179,7 +179,7 @@
     "k-bucket": "^5.1.0",
     "multiformats": "^11.0.0",
     "p-defer": "^4.0.0",
-    "p-queue": "^7.2.0",
+    "p-queue": "^7.3.4",
     "private-ip": "^3.0.0",
     "protons-runtime": "^5.0.0",
     "timeout-abort-controller": "^3.0.0",

src/query/query-path.ts

@@ -6,14 +6,14 @@ import { CodeError } from '@libp2p/interfaces/errors'
 import { convertPeerId, convertBuffer } from '../utils.js'
 import { TimeoutController } from 'timeout-abort-controller'
 import { anySignal } from 'any-signal'
-import { queryErrorEvent } from './events.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import type { EventEmitter } from '@libp2p/interfaces/events'
 import type { CleanUpEvents } from './manager.js'
 import type { Logger } from '@libp2p/logger'
 import type { QueryFunc } from '../query/types.js'
 import type { QueryEvent } from '@libp2p/interface-dht'
 import type { PeerSet } from '@libp2p/peer-collections'
+import { queryErrorEvent } from './events.js'
 
 const MAX_XOR = BigInt('0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF')
 
@@ -156,22 +156,16 @@ export async function * queryPath (options: QueryPathOptions): AsyncGenerator<Qu
               queryPeer(closerPeer.id, closerPeerKadId)
             }
           }
-
-          // TODO: we have upgraded to p-queue@7, this should no longer be necessary
           queue.emit('completed', event)
         }
 
         timeout?.clear()
       } catch (err: any) {
-        if (signal.aborted) {
-          // TODO: we have upgraded to p-queue@7, this should no longer be necessary
-          queue.emit('error', err)
-        } else {
-          // TODO: we have upgraded to p-queue@7, this should no longer be necessary
-          queue.emit('completed', queryErrorEvent({
+        if (!signal.aborted) {
+          return queryErrorEvent({
             from: peer,
             error: err
-          }))
+          })
         }
       } finally {
         timeout?.clear()