iobroker.alarm 3.4.1 → 3.4.3

package/README.md

@@ -29,20 +29,22 @@
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 3.4.3 (2023-11-05)
+* (misanorot) added silent_alarm (state list) to shortcuts
+
+### 3.4.2 (2023-10-31)
+* (misanorot) added enhancement #170
+
 ### 3.4.1 (2023-10-29)
 * (misanorot) fixed astro at presence simulation (jsControler 5.x???)
 
 ### 3.4.0 (2023-10-03)
 * (misanorot) fixed #168
 
-### 3.3.13 (2023-09-19)
-* (misanorot) fixed #147
-
-### 3.3.12 (2023-06-23)
-* (misanorot) fixed select-id popup and little issues on setting pages
+**[older changelogs](CHANGELOG_OLD.md)**
 
-### 3.3.11 (2023-04-15)
-* (misanorot) fixed issue at night rest
+### 3.3.7 (2023-01-02)
+* (misanorot) fixed issues at presence light trigger
 
 ## License
 MIT License

package/admin/index_m.html

@@ -1376,7 +1376,7 @@
                       data-options="status.state_list;status.activated;status.gets_activated;status.deactivated;status.burglar_alarm;status.silent_alarm;status.siren;status.activation_failed;status.sleep;status.activated_with_warnings;status.enableable;status.sharp_inside_activated;status.siren_inside;info.notification_circuit_changes;status.alarm_flash;status.silent_flash;other_alarms.one_changes;other_alarms.two_changes"
                       class=" translate">Name</th>
                     <th data-name="trigger_val" style="background: #174475" data-type="select"
-                      data-options=" ;true;false;deactivated;sharp;sharp_inside;burglary;night_rest;gets_activated;activation_failed;activation_aborted"
+                      data-options=" ;true;false;deactivated;sharp;sharp_inside;burglary;night_rest;gets_activated;activation_failed;activation_aborted;silent_alarm"
                       class=" translate">Trigger</th>
                     <th data-name="name" style="background: #174475" data-type="text" class=" translate">Name</th>
                     <th data-name="name_id" style="background: #174475" data-type="text" class=" translate">Object-ID

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "alarm",
-    "version": "3.4.1",
+    "version": "3.4.3",
     "news": {
+      "3.4.3": {
+        "en": "added silent_alarm (state list) to shortcuts",
+        "de": "stumm_alarm (stateliste) zu shortcuts hinzugefügt",
+        "ru": "добавлено quiet_alarm (список состояния) на shortcuts",
+        "pt": "adicionado silent_alarm (lista de estado) para atalhos",
+        "nl": "vertaling:",
+        "fr": "added silent_alarm (state list) to shortcuts",
+        "it": "aggiunto silent_alarm (elenco di stato) alle scorciatoie",
+        "es": "añadido silencio_alarma (lista de estado) a atajos",
+        "pl": "dodał cichą listę (listę stanową) do skrótów",
+        "uk": "додано безшумний_алматичний список (державний список) для ярликів",
+        "zh-cn": "补充沉默:沉默(国家名单)"
+      },
+      "3.4.2": {
+        "en": "added enhancement #170",
+        "de": "erweiterung #170",
+        "ru": "добавлено улучшение #170",
+        "pt": "melhoria adicionada #170",
+        "nl": "verbetering #170",
+        "fr": "amélioration ajoutée #170",
+        "it": "aggiunto miglioramento #170",
+        "es": "mejora agregada #170",
+        "pl": "dodał także poprawkę #170",
+        "uk": "додано підвищення #170",
+        "zh-cn": "增援行动170"
+      },
       "3.4.1": {
         "en": "fixed astro at presence simulation (jsControler 5.x???)",
         "de": "fester Astro bei Präsenzsimulation (jsControler 5.x?)",
@@ -67,32 +93,6 @@
         "pl": "trwały problem w nocy",
         "uk": "виправлено проблему в нічному режимі",
         "zh-cn": "夜间固定问题休息"
-      },
-      "3.3.10": {
-        "en": "fixed litle speech and presence bug",
-        "de": "feste litle rede und anwesenheit fehler",
-        "ru": "исправлена лиловая речь и ошибка присутствия",
-        "pt": "discurso de linho fixo e bug presença",
-        "nl": "_",
-        "fr": "discours fixe et bug de présence",
-        "it": "discorso fisso e bug di presenza",
-        "es": "discurso de litio fijo y error de presencia",
-        "pl": "stałe przemówienie i obecność bugu",
-        "uk": "виправлений лайт мова і наявність помилок",
-        "zh-cn": "固定的利词和存在 bug"
-      },
-      "3.3.9": {
-        "en": "fixed issues at burgle log",
-        "de": "feste probleme bei burgle log",
-        "ru": "фиксированные вопросы в burgle log",
-        "pt": "problemas fixos no log de águia",
-        "nl": "vertaling:",
-        "fr": "problèmes fixes dans le journal de burgle",
-        "it": "problemi fissi a log burgle",
-        "es": "problemas fijos en el registro de burgle",
-        "pl": "prawidłowe problemy z burgle logiem",
-        "uk": "виправлені питання в burgle log",
-        "zh-cn": "堡固定问题"
       }
     },
     "title": "Alarm",

package/main.js

@@ -1728,6 +1728,9 @@ class Alarm extends utils.Adapter {
 				case 7:
 					setVal = 'activation_aborted';
 					break;
+				case 8:
+					setVal = 'silent_alarm';
+					break;
 				default:
 					setVal = val;
 					this.log.warn(`Wrong list state at shortcuts: ${val}`);
@@ -1848,95 +1851,95 @@ class Alarm extends utils.Adapter {
 				switch (presenceTimers[item].option_presence) {
 					case 'time':
 						if (presenceTimers[item].presence_time_from == '' || presenceTimers[item].presence_time_to == '') {
-							this.log.warn(`Please check the times when configuring attendance: ${presenceTimers[item].name_id}`);
+							this.log.warn(`Please check the times when configuring attendance: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id} `);
 							return;
 						}
 						if (this.timeInRange(presenceTimers[item].presence_time_from, presenceTimers[item].presence_time_to) && !presenceTimers[item].wasOn) {
-							this.log.debug(`Delay for: ${presenceTimers[item].name_id} starts ${presenceTimers[item].presence_delay}ms, because time is in range.`);
+							this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  starts ${presenceTimers[item].presence_delay}ms, because time is in range.`);
 							presenceTimers[item].wasOn = true;
 							presenceTimers[item].presenceDelayTimer = setTimeout(() => {
-								this.log.debug(`Delay for: ${presenceTimers[item].name_id} ends and switch ON ${presenceTimers[item].presence_length}ms.`);
+								this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch ON ${presenceTimers[item].presence_length}ms.`);
 								this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_on), (err) => {
 									if (err) this.log.warn(`Cannot set state: ${err}`);
 								});
 								presenceTimers[item].presenceLengthTimer = setTimeout(() => {
-									this.log.debug(`Switch ON for: ${presenceTimers[item].name_id} ends and switch OFF.`);
+									this.log.debug(`Switch ON for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch OFF.`);
 									this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_off), (err) => {
 										if (err) this.log.warn(`Cannot set state: ${err}`);
 									});
 								}, presenceTimers[item].presence_length);
 							}, presenceTimers[item].presence_delay);
 						} else {
-							this.log.debug(`${presenceTimers[item].name_id} was ON or is not in time range`);
+							this.log.debug(`${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  was ON or is not in time range`);
 						}
 						break;
 					case 'sunrise':
 						if (sunrise && !presenceTimers[item].wasOn) {
-							this.log.debug(`Delay for: ${presenceTimers[item].name_id} starts ${presenceTimers[item].presence_delay}ms, by sunrise`);
+							this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  starts ${presenceTimers[item].presence_delay}ms, by sunrise`);
 							presenceTimers[item].wasOn = true;
 							presenceTimers[item].presenceDelayTimer = setTimeout(() => {
-								this.log.debug(`Delay for: ${presenceTimers[item].name_id} ends and switch ON ${presenceTimers[item].presence_length}ms.`);
+								this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch ON ${presenceTimers[item].presence_length}ms.`);
 								this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_on), (err) => {
 									if (err) this.log.warn(`Cannot set state: ${err}`);
 								});
 								presenceTimers[item].presenceLengthTimer = setTimeout(() => {
-									this.log.debug(`Switch ON for: ${presenceTimers[item].name_id} ends and switch OFF.`);
+									this.log.debug(`Switch ON for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch OFF.`);
 									this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_off), (err) => {
 										if (err) this.log.warn(`Cannot set state: ${err}`);
 									});
 								}, presenceTimers[item].presence_length);
 							}, presenceTimers[item].presence_delay);
 						} else {
-							this.log.debug(`${presenceTimers[item].name_id} was ON or is no sunrise`);
+							this.log.debug(`${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  was ON or is no sunrise`);
 						}
 						break;
 					case 'sunset':
 						if (sunset && !presenceTimers[item].wasOn) {
-							this.log.debug(`Delay for: ${presenceTimers[item].name_id} starts ${presenceTimers[item].presence_delay}ms, by sunset`);
+							this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  starts ${presenceTimers[item].presence_delay}ms, by sunset`);
 							presenceTimers[item].wasOn = true;
 							presenceTimers[item].presenceDelayTimer = setTimeout(() => {
-								this.log.debug(`Delay for: ${presenceTimers[item].name_id} ends and switch ON ${presenceTimers[item].presence_length}ms.`);
+								this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch ON ${presenceTimers[item].presence_length}ms.`);
 								this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_on), (err) => {
 									if (err) this.log.warn(`Cannot set state: ${err}`);
 								});
 								presenceTimers[item].presenceLengthTimer = setTimeout(() => {
-									this.log.debug(`Switch ON for: ${presenceTimers[item].name_id} ends and switch OFF.`);
+									this.log.debug(`Switch ON for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch OFF.`);
 									this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_off), (err) => {
 										if (err) this.log.warn(`Cannot set state: ${err}`);
 									});
 								}, presenceTimers[item].presence_length);
 							}, presenceTimers[item].presence_delay);
 						} else {
-							this.log.debug(`${presenceTimers[item].name_id} was ON or is no sunset`);
+							this.log.debug(`${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  was ON or is no sunset`);
 						}
 						break;
 					case 'light':
 						// eslint-disable-next-line no-case-declarations
 						const lightVal = await this.getForeignStateAsync(presenceTimers[item].presence_trigger_light).catch((e) => {
-							this.log.warn(`Check your light ID ${presenceTimers[item].name_id} in presence config! +++ ${e}`);
+							this.log.warn(`Check your light ID ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  in presence config! +++ ${e}`);
 							return;
 						});
 						if (lightVal.val < presenceTimers[item].presence_light_lux && !presenceTimers[item].wasOn) {
-							this.log.debug(`Delay for: ${presenceTimers[item].name_id} starts ${presenceTimers[item].presence_delay}ms, because light value is exceeded`);
+							this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  starts ${presenceTimers[item].presence_delay}ms, because light value is not under the limit.`);
 							presenceTimers[item].wasOn = true;
 							presenceTimers[item].presenceDelayTimer = setTimeout(() => {
-								this.log.debug(`Delay for: ${presenceTimers[item].name_id} ends and switch ON ${presenceTimers[item].presence_length}ms.`);
+								this.log.debug(`Delay for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch ON ${presenceTimers[item].presence_length}ms.`);
 								this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_on), (err) => {
 									if (err) this.log.warn(`Cannot set state: ${err}`);
 								});
 								presenceTimers[item].presenceLengthTimer = setTimeout(() => {
-									this.log.debug(`Switch ON for: ${presenceTimers[item].name_id} ends and switch OFF.`);
+									this.log.debug(`Switch ON for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  ends and switch OFF.`);
 									this.setForeignState(presenceTimers[item].name_id, this.bools(presenceTimers[item].presence_val_off), (err) => {
 										if (err) this.log.warn(`Cannot set state: ${err}`);
 									});
 								}, presenceTimers[item].presence_length);
 							}, presenceTimers[item].presence_delay);
 						} else {
-							this.log.debug(`${presenceTimers[item].name_id} was ON or light value is not exceeded`);
+							this.log.debug(`${presenceTimers[item].name} -- ${presenceTimers[item].name_id}  was ON or light value is not under the limit.`);
 						}
 						break;
 					default:
-						this.log.warn(`Please check presence configuration for: ${presenceTimers[item].name_id}, value: ${presenceTimers[item].option_presence}`);
+						this.log.warn(`Please check presence configuration for: ${presenceTimers[item].name} -- ${presenceTimers[item].name_id} , value: ${presenceTimers[item].option_presence}`);
 				}
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.alarm",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "Your own lttle alarm system",
   "author": {
     "name": "misanorot",
@@ -21,7 +21,7 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.3",
+    "@iobroker/adapter-core": "^3.0.4",
     "node-schedule": "^2.1.1",
     "suncalc2": "^1.8.1"
   },
@@ -34,12 +34,12 @@
     "@iobroker/testing": "^4.1.0",
     "@tsconfig/node16": "^16.1.1",
     "@types/chai": "^4.3.6",
-    "@types/chai-as-promised": "^7.1.6",
+    "@types/chai-as-promised": "^7.1.7",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^20.8.0",
-    "@types/proxyquire": "^1.3.29",
+    "@types/node": "^20.8.10",
+    "@types/proxyquire": "^1.3.30",
     "@types/sinon": "^10.0.15",
-    "@types/sinon-chai": "^3.2.9",
+    "@types/sinon-chai": "^3.2.11",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.50.0",