0.4.0

- Remove haystack nodes when editing server. - Add Connecting status
IOT-DSA · Dec 17, 2020 · e06a78b · e06a78b
2 parents 6d119b7 + d91363e
commit e06a78b
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 .DS_Store
 .key
 nodes.json
-nodes.json.bak
+*.bak
 
 # Gradle
 .gradle

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'java-library'
 mainClassName = 'org.dsa.iot.haystack.Main'
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
-version = '0.3.0'
+version = '0.4.0'
 
 repositories {
     mavenLocal()

diff --git a/dslink.json b/dslink.json
@@ -1,6 +1,6 @@
 {
   "name": "dslink-java-haystack",
-  "version": "0.2.13",
+  "version": "0.4.0",
   "description": "An implementation dslink of a haystack protocol consumer",
   "license": "Apache",
   "author": {

diff --git a/src/main/java/org/dsa/iot/haystack/Haystack.java b/src/main/java/org/dsa/iot/haystack/Haystack.java
@@ -84,6 +84,7 @@ public Haystack(final Node node) {
         this.subs = new ConcurrentHashMap<>();
         this.navHelper = new NavHelper(this);
         Utils.getStatusNode(node);
+        Utils.initCommon(this, node);
         this.conn = new ConnectionHelper(this, new Handler<Void>() {
             @Override
             public void handle(Void event) {
@@ -143,21 +144,29 @@ public void editConnection(String url,
                                int readTimeout,
                                boolean enabled) {
         LOGGER.info("Edit Server url={} user={} enabled={}", url, user, enabled);
-        if (!enabled) {
-            stop();
-            Utils.getStatusNode(node).setValue(new Value("Disabled"));
-            List<String> list = new ArrayList<>(node.getChildren().keySet());
-            for (String name : list) {
-                Node tmp = node.getChild(name, false);
-                if (tmp.getAction() != null) {
-                    continue;
-                }
-                if (tmp.getRoConfig("navId") != null) {
-                    node.removeChild(name, false);
+        node.setRoConfig("lu", new Value(0));
+        stop();
+        List<String> list = new ArrayList<>(node.getChildren().keySet());
+        for (String name : list) {
+            Node tmp = node.getChild(name, false);
+            if (tmp == null) {
+                tmp = node.getChild(name, true);
+            }
+            if (tmp == null) {
+                continue;
+            }
+            if (tmp.getAction() != null) {
+                continue;
+            }
+            if (tmp.getRoConfig("navId") != null) {
+                if (node.removeChild(name, false) == null) {
+                    node.removeChild(name, true);
                 }
             }
+        }
+        if (!enabled) {
+            Utils.getStatusNode(node).setValue(new Value("Disabled"));
         } else {
-            node.setRoConfig("lu", new Value(0));
             conn.editConnection(url, user, pass, connTimeout, readTimeout);
             setupPoll(pollRate);
         }
@@ -215,8 +224,7 @@ public static void init(Node superRoot) {
             for (Node child : children.values()) {
                 if (child.getAction() == null && !"sys".equals(child.getName())) {
                     child.clearChildren();
-                    Haystack haystack = new Haystack(child);
-                    Utils.initCommon(haystack, child);
+                    new Haystack(child);
                 }
             }
         }

diff --git a/src/main/java/org/dsa/iot/haystack/actions/ServerActions.java b/src/main/java/org/dsa/iot/haystack/actions/ServerActions.java
@@ -56,8 +56,7 @@ public void handle(ActionResult event) {
                 builder.setConfig("read timeout", vReadTimeout);
                 Node node = builder.build();
 
-                Haystack haystack = new Haystack(node);
-                Utils.initCommon(haystack, node);
+                new Haystack(node);
                 LOGGER.info("Added server name={} url={} user={}", name, url, user);
 
             }

diff --git a/src/main/java/org/dsa/iot/haystack/helpers/ConnectionHelper.java b/src/main/java/org/dsa/iot/haystack/helpers/ConnectionHelper.java
@@ -193,6 +193,11 @@ public Connector(Handler<HClient> onConnected) {
         @Override
         public void run() {
             try {
+                if (!haystack.isEnabled()) {
+                    close();
+                    return;
+                }
+                statusNode.setValue(new Value("Connecting"));
                 String pass = "";
                 if (password != null) {
                     pass = String.valueOf(password);
@@ -236,6 +241,8 @@ public void run() {
                                            cause != null ? cause.getMessage() : "");
                 if (haystack.isEnabled()) {
                     statusNode.setValue(new Value(err));
+                } else {
+                    close();
                 }
                 LOGGER.warn(err);
             }