0.65.1

- Fix directories in dslink.options
- Swallow init protocol method.

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.65.0'
+    version '0.65.1'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

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

@@ -183,9 +183,8 @@ public String getDslinkJson() {
     public DSMap getDslinkMap() {
         if (dslinkMap == null) {
             File file = null;
-            File home = this.home;
-            if (home != null) {
-                file = new File(home, getDslinkJson());
+            if (home != null) { //home cannot be in dslink.json
+                file = makeFile(getHome(), getDslinkJson());
             } else {
                 file = new File(getDslinkJson());
             }
@@ -236,7 +235,7 @@ public File getHome() {
      */
     public DSKeys getKeys() {
         if (keys == null) {
-            setKeys(new File(getHome(), getConfig(CFG_KEY_FILE, ".key")));
+            setKeys(makeFile(getHome(), getConfig(CFG_KEY_FILE, ".key")));
         }
         return keys;
     }
@@ -313,7 +312,7 @@ public boolean getMsgpack() {
     public File getNodesFile() {
         if (nodesFile == null) {
             String path = getConfig(CFG_NODE_FILE, "nodes.zip");
-            nodesFile = new File(getHome(), path);
+            nodesFile = makeFile(getHome(), path);
         }
         return nodesFile;
     }
@@ -398,7 +397,12 @@ public DSLinkOptions setDslinkMap(DSMap map) {
     public DSLinkOptions setHome(String path) {
         home = new File(".");
         if ((path != null) && !path.isEmpty()) {
-            home = new File(home, path);
+            home = makeFile(home, path);
+        } else {
+            try {
+                home = home.getCanonicalFile();
+            } catch (Exception x) {
+            }
         }
         home = home.getAbsoluteFile();
         return this;
@@ -421,7 +425,7 @@ public DSLinkOptions setKeys(File file) {
     }
 
     public DSLinkOptions setKeys(String path) {
-        return setKeys(new File(getHome(), path));
+        return setKeys(makeFile(getHome(), path));
     }
 
     public DSLinkOptions setLinkName(String arg) {
@@ -540,6 +544,17 @@ private DSMap getConfigMap(String name, boolean create) {
         return config;
     }
 
+    private File makeFile(File base, String path) {
+        File file = new File(path);
+        if (!file.isAbsolute() && (base != null)) {
+            file = new File(base, path);
+            try {
+                file = file.getCanonicalFile();
+            } catch (Exception x) {
+            }
+        }
+        return file.getAbsoluteFile();
+    }
 
     /**
      * Called by parseRequest for each key/value pair.

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/DS1Responder.java

@@ -71,6 +71,9 @@ public void handleRequest(final Integer rid, final DSMap map) {
                         break;
                     case 'i':  //invoke
                         if (!method.equals("invoke")) {
+                            if (method.equals("init")) {
+                                break;
+                            }
                             sendInvalidMethod(rid, method);
                         }
                         processInvoke(rid, map);

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/backup/SysBackupService.java

@@ -99,7 +99,6 @@ public void save() {
         ZipOutputStream zos = null;
         InputStream in = null;
         try {
-            DSLink link = getLink();
             File nodes = getLink().getOptions().getNodesFile();
             String name = nodes.getName();
             if (nodes.exists()) {