node-red-contrib-googlehome 0.0.14 → 1.0.0

package/README.md

@@ -17,4 +17,6 @@ You will need an account [here](https://googlehome.hardill.me.uk). Once you have
 account you can define a number of devices. You can then configure a node to represent
 that device in a Node-RED flow.
 
-The full documentation can be found [here](https://googlehome.hardill.me.uk/docs)
+The full documentation can be found [here](https://googlehome.hardill.me.uk/docs)
+
+Minimum NodeJS version is now 20 (uses `fetch` to replace `request`)

package/googlehome.html

@@ -12,11 +12,11 @@
 -->
 <script type="text/html" data-template-name="google-home-conf">
     <div class="form-row">
-      <label for="node-config-input-username"><i class="icon-tag"></i> Username</label>
+      <label for="node-config-input-username"><i class="fa fa-user"></i> Username</label>
       <input type="text" id="node-config-input-username">
   </div>
   <div class="form-row">
-      <label for="node-config-input-password"><i class="icon-tag"></i> Password</label>
+      <label for="node-config-input-password"><i class="fa fa-key"></i> Password</label>
       <input type="password" id="node-config-input-password">
   </div>
 </script>
@@ -64,11 +64,11 @@
 
 <script type="text/html" data-template-name="google-home">
   <div class="form-row">
-    <label for="node-input-conf"><i class="icon-tag"></i> Account</label>
+    <label for="node-input-conf"><i class="fa fa-tag"></i> Account</label>
     <input type="text" id="node-input-conf">
   </div>
   <div class="form-row">
-    <label for="node-input-device"><i class="icon-tag"></i> Device</label>
+    <label for="node-input-device"><i class="fa fa-tag"></i> Device</label>
     <select id="node-input-device">
     </select>
     <a id="node-input-device-refresh" class="btn"><i class="fa fa-refresh"></i></a>
@@ -79,11 +79,11 @@
         <label for="node-input-acknowledge" style="width: 70%"> Auto Acknowledge</span>
     </div>
   <div class="form-row">
-    <label for="node-input-topic"><i class="icon-tag"></i> Topic</label>
+    <label for="node-input-topic"><i class="fa fa-tag"></i> Topic</label>
     <input type="text" id="node-input-topic">
   </div>
   <div class="form-row">
-    <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+    <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name">
   </div>
 </script>
@@ -210,17 +210,17 @@
 
 <script type="text/html" data-template-name="google-home-response">
   <div class="form-row">
-    <label for="node-input-conf"><i class="icon-tag"></i> Account</label>
+    <label for="node-input-conf"><i class="fa fa-tag"></i> Account</label>
     <input type="text" id="node-input-conf">
   </div>
   <div class="form-row">
-    <label for="node-input-device"><i class="icon-tag"></i> Device</label>
+    <label for="node-input-device"><i class="fa fa-tag"></i> Device</label>
     <select id="node-input-device">
     </select>
     <a id="node-input-device-refresh" class="btn"><i class="fa fa-refresh"></i></a>
   </div>
   <div class="form-row">
-    <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+    <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name">
   </div>
 </script>

package/googlehome.js

@@ -23,7 +23,6 @@ module.exports = function(RED) {
   const fs = require('fs');
   const mqtt = require('mqtt');
   const path = require('path');
-  const request = require('request');
 
   var devices = {};
   var status = {};
@@ -214,6 +213,7 @@ module.exports = function(RED) {
             //console.log("replying to a command")
             var resp = {
               requestId: msg._requestId,
+              status: msg.status,
               id: msg.deviceId,
               execution: msg.payload
             }
@@ -254,21 +254,25 @@ module.exports = function(RED) {
 
   function getDevices(username, password, id) {
     if (username && password) {
-      request.get({
-        url: devicesURL,
-        auth: {
-          username: username,
-          password: password
+      fetch(devicesURL, {
+        method: 'GET',
+        headers: {
+          'Authorization': `Basic ${Buffer.from(username + ':' + password, "utf-8").toString('base64')}`
         }
-      }, function(err,res,body) {
-        if (!err && res.statusCode == 200) {
-          var devs = JSON.parse(body);
-          devices[id] = devs
+      })
+      .then(res => {
+        if (res.status === 200) {
+          return res.json()
         } else {
-          //console.("err: " + err);
           RED.log.log("Problem looking up " + username + "'s devices");
         }
-      });
+      })
+      .then(json => {
+        devices[id] = json
+      })
+      .catch( err => {
+        console.log(err)
+      })
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-googlehome",
-  "version": "0.0.14",
+  "version": "1.0.0",
   "description": "A Smart Home Action for Google Home",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,9 @@
   "author": "hardillb@gmail.com",
   "license": "Apache-2.0",
   "dependencies": {
-    "mqtt": "^4.2.6",
-    "request": "^2.83.0"
+    "mqtt": "^5.15.1"
+  },
+  "engines": {
+    "node": ">=18.x"
   }
 }