Make StreamSubscription be the active part of a stream.

runtime/bin/socket_patch.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 patch class RawServerSocket  {
   /* patch */ static Future<RawServerSocket> bind(address,
                                                   int port,
                                                   {int backlog: 0,
                                                    bool v6Only: false}) {
     return _RawServerSocket.bind(address, port, backlog, v6Only);
@@ skipping 791 matching lines @@
   List<int> buffer;
   bool paused = false;
   Completer streamCompleter;
 
   _SocketStreamConsumer(this.socket);
 
   Future<Socket> addStream(Stream<List<int>> stream) {
     socket._ensureRawSocketSubscription();
     streamCompleter = new Completer<Socket>();
     if (socket._raw != null) {
+      assert(!!!paused);

[Anders Johnsen, 2013/05/22 13:07:08]

!!!?

[Lasse Reichstein Nielsen, 2013/05/24 06:02:49]

!!!!!
Deliberately made stupid to mark it as debug code :)

       subscription = stream.listen(
           (data) {
             assert(!paused);
             assert(buffer == null);
             buffer = data;
             offset = 0;
             write();
           },
           onError: (error) {
             socket._consumerDone();
@@ skipping 13 matching lines @@
   }
 
   void write() {
     try {
       if (subscription == null) return;
       assert(buffer != null);
       // Write as much as possible.
       offset += socket._write(buffer, offset, buffer.length - offset);
       if (offset < buffer.length) {
         if (!paused) {
-          paused = true;
           // TODO(ajohnsen): It would be nice to avoid this check.
           // Some info: socket._write can emit an event, if it fails to write.
           // If the user closes the socket in that event, stop() will be called
           // before we get a change to pause.
           if (subscription == null) return;

[Anders Johnsen, 2013/05/22 13:07:08]

This line (and the comment) can be removed now, due to async future completion.

[Lasse Reichstein Nielsen, 2013/05/24 06:02:49]

YEY

+          paused = true;

[Anders Johnsen, 2013/05/22 13:07:08]

Can you try without these pause?

[Lasse Reichstein Nielsen, 2013/05/24 06:02:49]

I'll try.

           subscription.pause();
         }
         socket._enableWriteEvent();
       } else {
         buffer = null;
         if (paused) {
           paused = false;
           subscription.resume();
         }
       }
@@ skipping 12 matching lines @@
         streamCompleter.complete(socket);
       }
       streamCompleter = null;
     }
   }
 
   void stop() {
     if (subscription == null) return;
     subscription.cancel();
     subscription = null;
+    paused = false;
     socket._disableWriteEvent();
   }
 }
 
 
 class _Socket extends Stream<List<int>> implements Socket {
   RawSocket _raw;  // Set to null when the raw socket is closed.
   bool _closed = false;  // Set to true when the raw socket is closed.
   StreamController _controller;
   bool _controllerClosed = false;
@@ skipping 201 matching lines @@
     _raw.onBadCertificate = callback;
   }
 
   X509Certificate get peerCertificate {
     if (_raw == null) {
      throw new StateError("peerCertificate called on destroyed SecureSocket");
     }
     return _raw.peerCertificate;
   }
 }