Merge pull request #96 from Grizzelbee/Devg_0.9.0

Devg 0.9.0
Grizzelbee · Apr 21, 2021 · ae30ad5 · ae30ad5
2 parents e8e89b9 + eee8a89
commit ae30ad5
Show file tree

Hide file tree

Showing 8 changed files with 796 additions and 218 deletions.
diff --git a/.npmignore b/.npmignore
@@ -27,4 +27,8 @@ package-lock.json
 admin/i18n
 
 # maintenance scripts
-maintenance/**
+maintenance/**
+
+# CorelDraw files
+*.cdr
+*.bak
diff --git a/dyson-utils.js b/dyson-utils.js
@@ -2,26 +2,28 @@
 
 const _ = require('lodash');
 const crypto = require('crypto');
+const {stringify} = require('flatted');
+const dysonConstants = require('./dysonConstants.js');
 const axios  = require('axios');
 const path = require('path');
 const https = require('https');
 const rootCas = require('ssl-root-cas').create();
-const {stringify} = require('flatted');
 const httpsAgent = new https.Agent({ca: rootCas});
-const supportedProductTypes = ['358', '438', '455', '469', '475', '520', '527'];
-const apiUri = 'https://appapi.cp.dyson.com';
 rootCas.addFile(path.resolve(__dirname, 'certificates/intermediate.pem'));
 
-// class DysonUtils {
-//     DysonUtils() {}
-// }
 
+/*
+module.exports.getDyson2faMail(email, passwd, country, locale){
+    adapter.log.error('getDyson2faMail - Here we Go!');
+
+}
+*/
 /**
  * Function zeroFill
  *
  * Formats a number as a string with leading zeros
  *
- * @param number {number} Value thats needs to be filled up with leading zeros
+ * @param number {string} Value thats needs to be filled up with leading zeros
  * @param width  {number} width of the complete new string incl. number and zeros
  *
  * @returns The given number filled up with leading zeros to a given width (excluding the negative sign), returns empty string if number is not an actual number.
@@ -46,11 +48,11 @@ module.exports.zeroFill = function (number, width) {
  *           resolves if the config is valid
  *           rejects if the config is invalid
  *
- * @param config {Adapter} ioBroker adapter which contains the configuration that should be checked
+ * @param adapter {object} ioBroker adapter which contains the configuration that should be checked
  */
 module.exports.checkAdapterConfig = async function (adapter) {
     const config = adapter.config;
-    // Prepare masked Config for debuggging
+    // Prepare masked Config for debugging
     const logConfig = JSON.stringify(this.maskConfig(config));
 
     return new Promise(
@@ -116,8 +118,8 @@ module.exports.getDevices = async function(myAccount, adapter) {
                 const devices = [];
                 for (const thisDevice in response.data) {
                     adapter.log.debug('Data received from dyson API: ' + JSON.stringify(response.data[thisDevice]));
-                    // TODO Try to switch from supportedProductTypes-array to products-object
-                    if (!supportedProductTypes.some(function (t) {
+                    // TODO Try to switch from SUPPORTED_PRODUCT_TYPES-array to PRODUCTS-object
+                    if (!dysonConstants.SUPPORTED_PRODUCT_TYPES.some(function (t) {
                         return t === response.data[thisDevice].ProductType;
                     })) {
                         adapter.log.warn('Device with serial number [' + response.data[thisDevice].Serial + '] not added, hence it is not supported by this adapter. Product type: [' + response.data[thisDevice].ProductType + ']');
@@ -159,26 +161,30 @@ module.exports.dysonAPILogIn = async function(adapter) {
         'Email': adapter.config.email,
         'Password': adapter.config.Password
     };
+    const config = {
+        httpsAgent,
+        headers : headers,
+        json:true
+    };
 
-    const response = await axios.get(apiUri + `/v1/userregistration/userstatus?country=${adapter.config.country}&email=${adapter.config.email}`,
-        { httpsAgent,
-            headers: headers,
-            json: true
-        });
+    const response = await axios.get(dysonConstants.API_URI + `/v1/userregistration/userstatus?country=${adapter.config.country}&email=${adapter.config.email}`,
+        config);
     if (response.data.accountStatus === 'ACTIVE') {
         adapter.log.info(`Result from API-Status request -> Account is: ${response.data.accountStatus}`);
     } else {
         adapter.log.warn(`Result from API-Status request -> Account is: ${response.data.accountStatus}`);
     }
     // Sends the login request to the API
-    return await axios.post(apiUri + '/v1/userregistration/authenticate?country=' + adapter.config.country,
+    return await axios.post(dysonConstants.API_URI + '/v1/userregistration/authenticate?country=' + adapter.config.country,
         payload,
         { httpsAgent,
             headers: headers,
             json   : true
         });
 };
 
+
+
 /**
  * dysonGetDevicesFromApi
  *
@@ -189,7 +195,7 @@ module.exports.dysonAPILogIn = async function(adapter) {
  *      rejects on any http error.
  */module.exports.dysonGetDevicesFromApi = async function(auth) {
     // Sends a request to the API to get all devices of the user
-    return await axios.get(apiUri + '/v2/provisioningservice/manifest',
+    return await axios.get(dysonConstants.API_URI + '/v2/provisioningservice/manifest',
         {
             httpsAgent,
             headers: { 'Authorization': auth },
@@ -226,7 +232,8 @@ module.exports.getMqttCredentials = function(adapter) {
                             adapter.log.error(`Credentials used for login: User:[${adapter.config.email}] - Password:[${adapter.config.Password}] - Country:[${adapter.config.country}]`);
                             break;
                         case 429: // endpoint currently not available
-                            adapter.log.error('Error: Endpoint: ' + apiUri + '/v1/userregistration/authenticate?country=' + adapter.config.country);
+                            adapter.log.error('Error: Endpoint: ' + dysonConstants.API_URI + '/v1/userregistration/authenticate?country=' + adapter.config.country);
+                            break;
                         default:
                             adapter.log.error('[error.response.data]: ' + ((typeof error.response.data === 'object') ? stringify(error.response.data) : error.response.data));
                             adapter.log.error('[error.response.status]: ' + ((typeof error.response.status === 'object') ? stringify(error.response.status) : error.response.status));
@@ -264,7 +271,7 @@ module.exports.maskConfig = function (unmaskedConfig) {
  * @param msg Incoming JSON message
  */
 module.exports.parseDysonMessage = function (msg) {
-    if (null == msg || '' == msg) return;
+    if (null == msg || '' === msg) return;
 
     // TODO incomplete
 

diff --git a/dysonConstants.js b/dysonConstants.js
diff --git a/io-package.json b/io-package.json
@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "dysonairpurifier",
-        "version": "0.8.1",
+        "version": "0.8.2",
         "news": {
+            "0.8.2": {
+                "en": "Support for new dyson login procedure and bugfixes.",
+                "de": "Unterstützung für neue Dyson-Anmeldeverfahren und Bugfixes.",
+                "ru": "Поддержка новой процедуры входа в систему dyson и исправления.",
+                "pt": "Suporte para novo procedimento de login dyson e correções de bugs.",
+                "nl": "Ondersteuning voor nieuwe dyson-inlogprocedure en bugfixes.",
+                "fr": "Prise en charge de la nouvelle procédure de connexion dyson et corrections de bogues.",
+                "it": "Supporto per la nuova procedura di accesso a Dyson e correzioni di bug.",
+                "es": "Soporte para el nuevo procedimiento de inicio de sesión de Dyson y correcciones de errores.",
+                "pl": "Wsparcie dla nowej procedury logowania dyson i poprawek błędów.",
+                "zh-cn": "支持新的dyson登录过程和错误修正。"
+            },
             "0.8.0": {
                 "en": "Improved humidifier support and bugfixes.",
                 "de": "Verbesserte Luftbefeuchterunterstützung und Bugfixes.",
@@ -210,7 +222,7 @@
             "zh-cn": "将戴森空气净化器和风扇集成到ioBroker中"
         },
         "authors": [
-            "Hanjo Hingsen <hanjo@hingsen.de>"
+            "Hanjo Hingsen <open.source@hingsen.de>"
         ],
         "keywords": [
             "ioBroker",
@@ -224,7 +236,6 @@
         ],
         "license": "MIT",
         "platform": "Javascript/Node.js",
-        "main": "main.js",
         "icon": "dyson_logo.svg",
         "enabled": true,
         "extIcon": "https://github.com/Grizzelbee/ioBroker.dysonairpurifier/blob/master/admin/dyson_logo.svg",
@@ -236,7 +247,7 @@
         "materialize": true,
         "supportCustoms": false,
         "connectionType": "local",
-        "dataSource": "pull",
+        "dataSource": "poll",
         "dependencies": [
             {
                 "js-controller": ">=3.0.0",