From 8748cf2260e6cb0924f1d43679d8ad22c983ad02 Mon Sep 17 00:00:00 2001 From: chad Date: Mon, 1 May 2023 14:00:38 -0500 Subject: [PATCH] refactor: remove use of timeout-abort-controller --- package.json | 1 - src/peer_transport/handler.ts | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0319cc8..db830e0 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,6 @@ "multihashes": "^4.0.3", "p-defer": "^4.0.0", "protons-runtime": "^5.0.0", - "timeout-abort-controller": "^3.0.0", "uint8arraylist": "^2.3.3", "uint8arrays": "^4.0.2", "detect-browser": "^5.3.0" diff --git a/src/peer_transport/handler.ts b/src/peer_transport/handler.ts index 659a847..7a0275a 100644 --- a/src/peer_transport/handler.ts +++ b/src/peer_transport/handler.ts @@ -1,7 +1,6 @@ import type { IncomingStreamData } from '@libp2p/interface-registrar' import { pbStream } from 'it-pb-stream' import pDefer, { type DeferredPromise } from 'p-defer' -import { TimeoutController } from 'timeout-abort-controller' import { readCandidatesUntilConnected, resolveOnConnected } from './util.js' import * as pb from './pb/index.js' import { abortableDuplex } from 'abortable-iterator' @@ -17,9 +16,8 @@ const log = logger('libp2p:webrtc:peer') export type IncomingStreamOpts = { rtcConfiguration?: RTCConfiguration } & IncomingStreamData export async function handleIncomingStream ({ rtcConfiguration, stream: rawStream }: IncomingStreamOpts): Promise<[RTCPeerConnection, StreamMuxerFactory]> { - const timeoutController = new TimeoutController(DEFAULT_TIMEOUT) - const signal = timeoutController.signal - const stream = pbStream(abortableDuplex(rawStream, timeoutController.signal)).pb(pb.Message) + const signal = AbortSignal.timeout(DEFAULT_TIMEOUT) + const stream = pbStream(abortableDuplex(rawStream, signal)).pb(pb.Message) const pc = new RTCPeerConnection(rtcConfiguration) const muxerFactory = new DataChannelMuxerFactory(pc)