···

       
404
       
404
       
 
       
        // Make sure, even if there is no signal in the options, that the

     

       
405
       
405
       
 
       
        // request will be cancelled after at most 30 seconds.

     

       
406
       
406
       
 
       
        final timeoutToken = CancellationToken();

     

       
407
       
407
       
-
       
        Timer(Duration(seconds: 30), () => timeoutToken.cancel());

     

       
407
       
407
       
+
       
        final timeoutTimer = Timer(Duration(seconds: 30), () => timeoutToken.cancel());

     

       
408
       
408
       
 
       


     

       
409
       
409
       
 
       
        final combinedSignal =

     

       
410
       
410
       
 
       
            options?.signal != null

     
···

       
421
       
421
       
 
       
            ),

     

       
422
       
422
       
 
       
          );

     

       
423
       
423
       
 
       
        } finally {

     

       
424
       
424
       
+
       
          timeoutTimer.cancel(); // Cancel timer before disposing token

     

       
424
       
425
       
 
       
          combinedSignal.dispose();

     

       
425
       
426
       
 
       
          timeoutToken.dispose();

     

       
426
       
427
       
 
       
        }

     

···

       
166
       
166
       
 
       


     

       
167
       
167
       
 
       
    _isCancelled = true;

     

       
168
       
168
       
 
       
    _reason = reason ?? Exception('Operation was cancelled');

     

       
169
       
169
       
-
       
    _controller.add(null);

     

       
169
       
169
       
+
       


     

       
170
       
170
       
+
       
    // Only add to stream if not already closed

     

       
171
       
171
       
+
       
    if (!_controller.isClosed) {

     

       
172
       
172
       
+
       
      _controller.add(null);

     

       
173
       
173
       
+
       
    }

     

       
170
       
174
       
 
       
  }

     

       
171
       
175
       
 
       


     

       
172
       
176
       
 
       
  /// Throw an exception if the operation has been cancelled.