iobroker.iot 5.0.11 → 5.0.13

package/build/main.js

@@ -8,8 +8,6 @@ const adapter_core_1 = require("@iobroker/adapter-core"); // Get common adapter
 const node_fs_1 = require("node:fs");
 const axios_1 = __importDefault(require("axios"));
 const node_zlib_1 = require("node:zlib");
-// @ts-expect-error no types
-const alexaSmartHomeV2_1 = __importDefault(require("./lib/alexaSmartHomeV2"));
 const alexaSmartHomeV3_1 = __importDefault(require("./lib/alexaSmartHomeV3"));
 const alexaCustom_1 = __importDefault(require("./lib/alexaCustom"));
 // @ts-expect-error no types
@@ -37,7 +35,6 @@ class IotAdapter extends adapter_core_1.Adapter {
     recalcTimeout = null;
     lang = 'de';
     translate = false;
-    alexaSH2 = null;
     alexaSH3 = null;
     googleHome = null;
     alexaCustom = null;
@@ -49,7 +46,7 @@ class IotAdapter extends adapter_core_1.Adapter {
     secret = '';
     connectStarted = 0;
     caCert = null;
-    validTill = null;
+    validTill = null; // null - never read, "--" - user has no license, ISO date string - valid till
     validTillLastQuery = 0;
     alertReported = false;
     constructor(options = {}) {
@@ -63,7 +60,6 @@ class IotAdapter extends adapter_core_1.Adapter {
                     if (this.lang !== 'en' && this.lang !== 'de' && this.lang !== 'ru') {
                         this.lang = 'en';
                     }
-                    this.alexaSH2?.setLanguage(this.lang);
                     this.alexaSH3?.setLanguage(this.lang);
                     this.yandexAlisa?.setLanguage(this.lang);
                     this.alexaCustom?.setLanguage(this.lang);
@@ -135,15 +131,6 @@ class IotAdapter extends adapter_core_1.Adapter {
                             }
                             this.recalcTimeout = setTimeout(async () => {
                                 this.recalcTimeout = null;
-                                this.alexaSH2?.updateDevices(obj.message, async (analyseAddedId) => {
-                                    await this.setStateAsync('smart.updatesResult', analyseAddedId || '', true);
-                                    this.log.debug('Devices updated!');
-                                    await this.setStateAsync('smart.updates', true, true);
-                                });
-                                // this.alexaSH3 && this.alexaSH3.updateDevices(obj.message, async analyseAddedId => {
-                                //     await this.setStateAsync('smart.updatesResult', analyseAddedId || '', true);
-                                //     await this.setStateAsync('smart.updates3', true, true);
-                                // });
                                 if (this.alexaSH3) {
                                     await this.alexaSH3.updateDevices();
                                     await this.setStateAsync('smart.updates3', 1, true);
@@ -155,20 +142,6 @@ class IotAdapter extends adapter_core_1.Adapter {
                                 });
                             }, 1000);
                             break;
-                        case 'browse':
-                            if (obj.callback) {
-                                this.log.info('Request devices');
-                                if (this.alexaSH2) {
-                                    this.alexaSH2.updateDevices(() => {
-                                        this.sendTo(obj.from, obj.command, this.alexaSH2.getDevices(), obj.callback);
-                                        void this.setState('smart.updates', false, true);
-                                    });
-                                }
-                                else {
-                                    this.sendTo(obj.from, obj.command, { error: 'not activated' }, obj.callback);
-                                }
-                            }
-                            break;
                         case 'browse3':
                             if (obj.callback) {
                                 this.log.info(`Request V3 devices: ${obj.message}`);
@@ -253,9 +226,6 @@ class IotAdapter extends adapter_core_1.Adapter {
                         case 'alexaCustomResponse':
                             this.alexaCustom?.setResponse(obj.message);
                             break;
-                        case 'debug':
-                            this.alexaSH2?.getDebug((data) => this.sendTo(obj.from, obj.command, data, obj.callback));
-                            break;
                         case 'updateValidTill':
                             await this.readValidTill(true);
                             this.sendTo(obj.from, obj.command, this.validTill, obj.callback);
@@ -834,9 +804,6 @@ class IotAdapter extends adapter_core_1.Adapter {
                 return { error: 'Service is disabled' };
             }
             else {
-                if (this.alexaSH2) {
-                    return this.alexaSH2.process(request, this.config.amazonAlexa);
-                }
                 return { error: 'Service is disabled' };
             }
         }
@@ -1063,12 +1030,16 @@ class IotAdapter extends adapter_core_1.Adapter {
             this.validTill &&
             this.validTillLastQuery &&
             Date.now() - this.validTillLastQuery < 24 * 3_600_000) {
-            const validTill = new Date(this.validTill);
-            const tomorrow = new Date();
-            tomorrow.setDate(tomorrow.getDate() + 1);
-            if (validTill > tomorrow) {
-                return new Date(this.validTill);
+            if (this.validTill !== '--') {
+                const validTill = new Date(this.validTill);
+                const tomorrow = new Date();
+                tomorrow.setDate(tomorrow.getDate() + 1);
+                if (validTill > tomorrow) {
+                    // use cached value
+                    return;
+                }
             }
+            return;
         }
         try {
             const response = await fetch('https://iobroker.pro:3001/api/v1/validTill', {
@@ -1081,25 +1052,32 @@ class IotAdapter extends adapter_core_1.Adapter {
                 this.validTillLastQuery = Date.now();
                 const data = (await response.json());
                 this.validTill = data.validTill;
-                await this.setStateAsync('info.validTill', this.validTill, true);
-                // If license will expire in less than 7 days, show warning every time adapter starts
-                const validTillDate = new Date(data.validTill);
-                const now = new Date();
-                const diff = validTillDate.getTime() - now.getTime();
-                const days = Math.ceil(diff / (1000 * 3600 * 24));
-                if (days <= 7 && !this.alertReported) {
-                    this.alertReported = true;
-                    await this.registerNotification('iot', 'subscription', validTillDate.toLocaleString());
-                    this.log.warn(`Your ioBroker IoT license will expire in ${days} day(s) on ${validTillDate.toDateString()}. Please renew your license to continue using all features without interruption.`);
+                if (Math.abs(Date.now() - new Date(data.validTill).getTime()) < 120_000) {
+                    // User has no valid license and never had
+                    this.log.debug('You do not have any licenses.');
+                    this.validTill = '--';
                 }
-                return new Date(data.validTill);
+                else {
+                    // If license expires in less than 7 days, show warning every time adapter starts
+                    const validTillDate = new Date(data.validTill);
+                    const now = new Date();
+                    const diff = validTillDate.getTime() - now.getTime();
+                    const days = Math.ceil(diff / (1000 * 3600 * 24));
+                    if (days <= 7 && !this.alertReported) {
+                        this.alertReported = true;
+                        await this.registerNotification('iot', 'subscription', validTillDate.toLocaleString());
+                        this.log.warn(`Your ioBroker IoT license will expire in ${days} day(s) on ${validTillDate.toDateString()}. Please renew your license to continue using all features without interruption.`);
+                    }
+                }
+                await this.setStateAsync('info.validTill', this.validTill, true);
+            }
+            else {
+                this.log.error(`Cannot fetch validTill: ${response.status} ${response.statusText}`);
             }
-            this.log.error(`Cannot fetch validTill: ${response.status} ${response.statusText}`);
         }
         catch (error) {
             this.log.error(`Cannot fetch validTill: ${error}`);
         }
-        return null;
     }
     async startDevice(clientId, login, password, retry) {
         retry ||= 0;
@@ -1456,17 +1434,10 @@ class IotAdapter extends adapter_core_1.Adapter {
         if (this.lang !== 'en' && this.lang !== 'de' && this.lang !== 'ru') {
             this.lang = 'en';
         }
-        if (this.config.amazonAlexa) {
-            this.alexaSH2 = new alexaSmartHomeV2_1.default(this);
-            this.alexaSH2.setLanguage(this.lang, this.translate);
-            this.alexaSH2.updateDevices();
-        }
-        else {
-            // Check that update result is empty
-            const state = await this.getStateAsync('smart.updatesResult');
-            if (state?.val) {
-                await this.setStateAsync('smart.updatesResult', '', true);
-            }
+        // Check that update result is empty
+        const state = await this.getStateAsync('smart.updatesResult');
+        if (state?.val) {
+            await this.setStateAsync('smart.updatesResult', '', true);
         }
         this.remote?.setLanguage(this.lang);
         // check password
@@ -1546,7 +1517,7 @@ class IotAdapter extends adapter_core_1.Adapter {
             this.yandexAlisa = new alisa_1.default(this, this.urlKey);
         }
         else {
-            // Check that update result is empty
+            // Check that an update result is empty
             const state = await this.getStateAsync('smart.updatesYA');
             if (state?.val) {
                 await this.setStateAsync('smart.updatesYA', '', true);