@hurenkam/hue-services 0.6.5 → 0.6.7

package/README.md

@@ -15,6 +15,8 @@ Unit tests are in place for the server side nodes.
 Editor/UI functionality is currently not being tested apart from my own use in the editor, so your mileage may vary.
 
 # Changelog
+v0.6.6: Support bridge v3 acquire key; better error handling on put requests.
+
 v0.6.5: Added nodes for camera and contact sensor. Improved generic service usability.
 
 v0.6.4: Fix checkbox to work with Safari

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hurenkam/hue-services",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "Custom node-red nodes for interfacing with philips hue devices",
   "author": "Mark Hurenkamp",
   "license": "Apache 2.0",
@@ -22,6 +22,12 @@
     "hue",
     "clip"
   ],
+  "files": [
+    "README.md",
+    "LICENSE",
+    "package.json",
+    "src"
+  ],
   "node-red": {
     "version": ">=2.0.0",
     "nodes": {

package/src/RestApi.js

@@ -81,6 +81,7 @@ class RestApi {
             var local = this;
 
             var request = this.#requestQ.shift();
+            this.#info("_handleRequest() url: " + request.url + " method: " + request.method + " data: " + request.data);
             this.#request(request.url, request.method, request.data)
             .then(async (result) => {
                 await local.#limiter.removeTokens(1,()=>{});
@@ -90,7 +91,10 @@ class RestApi {
             .catch((error) => {
                 this.#error("_handleRequest(" + request.url + ") error: ");
                 this.#error(error);
-                request.reject();
+                var info = {};
+                info.error = error;
+                info.request = request;
+                request.reject(info);
 
                 // back off for a few seconds, just in case we ran into a 429 error.
                 local.#timeout = setTimeout(local.#handleRequest.bind(local), 5000);
@@ -105,33 +109,45 @@ class RestApi {
     get(url) {
         this.#trace("get(" + url + ")");
         var local = this;
-        return new Promise(function (resolve, reject) {
+
+        let promise = new Promise((resolve, reject) => {
             local.#requestQ.push({ url: url, method: "GET", data: null, resolve: resolve, reject: reject });
         });
+
+        return promise;
     }
 
     put(url, data) {
         this.#trace("put(" + url + ")");
         var local = this;
-        return new Promise(function (resolve, reject) {
+
+        let promise = new Promise((resolve, reject) => {
             local.#requestQ.push({ url: url, method: "PUT", data: data, resolve: resolve, reject: reject });
         });
+
+        return promise;
     }
 
     post(url, data) {
         this.#trace(".post(" + url + ")");
         var local = this;
-        return new Promise(function (resolve, reject) {
+
+        let promise = new Promise((resolve, reject) => {
             local.#requestQ.push({ url: url, method: "POST", data: data, resolve: resolve, reject: reject });
         });
+
+        return promise;
     }
 
     delete(url, data) {
         this.#trace(".delete(" + url + ")");
         var local = this;
-        return new Promise(function (resolve, reject) {
+
+        let promise = new Promise((resolve, reject) => {
             local.#requestQ.push({ url: url, method: "DELETE", data: data, resolve: resolve, reject: reject });
         });
+
+        return promise;
     }
 }
 

package/src/clip/Resource.js

@@ -107,7 +107,7 @@ class Resource extends events.EventEmitter {
 
     put(data) {
         this.#trace("put(",data,")");
-        this.clip().put(this.rtype(),this.rid(), data);
+        return this.clip().put(this.rtype(),this.rid(), data);
     }
 
     onEvent(event) {

package/src/nodes/BridgeConfigNode.js

@@ -119,7 +119,7 @@ class BridgeConfigNode extends BaseNode {
             var id = "BridgeConfig (" + Math.floor((Math.random() * 100) + 1) + ")";
             var request = {
                 "method": "POST",
-                "url": "http://" + ip + "/api",
+                "url": "https://" + ip + "/api",
                 "headers": { "Content-Type": "application/json; charset=utf-8" },
                 "data": { "devicetype": id },
                 "httpsAgent": new https.Agent({ rejectUnauthorized: false })

package/src/nodes/ResourceNode.js

@@ -82,26 +82,35 @@ class ResourceNode extends BaseNode {
     }
 
     onInput(msg) {
+        super.onInput(msg);
+
         var resource = this.resource();
         if (!resource) {
             this.#trace("onInput(): Resource not found",this.rid());
+            return;
         }
 
-        if (msg.rtypes) {
-            if ((resource) && (msg.rtypes.includes(resource.rtype()))) {
-                this.#trace("onInput(",msg.payload,")");
-                resource.put(msg.payload);
-            }
+        if (msg.rtypes && msg.rtypes.includes(resource.rtype())) {
+            resource.put(msg.payload).then(result => { 
+                return; 
+            }, info => {
+                var error = info.error;
+                var request = info.request; 
+                this.error("ResourceNode::onInput() request: "+JSON.stringify(request)+" error: " + error);
+                return; 
+            });
         }
 
-        if (msg.rids) {
-            if ((resource) && (msg.rids.includes(resource.rid()))) {
-                this.#trace("onInput(",msg.payload,")");
-                resource.put(msg.payload);
-            }
+        if (msg.rids && msg.rids.includes(resource.rid())) {
+            resource.put(msg.payload).then(result => { 
+                return; 
+            }, info => {
+                var error = info.error;
+                var request = info.request; 
+                this.error("ResourceNode::onInput() request: "+JSON.stringify(request)+" error: " + error);
+                return; 
+            });
         }
-
-        super.onInput(msg);
     }
 }
 

package/.github/workflows/node.js.yml

@@ -1,31 +0,0 @@
-# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
-
-name: Node.js CI
-
-on:
-  push:
-    branches: [ "maturing-v0.5" ]
-  pull_request:
-    branches: [ "maturing-v0.5" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x, 16.x, 18.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: npm ci
-    - run: npm run build --if-present
-    - run: npm test

package/attic-bridge-v2-key.txt

@@ -1,2 +0,0 @@
-2ml0TLJEUc-j-byMhxIhymRSOUPUlnzRrZUiseoq
-