iobroker.ring 3.0.0-beta.12 → 3.0.0-beta.13
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 +5 -0
- package/build/lib/ownRingDevice.js +45 -36
- package/build/lib/ownRingDevice.js.map +1 -1
- package/build/lib/ringApiClient.js +48 -18
- package/build/lib/ringApiClient.js.map +1 -1
- package/build/main.js +2 -1
- package/build/main.js.map +1 -1
- package/io-package.json +5 -2
- package/package.json +6 -6
package/README.md
CHANGED
|
@@ -51,6 +51,11 @@ You can use special variables for your livestream and snapshort path and filenam
|
|
|
51
51
|
Placeholder for the next version (at the beginning of the line):
|
|
52
52
|
### **WORK IN PROGRESS**
|
|
53
53
|
-->
|
|
54
|
+
### 3.0.0-beta.13 (2022-05-30)
|
|
55
|
+
|
|
56
|
+
* (theimo1221) Prevent missing of events, due to socket drop within ring-api-client
|
|
57
|
+
* (theimo1221) Improve device logging readabillity
|
|
58
|
+
|
|
54
59
|
### 3.0.0-beta.12 (2022-05-28)
|
|
55
60
|
* (theimo1221) Fix error in beta.11 in regards to new installations
|
|
56
61
|
* (theimo1221) Harden Event Handling to prevent rare permanent busy occasions
|
|
@@ -38,7 +38,7 @@ var EventState;
|
|
|
38
38
|
EventState[EventState["ReactingOnDoorbell"] = 3] = "ReactingOnDoorbell";
|
|
39
39
|
})(EventState || (EventState = {}));
|
|
40
40
|
class OwnRingDevice {
|
|
41
|
-
constructor(ringDevice,
|
|
41
|
+
constructor(ringDevice, location, adapter, apiClient) {
|
|
42
42
|
this._requestingSnapshot = false;
|
|
43
43
|
this._requestingLiveStream = false;
|
|
44
44
|
this._lastLightCommand = 0;
|
|
@@ -54,13 +54,12 @@ class OwnRingDevice {
|
|
|
54
54
|
this._liveStreamCount = 0;
|
|
55
55
|
this._state = EventState.Idle;
|
|
56
56
|
this._adapter = adapter;
|
|
57
|
-
this.debug(`Create device with ID: ${ringDevice.id}`);
|
|
58
57
|
this._ringDevice = ringDevice;
|
|
59
|
-
this.
|
|
58
|
+
this.shortId = `${ringDevice.id}`;
|
|
59
|
+
this.debug(`Create device`);
|
|
60
|
+
this._locationId = location.id;
|
|
60
61
|
this._client = apiClient;
|
|
61
|
-
this.path = `${this._locationIndex}.`;
|
|
62
62
|
this.kind = OwnRingDevice.evaluateKind(ringDevice, adapter);
|
|
63
|
-
this.shortId = `${ringDevice.id}`;
|
|
64
63
|
this.fullId = `${this.kind}_${this.shortId}`;
|
|
65
64
|
this.infoChannelId = `${this.fullId}.${constants_1.CHANNEL_NAME_INFO}`;
|
|
66
65
|
this.historyChannelId = `${this.fullId}.${constants_1.CHANNEL_NAME_HISTORY}`;
|
|
@@ -125,21 +124,28 @@ class OwnRingDevice {
|
|
|
125
124
|
get lastSnapShotDir() {
|
|
126
125
|
return this._lastSnapShotDir;
|
|
127
126
|
}
|
|
128
|
-
get
|
|
129
|
-
return this.
|
|
127
|
+
get locationId() {
|
|
128
|
+
return this._locationId;
|
|
130
129
|
}
|
|
131
130
|
get location() {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
131
|
+
const location = this._client.getLocation(this._locationId);
|
|
132
|
+
if (location === undefined) {
|
|
133
|
+
this._adapter.log.error(`Can't find a Location with id ${this._locationId}`);
|
|
135
134
|
}
|
|
136
|
-
return
|
|
135
|
+
return location;
|
|
137
136
|
}
|
|
138
137
|
get ringDevice() {
|
|
139
138
|
return this._ringDevice;
|
|
140
139
|
}
|
|
141
140
|
set ringDevice(device) {
|
|
142
141
|
this._ringDevice = device;
|
|
142
|
+
this.silly(`Start device subscriptions`);
|
|
143
|
+
this._ringDevice.subscribeToDingEvents().catch((r) => {
|
|
144
|
+
this.catcher(`Failed subscribing to Ding Events for ${device.name}`, r);
|
|
145
|
+
});
|
|
146
|
+
this._ringDevice.subscribeToMotionEvents().catch((r) => {
|
|
147
|
+
this.catcher(`Failed subscribing to Motion Events for ${device.name}`, r);
|
|
148
|
+
});
|
|
143
149
|
this._ringDevice.onData.subscribe(this.update.bind(this));
|
|
144
150
|
this._ringDevice.onMotionDetected.subscribe(this.onMotion.bind(this));
|
|
145
151
|
this._ringDevice.onDoorbellPressed.subscribe(this.onDorbell.bind(this));
|
|
@@ -212,7 +218,7 @@ class OwnRingDevice {
|
|
|
212
218
|
}
|
|
213
219
|
}
|
|
214
220
|
async recreateDeviceObjectTree() {
|
|
215
|
-
this.silly(`Recreate DeviceObjectTree
|
|
221
|
+
this.silly(`Recreate DeviceObjectTree`);
|
|
216
222
|
this._adapter.createDevice(this.fullId, {
|
|
217
223
|
name: `Device ${this.shortId} ("${this._ringDevice.data.description}")`
|
|
218
224
|
});
|
|
@@ -222,7 +228,7 @@ class OwnRingDevice {
|
|
|
222
228
|
this._adapter.createChannel(this.fullId, constants_1.CHANNEL_NAME_HISTORY);
|
|
223
229
|
this._adapter.createChannel(this.fullId, constants_1.CHANNEL_NAME_EVENTS);
|
|
224
230
|
if (this._ringDevice.hasLight) {
|
|
225
|
-
this.debug(`Device with Light Capabilities detected
|
|
231
|
+
this.debug(`Device with Light Capabilities detected`);
|
|
226
232
|
this._adapter.createChannel(this.fullId, constants_1.CHANNEL_NAME_LIGHT, { name: `Light ${this.shortId}` });
|
|
227
233
|
}
|
|
228
234
|
this._lastSnapShotDir = await this._adapter.tryGetStringState(`${this.snapshotChannelId}.snapshot_file`);
|
|
@@ -235,7 +241,7 @@ class OwnRingDevice {
|
|
|
235
241
|
this.update(ringDevice.data);
|
|
236
242
|
}
|
|
237
243
|
update(data) {
|
|
238
|
-
this.debug(`Recieved Update
|
|
244
|
+
this.debug(`Recieved Update`);
|
|
239
245
|
this.updateDeviceInfoObject(data);
|
|
240
246
|
this.updateHealth();
|
|
241
247
|
// noinspection JSIgnoredPromiseFromCall
|
|
@@ -246,13 +252,12 @@ class OwnRingDevice {
|
|
|
246
252
|
this.silly(`${this.shortId}.startLivestream()`);
|
|
247
253
|
const { fullPath, dirname } = file_service_1.FileService.getPath(this._adapter.config.path, this._adapter.config.filename_livestream, ++this._liveStreamCount, this.shortId, this.fullId, this.kind);
|
|
248
254
|
if (!(await file_service_1.FileService.prepareFolder(dirname))) {
|
|
249
|
-
this.debug(`Failed to prepare Livestream folder ("${fullPath}")
|
|
255
|
+
this.debug(`Failed to prepare Livestream folder ("${fullPath}")`);
|
|
250
256
|
return;
|
|
251
257
|
}
|
|
252
258
|
file_service_1.FileService.deleteFileIfExistSync(fullPath, this._adapter);
|
|
253
259
|
if (this._ringDevice.isOffline) {
|
|
254
|
-
this.info(`
|
|
255
|
-
`);
|
|
260
|
+
this.info(` is offline --> won't take LiveStream`);
|
|
256
261
|
return;
|
|
257
262
|
}
|
|
258
263
|
duration !== null && duration !== void 0 ? duration : (duration = this._adapter.config.recordtime_livestream);
|
|
@@ -260,7 +265,7 @@ class OwnRingDevice {
|
|
|
260
265
|
this.silly(`Initialize Livestream (${duration}s) to temp-file ${tempPath}`);
|
|
261
266
|
await this._ringDevice.recordToFile(tempPath, duration);
|
|
262
267
|
if (!fs.existsSync(tempPath)) {
|
|
263
|
-
this.info(`Could't create livestream
|
|
268
|
+
this.info(`Could't create livestream`);
|
|
264
269
|
return;
|
|
265
270
|
}
|
|
266
271
|
const video = fs.readFileSync(tempPath);
|
|
@@ -289,8 +294,7 @@ class OwnRingDevice {
|
|
|
289
294
|
return;
|
|
290
295
|
file_service_1.FileService.deleteFileIfExistSync(fullPath, this._adapter);
|
|
291
296
|
if (this._ringDevice.isOffline) {
|
|
292
|
-
this.info(`
|
|
293
|
-
`);
|
|
297
|
+
this.info(`is offline --> won't take Snapshot`);
|
|
294
298
|
return;
|
|
295
299
|
}
|
|
296
300
|
const image = await this._ringDevice.getSnapshot({ uuid: uuid }).catch((reason) => {
|
|
@@ -315,14 +319,14 @@ class OwnRingDevice {
|
|
|
315
319
|
this.debug(`Done creating snapshot to ${fullPath}`);
|
|
316
320
|
}
|
|
317
321
|
updateHealth() {
|
|
318
|
-
this.silly(`Update Health
|
|
322
|
+
this.silly(`Update Health`);
|
|
319
323
|
this._ringDevice.getHealth().then(this.updateHealthObject.bind(this));
|
|
320
324
|
}
|
|
321
325
|
async updateHistory() {
|
|
322
|
-
this.silly(`Update History
|
|
326
|
+
this.silly(`Update History`);
|
|
323
327
|
this._ringDevice.getEvents({ limit: 50 })
|
|
324
328
|
.then(async (r) => {
|
|
325
|
-
this.silly(`Recieved Event History
|
|
329
|
+
this.silly(`Recieved Event History`);
|
|
326
330
|
const lastAction = r.events.find((event) => {
|
|
327
331
|
const kind = event.kind;
|
|
328
332
|
switch (kind) {
|
|
@@ -357,7 +361,7 @@ class OwnRingDevice {
|
|
|
357
361
|
this._adapter.upsertState(`${this.historyChannelId}.kind`, constants_1.COMMON_HISTORY_KIND, lastAction.event.kind);
|
|
358
362
|
}
|
|
359
363
|
async updateSnapshotObject() {
|
|
360
|
-
this.debug(`Update Snapshot Object
|
|
364
|
+
this.debug(`Update Snapshot Object`);
|
|
361
365
|
if (this._lastSnapshotImage) {
|
|
362
366
|
await this._adapter.upsertFile(`${this.snapshotChannelId}.jpg`, constants_1.COMMON_SNAPSHOT_SNAPSHOT, this._lastSnapshotImage, this._lastSnapshotTimestamp).catch((reason) => {
|
|
363
367
|
this.debug(`Couldn't update Snapshot obejct: "${reason}"`);
|
|
@@ -371,7 +375,7 @@ class OwnRingDevice {
|
|
|
371
375
|
}
|
|
372
376
|
}
|
|
373
377
|
async updateLiveStreamObject() {
|
|
374
|
-
this.debug(`Update Livestream Object
|
|
378
|
+
this.debug(`Update Livestream Object`);
|
|
375
379
|
if (this._lastLiveStreamVideo) {
|
|
376
380
|
await this._adapter.upsertFile(`${this.liveStreamChannelId}.mp4`, constants_1.COMMON_LIVESTREAM_LIVESTREAM, this._lastLiveStreamVideo, this._lastLiveStreamTimestamp).catch((reason) => {
|
|
377
381
|
this.debug(`Couldn't update Livestream obejct: "${reason}"`);
|
|
@@ -386,7 +390,7 @@ class OwnRingDevice {
|
|
|
386
390
|
}
|
|
387
391
|
updateHealthObject(health) {
|
|
388
392
|
var _a;
|
|
389
|
-
this.debug(`Update Health Callback
|
|
393
|
+
this.debug(`Update Health Callback`);
|
|
390
394
|
let batteryPercent = parseInt((_a = health.battery_percentage) !== null && _a !== void 0 ? _a : "-1");
|
|
391
395
|
if (isNaN(batteryPercent)) {
|
|
392
396
|
batteryPercent = -1;
|
|
@@ -400,25 +404,25 @@ class OwnRingDevice {
|
|
|
400
404
|
if (this._ringDevice.hasLight && (Date.now() - this._lastLightCommand > 60000)) {
|
|
401
405
|
// this.silly(JSON.stringify(this._ringDevice.data));
|
|
402
406
|
const floodlightOn = this._ringDevice.data.health.floodlight_on;
|
|
403
|
-
this.debug(`Update Light within Health Update
|
|
407
|
+
this.debug(`Update Light within Health Update FLoodlight is ${floodlightOn}`);
|
|
404
408
|
this._adapter.upsertState(`${this.lightChannelId}.light_state`, constants_1.COMMON_LIGHT_STATE, floodlightOn);
|
|
405
409
|
this._adapter.upsertState(`${this.lightChannelId}.${constants_1.STATE_ID_LIGHT_SWITCH}`, constants_1.COMMON_LIGHT_SWITCH, floodlightOn, true);
|
|
406
410
|
}
|
|
407
411
|
}
|
|
408
412
|
debug(message) {
|
|
409
|
-
this._adapter.log.debug(message);
|
|
413
|
+
this._adapter.log.debug(`Device ${this.shortId} ("${this.ringDevice.data.description}"): ${message}`);
|
|
410
414
|
}
|
|
411
415
|
silly(message) {
|
|
412
|
-
this._adapter.log.silly(message);
|
|
416
|
+
this._adapter.log.silly(`Device ${this.shortId} ("${this.ringDevice.data.description}"): ${message}`);
|
|
413
417
|
}
|
|
414
418
|
info(message) {
|
|
415
|
-
this._adapter.log.info(message);
|
|
419
|
+
this._adapter.log.info(`Device ${this.shortId} ("${this.ringDevice.data.description}"): ${message}`);
|
|
416
420
|
}
|
|
417
421
|
catcher(message, reason) {
|
|
418
422
|
this._adapter.logCatch(message, reason);
|
|
419
423
|
}
|
|
420
424
|
onDing(value) {
|
|
421
|
-
this.debug(`Recieved Ding Event (${value})
|
|
425
|
+
this.debug(`Recieved Ding Event (${value})`);
|
|
422
426
|
this.conditionalRecording(EventState.ReactingOnDing, value.ding.image_uuid);
|
|
423
427
|
this._adapter.upsertState(`${this.eventsChannelId}.type`, constants_1.COMMON_EVENTS_TYPE, value.subtype);
|
|
424
428
|
this._adapter.upsertState(`${this.eventsChannelId}.detectionType`, constants_1.COMMON_EVENTS_DETECTIONTYPE, value.ding.detection_type);
|
|
@@ -426,14 +430,14 @@ class OwnRingDevice {
|
|
|
426
430
|
this._adapter.upsertState(`${this.eventsChannelId}.message`, constants_1.COMMON_EVENTS_MESSAGE, value.aps.alert);
|
|
427
431
|
}
|
|
428
432
|
onMotion(value) {
|
|
429
|
-
this.debug(`Recieved Motion Event (${value})
|
|
433
|
+
this.debug(`Recieved Motion Event (${value})`);
|
|
430
434
|
this._adapter.upsertState(`${this.eventsChannelId}.motion`, constants_1.COMMON_MOTION, value);
|
|
431
435
|
if (value) {
|
|
432
436
|
this.conditionalRecording(EventState.ReactingOnMotion);
|
|
433
437
|
}
|
|
434
438
|
}
|
|
435
439
|
onDorbell(value) {
|
|
436
|
-
this.debug(`Recieved Doorbell Event (${value})
|
|
440
|
+
this.debug(`Recieved Doorbell Event (${value})`);
|
|
437
441
|
this.conditionalRecording(EventState.ReactingOnDoorbell, value.ding.image_uuid);
|
|
438
442
|
this._adapter.upsertState(`${this.eventsChannelId}.doorbell`, constants_1.COMMON_EVENTS_DOORBELL, true);
|
|
439
443
|
setTimeout(() => {
|
|
@@ -442,7 +446,7 @@ class OwnRingDevice {
|
|
|
442
446
|
}
|
|
443
447
|
async conditionalRecording(state, uuid) {
|
|
444
448
|
if (this._state === EventState.Idle) {
|
|
445
|
-
this.silly(`Start recording
|
|
449
|
+
this.silly(`Start recording for Event "${EventState[state]}"...`);
|
|
446
450
|
this._state = state;
|
|
447
451
|
try {
|
|
448
452
|
this.takeSnapshot(uuid);
|
|
@@ -451,9 +455,14 @@ class OwnRingDevice {
|
|
|
451
455
|
finally {
|
|
452
456
|
this._state = EventState.Idle;
|
|
453
457
|
}
|
|
458
|
+
return;
|
|
454
459
|
}
|
|
455
|
-
|
|
456
|
-
|
|
460
|
+
this.silly(`Would have recorded due to "${EventState[state]}", but we are already reacting.`);
|
|
461
|
+
if (uuid) {
|
|
462
|
+
setTimeout(() => {
|
|
463
|
+
this.debug(`delayed uuid recording`);
|
|
464
|
+
this.takeSnapshot(uuid);
|
|
465
|
+
}, 22000);
|
|
457
466
|
}
|
|
458
467
|
}
|
|
459
468
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownRingDevice.js","sourceRoot":"","sources":["../../src/lib/ownRingDevice.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ownRingDevice.js","sourceRoot":"","sources":["../../src/lib/ownRingDevice.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.RingApiClient = void 0;
|
|
4
7
|
const api_1 = require("ring-client-api/lib/api/api");
|
|
5
8
|
const ownRingDevice_1 = require("./ownRingDevice");
|
|
6
9
|
const constants_1 = require("./constants");
|
|
10
|
+
const util_1 = __importDefault(require("util"));
|
|
7
11
|
class RingApiClient {
|
|
8
12
|
constructor(adapter) {
|
|
9
13
|
this.devices = {};
|
|
10
14
|
this._refreshInterval = null;
|
|
15
|
+
this._refreshing = false;
|
|
11
16
|
this._locations = [];
|
|
12
17
|
this.adapter = adapter;
|
|
13
18
|
}
|
|
@@ -36,7 +41,7 @@ class RingApiClient {
|
|
|
36
41
|
else {
|
|
37
42
|
this._api = new api_1.RingApi({
|
|
38
43
|
refreshToken: await this.adapter.getRefreshToken(),
|
|
39
|
-
cameraStatusPollingSeconds: 600
|
|
44
|
+
cameraStatusPollingSeconds: 600,
|
|
40
45
|
});
|
|
41
46
|
this._api.onRefreshTokenUpdated.subscribe((data) => {
|
|
42
47
|
this.adapter.log.info(`Recieved new Refresh Token. Will use the new one until the token in config gets changed`);
|
|
@@ -47,8 +52,21 @@ class RingApiClient {
|
|
|
47
52
|
return this._api;
|
|
48
53
|
}
|
|
49
54
|
async init() {
|
|
55
|
+
await this.refreshAll(true);
|
|
56
|
+
this._refreshInterval = setInterval(this.refreshAll.bind(this), 120 * 60 * 1000);
|
|
57
|
+
}
|
|
58
|
+
async refreshAll(initial = false) {
|
|
59
|
+
var _a;
|
|
60
|
+
/**
|
|
61
|
+
* TH 2022-05-30: It seems like Ring Api drops it's socket connection from time to time
|
|
62
|
+
* so we should reconnect ourselves
|
|
63
|
+
*/
|
|
64
|
+
this.debug(`Refresh Ring Connection`);
|
|
65
|
+
this._refreshing = true;
|
|
66
|
+
(_a = this._api) === null || _a === void 0 ? void 0 : _a.disconnect();
|
|
67
|
+
this._api = undefined;
|
|
50
68
|
await this.retrieveLocations();
|
|
51
|
-
if (this._locations.length === 0) {
|
|
69
|
+
if (this._locations.length === 0 && initial) {
|
|
52
70
|
this.adapter.terminate(`We couldn't find any locations in your Ring Account`);
|
|
53
71
|
return;
|
|
54
72
|
}
|
|
@@ -56,22 +74,25 @@ class RingApiClient {
|
|
|
56
74
|
l.onDataUpdate.subscribe((message) => {
|
|
57
75
|
this.debug(`Recieved Location Update Event: "${message}"`);
|
|
58
76
|
});
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
this.debug(`
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
77
|
+
l.onConnected.subscribe((connected) => {
|
|
78
|
+
this.debug(`Recieved Location Connection Status Change to ${connected}`);
|
|
79
|
+
if (!connected && !this._refreshing) {
|
|
80
|
+
this.warn(`Lost connection to Location ${l.name}... Will try a reconnect in 5s`);
|
|
81
|
+
setTimeout(() => {
|
|
82
|
+
this.refreshAll();
|
|
83
|
+
}, 5000);
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
this.silly(`Location Debug Data: ${util_1.default.inspect(l, false, 1)}`);
|
|
87
|
+
this.debug(`Process Location ${l.name}`);
|
|
88
|
+
const devices = await l.getDevices();
|
|
89
|
+
this.debug(`Recieved ${devices.length} Devices in Location ${l.name}`);
|
|
90
|
+
this.debug(`Location has ${l.cameras.length} Cameras`);
|
|
91
|
+
for (const c of l.cameras) {
|
|
92
|
+
this.updateDev(c, l);
|
|
73
93
|
}
|
|
74
94
|
}
|
|
95
|
+
this._refreshing = false;
|
|
75
96
|
this.debug(`Refresh complete`);
|
|
76
97
|
}
|
|
77
98
|
processUserInput(deviceID, channelID, stateID, state) {
|
|
@@ -101,20 +122,29 @@ class RingApiClient {
|
|
|
101
122
|
this.adapter.log.debug(`Failure reason:\n${reason}`);
|
|
102
123
|
this.adapter.log.debug(`Call Stack: \n${(new Error()).stack}`);
|
|
103
124
|
}
|
|
125
|
+
silly(message) {
|
|
126
|
+
this.adapter.log.silly(message);
|
|
127
|
+
}
|
|
104
128
|
debug(message) {
|
|
105
129
|
this.adapter.log.debug(message);
|
|
106
130
|
}
|
|
107
|
-
|
|
131
|
+
warn(message) {
|
|
132
|
+
this.adapter.log.warn(message);
|
|
133
|
+
}
|
|
134
|
+
updateDev(device, location) {
|
|
108
135
|
const fullID = ownRingDevice_1.OwnRingDevice.getFullId(device, this.adapter);
|
|
109
136
|
let ownDev = this.devices[fullID];
|
|
110
137
|
if (ownDev === undefined) {
|
|
111
|
-
ownDev = new ownRingDevice_1.OwnRingDevice(device,
|
|
138
|
+
ownDev = new ownRingDevice_1.OwnRingDevice(device, location, this.adapter, this);
|
|
112
139
|
this.devices[fullID] = ownDev;
|
|
113
140
|
}
|
|
114
141
|
else {
|
|
115
142
|
ownDev.updateByDevice(device);
|
|
116
143
|
}
|
|
117
144
|
}
|
|
145
|
+
getLocation(locId) {
|
|
146
|
+
return this.locations.filter(l => l.id === locId)[0];
|
|
147
|
+
}
|
|
118
148
|
}
|
|
119
149
|
exports.RingApiClient = RingApiClient;
|
|
120
150
|
//# sourceMappingURL=ringApiClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ringApiClient.js","sourceRoot":"","sources":["../../src/lib/ringApiClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ringApiClient.js","sourceRoot":"","sources":["../../src/lib/ringApiClient.ts"],"names":[],"mappings":"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"}
|
package/build/main.js
CHANGED
|
@@ -189,11 +189,12 @@ class RingAdapter extends utils.Adapter {
|
|
|
189
189
|
async upsertFile(id, common, value, timestamp) {
|
|
190
190
|
var _a;
|
|
191
191
|
try {
|
|
192
|
-
this.log.silly(`upsertFile ${id}, length: ${value.length}`);
|
|
193
192
|
if (this.states[id] === timestamp) {
|
|
193
|
+
this.log.silly(`upsertFile ${id} prevented as timestamp is the same`);
|
|
194
194
|
// Unchanged Value
|
|
195
195
|
return;
|
|
196
196
|
}
|
|
197
|
+
this.log.silly(`upsertFile ${id}, length: ${value.length}`);
|
|
197
198
|
const foreignId = `${this.namespace}.${id}`;
|
|
198
199
|
if (this.states[id] !== undefined) {
|
|
199
200
|
this.states[id] = timestamp;
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "ring",
|
|
4
|
-
"version": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.13",
|
|
5
5
|
"title": "Ring",
|
|
6
6
|
"news": {
|
|
7
|
+
"3.0.0-beta.13": {
|
|
8
|
+
"en": "Prevent missing of events, due to socket drop within ring-api-client\nImprove device logging\n"
|
|
9
|
+
},
|
|
7
10
|
"3.0.0-beta.12": {
|
|
8
|
-
"en": "Fix error in beta.11 in regards to new installations\nHarden Event Handling to prevent rare permanent busy occasions\
|
|
11
|
+
"en": "Fix error in beta.11 in regards to new installations\nHarden Event Handling to prevent rare permanent busy occasions\nAdd support for doorbell device doorbell_graham_cracker\n"
|
|
9
12
|
},
|
|
10
13
|
"3.0.0-beta.11": {
|
|
11
14
|
"en": "Add processing of new refresh token\n"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.ring",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.13",
|
|
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.0.
|
|
33
|
+
"ring-client-api": "^11.0.4",
|
|
34
34
|
"@iobroker/adapter-core": "^2.6.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
@@ -40,12 +40,12 @@
|
|
|
40
40
|
"@types/chai-as-promised": "^7.1.5",
|
|
41
41
|
"@types/gulp": "^4.0.9",
|
|
42
42
|
"@types/mocha": "^9.1.1",
|
|
43
|
-
"@types/node": "^17.0.
|
|
43
|
+
"@types/node": "^17.0.36",
|
|
44
44
|
"@types/proxyquire": "^1.3.28",
|
|
45
45
|
"@types/sinon": "^10.0.11",
|
|
46
46
|
"@types/sinon-chai": "^3.2.8",
|
|
47
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
48
|
-
"@typescript-eslint/parser": "^5.
|
|
47
|
+
"@typescript-eslint/eslint-plugin": "^5.26.0",
|
|
48
|
+
"@typescript-eslint/parser": "^5.26.0",
|
|
49
49
|
"axios": "^0.27.2",
|
|
50
50
|
"chai": "^4.3.6",
|
|
51
51
|
"chai-as-promised": "^7.1.1",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"sinon-chai": "^3.7.0",
|
|
60
60
|
"source-map-support": "^0.5.21",
|
|
61
61
|
"ts-node": "^10.8.0",
|
|
62
|
-
"typescript": "^4.
|
|
62
|
+
"typescript": "^4.7.2"
|
|
63
63
|
},
|
|
64
64
|
"main": "build/main.js",
|
|
65
65
|
"scripts": {
|