0.24.0

Fix U16 and U32 handling in MsgPack
Add DSAbstractAction to simplify anonymous actions.
Support secure broker connections in v1.

Author: a-hansen

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group 'org.iot.dsa'
-version '0.23.0'
+version '0.24.0'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6

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

@@ -392,6 +392,39 @@ public DSByteBuffer putShort(short v, boolean bigEndian) {
         return put((byte) ((v >>> 0) & 0xFF), (byte) ((v >>> 8) & 0xFF));
     }
 
+    /**
+     * Encodes the primitive into buffer.
+     *
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer putU16(int v, boolean bigEndian) {
+        if (bigEndian) {
+            return put((byte) ((v >>> 8) & 0xFF),
+                       (byte) ((v >>> 0) & 0xFF));
+        }
+        return put((byte) ((v >>> 0) & 0xFF),
+                   (byte) ((v >>> 8) & 0xFF));
+    }
+
+    /**
+     * Encodes the primitive into the buffer.
+     *
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer putU32(long v, boolean bigEndian) {
+        if (bigEndian) {
+            return put((byte) (v >>> 24),
+                       (byte) (v >>> 16),
+                       (byte) (v >>> 8),
+                       (byte) (v >>> 0));
+        }
+        return put((byte) (v >>> 0),
+                   (byte) (v >>> 8),
+                   (byte) (v >>> 16),
+                   (byte) (v >>> 24));
+    }
     /**
      * Returns the next byte in the buffer, or -1 when nothing is available.
      */

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackReader.java

@@ -286,11 +286,13 @@ private Token readNumber(byte b) throws IOException {
             case UINT8:
                 return setNextValue((short) in.read() & 0xFF);
             case INT16:
-            case UINT16:
                 return setNextValue(DSBytes.readShort(in, true));
+            case UINT16:
+                return setNextValue(DSBytes.readU16(in, true));
             case INT32:
-            case UINT32:
                 return setNextValue(DSBytes.readInt(in, true));
+            case UINT32:
+                return setNextValue(DSBytes.readU32(in, true));
             default: //INT64
                 return setNextValue(DSBytes.readLong(in, true));
         }

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackWriter.java

@@ -199,14 +199,14 @@ protected void write(long arg) throws IOException {
                     byteBuffer.put((byte) arg);
                 } else {
                     byteBuffer.put(UINT16);
-                    byteBuffer.putShort((short) arg);
+                    byteBuffer.putU16((int) arg, true);
                 }
             } else {
                 if (arg < (1L << 32)) {
                     byteBuffer.put(UINT32);
-                    byteBuffer.putInt((int) arg);
+                    byteBuffer.putU32((int) arg, true);
                 } else {
-                    byteBuffer.put(UINT64);
+                    byteBuffer.put(INT64);
                     byteBuffer.putLong(arg);
                 }
             }

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.security.MessageDigest;
 import org.iot.dsa.dslink.DSLink;
@@ -136,7 +137,11 @@ String makeWsUrl(String wsPath) {
         StringBuilder buf = new StringBuilder();
         try {
             URL url = new URL(brokerUri);
-            buf.append("ws://");
+            if (brokerUri.toLowerCase().startsWith("https:")) {
+                buf.append("wss://");
+            } else {
+                buf.append("ws://");
+            }
             buf.append(url.getHost());
             if (url.getPort() >= 0) {
                 buf.append(':').append(url.getPort());

dslink-core/src/main/java/org/iot/dsa/node/DSBytes.java

@@ -308,6 +308,88 @@ public static short readShort(InputStream in, boolean bigEndian) {
         return ret;
     }
 
+    /**
+     * Reads the primitive from a byte array.
+     *
+     * @param buf       Must be at least off + 2 in length.
+     * @param off       The offset into the buffer to start reading.
+     * @param bigEndian Whether to decode in big or little endian byte ordering.
+     */
+    public static int readU16(byte[] buf, int off, boolean bigEndian) {
+        if (bigEndian) {
+            return (((buf[off] & 0xFF) << 8) |
+                    ((buf[++off] & 0xFF) << 0));
+        }
+        return (((buf[off] & 0xFF) << 0) |
+                ((buf[++off] & 0xFF) << 8));
+    }
+
+    /**
+     * Reads the primitive from a stream.
+     *
+     * @param in        Must have at least 2 bytes to read.
+     * @param bigEndian Whether to decode in big or little endian byte ordering.
+     */
+    public static int readU16(InputStream in, boolean bigEndian) {
+        int ret = 0;
+        try {
+            if (bigEndian) {
+                return (((in.read() & 0xFF) << 8) |
+                        ((in.read() & 0xFF) << 0));
+            }
+            ret = (((in.read() & 0xFF) << 0) |
+                    ((in.read() & 0xFF) << 8));
+        } catch (IOException x) {
+            DSException.throwRuntime(x);
+        }
+        return ret;
+    }
+
+    /**
+     * Reads the primitive from a byte array.
+     *
+     * @param buf       Must be at least off + 4 in length.
+     * @param off       The offset into the buffer to start reading.
+     * @param bigEndian Whether to decode in big or little endian byte ordering.
+     */
+    public static long readU32(byte[] buf, int off, boolean bigEndian) {
+        if (bigEndian) {
+            return (((long) (buf[++off] & 0xFF) << 24) |
+                    ((buf[++off] & 0xFF) << 16) |
+                    ((buf[++off] & 0xFF) << 8) |
+                    ((buf[++off] & 0xFF) << 0));
+        }
+        return (((buf[off] & 0xFF) << 0) |
+                ((buf[++off] & 0xFF) << 8) |
+                ((buf[++off] & 0xFF) << 16) |
+                ((long) (buf[++off] & 0xFF) << 24));
+    }
+
+    /**
+     * Reads the primitive from a stream.
+     *
+     * @param in        Must have 8 bytes to read.
+     * @param bigEndian Whether to decode in big or little endian byte ordering.
+     */
+    public static long readU32(InputStream in, boolean bigEndian) {
+        long ret = 0;
+        try {
+            if (bigEndian) {
+                return (((long) (in.read() & 0xFF) << 24) |
+                        ((in.read() & 0xFF) << 16) |
+                        ((in.read() & 0xFF) << 8) |
+                        ((in.read() & 0xFF) << 0));
+            }
+            ret = (((in.read() & 0xFF) << 0) |
+                    ((in.read() & 0xFF) << 8) |
+                    ((in.read() & 0xFF) << 16) |
+                    ((long) (in.read() & 0xFF) << 24));
+        } catch (IOException x) {
+            DSException.throwRuntime(x);
+        }
+        return ret;
+    }
+
     @Override
     public byte[] toBytes() {
         return value;