Merge pull request #68 from thinger-io/develop

Release version 1.7.6
thinger-io · May 23, 2024 · 139476f · 139476f
2 parents 628dd63 + f3da47a
commit 139476f
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.7.6] - 2024-05-23
+
+### Fixed
+
+- Device create and Bucket create nodes failing on creation
+- Bucket create node not hiding auxiliary sources fields when source changed
+
+
 ## [1.7.5] - 2024-05-22
 
 ### Fixed
@@ -313,6 +321,7 @@ All notable changes to this project will be documented in this file.
 
 ## [0.0.6] - 2019-06-20
 
+[1.7.6]: https://github.com/thinger-io/Node-RED/compare/1.7.5...1.7.6
 [1.7.5]: https://github.com/thinger-io/Node-RED/compare/1.7.4...1.7.5
 [1.7.4]: https://github.com/thinger-io/Node-RED/compare/1.7.3...1.7.4
 [1.7.3]: https://github.com/thinger-io/Node-RED/compare/1.7.2...1.7.3

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # node-red-contrib-thinger
 
-[![NPM Version](https://img.shields.io/static/v1?label=npm&message=v1.7.5&color=blue&style=flat)](https://www.npmjs.com/package/node-red-contrib-thinger)
+[![NPM Version](https://img.shields.io/static/v1?label=npm&message=v1.7.6&color=blue&style=flat)](https://www.npmjs.com/package/node-red-contrib-thinger)
 
 ![Node-RED and Thinger.io Integration](./images/laptop.png "Thinger.io web console with Node-RED plugin and ad-hoc nodes")
 

diff --git a/nodes/bucket-create.html b/nodes/bucket-create.html
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 
-    function hideSources() {
+    function hideBucketSources() {
         $(".node-row-device").hide();
         $(".node-row-resource").hide();
         $(".node-row-update").hide();
@@ -52,7 +52,7 @@
             // Event listeners
             $("#node-input-source").change(function() {
                 if (!firstTime) {
-                    hideSources();
+                    hideBucketSources();
                 }
                 firstTime = false;
 

diff --git a/nodes/bucket-create.js b/nodes/bucket-create.js
@@ -108,28 +108,34 @@ module.exports = function(RED) {
             const url = `${server.config.ssl ? "https://" : "http://"}${server.config.host}/v1/users/${server.config.username}/buckets`;
 
             if (typeof server.request === "function") {
+
                 // Check if bucket exists
                 let exists = true;
                 let res;
 
                 try {
-                  res = await server.request(node,`${url}/${json.bucket}`, 'GET');
-                  if (res.status !== 200)
-                    exists = false;
-
-                  // Update if exist or create it
-                  let bucket = json.bucket;
-                  if ( exists ) {
-                      delete json.bucket;
-                      res = await server.request(node,`${url}/${bucket}`,'PUT',json);
-                  } else {
-                      res = await server.request(node, url, 'POST', json);
-                  }
-
-                  // Associate to projects
-                  if (projects && projects.length !== 0) {
-                    res = await server.request(node,`${url}/${bucket}/projects`,'PUT',projects);
-                  }
+                    res = await server.request(node,`${url}/${json.bucket}`, 'GET');
+                } catch (err) {
+                } finally {
+                    if ( !res || res.status !== 200 )
+                        exists = false;
+                }
+
+                try {
+
+                    // Update if exist or create it
+                    let bucket = json.bucket;
+                    if ( exists ) {
+                        delete json.bucket;
+                        res = await server.request(node,`${url}/${bucket}`,'PUT',json);
+                    } else {
+                        res = await server.request(node, url, 'POST', json);
+                    }
+
+                    // Associate to projects
+                    if (projects && projects.length !== 0) {
+                        res = await server.request(node,`${url}/${bucket}/projects`,'PUT',projects);
+                    }
 
                 } catch(err) {
                     delete err.stack;

diff --git a/nodes/device-callback.js b/nodes/device-callback.js
@@ -106,17 +106,21 @@ module.exports = function(RED) {
 
             if (typeof server.request === "function") {
 
+                const url = `${server.config.ssl ? "https://" : "http://"}${server.config.host}/v3/users/${server.config.username}/devices/${prefix}${device}/callback`;
+
                 try {
-                    const url = `${server.config.ssl ? "https://" : "http://"}${server.config.host}/v3/users/${server.config.username}/devices/${prefix}${device}/callback`;
 
                     // Check if device exists if not autoprovision resources
-                    let res = await server.request(node,`${url}/data`,'POST',data);
-                    if ( res.status !== 200 ) {
-
-                        await provisionBucket(server,node,prefix,device,assetType,assetGroup,product);
-                        await provisionDevice(server,node,prefix,device,assetType,assetGroup,product);
+                    let res;
+                    try {
                         res = await server.request(node,`${url}/data`,'POST',data);
-
+                    } catch (err) {
+                    } finally {
+                        if ( !res || res.status !== 200 ) {
+                            await provisionBucket(server,node,prefix,device,assetType,assetGroup,product);
+                            await provisionDevice(server,node,prefix,device,assetType,assetGroup,product);
+                            res = await server.request(node,`${url}/data`,'POST',data);
+                        }
                     }
 
                     msg.payload = res.payload;

diff --git a/nodes/device-create.html b/nodes/device-create.html
@@ -1,14 +1,5 @@
 <script type="text/javascript">
 
-    function hideSources() {
-        $(".node-row-device").hide();
-        $(".node-row-update").hide();
-        $(".node-row-topic").hide();
-        $("#node-input-device").val("");
-        $("#node-input-update").val("");
-        $("#node-input-topic").val("");
-    }
-
     RED.nodes.registerType('device-create', {
         category: 'thinger',
         color: '#62b0fe', // #1F8EFE at 30% lightened

diff --git a/nodes/device-create.js b/nodes/device-create.js
@@ -82,23 +82,28 @@ module.exports = function(RED) {
                 // Update if exist or create it
                 try {
 
-                  res = await server.request(node,`${url}/${data.device}`, 'GET');
-                  if (res.status !== 200)
-                    exists = false;
-
-                  let device = data.device;
-                  if ( exists ) {
-                      delete data.device;
-                      delete data.type;
-                      res = await server.request(node,`${url}/${device}`,'PUT',data);
-                  } else {
-                      res = await server.request(node, url, 'POST', data);
-                  }
-
-                  // Associate to projects
-                  if (projects && projects.length !== 0) {
-                    res = await server.request(node,`${url}/${device}/projects`,'PUT',projects);
-                  }
+                    try {
+                        res = await server.request(node,`${url}/${data.device}`, 'GET');
+                    } catch (err) {
+                    } finally {
+                        if ( !res || res.status !== 200 )
+                            exists = false;
+
+                    }
+
+                    let device = data.device;
+                    if ( exists ) {
+                        delete data.device;
+                        delete data.type;
+                        res = await server.request(node,`${url}/${device}`,'PUT',data);
+                    } else {
+                        res = await server.request(node, url, 'POST', data);
+                    }
+
+                    // Associate to projects
+                    if (projects && projects.length !== 0) {
+                      res = await server.request(node,`${url}/${device}/projects`,'PUT',projects);
+                    }
 
                 } catch(err) {
                     delete err.stack;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-thinger",
-  "version": "1.7.5",
+  "version": "1.7.6-alpha.1",
   "description": "Node-Red library for Thinger.io Platform",
   "keywords": [
     "node-red",