Add error handling to socket streams

runtime/bin/socket_stream_impl.dart

 // Copyright (c) 2012, 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.
 
+
 class _SocketInputStream implements SocketInputStream {
   _SocketInputStream(Socket socket) : _socket = socket {
     if (_socket._id == -1) _closed = true;
     _socket.onClosed = _onClosed;
   }
 
   List<int> read([int len]) {
     int bytesToRead = available();
     if (bytesToRead == 0) return null;
     if (len !== null) {
@@ skipping 44 matching lines @@
 
   void set onData(void callback()) {
     _socket._onData = callback;
   }
 
   void set onClosed(void callback()) {
     _clientCloseHandler = callback;
     _socket._onClosed = _onClosed;
   }
 
-  void set onError(void callback()) {
-    _socket.onError = callback;
-  }
-
   void _onClosed() {
     _closed = true;
     if (_clientCloseHandler !== null) {
       _clientCloseHandler();
     }
   }
 
+  void set onError(void callback(Exception e)) {
+    _errorCallback = callback;
+  }
+
+  void _onError(Exception e) {
+    close();
+    if (_errorCallback != null) _errorCallback(e);
+  }
+
   Socket _socket;
+  bool _closed = false;
   Function _clientCloseHandler;
-  bool _closed = false;
+  Function _errorCallback;
 }
 
 
 class _SocketOutputStream
     extends _BaseOutputStream implements SocketOutputStream {
   _SocketOutputStream(Socket socket)
       : _socket = socket, _pendingWrites = new _BufferList();
 
   bool write(List<int> buffer, [bool copyBuffer = true]) {
     return _write(buffer, 0, buffer.length, copyBuffer);
@@ skipping 23 matching lines @@
     _closed = true;
   }
 
   void set onNoPendingWrites(void callback()) {
     _onNoPendingWrites = callback;
     if (_onNoPendingWrites != null) {
       _socket._onWrite = _onWrite;
     }
   }
 
-  void set onError(void callback()) {
-    _streamErrorHandler = callback;
-    if (_streamErrorHandler != null) {
-      _socket.onError = _onError;
-    } else {
-      _socket.onError = null;
-    }
-  }
-
   bool _write(List<int> buffer, int offset, int len, bool copyBuffer) {
     if (_closing || _closed) throw new StreamException("Stream closed");
     int bytesWritten = 0;
     if (_pendingWrites.isEmpty()) {
       // If nothing is buffered write as much as possible and buffer
       // the rest.
       bytesWritten = _socket.writeList(buffer, offset, len);
       if (bytesWritten == len) return true;
     }
 
@@ skipping 28 matching lines @@
     // All buffered data was written.
     if (_closing) {
       _socket._closeWrite();
       _closed = true;
     } else {
       if (_onNoPendingWrites != null) _onNoPendingWrites();
     }
     if (_onNoPendingWrites == null) _socket._onWrite = null;
   }
 
-  void _onError() {
+  void set onError(void callback(Exception e)) {
+    _errorCallback = callback;
+  }
+
+  void _onError(Exception e) {
     close();
-    if (_streamErrorHandler != null) _streamErrorHandler();
+    if (_errorCallback != null) _errorCallback(e);
   }
 
   Socket _socket;
   _BufferList _pendingWrites;
   var _onNoPendingWrites;
-  var _streamErrorHandler;
+  Function _clientCloseHandler;

[Mads Ager (google), 2012/03/21 13:18:20]

Where is the _clientCloseHandler used? It doesn't appear to be used in this
code. If it is used in a super class, we should make it a member there? Or maybe
it isn't used?

[Søren Gjesse, 2012/03/21 14:39:46]

Thanks for spotting this copy/paste error. Removed.

+  Function _errorCallback;
   bool _closing = false;
   bool _closed = false;
 }