added support for gen2+ devices

1PM mini, H&T gen3

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [10.19.0] - 2024-03-16
+###  support for gen 3 shelly 1PM Mini and H&T gen3
+
 ## [10.18.0] - 2024-03-12
 ###  improved msg.payload checking - [#143](https://github.com/windkh/node-red-contrib-shelly/issues/143)
 

README.md

@@ -51,6 +51,10 @@ Generation 2 devices:
 - Shelly Plus Wall Dimmer
 - Shelly Blu Gateway
 
+Generation 3 devices:
+- Shelly 1PM Mini
+- Shelly Plus H&T
+
 
 Others may work but are not really tested so far.
 
@@ -605,7 +609,7 @@ Note that the button is not always reachable as it falls to sleep. This is not t
 
 
 
-# Shelly Node (Generation 2) 
+# Shelly Node (Generation 2+) 
 See also https://shelly-api-docs.shelly.cloud/gen2/
 See also https://shelly-api-docs.shelly.cloud/gen2/Devices/ShellyPlus1PM
 The node can communicate with several shelly types. You must select the correct device type from the combobox when configuring the node.
@@ -617,7 +621,7 @@ You must configure this network port, make sure that it is not already in use. I
 under that the shelly device can reach the node-red server (Leave this field empty if you run inside the same network segment).
 
 
-## Relay (Plus 1, Plus 1 PM, Plus 2 PM, Pro 1, Pro 1 PM, Pro 2, Pro 2 PM, Pro 4 PM, Plug US)
+## Relay (Plus 1, Plus 1 PM, Plus 2 PM, Pro 1, Pro 1 PM, Pro 2, Pro 2 PM, Pro 4 PM, Plug US, 1PM Mini)
 The node is able to turn on and turn off a shelly switch. It outputs the status after every interaction with the shelly device.
 Turning on is done by sending the following payload into the input. The relay number is optional and defaults to 0.
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-shelly",
-    "version": "10.18.0",
+    "version": "10.19.0",
     "description": "Shelly nodes.",
     "node-red": {
         "version": ">=0.1.0",

shelly/99-shelly.html

@@ -409,7 +409,7 @@ <h3>Details</h3>
         inputs: 1,
         outputs: 1,
         icon: "shelly2.png",
-        paletteLabel: "shelly gen 2",
+        paletteLabel: "shelly gen 2+",
         label: function () {
             return this.description || this.hostname || this.devicetype || "Shelly";
         },
@@ -453,7 +453,7 @@ <h3>Details</h3>
         <div style="display: inline-block; position: relative; width: 70%; height: 19.1333px;">
             <div style="position: absolute; left: 0; right: 0;">
             <select id="node-input-devicetype" style="width:100%">
-                <option value="Relay">Relay - Shelly Plus 1, Plus 1 PM, Plus 2 PM, Pro 2, Pro 2 PM, Pro 4 PM, Plug US, Plus Plug S</option>
+                <option value="Relay">Relay - Shelly Plus 1, Plus 1 PM, Plus 2 PM, Pro 2, Pro 2 PM, Pro 4 PM, Plug US, Plus Plug S, 1PM Mini</option>
                 <option value="Button">Button - Shelly Plus I4</option>
                 <option value="Sensor">Sensor - Shelly Plus H&T, Plus Smoke</option>
                 <option value="Measure">Measure - Shelly Pro 3EM</option>

shelly/99-shelly.js

@@ -370,10 +370,15 @@ module.exports = function (RED) {
             else if(node.shellyInfo.model && node.shellyInfo.gen === 2){
                 deviceType = node.shellyInfo.model;
                 requiredNodeType = 'shelly-gen2';
+
+            } // Generation 3 devices 
+            else if(node.shellyInfo.model && node.shellyInfo.gen === 3){
+                deviceType = node.shellyInfo.model;
+                requiredNodeType = 'shelly-gen2'; // right now the protocol is compatible to gen 2
             }
             else {
                 // this can not happen right now.
-                requiredNodeType = 'not shupported';
+                requiredNodeType = 'shelly gen-type is not supported';
             }
 
 
@@ -2151,7 +2156,7 @@ module.exports = function (RED) {
             success = true;
         }
         else if(mode === 'callback'){
-            let scriptPath = path.resolve(__dirname, './scripts/button.script');
+            let scriptPath = path.resolve(__dirname, './scripts/callback.script');
             const buffer = fs.readFileSync(scriptPath);
             // const buffer = await readFile(scriptPath); #96 nodejs V19
             let script = buffer.toString();
@@ -2250,9 +2255,9 @@ module.exports = function (RED) {
     }
 
     let gen2DeviceTypes = new Map([
-        ["Relay",      ["SHSW-", "SNSW-", "SPSW-", "SNPL-", "SNPM-"]],
+        ["Relay",      ["SHSW-", "SNSW-", "SPSW-", "SNPL-", "SNPM-", , "S3SW-"]],
         ["Button",     ["SNSN-"]],
-        ["Sensor",     ["SNSN-"]], // Shelly Plus H&T / PLus Smoke only support Webhook, no scripting
+        ["Sensor",     ["SNSN-", "S3SN-"]], // Shelly Plus H&T / PLus Smoke only support Webhook, no scripting
         ["Measure",    ["SPEM-"]],
         ["Dimmer",     ["SNDM-"]],
         ["BluGateway", ["SNGW-"]],