0.54.0

- DSTransport refactor (more to come).
- Simple requester implementation refactor.
- Fix v2/msgpack issues.
- Additional unit tests.

Author: a-hansen

build.gradle

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

dslink-v2-poc/src/main/java/org/iot/dsa/dslink/poc/MainNode.java

@@ -293,45 +293,6 @@ public enum MyEnum {
     // Inner Classes
     ///////////////////////////////////////////////////////////////////////////
 
-    private class ListHandler implements OutboundListHandler {
-
-        OutboundStream stream;
-
-        @Override
-        public void onClose() {
-            System.out.println("list closed");
-        }
-
-        @Override
-        public void onError(ErrorType type, String msg) {
-            System.out.println("list error " + type + ", " + msg);
-        }
-
-        @Override
-        public void onInit(String path, OutboundStream stream) {
-            System.out.println("onInit");
-            this.stream = stream;
-        }
-
-        @Override
-        public void onInitialized() {
-            System.out.println("list initialized");
-            stream.closeStream();
-        }
-
-        @Override
-        public void onRemove(String name) {
-            System.out.println("list remove " + name);
-        }
-
-        @Override
-        public void onUpdate(String name, DSElement value) {
-            System.out.print(name);
-            System.out.print(": ");
-            System.out.println(String.valueOf(value));
-        }
-    }
-
     public static class TestNode extends DSNode {
 
         public void declareDefaults() {

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/protocol/requester/DSOutboundSubscriptions.java

@@ -13,6 +13,7 @@
 import org.iot.dsa.io.DSIWriter;
 import org.iot.dsa.logging.DSLogger;
 import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSLong;
 import org.iot.dsa.node.DSNull;
 import org.iot.dsa.node.DSStatus;
 import org.iot.dsa.time.DSDateTime;
@@ -273,7 +274,7 @@ OutboundSubscribeHandler subscribe(String path, int qos, OutboundSubscribeHandle
             }
         }
         try {
-            req.onInit(path, sub.getQos(), stub);
+            req.onInit(path, DSLong.valueOf(sub.getQos()), stub);
         } catch (Exception x) {
             error(path, x);
         }

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSRequester.java

@@ -14,6 +14,8 @@
 import org.iot.dsa.dslink.requester.OutboundRequestHandler;
 import org.iot.dsa.dslink.requester.OutboundSubscribeHandler;
 import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSInt;
+import org.iot.dsa.node.DSLong;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 
@@ -69,7 +71,7 @@ public OutboundInvokeHandler invoke(String path, DSMap params, OutboundInvokeHan
     public OutboundListHandler list(String path, OutboundListHandler req) {
         DSOutboundListStub stub = makeList(path, req);
         requests.put(stub.getRequestId(), stub);
-        req.onInit(path, stub);
+        req.onInit(path, null, stub);
         session.enqueueOutgoingRequest(stub);
         return req;
     }

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundListStub.java

@@ -33,36 +33,37 @@ public class DS2OutboundListStub extends DSOutboundListStub
     @Override
     public void handleResponse(DS2MessageReader response) {
         OutboundListHandler handler = getHandler();
-        if (state == STS_INITIALIZING) {
-            Byte status = (Byte) response.getHeader(MessageConstants.HDR_STATUS);
-            if (status.byteValue() == STS_OK) {
-                state = STS_OK;
-                getHandler().onInitialized();
-            }
-        }
         try {
             MsgpackReader reader = response.getBodyReader();
             InputStream in = response.getBody();
             int bodyLen = response.getBodyLength();
             String name;
-            DSElement value;
+            DSElement value = null;
             while (bodyLen > 0) {
                 int len = DSBytes.readShort(in, false);
+                bodyLen -= len;
                 name = reader.readUTF(len);
                 len = DSBytes.readShort(in, false);
+                bodyLen -= len;
+                bodyLen -= 4; //the two lengths
                 if (len == 0) {
                     handler.onRemove(name);
                 } else {
-                    bodyLen -= len;
                     reader.reset();
                     value = reader.getElement();
-                    bodyLen -= len;
                     handler.onUpdate(DSPath.decodeName(name), value);
                 }
             }
         } catch (IOException x) {
             DSException.throwRuntime(x);
         }
+        if (state == STS_INITIALIZING) {
+            Byte status = (Byte) response.getHeader(MessageConstants.HDR_STATUS);
+            if (status.byteValue() == STS_OK) {
+                state = STS_OK;
+                getHandler().onInitialized();
+            }
+        }
     }
 
     @Override

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();

dslink-v2/src/main/java/org/iot/dsa/dslink/requester/AbstractInvokeHandler.java

@@ -7,53 +7,17 @@
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-public abstract class AbstractInvokeHandler implements OutboundInvokeHandler {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private DSMap params;
-    private String path;
-    private OutboundStream stream;
+public abstract class AbstractInvokeHandler
+        extends AbstractRequestHandler
+        implements OutboundInvokeHandler {
 
     ///////////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////////
 
-    /**
-     * Returns the value passed to onInit.
-     */
-    public DSMap getParams() {
-        return params;
-    }
-
-    /**
-     * Returns the value passed to onInit.
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Returns the value passed to onInit.
-     */
-    public OutboundStream getStream() {
-        return stream;
-    }
-
-    /**
-     * Sets the fields so they can be access via the corresponding getters.
-     * <p>
-     * <p>
-     * <p>
-     * {@inheritDoc}
-     */
     @Override
-    public void onInit(String path, DSMap params, OutboundStream stream) {
-        this.path = path;
-        this.params = params;
-        this.stream = stream;
+    public DSMap getParams() {
+        return (DSMap) super.getParams();
     }
 
 }

dslink-v2/src/main/java/org/iot/dsa/dslink/requester/AbstractListHandler.java

@@ -5,49 +5,12 @@
  * <p>
  * onUpdate will be called until the initial state is fully loaded.  After which onInitialized will
  * be called.  After that, onUpdate and onRemove will be called for state changes.
- * <p>
- * Configs, or node metadata names start with $.  Attributes start with @.  Anything else represents
- * a child.  Child maps will only contain configs/node metadata.
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-public abstract class AbstractListHandler implements OutboundListHandler {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private String path;
-    private OutboundStream stream;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the value passed to onInit.
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Returns the value passed to onInit.
-     */
-    public OutboundStream getStream() {
-        return stream;
-    }
-
-    /**
-     * Sets the fields so they can be accessed with the corresponding getters.
-     * <p>
-     * {@inheritDoc}
-     */
-    @Override
-    public void onInit(String path, OutboundStream stream) {
-        this.path = path;
-        this.stream = stream;
-    }
+public abstract class AbstractListHandler
+        extends AbstractRequestHandler
+        implements OutboundListHandler {
 
 }