chore: remove setTimeout from test

libp2p · Sep 10, 2024 · c2bc7fe · c2bc7fe
1 parent 6d72709
commit c2bc7fe
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/.release-please.json b/.release-please.json
@@ -29,6 +29,7 @@
     "packages/peer-id": {},
     "packages/peer-record": {},
     "packages/peer-store": {},
+    "packages/pnet": {},
     "packages/protocol-autonat": {},
     "packages/protocol-dcutr": {},
     "packages/protocol-echo": {},

diff --git a/package.json b/package.json
@@ -34,12 +34,13 @@
     "release:rc": "aegir release-rc",
     "docs": "aegir docs",
     "docs:no-publish": "aegir docs --publish false -- --exclude interop --exclude doc",
-    "postinstall": "patch-package"
+    "postinstall": "patch-package && rm -rf node_modules/@chainsafe/libp2p-yamux/node_modules node_modules/@chainsafe/libp2p-noise/node_modules node_modules/@chainsafe/libp2p-gossipsub/node_modules node_modules/@libp2p/daemon-client/node_modules node_modules/@libp2p/daemon-server/node_modules node_modules/@libp2p/daemon-protocol/node_modules node_modules/@libp2p/interop/node_modules"
   },
   "devDependencies": {
     "aegir": "^44.0.1",
     "npm-run-all": "^4.1.5",
-    "patch-package": "^8.0.0"
+    "patch-package": "^8.0.0",
+    "rimraf": "^6.0.1"
   },
   "eslintConfig": {
     "extends": "ipfs",

diff --git a/packages/kad-dht/test/query.spec.ts b/packages/kad-dht/test/query.spec.ts
@@ -312,6 +312,7 @@ describe('QueryManager', () => {
     })
     await manager.start()
 
+    const deferred = pDefer()
     const controller = new AbortController()
     let aborted
 
@@ -331,16 +332,24 @@ describe('QueryManager', () => {
         aborted = true
       })
 
+      deferred.resolve()
+
       await delay(1000)
 
       yield topology[peer.toString()].event
     }
 
-    setTimeout(() => {
-      controller.abort()
-    }, 10)
+    // start the query
+    const queryPromise = all(manager.run(key, queryFunc, { signal: controller.signal }))
+
+    // wait for the query function to be invoked
+    await deferred.promise
+
+    // abort the query
+    controller.abort()
 
-    await expect(all(manager.run(key, queryFunc, { signal: controller.signal }))).to.eventually.be.rejected()
+    // the should have been aborted
+    await expect(queryPromise).to.eventually.be.rejected()
       .with.property('name', 'QueryAbortedError')
 
     expect(aborted).to.be.true()

diff --git a/packages/transport-webrtc/src/private-to-private/initiate-connection.ts b/packages/transport-webrtc/src/private-to-private/initiate-connection.ts
@@ -138,6 +138,8 @@ export async function initiateConnection ({ rtcConfiguration, dataChannel, signa
 
       onProgress?.(new CustomProgressEvent('webrtc:read-sdp-answer'))
 
+      log.trace('initiator read SDP answer')
+
       // read answer
       const answerMessage = await messageStream.read({
         signal
@@ -147,7 +149,7 @@ export async function initiateConnection ({ rtcConfiguration, dataChannel, signa
         throw new SDPHandshakeFailedError('Remote should send an SDP answer')
       }
 
-      log.trace('initiator receive SDP answer %s', answerMessage.data)
+      log.trace('initiator received SDP answer %s', answerMessage.data)
 
       const answerSdp = new RTCSessionDescription({ type: 'answer', sdp: answerMessage.data })
       await peerConnection.setRemoteDescription(answerSdp).catch(err => {

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
@@ -3,7 +3,7 @@ import { pbStream } from 'it-protobuf-stream'
 import { SDPHandshakeFailedError } from '../error.js'
 import { type RTCPeerConnection, RTCSessionDescription } from '../webrtc/index.js'
 import { Message } from './pb/message.js'
-import { readCandidatesUntilConnected } from './util.js'
+import { getConnectionState, readCandidatesUntilConnected } from './util.js'
 import type { Logger } from '@libp2p/interface'
 import type { IncomingStreamData } from '@libp2p/interface-internal'
 
@@ -40,6 +40,8 @@ export async function handleIncomingStream ({ peerConnection, stream, signal, co
         })
     }
 
+    log.trace('recipient read SDP offer')
+
     // read an SDP offer
     const pbOffer = await messageStream.read({
       signal
@@ -49,7 +51,7 @@ export async function handleIncomingStream ({ peerConnection, stream, signal, co
       throw new SDPHandshakeFailedError(`expected message type SDP_OFFER, received: ${pbOffer.type ?? 'undefined'} `)
     }
 
-    log.trace('recipient receive SDP offer %s', pbOffer.data)
+    log.trace('recipient received SDP offer %s', pbOffer.data)
 
     const offer = new RTCSessionDescription({
       type: 'offer',
@@ -88,7 +90,7 @@ export async function handleIncomingStream ({ peerConnection, stream, signal, co
       log
     })
   } catch (err: any) {
-    if (peerConnection.connectionState !== 'connected') {
+    if (getConnectionState(peerConnection) !== 'connected') {
       log.error('error while handling signaling stream from peer %a', connection.remoteAddr, err)
 
       peerConnection.close()

diff --git a/packages/transport-webrtc/src/private-to-private/util.ts b/packages/transport-webrtc/src/private-to-private/util.ts
@@ -67,13 +67,13 @@ export const readCandidatesUntilConnected = async (pc: RTCPeerConnection, stream
   } catch (err) {
     options.log.error('%s error parsing ICE candidate', options.direction, err)
 
-    if (options.signal?.aborted === true) {
+    if (options.signal?.aborted === true && getConnectionState(pc) !== 'connected') {
       throw err
     }
   }
 }
 
-function getConnectionState (pc: RTCPeerConnection): string {
+export function getConnectionState (pc: RTCPeerConnection): string {
   return isFirefox ? pc.iceConnectionState : pc.connectionState
 }