iobroker.iot 4.0.2 → 4.0.3

package/admin/rules/assets/{virtualExposes-BqVak7rX.js → virtualExposes-BNZJTatg.js}

@@ -1,2 +1,2 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./ActionVisu-D9x2f6zu.js","./ActionVisu__mf_v__runtimeInit__mf_v__-Cz053nO7.js"])))=>i.map(i=>d[i]);
-import{_ as o}from"./preload-helper-Dp1pzeXC.js";const a={"./ActionVisu":async()=>{const t=await o(()=>import("./ActionVisu-D9x2f6zu.js"),__vite__mapDeps([0,1]),import.meta.url),e={};return Object.assign(e,t),Object.defineProperty(e,"__esModule",{value:!0,enumerable:!1}),e}};export{a as default};
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./ActionVisu-DE8dgNVF.js","./ActionVisu__mf_v__runtimeInit__mf_v__-DtUoI3FU.js"])))=>i.map(i=>d[i]);
+import{_ as o}from"./preload-helper-Dp1pzeXC.js";const a={"./ActionVisu":async()=>{const t=await o(()=>import("./ActionVisu-DE8dgNVF.js"),__vite__mapDeps([0,1]),import.meta.url),e={};return Object.assign(e,t),Object.defineProperty(e,"__esModule",{value:!0,enumerable:!1}),e}};export{a as default};

package/admin/rules/customRuleBlocks.js

@@ -1,2 +1,2 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-DwYdaT5M.js","./assets/ActionVisu__loadShare__react__loadShare__-Cg21Ef1U.js","./assets/_commonjsHelpers-Cpj98o6Y.js","./assets/ActionVisu__mf_v__runtimeInit__mf_v__-Cz053nO7.js","./assets/ActionVisu__loadShare__react_mf_2_dom__loadShare__-B1zRWn0u.js","./assets/index-Do-nCdWy.js","./assets/index-CAAeiKCc.js"])))=>i.map(i=>d[i]);
-import{i as m,A as p}from"./assets/ActionVisu__mf_v__runtimeInit__mf_v__-Cz053nO7.js";import s from"./assets/virtualExposes-BqVak7rX.js";import{_ as n}from"./assets/preload-helper-Dp1pzeXC.js";const i={"@iobroker/adapter-react-v5":async()=>await n(()=>import("./assets/index-DwYdaT5M.js"),__vite__mapDeps([0,1,2,3,4]),import.meta.url),react:async()=>await n(()=>import("./assets/index-Do-nCdWy.js").then(t=>t.i),__vite__mapDeps([5,2]),import.meta.url),"react-dom":async()=>await n(()=>import("./assets/index-CAAeiKCc.js").then(t=>t.i),__vite__mapDeps([6,2,1,3]),import.meta.url)},a={"@iobroker/adapter-react-v5":{name:"@iobroker/adapter-react-v5",version:"7.6.18",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["@iobroker/adapter-react-v5"].loaded=!0;const{"@iobroker/adapter-react-v5":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},react:{name:"react",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a.react.loaded=!0;const{react:e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"react-dom":{name:"react-dom",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["react-dom"].loaded=!0;const{"react-dom":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}}},f=[],u={},c="default",d="ActionVisu";async function k(e={},t=[]){const r=m.init({name:d,remotes:f,shared:a,plugins:[],shareStrategy:"version-first"});var o=u[c];if(o||(o=u[c]={from:d}),!(t.indexOf(o)>=0)){t.push(o),r.initShareScopeMap("default",e);try{await Promise.all(await r.initializeSharing("default",{strategy:"version-first",from:"build",initScope:t}))}catch(l){console.error(l)}return p.initResolve(r),r}}function y(e){if(!(e in s))throw new Error(`Module ${e} does not exist in container.`);return s[e]().then(t=>()=>t)}export{y as get,k as init};
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-_Y2FN5EZ.js","./assets/ActionVisu__loadShare__react__loadShare__-BKaC-p5K.js","./assets/_commonjsHelpers-Cpj98o6Y.js","./assets/ActionVisu__mf_v__runtimeInit__mf_v__-DtUoI3FU.js","./assets/ActionVisu__loadShare__react_mf_2_dom__loadShare__-Bs1o8DtQ.js","./assets/index-Do-nCdWy.js","./assets/index-DjPMvPni.js"])))=>i.map(i=>d[i]);
+import{i as m,A as p}from"./assets/ActionVisu__mf_v__runtimeInit__mf_v__-DtUoI3FU.js";import s from"./assets/virtualExposes-BNZJTatg.js";import{_ as n}from"./assets/preload-helper-Dp1pzeXC.js";const i={"@iobroker/adapter-react-v5":async()=>await n(()=>import("./assets/index-_Y2FN5EZ.js"),__vite__mapDeps([0,1,2,3,4]),import.meta.url),react:async()=>await n(()=>import("./assets/index-Do-nCdWy.js").then(t=>t.i),__vite__mapDeps([5,2]),import.meta.url),"react-dom":async()=>await n(()=>import("./assets/index-DjPMvPni.js").then(t=>t.i),__vite__mapDeps([6,2,1,3]),import.meta.url)},a={"@iobroker/adapter-react-v5":{name:"@iobroker/adapter-react-v5",version:"7.7.2",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["@iobroker/adapter-react-v5"].loaded=!0;const{"@iobroker/adapter-react-v5":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},react:{name:"react",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a.react.loaded=!0;const{react:e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"react-dom":{name:"react-dom",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["react-dom"].loaded=!0;const{"react-dom":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}}},f=[],u={},c="default",d="ActionVisu";async function k(e={},t=[]){const r=m({name:d,remotes:f,shared:a,plugins:[],shareStrategy:"version-first"});var o=u[c];if(o||(o=u[c]={from:d}),!(t.indexOf(o)>=0)){t.push(o),r.initShareScopeMap("default",e);try{await Promise.all(await r.initializeSharing("default",{strategy:"version-first",from:"build",initScope:t}))}catch(l){console.error(l)}return p.initResolve(r),r}}function y(e){if(!(e in s))throw new Error(`Module ${e} does not exist in container.`);return s[e]().then(t=>()=>t)}export{y as get,k as init};

package/build-backend/lib/alexaCustom.js

@@ -16,7 +16,6 @@ class AlexaCustom {
     openSessions = {};
     knownDevices = {};
     knownUsers = {};
-    lastSkillRequestWasV2 = false;
     config;
     adapter;
     constructor(adapter) {
@@ -53,7 +52,7 @@ class AlexaCustom {
     #writeResponse(_channelId, _stateId, _command, _value) {
         // adapter.log.warn('[CUSTOM] Unknown applianceId: ' + deviceId);
     }
-    #getResponseV1(text, repromptText, shouldEndSession) {
+    #getResponseV1(text, repromptText, requestId, shouldEndSession) {
         let speechPlainText = text;
         let speechType = 'PlainText';
         if (text.startsWith('<speak>')) {
@@ -67,11 +66,14 @@ class AlexaCustom {
         const response = {
             version: '1.0',
             sessionAttributes: {},
+            responseId: requestId,
             response: {
-                outputSpeech: {
-                    type: speechType,
-                    text: text,
-                },
+                outputSpeech: speechType === 'PlainText'
+                    ? {
+                        type: 'PlainText',
+                        text,
+                    }
+                    : { type: 'SSML', ssml: `text` },
                 card: {
                     content: speechPlainText,
                     title: (0, texts_1.default)(this.lang, 'Answer from ioBroker') || 'ioBroker',
@@ -82,16 +84,21 @@ class AlexaCustom {
         };
         if (repromptText) {
             response.response.reprompt = {
-                outputSpeech: {
-                    type: repromptType,
-                    ssml: repromptText,
-                },
+                outputSpeech: repromptType === 'PlainText'
+                    ? {
+                        type: 'PlainText',
+                        text: repromptText,
+                    }
+                    : {
+                        type: 'SSML',
+                        ssml: repromptText,
+                    },
             };
         }
         return response;
     }
-    #getResponseV2(text, repromptText, shouldEndSession) {
-        const response = this.#getResponseV1(text, repromptText, shouldEndSession);
+    #getResponseV2(text, repromptText, requestId, shouldEndSession) {
+        const response = this.#getResponseV1(text, repromptText, requestId, shouldEndSession);
         if (!shouldEndSession) {
             // We redirect the user to the Dialog Intent to capture the full traffic
             response.response.directives = [
@@ -167,7 +174,8 @@ class AlexaCustom {
     }
     processAfter(request, text, shouldEndSession, callback) {
         void this.adapter.setState('smart.lastResponse', text, true);
-        const sessionId = request.session && request.session.sessionId ? request.session.sessionId : '';
+        const sessionId = request.session?.sessionId || '';
+        const requestId = request.request?.requestId || '';
         if (this.openSessions[sessionId].responseTimer) {
             clearTimeout(this.openSessions[sessionId].responseTimer);
             this.openSessions[sessionId].responseTimer = null;
@@ -178,18 +186,18 @@ class AlexaCustom {
             ? this.openSessions[sessionId].isV2Skill
             : !!request.customSkillV2;
         if (isV2Skill) {
-            callback(this.#getResponseV2(text, null, shouldEndSession));
+            callback(this.#getResponseV2(text, null, requestId, shouldEndSession));
         }
         else {
-            callback(this.#getResponseV1(text, null, shouldEndSession));
+            callback(this.#getResponseV1(text, null, requestId, shouldEndSession));
         }
     }
     touchSession(sessionId, isV2Skill) {
-        if (this.openSessions[sessionId] && this.openSessions[sessionId].expiryTimer) {
+        if (this.openSessions[sessionId]?.expiryTimer) {
             clearTimeout(this.openSessions[sessionId].expiryTimer);
             this.openSessions[sessionId].expiryTimer = null;
         }
-        this.openSessions[sessionId] = this.openSessions[sessionId] || {
+        this.openSessions[sessionId] ||= {
             expiryTimer: null,
             responseTimer: null,
             request: null,
@@ -201,7 +209,7 @@ class AlexaCustom {
         }, 60000); // latest after 10 mins we declare a session as closed
     }
     deleteSession(sessionId) {
-        if (this.openSessions[sessionId] && this.openSessions[sessionId].expiryTimer) {
+        if (this.openSessions[sessionId]?.expiryTimer) {
             clearTimeout(this.openSessions[sessionId].expiryTimer);
         }
         delete this.openSessions[sessionId];
@@ -254,53 +262,53 @@ class AlexaCustom {
             return { error: 'Invalid request: no intent!' };
         }
         const isV2Skill = !!request.customSkillV2;
-        this.lastSkillRequestWasV2 = isV2Skill;
         const getResponse = isV2Skill ? this.#getResponseV2 : this.#getResponseV1;
+        const requestId = request.request?.requestId || '';
         if (!isEnabled) {
             if (this.lang === 'en') {
-                return getResponse('The service is not activated. Please enable Alexa integration in the iot Adapter.', null, true);
+                return getResponse('The service is not activated. Please enable Alexa integration in the iot Adapter.', null, requestId, true);
             }
             if (this.lang === 'ru') {
-                return getResponse('Услуга не активирована. Включите интеграцию Alexa в адаптере Интернета вещей.', null, true);
+                return getResponse('Услуга не активирована. Включите интеграцию Alexa в адаптере Интернета вещей.', null, requestId, true);
             }
-            return getResponse('Der Service ist nicht aktiviert. Bitte aktiviere die Alex-Integration im iot-Adapter um Ihn zu aktivieren.', null, true);
+            return getResponse('Der Service ist nicht aktiviert. Bitte aktiviere die Alex-Integration im iot-Adapter um Ihn zu aktivieren.', null, requestId, true);
         }
-        const sessionId = request.session && request.session.sessionId ? request.session.sessionId : '';
-        this.adapter.log.debug(`Custom Skill ${isV2Skill ? 'V2' : 'V1'} request: ${request.request.type}/${request.request.intent && request.request.intent.name} for session ${sessionId}, dialog: ${request.request.dialogState}`);
+        const sessionId = request.session?.sessionId || '';
         if (request.request.type === 'LaunchRequest') {
             this.adapter.log.debug(request.request.type);
             this.touchSession(sessionId, isV2Skill);
             if (this.lang === 'en') {
-                return getResponse('Hello, what do you want to know or control?', 'What do you want to know or control?');
+                return getResponse('Hello, what do you want to know or control?', 'What do you want to know or control?', requestId);
             }
             if (this.lang === 'ru') {
-                return getResponse('Привет. Что вы хотите знать или контролировать?', 'Что вы хотите знать или контролировать?');
+                return getResponse('Привет. Что вы хотите знать или контролировать?', 'Что вы хотите знать или контролировать?', requestId);
             }
-            return getResponse('Hallo, was möchtest Du wissen oder steuern?', 'Was möchtest Du wissen oder steuern?');
+            return getResponse('Hallo, was möchtest Du wissen oder steuern?', 'Was möchtest Du wissen oder steuern?', requestId);
         }
         if (request.request.type === 'IntentRequest') {
+            this.adapter.log.debug(`Custom Skill ${isV2Skill ? 'V2' : 'V1'} request: ${request.request.type}/${request.request.intent?.name} for session ${sessionId}, dialog: ${request.request.dialogState}`);
             if (request.request.intent) {
                 this.touchSession(sessionId, isV2Skill);
                 if (request.request.intent.name === 'AMAZON.HelpIntent') {
                     if (this.lang === 'en') {
-                        return getResponse('This skill will pass all recognized words to your ioBroker installation and you can configure actions and responses there! What do you want to know or control?', 'What do you want to know or control?');
+                        return getResponse('This skill will pass all recognized words to your ioBroker installation and you can configure actions and responses there! What do you want to know or control?', 'What do you want to know or control?', requestId);
                     }
                     if (this.lang === 'ru') {
-                        return getResponse('Этот навык передаст все распознанные слова в вашу установку ioBroker, и вы сможете настроить действия и ответы там! Что вы хотите знать или контролировать?', 'Что вы хотите знать или контролировать?');
+                        return getResponse('Этот навык передаст все распознанные слова в вашу установку ioBroker, и вы сможете настроить действия и ответы там! Что вы хотите знать или контролировать?', 'Что вы хотите знать или контролировать?', requestId);
                     }
-                    return getResponse('Dieser Skill gibt alle erkannten Wörter an Deine ioBroker-Installation weiter und Du kannst dort Aktionen und Antworten konfigurieren! Was möchtest Du wissen oder steuern?', 'Was möchtest Du wissen oder steuern?');
+                    return getResponse('Dieser Skill gibt alle erkannten Wörter an Deine ioBroker-Installation weiter und Du kannst dort Aktionen und Antworten konfigurieren! Was möchtest Du wissen oder steuern?', 'Was möchtest Du wissen oder steuern?', requestId);
                 }
                 else if (request.request.intent.name === 'AMAZON.CancelIntent' ||
                     request.request.intent.name === 'AMAZON.StopIntent') {
                     this.adapter.log.debug(request.request.intent.name);
                     this.deleteSession(sessionId);
                     if (this.lang === 'en') {
-                        return getResponse('Goodbye!', null, true);
+                        return getResponse('Goodbye!', null, requestId, true);
                     }
                     if (this.lang === 'ru') {
-                        return getResponse('До скорого!', null, true);
+                        return getResponse('До скорого!', null, requestId, true);
                     }
-                    return getResponse('Bis bald!', null, true);
+                    return getResponse('Bis bald!', null, requestId, true);
                 }
                 const textsLog = [];
                 const texts = [];
@@ -360,34 +368,36 @@ class AlexaCustom {
                     // No slots and nothing from above
                     this.adapter.log.warn(`Unexpected ALEXA Request: ${JSON.stringify(request)}`);
                     if (this.lang === 'en') {
-                        return getResponse('I did not hear you. Please repeat your question!', null);
+                        return getResponse('I did not hear you. Please repeat your question!', null, requestId);
                     }
                     if (this.lang === 'ru') {
-                        return getResponse('Я не слышал тебя. Пожалуйста, повторите свой вопрос!', null);
+                        return getResponse('Я не слышал тебя. Пожалуйста, повторите свой вопрос!', null, requestId);
                     }
-                    return getResponse('Ich habe Dich nicht verstanden. Bitte wiederhole deine Frage!', null);
+                    return getResponse('Ich habe Dich nicht verstanden. Bitte wiederhole deine Frage!', null, requestId);
                 }
+                const internRequest = request.request;
                 // collect all filled slots (v1 and v2 skill)
-                if (request.request.intent.slots) {
-                    const slots = Object.keys(request.request.intent.slots);
+                if (internRequest.intent.slots) {
+                    const slots = Object.keys(internRequest.intent.slots);
                     slots.forEach(slotId => {
-                        const slot = request.request.intent.slots[slotId];
+                        const slot = internRequest.intent.slots[slotId];
                         let value = slot.value;
-                        const resolution = slot.resolutions?.resolutionsPerAuthority?.length > 0
+                        const resolution = slot.resolutions?.resolutionsPerAuthority &&
+                            slot.resolutions.resolutionsPerAuthority.length > 0
                             ? slot.resolutions.resolutionsPerAuthority[0]
                             : null;
-                        if (resolution && resolution.status.code === 'ER_SUCCESS_MATCH') {
+                        if (resolution?.status.code === 'ER_SUCCESS_MATCH') {
                             const resolutionValue = resolution.values[0].value;
                             value = resolutionValue.name;
                         }
-                        if (value && value.length) {
+                        if (value?.length) {
                             texts.push(value);
                             textsLog.push(`${slotId} = ${value}`);
                         }
                     });
                 }
                 let text = texts.join(' ');
-                const intent = request.request.intent.name || '';
+                const intent = internRequest.intent.name || '';
                 if (originalIntentName.startsWith('queryIntentStarteDialog')) {
                     // v2 Skill StarteDialog* intents are automatically handled without sending anywhere
                     let response = '';
@@ -414,18 +424,18 @@ class AlexaCustom {
                             response = 'Ja?';
                         }
                     }
-                    return getResponse(response, response);
+                    return getResponse(response, response, requestId);
                 }
                 if (intent === 'queryIntent' && stopPhrases[this.lang].includes(text.toLowerCase())) {
                     // v2 Skill when in dialog mode, we need to take care of the exit criteria ourselves
                     this.deleteSession(sessionId);
                     if (this.lang === 'en') {
-                        return getResponse('Goodbye!', null, true);
+                        return getResponse('Goodbye!', null, requestId, true);
                     }
                     if (this.lang === 'ru') {
-                        return getResponse('До скорого!', null, true);
+                        return getResponse('До скорого!', null, requestId, true);
                     }
-                    return getResponse('Bis bald!', null, true);
+                    return getResponse('Bis bald!', null, requestId, true);
                 }
                 // v1 and v2 Skill
                 const deviceId = request?.context?.System?.device?.deviceId
@@ -457,15 +467,15 @@ class AlexaCustom {
                 await this.adapter.setStateAsync('smart.lastCommandObj', JSON.stringify(commandObj), true);
                 this.adapter.log.debug(`${intent}: ${textsLog.join(', ')}`);
                 if (intent) {
-                    let text_timeout;
+                    let textTimeout;
                     if (this.lang === 'en') {
-                        text_timeout = `Processing of ${text} is not possible!`;
+                        textTimeout = `Processing of ${text} is not possible!`;
                     }
                     else if (this.lang === 'ru') {
-                        text_timeout = `Обработка ${text} не возможна!`;
+                        textTimeout = `Обработка ${text} не возможна!`;
                     }
                     else {
-                        text_timeout = `Die Verarbeitung von ${text} ist nicht möglich!`;
+                        textTimeout = `Die Verarbeitung von ${text} ist nicht möglich!`;
                     }
                     if (this.config.text2command !== null &&
                         this.config.text2command !== undefined &&
@@ -476,7 +486,7 @@ class AlexaCustom {
                                 this.openSessions[sessionId].responseTimer = setTimeout(() => {
                                     this.openSessions[sessionId].responseTimer = null;
                                     if (resolve) {
-                                        this.processAfter(request, text_timeout, true, resolve);
+                                        this.processAfter(request, textTimeout, true, resolve);
                                         resolve = null;
                                     }
                                 }, 1000);
@@ -496,7 +506,7 @@ class AlexaCustom {
                                     this.adapter.log.debug(`Response from text2command: ${typedResult.response}`);
                                     void this.adapter.setState('smart.lastResponse', typedResult.response, true);
                                     if (resolve) {
-                                        resolve(getResponse(typedResult.response, null, true));
+                                        resolve(getResponse(typedResult.response, null, requestId, true));
                                         resolve = null;
                                     }
                                 });
@@ -508,30 +518,31 @@ class AlexaCustom {
                             clearTimeout(this.openSessions[sessionId].responseTimer);
                         this.openSessions[sessionId].callback = resolve;
                         this.openSessions[sessionId].request = request;
-                        this.openSessions[sessionId].responseTimer = setTimeout(() => this.processAfter(request, text_timeout, true, resolve), 200);
+                        this.openSessions[sessionId].responseTimer = setTimeout(() => this.processAfter(request, textTimeout, true, resolve), 200);
                     });
                 }
                 if (this.lang === 'en') {
-                    return getResponse('I did not understand the question!', null);
+                    return getResponse('I did not understand the question!', null, requestId);
                 }
                 if (this.lang === 'ru') {
-                    return getResponse('Я не поняла ваш вопрос!', null);
+                    return getResponse('Я не поняла ваш вопрос!', null, requestId);
                 }
-                return getResponse('Ich habe Deine Frage nicht verstanden!', null);
+                return getResponse('Ich habe Deine Frage nicht verstanden!', null, requestId);
             }
             this.adapter.log.warn(`Unexpected ALEXA Request: ${JSON.stringify(request)}`);
             if (this.lang === 'en') {
-                return getResponse('Please repeat your question!', null);
+                return getResponse('Please repeat your question!', null, requestId);
             }
             if (this.lang === 'ru') {
-                return getResponse('Пожалуйста, повторите вопрос!', null);
+                return getResponse('Пожалуйста, повторите вопрос!', null, requestId);
             }
-            return getResponse('Bitte wiederhole die Frage!', null);
+            return getResponse('Bitte wiederhole die Frage!', null, requestId);
         }
         if (request.request.type === 'SessionEndedRequest') {
             this.adapter.log.debug(`SessionEndedRequest: ${request.request.reason}`);
             this.deleteSession(sessionId);
             // Should not be called
+            // A skill cannot return a response to SessionEndedRequest.
             return { error: 'Unexpected Session Ended' };
         }
         this.adapter.log.debug(`Unknown Request type: ${JSON.stringify(request)}`);