Merge pull request #1 from slametps/devel

updated to new minor release
slametps · Sep 24, 2020 · af2c77b · af2c77b
2 parents b6bcb40 + 36b143a
commit af2c77b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,20 @@
+MMM-TuyaSL Change Log
+
+All notable changes will be documented in this file.
+
+## [1.0.1] - 2020-09-24
+
+## Updated
+- round-robin the tuya domain to gain shorter update interval
+- shortening default interval
+
+## [1.0] - 2020-09-20
+
+**Note:** This is an initial release.
+
+### Added
+- list all available devices in Tuya-IoT-Platform (managed by [SmartLife](https://play.google.com/store/apps/details?id=com.tuya.smartlife) app)
+- display options (any states/online only/active only)
+- save accessToken to file (reduce authentication activity)
+- translations (id, en)
+- telegram support (requires MMM-TelegramBot)
diff --git a/MMM-TuyaSL.js b/MMM-TuyaSL.js
@@ -56,7 +56,8 @@ Module.register("MMM-TuyaSL", {
     start: function () {
         var self = this;
         var devices = [];
-        if (self.config.updateInterval < 300*1000) self.config.updateInterval = 300*1000; // minimal is 300*1000 ms
+        const DEFAULT_INTERVAL = 125;
+        if (self.config.updateInterval < DEFAULT_INTERVAL*1000) self.config.updateInterval = DEFAULT_INTERVAL*1000; // minimal is 300*1000 ms
 
         //this.getLogin();
         this.getData();

diff --git a/node_helper.js b/node_helper.js
@@ -16,11 +16,13 @@ var arrDevices = [];
 var arrDevicesItem;
 var accessToken;
 var loginDataResult = {success: false};
+var regionTuya;
 
 module.exports = NodeHelper.create({
 	// Subclass start method.
 	start: function() {
 		console.log("Starting node_helper.js for MMM-TuyaSL.");
+    regionTuya = 'eu';
 	},
 
   dump: function(v, s) {
@@ -169,7 +171,11 @@ module.exports = NodeHelper.create({
         let params = '{"header": {"name": "Discovery", "namespace": "discovery", "payloadVersion": 1}, "payload": {"accessToken": "' + that.accessToken + '"}}';
 
         try {
-          let res = await axios.post('https://px1.tuyaeu.com/homeassistant/skill', params, configAx);
+          let res = await axios.post('https://px1.tuya' + regionTuya + '.com/homeassistant/skill', params, configAx);
+          console.log(`DEBUG: regionTuya     : ${regionTuya}`);
+          if (regionTuya == 'eu') regionTuya = 'us';
+          else if (regionTuya == 'us') regionTuya = 'cn';
+          else if (regionTuya == 'cn') regionTuya = 'eu';
 
           //console.log(`DEBUG: Status code    : ${res.status}`);
           //console.log(`DEBUG: Status text    : ${res.statusText}`);
@@ -183,17 +189,18 @@ module.exports = NodeHelper.create({
           //console.log(`DEBUG: Data.code      : ${res.data.header.code}`);
           //console.log(`DEBUG: Data.payloadVersion: ${res.data.header.payloadVersion}`);
 
-          if (res.data.header.code === 'SUCCESS') {
+          if ("header" in res.data && "code" in res.data.header && res.data.header.code === 'SUCCESS') {
             try {
               function myDeviceItem(value, index, array) {
                 deviceOnline = value.data.online;
+                //deviceOnline = (value.data.online === "false" ? false : value.data.online);
                 deviceState = (value.data.state == "true" ? true : (value.data.state == "false" ? false : value.data.state));
                 arrDevicesItem = {alias:value.name, type:value.dev_type, online:deviceOnline, on_off:deviceState};
                 arrDevices.push(arrDevicesItem);
               }
 
               res.data.payload.devices.forEach(myDeviceItem);
-              //console.log(`DEBUG: Number of Devices = ${arrDevices.length}`);
+              console.log(`DEBUG: Number of Devices = ${arrDevices.length}`);
               //console.log(`DEBUG: Device-List ${that.dump(arrDevices)}`);
             }
             catch (e) {