homebridge-netatmo-security-mk 1.0.3 → 1.0.4
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/dist/accessory/tagSensorAccessory.d.ts +8 -4
- package/dist/accessory/tagSensorAccessory.d.ts.map +1 -1
- package/dist/accessory/tagSensorAccessory.js +53 -30
- package/dist/accessory/tagSensorAccessory.js.map +1 -1
- package/dist/util/NetatmoAPI.d.ts.map +1 -1
- package/dist/util/NetatmoAPI.js +8 -13
- package/dist/util/NetatmoAPI.js.map +1 -1
- package/package.json +1 -5
- package/dist/util/LegacyAPI.d.ts +0 -2
- package/dist/util/LegacyAPI.d.ts.map +0 -1
- package/dist/util/LegacyAPI.js +0 -28
- package/dist/util/LegacyAPI.js.map +0 -1
- package/dist/util/Webhook.d.ts +0 -1
- package/dist/util/Webhook.d.ts.map +0 -1
- package/dist/util/Webhook.js +0 -25
- package/dist/util/Webhook.js.map +0 -1
- package/dist/util/axios.d.ts +0 -3
- package/dist/util/axios.d.ts.map +0 -1
- package/dist/util/axios.js +0 -10
- package/dist/util/axios.js.map +0 -1
|
@@ -3,14 +3,18 @@ import { NetatmoSecurityPlatform, NetatmoAccessory } from '../platform';
|
|
|
3
3
|
export declare class TagSensorAccessory implements NetatmoAccessory {
|
|
4
4
|
private readonly platform;
|
|
5
5
|
private readonly accessory;
|
|
6
|
-
private
|
|
6
|
+
private contactService;
|
|
7
|
+
private motionService;
|
|
7
8
|
private device;
|
|
8
|
-
private
|
|
9
|
+
private sensorStatus;
|
|
10
|
+
private lastSmallMoveSeen;
|
|
11
|
+
private motionDetected;
|
|
12
|
+
private motionTimer?;
|
|
9
13
|
constructor(platform: NetatmoSecurityPlatform, accessory: PlatformAccessory);
|
|
10
14
|
update(device: any): void;
|
|
15
|
+
private handleVibration;
|
|
16
|
+
private pulseVibration;
|
|
11
17
|
private contactState;
|
|
12
|
-
private isRecentActivity;
|
|
13
|
-
isTampered(): Promise<CharacteristicValue>;
|
|
14
18
|
isOpen(): Promise<CharacteristicValue>;
|
|
15
19
|
}
|
|
16
20
|
//# sourceMappingURL=tagSensorAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tagSensorAccessory.d.ts","sourceRoot":"","sources":["../../src/accessory/tagSensorAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"tagSensorAccessory.d.ts","sourceRoot":"","sources":["../../src/accessory/tagSensorAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAMxE,qBAAa,kBAAmB,YAAW,gBAAgB;IAavD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAb5B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,YAAY,CAAa;IAIjC,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAC,CAAgC;gBAGjC,QAAQ,EAAE,uBAAuB,EACjC,SAAS,EAAE,iBAAiB;IA+B/C,MAAM,CAAC,MAAM,EAAE,GAAG;IAqBlB,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,YAAY;IAKd,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAI7C"}
|
|
@@ -1,68 +1,91 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TagSensorAccessory = void 0;
|
|
4
|
+
// How long the vibration MotionSensor stays "detected" after a tag_small_move,
|
|
5
|
+
// so HomeKit reliably fires the false->true notification edge.
|
|
6
|
+
const VIBRATION_PULSE_MS = 10000;
|
|
4
7
|
class TagSensorAccessory {
|
|
5
8
|
constructor(platform, accessory) {
|
|
6
9
|
this.platform = platform;
|
|
7
10
|
this.accessory = accessory;
|
|
8
|
-
this.
|
|
9
|
-
|
|
10
|
-
TamperStatus: 0,
|
|
11
|
-
};
|
|
11
|
+
this.sensorStatus = 'unknown';
|
|
12
|
+
this.motionDetected = false;
|
|
12
13
|
this.device = accessory.context.device;
|
|
13
14
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
14
15
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, 'Netatmo-Security')
|
|
15
16
|
.setCharacteristic(this.platform.Characteristic.Model, 'Tag-Sensor')
|
|
16
17
|
.setCharacteristic(this.platform.Characteristic.SerialNumber, this.device.id);
|
|
17
|
-
|
|
18
|
+
// Contact sensor: open/closed from the device status.
|
|
19
|
+
this.contactService = this.accessory.getService(this.platform.Service.ContactSensor)
|
|
18
20
|
|| this.accessory.addService(this.platform.Service.ContactSensor);
|
|
19
|
-
this.
|
|
20
|
-
this.
|
|
21
|
+
this.contactService.setCharacteristic(this.platform.Characteristic.Name, this.device.name);
|
|
22
|
+
this.contactService.getCharacteristic(this.platform.Characteristic.ContactSensorState)
|
|
21
23
|
.onGet(this.isOpen.bind(this));
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
// Vibration: a separate MotionSensor so HomeKit can notify when someone
|
|
25
|
+
// taps/knocks the door (tag_small_move) without it being a normal open/close.
|
|
26
|
+
this.motionService = this.accessory.getService(this.platform.Service.MotionSensor)
|
|
27
|
+
|| this.accessory.addService(this.platform.Service.MotionSensor, this.device.name + ' Vibration', 'vibration');
|
|
28
|
+
this.motionService.setCharacteristic(this.platform.Characteristic.Name, this.device.name + ' Vibration');
|
|
29
|
+
this.motionService.getCharacteristic(this.platform.Characteristic.MotionDetected)
|
|
30
|
+
.onGet(() => this.motionDetected);
|
|
31
|
+
// Present the two services as one cohesive accessory: the door contact is the
|
|
32
|
+
// primary function, the vibration motion sensor is linked to it.
|
|
33
|
+
this.contactService.setPrimaryService(true);
|
|
34
|
+
this.contactService.addLinkedService(this.motionService);
|
|
24
35
|
}
|
|
25
36
|
// Push fresh device data from the platform's single poll loop.
|
|
26
37
|
update(device) {
|
|
27
38
|
this.device = device;
|
|
28
|
-
const C = this.platform.Characteristic;
|
|
29
39
|
try {
|
|
30
40
|
const open = device.status === 'open';
|
|
31
|
-
if (device.status !== this.
|
|
32
|
-
this.platform.log.info(`${this.accessory.displayName} Sensor Status: ${open} (${this.
|
|
41
|
+
if (device.status !== this.sensorStatus) {
|
|
42
|
+
this.platform.log.info(`${this.accessory.displayName} Sensor Status: ${open} (${this.sensorStatus} -> ${device.status})`);
|
|
33
43
|
}
|
|
34
|
-
this.
|
|
35
|
-
this.
|
|
44
|
+
this.sensorStatus = device.status;
|
|
45
|
+
this.contactService.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.contactState());
|
|
36
46
|
}
|
|
37
47
|
catch (error) {
|
|
38
48
|
this.platform.log.error('Failed to update contact sensor status', error);
|
|
39
49
|
}
|
|
40
50
|
try {
|
|
41
|
-
|
|
42
|
-
const tampered = this.isRecentActivity(activity);
|
|
43
|
-
if (activity !== this.state.TamperStatus) {
|
|
44
|
-
this.platform.log.info(`${this.accessory.displayName} Tampered Status: ${tampered} (${this.state.TamperStatus} -> ${activity})`);
|
|
45
|
-
}
|
|
46
|
-
this.state.TamperStatus = activity;
|
|
47
|
-
this.service.updateCharacteristic(C.StatusTampered, tampered);
|
|
51
|
+
this.handleVibration(device.lastSmallMove || 0);
|
|
48
52
|
}
|
|
49
53
|
catch (error) {
|
|
50
|
-
this.platform.log.error('Failed to update
|
|
54
|
+
this.platform.log.error('Failed to update vibration sensor', error);
|
|
51
55
|
}
|
|
52
56
|
}
|
|
57
|
+
handleVibration(lastSmallMove) {
|
|
58
|
+
// First update after (re)start: adopt the current value without firing, so an
|
|
59
|
+
// old event still in the backlog doesn't trigger a false alert.
|
|
60
|
+
if (this.lastSmallMoveSeen === undefined) {
|
|
61
|
+
this.lastSmallMoveSeen = lastSmallMove;
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
const now = new Date().getTime() / 1000;
|
|
65
|
+
const isNew = lastSmallMove > this.lastSmallMoveSeen;
|
|
66
|
+
const isRecent = lastSmallMove > now - 60;
|
|
67
|
+
this.lastSmallMoveSeen = lastSmallMove;
|
|
68
|
+
if (isNew && isRecent) {
|
|
69
|
+
this.pulseVibration();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
pulseVibration() {
|
|
73
|
+
this.platform.log.info(`${this.accessory.displayName} Vibration detected`);
|
|
74
|
+
this.motionDetected = true;
|
|
75
|
+
this.motionService.updateCharacteristic(this.platform.Characteristic.MotionDetected, true);
|
|
76
|
+
if (this.motionTimer) {
|
|
77
|
+
clearTimeout(this.motionTimer);
|
|
78
|
+
}
|
|
79
|
+
this.motionTimer = setTimeout(() => {
|
|
80
|
+
this.motionDetected = false;
|
|
81
|
+
this.motionService.updateCharacteristic(this.platform.Characteristic.MotionDetected, false);
|
|
82
|
+
}, VIBRATION_PULSE_MS);
|
|
83
|
+
}
|
|
53
84
|
contactState() {
|
|
54
85
|
var _a;
|
|
55
86
|
const C = this.platform.Characteristic.ContactSensorState;
|
|
56
87
|
return ((_a = this.device) === null || _a === void 0 ? void 0 : _a.status) === 'open' ? C.CONTACT_NOT_DETECTED : C.CONTACT_DETECTED;
|
|
57
88
|
}
|
|
58
|
-
isRecentActivity(activity) {
|
|
59
|
-
const minimumTime = (new Date().getTime() / 1000) - 90;
|
|
60
|
-
return activity > minimumTime;
|
|
61
|
-
}
|
|
62
|
-
async isTampered() {
|
|
63
|
-
var _a;
|
|
64
|
-
return this.isRecentActivity(((_a = this.device) === null || _a === void 0 ? void 0 : _a.activity) || 0);
|
|
65
|
-
}
|
|
66
89
|
async isOpen() {
|
|
67
90
|
return this.contactState();
|
|
68
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tagSensorAccessory.js","sourceRoot":"","sources":["../../src/accessory/tagSensorAccessory.ts"],"names":[],"mappings":";;;AAKA,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"tagSensorAccessory.js","sourceRoot":"","sources":["../../src/accessory/tagSensorAccessory.ts"],"names":[],"mappings":";;;AAKA,+EAA+E;AAC/E,+DAA+D;AAC/D,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAEjC,MAAa,kBAAkB;IAY7B,YACmB,QAAiC,EACjC,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAyB;QACjC,cAAS,GAAT,SAAS,CAAmB;QAVvC,iBAAY,GAAG,SAAS,CAAC;QAKzB,mBAAc,GAAG,KAAK,CAAC;QAO7B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC;QAEvC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACnE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,kBAAkB,CAAC;aAChF,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC;aACnE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEhF,sDAAsD;QACtD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;eACjF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAClE,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3F,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC;aACnF,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEjC,wEAAwE;QACxE,8EAA8E;QAC9E,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;eAC/E,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,YAAY,EAAE,WAAW,CAAC,CAAC;QAC/G,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC;QACzG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC;aAC9E,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEpC,8EAA8E;QAC9E,iEAAiE;QACjE,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC3D,CAAC;IAED,+DAA+D;IAC/D,MAAM,CAAC,MAAW;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC;YACtC,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,YAAY,EAAE;gBACvC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,mBAAmB,IAAI,KAAK,IAAI,CAAC,YAAY,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;aAC3H;YACD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAChH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;SAC1E;QAED,IAAI;YACF,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC;SACjD;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;SACrE;IACH,CAAC;IAEO,eAAe,CAAC,aAAqB;QAC3C,8EAA8E;QAC9E,gEAAgE;QAChE,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,aAAa,CAAC;YACvC,OAAO;SACR;QACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;QACxC,MAAM,KAAK,GAAG,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACrD,MAAM,QAAQ,GAAG,aAAa,GAAG,GAAG,GAAG,EAAE,CAAC;QAC1C,IAAI,CAAC,iBAAiB,GAAG,aAAa,CAAC;QACvC,IAAI,KAAK,IAAI,QAAQ,EAAE;YACrB,IAAI,CAAC,cAAc,EAAE,CAAC;SACvB;IACH,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,qBAAqB,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC3F,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QAC9F,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACzB,CAAC;IAEO,YAAY;;QAClB,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC;QAC1D,OAAO,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,MAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,MAAM;QACV,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;CAEF;AAxGD,gDAwGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetatmoAPI.d.ts","sourceRoot":"","sources":["../../src/util/NetatmoAPI.js"],"names":[],"mappings":"AAWA;IAUE,2CAIC;IAbD,UAAW;IACX,aAAc;IACd,kBAAmB;IACnB,kBAAmB;IACnB,mBAAoB;IACpB,oBAAgB;IAChB,mBAAoB;IACpB,oBAAqB;IAQrB,wBAEC;IAED,iCAaC;IAED,4BAQC;IAED,wCAWC;IAED,8BAgCC;IAID,wCAYC;IAED,wCAMC;IAED,iDAiBC;IAED,
|
|
1
|
+
{"version":3,"file":"NetatmoAPI.d.ts","sourceRoot":"","sources":["../../src/util/NetatmoAPI.js"],"names":[],"mappings":"AAWA;IAUE,2CAIC;IAbD,UAAW;IACX,aAAc;IACd,kBAAmB;IACnB,kBAAmB;IACnB,mBAAoB;IACpB,oBAAgB;IAChB,mBAAoB;IACpB,oBAAqB;IAQrB,wBAEC;IAED,iCAaC;IAED,4BAQC;IAED,wCAWC;IAED,8BAgCC;IAID,wCAYC;IAED,wCAMC;IAED,iDAiBC;IAED,qCAMC;IAKD,2CAaC;IAED,yCAMC;IAED,iCAyBC;CAEF"}
|
package/dist/util/NetatmoAPI.js
CHANGED
|
@@ -143,15 +143,6 @@ class NetatmoAPI {
|
|
|
143
143
|
const response = await this.client().get('/getevents?home_id=' + homeId);
|
|
144
144
|
const data = response.data.body.home;
|
|
145
145
|
const events = data.events;
|
|
146
|
-
// TEMP diagnostic: log recent event types so we can map vibration vs open/close.
|
|
147
|
-
// Remove once the event-type mapping is implemented.
|
|
148
|
-
const recent = (new Date().getTime() / 1000) - 120;
|
|
149
|
-
const sample = (events || [])
|
|
150
|
-
.filter((e) => e.time > recent)
|
|
151
|
-
.map((e) => ({ type: e.type, module_id: e.module_id, time: e.time }));
|
|
152
|
-
if (sample.length > 0) {
|
|
153
|
-
this.log.info('[event-types] ' + JSON.stringify(sample));
|
|
154
|
-
}
|
|
155
146
|
return events;
|
|
156
147
|
}
|
|
157
148
|
// The home structure (device list, names, types) is essentially static, so we
|
|
@@ -185,16 +176,20 @@ class NetatmoAPI {
|
|
|
185
176
|
const devices = [];
|
|
186
177
|
home.modules.map((moduleInfo) => {
|
|
187
178
|
const moduleStatus = status.modules.find((module) => moduleInfo.id === module.id);
|
|
188
|
-
const
|
|
189
|
-
const
|
|
190
|
-
|
|
179
|
+
const moduleEvents = events.filter((event) => moduleInfo.id === event.module_id);
|
|
180
|
+
const lastEventTime = (type) => {
|
|
181
|
+
const matching = moduleEvents.filter((event) => event.type === type);
|
|
182
|
+
return matching.length > 0 ? Math.max.apply(Math, matching.map((event) => event.time)) : 0;
|
|
183
|
+
};
|
|
191
184
|
const device = { ...moduleStatus,
|
|
192
185
|
name: moduleInfo.name,
|
|
193
186
|
category: moduleInfo.category,
|
|
194
187
|
setup_date: moduleInfo.setup_date,
|
|
195
188
|
room_id: moduleInfo.room_id,
|
|
196
189
|
home_id: home.id,
|
|
197
|
-
|
|
190
|
+
// tag_small_move = a light vibration/tap without opening (someone knocking);
|
|
191
|
+
// tag_big_move accompanies a normal open/close, so we don't surface it.
|
|
192
|
+
lastSmallMove: lastEventTime('tag_small_move'),
|
|
198
193
|
};
|
|
199
194
|
devices.push(device);
|
|
200
195
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetatmoAPI.js","sourceRoot":"","sources":["../../src/util/NetatmoAPI.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NetatmoAPI.js","sourceRoot":"","sources":["../../src/util/NetatmoAPI.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge Netatmo Security MK",
|
|
3
3
|
"name": "homebridge-netatmo-security-mk",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.4",
|
|
5
5
|
"description": "Extended HomeKit support for Netatmo Security products (door/window tags, siren). Fork of Anzure/homebridge-netatmo-security.",
|
|
6
6
|
"author": "maximekduval",
|
|
7
7
|
"license": "Apache-2.0",
|
|
@@ -39,13 +39,9 @@
|
|
|
39
39
|
],
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"axios": "^0.25.0",
|
|
42
|
-
"body-parser": "^1.20.1",
|
|
43
|
-
"express": "^4.18.2",
|
|
44
42
|
"form-data": "^4.0.0"
|
|
45
43
|
},
|
|
46
44
|
"devDependencies": {
|
|
47
|
-
"@types/body-parser": "^1.19.2",
|
|
48
|
-
"@types/express": "^4.17.14",
|
|
49
45
|
"@types/node": "^16.10.9",
|
|
50
46
|
"@typescript-eslint/eslint-plugin": "^5.0.0",
|
|
51
47
|
"@typescript-eslint/parser": "^5.0.0",
|
package/dist/util/LegacyAPI.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"LegacyAPI.d.ts","sourceRoot":"","sources":["../../src/util/LegacyAPI.js"],"names":[],"mappings":"AAGA,+EAqBC"}
|
package/dist/util/LegacyAPI.js
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
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
|
-
const axios_1 = __importDefault(require("axios"));
|
|
7
|
-
const querystring_1 = require("querystring");
|
|
8
|
-
function NetatmoAPI(config) {
|
|
9
|
-
if (axios_1.default.defaults.headers.common['Authorization'] === null || axios_1.default.defaults.headers.common['Authorization'] === undefined) {
|
|
10
|
-
const credentials = {
|
|
11
|
-
client_id: config.client_id,
|
|
12
|
-
client_secret: config.client_secret,
|
|
13
|
-
grant_type: 'password',
|
|
14
|
-
username: config.username,
|
|
15
|
-
password: config.password,
|
|
16
|
-
scope: 'read_camera write_camera',
|
|
17
|
-
};
|
|
18
|
-
const response = axios_1.default.post('https://api.netatmo.com/oauth2/token', (0, querystring_1.stringify)(credentials));
|
|
19
|
-
const token = response.data.access_token;
|
|
20
|
-
axios_1.default.defaults.headers.common['Authorization'] = `Bearer ${token}`;
|
|
21
|
-
}
|
|
22
|
-
return axios_1.default.create({
|
|
23
|
-
baseURL: 'https://api.netatmo.com/api/',
|
|
24
|
-
responseType: 'json',
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
exports.default = NetatmoAPI;
|
|
28
|
-
//# sourceMappingURL=LegacyAPI.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"LegacyAPI.js","sourceRoot":"","sources":["../../src/util/LegacyAPI.js"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,6CAAwC;AAExC,SAAwB,UAAU,CAAC,MAAM;IAEvC,IAAI,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,IAAI,IAAI,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC3H,MAAM,WAAW,GAAG;YAClB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,0BAA0B;SAClC,CAAC;QACF,MAAM,QAAQ,GAAG,eAAK,CAAC,IAAI,CAAC,sCAAsC,EAAE,IAAA,uBAAS,EAAC,WAAW,CAAC,CAAC,CAAC;QAC5F,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;QACzC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;KACpE;IAED,OAAO,eAAK,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,8BAA8B;QACvC,YAAY,EAAE,MAAM;KACrB,CAAC,CAAC;AAEL,CAAC;AArBD,6BAqBC"}
|
package/dist/util/Webhook.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=Webhook.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Webhook.d.ts","sourceRoot":"","sources":["../../src/util/Webhook.js"],"names":[],"mappings":""}
|
package/dist/util/Webhook.js
DELETED
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// todo
|
|
3
|
-
/*
|
|
4
|
-
|
|
5
|
-
import express from 'express';
|
|
6
|
-
import bodyParser from 'body-parser';
|
|
7
|
-
|
|
8
|
-
var app = express();
|
|
9
|
-
var port = 3000;
|
|
10
|
-
app.use(bodyParser.json());
|
|
11
|
-
|
|
12
|
-
app.get('/', (req, res) => {
|
|
13
|
-
var body = req.body;
|
|
14
|
-
res.json({
|
|
15
|
-
message: '',
|
|
16
|
-
});
|
|
17
|
-
});
|
|
18
|
-
|
|
19
|
-
var server = app.listen(port, () => {
|
|
20
|
-
var host = server.address().address;
|
|
21
|
-
var port = server.address().port;
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
*/
|
|
25
|
-
//# sourceMappingURL=Webhook.js.map
|
package/dist/util/Webhook.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Webhook.js","sourceRoot":"","sources":["../../src/util/Webhook.js"],"names":[],"mappings":";AAAA,OAAO;AAEP;;;;;;;;;;;;;;;;;;;;;EAqBE"}
|
package/dist/util/axios.d.ts
DELETED
package/dist/util/axios.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"axios.d.ts","sourceRoot":"","sources":["../../src/util/axios.js"],"names":[],"mappings":""}
|
package/dist/util/axios.js
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
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
|
-
const axios_1 = __importDefault(require("axios"));
|
|
7
|
-
exports.default = axios_1.default.create({
|
|
8
|
-
validateStatus: (status) => status < 500,
|
|
9
|
-
});
|
|
10
|
-
//# sourceMappingURL=axios.js.map
|
package/dist/util/axios.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../src/util/axios.js"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,kBAAe,eAAK,CAAC,MAAM,CAAC;IAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,GAAG;CACzC,CAAC,CAAC"}
|