iobroker.airzone 1.0.2 → 2.0.1

package/io-package.json

@@ -1,111 +1,154 @@
-{
-   "common":{
-      "name":"airzone",
-      "version":"1.0.2",
-      "news":{
-         "1.0.0":{
-            "en": "initial release",
-            "de": "Erstveröffentlichung",
-            "ru": "Первый выпуск",
-            "pt": "lançamento inicial",
-            "nl": "Eerste uitgave",
-            "fr": "Première version",
-            "it": "Versione iniziale",
-            "es": "Versión inicial",
-            "pl": "Pierwsze wydanie",
-            "zh-cn": "初始发行"
-         },
-         "1.0.1":{
-            "en": "Various corrections in the project structure",
-            "de": "Verschiedene Korrekturen in der Projektstruktur",
-            "ru": "Различные исправления в структуре проекта",
-            "pt": "Várias correções na estrutura do projeto",
-            "nl": "Diverse correcties in de projectstructuur",
-            "fr": "Diverses corrections dans la structure du projet",
-            "it": "Varie correzioni nella struttura del progetto",
-            "es": "Varias correcciones en la estructura del proyecto",
-            "pl": "Różne poprawki w strukturze projektu",
-            "zh-cn": "项目结构中的各种更正"
-         }
-		 "1.0.2":{
-            "en": "Corrections after code review by Apollon77",
-			"de": "Korrekturen nach Codeüberprüfung durch Apollon77",
-			"ru": "Исправления после проверки кода Apollon77",
-			"pt": "Correções após revisão de código por Apollon77",
-			"nl": "Correcties na codebeoordeling door Apollon77",
-			"fr": "Corrections après révision du code par Apollon77",
-			"it": "Correzioni dopo la revisione del codice da parte di Apollon77",
-			"es": "Correcciones después de la revisión del código por Apollon77",
-			"pl": "Poprawki po przeglądzie kodu przez Apollon77",
-			"zh-cn": "经过Apollon77代码审查后的更正"
-         }
-      },
-      "title":"Airzone Cloud",
-      "titleLang":{
-         "en": "Airzone Cloud",
-         "de": "Airzone Cloud",
-         "ru": "Облако Airzone",
-         "pt": "Airzone Cloud",
-         "nl": "Airzone Cloud",
-         "fr": "Nuage d'Airzone",
-         "it": "Airzone Cloud",
-         "es": "Nube de Airzone",
-         "pl": "Chmura Airzone",
-         "zh-cn": "空域云"
-      },
-      "desc":{
-         "en": "Adapter for connecting the Airzone Cloud.",
-         "de": "Adapter zum Anschließen der Airzone Cloud.",
-         "ru": "Адаптер для подключения Airzone Cloud.",
-         "pt": "Adaptador para conectar o Airzone Cloud.",
-         "nl": "Adapter voor het aansluiten van de Airzone Cloud.",
-         "fr": "Adaptateur pour connecter le Cloud Airzone.",
-         "it": "Adattatore per il collegamento dell'Airzone Cloud.",
-         "es": "Adaptador para conectar Airzone Cloud.",
-         "pl": "Adapter do podłączenia chmury Airzone.",
-         "zh-cn": "用于连接Airzone Cloud的适配器。"
-      },
-      "authors":[
-         "Christian Schemmer <christian.silentphoenix11@gmail.com>"
-      ],
-      "keywords":[
-         "ioBroker",
-         "airzone",
-         "Smart Home",
-         "home automation"
-      ],
-      "license":"MIT",
-      "platform":"Javascript/Node.js",
-      "main":"main.js",
-      "icon":"AirzoneSmall.png",
-      "extIcon":"https://raw.githubusercontent.com/SilentPhoenix11/ioBroker.airzone/master/admin/AirzoneSmall.png",
-      "enabled":true,
-      "readme":"https://github.com/SilentPhoenix11/ioBroker.airzone/blob/master/README.md",
-      "loglevel":"info",
-      "mode":"daemon",
-      "type":"climate-control",
-	   "compact":true,
-      "connectionType":"cloud",
-	   "dataSource":"poll",      
-      "materialize":true,      
-      "dependencies":[
-         {
-            "js-controller":">=2.0.0"
-         }
-      ]
-   },
-   "native":{
-      "username":"",
-      "password":"",
-      "base_url":"https://airzonecloud.com",
-      "sync_time":30
-   },
-   "encryptedNative": [
-       "password"
-   ],
-   "protectedNative": [
-       "password"
-   ],
-   "objects":[],
-   "instanceObjects":[]
+{
+   "common":{
+      "name":"airzone",
+      "version":"2.0.1",
+      "news":{
+         "1.0.0":{
+            "en": "initial release",
+            "de": "Erstveröffentlichung",
+            "ru": "Первый выпуск",
+            "pt": "lançamento inicial",
+            "nl": "Eerste uitgave",
+            "fr": "Première version",
+            "it": "Versione iniziale",
+            "es": "Versión inicial",
+            "pl": "Pierwsze wydanie",
+            "zh-cn": "初始发行"
+         },
+         "1.0.1":{
+            "en": "Various corrections in the project structure",
+            "de": "Verschiedene Korrekturen in der Projektstruktur",
+            "ru": "Различные исправления в структуре проекта",
+            "pt": "Várias correções na estrutura do projeto",
+            "nl": "Diverse correcties in de projectstructuur",
+            "fr": "Diverses corrections dans la structure du projet",
+            "it": "Varie correzioni nella struttura del progetto",
+            "es": "Varias correcciones en la estructura del proyecto",
+            "pl": "Różne poprawki w strukturze projektu",
+            "zh-cn": "项目结构中的各种更正"
+         },
+		 "1.0.2":{
+            "en": "Corrections after code review by Apollon77",
+			"de": "Korrekturen nach Codeüberprüfung durch Apollon77",
+			"ru": "Исправления после проверки кода Apollon77",
+			"pt": "Correções após revisão de código por Apollon77",
+			"nl": "Correcties na codebeoordeling door Apollon77",
+			"fr": "Corrections après révision du code par Apollon77",
+			"it": "Correzioni dopo la revisione del codice da parte di Apollon77",
+			"es": "Correcciones después de la revisión del código por Apollon77",
+			"pl": "Poprawki po przeglądzie kodu przez Apollon77",
+			"zh-cn": "经过Apollon77代码审查后的更正"
+         },
+		 "1.0.3":{
+			"en": "Fix of SyntaxError: Unexpected end of JSON input when calling askSystemInfo",
+			"de": "Korrektur von SyntaxError: Unerwartetes Ende der JSON-Eingabe beim Aufruf von askSystemInfo",
+			"ru": "Исправление SyntaxError: неожиданный конец ввода JSON при вызове askSystemInfo",
+			"pt": "Correção de SyntaxError: fim inesperado da entrada JSON ao chamar askSystemInfo",
+			"nl": "Fix van SyntaxError: onverwacht einde van JSON-invoer bij het aanroepen van askSystemInfo",
+			"fr": "Correction de SyntaxError: fin inattendue de l'entrée JSON lors de l'appel de askSystemInfo",
+			"it": "Correzione di SyntaxError: fine imprevista dell'input JSON durante la chiamata a askSystemInfo",
+			"es": "Corrección de SyntaxError: final inesperado de la entrada JSON al llamar a askSystemInfo",
+			"pl": "Poprawka błędu SyntaxError: nieoczekiwany koniec danych wejściowych JSON podczas wywoływania askSystemInfo",
+			"zh-cn": "解决SyntaxError：调用askSystemInfo时JSON输入意外结束"
+		 },
+		 "1.0.4":{
+			"en": "Small fixes",
+			"de": "Kleine Korrekturen",
+			"ru": "Небольшие исправления",
+			"pt": "Pequenas correções",
+			"nl": "Kleine reparaties",
+			"fr": "Petits correctifs",
+			"it": "Piccole correzioni",
+			"es": "Pequeñas correcciones",
+			"pl": "Małe poprawki",
+			"zh-cn": "小修正"
+		 },
+		 "2.0.0":{
+			"en": "Using the local API",
+			"de": "Verwendung der local API",
+			"ru": "Использование локального API",
+			"pt": "Utilização do API local",
+			"nl": "Gebruik van de lokale API",
+			"fr": "Utilisation de l'API locale",
+			"it": "Uso dell'API locale",
+			"es": "Uso de la API local",
+			"pl": "Korzystanie z lokalnego API",
+			"zh-cn": "使用本地API"
+		 },
+		  "2.0.1":{
+			"en": "Small fixes",
+			"de": "Kleine Korrekturen",
+			"ru": "Небольшие исправления",
+			"pt": "Pequenas correções",
+			"nl": "Kleine reparaties",
+			"fr": "Petits correctifs",
+			"it": "Piccole correzioni",
+			"es": "Pequeñas correcciones",
+			"pl": "Małe poprawki",
+			"zh-cn": "小修正"
+		 }
+      },
+      "title":"Airzone Local API",
+      "titleLang":{
+         "en": "Airzone local API",
+         "de": "Airzone lokale API",
+         "ru": "Airzone local API",
+         "pt": "Airzone local API",
+         "nl": "Airzone lokale API",
+         "fr": "Airzone local API",
+         "it": "API locale di Airzone",
+         "es": "API local de Airzone",
+         "pl": "Lokalne API strefy lotniczej",
+         "zh-cn": "Airzone本地API"
+      },
+      "desc":{
+         "en": "Allows the integration of an Airzone system.",
+         "de": "Ermöglicht die Integration eines Airzone Systems.",
+         "ru": "Позволяет интегрировать систему Airzone.",
+         "pt": "Permite a integração de um sistema de Zona Aérea.",
+         "nl": "Maakt de integratie van een Airzone-systeem mogelijk.",
+         "fr": "Permet d'intégrer un système Airzone.",
+         "it": "Permette l'integrazione di un sistema Airzone.",
+         "es": "Permite la integración de un sistema Airzone.",
+         "pl": "Umożliwia integrację systemu Airzone.",
+         "zh-cn": "实现了Airzone系统的整合。"
+      },
+      "authors":[
+         "Christian Schemmer <christian.silentphoenix11@gmail.com>"
+      ],
+      "keywords":[
+         "ioBroker",
+         "airzone",
+         "Smart Home",
+         "home automation"
+      ],
+      "license":"MIT",
+      "platform":"Javascript/Node.js",
+      "main":"main.js",
+      "icon":"AirzoneSmall.png",
+      "extIcon":"https://raw.githubusercontent.com/SilentPhoenix11/ioBroker.airzone/master/admin/AirzoneSmall.png",
+      "enabled":true,
+      "readme":"https://github.com/SilentPhoenix11/ioBroker.airzone/blob/master/README.md",
+      "loglevel":"info",
+      "mode":"daemon",
+      "type":"climate-control",
+	   "compact":true,
+      "connectionType":"local",
+	   "dataSource":"poll",      
+      "materialize":true,      
+      "dependencies":[
+         {
+            "js-controller":">=2.0.0"
+         }
+      ]
+   },
+   "native":{
+      "local_ip":"",
+      "system_id":1,
+      "sync_time":5      
+   },
+   "encryptedNative": [],
+   "protectedNative": [],
+   "objects":[],
+   "instanceObjects":[]
 }

package/main.js

@@ -1,145 +1,154 @@
-'use strict';
-
-const adaptername = "airzone"
-
-const utils = require('@iobroker/adapter-core');
-const AirzoneCloud = require("./Cloud/AirzoneCloud");
-
-
-class Template extends utils.Adapter {
-
-    /**
-     * @param {Partial<utils.AdapterOptions>} [options={}]
-     */
-    constructor(options) {
-        super({
-            ...options,
-            name: adaptername,
-        });        
-        this.on('ready', this.onReady.bind(this));
-        this.on('stateChange', this.onStateChange.bind(this));
-        // this.on('objectChange', this.onObjectChange.bind(this));
-        // this.on('message', this.onMessage.bind(this));
-        this.on('unload', this.onUnload.bind(this));        
-        this.stateChangeCallbacks = {};
-    }
-
-    /**
-     * Is called when databases are connected and adapter received configuration.
-     */    
-    async onReady() {
-        // Initialize your adapter here
-        this.session = new AirzoneCloud(this, this.config.username, this.config.password, this.config.base_url);
-        await this.session.init();        
-        this.initialized = true;
-
-        if(this.config.sync_time > 0) {        
-            this.update();
-        }
-    }
-
-    update() {
-        var syncTime = Math.max(this.config.sync_time, 15);
-
-        setTimeout(
-            (function(self) {         //Self-executing func which takes 'this' as self
-                return async function() {   //Return a function in the context of 'self'
-                    if(!self.initialized)
-                        return;
-                    try {
-                        await self.session.update();
-                    } catch (e) {
-                        adapter.log.error('error during update '+e);
-                    }
-
-                    if(self.initialized)
-                        self.update();
-                }
-            })(this), syncTime * 1000);
-    }
-
-    /**
-     * Is called when adapter shuts down - callback has to be called under any circumstances!
-     * @param {() => void} callback
-     */
-    onUnload(callback) {
-        this.initialized = false;
-        callback();
-    }
-    
-    /**
-     * Is called if a subscribed state changes
-     * @param {string} id
-     * @param {ioBroker.State | null | undefined} state
-     */
-    async onStateChange(id, state) {
-
-        if (state.from.search (adaptername) != -1) {return;}  // do not process self generated state changes
-
-        if (state) {
-            var callback = this.stateChangeCallbacks[id];
-            if(callback != undefined) {
-                var method = callback['method'];
-                var target = callback['target'];
-                await method(target, id, state);
-            }
-        }
-    }
-
-    async createProperty(_path, _name, _type, _read, _write, _role){
-        await this.setObjectNotExistsAsync(_path+"."+_name, {
-            type: 'state',
-            common: {
-                name: _name,
-                type: _type,
-                read: _read,
-                write: _write,
-                role: _role,
-            },
-            native: {},
-        });
-    }
-
-    async createProperty(_path, _name, _type, _min, _max, _unit, _read, _write, _role){
-        await this.setObjectNotExistsAsync(_path+"."+_name, {
-            type: 'state',
-            common: {
-                name: _name,
-                type: _type,
-                read: _read,                
-                write: _write,
-                role: _role,
-                min : _min,
-                max : _max,
-                unit : _unit
-            },
-            native: {},
-        });
-    }
-
-    async updatePropertyValue(_path, _name, _value) {
-        await this.setStateAsync(_path+"."+_name, { val: _value, ack: true } );
-    }
-
-    async createPropertyAndInit(_path, _name, _type, _read, _write, _value, _role){
-        await this.createProperty(_path, _name, _type, _read, _write, _role);
-        await this.updatePropertyValue(_path, _name, _value);
-    }
-    
-    subscribeState(path, obj, callback) {
-        this.subscribeStates(path);       
-        var id = this.namespace+'.'+path;
-        this.stateChangeCallbacks[id] = {target: obj, method : callback};
-    }
-}
-
-if (require.main !== module) {
-    // Export the constructor in compact mode
-    /**
-     * @param {Partial<utils.AdapterOptions>} [options={}]
-     */
-    module.exports = (options) => new Template(options);
-} else {
-    // otherwise start the instance directly
-    new Template();
+'use strict';
+
+const adaptername = "airzone"
+
+const utils = require('@iobroker/adapter-core');
+const AirzoneLocalApi = require("./LocalApi/AirzoneLocalApi");
+
+
+class Template extends utils.Adapter {
+
+    /**
+     * @param {Partial<utils.AdapterOptions>} [options={}]
+     */
+    constructor(options) {
+        super({
+            ...options,
+            name: adaptername,
+        });        
+        this.on('ready', this.onReady.bind(this));
+        this.on('stateChange', this.onStateChange.bind(this));
+        // this.on('objectChange', this.onObjectChange.bind(this));
+        // this.on('message', this.onMessage.bind(this));
+        this.on('unload', this.onUnload.bind(this));        
+        this.stateChangeCallbacks = {};
+    }
+
+    /**
+     * Is called when databases are connected and adapter received configuration.
+     */    
+    async onReady() {
+        // Initialize your adapter here
+        try
+        {
+            this.log.info('Init Airzone local api...');
+            this.session = new AirzoneLocalApi(this, this.config.local_ip);
+            await this.session.init(parseInt(this.config.system_id));
+            this.log.info('Init Airzone local api succeeded.');
+        } 
+        catch (e) 
+        {
+            this.log.error('Init Airzone local api failed: '+e+'\r\n'+e.stack);
+        }
+        this.initialized = true;
+
+        if(this.config.sync_time > 0) {        
+            this.update();
+        }
+    }
+
+    update() {
+        var syncTime = Math.max(this.config.sync_time, 1);
+
+        setTimeout(
+            (function(self) {         //Self-executing func which takes 'this' as self
+                return async function() {   //Return a function in the context of 'self'
+                    if(!self.initialized)
+                        return;
+                    try {
+                        await self.session.update();
+                    } catch (e) {
+                        self.log.error('error during update '+e+'\r\n'+e.stack);
+                    }
+
+                    if(self.initialized)
+                        self.update();
+                }
+            })(this), syncTime * 1000);
+    }
+
+    /**
+     * Is called when adapter shuts down - callback has to be called under any circumstances!
+     * @param {() => void} callback
+     */
+    onUnload(callback) {
+        this.initialized = false;
+        callback();
+    }
+    
+    /**
+     * Is called if a subscribed state changes
+     * @param {string} id
+     * @param {ioBroker.State | null | undefined} state
+     */
+    async onStateChange(id, state) {
+
+        if (state.from.search (adaptername) != -1) {return;}  // do not process self generated state changes
+
+        if (state) {
+            var callback = this.stateChangeCallbacks[id];
+            if(callback != undefined) {
+                var method = callback['method'];
+                var target = callback['target'];
+                await method(target, id, state);
+            }
+        }
+    }
+
+    async createProperty(_path, _name, _type, _read, _write, _role){
+        await this.setObjectNotExistsAsync(_path+"."+_name, {
+            type: 'state',
+            common: {
+                name: _name,
+                type: _type,
+                read: _read,
+                write: _write,
+                role: _role,
+            },
+            native: {},
+        });
+    }
+
+    async createUnitProperty(_path, _name, _type, _min, _max, _unit, _read, _write, _role){
+        await this.setObjectNotExistsAsync(_path+"."+_name, {
+            type: 'state',
+            common: {
+                name: _name,
+                type: _type,
+                read: _read,                
+                write: _write,
+                role: _role,
+                min : _min,
+                max : _max,
+                unit : _unit
+            },
+            native: {},
+        });
+    }
+
+    async updatePropertyValue(_path, _name, _value) {
+        await this.setStateAsync(_path+"."+_name, { val: _value, ack: true } );
+    }
+
+    async createPropertyAndInit(_path, _name, _type, _read, _write, _value, _role){
+        await this.createProperty(_path, _name, _type, _read, _write, _role);
+        await this.updatePropertyValue(_path, _name, _value);
+    }
+    
+    subscribeState(path, obj, callback) {
+        this.subscribeStates(path);       
+        var id = this.namespace+'.'+path;
+        this.stateChangeCallbacks[id] = {target: obj, method : callback};
+    }
+}
+
+if (require.main !== module) {
+    // Export the constructor in compact mode
+    /**
+     * @param {Partial<utils.AdapterOptions>} [options={}]
+     */
+    module.exports = (options) => new Template(options);
+} else {
+    // otherwise start the instance directly
+    new Template();
 }

package/package.json

@@ -1,7 +1,7 @@
 {
    "name":"iobroker.airzone",
-   "version":"1.0.2",
-   "description":"Airzone cloud adapter for ioBroker",
+   "version":"2.0.1",
+   "description":"Airzone local api integration for ioBroker",
    "author":{
       "name":"Christian Schemmer",
       "email":"christian.silentphoenix11@gmail.com"