@homebridge-plugins/homebridge-eufy-security 4.6.2-beta.6 → 4.6.2-beta.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/.claude/CLAUDE.md +7 -7
- package/.claude/PRD.md +2 -2
- package/.prettierignore +7 -0
- package/.prettierrc.json +7 -0
- package/dist/accessories/AutoSyncStationAccessory.js +6 -5
- package/dist/accessories/AutoSyncStationAccessory.js.map +1 -1
- package/dist/accessories/BaseAccessory.js +9 -13
- package/dist/accessories/BaseAccessory.js.map +1 -1
- package/dist/accessories/CameraAccessory.js +15 -21
- package/dist/accessories/CameraAccessory.js.map +1 -1
- package/dist/accessories/Device.js +1 -3
- package/dist/accessories/Device.js.map +1 -1
- package/dist/accessories/EntrySensorAccessory.js +1 -1
- package/dist/accessories/EntrySensorAccessory.js.map +1 -1
- package/dist/accessories/LockAccessory.js.map +1 -1
- package/dist/accessories/MotionSensorAccessory.js +1 -1
- package/dist/accessories/MotionSensorAccessory.js.map +1 -1
- package/dist/accessories/SmartDropAccessory.js +2 -6
- package/dist/accessories/SmartDropAccessory.js.map +1 -1
- package/dist/accessories/StationAccessory.js +17 -15
- package/dist/accessories/StationAccessory.js.map +1 -1
- package/dist/controller/DebugRecordingManager.js +30 -19
- package/dist/controller/DebugRecordingManager.js.map +1 -1
- package/dist/controller/LocalLivestreamManager.js +6 -4
- package/dist/controller/LocalLivestreamManager.js.map +1 -1
- package/dist/controller/recordingDelegate.js +11 -11
- package/dist/controller/recordingDelegate.js.map +1 -1
- package/dist/controller/snapshotDelegate.js +4 -5
- package/dist/controller/snapshotDelegate.js.map +1 -1
- package/dist/controller/streamingDelegate.js +12 -8
- package/dist/controller/streamingDelegate.js.map +1 -1
- package/dist/platform.js +20 -15
- package/dist/platform.js.map +1 -1
- package/dist/utils/Talkback.js +2 -4
- package/dist/utils/Talkback.js.map +1 -1
- package/dist/utils/accessoriesStore.js +8 -7
- package/dist/utils/accessoriesStore.js.map +1 -1
- package/dist/utils/ffmpeg.js +40 -23
- package/dist/utils/ffmpeg.js.map +1 -1
- package/dist/utils/interfaces.js.map +1 -1
- package/dist/utils/utils.js +9 -5
- package/dist/utils/utils.js.map +1 -1
- package/dist/version.js +1 -1
- package/package.json +13 -15
- package/eslint.config.mjs +0 -18
package/.claude/CLAUDE.md
CHANGED
|
@@ -15,14 +15,14 @@ For detailed functional requirements, device coverage, configuration options, an
|
|
|
15
15
|
```bash
|
|
16
16
|
npm run build # rimraf dist -> tsc -> copy media/ to dist/
|
|
17
17
|
npm run build-plugin # rimraf dist -> tsc (no media copy)
|
|
18
|
-
npm run lint #
|
|
19
|
-
npm run lint-fix #
|
|
18
|
+
npm run lint # prettier --check 'src/**/*.ts'
|
|
19
|
+
npm run lint-fix # prettier --write 'src/**/*.ts'
|
|
20
20
|
```
|
|
21
21
|
|
|
22
22
|
- No test suite -- there are no unit or integration tests
|
|
23
23
|
- Output: `dist/`
|
|
24
|
-
-
|
|
25
|
-
- ESLint
|
|
24
|
+
- Formatting is enforced by Prettier (`.prettierrc.json`); `npm run lint` fails on any unformatted file -- run `npm run lint-fix` to auto-format
|
|
25
|
+
- ESLint has been removed (typescript-eslint has no TypeScript 7 compatible release); Prettier is the only style gate
|
|
26
26
|
- Run `npm run lint` and `npm run build` before pushing
|
|
27
27
|
|
|
28
28
|
## Architecture
|
|
@@ -47,7 +47,7 @@ Entry point `src/index.ts` registers `EufySecurityPlatform` with Homebridge. The
|
|
|
47
47
|
|
|
48
48
|
**Constants** in `src/settings.ts`: HKSV segment lengths, snapshot cache ages, streaming bitrate headroom, IDR intervals -- reference this when tuning streaming or recording behaviour.
|
|
49
49
|
|
|
50
|
-
**Plugin UI** in `homebridge-ui/`: `server.js` (plain JS,
|
|
50
|
+
**Plugin UI** in `homebridge-ui/`: `server.js` (plain JS, prettier-ignored) handles UI server logic and diagnostics generation. The UI and the plugin runtime (`src/`) are **separate processes** that share state through `accessories.json` on disk (written by `src/utils/accessoriesStore.ts`, read by `homebridge-ui/server.js`). Both independently import `eufy-security-client` types (`DeviceType`, `PropertyName`, `Device`, etc.) -- changes to the device/station record shape must be kept in sync between `accessoriesStore.ts` and `server.js`.
|
|
51
51
|
|
|
52
52
|
### Key source files for device registration and triage
|
|
53
53
|
|
|
@@ -57,8 +57,8 @@ Entry point `src/index.ts` registers `EufySecurityPlatform` with Homebridge. The
|
|
|
57
57
|
|
|
58
58
|
- ESM project (`"type": "module"`, `"module": "NodeNext"`) -- imports must use `.js` extensions (NodeNext resolution requires explicit extensions)
|
|
59
59
|
- TypeScript strict mode, ES2022 target (`noImplicitAny: false` relaxes implicit-any checks)
|
|
60
|
-
- Node.js
|
|
61
|
-
- Homebridge
|
|
60
|
+
- Node.js >=24.5.0 required
|
|
61
|
+
- Homebridge ^2.0.0 (1.x no longer supported)
|
|
62
62
|
- Uses `ffmpeg-for-homebridge` for video transcoding
|
|
63
63
|
- `src/version.ts` is auto-generated at prebuild time -- do not edit manually
|
|
64
64
|
- `prepublishOnly` runs lint + build automatically before `npm publish`
|
package/.claude/PRD.md
CHANGED
|
@@ -14,8 +14,8 @@ Homebridge users with Eufy Security hardware who want native HomeKit integration
|
|
|
14
14
|
|
|
15
15
|
| Requirement | Value |
|
|
16
16
|
|---|---|
|
|
17
|
-
| Node.js |
|
|
18
|
-
| Homebridge |
|
|
17
|
+
| Node.js | >=24.5.0 |
|
|
18
|
+
| Homebridge | ^2.0.0 |
|
|
19
19
|
| Eufy Account | Dedicated guest account (admin accounts blocked) |
|
|
20
20
|
| FFmpeg | Bundled via `ffmpeg-for-homebridge` |
|
|
21
21
|
|
package/.prettierignore
ADDED
package/.prettierrc.json
ADDED
|
@@ -91,11 +91,11 @@ export class AutoSyncStationAccessory {
|
|
|
91
91
|
}
|
|
92
92
|
else {
|
|
93
93
|
AutoSyncStationAccessory.alarmFired = true;
|
|
94
|
-
log.debug(`SET TIMEOUT ${this.name} 'alarm event' REASON ${AlarmEvent[alarmEvent]} FOR ${manualAlarmSeconds * 4 / 5}sec`);
|
|
94
|
+
log.debug(`SET TIMEOUT ${this.name} 'alarm event' REASON ${AlarmEvent[alarmEvent]} FOR ${(manualAlarmSeconds * 4) / 5}sec`);
|
|
95
95
|
AutoSyncStationAccessory.alarmFiredTimeout.timeout = setTimeout(() => {
|
|
96
96
|
AutoSyncStationAccessory.alarmFired = false;
|
|
97
97
|
log.debug(`TIMEOUT ${this.name} 'alarm event' REASON ${AlarmEvent[alarmEvent]}`);
|
|
98
|
-
}, manualAlarmSeconds * 4 / 5 * 1000);
|
|
98
|
+
}, ((manualAlarmSeconds * 4) / 5) * 1000);
|
|
99
99
|
}
|
|
100
100
|
// List of alarm events fired to stop alarm
|
|
101
101
|
const pluginFiredAlarmStopEvents = [
|
|
@@ -103,17 +103,18 @@ export class AutoSyncStationAccessory {
|
|
|
103
103
|
AlarmEvent.HUB_STOP_BY_APP,
|
|
104
104
|
AlarmEvent.HUB_STOP_BY_HAND,
|
|
105
105
|
AlarmEvent.HUB_STOP_BY_KEYPAD,
|
|
106
|
-
AlarmEvent.DEV_STOP
|
|
106
|
+
AlarmEvent.DEV_STOP,
|
|
107
107
|
];
|
|
108
108
|
// Check if the alarm event is a plugin-fired alarm stop event
|
|
109
109
|
if (pluginFiredAlarmStopEvents.includes(alarmEvent)) {
|
|
110
110
|
return;
|
|
111
111
|
}
|
|
112
|
-
const characteristic = first_station
|
|
112
|
+
const characteristic = first_station
|
|
113
|
+
.getService(SERV.SecuritySystem)
|
|
113
114
|
.getCharacteristic(CHAR.SecuritySystemCurrentState);
|
|
114
115
|
first_station.onStationAlarmEventPushNotification(characteristic, alarmEvent);
|
|
115
116
|
// Iterate over child stations to synchronize the alarm event
|
|
116
|
-
AutoSyncStationAccessory.childs.forEach(child => {
|
|
117
|
+
AutoSyncStationAccessory.childs.forEach((child) => {
|
|
117
118
|
// Check if the alarm is already handled by the child itself
|
|
118
119
|
if (this.device.getSerial() === child.device.getSerial()) {
|
|
119
120
|
return; // Already fired by itself so do nothing for him
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutoSyncStationAccessory.js","sourceRoot":"","sources":["../../src/accessories/AutoSyncStationAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAW,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,MAAM,OAAO,wBAAwB;
|
|
1
|
+
{"version":3,"file":"AutoSyncStationAccessory.js","sourceRoot":"","sources":["../../src/accessories/AutoSyncStationAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Servicing and caching strategy inspired
|
|
1
|
+
// Servicing and caching strategy inspired
|
|
2
2
|
// by homebridge-ring — https://github.com/dgreif/ring
|
|
3
3
|
import { DeviceType } from 'eufy-security-client';
|
|
4
4
|
import { EventEmitter } from 'events';
|
|
@@ -12,9 +12,7 @@ import { CHAR, SERV, log } from '../utils/utils.js';
|
|
|
12
12
|
* @returns {boolean} Returns true if the serviceType is an instance of Service, otherwise false.
|
|
13
13
|
*/
|
|
14
14
|
function isServiceInstance(serviceType) {
|
|
15
|
-
return
|
|
16
|
-
serviceType !== null &&
|
|
17
|
-
'characteristics' in serviceType);
|
|
15
|
+
return typeof serviceType === 'object' && serviceType !== null && 'characteristics' in serviceType;
|
|
18
16
|
}
|
|
19
17
|
export class BaseAccessory extends EventEmitter {
|
|
20
18
|
platform;
|
|
@@ -218,7 +216,7 @@ export class BaseAccessory extends EventEmitter {
|
|
|
218
216
|
}
|
|
219
217
|
if (onMultipleValue) {
|
|
220
218
|
// Attach the common event handler to each event type
|
|
221
|
-
onMultipleValue.forEach(eventType => {
|
|
219
|
+
onMultipleValue.forEach((eventType) => {
|
|
222
220
|
this.device.on(eventType, (device, value) => {
|
|
223
221
|
this.log.info(`ON '${serviceType.name} / ${characteristicType.name} / ${eventType}':`, value);
|
|
224
222
|
characteristic.updateValue(value);
|
|
@@ -239,12 +237,11 @@ export class BaseAccessory extends EventEmitter {
|
|
|
239
237
|
if (isServiceInstance(serviceType)) {
|
|
240
238
|
return serviceType;
|
|
241
239
|
}
|
|
242
|
-
const existingService = subType
|
|
243
|
-
|
|
244
|
-
this.accessory.
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
name !== existingService.displayName) {
|
|
240
|
+
const existingService = subType
|
|
241
|
+
? this.accessory.getServiceById(serviceType, subType)
|
|
242
|
+
: this.accessory.getService(serviceType);
|
|
243
|
+
const service = existingService || this.accessory.addService(serviceType, name, subType);
|
|
244
|
+
if (existingService && existingService.displayName && name !== existingService.displayName) {
|
|
248
245
|
throw new Error(`Overlapping services for device ${this.name} - ${name} != ${existingService.displayName} - ${serviceType}`);
|
|
249
246
|
}
|
|
250
247
|
if (!this.servicesInUse.includes(service)) {
|
|
@@ -254,8 +251,7 @@ export class BaseAccessory extends EventEmitter {
|
|
|
254
251
|
}
|
|
255
252
|
pruneUnusedServices() {
|
|
256
253
|
this.accessory.services.forEach((service) => {
|
|
257
|
-
if (!this.servicesInUse.includes(service) &&
|
|
258
|
-
!BaseAccessory.CAMERA_CONTROLLER_SERVICE_UUIDS.has(service.UUID)) {
|
|
254
|
+
if (!this.servicesInUse.includes(service) && !BaseAccessory.CAMERA_CONTROLLER_SERVICE_UUIDS.has(service.UUID)) {
|
|
259
255
|
this.log.debug(`Pruning unused service ${service.UUID} ${service.displayName || service.name}`);
|
|
260
256
|
this.accessory.removeService(service);
|
|
261
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseAccessory.js","sourceRoot":"","sources":["../../src/accessories/BaseAccessory.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"BaseAccessory.js","sourceRoot":"","sources":["../../src/accessories/BaseAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DeviceAccessory } from './Device.js';
|
|
2
|
-
// @ts-ignore
|
|
2
|
+
// @ts-ignore
|
|
3
3
|
import { PropertyName, CommandName } from 'eufy-security-client';
|
|
4
4
|
import { DEFAULT_CAMERACONFIG_VALUES } from '../utils/configTypes.js';
|
|
5
5
|
import { probeHardwareEncoder } from '../utils/ffmpeg.js';
|
|
@@ -147,7 +147,7 @@ export class CameraAccessory extends DeviceAccessory {
|
|
|
147
147
|
*/
|
|
148
148
|
getCameraConfig() {
|
|
149
149
|
// Find the specific camera config from the platform based on its serial number
|
|
150
|
-
const foundConfig = this.platform.config.cameras?.find(e => e.serialNumber === this.device.getSerial()) ?? {};
|
|
150
|
+
const foundConfig = this.platform.config.cameras?.find((e) => e.serialNumber === this.device.getSerial()) ?? {};
|
|
151
151
|
// Combine default and specific configurations
|
|
152
152
|
const config = {
|
|
153
153
|
...DEFAULT_CAMERACONFIG_VALUES,
|
|
@@ -179,16 +179,18 @@ export class CameraAccessory extends DeviceAccessory {
|
|
|
179
179
|
characteristicType: CHAR.MotionDetected,
|
|
180
180
|
getValue: () => this.device.getPropertyValue(PropertyName.DeviceMotionDetected),
|
|
181
181
|
onValue: (service, characteristic) => {
|
|
182
|
-
this.eventTypesToHandle.forEach(eventType => {
|
|
182
|
+
this.eventTypesToHandle.forEach((eventType) => {
|
|
183
183
|
this.device.on(eventType, (device, state) => {
|
|
184
184
|
this.log.info(`MOTION DETECTED (${eventType})': ${state}`);
|
|
185
185
|
characteristic.updateValue(state);
|
|
186
186
|
// Pre-warm the P2P livestream on motion start so it's ready when
|
|
187
187
|
// HomeKit requests an HKSV recording. RTSP cameras don't need this
|
|
188
188
|
// since their stream URL is immediately available.
|
|
189
|
-
if (state &&
|
|
190
|
-
|
|
191
|
-
|
|
189
|
+
if (state &&
|
|
190
|
+
this.streamingDelegate &&
|
|
191
|
+
this.recordingDelegate &&
|
|
192
|
+
!this.recordingDelegate.isRecording() &&
|
|
193
|
+
!isRtspReady(this.device, this.cameraConfig)) {
|
|
192
194
|
const manager = this.streamingDelegate.getLivestreamManager();
|
|
193
195
|
manager.preWarmStream().catch((err) => {
|
|
194
196
|
this.log.debug('P2P pre-warm failed (non-fatal): ' + err);
|
|
@@ -258,9 +260,7 @@ export class CameraAccessory extends DeviceAccessory {
|
|
|
258
260
|
getValue: () => {
|
|
259
261
|
const tampered = this.device.getPropertyValue(PropertyName.DeviceEnabled);
|
|
260
262
|
this.log.debug(`TAMPERED? ${!tampered}`);
|
|
261
|
-
return tampered
|
|
262
|
-
? CHAR.StatusTampered.NOT_TAMPERED
|
|
263
|
-
: CHAR.StatusTampered.TAMPERED;
|
|
263
|
+
return tampered ? CHAR.StatusTampered.NOT_TAMPERED : CHAR.StatusTampered.TAMPERED;
|
|
264
264
|
},
|
|
265
265
|
});
|
|
266
266
|
if (this.device.isDoorbell()) {
|
|
@@ -288,9 +288,8 @@ export class CameraAccessory extends DeviceAccessory {
|
|
|
288
288
|
if (propertyName === PropertyName.DeviceNightvision) {
|
|
289
289
|
return value === 1;
|
|
290
290
|
}
|
|
291
|
-
// Override for PropertyName.DeviceEnabled when enabled button is fired and
|
|
292
|
-
if (propertyName === PropertyName.DeviceEnabled &&
|
|
293
|
-
Date.now() - this.cameraStatus.timestamp <= 60000) {
|
|
291
|
+
// Override for PropertyName.DeviceEnabled when enabled button is fired and
|
|
292
|
+
if (propertyName === PropertyName.DeviceEnabled && Date.now() - this.cameraStatus.timestamp <= 60000) {
|
|
294
293
|
this.log.debug(`CACHED for (1 min) '${characteristic.displayName}' ${propertyName}: ${this.cameraStatus.isEnabled}`);
|
|
295
294
|
value = this.cameraStatus.isEnabled;
|
|
296
295
|
}
|
|
@@ -307,12 +306,10 @@ export class CameraAccessory extends DeviceAccessory {
|
|
|
307
306
|
try {
|
|
308
307
|
this.log.debug(`SET '${characteristic.displayName}' ${propertyName}: ${value}`);
|
|
309
308
|
await this.setPropertyValue(propertyName, value);
|
|
310
|
-
if (propertyName === PropertyName.DeviceEnabled &&
|
|
311
|
-
characteristic.displayName === 'On') {
|
|
309
|
+
if (propertyName === PropertyName.DeviceEnabled && characteristic.displayName === 'On') {
|
|
312
310
|
characteristic.updateValue(value);
|
|
313
311
|
this.cameraStatus = { isEnabled: value, timestamp: Date.now() };
|
|
314
|
-
characteristic = this.getService(SERV.CameraOperatingMode)
|
|
315
|
-
.getCharacteristic(CHAR.ManuallyDisabled);
|
|
312
|
+
characteristic = this.getService(SERV.CameraOperatingMode).getCharacteristic(CHAR.ManuallyDisabled);
|
|
316
313
|
this.log.debug(`INVERSED '${characteristic.displayName}' ${propertyName}: ${!value}`);
|
|
317
314
|
value = !value;
|
|
318
315
|
}
|
|
@@ -396,11 +393,8 @@ export class CameraAccessory extends DeviceAccessory {
|
|
|
396
393
|
},
|
|
397
394
|
recording: {
|
|
398
395
|
options: {
|
|
399
|
-
overrideEventTriggerOptions: [
|
|
400
|
-
|
|
401
|
-
2 /* EventTriggerOption.DOORBELL */,
|
|
402
|
-
],
|
|
403
|
-
prebufferLength: (isRtspReady(this.device, this.cameraConfig) || this.device.hasBattery()) ? 0 : PREBUFFER_DURATION_MS,
|
|
396
|
+
overrideEventTriggerOptions: [1 /* EventTriggerOption.MOTION */, 2 /* EventTriggerOption.DOORBELL */],
|
|
397
|
+
prebufferLength: isRtspReady(this.device, this.cameraConfig) || this.device.hasBattery() ? 0 : PREBUFFER_DURATION_MS,
|
|
404
398
|
mediaContainerConfiguration: [
|
|
405
399
|
{
|
|
406
400
|
type: 0 /* MediaContainerType.FRAGMENTED_MP4 */,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameraAccessory.js","sourceRoot":"","sources":["../../src/accessories/CameraAccessory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CameraAccessory.js","sourceRoot":"","sources":["../../src/accessories/CameraAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,7 @@ export class DeviceAccessory extends BaseAccessory {
|
|
|
24
24
|
}
|
|
25
25
|
onPushNotification(characteristicType, serviceType, value) {
|
|
26
26
|
this.log.debug(`ON '${serviceType.name}': ${value}`);
|
|
27
|
-
this.getService(serviceType)
|
|
28
|
-
.getCharacteristic(characteristicType)
|
|
29
|
-
.updateValue(value);
|
|
27
|
+
this.getService(serviceType).getCharacteristic(characteristicType).updateValue(value);
|
|
30
28
|
}
|
|
31
29
|
initSensorService() {
|
|
32
30
|
const propertiesToRegister = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../src/accessories/Device.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../src/accessories/Device.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAU,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAK/C,MAAM,OAAgB,eAAgB,SAAQ,aAAa;IACzD,YAAY,QAA8B,EAAE,SAA4B,EAAE,MAAc;QACtF,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAED;;OAEG;IACI,gBAAgB,CAAC,cAAsB,EAAE,YAA0B;QACxE,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACzD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,cAAc,KAAK,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;YACpE,OAAO,KAA4B,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,cAAc,KAAK,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;YAC9E,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,YAA0B,EAAE,KAAc;QACtE,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IACjF,CAAC;IAES,kBAAkB,CAC1B,kBAAsC,EACtC,WAAwB,EACxB,KAA0B;QAE1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,IAAI,MAAM,KAAK,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACxF,CAAC;IAED,iBAAiB;QACf,MAAM,oBAAoB,GAAG;YAC3B;gBACE,QAAQ,EAAE,SAAS;gBACnB,kBAAkB,EAAE,IAAI,CAAC,YAAY;gBACrC,YAAY,EAAE,YAAY,CAAC,aAAa;gBACxC,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,GAAG;aACd;YACD;gBACE,QAAQ,EAAE,YAAY;gBACtB,kBAAkB,EAAE,IAAI,CAAC,gBAAgB;gBACzC,YAAY,EAAE,YAAY,CAAC,gBAAgB;gBAC3C,aAAa,EAAE,aAAa;gBAC5B,QAAQ,EAAE,KAAK;aAChB;YACD;gBACE,QAAQ,EAAE,mBAAmB;gBAC7B,kBAAkB,EAAE,IAAI,CAAC,aAAa;gBACtC,YAAY,EAAE,YAAY,CAAC,uBAAuB;gBAClD,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC;QAEF,oBAAoB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;YAC9C,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrD,IAAI,CAAC,sBAAsB,CAAC;oBAC1B,WAAW,EAAE,IAAI,CAAC,OAAO;oBACzB,kBAAkB,EAAE,cAAc,CAAC,kBAAkB;oBACrD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,QAAQ;oBACpG,aAAa,EAAE,cAAc,CAAC,aAAa;iBAC5C,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntrySensorAccessory.js","sourceRoot":"","sources":["../../src/accessories/EntrySensorAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"EntrySensorAccessory.js","sourceRoot":"","sources":["../../src/accessories/EntrySensorAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,aAAa;AACb,OAAO,EAAe,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;GASG;AACH,MAAM,OAAO,oBAAqB,SAAQ,eAAe;IACvD;;;;;;OAMG;IACH,YAAY,QAA8B,EAAE,SAA4B,EAAE,MAAmB;QAC3F,4DAA4D;QAC5D,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEnC,uEAAuE;QACvE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAE3C,qDAAqD;QACrD,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1C,8CAA8C;YAC9C,IAAI,CAAC,sBAAsB,CAAC;gBAC1B,WAAW,EAAE,IAAI,CAAC,aAAa;gBAC/B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,CAAC;gBAC3E,aAAa,EAAE,MAAM;aACtB,CAAC,CAAC;YAEH,iCAAiC;YACjC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,8EAA8E;YAC9E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACtC,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LockAccessory.js","sourceRoot":"","sources":["../../src/accessories/LockAccessory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LockAccessory.js","sourceRoot":"","sources":["../../src/accessories/LockAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MotionSensorAccessory.js","sourceRoot":"","sources":["../../src/accessories/MotionSensorAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"MotionSensorAccessory.js","sourceRoot":"","sources":["../../src/accessories/MotionSensorAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,aAAa;AACb,OAAO,EAAgB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;GASG;AACH,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IACxD;;;;;;OAMG;IACH,YAAY,QAA8B,EAAE,SAA4B,EAAE,MAAoB;QAC5F,4DAA4D;QAC5D,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEnC,wEAAwE;QACxE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE5C,yDAAyD;QACzD,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC9C,+CAA+C;YAC/C,IAAI,CAAC,sBAAsB,CAAC;gBAC1B,WAAW,EAAE,IAAI,CAAC,YAAY;gBAC9B,kBAAkB,EAAE,IAAI,CAAC,cAAc;gBACvC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,oBAAoB,CAAC;gBAC/E,aAAa,EAAE,iBAAiB;aACjC,CAAC,CAAC;YAEH,iCAAiC;YACjC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,kFAAkF;YAClF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC1C,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;CACF"}
|
|
@@ -100,9 +100,7 @@ export class SmartDropAccessory extends DeviceAccessory {
|
|
|
100
100
|
if (this.device.hasProperty('open')) {
|
|
101
101
|
const isOpen = this.device.getPropertyValue(PropertyName.DeviceOpen);
|
|
102
102
|
this.log.debug(`getLidStatus: ${isOpen}`);
|
|
103
|
-
return isOpen
|
|
104
|
-
? CHAR.LockCurrentState.UNSECURED
|
|
105
|
-
: CHAR.LockCurrentState.SECURED;
|
|
103
|
+
return isOpen ? CHAR.LockCurrentState.UNSECURED : CHAR.LockCurrentState.SECURED;
|
|
106
104
|
}
|
|
107
105
|
return CHAR.LockCurrentState.SECURED;
|
|
108
106
|
}
|
|
@@ -137,9 +135,7 @@ export class SmartDropAccessory extends DeviceAccessory {
|
|
|
137
135
|
getPackageDeliveredStatus() {
|
|
138
136
|
const delivered = this.device.getPropertyValue(PropertyName.DevicePackageDelivered);
|
|
139
137
|
this.log.debug(`getPackageDeliveredStatus: ${delivered}`);
|
|
140
|
-
return delivered
|
|
141
|
-
? CHAR.ContactSensorState.CONTACT_NOT_DETECTED
|
|
142
|
-
: CHAR.ContactSensorState.CONTACT_DETECTED;
|
|
138
|
+
return delivered ? CHAR.ContactSensorState.CONTACT_NOT_DETECTED : CHAR.ContactSensorState.CONTACT_DETECTED;
|
|
143
139
|
}
|
|
144
140
|
}
|
|
145
141
|
//# sourceMappingURL=SmartDropAccessory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmartDropAccessory.js","sourceRoot":"","sources":["../../src/accessories/SmartDropAccessory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SmartDropAccessory.js","sourceRoot":"","sources":["../../src/accessories/SmartDropAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BaseAccessory } from './BaseAccessory.js';
|
|
2
|
-
// @ts-ignore
|
|
2
|
+
// @ts-ignore
|
|
3
3
|
import { DeviceType, PropertyName, AlarmEvent, GuardMode } from 'eufy-security-client';
|
|
4
4
|
import { CHAR, SERV, log } from '../utils/utils.js';
|
|
5
5
|
export var HKGuardMode;
|
|
@@ -44,7 +44,7 @@ export class StationAccessory extends BaseAccessory {
|
|
|
44
44
|
PropertyName.StationCustom2SecuritySettings,
|
|
45
45
|
PropertyName.StationCustom3SecuritySettings,
|
|
46
46
|
];
|
|
47
|
-
SecuritySettings.forEach(item => {
|
|
47
|
+
SecuritySettings.forEach((item) => {
|
|
48
48
|
if (this.device.hasPropertyValue(item) && this.getPropertyValue(item) !== '') {
|
|
49
49
|
this.log.debug(`- ${item} :`, this.getPropertyValue(item));
|
|
50
50
|
}
|
|
@@ -76,9 +76,7 @@ export class StationAccessory extends BaseAccessory {
|
|
|
76
76
|
this.device.on('alarm armed event', this.onStationAlarmArmedEvent.bind(this));
|
|
77
77
|
},
|
|
78
78
|
});
|
|
79
|
-
this.getService(SERV.SecuritySystem)
|
|
80
|
-
.getCharacteristic(CHAR.SecuritySystemTargetState)
|
|
81
|
-
.setProps({ validValues });
|
|
79
|
+
this.getService(SERV.SecuritySystem).getCharacteristic(CHAR.SecuritySystemTargetState).setProps({ validValues });
|
|
82
80
|
this.registerCharacteristic({
|
|
83
81
|
serviceType: SERV.Switch,
|
|
84
82
|
characteristicType: CHAR.On,
|
|
@@ -119,7 +117,7 @@ export class StationAccessory extends BaseAccessory {
|
|
|
119
117
|
// Default HomeKit mode for 'Off':
|
|
120
118
|
// - If a keypad is present, set to 6 (Special value)
|
|
121
119
|
// - Otherwise, set to 63 (Default value)
|
|
122
|
-
hkOff: stationConfig?.hkOff ?? this.hasKeyPad ? 6 : this.platform.config.hkOff,
|
|
120
|
+
hkOff: (stationConfig?.hkOff ?? this.hasKeyPad) ? 6 : this.platform.config.hkOff,
|
|
123
121
|
// Use optional chaining to safely access manualTriggerModes and manualAlarmSeconds
|
|
124
122
|
manualTriggerModes: stationConfig?.manualTriggerModes ?? [],
|
|
125
123
|
manualAlarmSeconds: stationConfig?.manualAlarmSeconds ?? 30,
|
|
@@ -294,7 +292,8 @@ export class StationAccessory extends BaseAccessory {
|
|
|
294
292
|
return this.alarm_triggered;
|
|
295
293
|
}
|
|
296
294
|
async handleManualTriggerSwitchStateSet(value) {
|
|
297
|
-
if (value) {
|
|
295
|
+
if (value) {
|
|
296
|
+
// trigger alarm
|
|
298
297
|
try {
|
|
299
298
|
const currentValue = this.device.getPropertyValue(PropertyName.StationCurrentMode);
|
|
300
299
|
if (currentValue === -1) {
|
|
@@ -302,15 +301,17 @@ export class StationAccessory extends BaseAccessory {
|
|
|
302
301
|
}
|
|
303
302
|
// check if alarm is allowed for this guard mode
|
|
304
303
|
// and alarm is not delayed
|
|
305
|
-
if (this.stationConfig.manualTriggerModes.indexOf(this.convertEufytoHK(currentValue)) !== -1 &&
|
|
306
|
-
this.
|
|
304
|
+
if (this.stationConfig.manualTriggerModes.indexOf(this.convertEufytoHK(currentValue)) !== -1 &&
|
|
305
|
+
!this.alarm_delayed) {
|
|
306
|
+
this.device
|
|
307
|
+
.triggerStationAlarmSound(this.stationConfig.manualAlarmSeconds)
|
|
307
308
|
.then(() => log.debug(this.accessory.displayName, 'alarm manually triggered for ' + this.stationConfig.manualAlarmSeconds + ' seconds.'))
|
|
308
|
-
.catch(error => this.log.error(`alarm could not be manually triggered: ${error}`));
|
|
309
|
+
.catch((error) => this.log.error(`alarm could not be manually triggered: ${error}`));
|
|
309
310
|
}
|
|
310
311
|
else {
|
|
311
|
-
const message = this.alarm_delayed
|
|
312
|
-
'tried to trigger alarm, but the alarm delayed event was triggered beforehand.'
|
|
313
|
-
'tried to trigger alarm, but the current station mode prevents the alarm from being triggered. ' +
|
|
312
|
+
const message = this.alarm_delayed
|
|
313
|
+
? 'tried to trigger alarm, but the alarm delayed event was triggered beforehand.'
|
|
314
|
+
: 'tried to trigger alarm, but the current station mode prevents the alarm from being triggered. ' +
|
|
314
315
|
'Please look in in the configuration if you want to change this behaviour.';
|
|
315
316
|
setTimeout(() => {
|
|
316
317
|
this.log.info(`${message}`);
|
|
@@ -323,12 +324,13 @@ export class StationAccessory extends BaseAccessory {
|
|
|
323
324
|
return;
|
|
324
325
|
}
|
|
325
326
|
}
|
|
326
|
-
else {
|
|
327
|
+
else {
|
|
328
|
+
// reset alarm
|
|
327
329
|
const resetPromise = this.device.resetStationAlarmSound();
|
|
328
330
|
if (resetPromise) {
|
|
329
331
|
resetPromise
|
|
330
332
|
.then(() => this.log.debug(`alarm manually reset`))
|
|
331
|
-
.catch(error => this.log.error(`alarm could not be reset: ${error}`));
|
|
333
|
+
.catch((error) => this.log.error(`alarm could not be reset: ${error}`));
|
|
332
334
|
}
|
|
333
335
|
else {
|
|
334
336
|
this.log.warn(`resetStationAlarmSound returned undefined`);
|