iobroker.iot 3.6.0 → 4.0.2

package/{lib → build-backend/lib}/googleHome.js

@@ -1,10 +1,9 @@
 const axios = require('axios');
-const { Types, ChannelDetector } = require('iobroker.type-detector');
+const ChannelDetector = require('@iobroker/type-detector');
 
-const textsT = require('./texts');
-const roomsT = require('./rooms');
-const funcsT = require('./functions');
-const version = require('../package.json').version;
+const textsT = require('./texts').default;
+const roomsT = require('./rooms').default;
+const funcsT = require('./functions').default;
 
 const PROTOCOL_VERSION = 1;
 const RETRY_UNKNOWN_DEVICES_INTERVAL = 10 * 60000; // 10 minutes
@@ -426,7 +425,7 @@ class GoogleHome {
         this.smartDevicesSentToGoogle = {};
         this.enums = [];
         this.usedIds = [];
-        this.detector = new ChannelDetector();
+        this.detector = new ChannelDetector.default();
         this.urlKeyOk = false;
         this.keyPromise = null;
         this.keyPromiseTime = null;
@@ -437,23 +436,23 @@ class GoogleHome {
         this.tasksTimer = null;
 
         this.converter = {
-            [Types.socket]: this.processSocket.bind(this),
-            [Types.light]: this.processLight.bind(this),
-            [Types.info]: this.processInfo.bind(this),
-            [Types.dimmer]: this.processDimmer.bind(this),
-            [Types.rgbSingle]: this.processRgbSingle.bind(this),
-            [Types.rgb]: this.processRgb.bind(this),
-            [Types.hue]: this.processHue.bind(this),
-            [Types.ct]: this.processCT.bind(this),
-            [Types.temperature]: this.processTemperature.bind(this),
-            [Types.thermostat]: this.processThermostat.bind(this),
-            [Types.button]: this.processButton.bind(this),
-            [Types.windowTilt]: this.processWindowTilt.bind(this),
-            [Types.door]: this.processWindowTilt.bind(this),
-            [Types.window]: this.processWindowTilt.bind(this),
-            [Types.blind]: this.processBlind.bind(this),
-            [Types.slider]: this.processBlind.bind(this),
-            [Types.media]: this.processMedia.bind(this),
+            [ChannelDetector.Types.socket]: this.processSocket.bind(this),
+            [ChannelDetector.Types.light]: this.processLight.bind(this),
+            [ChannelDetector.Types.info]: this.processInfo.bind(this),
+            [ChannelDetector.Types.dimmer]: this.processDimmer.bind(this),
+            [ChannelDetector.Types.rgbSingle]: this.processRgbSingle.bind(this),
+            [ChannelDetector.Types.rgb]: this.processRgb.bind(this),
+            [ChannelDetector.Types.hue]: this.processHue.bind(this),
+            [ChannelDetector.Types.ct]: this.processCT.bind(this),
+            [ChannelDetector.Types.temperature]: this.processTemperature.bind(this),
+            [ChannelDetector.Types.thermostat]: this.processThermostat.bind(this),
+            [ChannelDetector.Types.button]: this.processButton.bind(this),
+            [ChannelDetector.Types.windowTilt]: this.processWindowTilt.bind(this),
+            [ChannelDetector.Types.door]: this.processWindowTilt.bind(this),
+            [ChannelDetector.Types.window]: this.processWindowTilt.bind(this),
+            [ChannelDetector.Types.blind]: this.processBlind.bind(this),
+            [ChannelDetector.Types.slider]: this.processBlind.bind(this),
+            [ChannelDetector.Types.media]: this.processMedia.bind(this),
         };
     }
 
@@ -463,7 +462,7 @@ class GoogleHome {
             /* 15 Minutes */
             this.keyPromiseTime = now;
 
-            const url = `${URL_STATUS}?user=${encodeURIComponent(this.adapter.config.login)}&urlKey=${encodeURIComponent(this.urlKey ? this.urlKey.key : '')}&p=${PROTOCOL_VERSION}&v=${version}`;
+            const url = `${URL_STATUS}?user=${encodeURIComponent(this.adapter.config.login)}&urlKey=${encodeURIComponent(this.urlKey ? this.urlKey.key : '')}&p=${PROTOCOL_VERSION}&v=${this.adapter.version}`;
 
             this.keyPromise = axios
                 .get(url, { validateStatus: status => status === 200 })
@@ -2392,7 +2391,7 @@ class GoogleHome {
 
             this.rateCalculation.push(now);
 
-            const url = `${URL_STATUS}?user=${encodeURIComponent(this.adapter.config.login)}&urlKey=${encodeURIComponent(this.urlKey.key)}&p=${PROTOCOL_VERSION}&v=${version}`;
+            const url = `${URL_STATUS}?user=${encodeURIComponent(this.adapter.config.login)}&urlKey=${encodeURIComponent(this.urlKey.key)}&p=${PROTOCOL_VERSION}&v=${this.adapter.version}`;
             axios
                 .post(url, json, { validateStatus: status => status === 200 })
                 .then(response => {
@@ -2630,7 +2629,7 @@ class GoogleHome {
             }
         }
 
-        const url = `${URL_STATUS}?user=${encodeURIComponent(this.adapter.config.login)}&urlKey=${encodeURIComponent(this.urlKey.key)}&p=${PROTOCOL_VERSION}&v=${version}`;
+        const url = `${URL_STATUS}?user=${encodeURIComponent(this.adapter.config.login)}&urlKey=${encodeURIComponent(this.urlKey.key)}&p=${PROTOCOL_VERSION}&v=${this.adapter.version}`;
         const sendRequest = () => {
             axios
                 .post(url, json, { validateStatus: status => status === 200 })

package/{lib → build-backend/lib}/notifications.js

@@ -1,3 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildMessageFromNotification = buildMessageFromNotification;
+/**
+ * Extract the newest message out of a notification messages together with the localized date
+ *
+ * @param messages all messages in current notification
+ * @returns string
+ */
+function getNewestMessage(messages) {
+    const newestMessage = messages.sort((a, b) => (a.ts < b.ts ? 1 : -1))[0];
+    return `${new Date(newestMessage.ts).toLocaleString()} ${newestMessage.message}`;
+}
 /**
  * Build up a mail object from the notification message
  *
@@ -7,31 +20,11 @@
 function buildMessageFromNotification(message) {
     const subject = message.category.name;
     const { instances } = message.category;
-
-    const readableInstances = Object.entries(instances).map(
-        ([instance, entry]) => `${instance.substring('system.adapter.'.length)}: ${getNewestMessage(entry.messages)}`,
-    );
-
+    const readableInstances = Object.entries(instances).map(([instance, entry]) => `${instance.substring('system.adapter.'.length)}: ${getNewestMessage(entry.messages)}`);
     const text = `${message.category.description}
 ${message.host}:
 ${readableInstances.join('\n')}
     `;
-
     return { title: subject, message: text };
 }
-
-/**
- * Extract the newest message out of a notification messages together with the localized date
- *
- * @param messages all messages in current notification
- * @returns string
- */
-function getNewestMessage(messages) {
-    const newestMessage = messages.sort((a, b) => (a.ts < b.ts ? 1 : -1))[0];
-
-    return `${new Date(newestMessage.ts).toLocaleString()} ${newestMessage.message}`;
-}
-
-module.exports = {
-    buildMessageFromNotification,
-};
+//# sourceMappingURL=notifications.js.map

package/build-backend/lib/notifications.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notifications.js","sourceRoot":"","sources":["../../src/lib/notifications.ts"],"names":[],"mappings":";;AAkBA,oEAwBC;AA1CD;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,QAA2C;IACjE,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzE,OAAO,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,cAAc,EAAE,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;AACrF,CAAC;AAED;;;;;GAKG;AACH,SAAgB,4BAA4B,CAAC,OAO5C;IAIG,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;IACtC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;IAEvC,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CACnD,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAChH,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW;EAC9C,OAAO,CAAC,IAAI;EACZ,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;KACzB,CAAC;IAEF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC7C,CAAC","sourcesContent":["/**\n * Extract the newest message out of a notification messages together with the localized date\n *\n * @param messages all messages in current notification\n * @returns string\n */\nfunction getNewestMessage(messages: { ts: number; message: string }[]): string {\n    const newestMessage = messages.sort((a, b) => (a.ts < b.ts ? 1 : -1))[0];\n\n    return `${new Date(newestMessage.ts).toLocaleString()} ${newestMessage.message}`;\n}\n\n/**\n * Build up a mail object from the notification message\n *\n * @param message received message from notification manager\n * @returns message to send to app\n */\nexport function buildMessageFromNotification(message: {\n    category: {\n        name: string;\n        instances: { [instance: string]: { messages: { ts: number; message: string }[] } };\n        description: string;\n    };\n    host: string;\n}): {\n    title: string;\n    message: string;\n} {\n    const subject = message.category.name;\n    const { instances } = message.category;\n\n    const readableInstances = Object.entries(instances).map(\n        ([instance, entry]) => `${instance.substring('system.adapter.'.length)}: ${getNewestMessage(entry.messages)}`,\n    );\n\n    const text = `${message.category.description}\n${message.host}:\n${readableInstances.join('\\n')}\n    `;\n\n    return { title: subject, message: text };\n}\n"]}