iobroker.ring 3.2.1 → 3.2.3

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.
@@ -2,9 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.RingApiClient = void 0;
4
4
  const ring_client_api_1 = require("ring-client-api");
5
- const ownRingDevice_1 = require("./ownRingDevice");
5
+ const ownRingCamera_1 = require("./ownRingCamera");
6
6
  const constants_1 = require("./constants");
7
7
  const ownRingLocation_1 = require("./ownRingLocation");
8
+ const ownRingDevice_1 = require("./ownRingDevice");
9
+ const ownRingIntercom_1 = require("./ownRingIntercom");
8
10
  class RingApiClient {
9
11
  get locations() {
10
12
  return this._locations;
@@ -31,7 +33,7 @@ class RingApiClient {
31
33
  this._api = new ring_client_api_1.RingApi({
32
34
  controlCenterDisplayName: "iobroker.ring",
33
35
  refreshToken: await this.adapter.getRefreshToken(),
34
- systemId: `${this.adapter.host}.ring`,
36
+ systemId: `${this.adapter.host}.ring_v${this.adapter.version}_${Math.random() * Math.pow(10, 6)}`,
35
37
  cameraStatusPollingSeconds: 120,
36
38
  locationModePollingSeconds: 120,
37
39
  // debug: true
@@ -45,7 +47,8 @@ class RingApiClient {
45
47
  }
46
48
  constructor(adapter) {
47
49
  this.refreshing = false;
48
- this.devices = {};
50
+ this.cameras = {};
51
+ this.intercoms = {};
49
52
  this._refreshInterval = null;
50
53
  this._retryTimeout = null;
51
54
  this._locations = {};
@@ -95,14 +98,18 @@ class RingApiClient {
95
98
  this.debug(`Recieved ${devices.length} Devices in Location ${l.name}`);
96
99
  this.debug(`Location has ${l.loc.cameras.length} Cameras`);
97
100
  for (const c of l.loc.cameras) {
98
- this.updateDev(c, l);
101
+ this.updateCamera(c, l);
102
+ }
103
+ this.debug(`Location has ${l.loc.intercoms.length} Intercoms`);
104
+ for (const i of l.loc.intercoms) {
105
+ this.updateIntercom(i, l);
99
106
  }
100
107
  }
101
108
  this.refreshing = false;
102
109
  this.debug(`Refresh complete`);
103
110
  }
104
111
  processUserInput(targetId, channelID, stateID, state) {
105
- const targetDevice = this.devices[targetId];
112
+ const targetDevice = this.cameras[targetId];
106
113
  const targetLocation = this._locations[targetId];
107
114
  if (!targetDevice && !targetLocation) {
108
115
  this.adapter.log.error(`Recieved State Change on Subscribed State, for unknown Device/Location "${targetId}"`);
@@ -163,15 +170,26 @@ class RingApiClient {
163
170
  warn(message) {
164
171
  this.adapter.log.warn(message);
165
172
  }
166
- updateDev(device, location) {
167
- const fullID = ownRingDevice_1.OwnRingDevice.getFullId(device, this.adapter);
168
- let ownDev = this.devices[fullID];
169
- if (ownDev === undefined) {
170
- ownDev = new ownRingDevice_1.OwnRingDevice(device, location, this.adapter, this);
171
- this.devices[fullID] = ownDev;
173
+ updateCamera(camera, location) {
174
+ const fullID = ownRingCamera_1.OwnRingCamera.getFullId(camera, this.adapter);
175
+ let ownRingCamera = this.cameras[fullID];
176
+ if (ownRingCamera === undefined) {
177
+ ownRingCamera = new ownRingCamera_1.OwnRingCamera(camera, location, this.adapter, this);
178
+ this.cameras[fullID] = ownRingCamera;
179
+ }
180
+ else {
181
+ ownRingCamera.updateByDevice(camera);
182
+ }
183
+ }
184
+ updateIntercom(intercom, location) {
185
+ const fullID = ownRingDevice_1.OwnRingDevice.getFullId(intercom, this.adapter);
186
+ let ownRingIntercom = this.intercoms[fullID];
187
+ if (ownRingIntercom === undefined) {
188
+ ownRingIntercom = new ownRingIntercom_1.OwnRingIntercom(intercom, location, this.adapter, this);
189
+ this.intercoms[fullID] = ownRingIntercom;
172
190
  }
173
191
  else {
174
- ownDev.updateByDevice(device);
192
+ ownRingIntercom.updateByDevice(intercom);
175
193
  }
176
194
  }
177
195
  getLocation(locId) {
@@ -1 +1 @@
1
- {"version":3,"file":"ringApiClient.js","sourceRoot":"","sources":["../../src/lib/ringApiClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ringApiClient.js","sourceRoot":"","sources":["../../src/lib/ringApiClient.ts"],"names":[],"mappings":";;;AAAA,qDAA8E;AAE9E,mDAAgD;AAChD,2CAAiE;AACjE,uDAAoD;AACpD,mDAAgD;AAChD,uDAAoD;AAEpD,MAAa,aAAa;IAOxB,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAIM,oBAAoB;QACzB,MAAM,KAAK,GAAW,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;QACvD,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE,EAAE;YAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;YAChD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,EAAE;YACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACtD,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,OAAO,IAAI,CAAC,IAAI,CAAC;SAClB;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE;YACrC,MAAK,CAAC,uBAAuB,CAAC,CAAA;SAC/B;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,yBAAO,CAAC;YACtB,wBAAwB,EAAE,eAAe;YACzC,YAAY,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAClD,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,UAAU,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE;YACjG,0BAA0B,EAAE,GAAG;YAC/B,0BAA0B,EAAE,GAAG;YAC/B,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;YACjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CACnB,yFAAyF,CAC1F,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAoB,EAAE,4BAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YACvF,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,wBAAwB,EAAE,4BAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACzG,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAKD,YAAmB,OAAoB;QAtDhC,eAAU,GAAG,KAAK,CAAC;QAClB,YAAO,GAAoC,EAAE,CAAC;QAC9C,cAAS,GAAsC,EAAE,CAAC;QAClD,qBAAgB,GAAwB,IAAI,CAAC;QAC7C,kBAAa,GAAwB,IAAI,CAAC;QAM1C,eAAU,GAAsC,EAAE,CAAC;QA6CzD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;IAClF,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,KAAK;;QACrC;;;WAGG;QACH,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,MAAA,IAAI,CAAC,IAAI,0CAAE,UAAU,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,EAAE,EAAE;YACnC,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAC;aACnF;iBAAM;gBACL,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;oBAC/B,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;iBAC3B;gBACD,IAAI,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAA;gBACzF,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;aAC5E;SACF;aAAM;YACL,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;gBAC/B,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;aAC3B;SACF;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,EAAE;YACxD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,qDAAqD,CAAC,CAAC;YAC9E,OAAO;SACR;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE;YACjC,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACzC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,YAAY,OAAO,CAAC,MAAM,wBAAwB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,UAAU,CAAC,CAAC;YAC3D,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE;gBAC7B,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACzB;YACD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,YAAY,CAAC,CAAC;YAC/D,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;gBAC/B,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAC3B;SACF;QACD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,CAAC;IAGM,gBAAgB,CAAC,QAAgB,EAAE,SAAiB,EAAE,OAAe,EAAE,KAAqB;QACjG,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,EAAE;YACpC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,2EAA2E,QAAQ,GAAG,CAAC,CAAC;YAC/G,OAAO;SACR;aAAM,IAAI,YAAY,EAAE;YACvB,YAAY,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;SAC1D;aAAM,IAAI,cAAc,EAAE;YACzB,cAAc,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;SAC5D;IACH,CAAC;IAEM,MAAM;QACX,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;SAC9B;QACD,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC/B,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;SAC3B;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC7B,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACjC,OAAO,IAAI,OAAO,CAAU,KAAK,EAAE,GAAG,EAAE,EAAE;YACxC,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,YAAY,EAAE;iBACjC,KAAK,CAAC,CAAC,MAAW,EAAE,EAAE;gBACrB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;gBAC3B,GAAG,CAAC,KAAK,CAAC,CAAC;YACb,CAAC,CAAC;iBACD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;;gBACb,IAAI,OAAO,IAAI,IAAI,QAAQ,IAAI,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,CAAC,CAAC,IAAI,CAAC,EAAE;oBACvD,IAAI,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAA;oBAChE,GAAG,CAAC,KAAK,CAAC,CAAC;iBACZ;gBACD,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,YAAY,CAAC,CAAC;gBACjD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;gBACrB,KAAK,MAAM,GAAG,IAAI,IAAkB,EAAE;oBACpC,MAAM,MAAM,GAAG,IAAI,iCAAe,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBAC5D,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;iBACzC;gBACD,GAAG,CAAC,IAAI,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,MAAW;QAChC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,OAAe;QAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,OAAe;QAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEO,IAAI,CAAC,OAAe;QAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEO,YAAY,CAAC,MAAkB,EAAE,QAAyB;QAChE,MAAM,MAAM,GAAG,6BAAa,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,aAAa,GAAkB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,aAAa,GAAG,IAAI,6BAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;SACtC;aAAM;YACL,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SACtC;IACH,CAAC;IAEO,cAAc,CAAC,QAAsB,EAAE,QAAyB;QACtE,MAAM,MAAM,GAAG,6BAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,eAAe,GAAoB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,eAAe,KAAK,SAAS,EAAE;YACjC,eAAe,GAAG,IAAI,iCAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC9E,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC;SAC1C;aAAM;YACL,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;SAC1C;IACH,CAAC;IAEM,WAAW,CAAC,KAAa;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACF;AA5MD,sCA4MC"}
package/io-package.json CHANGED
@@ -1,9 +1,35 @@
1
1
  {
2
2
  "common": {
3
3
  "name": "ring",
4
- "version": "3.2.1",
4
+ "version": "3.2.3",
5
5
  "title": "Ring",
6
6
  "news": {
7
+ "3.2.3": {
8
+ "en": "Update Packages\n#385 Experimental Ring Intercom support",
9
+ "de": "Pakete aktualisieren\n#385 Experimental Ring Intercom Unterstützung",
10
+ "ru": "Обновление пакетов\n#385 Экспериментальный Поддержка Ring Intercom",
11
+ "pt": "Pacotes de atualização\n#385 Experimental Suporte ao Ring Intercom",
12
+ "nl": "Update Packages\n#385 Experimental Ring Intercom",
13
+ "fr": "Mise à jour des paquets\n#385 Experimental Soutien Ring Intercom",
14
+ "it": "Pacchetti di aggiornamento\n#385 Experimental Supporto per citofono",
15
+ "es": "Paquetes de actualización\n#385 Experimental Soporte de intercomunicación",
16
+ "pl": "Package Update\n#385 (ang.). Ring Intercom",
17
+ "uk": "Оновлення пакетів\n#385 Експериментальне Кільцева підтримка",
18
+ "zh-cn": "最新包装\n第385号实验 部门间支助"
19
+ },
20
+ "3.2.2": {
21
+ "en": "#373 Fix event receiving for iobroker instances without unique hostname",
22
+ "de": "#373 Fix Event empfangen für iobroker Instanzen ohne einzigartigen Hostnamen",
23
+ "ru": "#373 Fix event прием для инстанций iobroker без уникального имени хоста",
24
+ "pt": "#373 Corrigir evento recebendo para instâncias iobroker sem nome de host único",
25
+ "nl": "♪373 Fix event ontvangen voor iobroker instances zonder unieke naam",
26
+ "fr": "#373 Réception d'événements fixes pour les instances iobroker sans nom d'hôte unique",
27
+ "it": "#373 Evento fisso che riceve per istanze iobroker senza nome host unico",
28
+ "es": "#373 Arregla el evento recibiendo para instancias de iobroker sin nombre de host único",
29
+ "pl": "#373 wydarzenia Fix otrzymujące instancje iobrokerowe bez unikalnej nazwy hostname",
30
+ "uk": "#373 Фіксований захід для екземплярів iobroker без унікального імені хоста",
31
+ "zh-cn": "第373 Fix号活动,在无人独有的旅名的情况下接收iobroker案"
32
+ },
7
33
  "3.2.1": {
8
34
  "en": "Redeploy",
9
35
  "de": "Beschäftigung",
@@ -68,32 +94,6 @@
68
94
  "pl": "Package Update",
69
95
  "uk": "Оновлення пакетів",
70
96
  "zh-cn": "最新包装"
71
- },
72
- "3.1.6": {
73
- "en": "Inline subscription instead of properties for Event observer\nUpdate Packages",
74
- "de": "Inline-Abonnement statt Eigenschaften für Event-Beobachter\nPakete aktualisieren",
75
- "ru": "Инлайн подписка вместо свойств для наблюдателя событий\nОбновление пакетов",
76
- "pt": "Assinatura em linha em vez de propriedades para o observador do evento\nPacotes de atualização",
77
- "nl": "Inline abonnement in plaats van eigendommen voor event waarnemer\nUpdate Packages",
78
- "fr": "Abonnement en ligne au lieu des propriétés pour Event observer\nMise à jour des paquets",
79
- "it": "Abbonamento in linea invece delle proprietà per l'osservatore Evento\nPacchetti di aggiornamento",
80
- "es": "Suscripción en línea en lugar de propiedades para el observador de evento\nPaquetes de actualización",
81
- "pl": "Inline subskrypcja zamiast własności obserwatora zdarzeń\nPackage Update",
82
- "uk": "Інлайн підписка замість властивостей спостерігача подій\nОновлення пакетів",
83
- "zh-cn": "说明而不是为活动观察员提供财产\n最新包装"
84
- },
85
- "3.1.5": {
86
- "en": "Update Packages",
87
- "de": "Pakete aktualisieren",
88
- "ru": "Обновление пакетов",
89
- "pt": "Pacotes de atualização",
90
- "nl": "Update Packages",
91
- "fr": "Mise à jour des paquets",
92
- "it": "Pacchetti di aggiornamento",
93
- "es": "Paquetes de actualización",
94
- "pl": "Package Update",
95
- "uk": "Оновлення пакетів",
96
- "zh-cn": "最新包装"
97
97
  }
98
98
  },
99
99
  "titleLang": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker.ring",
3
- "version": "3.2.1",
3
+ "version": "3.2.3",
4
4
  "description": "Ring",
5
5
  "author": {
6
6
  "name": "Thiemo Hoffmann",
@@ -30,7 +30,7 @@
30
30
  "url": "https://github.com/iobroker-community-adapters/ioBroker.ring"
31
31
  },
32
32
  "dependencies": {
33
- "ring-client-api": "^11.6.0",
33
+ "ring-client-api": "^11.7.0",
34
34
  "@iobroker/adapter-core": "^2.6.7"
35
35
  },
36
36
  "devDependencies": {
@@ -42,26 +42,26 @@
42
42
  "@types/chai-as-promised": "^7.1.5",
43
43
  "@types/gulp": "^4.0.10",
44
44
  "@types/mocha": "^10.0.1",
45
- "@types/node": "^18.11.10",
45
+ "@types/node": "^18.11.15",
46
46
  "@types/proxyquire": "^1.3.28",
47
47
  "@types/sinon": "^10.0.13",
48
48
  "@types/sinon-chai": "^3.2.9",
49
- "@typescript-eslint/eslint-plugin": "^5.45.0",
50
- "@typescript-eslint/parser": "^5.45.0",
51
- "axios": "^1.2.0",
49
+ "@typescript-eslint/eslint-plugin": "^5.46.1",
50
+ "@typescript-eslint/parser": "^5.46.1",
51
+ "axios": "^1.2.1",
52
52
  "chai": "^4.3.7",
53
53
  "chai-as-promised": "^7.1.1",
54
- "eslint": "^8.28.0",
54
+ "eslint": "^8.29.0",
55
55
  "gulp": "^4.0.2",
56
- "mocha": "^10.1.0",
56
+ "mocha": "^10.2.0",
57
57
  "nyc": "^15.1.0",
58
58
  "proxyquire": "^2.1.3",
59
59
  "rimraf": "^3.0.2",
60
- "sinon": "^15.0.0",
60
+ "sinon": "^15.0.1",
61
61
  "sinon-chai": "^3.7.0",
62
62
  "source-map-support": "^0.5.21",
63
63
  "ts-node": "^10.9.1",
64
- "typescript": "^4.9.3"
64
+ "typescript": "^4.9.4"
65
65
  },
66
66
  "main": "build/main.js",
67
67
  "files": [