Add web socket protocol processor test

runtime/bin/websocket_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 _WebSocketMessageType {
   static final int NONE = 0;
   static final int BINARY = 1;
   static final int TEXT = 2;
   static final int CLOSE = 3;
 }
@@ skipping 45 matching lines @@
     _currentMessageType = _WebSocketMessageType.NONE;
   }
 
   /**
    * Process data received from the underlying communication channel.
    */
   void update(List<int> buffer, int offset, int count) {
     int index = offset;
     int lastIndex = offset + count;
     try {
-      if (_state == _State.CLOSED) {
+      if (_state == CLOSED) {
         throw new WebSocketException("Data on closed connection");
       }
-      if (_state == _State.FAILURE) {
+      if (_state == FAILURE) {
         throw new WebSocketException("Data on failed connection");
       }
       while ((index < lastIndex) && _state != CLOSED && _state != FAILURE) {
         int byte = buffer[index];
         switch (_state) {
           case START:
             _fin = (byte & 0x80) != 0;
             _opcode = (byte & 0xF);
             switch (_opcode) {
             case _WebSocketOpcode.CONTINUATION:
@@ skipping 43 matching lines @@
             }
             _state = LEN_FIRST;
             break;
 
           case LEN_FIRST:
             _masked = (byte & 0x80) != 0;
             _len = byte & 0x7F;
             if (_len < 126) {
               _lengthDone();
             } else if (_len == 126) {
-              _ len = 0;
+              _len = 0;
               _remainingLenBytes = 2;
+              _state = LEN_REST;
             } else if (_len == 127) {
-              _ len = 0;
+              _len = 0;
               _remainingLenBytes = 8;
+              _state = LEN_REST;
             }
             break;
 
           case LEN_REST:
             _len = _len << 8 | byte;
             _remainingLenBytes--;
             if (_remainingLenBytes == 0) {
               _lengthDone();
             }
             break;
 
           case MASK:
             _maskingKey = _maskingKey << 8 | byte;
             _remainingMaskingKeyBytes--;
             if (_remainingMaskingKeyBytes == 0) {
               _maskDone();
             }
             break;
 
           case PAYLOAD:
             // The payload is not handled one byte at the time but in blocks.
             int payload;
-            if (lastIndex - index >= _remainingPayloadBytes) {
+            if (lastIndex - index <= _remainingPayloadBytes) {
               payload = lastIndex - index;
             } else {
               payload = _remainingPayloadBytes;
             }
             // Unmask payload if masked.
             if (_masked) {
               for (int i = 0; i < payload; i++) {
                 int maskingByte =
                     ((_maskingKey >> ((3 - _unmaskingIndex) * 8)) & 0xFF);
                 buffer[index + i] = buffer[index + i] ^ maskingByte;
                 _unmaskingIndex = (_unmaskingIndex + 1) % 4;
               }
             }
 
             switch (_currentMessageType) {
               case _WebSocketMessageType.NONE:
                 throw new WebSocketException("Protocol error");
                 break;
 
               case _WebSocketMessageType.TEXT:
               case _WebSocketMessageType.BINARY:
                 if (onMessageData != null) {
                   onMessageData(buffer, index, payload);
                 }
                 _remainingPayloadBytes -= payload;
                 index += payload;
-                if (_fin) {
-                  _messageEnd();
+                if (_remainingPayloadBytes == 0) {
+                  _frameEnd();
                 }
                 break;
 
               case _WebSocketMessageType.CLOSE:
                 // Allocate a buffer for holding the close payload if any.
                 if (_closePayload == null) {
                   _closePayload = new List<int>();
                 }
                 _closePayload.addAll(buffer.getRange(index, payload));
                 _remainingPayloadBytes -= payload;
@@ skipping 61 matching lines @@
       _startPayload();
     }
   }
 
   void _maskDone() {
     _remainingPayloadBytes = _len;
     _startPayload();
   }
 
   void _startPayload() {
-      // Check whether there is any payload. If not indicate empty message or
+    // Check whether there is any payload. If not indicate empty message or

[Mads Ager (google), 2012/04/25 10:47:46]

Finish comment. :)

[Søren Gjesse, 2012/04/27 11:58:24]

Done.

     if (_remainingPayloadBytes == 0) {
       if (_currentMessageType ==_WebSocketMessageType.CLOSE) {
         if (onClosed != null) onClosed(null, null);
       } else {
-        _messageEnd();
+        _frameEnd();
       }
     } else {
       _state = PAYLOAD;
     }
   }
 
-  void _messageEnd() {
+  void _frameEnd() {
     if (_remainingPayloadBytes != 0) {
       throw new WebSocketException("Protocol error");
     }
-    if (onMessageEnd != null) onMessageEnd();
-    _currentMessageType = _WebSocketMessageType.NONE;
+    if (_fin) {
+      if (onMessageEnd != null) onMessageEnd();
+      _currentMessageType = _WebSocketMessageType.NONE;
+    }
     _reset();
   }
 
   void _reset() {
     _state = START;
     _fin = null;
     _opcode = null;
     _len = null;
     _masked = null;
     _maskingKey = 0;
     _remainingLenBytes = null;
     _remainingMaskingKeyBytes = null;
     _remainingPayloadBytes = null;
     _unmaskingIndex = 0;
   }
 
   void _reportError(e) {
     // Report the error through the error callback if any. Otherwise
     // throw the error.
     if (onError != null) {
       onError(e);
-      _state = _State.FAILURE;
+      _state = FAILURE;
     } else {
       throw e;
     }
   }
 
   int _state;
   bool _fin;
   int _opcode;
   int _len;
   bool _masked;
@@ skipping 262 matching lines @@
     }
     String key = request.headers.value("Sec-WebSocket-Key");
     if (key == null) {
       return false;
     }
     return true;
   }
 
   Function _onConnection;
 }