From 181c3fd97819b03e295e03eb9ca48ed40e183808 Mon Sep 17 00:00:00 2001 From: Zefau Date: Wed, 1 Jul 2020 20:22:34 +0200 Subject: [PATCH] 1.3.7 --- README.md | 4 +- hue-extended.js | 24 ++++- io-package.json | 245 +++++++++++++++++++++++----------------------- package-lock.json | 50 +++------- package.json | 33 +++---- 5 files changed, 173 insertions(+), 183 deletions(-) diff --git a/README.md b/README.md index 521e3b9..06ea30e 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,9 @@ Connect your Philips Hue Lights with ioBroker. ## Changelog -Please also see [release page](https://github.com/Zefau/ioBroker.hue-extended/releases) for changelog and detailed information. +### 1.3.7 (2020-07-01) +- (Zefau) added additional verification checks of the response received from the Hue Bridge (see [#45](https://github.com/Zefau/ioBroker.hue-extended/issues/45)) +- (Zefau) fixed long-time polling for connection retry after connection fails serval times on short-time polling (see [#58](https://github.com/Zefau/ioBroker.hue-extended/issues/58)) ### 1.3.6 (2020-05-31) - (Zefau) added long-time polling for connection retry after connection fails serval times on short-time polling (see [#58](https://github.com/Zefau/ioBroker.hue-extended/issues/58)) diff --git a/hue-extended.js b/hue-extended.js index 86087d9..e1a103c 100644 --- a/hue-extended.js +++ b/hue-extended.js @@ -19,6 +19,7 @@ const _SUBSCRIPTIONS = require(__dirname + '/_NODES.js').SUBSCRIPTIONS; const _MAPPING_BRIDGE = Object.keys(_MAPPING); const _MAPPING_STATES = Object.values(_MAPPING); +const _CHANNELS = ['config', 'groups', 'lights', 'resourcelinks', 'rules', 'scenes', 'schedules', 'sensors']; /* * variables initiation @@ -567,13 +568,12 @@ function getPayload(refresh) _request({ ...REQUEST_OPTIONS, 'uri': bridge, resolveWithFullResponse: true }).then(response => { let payload = response.body; + // error handler if (response.statusCode !== 200) { - adapter.log.error('Error while retrieving payload from Hue Bridge (Status Code ' + response.statusCode + ')!'); - return false; + throw new Error('Error while retrieving payload from Hue Bridge (Status Code ' + response.statusCode + ')'); } else if (!payload || (payload[0] && payload[0].error)) { - adapter.log.error('Error while retrieving payload from Hue Bridge' + (payload[0] && payload[0].error ? ': ' + payload[0].error.description : '!')); - return false; + throw new Error('Error while retrieving payload from Hue Bridge' + (payload[0] && payload[0].error ? ': ' + payload[0].error.description : '')); } // add meta data @@ -628,6 +628,11 @@ function getPayload(refresh) // go through channels for (let channel in payload) { + // verify channel + if (_CHANNELS.indexOf(channel) === -1) { + throw new Error('Incorrect data return from Hue API'); + } + // create channel library.set({ 'node': channel, @@ -637,9 +642,18 @@ function getPayload(refresh) // sync all groups if (channel == 'groups') { - _request({ ...REQUEST_OPTIONS, 'uri': bridge + channel + '/0' }).then(pl => { + _request({ ...REQUEST_OPTIONS, 'uri': bridge + channel + '/0', resolveWithFullResponse: true }).then(res => { + let pl = res.body; pl.name = 'All Lights'; + // error handler + if (res.statusCode !== 200) { + throw new Error('Error while retrieving payload from Hue Bridge (Status Code ' + res.statusCode + ')'); + } + else if (!pl || (pl[0] && pl[0].error)) { + throw new Error('Error while retrieving payload from Hue Bridge' + (pl[0] && pl[0].error ? ': ' + pl[0].error.description : '')); + } + // index DEVICES[channel] = JSON.parse(JSON.stringify(payload[channel])); DEVICES[channel][0] = JSON.parse(JSON.stringify(pl)); diff --git a/io-package.json b/io-package.json index 5c3026e..aa5f68f 100644 --- a/io-package.json +++ b/io-package.json @@ -1,126 +1,127 @@ { - "common": { - "name": "hue-extended", - "version": "1.3.6", - "title": "Philips Hue Extended", - "desc": { - "en": "Integration of all your Philips Hue Devices with your ioBroker", - "de": "Integration aller Philips Hue Geräte mit Ihrem ioBroker", - "ru": "Интеграция всех ваших устройств Philips Хюэ с ioBroker", - "pt": "A integração de todos os seus Philips Hue Dispositivos com a sua ioBroker", - "nl": "Integratie van al uw Philips Hue-Apparaten met uw ioBroker", - "fr": "L'intégration de l'ensemble de votre Philips Hue Appareils avec votre ioBroker", - "it": "L'integrazione di tutte le Philips Hue Dispositivi con il ioBroker", - "es": "La integración de todos sus Philips Hue Dispositivos con la ioBroker", - "pl": "Integracja wszystkich urządzeń Philips Hue z ioBroker", - "zh-cn": "一体化的所有飞利浦色调设备与你ioBroker" - }, - "news": { - "1.1.0": { - "en": "- add support for Hue Labs scenes\n- add retry if bridge returns error `socket hang up`\n- add retry if device is not reachable", - "de": "- Unterstützung für Hue Labs-Szenen hinzufügen\n", - "ru": "- добавить поддержку сцен Hue Labs\n", - "pt": "- adicione suporte para cenas do Hue Labs\n", - "nl": "- ondersteuning toevoegen voor Hue Labs-scènes\n", - "fr": "- ajouter un support pour les scènes Hue Labs\n", - "it": "- aggiungi il supporto per le scene di Hue Labs\n", - "es": "- Añadir soporte para escenas Hue Labs\n", - "pl": "- dodaj obsługę scen Hue Labs\n", - "zh-cn": "-添加对Hue Labs场景的支持\n" - }, - "1.0.2": { - "en": "- added scenes from Hue Labs", - "de": "- Szenen aus Hue Labs hinzugefügt", - "ru": "- добавлены сцены из Hue Labs", - "pt": "- cenas adicionadas do Hue Labs", - "nl": "- scènes uit Hue Labs toegevoegd", - "fr": "- ajout de scènes de Hue Labs", - "it": "- aggiunte scene da Hue Labs", - "es": "- escenas agregadas de Hue Labs", - "pl": "- dodano sceny z Hue Labs", - "zh-cn": "-从Hue Labs添加了场景" - }, - "1.0.1": { - "en": "- fixed incorrect omitting GroupScenes", - "de": "- Fehler beim Auslassen von GroupScenes behoben", - "ru": "- исправлено некорректное пропускание групповых сцен", - "pt": "- correção incorreta de omissão de GroupScenes", - "nl": "- foutieve weglating van GroupScenes opgelost", - "fr": "- correction incorrecte en omettant GroupScenes", - "it": "- risolto GroupScenes omesso errato", - "es": "- Se corrigió la omisión incorrecta de GroupScenes", - "pl": "- naprawiono nieprawidłowe pomijanie scen grupowych", - "zh-cn": "-修正了不正确的省略GroupScenes" - }, - "1.0.0": { - "en": "- BREAKING CHANGE: changed certain objects due to standardization\n- fixed incorrect conversion between color spaces (rgb, hex, etc.)", - "de": "- Wichtige ÄNDERUNG: geändert, bestimmte Objekte durch Standardisierung\n- fixed falsche Konvertierung zwischen Farbräumen (rgb, hex, etc.)", - "ru": "- Последние изменение: изменены некоторые объекты из-за стандартизации\n- исправлено некорректное преобразование между цветовыми пространствами (RGB, и наговор, и т. д.)", - "pt": "- ALTERAÇÃO de última hora: mudou de determinados objetos, devido à padronização\n- fixo incorreta conversão entre espaços de cor (rgb, hexadecimal, etc.)", - "nl": "- Het BREKEN van VERANDERING: gewijzigd bepaalde objecten als gevolg van standaardisatie\n- vaste onjuiste omzetting tussen kleurruimte (rgb hex, enz.)", - "fr": "- MODIFICATION de RUPTURE: modification de certains objets en raison de la normalisation\n- correction d'un bug provoquant la conversion entre les espaces de couleurs (rgb, hex, etc.)", - "it": "- ROTTURA della MODIFICA: modificato alcuni oggetti a causa della standardizzazione\n- corretto errore di conversione tra gli spazi colore (rgb, hex, etc.)", - "es": "- CAMBIO de hora: se ha cambiado ciertos objetos debido a la estandarización\n- fija incorrecta de la conversión entre espacios de color (rgb, hex, etc.)", - "pl": "- Ostatnie zmiany: zmieniono niektóre obiekty z powodu standaryzacji\n- poprawiono nieprawidłowe konwersja między przestrzeniami kolorów (RGB, i наговор, itp.)", - "zh-cn": "-裂变化：改变某些物体由于标准化\n-固定不正确之间的转换颜色空间(rgb hex，等等。)" - }, - "0.9.0": { - "en": "- BREAKING CHANGE: changed grouping of scenes and added option to choose how objects are mapping (either scenes...objects or scenes...objects)\n- retrieving group for all-lights directly from Hue Bridge API (instead of assembling through states)\n- added option to delete outdated devices (gargabe collector)", - "de": "- Wichtige ÄNDERUNG: geänderte Gruppierung von Szenen und option Hinzugefügt, um zu wählen, wie Objekte mapping (entweder Szenen...Objekte oder Szenen...Objekte)\n- abrufen-Gruppe für alle-Lichter direkt aus Hue Bridge API (statt der Zusammenstellung durch die Staaten)\n- option Hinzugefügt, um zu löschen Sie veraltete Geräte (gargabe collector)", - "ru": "- Последние изменение: изменена группировка сцены и добавлена опция, чтобы выбрать, как объекты сопоставления (либо сцен.<группы>.<сцена>.объекты или сцены.<сцена>.<группа>.объектов)\n- получение группы для всех-огни непосредственно из Хюэ мост API (вместо монтаж через штаты)\n- добавлена опция для удаления устаревших устройств (коллектор gargabe)", - "pt": "- ALTERAÇÃO de última hora: alterado agrupamento de cenas e adicionada opção para escolher a forma como os objetos são de mapeamento (ou cenas...objetos ou cenas...objetos)\n- recuperação de grupo para todas as luzes diretamente a partir de Tonalidade Ponte API (em vez de montar através de estados)\n- adicionada opção para excluir desatualizado dispositivos (gargabe collector)", - "nl": "- Het BREKEN van VERANDERING: gewijzigd groepering van scènes en toegevoegde optie om te kiezen hoe objecten worden mapping (ofwel scènes...voorwerpen of scènes...objecten)\n- ophalen groep voor alle-lichten rechtstreeks vanuit Hue Bridge API (in plaats van montage door staten)\n- optie toegevoegd om het verwijderen van verouderde apparaten (gargabe collector)", - "fr": "- MODIFICATION de RUPTURE: modification de regroupement des scènes et ajout d'une option pour choisir la manière dont les objets sont de cartographie (soit scènes...les objets ou les scènes...les objets)\n- récupération de groupe pour toutes les lumières de la directement à partir de la Teinte Pont de l'API (au lieu de rassembler à travers les états)\n- ajout d'une option pour supprimer les périphériques obsolètes (gargabe collector)", - "it": "- ROTTURA della MODIFICA: modificato il raggruppamento di scene e aggiunta l'opzione per scegliere il modo in cui gli oggetti sono mapping (o scene...oggetti o scene...gli oggetti)\n- il recupero di gruppo per tutte le luci direttamente dalla Tonalità Ponte API (invece di assemblare uniti)\n- aggiunta l'opzione per eliminare obsoleto dispositivi (gargabe collector)", - "es": "- CAMBIO de hora: se ha cambiado la agrupación de las escenas y añadida la opción de elegir cómo los objetos son de asignación (cualquiera de las escenas...objetos o escenas...los objetos)\n- recuperación de grupo para todas las luces directamente de Hue Puente de la API (en lugar de armar a través de los estados)\n- añadida la opción de eliminar dispositivos obsoletos (gargabe coleccionista)", - "pl": "- Ostatnie zmiany: poprawiono grupowanie sceny i dodano opcję, aby wybrać, jak obiekty mapowania (lub scen...obiektów lub scen...obiektów)\n- uzyskiwanie grupy dla wszystkich-światła bezpośrednio z Hue bridge API (zamiast montaż przez zjednoczone)\n- dodano opcję, aby usunąć starszych urządzeń (kolektor gargabe)", - "zh-cn": "-裂变化：改变组的场景而增加的选择到如何选择对象映射(无论是现场。<组>.<现场>.对象或现场。<现场>.<组>.对象)\n-检索组对于所有的灯光，直接从顺桥API(而不是通过组装国)\n-增加的选择，以删除过时的设备(gargabe集)" - } - }, - "license": "MIT", - "platform": "Javascript/Node.js", - "mode": "daemon", - "icon": "hue-extended.png", - "extIcon": "https://raw.githubusercontent.com/Zefau/ioBroker.hue-extended/master/admin/hue-extended.png", - "keywords": [ - "hue", - "lights", - "groups", - "scenes", - "hue-labs", - "sensors", - "schedules", - "rules", - "config", - "extended" - ], - "readme": "https://github.com/Zefau/ioBroker.hue-extended/blob/master/README.md", - "loglevel": "info", - "materialize": true, - "compact": true, - "enabled": true, - "localLink": "https://%bridgeIp%/debug/clip.html", - "messagebox": true, - "subscribe": "messagebox", - "type": "lighting", - "authors": [ - { - "name": "Zefau", - "email": "zefau@mailbox.org" - } - ] + "common": { + "name": "hue-extended", + "version": "1.3.7", + "title": "Philips Hue Extended", + "desc": { + "en": "Integration of all your Philips Hue Devices with your ioBroker", + "de": "Integration aller Philips Hue Geräte mit Ihrem ioBroker", + "ru": "Интеграция всех ваших устройств Philips Хюэ с ioBroker", + "pt": "A integração de todos os seus Philips Hue Dispositivos com a sua ioBroker", + "nl": "Integratie van al uw Philips Hue-Apparaten met uw ioBroker", + "fr": "L'intégration de l'ensemble de votre Philips Hue Appareils avec votre ioBroker", + "it": "L'integrazione di tutte le Philips Hue Dispositivi con il ioBroker", + "es": "La integración de todos sus Philips Hue Dispositivos con la ioBroker", + "pl": "Integracja wszystkich urządzeń Philips Hue z ioBroker", + "zh-cn": "一体化的所有飞利浦色调设备与你ioBroker" }, - "native": { - "refresh": 30, - "syncLights": true, - "syncGroups": true, - "syncScenes": true, - "syncHueLabsScenes": true, - "syncScenesRecycled": true, - "hueToXY": true, - "useQueue": true, - "sceneNaming": "room" + "news": { + "1.1.0": { + "en": "- add support for Hue Labs scenes\n- add retry if bridge returns error `socket hang up`\n- add retry if device is not reachable", + "de": "- Unterstützung für Hue Labs-Szenen hinzufügen\n", + "ru": "- добавить поддержку сцен Hue Labs\n", + "pt": "- adicione suporte para cenas do Hue Labs\n", + "nl": "- ondersteuning toevoegen voor Hue Labs-scènes\n", + "fr": "- ajouter un support pour les scènes Hue Labs\n", + "it": "- aggiungi il supporto per le scene di Hue Labs\n", + "es": "- Añadir soporte para escenas Hue Labs\n", + "pl": "- dodaj obsługę scen Hue Labs\n", + "zh-cn": "-添加对Hue Labs场景的支持\n" + }, + "1.0.2": { + "en": "- added scenes from Hue Labs", + "de": "- Szenen aus Hue Labs hinzugefügt", + "ru": "- добавлены сцены из Hue Labs", + "pt": "- cenas adicionadas do Hue Labs", + "nl": "- scènes uit Hue Labs toegevoegd", + "fr": "- ajout de scènes de Hue Labs", + "it": "- aggiunte scene da Hue Labs", + "es": "- escenas agregadas de Hue Labs", + "pl": "- dodano sceny z Hue Labs", + "zh-cn": "-从Hue Labs添加了场景" + }, + "1.0.1": { + "en": "- fixed incorrect omitting GroupScenes", + "de": "- Fehler beim Auslassen von GroupScenes behoben", + "ru": "- исправлено некорректное пропускание групповых сцен", + "pt": "- correção incorreta de omissão de GroupScenes", + "nl": "- foutieve weglating van GroupScenes opgelost", + "fr": "- correction incorrecte en omettant GroupScenes", + "it": "- risolto GroupScenes omesso errato", + "es": "- Se corrigió la omisión incorrecta de GroupScenes", + "pl": "- naprawiono nieprawidłowe pomijanie scen grupowych", + "zh-cn": "-修正了不正确的省略GroupScenes" + }, + "1.0.0": { + "en": "- BREAKING CHANGE: changed certain objects due to standardization\n- fixed incorrect conversion between color spaces (rgb, hex, etc.)", + "de": "- Wichtige ÄNDERUNG: geändert, bestimmte Objekte durch Standardisierung\n- fixed falsche Konvertierung zwischen Farbräumen (rgb, hex, etc.)", + "ru": "- Последние изменение: изменены некоторые объекты из-за стандартизации\n- исправлено некорректное преобразование между цветовыми пространствами (RGB, и наговор, и т. д.)", + "pt": "- ALTERAÇÃO de última hora: mudou de determinados objetos, devido à padronização\n- fixo incorreta conversão entre espaços de cor (rgb, hexadecimal, etc.)", + "nl": "- Het BREKEN van VERANDERING: gewijzigd bepaalde objecten als gevolg van standaardisatie\n- vaste onjuiste omzetting tussen kleurruimte (rgb hex, enz.)", + "fr": "- MODIFICATION de RUPTURE: modification de certains objets en raison de la normalisation\n- correction d'un bug provoquant la conversion entre les espaces de couleurs (rgb, hex, etc.)", + "it": "- ROTTURA della MODIFICA: modificato alcuni oggetti a causa della standardizzazione\n- corretto errore di conversione tra gli spazi colore (rgb, hex, etc.)", + "es": "- CAMBIO de hora: se ha cambiado ciertos objetos debido a la estandarización\n- fija incorrecta de la conversión entre espacios de color (rgb, hex, etc.)", + "pl": "- Ostatnie zmiany: zmieniono niektóre obiekty z powodu standaryzacji\n- poprawiono nieprawidłowe konwersja między przestrzeniami kolorów (RGB, i наговор, itp.)", + "zh-cn": "-裂变化：改变某些物体由于标准化\n-固定不正确之间的转换颜色空间(rgb hex，等等。)" + }, + "0.9.0": { + "en": "- BREAKING CHANGE: changed grouping of scenes and added option to choose how objects are mapping (either scenes...objects or scenes...objects)\n- retrieving group for all-lights directly from Hue Bridge API (instead of assembling through states)\n- added option to delete outdated devices (gargabe collector)", + "de": "- Wichtige ÄNDERUNG: geänderte Gruppierung von Szenen und option Hinzugefügt, um zu wählen, wie Objekte mapping (entweder Szenen...Objekte oder Szenen...Objekte)\n- abrufen-Gruppe für alle-Lichter direkt aus Hue Bridge API (statt der Zusammenstellung durch die Staaten)\n- option Hinzugefügt, um zu löschen Sie veraltete Geräte (gargabe collector)", + "ru": "- Последние изменение: изменена группировка сцены и добавлена опция, чтобы выбрать, как объекты сопоставления (либо сцен.<группы>.<сцена>.объекты или сцены.<сцена>.<группа>.объектов)\n- получение группы для всех-огни непосредственно из Хюэ мост API (вместо монтаж через штаты)\n- добавлена опция для удаления устаревших устройств (коллектор gargabe)", + "pt": "- ALTERAÇÃO de última hora: alterado agrupamento de cenas e adicionada opção para escolher a forma como os objetos são de mapeamento (ou cenas...objetos ou cenas...objetos)\n- recuperação de grupo para todas as luzes diretamente a partir de Tonalidade Ponte API (em vez de montar através de estados)\n- adicionada opção para excluir desatualizado dispositivos (gargabe collector)", + "nl": "- Het BREKEN van VERANDERING: gewijzigd groepering van scènes en toegevoegde optie om te kiezen hoe objecten worden mapping (ofwel scènes...voorwerpen of scènes...objecten)\n- ophalen groep voor alle-lichten rechtstreeks vanuit Hue Bridge API (in plaats van montage door staten)\n- optie toegevoegd om het verwijderen van verouderde apparaten (gargabe collector)", + "fr": "- MODIFICATION de RUPTURE: modification de regroupement des scènes et ajout d'une option pour choisir la manière dont les objets sont de cartographie (soit scènes...les objets ou les scènes...les objets)\n- récupération de groupe pour toutes les lumières de la directement à partir de la Teinte Pont de l'API (au lieu de rassembler à travers les états)\n- ajout d'une option pour supprimer les périphériques obsolètes (gargabe collector)", + "it": "- ROTTURA della MODIFICA: modificato il raggruppamento di scene e aggiunta l'opzione per scegliere il modo in cui gli oggetti sono mapping (o scene...oggetti o scene...gli oggetti)\n- il recupero di gruppo per tutte le luci direttamente dalla Tonalità Ponte API (invece di assemblare uniti)\n- aggiunta l'opzione per eliminare obsoleto dispositivi (gargabe collector)", + "es": "- CAMBIO de hora: se ha cambiado la agrupación de las escenas y añadida la opción de elegir cómo los objetos son de asignación (cualquiera de las escenas...objetos o escenas...los objetos)\n- recuperación de grupo para todas las luces directamente de Hue Puente de la API (en lugar de armar a través de los estados)\n- añadida la opción de eliminar dispositivos obsoletos (gargabe coleccionista)", + "pl": "- Ostatnie zmiany: poprawiono grupowanie sceny i dodano opcję, aby wybrać, jak obiekty mapowania (lub scen...obiektów lub scen...obiektów)\n- uzyskiwanie grupy dla wszystkich-światła bezpośrednio z Hue bridge API (zamiast montaż przez zjednoczone)\n- dodano opcję, aby usunąć starszych urządzeń (kolektor gargabe)", + "zh-cn": "-裂变化：改变组的场景而增加的选择到如何选择对象映射(无论是现场。<组>.<现场>.对象或现场。<现场>.<组>.对象)\n-检索组对于所有的灯光，直接从顺桥API(而不是通过组装国)\n-增加的选择，以删除过时的设备(gargabe集)" + } }, - "objects": [], - "instanceObjects": [] + "license": "MIT", + "platform": "Javascript/Node.js", + "mode": "daemon", + "icon": "hue-extended.png", + "extIcon": "https://raw.githubusercontent.com/Zefau/ioBroker.hue-extended/master/admin/hue-extended.png", + "keywords": [ + "hue", + "lights", + "groups", + "scenes", + "hue-labs", + "sensors", + "schedules", + "rules", + "config", + "extended" + ], + "readme": "https://github.com/Zefau/ioBroker.hue-extended/blob/master/README.md", + "loglevel": "info", + "materialize": true, + "compact": true, + "enabled": true, + "localLink": "https://%bridgeIp%/debug/clip.html", + "messagebox": true, + "subscribe": "messagebox", + "type": "lighting", + "authors": [ + { + "name": "Zefau", + "email": "zefau@mailbox.org" + } + ], + "installedFrom": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613" + }, + "native": { + "refresh": 30, + "syncLights": true, + "syncGroups": true, + "syncScenes": true, + "syncHueLabsScenes": true, + "syncScenesRecycled": true, + "hueToXY": true, + "useQueue": true, + "sceneNaming": "room" + }, + "objects": [], + "instanceObjects": [] } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f067847..49fc8db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iobroker.hue-extended", - "version": "1.3.6", + "version": "1.3.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -610,9 +610,9 @@ } }, "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, "bluebird": { @@ -1145,22 +1145,22 @@ } }, "es-abstract": { - "version": "1.17.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", - "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "version": "1.17.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", + "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", + "is-callable": "^1.2.0", + "is-regex": "^1.1.0", "object-inspect": "^1.7.0", "object-keys": "^1.1.1", "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } }, "es-array-method-boxes-properly": { @@ -3725,9 +3725,9 @@ } }, "object-inspect": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", "dev": true }, "object-keys": { @@ -4715,28 +4715,6 @@ "es-abstract": "^1.17.5" } }, - "string.prototype.trimleft": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", - "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5", - "string.prototype.trimstart": "^1.0.0" - } - }, - "string.prototype.trimright": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", - "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5", - "string.prototype.trimend": "^1.0.0" - } - }, "string.prototype.trimstart": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", diff --git a/package.json b/package.json index 9d8e3d4..5711e3c 100644 --- a/package.json +++ b/package.json @@ -1,30 +1,25 @@ { - "_from": "iobroker.hue-extended@1.2.3", - "_id": "iobroker.hue-extended@1.2.3", + "_from": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613", + "_id": "iobroker.hue-extended@1.3.6", "_inBundle": false, - "_integrity": "sha512-LI2UCGfaKz1E4qNLCGmYoPy1dfccUSu/hro4JC3YurS04tbsyfsuzIoHLVR9HMI6EeP0P4xm6LCzRZ40lcEjhw==", + "_integrity": "sha512-Oew4JpcBqB+T/RU+Dhn9fcCgwkvVtPTmtfkCA046A5BdlJ0fv3tvot/rdF+HxHIwtVaEwxFby/q+gFadNhnb9A==", "_location": "/iobroker.hue-extended", - "_phantomChildren": { - "@types/node": "13.7.7" - }, + "_phantomChildren": {}, "_requested": { - "type": "version", - "registry": true, - "raw": "iobroker.hue-extended@1.2.3", - "name": "iobroker.hue-extended", - "escapedName": "iobroker.hue-extended", - "rawSpec": "1.2.3", - "saveSpec": null, - "fetchSpec": "1.2.3" + "type": "remote", + "raw": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613", + "rawSpec": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613", + "saveSpec": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613", + "fetchSpec": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613" }, "_requiredBy": [ "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/iobroker.hue-extended/-/iobroker.hue-extended-1.2.3.tgz", - "_shasum": "de8f852f86d5cfd8f9c4acafc5aa3472f13cc3db", - "_spec": "iobroker.hue-extended@1.2.3", - "_where": "/opt", + "_resolved": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613", + "_shasum": "c2c8aebfc251946f2de05232cc0382f14edc41e0", + "_spec": "https://github.com/Zefau/ioBroker.hue-extended/tarball/4667185e9a4db67b24b2165e868301576d881613", + "_where": "/opt/iobroker", "author": { "name": "zefau", "email": "zefau@mailbox.org" @@ -78,5 +73,5 @@ "test:unit": "mocha test/unit --exit", "translate": "gulp translateAndUpdateWordsJS" }, - "version": "1.3.6" + "version": "1.3.7" }