iobroker.ring 3.0.1 → 3.0.5
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/build/lib/constants.js +11 -1
- package/build/lib/constants.js.map +1 -1
- package/build/lib/ownRingDevice.js +34 -20
- package/build/lib/ownRingDevice.js.map +1 -1
- package/build/lib/ownRingLocation.js +136 -0
- package/build/lib/ownRingLocation.js.map +1 -0
- package/build/lib/ringApiClient.js +42 -47
- package/build/lib/ringApiClient.js.map +1 -1
- package/build/main.js +8 -4
- package/build/main.js.map +1 -1
- package/io-package.json +37 -19
- package/package.json +8 -8
package/README.md
CHANGED
|
@@ -87,6 +87,16 @@ It is recommended that you add your own tests into the mix.
|
|
|
87
87
|
Placeholder for the next version (at the beginning of the line):
|
|
88
88
|
### **WORK IN PROGRESS**
|
|
89
89
|
-->
|
|
90
|
+
### 3.0.5 (2022-07-05)
|
|
91
|
+
* (theimo1221) Improve Log Message on failed Snapshots during eventhandling
|
|
92
|
+
* (theimo1221) Add Support for doorbell oyster
|
|
93
|
+
|
|
94
|
+
### 3.0.4 (2022-06-17)
|
|
95
|
+
* (theimo1221) Fix Edge Case resulting in lamps being permanently on
|
|
96
|
+
|
|
97
|
+
### 3.0.3 (2022-06-16)
|
|
98
|
+
* (theimo1221) Implement location mode
|
|
99
|
+
|
|
90
100
|
### 3.0.1 (2022-06-08)
|
|
91
101
|
* (bluefox) Changed the russian translations
|
|
92
102
|
|
package/build/lib/constants.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.STATE_ID_DEBUG_REQUEST = exports.STATE_ID_LIVESTREAM_REQUEST = exports.STATE_ID_SNAPSHOT_REQUEST = exports.STATE_ID_LIGHT_SWITCH = exports.CHANNEL_NAME_EVENTS = exports.CHANNEL_NAME_LIVESTREAM = exports.CHANNEL_NAME_SNAPSHOT = exports.CHANNEL_NAME_LIGHT = exports.CHANNEL_NAME_HISTORY = exports.CHANNEL_NAME_INFO = exports.COMMON_OLD_TOKEN = exports.COMMON_NEW_TOKEN = exports.COMMON_DEBUG_REQUEST = exports.COMMON_EVENTS_MOMENT = exports.COMMON_EVENTS_MESSAGE = exports.COMMON_EVENTS_DETECTIONTYPE = exports.COMMON_EVENTS_TYPE = exports.COMMON_EVENTS_DOORBELL = exports.COMMON_MOTION = exports.COMMON_LIVESTREAM_FILE = exports.COMMON_LIVESTREAM_URL = exports.COMMON_LIVESTREAM_REQUEST = exports.COMMON_LIVESTREAM_MOMENT = exports.COMMON_LIVESTREAM_LIVESTREAM = exports.COMMON_SNAPSHOT_MOMENT = exports.COMMON_SNAPSHOT_SNAPSHOT = exports.COMMON_SNAPSHOT_REQUEST = exports.COMMON_SNAPSHOT_FILE = exports.COMMON_SNAPSHOT_URL = exports.COMMON_HISTORY_KIND = exports.COMMON_HISTORY_CREATED_AT = exports.COMMON_HISTORY_URL = exports.COMMON_LIGHT_STATE = exports.COMMON_LIGHT_SWITCH = exports.COMMON_INFO_HAS_SIREN = exports.COMMON_INFO_HAS_BATTERY = exports.COMMON_INFO_HAS_LIGHT = exports.COMMON_INFO_FIRMWARE = exports.COMMON_INFO_LATEST_SIGNAL_CATEGORY = exports.COMMON_INFO_LATEST_SIGNAL_STRENGTH = exports.COMMON_INFO_WIFI_NAME = exports.COMMON_INFO_BATTERY_PERCENTAGE_CATEGORY = exports.COMMON_INFO_BATTERY_PERCENTAGE = exports.COMMON_INFO_KIND = exports.COMMON_INFO_EXTERNAL_CONNECTION = exports.COMMON_INFO_DESCRIPTION = exports.COMMON_INFO_ID = void 0;
|
|
3
|
+
exports.STATE_ID_LOCATIONMODE = exports.STATE_ID_DEBUG_REQUEST = exports.STATE_ID_LIVESTREAM_REQUEST = exports.STATE_ID_SNAPSHOT_REQUEST = exports.STATE_ID_LIGHT_SWITCH = exports.CHANNEL_NAME_EVENTS = exports.CHANNEL_NAME_LIVESTREAM = exports.CHANNEL_NAME_SNAPSHOT = exports.CHANNEL_NAME_LIGHT = exports.CHANNEL_NAME_HISTORY = exports.CHANNEL_NAME_INFO = exports.COMMON_LOCATIONMODE = exports.COMMON_OLD_TOKEN = exports.COMMON_NEW_TOKEN = exports.COMMON_DEBUG_REQUEST = exports.COMMON_EVENTS_MOMENT = exports.COMMON_EVENTS_MESSAGE = exports.COMMON_EVENTS_DETECTIONTYPE = exports.COMMON_EVENTS_TYPE = exports.COMMON_EVENTS_DOORBELL = exports.COMMON_MOTION = exports.COMMON_LIVESTREAM_FILE = exports.COMMON_LIVESTREAM_URL = exports.COMMON_LIVESTREAM_REQUEST = exports.COMMON_LIVESTREAM_MOMENT = exports.COMMON_LIVESTREAM_LIVESTREAM = exports.COMMON_SNAPSHOT_MOMENT = exports.COMMON_SNAPSHOT_SNAPSHOT = exports.COMMON_SNAPSHOT_REQUEST = exports.COMMON_SNAPSHOT_FILE = exports.COMMON_SNAPSHOT_URL = exports.COMMON_HISTORY_KIND = exports.COMMON_HISTORY_CREATED_AT = exports.COMMON_HISTORY_URL = exports.COMMON_LIGHT_STATE = exports.COMMON_LIGHT_SWITCH = exports.COMMON_INFO_HAS_SIREN = exports.COMMON_INFO_HAS_BATTERY = exports.COMMON_INFO_HAS_LIGHT = exports.COMMON_INFO_FIRMWARE = exports.COMMON_INFO_LATEST_SIGNAL_CATEGORY = exports.COMMON_INFO_LATEST_SIGNAL_STRENGTH = exports.COMMON_INFO_WIFI_NAME = exports.COMMON_INFO_BATTERY_PERCENTAGE_CATEGORY = exports.COMMON_INFO_BATTERY_PERCENTAGE = exports.COMMON_INFO_KIND = exports.COMMON_INFO_EXTERNAL_CONNECTION = exports.COMMON_INFO_DESCRIPTION = exports.COMMON_INFO_ID = exports.LOCATION_MODE_OPTIONS = void 0;
|
|
4
|
+
exports.LOCATION_MODE_OPTIONS = ["home", "away", "disarmed", "disabled", "unset"];
|
|
4
5
|
exports.COMMON_INFO_ID = {
|
|
5
6
|
type: "string",
|
|
6
7
|
role: "state",
|
|
@@ -262,6 +263,14 @@ exports.COMMON_OLD_TOKEN = {
|
|
|
262
263
|
read: true,
|
|
263
264
|
write: false
|
|
264
265
|
};
|
|
266
|
+
exports.COMMON_LOCATIONMODE = {
|
|
267
|
+
type: "string",
|
|
268
|
+
role: "text",
|
|
269
|
+
name: "Location Mode",
|
|
270
|
+
read: true,
|
|
271
|
+
write: true,
|
|
272
|
+
states: exports.LOCATION_MODE_OPTIONS
|
|
273
|
+
};
|
|
265
274
|
exports.CHANNEL_NAME_INFO = "Info";
|
|
266
275
|
exports.CHANNEL_NAME_HISTORY = "History";
|
|
267
276
|
exports.CHANNEL_NAME_LIGHT = "Light";
|
|
@@ -272,4 +281,5 @@ exports.STATE_ID_LIGHT_SWITCH = "light_switch";
|
|
|
272
281
|
exports.STATE_ID_SNAPSHOT_REQUEST = "snapshot_request";
|
|
273
282
|
exports.STATE_ID_LIVESTREAM_REQUEST = "livestream_request";
|
|
274
283
|
exports.STATE_ID_DEBUG_REQUEST = "debug_request";
|
|
284
|
+
exports.STATE_ID_LOCATIONMODE = "locationMode";
|
|
275
285
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,11 +53,21 @@ class OwnRingDevice {
|
|
|
53
53
|
this._snapshotCount = 0;
|
|
54
54
|
this._liveStreamCount = 0;
|
|
55
55
|
this._state = EventState.Idle;
|
|
56
|
+
this.motionObserver = {
|
|
57
|
+
next: (x) => this.onMotion(x),
|
|
58
|
+
error: (err) => this.catcher(`Motion Observer recieved error`, err),
|
|
59
|
+
complete: () => this.debug("Motion Observer got a complete notification"),
|
|
60
|
+
};
|
|
61
|
+
this.dingObserver = {
|
|
62
|
+
next: (x) => this.onDing(x),
|
|
63
|
+
error: (err) => this.catcher(`Ding Observer recieved error`, err),
|
|
64
|
+
complete: () => this.debug("Ding Observer got a complete notification"),
|
|
65
|
+
};
|
|
56
66
|
this._adapter = adapter;
|
|
57
67
|
this._ringDevice = ringDevice;
|
|
58
68
|
this.shortId = `${ringDevice.id}`;
|
|
59
69
|
this.debug(`Create device`);
|
|
60
|
-
this._locationId = location.
|
|
70
|
+
this._locationId = location.fullId;
|
|
61
71
|
this._client = apiClient;
|
|
62
72
|
this.kind = OwnRingDevice.evaluateKind(ringDevice, adapter);
|
|
63
73
|
this.fullId = `${this.kind}_${this.shortId}`;
|
|
@@ -86,6 +96,7 @@ class OwnRingDevice {
|
|
|
86
96
|
case ring_client_api_1.RingCameraKind.doorbell_v3:
|
|
87
97
|
case ring_client_api_1.RingCameraKind.doorbell_v4:
|
|
88
98
|
case ring_client_api_1.RingCameraKind.doorbell_v5:
|
|
99
|
+
case ring_client_api_1.RingCameraKind.doorbell_graham_cracker:
|
|
89
100
|
case ring_client_api_1.RingCameraKind.doorbell_portal:
|
|
90
101
|
case ring_client_api_1.RingCameraKind.doorbell_scallop:
|
|
91
102
|
case ring_client_api_1.RingCameraKind.doorbell_scallop_lite:
|
|
@@ -97,7 +108,7 @@ class OwnRingDevice {
|
|
|
97
108
|
case ring_client_api_1.RingCameraKind.floodlight_v2:
|
|
98
109
|
case ring_client_api_1.RingCameraKind.spotlightw_v2:
|
|
99
110
|
case ring_client_api_1.RingCameraKind.jbox_v1:
|
|
100
|
-
case "
|
|
111
|
+
case "doorbell_oyster":
|
|
101
112
|
case "lpd_v3":
|
|
102
113
|
case "lpd_v4":
|
|
103
114
|
return `doorbell`;
|
|
@@ -127,29 +138,25 @@ class OwnRingDevice {
|
|
|
127
138
|
get locationId() {
|
|
128
139
|
return this._locationId;
|
|
129
140
|
}
|
|
130
|
-
get location() {
|
|
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}`);
|
|
134
|
-
}
|
|
135
|
-
return location;
|
|
136
|
-
}
|
|
137
141
|
get ringDevice() {
|
|
138
142
|
return this._ringDevice;
|
|
139
143
|
}
|
|
140
144
|
set ringDevice(device) {
|
|
141
145
|
this._ringDevice = device;
|
|
146
|
+
this.subscribeToEvents();
|
|
147
|
+
}
|
|
148
|
+
async subscribeToEvents() {
|
|
142
149
|
this.silly(`Start device subscriptions`);
|
|
143
|
-
this._ringDevice.subscribeToDingEvents().catch((r) => {
|
|
144
|
-
this.catcher(`Failed subscribing to Ding Events for ${
|
|
150
|
+
await this._ringDevice.subscribeToDingEvents().catch((r) => {
|
|
151
|
+
this.catcher(`Failed subscribing to Ding Events for ${this._ringDevice.name}`, r);
|
|
145
152
|
});
|
|
146
|
-
this._ringDevice.subscribeToMotionEvents().catch((r) => {
|
|
147
|
-
this.catcher(`Failed subscribing to Motion Events for ${
|
|
153
|
+
await this._ringDevice.subscribeToMotionEvents().catch((r) => {
|
|
154
|
+
this.catcher(`Failed subscribing to Motion Events for ${this._ringDevice.name}`, r);
|
|
148
155
|
});
|
|
149
156
|
this._ringDevice.onData.subscribe(this.update.bind(this));
|
|
150
|
-
this._ringDevice.onMotionDetected.subscribe(this.
|
|
157
|
+
this._ringDevice.onMotionDetected.subscribe(this.motionObserver);
|
|
151
158
|
this._ringDevice.onDoorbellPressed.subscribe(this.onDorbell.bind(this));
|
|
152
|
-
this._ringDevice.onNewNotification.subscribe(this.
|
|
159
|
+
this._ringDevice.onNewNotification.subscribe(this.dingObserver);
|
|
153
160
|
}
|
|
154
161
|
processUserInput(channelID, stateID, state) {
|
|
155
162
|
switch (channelID) {
|
|
@@ -288,7 +295,7 @@ class OwnRingDevice {
|
|
|
288
295
|
await this.updateLiveStreamObject();
|
|
289
296
|
this.debug(`Done creating livestream to ${fullPath}`);
|
|
290
297
|
}
|
|
291
|
-
async takeSnapshot(uuid) {
|
|
298
|
+
async takeSnapshot(uuid, eventBased = false) {
|
|
292
299
|
const { fullPath, dirname } = file_service_1.FileService.getPath(this._adapter.config.path, this._adapter.config.filename_snapshot, ++this._snapshotCount, this.shortId, this.fullId, this.kind);
|
|
293
300
|
if (!(await file_service_1.FileService.prepareFolder(dirname)))
|
|
294
301
|
return;
|
|
@@ -298,10 +305,17 @@ class OwnRingDevice {
|
|
|
298
305
|
return;
|
|
299
306
|
}
|
|
300
307
|
const image = await this._ringDevice.getSnapshot({ uuid: uuid }).catch((reason) => {
|
|
301
|
-
|
|
308
|
+
if (eventBased) {
|
|
309
|
+
this.info("Taking Snapshot on Event failed. Will try again after livestream finished.");
|
|
310
|
+
}
|
|
311
|
+
else {
|
|
312
|
+
this.catcher("Couldn't get Snapshot from api.", reason);
|
|
313
|
+
}
|
|
302
314
|
});
|
|
303
315
|
if (!image) {
|
|
304
|
-
|
|
316
|
+
if (!eventBased) {
|
|
317
|
+
this.info("Could not create snapshot");
|
|
318
|
+
}
|
|
305
319
|
return;
|
|
306
320
|
}
|
|
307
321
|
this.silly(`Writing Snapshot (Length: ${image.length}) to "${fullPath}"`);
|
|
@@ -449,7 +463,7 @@ class OwnRingDevice {
|
|
|
449
463
|
this.silly(`Start recording for Event "${EventState[state]}"...`);
|
|
450
464
|
this._state = state;
|
|
451
465
|
try {
|
|
452
|
-
this.takeSnapshot(uuid);
|
|
466
|
+
this.takeSnapshot(uuid, true);
|
|
453
467
|
await this.startLivestream(20);
|
|
454
468
|
}
|
|
455
469
|
finally {
|
|
@@ -462,7 +476,7 @@ class OwnRingDevice {
|
|
|
462
476
|
setTimeout(() => {
|
|
463
477
|
this.debug(`delayed uuid recording`);
|
|
464
478
|
this.takeSnapshot(uuid);
|
|
465
|
-
},
|
|
479
|
+
}, 23000);
|
|
466
480
|
}
|
|
467
481
|
}
|
|
468
482
|
}
|
|
@@ -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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"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.OwnRingLocation = void 0;
|
|
7
|
+
const util_1 = __importDefault(require("util"));
|
|
8
|
+
const constants_1 = require("./constants");
|
|
9
|
+
class OwnRingLocation {
|
|
10
|
+
constructor(location, adapter, apiClient) {
|
|
11
|
+
this._currentLocationMode = "unset";
|
|
12
|
+
this._loc = location;
|
|
13
|
+
this._fullId = `Location_${this.id}`;
|
|
14
|
+
this._adapter = adapter;
|
|
15
|
+
this._client = apiClient;
|
|
16
|
+
this._loc.onDataUpdate.subscribe((message) => {
|
|
17
|
+
this.debug(`Recieved Location Update Event: "${message}"`);
|
|
18
|
+
});
|
|
19
|
+
this._loc.onConnected.subscribe((connected) => {
|
|
20
|
+
this.debug(`Recieved Location Connection Status Change to ${connected}`);
|
|
21
|
+
if (!connected && !apiClient.refreshing) {
|
|
22
|
+
this.warn(`Lost connection to Location ${this._loc.name}... Will try a reconnect in 5s`);
|
|
23
|
+
setTimeout(() => {
|
|
24
|
+
this._client.refreshAll();
|
|
25
|
+
}, 5000);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
this._loc.onLocationMode.subscribe((newMode) => {
|
|
29
|
+
this.updateModeObject(newMode);
|
|
30
|
+
});
|
|
31
|
+
this.silly(`Location Debug Data: ${util_1.default.inspect(this._loc, false, 2)}`);
|
|
32
|
+
this.recreateDeviceObjectTree();
|
|
33
|
+
this.getLocationMode();
|
|
34
|
+
}
|
|
35
|
+
get loc() {
|
|
36
|
+
return this._loc;
|
|
37
|
+
}
|
|
38
|
+
get id() {
|
|
39
|
+
return this._loc.id;
|
|
40
|
+
}
|
|
41
|
+
get fullId() {
|
|
42
|
+
return this._fullId;
|
|
43
|
+
}
|
|
44
|
+
get name() {
|
|
45
|
+
return this._loc.name;
|
|
46
|
+
}
|
|
47
|
+
async recreateDeviceObjectTree() {
|
|
48
|
+
this.silly(`Recreate LocationObjectTree`);
|
|
49
|
+
this._adapter.createDevice(this._fullId, {
|
|
50
|
+
name: `Location ${this.id} ("${this.name}")`
|
|
51
|
+
});
|
|
52
|
+
// this._adapter.createChannel(this._fullId, CHANNEL_NAME_INFO, {name: `Info ${this.id}`});
|
|
53
|
+
this._adapter.upsertState(`${this._fullId}.${constants_1.STATE_ID_DEBUG_REQUEST}`, constants_1.COMMON_DEBUG_REQUEST, false, true);
|
|
54
|
+
}
|
|
55
|
+
silly(message) {
|
|
56
|
+
this._adapter.log.silly(`Location ${this.id} ("${this.name}"): ${message}`);
|
|
57
|
+
}
|
|
58
|
+
debug(message) {
|
|
59
|
+
this._adapter.log.debug(`Location ${this.id} ("${this.name}"): ${message}`);
|
|
60
|
+
}
|
|
61
|
+
warn(message) {
|
|
62
|
+
this._adapter.log.warn(`Location ${this.id} ("${this.name}"): ${message}`);
|
|
63
|
+
}
|
|
64
|
+
async getDevices() {
|
|
65
|
+
return this.loc.getDevices();
|
|
66
|
+
}
|
|
67
|
+
processUserInput(channelID, stateID, state) {
|
|
68
|
+
switch (channelID) {
|
|
69
|
+
case "":
|
|
70
|
+
if (stateID === constants_1.STATE_ID_DEBUG_REQUEST) {
|
|
71
|
+
this.performDebugOnUserRequest(state);
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
if (stateID === constants_1.STATE_ID_LOCATIONMODE) {
|
|
75
|
+
this.performLocationModeChange(state);
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
this._adapter.log.error(`Unknown State/Switch with channel "${channelID}" and state "${stateID}"`);
|
|
79
|
+
return;
|
|
80
|
+
default:
|
|
81
|
+
this._adapter.log.error(`Unknown State/Switch with channel "${channelID}" and state "${stateID}"`);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
performDebugOnUserRequest(state) {
|
|
85
|
+
const targetVal = state.val;
|
|
86
|
+
if (targetVal) {
|
|
87
|
+
this._adapter.log.info(`Location Debug Data for ${this.id}: ${util_1.default.inspect(this._loc, false, 1)}`);
|
|
88
|
+
this._adapter.upsertState(`${this._fullId}.${constants_1.STATE_ID_DEBUG_REQUEST}`, constants_1.COMMON_DEBUG_REQUEST, false);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
async performLocationModeChange(state) {
|
|
92
|
+
const parsedNumber = parseInt(state.val, 10);
|
|
93
|
+
let desiredState;
|
|
94
|
+
if (typeof desiredState == "number") {
|
|
95
|
+
desiredState = constants_1.LOCATION_MODE_OPTIONS[state.val];
|
|
96
|
+
}
|
|
97
|
+
else if (!isNaN(parsedNumber)) {
|
|
98
|
+
desiredState = constants_1.LOCATION_MODE_OPTIONS[state.val];
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
desiredState = state.val;
|
|
102
|
+
}
|
|
103
|
+
if (desiredState == this._currentLocationMode) {
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
if (["home", "away", "disarmed"].indexOf(desiredState) === -1) {
|
|
107
|
+
this.updateModeObject(this._currentLocationMode, true);
|
|
108
|
+
this.warn(`Invalid input "${desiredState}"... Only "home","away" and "disarmed" are chooseable by user.`);
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
this.debug(`Change Location Mode to ${desiredState}`);
|
|
112
|
+
this._loc.setLocationMode(desiredState)
|
|
113
|
+
.then((r) => {
|
|
114
|
+
this.updateModeObject(r.mode);
|
|
115
|
+
})
|
|
116
|
+
.catch((reason) => { this._adapter.logCatch(`Failed setting location mode`, reason); });
|
|
117
|
+
}
|
|
118
|
+
updateModeObject(newMode, preventLog = false) {
|
|
119
|
+
this._currentLocationMode = newMode;
|
|
120
|
+
if (!preventLog) {
|
|
121
|
+
this.silly(`Recieved new LocationMode: ${newMode}`);
|
|
122
|
+
}
|
|
123
|
+
this._adapter.upsertState(`${this._fullId}.locationMode`, constants_1.COMMON_LOCATIONMODE, newMode, true);
|
|
124
|
+
}
|
|
125
|
+
async getLocationMode() {
|
|
126
|
+
this._loc.getLocationMode()
|
|
127
|
+
.then((r) => {
|
|
128
|
+
this.updateModeObject(r.mode);
|
|
129
|
+
})
|
|
130
|
+
.catch((reason) => {
|
|
131
|
+
this._adapter.logCatch("Couldn't retrieve Location Mode", reason);
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
exports.OwnRingLocation = OwnRingLocation;
|
|
136
|
+
//# sourceMappingURL=ownRingLocation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ownRingLocation.js","sourceRoot":"","sources":["../../src/lib/ownRingLocation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.RingApiClient = void 0;
|
|
7
4
|
const api_1 = require("ring-client-api/lib/api/api");
|
|
8
5
|
const ownRingDevice_1 = require("./ownRingDevice");
|
|
9
6
|
const constants_1 = require("./constants");
|
|
10
|
-
const
|
|
7
|
+
const ownRingLocation_1 = require("./ownRingLocation");
|
|
11
8
|
class RingApiClient {
|
|
12
9
|
constructor(adapter) {
|
|
10
|
+
this.refreshing = false;
|
|
13
11
|
this.devices = {};
|
|
14
12
|
this._refreshInterval = null;
|
|
15
|
-
this.
|
|
16
|
-
this._locations = [];
|
|
13
|
+
this._locations = {};
|
|
17
14
|
this.adapter = adapter;
|
|
18
15
|
}
|
|
19
16
|
get locations() {
|
|
@@ -38,17 +35,19 @@ class RingApiClient {
|
|
|
38
35
|
if (!this.adapter.config.refreshtoken) {
|
|
39
36
|
throw (`Refresh Token needed.`);
|
|
40
37
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
38
|
+
this._api = new api_1.RingApi({
|
|
39
|
+
controlCenterDisplayName: "iobroker.ring",
|
|
40
|
+
refreshToken: await this.adapter.getRefreshToken(),
|
|
41
|
+
systemId: `${this.adapter.host}.ring`,
|
|
42
|
+
cameraStatusPollingSeconds: 120,
|
|
43
|
+
locationModePollingSeconds: 120,
|
|
44
|
+
// debug: true
|
|
45
|
+
});
|
|
46
|
+
this._api.onRefreshTokenUpdated.subscribe((data) => {
|
|
47
|
+
this.adapter.log.info(`Recieved new Refresh Token. Will use the new one until the token in config gets changed`);
|
|
48
|
+
this.adapter.upsertState("next_refresh_token", constants_1.COMMON_NEW_TOKEN, data.newRefreshToken);
|
|
49
|
+
this.adapter.upsertState("old_user_refresh_token", constants_1.COMMON_OLD_TOKEN, this.adapter.config.refreshtoken);
|
|
50
|
+
});
|
|
52
51
|
return this._api;
|
|
53
52
|
}
|
|
54
53
|
async init() {
|
|
@@ -62,46 +61,40 @@ class RingApiClient {
|
|
|
62
61
|
* so we should reconnect ourselves
|
|
63
62
|
*/
|
|
64
63
|
this.debug(`Refresh Ring Connection`);
|
|
65
|
-
this.
|
|
64
|
+
this.refreshing = true;
|
|
66
65
|
(_a = this._api) === null || _a === void 0 ? void 0 : _a.disconnect();
|
|
67
66
|
this._api = undefined;
|
|
68
67
|
await this.retrieveLocations();
|
|
69
|
-
if (this._locations.length === 0 && initial) {
|
|
68
|
+
if (Object.keys(this._locations).length === 0 && initial) {
|
|
70
69
|
this.adapter.terminate(`We couldn't find any locations in your Ring Account`);
|
|
71
70
|
return;
|
|
72
71
|
}
|
|
73
|
-
for (const
|
|
74
|
-
l
|
|
75
|
-
this.debug(`Recieved Location Update Event: "${message}"`);
|
|
76
|
-
});
|
|
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)}`);
|
|
72
|
+
for (const key in this._locations) {
|
|
73
|
+
const l = this._locations[key];
|
|
87
74
|
this.debug(`Process Location ${l.name}`);
|
|
88
75
|
const devices = await l.getDevices();
|
|
89
76
|
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) {
|
|
77
|
+
this.debug(`Location has ${l.loc.cameras.length} Cameras`);
|
|
78
|
+
for (const c of l.loc.cameras) {
|
|
92
79
|
this.updateDev(c, l);
|
|
93
80
|
}
|
|
94
81
|
}
|
|
95
|
-
this.
|
|
82
|
+
this.refreshing = false;
|
|
96
83
|
this.debug(`Refresh complete`);
|
|
97
84
|
}
|
|
98
|
-
processUserInput(
|
|
99
|
-
|
|
100
|
-
|
|
85
|
+
processUserInput(targetId, channelID, stateID, state) {
|
|
86
|
+
const targetDevice = this.devices[targetId];
|
|
87
|
+
const targetLocation = this._locations[targetId];
|
|
88
|
+
if (!targetDevice && !targetLocation) {
|
|
89
|
+
this.adapter.log.error(`Recieved State Change on Subscribed State, for unknown Device/Location "${targetId}"`);
|
|
101
90
|
return;
|
|
102
91
|
}
|
|
103
|
-
|
|
104
|
-
|
|
92
|
+
else if (targetDevice) {
|
|
93
|
+
targetDevice.processUserInput(channelID, stateID, state);
|
|
94
|
+
}
|
|
95
|
+
else if (targetLocation) {
|
|
96
|
+
targetLocation.processUserInput(channelID, stateID, state);
|
|
97
|
+
}
|
|
105
98
|
}
|
|
106
99
|
unload() {
|
|
107
100
|
if (this._refreshInterval) {
|
|
@@ -111,11 +104,13 @@ class RingApiClient {
|
|
|
111
104
|
}
|
|
112
105
|
async retrieveLocations() {
|
|
113
106
|
this.debug(`Retrieve Locations`);
|
|
114
|
-
await (await this.getApi()).getLocations()
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
107
|
+
const locs = await (await this.getApi()).getLocations().catch(this.handleApiError.bind(this));
|
|
108
|
+
this.debug(`Recieved ${locs === null || locs === void 0 ? void 0 : locs.length} Locations`);
|
|
109
|
+
this._locations = {};
|
|
110
|
+
for (const loc of locs) {
|
|
111
|
+
const newLoc = new ownRingLocation_1.OwnRingLocation(loc, this.adapter, this);
|
|
112
|
+
this._locations[newLoc.fullId] = newLoc;
|
|
113
|
+
}
|
|
119
114
|
}
|
|
120
115
|
handleApiError(reason) {
|
|
121
116
|
this.adapter.log.error(`Api Call failed`);
|
|
@@ -143,7 +138,7 @@ class RingApiClient {
|
|
|
143
138
|
}
|
|
144
139
|
}
|
|
145
140
|
getLocation(locId) {
|
|
146
|
-
return this.locations
|
|
141
|
+
return this.locations[locId];
|
|
147
142
|
}
|
|
148
143
|
}
|
|
149
144
|
exports.RingApiClient = RingApiClient;
|
|
@@ -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
|
@@ -121,17 +121,21 @@ class RingAdapter extends utils.Adapter {
|
|
|
121
121
|
this.log.silly(`state ${id} deleted`);
|
|
122
122
|
return;
|
|
123
123
|
}
|
|
124
|
+
if (state.ack) {
|
|
125
|
+
// As it is already ack, don't react on it (could be set by us).
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
124
128
|
// The state was changed
|
|
125
129
|
this.log.silly(`state ${id} changed: ${state.val} (ack = ${state.ack})`);
|
|
126
130
|
const splits = id.split(".");
|
|
127
|
-
const
|
|
131
|
+
const targetId = splits[2];
|
|
128
132
|
let stateID = splits[3];
|
|
129
133
|
let channelID = "";
|
|
130
134
|
if (splits.length === 5) {
|
|
131
135
|
channelID = splits[3];
|
|
132
136
|
stateID = splits[4];
|
|
133
137
|
}
|
|
134
|
-
this.apiClient.processUserInput(
|
|
138
|
+
this.apiClient.processUserInput(targetId, channelID, stateID, state);
|
|
135
139
|
}
|
|
136
140
|
// If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor.
|
|
137
141
|
// /**
|
|
@@ -149,8 +153,8 @@ class RingAdapter extends utils.Adapter {
|
|
|
149
153
|
// }
|
|
150
154
|
// }
|
|
151
155
|
upsertState(id, common, value, subscribe = false) {
|
|
152
|
-
if (this.states[id] === value) {
|
|
153
|
-
// Unchanged Value
|
|
156
|
+
if (this.states[id] === value && !subscribe) {
|
|
157
|
+
// Unchanged and from user not changeable Value
|
|
154
158
|
return;
|
|
155
159
|
}
|
|
156
160
|
// noinspection JSIgnoredPromiseFromCall
|
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,uDAAoD;AACpD,gDAAwB;AACxB,8DAA0D;AAE1D,gCAAgC;AAChC,4BAA4B;AAE5B,MAAa,WAAY,SAAQ,KAAK,CAAC,OAAO;IAK5C,YAAmB,UAAyC,EAAE;QAC5D,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;QAPG,WAAM,GAA0C,EAAE,CAAC;QAQzD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,2DAA2D;QAC3D,iDAAiD;QACjD,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,OAAO;QACnB,+BAA+B;QAC/B,yGAAyG;QACzG,eAAe;QAEf,IAAI,CAAC,SAAS,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,EAAE,EAAE;YAC1C,IAAI,CAAC,SAAS,CAAC,yFAAyF,CAAC,CAAC;YAC1G,OAAO;SACR;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,cAAI,CAAC,SAAS,CAC/B,GAAG,KAAK,CAAC,aAAa,IAAI,OAAO,SAAS,IAAI,CAAC,SAAS,EAAE,CAC3D,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;SAC1D;QACD,MAAM,0BAAW,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAElD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7C,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SACjC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,QAAoB;QACnC,IAAI;YACF,yEAAyE;YACzE,0BAA0B;YAC1B,0BAA0B;YAC1B,MAAM;YACN,4BAA4B;YAC5B,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;aACzB;YACD,QAAQ,EAAE,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,EAAE,CAAC;SACZ;IACH,CAAC;IAED,uHAAuH;IACvH,6GAA6G;IAC7G,MAAM;IACN,8CAA8C;IAC9C,MAAM;IACN,sFAAsF;IACtF,cAAc;IACd,8BAA8B;IAC9B,mEAAmE;IACnE,YAAY;IACZ,8BAA8B;IAC9B,2CAA2C;IAC3C,KAAK;IACL,IAAI;IAEJ;;OAEG;IACK,aAAa,CAAC,EAAU,EAAE,KAAwC;QACxE,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAC7B,wBAAwB;YACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YACtC,OAAO;SACR;QAED,wBAAwB;QACxB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,KAAK,CAAC,GAAG,WAAW,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACtB,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;SACrB;QAED,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IAED,+HAA+H;IAC/H,MAAM;IACN,wGAAwG;IACxG,kGAAkG;IAClG,MAAM;IACN,mDAAmD;IACnD,iDAAiD;IACjD,kCAAkC;IAClC,gDAAgD;IAChD,oCAAoC;IAEpC,8CAA8C;IAC9C,6FAA6F;IAC7F,MAAM;IACN,KAAK;IACL,IAAI;IAEJ,WAAW,CAAC,EAAU,EAAE,MAAqC,EAAE,KAA0B,EAAE,SAAS,GAAG,KAAK;QAC1G,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,9 +1,45 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "ring",
|
|
4
|
-
"version": "3.0.
|
|
4
|
+
"version": "3.0.5",
|
|
5
5
|
"title": "Ring",
|
|
6
6
|
"news": {
|
|
7
|
+
"3.0.5": {
|
|
8
|
+
"en": "Improve Log Message on failed Snapshots during eventhandling\nAdd Support for doorbell oyster",
|
|
9
|
+
"de": "Verbessern Sie die Log-Nachricht auf fehlgeschlagenen Snapshots während der Eventhandling\nUnterstützung für Türklingel Austern hinzufügen",
|
|
10
|
+
"ru": "Улучшить Log Сообщение о неудачных снимках во время eventhandling\nДобавить Поддержка дверного звонка устрица",
|
|
11
|
+
"pt": "Melhore a Mensagem de Log em Snapshots falhados durante o tratamento de eventos\nAdicionar suporte para ostra da campainha",
|
|
12
|
+
"nl": "Improve Log Message over mislukte Snapshots tijdens het evenement\nVersterking voor deurbel oyster",
|
|
13
|
+
"fr": "Améliorez le message de connexion sur les snapshots échoués lors de l'exécution\nAjouter Support pour huître de porte",
|
|
14
|
+
"it": "Migliorare il messaggio di registro sulle snapshot fallite durante la gestione degli eventi\nAggiungi supporto per oyster del campanello",
|
|
15
|
+
"es": "Mejorar el mensaje de registro en instantáneas fallidas durante el manejo de eventos\nAñadir Soporte para timbre de puerta",
|
|
16
|
+
"pl": "Improve Log Message nie powiódł Snapshots podczas imprezy\nAddd Support for the doorbell",
|
|
17
|
+
"zh-cn": "在事件期间改进关于未获逮捕的Steshots的Tal Message\nB. 增加对大门旅舍的支持"
|
|
18
|
+
},
|
|
19
|
+
"3.0.4": {
|
|
20
|
+
"en": "Fix Edge Case resulting in lamps being permanently on",
|
|
21
|
+
"de": "Fix Edge Fall, dass Lampen dauerhaft an",
|
|
22
|
+
"ru": "Fix Край Кейс, полученный в лампах, постоянно на",
|
|
23
|
+
"pt": "Borda fixa Caso resultando em lâmpadas sendo permanentemente em",
|
|
24
|
+
"nl": "Vertaling: Zaak resulteert in lampen die permanent op",
|
|
25
|
+
"fr": "Fix Edge Case resulting in lamps being permanently on",
|
|
26
|
+
"it": "Bordo di fissaggio Caso che risulta che le lampade sono permanentemente su",
|
|
27
|
+
"es": "Corrección Case resulting in lamps being permanently on",
|
|
28
|
+
"pl": "Fix Edge Edge Edge Edge Powoduje to, że lampy stają się na stałe",
|
|
29
|
+
"zh-cn": "Fix Edge 造成长期猛增的案件"
|
|
30
|
+
},
|
|
31
|
+
"3.0.3": {
|
|
32
|
+
"en": "Implement location mode",
|
|
33
|
+
"de": "Implementieren Standortmodus",
|
|
34
|
+
"ru": "Внедрить режим расположения",
|
|
35
|
+
"pt": "Implementar modo de localização",
|
|
36
|
+
"nl": "Implementie locatie modus",
|
|
37
|
+
"fr": "Mettre en place le mode de localisation",
|
|
38
|
+
"it": "Modalità di implementazione",
|
|
39
|
+
"es": "Aplicar el modo de ubicación",
|
|
40
|
+
"pl": "Implementacja",
|
|
41
|
+
"zh-cn": "执行地点模式"
|
|
42
|
+
},
|
|
7
43
|
"3.0.1": {
|
|
8
44
|
"en": "Changed the russian translations",
|
|
9
45
|
"de": "Ändern der russischen Übersetzungen",
|
|
@@ -15,24 +51,6 @@
|
|
|
15
51
|
"es": "Cambiaron las traducciones rusas",
|
|
16
52
|
"pl": "Zmienił russkie tłumaczenia",
|
|
17
53
|
"zh-cn": "B. 更改条约翻译"
|
|
18
|
-
},
|
|
19
|
-
"3.0.0-beta.13": {
|
|
20
|
-
"en": "Prevent missing of events, due to socket drop within ring-api-client\nImprove device logging\n"
|
|
21
|
-
},
|
|
22
|
-
"3.0.0-beta.12": {
|
|
23
|
-
"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"
|
|
24
|
-
},
|
|
25
|
-
"3.0.0-beta.11": {
|
|
26
|
-
"en": "Add processing of new refresh token\n"
|
|
27
|
-
},
|
|
28
|
-
"3.0.0-beta.10": {
|
|
29
|
-
"en": "Add `lpd_v4` Doorbell\n"
|
|
30
|
-
},
|
|
31
|
-
"3.0.0-beta.9": {
|
|
32
|
-
"en": "Refresh location every 2 hours for more stability\n"
|
|
33
|
-
},
|
|
34
|
-
"3.0.0-beta.8": {
|
|
35
|
-
"en": "Fix writing to iobroker-data/files folder (thx to Apollon)\n"
|
|
36
54
|
}
|
|
37
55
|
},
|
|
38
56
|
"titleLang": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.ring",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.5",
|
|
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.6",
|
|
34
34
|
"@iobroker/adapter-core": "^2.6.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
@@ -44,14 +44,14 @@
|
|
|
44
44
|
"@types/mocha": "^9.1.1",
|
|
45
45
|
"@types/node": "^17.0.41",
|
|
46
46
|
"@types/proxyquire": "^1.3.28",
|
|
47
|
-
"@types/sinon": "^10.0.
|
|
47
|
+
"@types/sinon": "^10.0.12",
|
|
48
48
|
"@types/sinon-chai": "^3.2.8",
|
|
49
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
50
|
-
"@typescript-eslint/parser": "^5.
|
|
49
|
+
"@typescript-eslint/eslint-plugin": "^5.30.4",
|
|
50
|
+
"@typescript-eslint/parser": "^5.30.4",
|
|
51
51
|
"axios": "^0.27.2",
|
|
52
52
|
"chai": "^4.3.6",
|
|
53
53
|
"chai-as-promised": "^7.1.1",
|
|
54
|
-
"eslint": "^8.
|
|
54
|
+
"eslint": "^8.19.0",
|
|
55
55
|
"gulp": "^4.0.2",
|
|
56
56
|
"mocha": "^10.0.0",
|
|
57
57
|
"nyc": "^15.1.0",
|
|
@@ -60,8 +60,8 @@
|
|
|
60
60
|
"sinon": "^14.0.0",
|
|
61
61
|
"sinon-chai": "^3.7.0",
|
|
62
62
|
"source-map-support": "^0.5.21",
|
|
63
|
-
"ts-node": "^10.8.
|
|
64
|
-
"typescript": "^4.7.
|
|
63
|
+
"ts-node": "^10.8.2",
|
|
64
|
+
"typescript": "^4.7.4"
|
|
65
65
|
},
|
|
66
66
|
"main": "build/main.js",
|
|
67
67
|
"files": [
|