Skip to content

Commit

Permalink
Merge pull request #326 from Grizzelbee/development
Browse files Browse the repository at this point in the history
dependencies got updated
  • Loading branch information
Grizzelbee authored Oct 8, 2024
2 parents bbf48aa + 4acb0b4 commit c7ab436
Show file tree
Hide file tree
Showing 16 changed files with 116 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .ncurc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"upgrade": true,
"reject": ["chai", "eslint", "@eslint/js", "sinon-chai"]
"reject": ["chai", "eslint", "@eslint/js", "sinon-chai", "@types/sinon-chai"]
}
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ This is nice to know because the devices usually send (at least mine do) their s
- In other cases it has been an IP/DNS issue. Resetting the DHCP/DNS server (router) solved the issue.

## Changelog
### **WORK IN PROGRESS**
- (grizzelbee) Upd: Dependencies got updated
- (grizzelbee) Fix: Fixed GUI issues
- (grizzelbee) Fix: Added missing files to files-section in package.json

### 3.2.4 (2024-10-01)
- (grizzelbee) Upd: Dependencies got updated
- (grizzelbee) Fix: Removed plugin-sentry
Expand Down
3 changes: 2 additions & 1 deletion admin/i18n/de/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"token_inside": "Ein Token wurde empfangen und gespeichert.",
"token_inside_desc": "Zeigt an, ob ein Authentifizierungstoken von den Dyson-Servern empfangen wurde, der für die Anmeldung erforderlich ist – der Adapter funktioniert nicht, wenn dieses Kontrollkästchen nicht aktiviert ist.",
"Lbl_UpAndRunning": "Diese Adapterinstanz muss vor der Konfiguration betriebsbereit sein.",
"Poll_Interval_desc": "Fordern Sie alle X Sekunden neue Status- und Sensorinformationen von Geräten an. 0 (Null) deaktiviert die Abfrage."
"Poll_Interval_desc": "Fordern Sie alle X Sekunden neue Status- und Sensorinformationen von Geräten an. 0 (Null) deaktiviert die Abfrage.",
"Lbl_Donation": "Spende"
}
1 change: 1 addition & 0 deletions admin/i18n/en/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"Ireland": "Ireland",
"Kelvin": "Kelvin",
"Lbl_2FA": "2 factor authentication",
"Lbl_Donation": "Donation",
"Lbl_Password": "Password",
"Lbl_ChallengeId": "dyson Challenge-Id",
"Lbl_country": "Country code",
Expand Down
3 changes: 2 additions & 1 deletion admin/i18n/es/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "ID del desafío Dyson",
"desc_2FA": "Debe realizar un proceso 2FA inicial único similar al de la aplicación Dyson para activar este adaptador.",
"Lbl_UpAndRunning": "Esta instancia de adaptador debe estar en funcionamiento antes de la configuración.",
"Poll_Interval_desc": "Solicite nueva información de estado y sensores de los dispositivos cada X segundos. 0 (cero) desactiva el sondeo."
"Poll_Interval_desc": "Solicite nueva información de estado y sensores de los dispositivos cada X segundos. 0 (cero) desactiva el sondeo.",
"Lbl_Donation": "Donación"
}
3 changes: 2 additions & 1 deletion admin/i18n/fr/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "ID de défi Dyson",
"desc_2FA": "Vous devez effectuer un premier processus 2FA unique similaire à l'application Dyson pour activer cet adaptateur.",
"Lbl_UpAndRunning": "Cette instance d'adaptateur doit être opérationnelle avant la configuration.",
"Poll_Interval_desc": "Demandez de nouvelles informations sur l'état et les capteurs des appareils toutes les X secondes. 0 (zéro) désactive l’interrogation."
"Poll_Interval_desc": "Demandez de nouvelles informations sur l'état et les capteurs des appareils toutes les X secondes. 0 (zéro) désactive l’interrogation.",
"Lbl_Donation": "Donation"
}
3 changes: 2 additions & 1 deletion admin/i18n/it/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "Dyson Challenge-Id",
"desc_2FA": "È necessario eseguire un processo 2FA iniziale una tantum simile all'app Dyson per attivare questo adattatore.",
"Lbl_UpAndRunning": "Questa istanza dell'adattatore deve essere attiva e in esecuzione prima della configurazione.",
"Poll_Interval_desc": "Richiedi nuove informazioni sullo stato e sui sensori dai dispositivi ogni X secondi. 0 (zero) disabilita il polling."
"Poll_Interval_desc": "Richiedi nuove informazioni sullo stato e sui sensori dai dispositivi ogni X secondi. 0 (zero) disabilita il polling.",
"Lbl_Donation": "Donazione"
}
3 changes: 2 additions & 1 deletion admin/i18n/nl/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "dyson Challenge-ID",
"desc_2FA": "U moet een eerste eenmalig 2FA-proces uitvoeren, vergelijkbaar met de Dyson-app, om deze adapter te activeren.",
"Lbl_UpAndRunning": "Deze adapterinstantie moet actief zijn vóór de configuratie.",
"Poll_Interval_desc": "Vraag elke X seconden nieuwe status- en sensorinformatie op van apparaten. 0 (nul) schakelt polling uit."
"Poll_Interval_desc": "Vraag elke X seconden nieuwe status- en sensorinformatie op van apparaten. 0 (nul) schakelt polling uit.",
"Lbl_Donation": "Donatie"
}
3 changes: 2 additions & 1 deletion admin/i18n/pl/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "dyson Challenge-Id",
"desc_2FA": "Aby aktywować ten adapter, musisz wykonać początkowy jednorazowy proces 2FA podobny do aplikacji dyson.",
"Lbl_UpAndRunning": "Przed konfiguracją ta instancja adaptera musi zostać uruchomiona i uruchomiona.",
"Poll_Interval_desc": "Żądaj nowych informacji o stanie i czujnikach z urządzeń co X sekund. 0 (zero) wyłącza odpytywanie."
"Poll_Interval_desc": "Żądaj nowych informacji o stanie i czujnikach z urządzeń co X sekund. 0 (zero) wyłącza odpytywanie.",
"Lbl_Donation": "Darowizna"
}
3 changes: 2 additions & 1 deletion admin/i18n/pt/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "ID do desafio dison",
"desc_2FA": "Você precisa realizar um processo 2FA inicial semelhante ao aplicativo dyson para ativar este adaptador.",
"Lbl_UpAndRunning": "Esta instância do adaptador precisa estar instalada e em execução antes da configuração.",
"Poll_Interval_desc": "Solicite novas informações de status e sensores dos dispositivos a cada X segundos. 0 (zero) desativa a pesquisa."
"Poll_Interval_desc": "Solicite novas informações de status e sensores dos dispositivos a cada X segundos. 0 (zero) desativa a pesquisa.",
"Lbl_Donation": "Doação"
}
3 changes: 2 additions & 1 deletion admin/i18n/ru/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "Идентификатор вызова Dyson",
"desc_2FA": "Чтобы активировать этот адаптер, вам необходимо выполнить первоначальный однократный процесс 2FA, аналогичный тому, который используется в приложении Dyson.",
"Lbl_UpAndRunning": "Перед настройкой этот экземпляр адаптера должен быть запущен и запущен.",
"Poll_Interval_desc": "Запрашивайте новую информацию о состоянии и датчиках от устройств каждые X секунд. 0 (ноль) отключает опрос."
"Poll_Interval_desc": "Запрашивайте новую информацию о состоянии и датчиках от устройств каждые X секунд. 0 (ноль) отключает опрос.",
"Lbl_Donation": "Пожертвование"
}
3 changes: 2 additions & 1 deletion admin/i18n/uk/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "dyson Challenge-Id",
"desc_2FA": "Щоб активувати цей адаптер, потрібно виконати початковий одноразовий процес 2FA, подібний до програми dyson.",
"Lbl_UpAndRunning": "Цей екземпляр адаптера має бути запущений і запущений до налаштування.",
"Poll_Interval_desc": "Запитувати новий статус і дані датчиків від пристроїв кожні X секунд. 0 (нуль) вимикає опитування."
"Poll_Interval_desc": "Запитувати новий статус і дані датчиків від пристроїв кожні X секунд. 0 (нуль) вимикає опитування.",
"Lbl_Donation": "Пожертвування"
}
3 changes: 2 additions & 1 deletion admin/i18n/zh-cn/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"Lbl_ChallengeId": "戴森挑战-ID",
"desc_2FA": "您需要执行类似于戴森应用程序的初始一次性 2FA 流程来激活此适配器。",
"Lbl_UpAndRunning": "该适配器实例需要在配置之前启动并运行。",
"Poll_Interval_desc": "每 X 秒向设备请求新的状态和传感器信息。 0(零)禁用轮询。"
"Poll_Interval_desc": "每 X 秒向设备请求新的状态和传感器信息。 0(零)禁用轮询。",
"Lbl_Donation": "捐款"
}
132 changes: 72 additions & 60 deletions admin/jsonConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@
"i18n": true,
"type": "panel",
"items": {
"donationHelp": {
"type": "staticText",
"text": "donation"
},
"donateButton": {
"newLine": true,
"type": "staticImage",
"src": "adapter/dysonairpurifier/admin/paypal-donate-button.png",
"href": "https://www.paypal.com/donate/?hosted_button_id=SPUDTXGNG2MYG"
},
"testAlive": {
"newLine": true,
"type": "alive",
Expand All @@ -24,16 +14,7 @@
"type": "header",
"text": "Settings",
"size": 2,
"sm": 24,
"md": 8,
"lg": 6
},
"_2FactorSection": {
"type": "header",
"text": "Lbl_2FA",
"tooltip": "desc_2FA",
"size": 2,
"sm": 24,
"sm": 12,
"md": 8,
"lg": 6
},
Expand All @@ -54,16 +35,6 @@
"md": 4,
"lg": 3
},
"token_received": {
"type": "checkbox",
"label": "token_received",
"tooltip": "token_received_desc",
"defaultFunc": "data.token_received=(data.token.length > 0)",
"disabled": "true",
"sm": 30,
"md": 94,
"lg": 6
},
"country": {
"newLine": true,
"type": "select",
Expand Down Expand Up @@ -114,36 +85,47 @@
"md": 3,
"lg": 2
},
"challengeId": {
"type": "text",
"label": "Lbl_ChallengeId",
"tooltip": "challengeId_desc",
"default": "",
"doNotSave": true,
"sm": 12,
"md": 4,
"lg": 3
},
"dyson_code": {
"type": "text",
"label": "Lbl_dyson_code",
"tooltip": "dyson_code_desc",
"doNotSave": true,
"sm": 12,
"md": 4,
"lg": 3
},
"keepValues": {
"newLine": true,
"type": "checkbox",
"label": "keepValues",
"tooltip": "keepValues_desc",
"default": false,
"sm": 30,
"md": 9,
"sm": 6,
"md": 3,
"lg": 2
},
"disableReconnectLogging": {
"type": "checkbox",
"label": "disableReconnectLogging",
"tooltip": "disableReconnectLogging_desc",
"default": false,
"sm": 6,
"md": 3,
"lg": 2
},
"_2FactorSection": {
"newLine": true,
"type": "header",
"text": "Lbl_2FA",
"tooltip": "desc_2FA",
"size": 2,
"sm": 12,
"md": 8,
"lg": 6
},
"token_received": {
"type": "checkbox",
"label": "token_received",
"tooltip": "token_received_desc",
"defaultFunc": "data.token_received=(data.token.length > 0)",
"disabled": "true",
"sm": 12,
"md": 6,
"lg": 4
},
"getDyson2faMail": {
"newLine": true,
"type": "sendTo",
"label": "Start 2FA Process",
"variant": "outlined",
Expand All @@ -169,25 +151,55 @@
"md": 2,
"lg": 3
},
"disableReconnectLogging": {
"challengeId": {
"newLine": true,
"type": "checkbox",
"label": "disableReconnectLogging",
"tooltip": "disableReconnectLogging_desc",
"default": false,
"sm": 30,
"md": 9,
"lg": 6
"type": "text",
"label": "Lbl_ChallengeId",
"tooltip": "challengeId_desc",
"default": "",
"doNotSave": true,
"sm": 12,
"md": 4,
"lg": 3
},
"dyson_code": {
"type": "text",
"label": "Lbl_dyson_code",
"tooltip": "dyson_code_desc",
"doNotSave": true,
"sm": 12,
"md": 4,
"lg": 3
},
"token": {
"type": "password",
"label": "Token",
"tooltip": "token_desc",
"disabled": "true",
"hidden": "true",
"sm": 30,
"sm": 12,
"md": 9,
"lg": 6
},
"_donateSection": {
"newLine": true,
"type": "header",
"text": "Lbl_Donation",
"tooltip": "donation",
"size": 2,
"sm": 12,
"md": 8,
"lg": 6
},
"donationHelp": {
"newLine": true,
"type": "staticText",
"text": "donation"
},
"donateButton": {
"type": "staticImage",
"src": "adapter/dysonairpurifier/admin/paypal-donate-button.png",
"href": "https://www.paypal.com/donate/?hosted_button_id=SPUDTXGNG2MYG"
}
}
}
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"www/",
"io-package.json",
"LICENSE",
"main.js"
"README.md",
"*.{json,js}"
],
"engines": {
"node": ">= 18.2.0"
Expand All @@ -57,7 +58,7 @@
"readmeFilename": "README.md",
"snyk": true,
"dependencies": {
"@iobroker/adapter-core": "^3.2.1",
"@iobroker/adapter-core": "^3.2.2",
"@snyk/protect": "^1.1293.1",
"axios": "^1.7.7",
"flatted": "^3.3.1",
Expand All @@ -76,8 +77,8 @@
"@iobroker/testing": "^5.0.0",
"@types/chai": "^5.0.0",
"@types/chai-as-promised": "^8.0.1",
"@types/mocha": "^10.0.8",
"@types/node": "^22.7.4",
"@types/mocha": "^10.0.9",
"@types/node": "^22.7.5",
"@types/proxyquire": "^1.3.31",
"@types/sinon": "^17.0.3",
"@types/sinon-chai": "^3.2.12",
Expand Down

0 comments on commit c7ab436

Please sign in to comment.