iobroker.ring 5.0.5 → 5.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -0
- package/admin/i18n/de.json +9 -3
- package/admin/i18n/en.json +8 -2
- package/admin/i18n/es.json +8 -1
- package/admin/i18n/fr.json +9 -3
- package/admin/i18n/it.json +9 -3
- package/admin/i18n/nl.json +9 -3
- package/admin/i18n/pl.json +9 -3
- package/admin/i18n/pt.json +9 -3
- package/admin/i18n/ru.json +9 -3
- package/admin/i18n/uk.json +9 -3
- package/admin/i18n/zh-cn.json +9 -3
- package/admin/jsonConfig.json +117 -1
- package/admin/preferences-desktop-notification-bell-3.png +0 -0
- package/build/lib/constants.js.map +1 -1
- package/build/lib/lastAction.js.map +1 -1
- package/build/lib/ownRingCamera.js +163 -288
- package/build/lib/ownRingCamera.js.map +1 -1
- package/build/lib/ownRingDevice.js.map +1 -1
- package/build/lib/ownRingIntercom.js.map +1 -1
- package/build/lib/ownRingLocation.js +6 -4
- package/build/lib/ownRingLocation.js.map +1 -1
- package/build/lib/ringApiClient.js +2 -4
- package/build/lib/ringApiClient.js.map +1 -1
- package/build/lib/services/event-blocker.js +34 -0
- package/build/lib/services/event-blocker.js.map +1 -0
- package/build/lib/services/file-service.js +2 -2
- package/build/lib/services/file-service.js.map +1 -1
- package/build/lib/services/image-service.js +53 -0
- package/build/lib/services/image-service.js.map +1 -0
- package/build/lib/services/text-service.js +92 -0
- package/build/lib/services/text-service.js.map +1 -0
- package/build/lib/tools.js.map +1 -1
- package/build/main.js +92 -92
- package/build/main.js.map +1 -1
- package/io-package.json +40 -32
- package/package.json +10 -10
package/build/main.js
CHANGED
|
@@ -68,6 +68,95 @@ class RingAdapter extends adapter_core_1.Adapter {
|
|
|
68
68
|
// this.on("message", this.onMessage.bind(this));
|
|
69
69
|
this.on("unload", this.onUnload.bind(this));
|
|
70
70
|
}
|
|
71
|
+
static getSplitIds(id) {
|
|
72
|
+
const splits = id.split(".");
|
|
73
|
+
let device = "";
|
|
74
|
+
let channel = "";
|
|
75
|
+
let stateName = splits[0];
|
|
76
|
+
if (splits.length === 2) {
|
|
77
|
+
device = splits[0];
|
|
78
|
+
stateName = splits[1];
|
|
79
|
+
}
|
|
80
|
+
else if (splits.length === 3) {
|
|
81
|
+
device = splits[0];
|
|
82
|
+
channel = splits[1];
|
|
83
|
+
stateName = splits[2];
|
|
84
|
+
}
|
|
85
|
+
return { device, channel, stateName };
|
|
86
|
+
}
|
|
87
|
+
upsertState(id, common, value, ack = true, subscribe = false) {
|
|
88
|
+
if (this.states[id] === value && !subscribe) {
|
|
89
|
+
// Unchanged and from user not changeable Value
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
// noinspection JSIgnoredPromiseFromCall
|
|
93
|
+
this.upsertStateAsync(id, common, value, ack, subscribe);
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Is called when adapter shuts down - callback has to be called under any circumstances!
|
|
97
|
+
*/
|
|
98
|
+
onUnload(callback) {
|
|
99
|
+
try {
|
|
100
|
+
// Here you must clear all timeouts or intervals that may still be active
|
|
101
|
+
// clearTimeout(timeout1);
|
|
102
|
+
// clearTimeout(timeout2);
|
|
103
|
+
// ...
|
|
104
|
+
// clearInterval(interval1);
|
|
105
|
+
if (this.apiClient) {
|
|
106
|
+
this.apiClient.unload();
|
|
107
|
+
}
|
|
108
|
+
callback();
|
|
109
|
+
}
|
|
110
|
+
catch (e) {
|
|
111
|
+
callback();
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
// If you need to react to object changes, uncomment the following block and the corresponding line in the constructor.
|
|
115
|
+
// You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`.
|
|
116
|
+
// /**
|
|
117
|
+
// * Is called if a subscribed object changes
|
|
118
|
+
// */
|
|
119
|
+
// private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void {
|
|
120
|
+
// if (obj) {
|
|
121
|
+
// // The object was changed
|
|
122
|
+
// this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`);
|
|
123
|
+
// } else {
|
|
124
|
+
// // The object was deleted
|
|
125
|
+
// this.log.info(`object ${id} deleted`);
|
|
126
|
+
// }
|
|
127
|
+
// }
|
|
128
|
+
async tryGetStringState(id) {
|
|
129
|
+
var _a, _b;
|
|
130
|
+
const cachedVal = this.states[id];
|
|
131
|
+
if (cachedVal !== undefined && cachedVal !== null) {
|
|
132
|
+
return cachedVal + "";
|
|
133
|
+
}
|
|
134
|
+
return ((_b = (_a = (await this.getStateAsync(id))) === null || _a === void 0 ? void 0 : _a.val) !== null && _b !== void 0 ? _b : "") + "";
|
|
135
|
+
}
|
|
136
|
+
// If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor.
|
|
137
|
+
// /**
|
|
138
|
+
// * Some message was sent to this instance over the message box. Used by email, pushover, text2speech, ...
|
|
139
|
+
// * Using this method requires "common.messagebox" property to be set to true in io-package.json
|
|
140
|
+
// */
|
|
141
|
+
// private onMessage(obj: ioBroker.Message): void {
|
|
142
|
+
// if (typeof obj === "object" && obj.message) {
|
|
143
|
+
// if (obj.command === "send") {
|
|
144
|
+
// // e.g. send email or pushover or whatever
|
|
145
|
+
// this.log.info("send command");
|
|
146
|
+
// // Send response in callback if required
|
|
147
|
+
// if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback);
|
|
148
|
+
// }
|
|
149
|
+
// }
|
|
150
|
+
// }
|
|
151
|
+
async getRefreshToken() {
|
|
152
|
+
const newTokenStateVal = await this.tryGetStringState("next_refresh_token");
|
|
153
|
+
const oldTokenStateVal = await this.tryGetStringState("old_user_refresh_token");
|
|
154
|
+
if (newTokenStateVal && oldTokenStateVal === this.config.refreshtoken) {
|
|
155
|
+
this.log.debug(`As the configured refresh token hasn't changed the state one will be used`);
|
|
156
|
+
return newTokenStateVal;
|
|
157
|
+
}
|
|
158
|
+
return this.config.refreshtoken;
|
|
159
|
+
}
|
|
71
160
|
async CalcSunData() {
|
|
72
161
|
try {
|
|
73
162
|
this.log.debug("Run CalcSunData");
|
|
@@ -143,39 +232,6 @@ class RingAdapter extends adapter_core_1.Adapter {
|
|
|
143
232
|
await this.CalcSunData();
|
|
144
233
|
});
|
|
145
234
|
}
|
|
146
|
-
/**
|
|
147
|
-
* Is called when adapter shuts down - callback has to be called under any circumstances!
|
|
148
|
-
*/
|
|
149
|
-
onUnload(callback) {
|
|
150
|
-
try {
|
|
151
|
-
// Here you must clear all timeouts or intervals that may still be active
|
|
152
|
-
// clearTimeout(timeout1);
|
|
153
|
-
// clearTimeout(timeout2);
|
|
154
|
-
// ...
|
|
155
|
-
// clearInterval(interval1);
|
|
156
|
-
if (this.apiClient) {
|
|
157
|
-
this.apiClient.unload();
|
|
158
|
-
}
|
|
159
|
-
callback();
|
|
160
|
-
}
|
|
161
|
-
catch (e) {
|
|
162
|
-
callback();
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
// If you need to react to object changes, uncomment the following block and the corresponding line in the constructor.
|
|
166
|
-
// You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`.
|
|
167
|
-
// /**
|
|
168
|
-
// * Is called if a subscribed object changes
|
|
169
|
-
// */
|
|
170
|
-
// private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void {
|
|
171
|
-
// if (obj) {
|
|
172
|
-
// // The object was changed
|
|
173
|
-
// this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`);
|
|
174
|
-
// } else {
|
|
175
|
-
// // The object was deleted
|
|
176
|
-
// this.log.info(`object ${id} deleted`);
|
|
177
|
-
// }
|
|
178
|
-
// }
|
|
179
235
|
/**
|
|
180
236
|
* Is called if a subscribed state changes
|
|
181
237
|
*/
|
|
@@ -201,36 +257,9 @@ class RingAdapter extends adapter_core_1.Adapter {
|
|
|
201
257
|
}
|
|
202
258
|
this.apiClient.processUserInput(targetId, channelID, stateID, state);
|
|
203
259
|
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
// * Using this method requires "common.messagebox" property to be set to true in io-package.json
|
|
208
|
-
// */
|
|
209
|
-
// private onMessage(obj: ioBroker.Message): void {
|
|
210
|
-
// if (typeof obj === "object" && obj.message) {
|
|
211
|
-
// if (obj.command === "send") {
|
|
212
|
-
// // e.g. send email or pushover or whatever
|
|
213
|
-
// this.log.info("send command");
|
|
214
|
-
// // Send response in callback if required
|
|
215
|
-
// if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback);
|
|
216
|
-
// }
|
|
217
|
-
// }
|
|
218
|
-
// }
|
|
219
|
-
upsertState(id, common, value, ack = true, subscribe = false) {
|
|
220
|
-
if (this.states[id] === value && !subscribe) {
|
|
221
|
-
// Unchanged and from user not changeable Value
|
|
222
|
-
return;
|
|
223
|
-
}
|
|
224
|
-
// noinspection JSIgnoredPromiseFromCall
|
|
225
|
-
this.upsertStateAsync(id, common, value, ack, subscribe);
|
|
226
|
-
}
|
|
227
|
-
async tryGetStringState(id) {
|
|
228
|
-
var _a, _b;
|
|
229
|
-
const cachedVal = this.states[id];
|
|
230
|
-
if (cachedVal !== undefined && cachedVal !== null) {
|
|
231
|
-
return cachedVal + "";
|
|
232
|
-
}
|
|
233
|
-
return ((_b = (_a = (await this.getStateAsync(id))) === null || _a === void 0 ? void 0 : _a.val) !== null && _b !== void 0 ? _b : "") + "";
|
|
260
|
+
logCatch(message, reason) {
|
|
261
|
+
this.log.info(message);
|
|
262
|
+
this.log.debug(`Reason: "${reason}"`);
|
|
234
263
|
}
|
|
235
264
|
async upsertStateAsync(id, common, value, ack = true, subscribe = false) {
|
|
236
265
|
var _a;
|
|
@@ -255,35 +284,6 @@ class RingAdapter extends adapter_core_1.Adapter {
|
|
|
255
284
|
}
|
|
256
285
|
}
|
|
257
286
|
}
|
|
258
|
-
static getSplitIds(id) {
|
|
259
|
-
const splits = id.split(".");
|
|
260
|
-
let device = "";
|
|
261
|
-
let channel = "";
|
|
262
|
-
let stateName = splits[0];
|
|
263
|
-
if (splits.length === 2) {
|
|
264
|
-
device = splits[0];
|
|
265
|
-
stateName = splits[1];
|
|
266
|
-
}
|
|
267
|
-
else if (splits.length === 3) {
|
|
268
|
-
device = splits[0];
|
|
269
|
-
channel = splits[1];
|
|
270
|
-
stateName = splits[2];
|
|
271
|
-
}
|
|
272
|
-
return { device, channel, stateName };
|
|
273
|
-
}
|
|
274
|
-
logCatch(message, reason) {
|
|
275
|
-
this.log.info(message);
|
|
276
|
-
this.log.debug(`Reason: "${reason}"`);
|
|
277
|
-
}
|
|
278
|
-
async getRefreshToken() {
|
|
279
|
-
const newTokenStateVal = await this.tryGetStringState("next_refresh_token");
|
|
280
|
-
const oldTokenStateVal = await this.tryGetStringState("old_user_refresh_token");
|
|
281
|
-
if (newTokenStateVal && oldTokenStateVal === this.config.refreshtoken) {
|
|
282
|
-
this.log.debug(`As the configured refresh token hasn't changed the state one will be used`);
|
|
283
|
-
return newTokenStateVal;
|
|
284
|
-
}
|
|
285
|
-
return this.config.refreshtoken;
|
|
286
|
-
}
|
|
287
287
|
}
|
|
288
288
|
exports.RingAdapter = RingAdapter;
|
|
289
289
|
RingAdapter.isWindows = process.platform.startsWith("win");
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0EAA0E;AAC1E,gCAAgC;AAChC,8DAAgD;AAChD,yDAAiD;AACjD,gDAAwB;AACxB,kEAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -61,6 +61,32 @@
|
|
|
61
61
|
"mode": "daemon",
|
|
62
62
|
"name": "ring",
|
|
63
63
|
"news": {
|
|
64
|
+
"5.0.7": {
|
|
65
|
+
"en": "Updated Packages\nInclude missing build artifacts",
|
|
66
|
+
"de": "Aktualisierte Pakete\nInklusive fehlender Bauartefakte",
|
|
67
|
+
"ru": "Обновленные пакеты\nВключает недостающие строительные артефакты",
|
|
68
|
+
"pt": "Pacotes atualizados\nIncluir artefatos de construção em falta",
|
|
69
|
+
"nl": "Verouderde pakket\nInclusief ontbrekende bouw van artefacten",
|
|
70
|
+
"fr": "Forfaits mis à jour\nInclure des objets de construction manquants",
|
|
71
|
+
"it": "Pacchetti aggiornati\nInclude artefatti di costruzione mancanti",
|
|
72
|
+
"es": "Paquetes actualizados\nIncluye objetos de construcción desaparecidos",
|
|
73
|
+
"pl": "Package Update\nBrakuje zbiorów artefaktów",
|
|
74
|
+
"uk": "Оновлені пакети\nУ комплекті відсутніх конструкційних артефактів",
|
|
75
|
+
"zh-cn": "最新包装\n包括缺乏建筑艺术材料"
|
|
76
|
+
},
|
|
77
|
+
"5.0.6": {
|
|
78
|
+
"en": "Updated Packages\nMake event debouncing configurable",
|
|
79
|
+
"de": "Aktualisierte Pakete\nEvent debouncing konfigurierbar machen",
|
|
80
|
+
"ru": "Обновленные пакеты\nСделать событие дебунксинг конфигурируемым",
|
|
81
|
+
"pt": "Pacotes atualizados\nTornar o evento configurável",
|
|
82
|
+
"nl": "Verouderde pakket\nLaat het event ontploffen",
|
|
83
|
+
"fr": "Forfaits mis à jour\nFaire l'événement debouncing configurable",
|
|
84
|
+
"it": "Pacchetti aggiornati\nRendere l'evento debouncing configurabile",
|
|
85
|
+
"es": "Paquetes actualizados\nHaz que el evento repita configurable",
|
|
86
|
+
"pl": "Package Update\nCzynnik zdarzeń rozbieżnych",
|
|
87
|
+
"uk": "Оновлені пакети\nЗбережіть налаштування подій",
|
|
88
|
+
"zh-cn": "最新包装\nD. 减少布局活动"
|
|
89
|
+
},
|
|
64
90
|
"5.0.5": {
|
|
65
91
|
"en": "#602 Debounce Motion Events by 25 seconds. This prevents multiple events within a short time.",
|
|
66
92
|
"de": "#602 Debounce Motion Ereignisse um 25 Sekunden. Dies verhindert mehrere Ereignisse innerhalb kurzer Zeit.",
|
|
@@ -125,32 +151,6 @@
|
|
|
125
151
|
"pl": "Package Update\nRemove dziedzictwo państw członkowskich\nAdd stickup_mini_v2 (ang.)",
|
|
126
152
|
"uk": "Оновлені пакети\nВидаліть стани спадщини Legacy\nДодати палицю_cam_mini_v2",
|
|
127
153
|
"zh-cn": "最新包装\n消除遗留状况\n增加stickup_cam_mini_v2"
|
|
128
|
-
},
|
|
129
|
-
"5.0.1-beta.0": {
|
|
130
|
-
"en": "migrated the configuration to JSON\nmany changes for livestream and high-definition screenshots\nRefactoring and cleanup",
|
|
131
|
-
"de": "die Konfiguration zu JSON migriert\nviele änderungen für livestream und high-definition screenshots\nHerstellung und Reinigung",
|
|
132
|
-
"ru": "мигрировали конфигурацию в JSON\nмного изменений для скриншотов livestream и high-definition\nРефакторинг и очистка",
|
|
133
|
-
"pt": "migraram a configuração para JSON\nmuitas alterações para livestream e capturas de tela de alta definição\nRefactoring e limpeza",
|
|
134
|
-
"nl": "de configuratie van JSON\nveel veranderingen voor livestream and high-definition screenshots\nHerstarten en opruimen",
|
|
135
|
-
"fr": "a migré la configuration vers JSON\nde nombreux changements pour les captures d'écran en direct et haute définition\nRefactoring and cleanup",
|
|
136
|
-
"it": "migrata la configurazione a JSON\nmolte modifiche per gli screenshot livestream e ad alta definizione\nRefactoring e pulizia",
|
|
137
|
-
"es": "migraron la configuración a JSON\nmuchos cambios para pantallas de flujo vivo y alta definición\nRefactorización y limpieza",
|
|
138
|
-
"pl": "przeprowadziło to do migracji do JSON\nwiele zmian na żywostream i high-definition screenshot\nOdtwarzanie i oczyszczanie",
|
|
139
|
-
"uk": "мігрувати конфігурацію в JSON\nбагато змін для живого потоку та знімків високої чіткості\nРефакторинг і очищення",
|
|
140
|
-
"zh-cn": "迁移到联合协商会的组合\n对上游和高指标屏幕进行的许多变化\n改建和清洁"
|
|
141
|
-
},
|
|
142
|
-
"5.0.0": {
|
|
143
|
-
"en": "migrated the configuration to JSON\nmany changes for livestream and high-definition screenshots\nRefactoring and cleanup",
|
|
144
|
-
"de": "die Konfiguration zu JSON migriert\nviele änderungen für livestream und high-definition screenshots\nHerstellung und Reinigung",
|
|
145
|
-
"ru": "мигрировали конфигурацию в JSON\nмного изменений для скриншотов livestream и high-definition\nРефакторинг и очистка",
|
|
146
|
-
"pt": "migraram a configuração para JSON\nmuitas alterações para livestream e capturas de tela de alta definição\nRefactoring e limpeza",
|
|
147
|
-
"nl": "de configuratie van JSON\nveel veranderingen voor livestream and high-definition screenshots\nHerstarten en opruimen",
|
|
148
|
-
"fr": "a migré la configuration vers JSON\nde nombreux changements pour les captures d'écran en direct et haute définition\nRefactoring and cleanup",
|
|
149
|
-
"it": "migrata la configurazione a JSON\nmolte modifiche per gli screenshot livestream e ad alta definizione\nRefactoring e pulizia",
|
|
150
|
-
"es": "migraron la configuración a JSON\nmuchos cambios para pantallas de flujo vivo y alta definición\nRefactorización y limpieza",
|
|
151
|
-
"pl": "przeprowadziło to do migracji do JSON\nwiele zmian na żywostream i high-definition screenshot\nOdtwarzanie i oczyszczanie",
|
|
152
|
-
"uk": "мігрувати конфігурацію в JSON\nбагато змін для живого потоку та знімків високої чіткості\nРефакторинг і очищення",
|
|
153
|
-
"zh-cn": "迁移到联合协商会的组合\n对上游和高指标屏幕进行的许多变化\n改建和清洁"
|
|
154
154
|
}
|
|
155
155
|
},
|
|
156
156
|
"platform": "Javascript/Node.js",
|
|
@@ -170,7 +170,7 @@
|
|
|
170
170
|
"zh-cn": "环 圈"
|
|
171
171
|
},
|
|
172
172
|
"type": "hardware",
|
|
173
|
-
"version": "5.0.
|
|
173
|
+
"version": "5.0.7"
|
|
174
174
|
},
|
|
175
175
|
"instanceObjects": [
|
|
176
176
|
{
|
|
@@ -186,17 +186,22 @@
|
|
|
186
186
|
"native": {
|
|
187
187
|
"email": "email@test.foo",
|
|
188
188
|
"del_old_livestream": true,
|
|
189
|
-
"
|
|
189
|
+
"auto_livestream": true,
|
|
190
|
+
"save_livestream": 0,
|
|
190
191
|
"filename_livestream": "livestream%i_%d.mp4",
|
|
192
|
+
"path_livestream": "",
|
|
193
|
+
"overlay_Livestream": false,
|
|
191
194
|
"recordtime_livestream": 10,
|
|
192
195
|
"recordtime_auto_livestream": 20,
|
|
193
|
-
"auto_livestream": true,
|
|
194
|
-
"auto_snapshot": true,
|
|
195
|
-
"auto_HDsnapshot": true,
|
|
196
196
|
"del_old_snapshot": true,
|
|
197
|
+
"auto_snapshot": true,
|
|
198
|
+
"save_snapshot": 0,
|
|
197
199
|
"filename_snapshot": "snapshot%i_%d.jpg",
|
|
198
200
|
"path_snapshot": "",
|
|
201
|
+
"overlay_snapshot": false,
|
|
199
202
|
"del_old_HDsnapshot": true,
|
|
203
|
+
"auto_HDsnapshot": true,
|
|
204
|
+
"save_HDsnapshot": 0,
|
|
200
205
|
"filename_HDsnapshot": "snapshot%i_%d.jpg",
|
|
201
206
|
"path_HDsnapshot": "",
|
|
202
207
|
"overlay_HDsnapshot": false,
|
|
@@ -209,7 +214,10 @@
|
|
|
209
214
|
"refreshtoken": "",
|
|
210
215
|
"sentry_enable": true,
|
|
211
216
|
"timeout": 5,
|
|
212
|
-
"twofaceauth": false
|
|
217
|
+
"twofaceauth": false,
|
|
218
|
+
"ignore_events_Motion": 0,
|
|
219
|
+
"ignore_events_Doorbell": 0,
|
|
220
|
+
"keep_ignoring_if_retriggered": false
|
|
213
221
|
},
|
|
214
222
|
"objects": []
|
|
215
223
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.ring",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.7",
|
|
4
4
|
"description": "Ring",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Thiemo Hoffmann",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@iobroker/adapter-core": "^3.0.4",
|
|
37
|
-
"@iobroker/types": "^5.0.
|
|
37
|
+
"@iobroker/types": "^5.0.16",
|
|
38
38
|
"@types/suncalc": "^1.9.1",
|
|
39
39
|
"ffmpeg-static": "^5.2.0",
|
|
40
40
|
"node-schedule": "^2.1.1",
|
|
@@ -54,24 +54,24 @@
|
|
|
54
54
|
"@types/ffmpeg-static": "^3.0.2",
|
|
55
55
|
"@types/gulp": "^4.0.16",
|
|
56
56
|
"@types/mocha": "^10.0.3",
|
|
57
|
-
"@types/node": "^20.8.
|
|
57
|
+
"@types/node": "^20.8.10",
|
|
58
58
|
"@types/node-schedule": "^2.1.2",
|
|
59
59
|
"@types/proxyquire": "^1.3.30",
|
|
60
60
|
"@types/sinon": "^10.0.20",
|
|
61
61
|
"@types/sinon-chai": "^3.2.11",
|
|
62
62
|
"@types/strftime": "^0.9.6",
|
|
63
|
-
"@typescript-eslint/eslint-plugin": "^6.
|
|
64
|
-
"@typescript-eslint/parser": "^6.
|
|
65
|
-
"axios": "^1.
|
|
63
|
+
"@typescript-eslint/eslint-plugin": "^6.9.1",
|
|
64
|
+
"@typescript-eslint/parser": "^6.9.1",
|
|
65
|
+
"axios": "^1.6.0",
|
|
66
66
|
"chai": "^4.3.10",
|
|
67
67
|
"chai-as-promised": "^7.1.1",
|
|
68
|
-
"eslint": "^8.
|
|
68
|
+
"eslint": "^8.52.0",
|
|
69
69
|
"gulp": "^4.0.2",
|
|
70
70
|
"mocha": "^10.2.0",
|
|
71
71
|
"nyc": "^15.1.0",
|
|
72
72
|
"proxyquire": "^2.1.3",
|
|
73
73
|
"rimraf": "^5.0.5",
|
|
74
|
-
"sinon": "^17.0.
|
|
74
|
+
"sinon": "^17.0.1",
|
|
75
75
|
"sinon-chai": "^3.7.0",
|
|
76
76
|
"source-map-support": "^0.5.21",
|
|
77
77
|
"ts-node": "^10.9.1",
|
|
@@ -96,11 +96,11 @@
|
|
|
96
96
|
"test:package": "mocha test/package --exit",
|
|
97
97
|
"test:unit": "mocha test/unit --exit",
|
|
98
98
|
"test:integration": "mocha test/integration --exit",
|
|
99
|
-
"test": "npm run test:ts && npm run test:package",
|
|
99
|
+
"test": "npm run lint && npm run test:ts && npm run test:package",
|
|
100
100
|
"check": "tsc --noEmit",
|
|
101
101
|
"check-package-upgrades": "npx npm-check-updates -i",
|
|
102
102
|
"coverage": "nyc npm run test:ts",
|
|
103
|
-
"lint": "eslint
|
|
103
|
+
"lint": "eslint src/**/*.ts",
|
|
104
104
|
"release": "release-script",
|
|
105
105
|
"release-patch": "release-script patch --yes",
|
|
106
106
|
"release-minor": "release-script minor --yes",
|