@@ -28,8 +28,6 @@ export class Socket extends EventEmitter {
28
28
private packetsFn : Array < ( ) => void > ;
29
29
private sentCallbackFn : any [ ] ;
30
30
private cleanupFn : any [ ] ;
31
- private checkIntervalTimer ;
32
- private upgradeTimeoutTimer ;
33
31
private pingTimeoutTimer ;
34
32
private pingIntervalTimer ;
35
33
@@ -81,8 +79,6 @@ export class Socket extends EventEmitter {
81
79
// see https://github.com/fails-components/webtransport/issues/114
82
80
}
83
81
84
- this . checkIntervalTimer = null ;
85
- this . upgradeTimeoutTimer = null ;
86
82
this . pingTimeoutTimer = null ;
87
83
this . pingIntervalTimer = null ;
88
84
@@ -265,21 +261,23 @@ export class Socket extends EventEmitter {
265
261
this . upgrading = true ;
266
262
267
263
// set transport upgrade timer
268
- this . upgradeTimeoutTimer = setTimeout ( ( ) => {
264
+ const upgradeTimeoutTimer = setTimeout ( ( ) => {
269
265
debug ( "client did not complete upgrade - closing transport" ) ;
270
266
cleanup ( ) ;
271
267
if ( "open" === transport . readyState ) {
272
268
transport . close ( ) ;
273
269
}
274
270
} , this . server . opts . upgradeTimeout ) ;
275
271
272
+ let checkIntervalTimer ;
273
+
276
274
const onPacket = ( packet ) => {
277
275
if ( "ping" === packet . type && "probe" === packet . data ) {
278
276
debug ( "got probe ping packet, sending pong" ) ;
279
277
transport . send ( [ { type : "pong" , data : "probe" } ] ) ;
280
278
this . emit ( "upgrading" , transport ) ;
281
- clearInterval ( this . checkIntervalTimer ) ;
282
- this . checkIntervalTimer = setInterval ( check , 100 ) ;
279
+ clearInterval ( checkIntervalTimer ) ;
280
+ checkIntervalTimer = setInterval ( check , 100 ) ;
283
281
} else if ( "upgrade" === packet . type && this . readyState !== "closed" ) {
284
282
debug ( "got upgrade packet - upgrading" ) ;
285
283
cleanup ( ) ;
@@ -311,11 +309,8 @@ export class Socket extends EventEmitter {
311
309
const cleanup = ( ) => {
312
310
this . upgrading = false ;
313
311
314
- clearInterval ( this . checkIntervalTimer ) ;
315
- this . checkIntervalTimer = null ;
316
-
317
- clearTimeout ( this . upgradeTimeoutTimer ) ;
318
- this . upgradeTimeoutTimer = null ;
312
+ clearInterval ( checkIntervalTimer ) ;
313
+ clearTimeout ( upgradeTimeoutTimer ) ;
319
314
320
315
transport . removeListener ( "packet" , onPacket ) ;
321
316
transport . removeListener ( "close" , onTransportClose ) ;
@@ -384,9 +379,6 @@ export class Socket extends EventEmitter {
384
379
clearTimeout ( this . pingIntervalTimer ) ;
385
380
clearTimeout ( this . pingTimeoutTimer ) ;
386
381
387
- clearInterval ( this . checkIntervalTimer ) ;
388
- this . checkIntervalTimer = null ;
389
- clearTimeout ( this . upgradeTimeoutTimer ) ;
390
382
// clean writeBuffer in next tick, so developers can still
391
383
// grab the writeBuffer on 'close' event
392
384
process . nextTick ( ( ) => {
0 commit comments