From e404c9a7ab1885bd4745364ac675b02a091c7e27 Mon Sep 17 00:00:00 2001
From: Matthias Berner <matthiasberner@familie-berner.de>
Date: Sat, 21 Feb 2026 20:41:14 +0100
Subject: [PATCH] mattes-seins

---
 README.md                                     |   2 -
 node-red-contrib-xiaomi-all/xiaomi-all.html   |   4 +-
 .../icons/natgas-tw-icon.png                  | Bin 0 -> 3778 bytes
 .../icons/smoke-tw-icon.png                   | Bin 0 -> 3778 bytes
 .../xiaomi-configurator.html                  |   6 +-
 .../icons/natgas-icon.png                     | Bin 0 -> 2561 bytes
 .../icons/org_natgas-icon.png                 | Bin 0 -> 5812 bytes
 .../xiaomi-natgas.html                        | 131 ++++++++++++++++++
 .../xiaomi-natgas.js                          |   9 ++
 .../icons/org_smoke-icon.png                  | Bin 0 -> 5812 bytes
 .../icons/smoke-icon.png                      | Bin 0 -> 1429 bytes
 .../xiaomi-smoke.html                         | 131 ++++++++++++++++++
 node-red-contrib-xiaomi-smoke/xiaomi-smoke.js |   9 ++
 package.json                                  | 122 ++++++++++------
 14 files changed, 365 insertions(+), 49 deletions(-)
 create mode 100644 node-red-contrib-xiaomi-configurator/icons/natgas-tw-icon.png
 create mode 100644 node-red-contrib-xiaomi-configurator/icons/smoke-tw-icon.png
 create mode 100644 node-red-contrib-xiaomi-natgas/icons/natgas-icon.png
 create mode 100644 node-red-contrib-xiaomi-natgas/icons/org_natgas-icon.png
 create mode 100644 node-red-contrib-xiaomi-natgas/xiaomi-natgas.html
 create mode 100644 node-red-contrib-xiaomi-natgas/xiaomi-natgas.js
 create mode 100644 node-red-contrib-xiaomi-smoke/icons/org_smoke-icon.png
 create mode 100644 node-red-contrib-xiaomi-smoke/icons/smoke-icon.png
 create mode 100644 node-red-contrib-xiaomi-smoke/xiaomi-smoke.html
 create mode 100644 node-red-contrib-xiaomi-smoke/xiaomi-smoke.js

diff --git a/README.md b/README.md
index 6f03205..ff6c217 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # node-red-contrib-mi-devices
 
-__:warning: I will not go further because I don't use node-red anymore and I don't have the time, but feel free to fork, PR & so on. If you want to maintain this module, feel free to ask.__
-
 This module contains the following nodes to provide easy integration of the Xiaomi devices into node-red.
 This module is a fork of [Harald Rietman module, node-red-contrib-xiaomi-devices](https://github.com/hrietman/node-red-contrib-xiaomi-devices)
 
diff --git a/node-red-contrib-xiaomi-all/xiaomi-all.html b/node-red-contrib-xiaomi-all/xiaomi-all.html
index bd70aaf..05fca1d 100644
--- a/node-red-contrib-xiaomi-all/xiaomi-all.html
+++ b/node-red-contrib-xiaomi-all/xiaomi-all.html
@@ -79,7 +79,9 @@
     <div class="form-row">
         <label for="node-input-onlyModels"><i class="icon-tag"></i> Only</label>
         <select multiple id="node-input-onlyModels">
-            <option value="sensor_ht,weather.v1">Temperature/humidty</option>
+            <option value="sensor_ht,weather.v1">Temperature/Humidty</option>
+            <option value="natgas">Natgas/Alarm/Density</option>
+            <option value="smoke">Smoke/Alarm/Density</option>
             <option value="motion">Motion</option>
             <option value="switch,sensor_switch.aq2">Switches</option>
             <option value="magnet,sensor_magnet.aq2">Contacts</option>
diff --git a/node-red-contrib-xiaomi-configurator/icons/natgas-tw-icon.png b/node-red-contrib-xiaomi-configurator/icons/natgas-tw-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe2cb7792200610a3be26ba476e22bd9ed5f16b
GIT binary patch
literal 3778
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
N>T8>5Rcbij`4=t4uH66t

literal 0
HcmV?d00001

diff --git a/node-red-contrib-xiaomi-configurator/icons/smoke-tw-icon.png b/node-red-contrib-xiaomi-configurator/icons/smoke-tw-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe2cb7792200610a3be26ba476e22bd9ed5f16b
GIT binary patch
literal 3778
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
N>T8>5Rcbij`4=t4uH66t

literal 0
HcmV?d00001

diff --git a/node-red-contrib-xiaomi-configurator/xiaomi-configurator.html b/node-red-contrib-xiaomi-configurator/xiaomi-configurator.html
index 5ebba6b..e11b21f 100644
--- a/node-red-contrib-xiaomi-configurator/xiaomi-configurator.html
+++ b/node-red-contrib-xiaomi-configurator/xiaomi-configurator.html
@@ -15,6 +15,8 @@
             var node = this;
 
             var tw_sensor_ht = {value:"sensor_ht", label:"sensor ht", icon:"icons/node-red-contrib-mi-devices/thermometer-tw-icon.png"};
+            var tw_natgas = {value:"natgas", label:"natgas", icon:"icons/node-red-contrib-mi-devices/natgas-tw-icon.png"};
+            var tw_smoke = {value:"smoke", label:"smoke", icon:"icons/node-red-contrib-mi-devices/smoke-tw-icon.png"};
             var tw_magnet = {value:"magnet", label:"contact", icon:"icons/node-red-contrib-mi-devices/door-tw-icon.png"};
             var tw_motion = {value:"motion", label:"motion", icon:"icons/node-red-contrib-mi-devices/motion-tw-icon.png"};
             var tw_plug = {value:"plug", label:"plug", icon:"icons/node-red-contrib-mi-devices/outlet-tw-icon.png"};
@@ -31,7 +33,7 @@
                     var sid = $('<input/>',{id:"node-config-input-sid-"+i,type:"text", placeholder:"SID", style:"width:auto;vertical-align:top"}).appendTo(row);
                     sid.typedInput({
                         default: 'sensor_ht',
-                        types: [tw_sensor_ht, tw_magnet, tw_motion, tw_plug, tw_switch]
+                        types: [tw_sensor_ht, tw_natgas, tw_smoke, tw_magnet, tw_motion, tw_plug, tw_switch]
                     });
 
                     $('<label/>',{for:"node-config-input-desc-"+i, style:"margin-left: 7px; width: 20px;vertical-align:middle"}).html('<i class="fa fa-pencil-square-o"></i>').appendTo(row);
@@ -114,6 +116,8 @@
     <p>At the moment the following devices are supported:
     <lu>
         <li>Humidity & Temperature sensor [sensor ht/]</li>
+        <li>Natgas sensor [natgas]</li>
+        <li>Smoke sensor [smoke]</li>
         <li>Body motion sensor [motion]</li>
         <li>Magnet contact sensor [contact]</li>
         <li>Wall socket plug (zigbee) [plug]</li>
diff --git a/node-red-contrib-xiaomi-natgas/icons/natgas-icon.png b/node-red-contrib-xiaomi-natgas/icons/natgas-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5cd8f321e2921abf0c11537ea2e6ffe41fcfc74
GIT binary patch
literal 2561
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
X;7!J>o6Ma|00000NkvXXu0mjfW;@O4

literal 0
HcmV?d00001

diff --git a/node-red-contrib-xiaomi-natgas/icons/org_natgas-icon.png b/node-red-contrib-xiaomi-natgas/icons/org_natgas-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..86c7e68cb92a3f4db84652d95b8deb7a51314fc7
GIT binary patch
literal 5812
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

literal 0
HcmV?d00001

diff --git a/node-red-contrib-xiaomi-natgas/xiaomi-natgas.html b/node-red-contrib-xiaomi-natgas/xiaomi-natgas.html
new file mode 100644
index 0000000..c55a676
--- /dev/null
+++ b/node-red-contrib-xiaomi-natgas/xiaomi-natgas.html
@@ -0,0 +1,131 @@
+<script type="text/javascript">
+    RED.nodes.registerType('xiaomi-natgas', {
+        category: 'xiaomi',
+        color: '#3FADB5',
+        defaults: {
+            gateway: {value:"", type:"xiaomi-configurator"},
+            name: {value: ""},
+            sid: {value: "", required: true},
+            natgasmsg: {value: ""},
+            nonatgasmsg: {value: ""},
+            output: {value: "0"}
+        },
+        inputs: 1,
+        outputs: 1,
+        paletteLabel: "natgas",
+        icon: "natgas-icon.png",
+        label: function () {
+            return this.name || "xiaomi-natgas";
+        },
+        oneditprepare: function() {
+            var node = this;
+
+            if(node.sid) {
+                $('#node-input-sid').val(node.sid);
+            }
+
+            function changeGateway(model) {
+                var configNodeID = $('#node-input-gateway').val();
+                if (configNodeID) {
+                    var configNode = RED.nodes.node(configNodeID);
+                    if(configNode) {
+                        $('#node-input-sid').empty();
+                        for (key in configNode.deviceList) {
+                            var device = configNode.deviceList[key];
+                            if (device.model === model) {
+                                $('#node-input-sid').append('<option value="' + device.sid + '">' + device.desc + '</option>');
+                            }
+                        }
+                        if(node.sid) {
+                            $('#node-input-sid option[value="' + node.sid + '"]').prop('selected', true);
+                        }
+                    }
+                }
+            }
+
+            $("#node-input-sid").change(function () {
+                if(!this.name) {
+                    $("#node-input-name").val($('#node-input-sid option:selected').text());
+                }
+            });
+            $("#node-input-gateway").change(function () {
+                changeGateway("natgas");
+            });
+        },
+        oneditsave: function() {
+            var node = this;
+            node.sid = $("#node-input-sid").val();
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="xiaomi-natgas">
+    <div class="form-row">
+        <label for="node-input-gateway"><i class="icon-tag"></i> Gateway</label>
+        <input type="text" id="node-input-gateway" placeholder="xiaomi gateway">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-sid"><i class="icon-tag"></i> Device</label>
+        <select id="node-input-sid" placeholder="xiaomi gateway"></select>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="xiaomi-natgas">
+    <p>The Xiaomi natgas sensor node</p>
+
+    <h3>Inputs</h3>
+    <dl class="message-properties">
+        <dt>payload
+            <span class="property-type">object</span>
+        </dt>
+        <dd>
+            When the message contains a <code>sid</code> field, the node will filter the input and output only if the <code>sid</code> is the device's sid.<br>
+            <hr>
+            If the message doesn't contain a <code>sid</code> field, the node will be used to inject <code>sid</code> and <code>gateway</code> fields in the incoming <code>msg</code>.<br>
+            <hr>
+            Input Gateway node produces message of type <code>read_ack</code>, <code>heartbeat</code> or <code>report</code>.
+        </dd>
+    </dl>
+
+    <h3>Outputs</h3>
+    <ol class="node-ports">
+        <dl class="message-properties">
+            <dt>payload <span class="property-type">object</span></dt>
+            <dd>Data from gateway when used as a filter (see below).</dd>
+            <dt>sid <span class="property-type">string</span></dt>
+            <dd>Device SID.</dd>
+            <dt>gateway <span class="property-type">object</span></dt>
+            <dd>The <code>xiaomi-configurator</code> object where the device is registred.</dd>
+        </dl>
+    </ol>
+
+    <h4>Details</h4>
+    <p>The incoming message is processed if the input <code>sid</code> matches the configured value for this device.</p>
+    <p>Sample messages:</p>
+    <p><pre>{
+  cmd: "report"
+  model: "natgas"
+  sid: "158d00015ef56c"
+  short_id: 21672
+  data: {
+    density: "0"
+  }
+}</pre>
+    <p><pre>{
+  cmd: "heartbeat"
+  model: "natgas"
+  sid: "158d00015ef56c"
+  short_id: 21672
+  data: {
+    voltage: 3035,
+    alarm: "0",
+    batteryLevel: 45
+  }
+}</pre>
+Where <code>batteryLevel</code> is a computed percentage of remaining battery.
+</p>
+</script>
diff --git a/node-red-contrib-xiaomi-natgas/xiaomi-natgas.js b/node-red-contrib-xiaomi-natgas/xiaomi-natgas.js
new file mode 100644
index 0000000..9386d76
--- /dev/null
+++ b/node-red-contrib-xiaomi-natgas/xiaomi-natgas.js
@@ -0,0 +1,9 @@
+const miDevicesUtils = require('../src/utils');
+
+module.exports = (RED) => {
+    // natgas
+    function XiaomiNatgasNode(config) {
+        miDevicesUtils.defaultNode(RED, config, this);
+    }
+    RED.nodes.registerType("xiaomi-natgas", XiaomiNatgasNode);
+};
diff --git a/node-red-contrib-xiaomi-smoke/icons/org_smoke-icon.png b/node-red-contrib-xiaomi-smoke/icons/org_smoke-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..86c7e68cb92a3f4db84652d95b8deb7a51314fc7
GIT binary patch
literal 5812
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

literal 0
HcmV?d00001

diff --git a/node-red-contrib-xiaomi-smoke/icons/smoke-icon.png b/node-red-contrib-xiaomi-smoke/icons/smoke-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f533cde063272c0b6402727514e1ad0225baed4
GIT binary patch
literal 1429
zcmV;G1#0?<P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1u98IK~!i%?V1Ou
z9Yqv|uO)V)v7<yp5)FyHAQli!EW{*=8Wa?J!-l=rs3ft03Zf>lBw_~(B#2Q_>?ndF
zDmE-Ah`smnee>?Y<-NOm-@Ci--W&6N_~6a#-kI6mnRCvZd9@+^kF*Bt2`9jna1T5W
z@54v%HT(?!)cFR!0I$CZ3t=`~1c$)3FboD=>%y_%fIom3V3qs|FT!=O2P^}XXk|DF
zZ2WJ?cKR(m4mZFVFcr3g4Ph-90ZT$?Ik0XdYz*V!2)G31!fWs+Wc&CI?uK2UC9Miq
zfel5Y-@|=yC^(QMplYoMJHdJI5@cVV54s=pTa)24@W(dvSiNppXt$isXT!%35A-Pb
z#S3*X#OHO|Yy#b&rNL?VIXJd=VI9cTm*9<Orc(E5b$9_B<8&+X6i+-VmAX?tfMcAN
zN;z^dd(%;=)Sc2-ImX>mDMu%QH_c0>?vqySclZrfup&>Jf)ApV=tlV!9N#mkR3IH#
zEO;GTx9JLSY?q}{6Fmgpd}J!MCSQnNe0VDLm`}@k_cHQJIJOC?)I_I(H$R+8&9x6)
z3U{PZkF)v%Y~yt+klxy|JYWUd8E%1-VXPHRv_7~tny!z~dSD!7r-mcFwH0Ur*G{Ec
z?H!0gt_e$l3)1M<7)@;h5e?sF1v(4jcZMYDKsX+3Co9{GuW_dp{nY{BkA8$PR@7yH
z7@Z$u1u}%V92~?-Rv<ghlhaIX1V+<0fg!wl4s6@EzO@x~*}nB3f>U%rx*7cO+Yp}K
z(E3xj8aA_{V)-&$qwj(1OmllL7&bXwcYp!QdH4qSFzyqaqei^#*!)Bv7l8fCxmL8Q
zy}(A^g6!U+x4h=s*&j}WuvUf<MhmjL6=-|VBI*;2Zj0m>uz#mi(R6JpgESlZ1!8Wi
z<-yS21*@C_*-cTbt5~3Nm=!2|f!t*U+5pan%~R<=8I60N)2p-$nQd&#RO;zWBVe8L
z)`w7!z=LotX!(>oJ9m!a)KnAUMsQ!D=~c%;JlvC3)D_0%^i(P-x0*H<e#I|il>99C
zMPeG2kygt=e*!bDKz`MTGW0p6bqd7WiU!@w4~D{0DFavgbjpTVFD1QhJc#qSiZ9Si
z?o6Km`}E6KrmQ3U3AFV(Gkr-ZYf{%LU{=Lo@KuPu%!O4lt+KMC`S2G+N8-Y_bMsw>
zE>6XRK+|n-w<GLY|9f9J9Q?A^gA3k-UGFx(f@>g*#-PYJ$QbN)Fk{#|-_;7fjHh7+
zXz8-1zHM?L>I@Ap3}t+iE>xpj)1tuw&@s*e9i_WbQ?BlNs+gWbQf6DsN|x0)=+_=&
zFr*na+%}b2CVlEdxX$iRr4C5v6<K-1`#c%a6zw52y+42t;~u3Wid~)-tdWeb^vqhM
zB543@=fYI#fOJ+4;N?{6E6+DP-0>b$O?fgQ=so(Pjws?GO>UlaeBPsv$dh|}@A34j
z?b2zvbJQz)c$23|;2`xSjiev(y5UG=CsYHGR?7vdS1!s|#TPO4(@5@fyl!rwV|oP~
z#L=nLSAMlP_1eOU2J!$YP61jzVk;~6=nmkiRO+kI;Pqy?WD^VC7dfxCD;^}zyt)B%
z4QYalj?2yg+nJL}9gtzT11L(>L@xQ_RO&0E0;6c}@x`=VtAUH%G^qbPkf*)DL3*g#
zNM;nh?mroHBz*TxdPZ(~wMb?_9BAI*krvO)iyODDR%~5O2`#en9}9d4&+R+n?5dJ`
jj9Xz!Dh+9|QLXkbH|lbi)vf!(00000NkvXXu0mjfF4UhA

literal 0
HcmV?d00001

diff --git a/node-red-contrib-xiaomi-smoke/xiaomi-smoke.html b/node-red-contrib-xiaomi-smoke/xiaomi-smoke.html
new file mode 100644
index 0000000..80a9342
--- /dev/null
+++ b/node-red-contrib-xiaomi-smoke/xiaomi-smoke.html
@@ -0,0 +1,131 @@
+<script type="text/javascript">
+    RED.nodes.registerType('xiaomi-smoke', {
+        category: 'xiaomi',
+        color: '#3FADB5',
+        defaults: {
+            gateway: {value:"", type:"xiaomi-configurator"},
+            name: {value: ""},
+            sid: {value: "", required: true},
+            smokemsg: {value: ""},
+            nosmokemsg: {value: ""},
+            output: {value: "0"}
+        },
+        inputs: 1,
+        outputs: 1,
+        paletteLabel: "smoke",
+        icon: "smoke-icon.png",
+        label: function () {
+            return this.name || "xiaomi-smoke";
+        },
+        oneditprepare: function() {
+            var node = this;
+
+            if(node.sid) {
+                $('#node-input-sid').val(node.sid);
+            }
+
+            function changeGateway(model) {
+                var configNodeID = $('#node-input-gateway').val();
+                if (configNodeID) {
+                    var configNode = RED.nodes.node(configNodeID);
+                    if(configNode) {
+                        $('#node-input-sid').empty();
+                        for (key in configNode.deviceList) {
+                            var device = configNode.deviceList[key];
+                            if (device.model === model) {
+                                $('#node-input-sid').append('<option value="' + device.sid + '">' + device.desc + '</option>');
+                            }
+                        }
+                        if(node.sid) {
+                            $('#node-input-sid option[value="' + node.sid + '"]').prop('selected', true);
+                        }
+                    }
+                }
+            }
+
+            $("#node-input-sid").change(function () {
+                if(!this.name) {
+                    $("#node-input-name").val($('#node-input-sid option:selected').text());
+                }
+            });
+            $("#node-input-gateway").change(function () {
+                changeGateway("smoke");
+            });
+        },
+        oneditsave: function() {
+            var node = this;
+            node.sid = $("#node-input-sid").val();
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="xiaomi-smoke">
+    <div class="form-row">
+        <label for="node-input-gateway"><i class="icon-tag"></i> Gateway</label>
+        <input type="text" id="node-input-gateway" placeholder="xiaomi gateway">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-sid"><i class="icon-tag"></i> Device</label>
+        <select id="node-input-sid" placeholder="xiaomi gateway"></select>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="xiaomi-smoke">
+    <p>The Xiaomi smoke sensor node</p>
+
+    <h3>Inputs</h3>
+    <dl class="message-properties">
+        <dt>payload
+            <span class="property-type">object</span>
+        </dt>
+        <dd>
+            When the message contains a <code>sid</code> field, the node will filter the input and output only if the <code>sid</code> is the device's sid.<br>
+            <hr>
+            If the message doesn't contain a <code>sid</code> field, the node will be used to inject <code>sid</code> and <code>gateway</code> fields in the incoming <code>msg</code>.<br>
+            <hr>
+            Input Gateway node produces message of type <code>read_ack</code>, <code>heartbeat</code> or <code>report</code>.
+        </dd>
+    </dl>
+
+    <h3>Outputs</h3>
+    <ol class="node-ports">
+        <dl class="message-properties">
+            <dt>payload <span class="property-type">object</span></dt>
+            <dd>Data from gateway when used as a filter (see below).</dd>
+            <dt>sid <span class="property-type">string</span></dt>
+            <dd>Device SID.</dd>
+            <dt>gateway <span class="property-type">object</span></dt>
+            <dd>The <code>xiaomi-configurator</code> object where the device is registred.</dd>
+        </dl>
+    </ol>
+
+    <h4>Details</h4>
+    <p>The incoming message is processed if the input <code>sid</code> matches the configured value for this device.</p>
+    <p>Sample message:</p>
+    <p><pre>{
+  cmd: "report"
+  model: "smoke"
+  sid: "158d00015ef56c"
+  short_id: 21672
+  data: {
+    density: "0"
+  }
+}</pre>
+    <p><pre>{
+  cmd: "heartbeat"
+  model: "smoke"
+  sid: "158d00015ef56c"
+  short_id: 21672
+  data: {
+    voltage: 3035,
+    alarm: "0",
+    batteryLevel: 45
+  }
+}</pre>
+Where <code>batteryLevel</code> is a computed percentage of remaining battery.
+</p>
+</script>
diff --git a/node-red-contrib-xiaomi-smoke/xiaomi-smoke.js b/node-red-contrib-xiaomi-smoke/xiaomi-smoke.js
new file mode 100644
index 0000000..93eb334
--- /dev/null
+++ b/node-red-contrib-xiaomi-smoke/xiaomi-smoke.js
@@ -0,0 +1,9 @@
+const miDevicesUtils = require('../src/utils');
+
+module.exports = (RED) => {
+    // smoke
+    function XiaomiSmokeNode(config) {
+        miDevicesUtils.defaultNode(RED, config, this);
+    }
+    RED.nodes.registerType("xiaomi-smoke", XiaomiSmokeNode);
+};
diff --git a/package.json b/package.json
index eedee03..12b45a8 100644
--- a/package.json
+++ b/package.json
@@ -1,47 +1,35 @@
 {
-  "name": "node-red-contrib-mi-devices",
-  "version": "1.1.1",
-  "description": "A set of nodes to control some of the popular Xiaomi sensors which are connected to the Xiaomi Gateway, and the Gateway itself.",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com:pierrecle/node-red-contrib-mi-devices.git"
-  },
-  "scripts": {
-    "clean": "rimraf dist",
-    "build": "npm run clean && npm run build:ts && npm run build:ejs && npm run build:icons",
-    "build:ts": "tsc --allowUnreachableCode -p .",
-    "build:ejs": "npm run build:ejs:indexes",
-    "build:ejs:indexes": "ejs-cli --base-dir src/ --options \"{\\\"NODES_PREFIX\\\": \\\"mi-devices\\\"}\" \"**/index.ejs\" --out dist/",
-    "build:ejs:devices": "ejs-cli --base-dir src/ --options \"{\\\"NODES_PREFIX\\\": \\\"mi-devices\\\"}\" \"nodes/devices/*.ejs\" --out dist/",
-    "build:icons": "npm run build:icons:yeelight",
-    "build:icons:gateway": "cp -pr icons/gateway dist/nodes/gateway/icons",
-    "build:icons:devices": "cp -pr icons/devices dist/nodes/devices/icons",
-    "build:icons:actions": "cp -pr icons/actions dist/nodes/actions/icons",
-    "build:icons:yeelight": "cp -pr icons/yeelight dist/nodes/yeelight/icons"
-  },
-  "license": "MIT",
-  "keywords": [
-    "Xiaomi",
-    "Aqara",
-    "Yeelight",
-    "node-red"
+  "_args": [
+    [
+      "node-red-contrib-mi-devices@1.1.1",
+      "/private/var/node-red"
+    ]
   ],
-  "node-red": {
-    "nodes": {
-      "xiaomi-ht": "node-red-contrib-xiaomi-ht/xiaomi-ht.js",
-      "xiaomi-magnet": "node-red-contrib-xiaomi-magnet/xiaomi-magnet.js",
-      "xiaomi-motion": "node-red-contrib-xiaomi-motion/xiaomi-motion.js",
-      "xiaomi-switch": "node-red-contrib-xiaomi-switch/xiaomi-switch.js",
-      "xiaomi-socket": "node-red-contrib-xiaomi-socket/xiaomi-socket.js",
-      "xiaomi-socket-wifi": "node-red-contrib-xiaomi-socket-wifi/xiaomi-socket-wifi.js",
-      "xiaomi-all": "node-red-contrib-xiaomi-all/xiaomi-all.js",
-      "xiaomi-configurator": "node-red-contrib-xiaomi-configurator/xiaomi-configurator.js",
-      "xiaomi-gateway": "node-red-contrib-xiaomi-gateway/xiaomi-gateway.js",
-      "xiaomi-actions": "node-red-contrib-xiaomi-actions/xiaomi-actions.js",
-      "xiaomi-yeelight": "dist/nodes/yeelight/index.js"
-    }
+  "_from": "node-red-contrib-mi-devices@1.1.1",
+  "_id": "node-red-contrib-mi-devices@1.1.1",
+  "_inBundle": false,
+  "_integrity": "sha512-uUizxWcRgjML83O+nfElPoct6q+2cZHLN96gvSagzx7MtEtcVtTz0pUYiebWhNWd4EzM5UvDa9mI7KYHNmIKPg==",
+  "_location": "/node-red-contrib-mi-devices",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "node-red-contrib-mi-devices@1.1.1",
+    "name": "node-red-contrib-mi-devices",
+    "escapedName": "node-red-contrib-mi-devices",
+    "rawSpec": "1.1.1",
+    "saveSpec": null,
+    "fetchSpec": "1.1.1"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/node-red-contrib-mi-devices/-/node-red-contrib-mi-devices-1.1.1.tgz",
+  "_spec": "1.1.1",
+  "_where": "/private/var/node-red",
+  "author": {
+    "name": "Pierre CLEMENT"
   },
-  "author": "Pierre CLEMENT",
   "bugs": {
     "url": "https://github.com/pierrecle/node-red-contrib-mi-devices/issues"
   },
@@ -51,14 +39,58 @@
     "miio": "^0.14.1",
     "yeelight-wifi": "^2.3.0"
   },
-  "engines": {
-    "node": ">=4.4.5"
-  },
+  "description": "A set of nodes to control some of the popular Xiaomi sensors which are connected to the Xiaomi Gateway, and the Gateway itself.",
   "devDependencies": {
     "@types/node-red": "^0.17.1",
     "ejs": "^2.5.7",
     "ejs-cli": "^2.0.0",
     "rimraf": "^2.6.2",
     "typescript": "^2.6.2"
-  }
+  },
+  "engines": {
+    "node": ">=4.4.5"
+  },
+  "homepage": "https://github.com/pierrecle/node-red-contrib-mi-devices#readme",
+  "keywords": [
+    "Xiaomi",
+    "Aqara",
+    "Yeelight",
+    "node-red"
+  ],
+  "license": "MIT",
+  "name": "node-red-contrib-mi-devices",
+  "node-red": {
+    "nodes": {
+      "xiaomi-ht": "node-red-contrib-xiaomi-ht/xiaomi-ht.js",
+      "xiaomi-natgas": "node-red-contrib-xiaomi-natgas/xiaomi-natgas.js",
+      "xiaomi-smoke": "node-red-contrib-xiaomi-smoke/xiaomi-smoke.js",
+      "xiaomi-magnet": "node-red-contrib-xiaomi-magnet/xiaomi-magnet.js",
+      "xiaomi-motion": "node-red-contrib-xiaomi-motion/xiaomi-motion.js",
+      "xiaomi-switch": "node-red-contrib-xiaomi-switch/xiaomi-switch.js",
+      "xiaomi-socket": "node-red-contrib-xiaomi-socket/xiaomi-socket.js",
+      "xiaomi-socket-wifi": "node-red-contrib-xiaomi-socket-wifi/xiaomi-socket-wifi.js",
+      "xiaomi-all": "node-red-contrib-xiaomi-all/xiaomi-all.js",
+      "xiaomi-configurator": "node-red-contrib-xiaomi-configurator/xiaomi-configurator.js",
+      "xiaomi-gateway": "node-red-contrib-xiaomi-gateway/xiaomi-gateway.js",
+      "xiaomi-actions": "node-red-contrib-xiaomi-actions/xiaomi-actions.js"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/pierrecle/node-red-contrib-mi-devices.git"
+  },
+  "scripts": {
+    "build": "npm run clean && npm run build:ts && npm run build:ejs && npm run build:icons",
+    "build:ejs": "npm run build:ejs:indexes",
+    "build:ejs:devices": "ejs-cli --base-dir src/ --options \"{\\\"NODES_PREFIX\\\": \\\"mi-devices\\\"}\" \"nodes/devices/*.ejs\" --out dist/",
+    "build:ejs:indexes": "ejs-cli --base-dir src/ --options \"{\\\"NODES_PREFIX\\\": \\\"mi-devices\\\"}\" \"**/index.ejs\" --out dist/",
+    "build:icons": "npm run build:icons:yeelight",
+    "build:icons:actions": "cp -pr icons/actions dist/nodes/actions/icons",
+    "build:icons:devices": "cp -pr icons/devices dist/nodes/devices/icons",
+    "build:icons:gateway": "cp -pr icons/gateway dist/nodes/gateway/icons",
+    "build:icons:yeelight": "cp -pr icons/yeelight dist/nodes/yeelight/icons",
+    "build:ts": "tsc --allowUnreachableCode -p .",
+    "clean": "rimraf dist"
+  },
+  "version": "1.1.1"
 }