0.65.0

- More aggressive closing of connection by transport.

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.64.1'
+    version '0.65.0'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -57,5 +57,5 @@ allprojects {
 }
 
 wrapper {
-    gradleVersion = '5.4.1'
+    gradleVersion = '5.5.1'
 }

dslink-v2-api/src/main/java/org/iot/dsa/node/DSNode.java

@@ -694,6 +694,13 @@ public ActionResult invoke(DSInfo action, DSInfo target, ActionInvocation reques
         return action.getAction().invoke(target, request);
     }
 
+    /**
+     * True if this is the default instance for the type.
+     */
+    public final boolean isDefaultInstance() {
+        return defaultInstance == defaultDefaultInstance;
+    }
+
     /**
      * Returns false.
      */
@@ -1200,9 +1207,9 @@ protected DSInfo declareDefault(String name, DSIObject value, String description
     }
 
     /**
-     * The is only called once for each class.  It's purpose is to define the default children of
-     * the node subtype.  Use the declareDefault method to add non-removable children that all
-     * runtime instances should have.  Be sure to call super.declareDefaults().
+     * This only called once for each class.  It's purpose is to define the default children of
+     * the node subtype.  Use the declareDefault method to add permanent children that all
+     * runtime instances will have.  Be sure to call super.declareDefaults().
      *
      * @see #declareDefault(String, DSIObject) To create non-removable children.
      */
@@ -1247,13 +1254,6 @@ protected String getLogName() {
         return "dsa";
     }
 
-    /**
-     * True if this is the default instance for the type.
-     */
-    protected final boolean isDefaultInstance() {
-        return defaultInstance == defaultDefaultInstance;
-    }
-
     /**
      * Convenience for instanceof DSNode.
      */

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

@@ -13,6 +13,7 @@
 import javax.websocket.OnOpen;
 import javax.websocket.RemoteEndpoint;
 import javax.websocket.Session;
+import org.iot.dsa.dslink.DSLinkConnection;
 
 /**
  * Abstract websocket transport.
@@ -52,7 +53,15 @@ public void close() {
         } catch (IOException x) {
             debug(null, x);
         }
-        getConnection().getSession().recvMessage(true);
+        synchronized (this) {
+            notifyAll();
+            if (available() > 0) {
+                DSLinkConnection conn = getConnection();
+                if (conn != null) {
+                    conn.getSession().recvMessage(true);
+                }
+            }
+        }
     }
 
     @Override
@@ -67,13 +76,15 @@ public void endRecvMessage() {
     public void onClose(CloseReason reason) {
         if (isOpen()) {
             debug("Remotely closed: " + reason.toString());
+            getConnection().connDown(reason.toString());
             close();
         }
     }
 
     @OnError
     public void onError(Throwable err) {
         if (isOpen()) {
+            getConnection().connDown(err.toString());
             close(err);
         }
     }
@@ -190,6 +201,13 @@ protected EndpointConfig getConfig() {
         return config;
     }
 
+    /**
+     * The session passed to onOpen.
+     */
+    protected Session getSession() {
+        return session;
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // Private Methods
     ///////////////////////////////////////////////////////////////////////////