iobroker.alarm 3.3.9 → 3.3.11

package/README.md

@@ -23,10 +23,18 @@
 **[English description](docs/en/alarm_en.md)**
 
 ******************************************************************************************
+## CHANGELOG
+
 <!--
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 3.3.11 (2023-04-15)
+* (misanorot) fixed issue at night rest
+
+### 3.3.10 (2023-03-31)
+* (misanorot) fixed litle speech and presence bug
+
 ### 3.3.9 (2023-01-14)
 * (misanorot) fixed issues at burgle log
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "alarm",
-    "version": "3.3.9",
+    "version": "3.3.11",
     "news": {
+      "3.3.11": {
+        "en": "fixed issue at night rest",
+        "de": "festes problem bei nachtruhe",
+        "ru": "фиксированная проблема в ночной отдых",
+        "pt": "problema fixo no descanso noturno",
+        "nl": "'s nachts rust",
+        "fr": "problème fixe au repos nocturne",
+        "it": "problema fisso al riposo notturno",
+        "es": "tema fijo en el descanso nocturno",
+        "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",
@@ -67,32 +93,6 @@
         "pl": "aktualizacja dziennika",
         "uk": "виправлені питання в журналі сьогодні",
         "zh-cn": "今天逻辑上的固定问题"
-      },
-      "3.3.4": {
-        "en": "fixed issues",
-        "de": "feste probleme",
-        "ru": "фиксированные вопросы",
-        "pt": "problemas",
-        "nl": "_",
-        "fr": "questions fixes",
-        "it": "questioni fisse",
-        "es": "cuestiones fijas",
-        "pl": "ustalenie",
-        "uk": "виправлені питання",
-        "zh-cn": "固定问题"
-      },
-      "3.3.3": {
-        "en": "fixed issues",
-        "de": "feste probleme",
-        "ru": "фиксированные вопросы",
-        "pt": "problemas",
-        "nl": "_",
-        "fr": "questions fixes",
-        "it": "questioni fisse",
-        "es": "cuestiones fijas",
-        "pl": "ustalenie",
-        "uk": "виправлені питання",
-        "zh-cn": "固定问题"
       }
     },
     "title": "Alarm",

package/main.js

@@ -1203,7 +1203,7 @@ class Alarm extends utils.Adapter {
 	}
 
 	sleep_begin(auto) {
-		if (night_rest) return;
+		if (night_rest || burgle) return;
 		if (auto && inside || auto && activated) {
 			this.log.warn(`Cannot set alarm system to night rest, it is sharp or sharp inside`);
 			return;
@@ -1604,17 +1604,18 @@ class Alarm extends utils.Adapter {
 	countdown(count) {
 		const time = this.timeMode(this.config.time_activate_select);
 		let counter = this.config.time_activate * time / 1000;
-		let say = this.config.time_activate + ' ' + this.config.text_countdown;
 		if (count && !timer && !activated) {
+			const say = this.config.time_activate + ' ' + this.config.text_countdown;
 			if (is_alarm) {
 				if (this.config.send_activation_warnings) this.messages(`${this.config.log_act_notice} ${names_alarm}`);
-				say = say + ' ' + this.config.text_warning;
+				let say = this.config.text_warning;
 				if (this.config.opt_say_names) {
 					say = say + ' ' + names_alarm;
 				}
 				this.sayit(say, 4);
 			}
-			this.sayit(say, 11);
+			if (is_alarm) setTimeout(() => {this.sayit(say, 11);}, 5000);
+			else this.sayit(say, 11);
 			this.setState('status.gets_activated', true, true);
 			this.setState('status.state', 'gets activated', true);
 			this.setState('status.state_list', 5, true);
@@ -1795,7 +1796,7 @@ class Alarm extends utils.Adapter {
 					tempObj.presence_light_lux = ele.presence_light_lux;
 					tempObj.wasOn = false;
 
-					presenceTimers[ele.id] = tempObj;
+					presenceTimers[ele.name_id] = tempObj;
 
 				} else if (!ele.enable) {
 					this.log.debug(`Presence state not used but configured: ${ele.name_id}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.alarm",
-  "version": "3.3.9",
+  "version": "3.3.11",
   "description": "Your own lttle alarm system",
   "author": {
     "name": "misanorot",
@@ -21,8 +21,8 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7",
-    "node-schedule": "^2.1.0",
+    "@iobroker/adapter-core": "^2.6.8",
+    "node-schedule": "^2.1.1",
     "suncalc2": "^1.8.1"
   },
   "devDependencies": {
@@ -36,18 +36,18 @@
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.18",
+    "@types/node": "^18.15.11",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.31.0",
+    "eslint": "^8.37.0",
     "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^15.0.1",
+    "sinon": "^15.0.3",
     "sinon-chai": "^3.7.0",
-    "typescript": "~4.9.4"
+    "typescript": "~5.0.3"
   },
   "main": "main.js",
   "files": [