Fix ability to read UTF-8 from combined buffer

Author: jakewins

lib/graph-types.js

@@ -34,7 +34,7 @@ class Node {
   }
 
   toString() {
-    let s = "(" + this.identity.split('/')[1];
+    let s = "(" + this.identity;
     for (let i = 0; i < this.labels.length; i++) {
       s += ":" + this.labels[i];
     }

lib/internal/ch-websocket.js

@@ -50,7 +50,8 @@ class WebSocketChannel {
     };
     this._ws.onmessage = (event) => {
       if( self.onmessage ) {
-        self.onmessage( new HeapBuffer( event.data ) );
+        var b = new HeapBuffer( event.data );
+        self.onmessage( b );
       } 
     };
   }
@@ -67,7 +68,7 @@ class WebSocketChannel {
     } else if( buffer instanceof HeapBuffer ) {
       this._ws.send( buffer._buffer );
     } else {
-      throw new Exception( "Don't know how to send buffer: " + buffer );
+      throw new Error( "Don't know how to send buffer: " + buffer );
     }
   }
 

lib/internal/connector.js

@@ -21,8 +21,9 @@ import WebSocketChannel from "./ch-websocket";
 import NodeChannel from "./ch-node";
 import chunking from "./chunking";
 import packstream from "./packstream";
-import {alloc} from "./buf";
+import {alloc, CombinedBuffer} from "./buf";
 import GraphType from '../graph-types';
+import {int, isInt} from '../integer';
 
 let Channel;
 if( WebSocketChannel.available ) {

lib/internal/utf8.js

@@ -72,17 +72,15 @@ try {
       if( buffer instanceof buf.HeapBuffer ) {
         return decoder.decode( buffer.readView( length ) );
       }
-      else if( buffer instanceof buf.CombinedBuffer ) {
-        let out = streamDecodeCombinedBuffer(buffer._buffers, length,
-          (partBuffer) => {
-            return decoder.decode(partBuffer.readView(partBuffer.length), {stream:true});
-          },
-          () => { return decoder.decode(); }
-        );
-        return out;
-      } 
       else {
-        throw new Error( "Don't know how to decode strings from `" + buffer + "`.");
+        // Decoding combined buffer is complicated. For simplicity, for now, 
+        // we simply copy the combined buffer into a regular buffer and decode that.
+        var tmpBuf = buf.alloc( length );
+        for (var i = 0; i < length; i++) {
+          tmpBuf.writeUInt8( buffer.readUInt8() );
+        };
+        tmpBuf.reset();
+        return decoder.decode( tmpBuf.readView( length ) );
       }
     }
   }