New DSTransport

Author: Aaron

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.53.0'
+    version '0.53.1a2'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/io/DSByteBuffer.java

@@ -83,7 +83,6 @@ public void print(PrintStream out, int cols) {
     }
 
     /**
-     * /**
      * Gets the bytes from the given buffer, which will be flipped, then cleared.
      */
     public DSByteBuffer put(ByteBuffer buf) {
@@ -412,9 +411,7 @@ public DSByteBuffer putU32(long v, boolean bigEndian) {
                    (byte) (v >>> 24));
     }
 
-    /**
-     * Returns the next byte in the buffer, or -1 when nothing is available.
-     */
+    @Override
     public int read() {
         if (length == 0) {
             return -1;
@@ -425,6 +422,11 @@ public int read() {
         return ret;
     }
 
+    @Override
+    public int read(byte[] buf, int off, int len) {
+        return sendTo(buf, off, len);
+    }
+
     /**
      * Overwrites byte in the internal buffer.
      *

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTransport.java

@@ -289,11 +289,12 @@ public void write(byte[] buf, int off, int len, boolean isLast) {
                 traceOut = new StringBuilder();
                 traceOut.append("Send:\n");
             }
+            int idx = off;
             for (int i = 0; i < len; i++) {
                 if (traceOutCols > 0) {
                     traceOut.append(' ');
                 }
-                DSBytes.toHex(buf[i], traceIn);
+                DSBytes.toHex(buf[idx++], traceOut);
                 if (++traceOutCols == HEX_COLS) {
                     traceOutCols = 0;
                     traceOut.append('\n');

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTransportWs.java

@@ -3,21 +3,16 @@
 import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
 import com.acuity.iot.dsa.dslink.io.DSCharBuffer;
 import com.acuity.iot.dsa.dslink.io.DSIoException;
-import com.acuity.iot.dsa.dslink.sys.cert.SysCertService;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.net.URI;
 import java.nio.ByteBuffer;
 import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
 import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.RemoteEndpoint;
 import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import org.iot.dsa.util.DSException;
 
 /**
  * Abstract websocket transport.
@@ -163,7 +158,7 @@ protected void doWrite(byte[] buf, int off, int len, boolean isLast) {
             byteBuffer.put(buf, off, len);
         }
         try {
-            if (isLast) {
+            if (isLast && (byteBuffer.position() > 0)) {
                 byteBuffer.flip();
                 basicRemote.sendBinary(byteBuffer, isLast);
                 byteBuffer.clear();