homebridge-comelit-doorbell 2.0.2 → 2.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/CHANGELOG.md +21 -0
- package/README.md +2 -2
- package/dist/accessories/cameraAccessory.js.map +1 -0
- package/dist/accessories/doorbellAccessory.js +6 -2
- package/dist/accessories/doorbellAccessory.js.map +1 -0
- package/dist/accessories/lockAccessory.js +19 -6
- package/dist/accessories/lockAccessory.js.map +1 -0
- package/dist/auth.js.map +1 -0
- package/dist/call.d.ts +53 -0
- package/dist/call.js +149 -0
- package/dist/call.js.map +1 -0
- package/dist/channels.js +8 -5
- package/dist/channels.js.map +1 -0
- package/dist/client.js.map +1 -0
- package/dist/config.d.ts +38 -0
- package/dist/config.js +26 -0
- package/dist/config.js.map +1 -0
- package/dist/configReader.js.map +1 -0
- package/dist/ctp.d.ts +66 -0
- package/dist/ctp.js +77 -0
- package/dist/ctp.js.map +1 -0
- package/dist/ctpp.js.map +1 -0
- package/dist/door.js +26 -5
- package/dist/door.js.map +1 -0
- package/dist/index.js.map +1 -0
- package/dist/models.js.map +1 -0
- package/dist/platform.js +5 -1
- package/dist/platform.js.map +1 -0
- package/dist/protocol.js.map +1 -0
- package/dist/push.js.map +1 -0
- package/dist/settings.js.map +1 -0
- package/dist/vipListener.js +20 -2
- package/dist/vipListener.js.map +1 -0
- package/package.json +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,26 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2.0.4 (2026-11-07)
|
|
4
|
+
|
|
5
|
+
### Fixed
|
|
6
|
+
|
|
7
|
+
- Messages from the intercom could be lost. After the listener had waited a minute without anything arriving, the next message went to that expired wait and was dropped, and one more expired wait piled up for each further idle minute. A ring after a quiet period only got through if the intercom resent the INVITE often enough. This may also be why rings stopped arriving when the registration was refreshed less often.
|
|
8
|
+
|
|
9
|
+
## 2.0.3 (2026-11-07)
|
|
10
|
+
|
|
11
|
+
### Fixed
|
|
12
|
+
|
|
13
|
+
- Accessories were registered again on every reconnect after a fresh install. Homebridge rejected the duplicate, and the ring sensor stopped updating until the next restart. Each accessory is now registered once.
|
|
14
|
+
- Unlock reported success even when the intercom refused. The plugin now waits up to 10 s for the intercom's answer: the lock shows Unlocked only once the door actually opens, snaps back to Locked if refused, and the log gives the cause (for example `cause 8, busy`).
|
|
15
|
+
- Only an INVITE from the intercom counts as a ring. Other new connections no longer fire a ring or open the unlock window.
|
|
16
|
+
- Releases are no longer logged as `door_opened` events.
|
|
17
|
+
- The ring window now applies to Unlock only, not Lock.
|
|
18
|
+
- The doorbell trigger URL also works with `https`, with a 5 s timeout.
|
|
19
|
+
|
|
20
|
+
### Added
|
|
21
|
+
|
|
22
|
+
- Tests built from frames captured from a real intercom, run by CI and before each publish.
|
|
23
|
+
|
|
3
24
|
## 2.0.2 (2026-11-07)
|
|
4
25
|
|
|
5
26
|
- Documentation: the README covers every setting, the accessories the plugin creates, migration, the ring-to-open flow and troubleshooting.
|
package/README.md
CHANGED
|
@@ -86,7 +86,7 @@ HomeKit only sends a proper doorbell notification for a doorbell camera. You can
|
|
|
86
86
|
|
|
87
87
|
| Accessory | HomeKit type | Notes |
|
|
88
88
|
|---|---|---|
|
|
89
|
-
| One lock per door | Lock | Read from the intercom's door list, with the names set on the intercom. **Unlock** opens the door. The lock shows Unlocked for 3 seconds, then Locked again. |
|
|
89
|
+
| One lock per door | Lock | Read from the intercom's door list, with the names set on the intercom. **Unlock** opens the door. The lock shows Unlocked for 3 seconds once the intercom confirms, then Locked again. If the intercom refuses, it goes straight back to Locked and the log says why. |
|
|
90
90
|
| Doorbell (named after **Name**) | Motion sensor | Detected for 5 seconds on every ring. Use it in automations. |
|
|
91
91
|
| RTSP cameras listed on the intercom, if any | Motion sensor | Placeholder only: no video yet. Their RTSP URL is written to the log. |
|
|
92
92
|
|
|
@@ -163,7 +163,7 @@ The platform name stays `ComelitIntercom`, so your config block works unchanged,
|
|
|
163
163
|
|---|---|
|
|
164
164
|
| Rings stop reaching HomeKit after a few minutes | Use the default **Registration refresh interval** of 2 minutes. Check the log for `Registration renewed in place` or reconnects. |
|
|
165
165
|
| No rings at all, but the phones ring | Make sure `subaddress` is a user of its own, not shared with a phone, and that `registerPush` is off. On the intercom's Extender page, the Homebridge user should appear under **Registered slaves**. |
|
|
166
|
-
| Unlock shows as failed | Outside the ring window, this is expected (`Open refused` in the log). During a ring,
|
|
166
|
+
| Unlock shows as failed, or snaps back to Locked | Outside the ring window, this is expected (`Open refused` in the log). During a ring, the log shows `intercom refused (cause 8, busy…)`: see [answering the ring](#answering-the-ring-experimental). |
|
|
167
167
|
| `Doorbell camera trigger failed` in the log | camera-ffmpeg isn't reachable at the URL. Fix the URL, or set it to an empty string. |
|
|
168
168
|
| `Authentication failed` / `Token Not Found` | The token doesn't belong to an active user. Download a fresh backup and copy the token again. |
|
|
169
169
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cameraAccessory.js","sourceRoot":"","sources":["../../src/accessories/cameraAccessory.ts"],"names":[],"mappings":";;;AAIA;;;GAGG;AACH,MAAa,eAAe;IAGf;IAFX,YACE,QAAiC,EACxB,SAA4B,EACrC,MAAc;QADL,cAAS,GAAT,SAAS,CAAmB;QAGrC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QAC7C,SAAS;aACN,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACzC,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC;aACzD,iBAAiB,CAAC,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC;aACpD,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,MAAM,CAAC,EAAE,EAAE,CAAC;aAClE,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACtH,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAC5E,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,IAAI,eAAe,MAAM,CAAC,OAAO,kCAAkC,CAAC,CAAC;QAC3G,CAAC;IACH,CAAC;CACF;AAnBD,0CAmBC"}
|
|
@@ -45,8 +45,12 @@ class DoorbellAccessory {
|
|
|
45
45
|
global.__zmanLastRing = Date.now(); // zman: ring window
|
|
46
46
|
// zman: ring the HomeKit doorbell camera (homebridge-camera-ffmpeg, localhost-only)
|
|
47
47
|
try {
|
|
48
|
-
if (global.__zmanDoorbellUrl)
|
|
49
|
-
|
|
48
|
+
if (global.__zmanDoorbellUrl) { // zman: settings - http or https, 5 s timeout
|
|
49
|
+
const u = new URL(global.__zmanDoorbellUrl);
|
|
50
|
+
const req = require(u.protocol === 'https:' ? 'https' : 'http').get(u, { timeout: 5000 }, (res) => res.resume());
|
|
51
|
+
req.on('timeout', () => req.destroy(new Error('timed out after 5 s')));
|
|
52
|
+
req.on('error', (e) => this.platform.log.warn(`Doorbell camera trigger failed: ${e.message}`));
|
|
53
|
+
}
|
|
50
54
|
} catch (e) { this.platform.log.warn(`Doorbell camera trigger failed: ${e.message}`); }
|
|
51
55
|
this.sensorService.updateCharacteristic(this.platform.Characteristic.MotionDetected, true);
|
|
52
56
|
this.active = true;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doorbellAccessory.js","sourceRoot":"","sources":["../../src/accessories/doorbellAccessory.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,kDAA0B;AAI1B,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAC/B,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAEjC;;;;GAIG;AACH,MAAa,iBAAiB;IAMT;IACR;IANM,MAAM,CAAU;IACzB,MAAM,GAAG,KAAK,CAAC;IACf,QAAQ,CAAkB;IAElC,YACmB,QAAiC,EACzC,SAA4B;QADpB,aAAQ,GAAR,QAAQ,CAAyB;QACzC,cAAS,GAAT,SAAS,CAAmB;QAErC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QAC7C,SAAS;aACN,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACzC,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC;aACzD,iBAAiB,CAAC,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC;aACvD,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC9D,0CAA0C;QAC1C,KAAK,MAAM,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACxE,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,GAAG,EAAE,CAAC;gBACR,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAC9H,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxF,CAAC;IAED,WAAW;QACT,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACxC,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACpF,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC;IACpE,CAAC;IAEO,MAAM;QACZ,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACvF,CAAC;IAEO,WAAW;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QACtD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,CAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAClG,IAAI,CAAC;YACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YACvB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,CAAC,CAAC,cAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;YACpH,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,mBAAmB,kBAAkB,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;YAClG,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,CAAU,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;CACF;AAvDD,8CAuDC"}
|
|
@@ -39,7 +39,7 @@ class LockAccessory {
|
|
|
39
39
|
? Characteristic.LockTargetState.UNSECURED
|
|
40
40
|
: Characteristic.LockTargetState.SECURED)
|
|
41
41
|
.onSet((value) => {
|
|
42
|
-
{ const zw = global.__zmanRingWindowMs === undefined ? 90000 : global.__zmanRingWindowMs; // zman: ring window
|
|
42
|
+
if (value === Characteristic.LockTargetState.UNSECURED) { const zw = global.__zmanRingWindowMs === undefined ? 90000 : global.__zmanRingWindowMs; // zman: ring window
|
|
43
43
|
if (zw > 0 && Date.now() - (global.__zmanLastRing || 0) > zw) {
|
|
44
44
|
if (Date.now() - (global.__zmanRefusedLog || 0) > 5000) { global.__zmanRefusedLog = Date.now(); this.platform.log.warn(`Open refused: no ring in the last ${zw / 1000} s`); }
|
|
45
45
|
const zh = this.platform.api && this.platform.api.hap;
|
|
@@ -54,16 +54,29 @@ class LockAccessory {
|
|
|
54
54
|
const { Characteristic } = this.platform;
|
|
55
55
|
const SECURED = Characteristic.LockCurrentState.SECURED;
|
|
56
56
|
const UNSECURED = Characteristic.LockCurrentState.UNSECURED;
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
const relock = () => {
|
|
58
|
+
this.lockState = SECURED;
|
|
59
|
+
this.service.updateCharacteristic(Characteristic.LockCurrentState, SECURED);
|
|
60
|
+
this.service.updateCharacteristic(Characteristic.LockTargetState, Characteristic.LockTargetState.SECURED);
|
|
61
|
+
};
|
|
62
|
+
// Show Unlocked only once the intercom confirms; otherwise snap back to Locked.
|
|
59
63
|
try {
|
|
60
|
-
await this.platform.openDoor(this.door);
|
|
61
|
-
|
|
64
|
+
const result = await this.platform.openDoor(this.door);
|
|
65
|
+
if (result && result.confirmed === false) {
|
|
66
|
+
this.platform.log.warn(`Door '${this.door.name}': open sent, but the intercom did not confirm it`);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
this.platform.log.info(`Door '${this.door.name}' opened`);
|
|
70
|
+
}
|
|
62
71
|
}
|
|
63
72
|
catch (e) {
|
|
64
73
|
this.platform.log.error(`Door open failed: ${e.message}`);
|
|
74
|
+
relock();
|
|
75
|
+
return;
|
|
65
76
|
}
|
|
66
|
-
|
|
77
|
+
this.lockState = UNSECURED;
|
|
78
|
+
this.service.updateCharacteristic(Characteristic.LockCurrentState, UNSECURED);
|
|
79
|
+
// Back to Locked after 3 s
|
|
67
80
|
setTimeout(() => {
|
|
68
81
|
this.lockState = SECURED;
|
|
69
82
|
this.service.updateCharacteristic(Characteristic.LockCurrentState, SECURED);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lockAccessory.js","sourceRoot":"","sources":["../../src/accessories/lockAccessory.ts"],"names":[],"mappings":"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"}
|
package/dist/auth.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;;AAKA,oCAaC;AAlBD,yCAAyD;AAGzD,MAAa,mBAAoB,SAAQ,KAAK;CAAG;AAAjD,kDAAiD;AAE1C,KAAK,UAAU,YAAY,CAAC,MAAyB,EAAE,KAAa;IACzE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,sBAAW,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE;QAC9C,OAAO,EAAE,QAAQ;QACjB,YAAY,EAAE,KAAK;QACnB,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,yBAAc,CAAC,IAAI;KAClC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;QACjB,MAAM,MAAM,GAAI,QAAQ,CAAC,iBAAiB,CAAwB,IAAI,eAAe,CAAC;QACtF,MAAM,IAAI,mBAAmB,CAAC,0BAA0B,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;IACpF,CAAC;AACH,CAAC"}
|
package/dist/call.d.ts
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Experimental: taking part in an incoming call (a ring).
|
|
3
|
+
*
|
|
4
|
+
* While a ring is unanswered, the intercom refuses a door release from anyone who didn't
|
|
5
|
+
* answer it (RELEASE cause 8, busy). The Comelit app answers first and then opens inside
|
|
6
|
+
* the call. This module mirrors that, guided by the outgoing-call setup known from
|
|
7
|
+
* comelit-vip:
|
|
8
|
+
*
|
|
9
|
+
* intercom → INVITE (SYN) we → echo the INVITE
|
|
10
|
+
* intercom → CAPABILITIES we → our CAPABILITIES ("handshake": stop here)
|
|
11
|
+
* we → SETUP_ACK (answer), OPEN_DOOR inside the call, RELEASE (hang up)
|
|
12
|
+
*
|
|
13
|
+
* Every frame of a call is logged with the prefix `call:`.
|
|
14
|
+
*/
|
|
15
|
+
import type { Logging } from 'homebridge';
|
|
16
|
+
import { CtpFrame } from './ctp';
|
|
17
|
+
import type { Door, OpenResult } from './models';
|
|
18
|
+
export type AnswerMode = 'off' | 'handshake' | 'answer-on-open';
|
|
19
|
+
interface Call {
|
|
20
|
+
conn0: number;
|
|
21
|
+
conn1: number;
|
|
22
|
+
/** Our next sequence number on this connection. */
|
|
23
|
+
seq: number;
|
|
24
|
+
/** Their last sequence number + 1. */
|
|
25
|
+
ack: number;
|
|
26
|
+
peer: string;
|
|
27
|
+
born: number;
|
|
28
|
+
seen: Set<string>;
|
|
29
|
+
ended: boolean;
|
|
30
|
+
}
|
|
31
|
+
export declare class CallHandler {
|
|
32
|
+
private readonly mode;
|
|
33
|
+
private readonly ourAddress;
|
|
34
|
+
private readonly defaultPeer;
|
|
35
|
+
private readonly sendFrame;
|
|
36
|
+
private readonly log?;
|
|
37
|
+
private readonly calls;
|
|
38
|
+
private waiters;
|
|
39
|
+
constructor(mode: AnswerMode, ourAddress: string, defaultPeer: string, sendFrame: (frame: Buffer) => Promise<void>, log?: Logging | undefined);
|
|
40
|
+
get enabled(): boolean;
|
|
41
|
+
/** The most recent call still in progress, if any. */
|
|
42
|
+
activeCall(): Call | undefined;
|
|
43
|
+
onFrame(frame: CtpFrame, addresses: string[]): Promise<void>;
|
|
44
|
+
/**
|
|
45
|
+
* In `answer-on-open` mode with a call ringing: answer it, open `door` inside the call,
|
|
46
|
+
* then hang up. Returns null when there is nothing to answer, so the caller opens the
|
|
47
|
+
* normal way.
|
|
48
|
+
*/
|
|
49
|
+
openInCall(door: Door): Promise<OpenResult | null>;
|
|
50
|
+
private send;
|
|
51
|
+
private wait;
|
|
52
|
+
}
|
|
53
|
+
export {};
|
package/dist/call.js
ADDED
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CallHandler = void 0;
|
|
4
|
+
const ctp_1 = require("./ctp");
|
|
5
|
+
/** The capabilities the Comelit app sends. */
|
|
6
|
+
const APP_CAPABILITIES = Buffer.from('0003490027000000', 'hex');
|
|
7
|
+
const CALL_MAX_AGE_MS = 120_000;
|
|
8
|
+
const hex = (b) => b.toString('hex');
|
|
9
|
+
class CallHandler {
|
|
10
|
+
mode;
|
|
11
|
+
ourAddress;
|
|
12
|
+
defaultPeer;
|
|
13
|
+
sendFrame;
|
|
14
|
+
log;
|
|
15
|
+
calls = new Map();
|
|
16
|
+
waiters = [];
|
|
17
|
+
constructor(mode, ourAddress, defaultPeer, sendFrame, log) {
|
|
18
|
+
this.mode = mode;
|
|
19
|
+
this.ourAddress = ourAddress;
|
|
20
|
+
this.defaultPeer = defaultPeer;
|
|
21
|
+
this.sendFrame = sendFrame;
|
|
22
|
+
this.log = log;
|
|
23
|
+
}
|
|
24
|
+
get enabled() {
|
|
25
|
+
return this.mode !== 'off';
|
|
26
|
+
}
|
|
27
|
+
/** The most recent call still in progress, if any. */
|
|
28
|
+
activeCall() {
|
|
29
|
+
const now = Date.now();
|
|
30
|
+
for (const [key, call] of this.calls) {
|
|
31
|
+
if (call.ended || now - call.born > CALL_MAX_AGE_MS) {
|
|
32
|
+
this.calls.delete(key);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return [...this.calls.values()].pop();
|
|
36
|
+
}
|
|
37
|
+
async onFrame(frame, addresses) {
|
|
38
|
+
if (!this.enabled) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const key = (frame.conn1 << 8) | frame.conn0;
|
|
42
|
+
let call = this.calls.get(key);
|
|
43
|
+
if (!call && frame.flags === 192 /* Flag.SYN */ && frame.opcode === 1 /* Opcode.INVITE */) {
|
|
44
|
+
call = {
|
|
45
|
+
conn0: frame.conn0,
|
|
46
|
+
conn1: frame.conn1,
|
|
47
|
+
seq: frame.ack,
|
|
48
|
+
ack: (frame.seq + 1) & 0xff,
|
|
49
|
+
peer: addresses[0] ?? this.defaultPeer,
|
|
50
|
+
born: Date.now(),
|
|
51
|
+
seen: new Set(),
|
|
52
|
+
ended: false,
|
|
53
|
+
};
|
|
54
|
+
this.calls.set(key, call);
|
|
55
|
+
}
|
|
56
|
+
if (!call) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
this.log?.info(`call: rx flags=0x${frame.flags.toString(16)} seq=${frame.seq} ack=${frame.ack} op=0x${(frame.opcode & 0xffff).toString(16)} body=${hex(frame.body)}`);
|
|
60
|
+
if (frame.body.length > 0) {
|
|
61
|
+
call.ack = (frame.seq + 1) & 0xff;
|
|
62
|
+
}
|
|
63
|
+
for (const w of this.waiters.slice()) {
|
|
64
|
+
if (w.call === call && (w.opcode === frame.opcode || frame.opcode === 14 /* Opcode.RELEASE */)) {
|
|
65
|
+
this.waiters.splice(this.waiters.indexOf(w), 1);
|
|
66
|
+
w.resolve({ opcode: frame.opcode, body: frame.body });
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (frame.opcode === 14 /* Opcode.RELEASE */ || frame.flags & 32 /* Flag.FIN */) {
|
|
70
|
+
call.ended = true;
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const tag = `${frame.seq}:${frame.opcode}`;
|
|
74
|
+
if (call.seen.has(tag)) {
|
|
75
|
+
return; // retransmission
|
|
76
|
+
}
|
|
77
|
+
call.seen.add(tag);
|
|
78
|
+
if (frame.opcode === 1 /* Opcode.INVITE */) {
|
|
79
|
+
await this.send(call, 64 /* Flag.DATA */, Buffer.from(frame.body), 'invite echo');
|
|
80
|
+
}
|
|
81
|
+
else if (frame.opcode === 3 /* Opcode.CAPABILITIES */) {
|
|
82
|
+
await this.send(call, 64 /* Flag.DATA */, APP_CAPABILITIES, 'capabilities');
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* In `answer-on-open` mode with a call ringing: answer it, open `door` inside the call,
|
|
87
|
+
* then hang up. Returns null when there is nothing to answer, so the caller opens the
|
|
88
|
+
* normal way.
|
|
89
|
+
*/
|
|
90
|
+
async openInCall(door) {
|
|
91
|
+
if (this.mode !== 'answer-on-open') {
|
|
92
|
+
return null;
|
|
93
|
+
}
|
|
94
|
+
const call = this.activeCall();
|
|
95
|
+
if (!call) {
|
|
96
|
+
return null;
|
|
97
|
+
}
|
|
98
|
+
this.log?.info('call: answering the ring to open the door');
|
|
99
|
+
await this.send(call, 64 /* Flag.DATA */, Buffer.from('000c000000000000', 'hex'), 'answer 000c');
|
|
100
|
+
await this.wait(call, 12 /* Opcode.SETUP_ACK */, 1500);
|
|
101
|
+
const output = Number(door.outputIndex) || 1;
|
|
102
|
+
const openBody = Buffer.concat([Buffer.from([0x00, 0x2d]), (0, ctp_1.logicalAddress)(door.aptAddress), Buffer.from([output & 0xff])]);
|
|
103
|
+
await this.send(call, 64 /* Flag.DATA */, openBody, 'open in call');
|
|
104
|
+
const reply = await this.wait(call, 45 /* Opcode.OPEN_DOOR */, 4000);
|
|
105
|
+
this.log?.info(`call: open reply ${reply ? `op=0x${reply.opcode.toString(16)} body=${hex(reply.body)}` : 'none within 4 s'}`);
|
|
106
|
+
if (!call.ended) {
|
|
107
|
+
await new Promise((r) => setTimeout(r, 1500));
|
|
108
|
+
await this.send(call, 96 /* Flag.DATA_FIN */, Buffer.from([0x00, 0x0e, 0x00]), 'hang up 000e');
|
|
109
|
+
call.ended = true;
|
|
110
|
+
}
|
|
111
|
+
const released = reply && reply.opcode === 14 /* Opcode.RELEASE */ && reply.body.length >= 3;
|
|
112
|
+
if (released && reply.body[2] !== 0) {
|
|
113
|
+
throw new Error(`intercom refused the open in the call (cause ${reply.body[2]})`);
|
|
114
|
+
}
|
|
115
|
+
return { confirmed: Boolean(released && reply.body[2] === 0) };
|
|
116
|
+
}
|
|
117
|
+
async send(call, flags, body, what) {
|
|
118
|
+
const frame = (0, ctp_1.buildFrame)({
|
|
119
|
+
flags,
|
|
120
|
+
conn0: call.conn0 ^ 0x80,
|
|
121
|
+
conn1: call.conn1,
|
|
122
|
+
seq: call.seq,
|
|
123
|
+
ack: call.ack,
|
|
124
|
+
body,
|
|
125
|
+
source: this.ourAddress,
|
|
126
|
+
destination: call.peer,
|
|
127
|
+
});
|
|
128
|
+
if (flags & 64 /* Flag.DATA */) {
|
|
129
|
+
call.seq = (call.seq + 1) & 0xff;
|
|
130
|
+
}
|
|
131
|
+
this.log?.info(`call: tx ${what}: ${hex(frame.subarray(0, 8 + body.length))}`);
|
|
132
|
+
await this.sendFrame(frame);
|
|
133
|
+
}
|
|
134
|
+
wait(call, opcode, ms) {
|
|
135
|
+
return new Promise((resolve) => {
|
|
136
|
+
const waiter = { call, opcode, resolve };
|
|
137
|
+
this.waiters.push(waiter);
|
|
138
|
+
setTimeout(() => {
|
|
139
|
+
const i = this.waiters.indexOf(waiter);
|
|
140
|
+
if (i >= 0) {
|
|
141
|
+
this.waiters.splice(i, 1);
|
|
142
|
+
resolve(null);
|
|
143
|
+
}
|
|
144
|
+
}, ms);
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
exports.CallHandler = CallHandler;
|
|
149
|
+
//# sourceMappingURL=call.js.map
|
package/dist/call.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"call.js","sourceRoot":"","sources":["../src/call.ts"],"names":[],"mappings":";;;AAeA,+BAA2E;AAK3E,8CAA8C;AAC9C,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAChE,MAAM,eAAe,GAAG,OAAO,CAAC;AAqBhC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAE7C,MAAa,WAAW;IAKH;IACA;IACA;IACA;IACA;IARF,KAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IACzC,OAAO,GAAa,EAAE,CAAC;IAE/B,YACmB,IAAgB,EAChB,UAAkB,EAClB,WAAmB,EACnB,SAA2C,EAC3C,GAAa;QAJb,SAAI,GAAJ,IAAI,CAAY;QAChB,eAAU,GAAV,UAAU,CAAQ;QAClB,gBAAW,GAAX,WAAW,CAAQ;QACnB,cAAS,GAAT,SAAS,CAAkC;QAC3C,QAAG,GAAH,GAAG,CAAU;IAC7B,CAAC;IAEJ,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC;IAC7B,CAAC;IAED,sDAAsD;IACtD,UAAU;QACR,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACrC,IAAI,IAAI,CAAC,KAAK,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,eAAe,EAAE,CAAC;gBACpD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QACD,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAe,EAAE,SAAmB;QAChD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;QAC7C,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,uBAAa,IAAI,KAAK,CAAC,MAAM,0BAAkB,EAAE,CAAC;YACxE,IAAI,GAAG;gBACL,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI;gBAC3B,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,WAAW;gBACtC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;gBAChB,IAAI,EAAE,IAAI,GAAG,EAAE;gBACf,KAAK,EAAE,KAAK;aACb,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,IAAI,CACZ,oBAAoB,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,CAAC,GAAG,QAAQ,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CACtJ,CAAC;QACF,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;QACpC,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,4BAAmB,CAAC,EAAE,CAAC;gBACtF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAChD,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,4BAAmB,IAAI,KAAK,CAAC,KAAK,oBAAW,EAAE,CAAC;YAC9D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,iBAAiB;QAC3B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI,KAAK,CAAC,MAAM,0BAAkB,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,sBAAa,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC;QAC3E,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,gCAAwB,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,sBAAa,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,IAAU;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,sBAAa,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;QACxF,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,6BAAoB,IAAI,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,IAAA,oBAAc,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3H,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,sBAAa,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,6BAAoB,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,oBAAoB,KAAK,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC9H,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,0BAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YACtF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,IAAI,KAAK,CAAC,MAAM,4BAAmB,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QACpF,IAAI,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,gDAAgD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,IAAU,EAAE,KAAa,EAAE,IAAY,EAAE,IAAY;QACtE,MAAM,KAAK,GAAG,IAAA,gBAAU,EAAC;YACvB,KAAK;YACL,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,WAAW,EAAE,IAAI,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,IAAI,KAAK,qBAAY,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;QACnC,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/E,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEO,IAAI,CAAC,IAAU,EAAE,MAAc,EAAE,EAAU;QACjD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,MAAM,GAAW,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;YACjD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,UAAU,CAAC,GAAG,EAAE;gBACd,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACvC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC;YACH,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA7ID,kCA6IC"}
|
package/dist/channels.js
CHANGED
|
@@ -39,16 +39,19 @@ class AsyncQueue {
|
|
|
39
39
|
return Promise.resolve(this.items.shift());
|
|
40
40
|
}
|
|
41
41
|
return new Promise((resolve) => {
|
|
42
|
+
// Remove this exact waiter on timeout. Removing `resolve` (never in the list) left an
|
|
43
|
+
// expired waiter behind, and the next enqueued item went to it and was lost.
|
|
44
|
+
const waiter = (item) => {
|
|
45
|
+
clearTimeout(timer);
|
|
46
|
+
resolve(item);
|
|
47
|
+
};
|
|
42
48
|
const timer = setTimeout(() => {
|
|
43
|
-
const idx = this.waiters.indexOf(
|
|
49
|
+
const idx = this.waiters.indexOf(waiter);
|
|
44
50
|
if (idx >= 0)
|
|
45
51
|
this.waiters.splice(idx, 1);
|
|
46
52
|
resolve(null);
|
|
47
53
|
}, timeoutMs);
|
|
48
|
-
this.waiters.push(
|
|
49
|
-
clearTimeout(timer);
|
|
50
|
-
resolve(item);
|
|
51
|
-
});
|
|
54
|
+
this.waiters.push(waiter);
|
|
52
55
|
});
|
|
53
56
|
}
|
|
54
57
|
clear() {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channels.js","sourceRoot":"","sources":["../src/channels.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
ADDED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { PlatformConfig } from 'homebridge';
|
|
2
|
+
import type { AnswerMode } from './call';
|
|
3
|
+
/** The plugin's block in config.json (see config.schema.json). */
|
|
4
|
+
export interface ComelitPlatformConfig extends PlatformConfig {
|
|
5
|
+
host?: string;
|
|
6
|
+
port?: number;
|
|
7
|
+
token?: string;
|
|
8
|
+
subaddress?: number;
|
|
9
|
+
enableNotifications?: boolean;
|
|
10
|
+
reconnectDelay?: number;
|
|
11
|
+
leaseRefreshMode?: string;
|
|
12
|
+
leaseRefreshMinutes?: number;
|
|
13
|
+
leaseRecycleMinutes?: number;
|
|
14
|
+
ringWindowSeconds?: number | string | null;
|
|
15
|
+
doorbellTriggerUrl?: string;
|
|
16
|
+
registerPush?: boolean;
|
|
17
|
+
answerMode?: string;
|
|
18
|
+
}
|
|
19
|
+
export declare const DEFAULT_DOORBELL_TRIGGER_URL = "http://localhost:8089/doorbell?Doorbell";
|
|
20
|
+
/** Settings with defaults applied. */
|
|
21
|
+
export interface Settings {
|
|
22
|
+
host: string;
|
|
23
|
+
port: number;
|
|
24
|
+
token: string;
|
|
25
|
+
subaddress?: number;
|
|
26
|
+
enableNotifications: boolean;
|
|
27
|
+
reconnectDelayMs: number;
|
|
28
|
+
leaseMode: 'reconnect' | 'inplace';
|
|
29
|
+
leaseRefreshMs: number;
|
|
30
|
+
leaseRecycleMs: number;
|
|
31
|
+
/** 0 = unlocking allowed at any time. */
|
|
32
|
+
ringWindowMs: number;
|
|
33
|
+
/** Empty = no trigger. */
|
|
34
|
+
doorbellTriggerUrl: string;
|
|
35
|
+
registerPush: boolean;
|
|
36
|
+
answerMode: AnswerMode;
|
|
37
|
+
}
|
|
38
|
+
export declare function resolveSettings(c: ComelitPlatformConfig): Settings;
|
package/dist/config.js
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_DOORBELL_TRIGGER_URL = void 0;
|
|
4
|
+
exports.resolveSettings = resolveSettings;
|
|
5
|
+
const settings_1 = require("./settings");
|
|
6
|
+
exports.DEFAULT_DOORBELL_TRIGGER_URL = 'http://localhost:8089/doorbell?Doorbell';
|
|
7
|
+
const positive = (v, fallback) => (Number(v) > 0 ? Number(v) : fallback);
|
|
8
|
+
function resolveSettings(c) {
|
|
9
|
+
const ringWindow = c.ringWindowSeconds === undefined || c.ringWindowSeconds === null || c.ringWindowSeconds === '' ? 90 : Number(c.ringWindowSeconds);
|
|
10
|
+
return {
|
|
11
|
+
host: c.host ?? '',
|
|
12
|
+
port: c.port ?? settings_1.ICONA_BRIDGE_PORT,
|
|
13
|
+
token: c.token ?? '',
|
|
14
|
+
subaddress: Number.isInteger(c.subaddress) ? c.subaddress : undefined,
|
|
15
|
+
enableNotifications: c.enableNotifications ?? true,
|
|
16
|
+
reconnectDelayMs: (c.reconnectDelay ?? settings_1.DEFAULT_RECONNECT_DELAY_S) * 1000,
|
|
17
|
+
leaseMode: c.leaseRefreshMode === 'inplace' ? 'inplace' : 'reconnect',
|
|
18
|
+
leaseRefreshMs: positive(c.leaseRefreshMinutes, 2) * 60_000,
|
|
19
|
+
leaseRecycleMs: positive(c.leaseRecycleMinutes, 50) * 60_000,
|
|
20
|
+
ringWindowMs: Number.isFinite(ringWindow) && ringWindow > 0 ? ringWindow * 1000 : 0,
|
|
21
|
+
doorbellTriggerUrl: (c.doorbellTriggerUrl === undefined ? exports.DEFAULT_DOORBELL_TRIGGER_URL : String(c.doorbellTriggerUrl)).trim(),
|
|
22
|
+
registerPush: c.registerPush === true,
|
|
23
|
+
answerMode: c.answerMode === 'handshake' || c.answerMode === 'answer-on-open' ? c.answerMode : 'off',
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AA4CA,0CAiBC;AA3DD,yCAA0E;AAmB7D,QAAA,4BAA4B,GAAG,yCAAyC,CAAC;AAqBtF,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAE,QAAgB,EAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAElG,SAAgB,eAAe,CAAC,CAAwB;IACtD,MAAM,UAAU,GAAG,CAAC,CAAC,iBAAiB,KAAK,SAAS,IAAI,CAAC,CAAC,iBAAiB,KAAK,IAAI,IAAI,CAAC,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACtJ,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE;QAClB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,4BAAiB;QACjC,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;QACpB,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;QACrE,mBAAmB,EAAE,CAAC,CAAC,mBAAmB,IAAI,IAAI;QAClD,gBAAgB,EAAE,CAAC,CAAC,CAAC,cAAc,IAAI,oCAAyB,CAAC,GAAG,IAAI;QACxE,SAAS,EAAE,CAAC,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW;QACrE,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,GAAG,MAAM;QAC3D,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAAC,GAAG,MAAM;QAC5D,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACnF,kBAAkB,EAAE,CAAC,CAAC,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,oCAA4B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE;QAC7H,YAAY,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI;QACrC,UAAU,EAAE,CAAC,CAAC,UAAU,KAAK,WAAW,IAAI,CAAC,CAAC,UAAU,KAAK,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK;KACrG,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configReader.js","sourceRoot":"","sources":["../src/configReader.ts"],"names":[],"mappings":";;AAOA,0CAaC;AAMD,kCAyCC;AAnED,yCAAyD;AACzD,qCAA4D;AAMrD,KAAK,UAAU,eAAe,CAAC,MAAyB;IAC7D,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,sBAAW,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE;QAC9C,OAAO,EAAE,mBAAmB;QAC5B,YAAY,EAAE,KAAK;QACnB,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,yBAAc,CAAC,IAAI;KAClC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;QACjB,MAAM,IAAI,sBAAa,CAAC,gCAAgC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,IAAI,CAAC,CAAU;IACtB,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAW,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9C,CAAC;AAED,SAAgB,WAAW,CAAC,IAAiB;IAC3C,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAQ,CAAC;IACvC,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAQ,CAAC;IACzD,MAAM,MAAM,GAAiB;QAC3B,UAAU,EAAG,GAAG,CAAC,aAAa,CAAY,IAAI,EAAE;QAChD,aAAa,EAAG,GAAG,CAAC,gBAAgB,CAAY,IAAI,CAAC;QACrD,aAAa,EAAE,EAAE;QACjB,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,IAAI;KACV,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAC5D,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,aAAa,GAAI,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,CAAY,IAAI,EAAE,CAAC;IACvE,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAM,EAAE,KAAa,EAAE,UAAmB,EAAQ,EAAE,CAAC,CAAC;QAClE,EAAE,EAAG,CAAC,CAAC,IAAI,CAAY,IAAI,KAAK;QAChC,KAAK;QACL,IAAI,EAAG,CAAC,CAAC,MAAM,CAAY,IAAI,EAAE;QACjC,UAAU,EAAG,CAAC,CAAC,aAAa,CAAY,IAAI,EAAE;QAC9C,WAAW,EAAG,CAAC,CAAC,cAAc,CAAY,IAAI,CAAC;QAC/C,UAAU,EAAG,CAAC,CAAC,aAAa,CAAa,IAAI,KAAK;QAClD,UAAU;QACV,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,cAAc,CAAY,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACnE,CAAC,CAAC;IACH,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YAClB,EAAE,EAAG,CAAC,CAAC,IAAI,CAAY,IAAI,CAAC;YAC5B,IAAI,EAAG,CAAC,CAAC,MAAM,CAAY,IAAI,EAAE;YACjC,OAAO,EAAG,CAAC,CAAC,UAAU,CAAY,IAAI,EAAE;YACxC,QAAQ,EAAG,CAAC,CAAC,WAAW,CAAY,IAAI,EAAE;YAC1C,YAAY,EAAG,CAAC,CAAC,eAAe,CAAY,IAAI,EAAE;SACnD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/ctp.d.ts
ADDED
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CTP frames carried on the CTPP channel.
|
|
3
|
+
*
|
|
4
|
+
* [flags] [0x18] [conn0 conn1] [seq] [ack] [body length BE16] [body] [pad to 4]
|
|
5
|
+
* [0xFFFFFFFF] [source address, 10 bytes] [destination address, 10 bytes]
|
|
6
|
+
*
|
|
7
|
+
* flags: 0xC0 = new connection (SYN + data), 0x40 = data, 0x00 = ack, 0x20 = FIN, 0x60 = data + FIN.
|
|
8
|
+
* The peer of a connection uses the same id with the top bit of the first byte flipped.
|
|
9
|
+
* The body starts with a 16-bit opcode.
|
|
10
|
+
*
|
|
11
|
+
* Older code reads the first 6 bytes as a little-endian "prefix" (0x18 << 8 | flags) and
|
|
12
|
+
* "timestamp" (conn0, conn1, seq, ack); the helpers below work on either view.
|
|
13
|
+
*/
|
|
14
|
+
export declare const enum Flag {
|
|
15
|
+
ACK = 0,
|
|
16
|
+
FIN = 32,
|
|
17
|
+
DATA = 64,
|
|
18
|
+
DATA_FIN = 96,
|
|
19
|
+
SYN = 192
|
|
20
|
+
}
|
|
21
|
+
export declare const enum Opcode {
|
|
22
|
+
INVITE = 1,
|
|
23
|
+
CAPABILITIES = 3,
|
|
24
|
+
SETUP_ACK = 12,
|
|
25
|
+
RELEASE = 14,
|
|
26
|
+
MEDIA_REQUEST = 17,
|
|
27
|
+
OPEN_DOOR = 45,
|
|
28
|
+
REGISTER = 64,
|
|
29
|
+
REGISTER_RESPONSE = 65
|
|
30
|
+
}
|
|
31
|
+
/** Release cause the intercom sends when a call is ringing and the sender didn't answer it. */
|
|
32
|
+
export declare const CAUSE_BUSY = 8;
|
|
33
|
+
export interface CtpFrame {
|
|
34
|
+
flags: number;
|
|
35
|
+
conn0: number;
|
|
36
|
+
conn1: number;
|
|
37
|
+
seq: number;
|
|
38
|
+
ack: number;
|
|
39
|
+
body: Buffer;
|
|
40
|
+
/** First 16 bits of the body, or -1 for an empty frame. */
|
|
41
|
+
opcode: number;
|
|
42
|
+
}
|
|
43
|
+
export declare function parseFrame(raw: Buffer): CtpFrame | null;
|
|
44
|
+
/** A ViP address padded with zeros to 10 bytes, as used in the frame trailer. */
|
|
45
|
+
export declare function logicalAddress(address: string): Buffer;
|
|
46
|
+
export interface FrameOptions {
|
|
47
|
+
flags: number;
|
|
48
|
+
conn0: number;
|
|
49
|
+
conn1: number;
|
|
50
|
+
seq: number;
|
|
51
|
+
ack: number;
|
|
52
|
+
body: Buffer;
|
|
53
|
+
source: string;
|
|
54
|
+
destination: string;
|
|
55
|
+
}
|
|
56
|
+
export declare function buildFrame(o: FrameOptions): Buffer;
|
|
57
|
+
/**
|
|
58
|
+
* The 32-bit word to put in an ACK for a frame whose first bytes after the flags are `t`
|
|
59
|
+
* (little-endian conn0, conn1, seq, ack): flip the connection id, echo their ack as our
|
|
60
|
+
* sequence, and acknowledge their sequence + 1.
|
|
61
|
+
*/
|
|
62
|
+
export declare function ackWord(t: number): number;
|
|
63
|
+
/** Same as ackWord, but for answering a FIN with a FIN: their sequence is not advanced. */
|
|
64
|
+
export declare function finWord(t: number): number;
|
|
65
|
+
/** Key identifying a connection as seen from our side: the peer's id with the top bit flipped. */
|
|
66
|
+
export declare function peerKey(conn0: number, conn1: number): string;
|
package/dist/ctp.js
ADDED
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* CTP frames carried on the CTPP channel.
|
|
4
|
+
*
|
|
5
|
+
* [flags] [0x18] [conn0 conn1] [seq] [ack] [body length BE16] [body] [pad to 4]
|
|
6
|
+
* [0xFFFFFFFF] [source address, 10 bytes] [destination address, 10 bytes]
|
|
7
|
+
*
|
|
8
|
+
* flags: 0xC0 = new connection (SYN + data), 0x40 = data, 0x00 = ack, 0x20 = FIN, 0x60 = data + FIN.
|
|
9
|
+
* The peer of a connection uses the same id with the top bit of the first byte flipped.
|
|
10
|
+
* The body starts with a 16-bit opcode.
|
|
11
|
+
*
|
|
12
|
+
* Older code reads the first 6 bytes as a little-endian "prefix" (0x18 << 8 | flags) and
|
|
13
|
+
* "timestamp" (conn0, conn1, seq, ack); the helpers below work on either view.
|
|
14
|
+
*/
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.CAUSE_BUSY = void 0;
|
|
17
|
+
exports.parseFrame = parseFrame;
|
|
18
|
+
exports.logicalAddress = logicalAddress;
|
|
19
|
+
exports.buildFrame = buildFrame;
|
|
20
|
+
exports.ackWord = ackWord;
|
|
21
|
+
exports.finWord = finWord;
|
|
22
|
+
exports.peerKey = peerKey;
|
|
23
|
+
/** Release cause the intercom sends when a call is ringing and the sender didn't answer it. */
|
|
24
|
+
exports.CAUSE_BUSY = 8;
|
|
25
|
+
function parseFrame(raw) {
|
|
26
|
+
if (raw.length < 8 || raw[1] !== 0x18) {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
const len = raw.readUInt16BE(6);
|
|
30
|
+
const body = raw.subarray(8, Math.min(raw.length, 8 + len));
|
|
31
|
+
return {
|
|
32
|
+
flags: raw[0],
|
|
33
|
+
conn0: raw[2],
|
|
34
|
+
conn1: raw[3],
|
|
35
|
+
seq: raw[4],
|
|
36
|
+
ack: raw[5],
|
|
37
|
+
body,
|
|
38
|
+
opcode: body.length >= 2 ? body.readUInt16BE(0) : -1,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
/** A ViP address padded with zeros to 10 bytes, as used in the frame trailer. */
|
|
42
|
+
function logicalAddress(address) {
|
|
43
|
+
const b = Buffer.alloc(10);
|
|
44
|
+
Buffer.from(String(address), 'latin1').copy(b, 0, 0, 10);
|
|
45
|
+
return b;
|
|
46
|
+
}
|
|
47
|
+
function buildFrame(o) {
|
|
48
|
+
const head = Buffer.from([o.flags, 0x18, o.conn0, o.conn1, o.seq & 0xff, o.ack & 0xff, 0, 0]);
|
|
49
|
+
head.writeUInt16BE(o.body.length, 6);
|
|
50
|
+
const pad = Buffer.alloc((4 - ((8 + o.body.length) % 4)) % 4);
|
|
51
|
+
return Buffer.concat([head, o.body, pad, Buffer.from([0xff, 0xff, 0xff, 0xff]), logicalAddress(o.source), logicalAddress(o.destination)]);
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* The 32-bit word to put in an ACK for a frame whose first bytes after the flags are `t`
|
|
55
|
+
* (little-endian conn0, conn1, seq, ack): flip the connection id, echo their ack as our
|
|
56
|
+
* sequence, and acknowledge their sequence + 1.
|
|
57
|
+
*/
|
|
58
|
+
function ackWord(t) {
|
|
59
|
+
const c0 = (t & 0xff) ^ 0x80;
|
|
60
|
+
const c1 = (t >>> 8) & 0xff;
|
|
61
|
+
const s = (t >>> 16) & 0xff;
|
|
62
|
+
const a = (t >>> 24) & 0xff;
|
|
63
|
+
return (c0 | (c1 << 8) | (a << 16) | (((s + 1) & 0xff) << 24)) >>> 0;
|
|
64
|
+
}
|
|
65
|
+
/** Same as ackWord, but for answering a FIN with a FIN: their sequence is not advanced. */
|
|
66
|
+
function finWord(t) {
|
|
67
|
+
const c0 = (t & 0xff) ^ 0x80;
|
|
68
|
+
const c1 = (t >>> 8) & 0xff;
|
|
69
|
+
const s = (t >>> 16) & 0xff;
|
|
70
|
+
const a = (t >>> 24) & 0xff;
|
|
71
|
+
return (c0 | (c1 << 8) | (a << 16) | (s << 24)) >>> 0;
|
|
72
|
+
}
|
|
73
|
+
/** Key identifying a connection as seen from our side: the peer's id with the top bit flipped. */
|
|
74
|
+
function peerKey(conn0, conn1) {
|
|
75
|
+
return `${conn0 ^ 0x80}:${conn1}`;
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=ctp.js.map
|
package/dist/ctp.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ctp.js","sourceRoot":"","sources":["../src/ctp.ts"],"names":[],"mappings":"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"}
|
package/dist/ctpp.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ctpp.js","sourceRoot":"","sources":["../src/ctpp.ts"],"names":[],"mappings":";;AAeA,4CAkCC;AA9CD,+BAAgC;AAChC,yCAAmE;AAEnE,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEhC;;;;;;GAMG;AACI,KAAK,UAAU,gBAAgB,CACpC,MAAyB,EACzB,OAAgB,EAChB,OAAe,EACf,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,iBAAiB,GAAG,KAAK,EACzB,GAAa;IAEb,GAAG,EAAE,KAAK,CAAC,gCAAgC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC;IACrF,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,IAAA,yBAAc,EAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7E,qFAAqF;IACrF,sFAAsF;IACtF,UAAU;IACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,GAAG,EAAE,KAAK,CAAC,sBAAsB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAC7D,SAAS;QACX,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,GAAG,EAAE,KAAK,CAAC,sBAAsB,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,mBAAmB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACjH,IAAI,MAAM,KAAK,gBAAgB,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,IAAA,aAAO,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,GAAG,EAAE,KAAK,CAAC,4CAA4C,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,IAAA,gCAAqB,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC/E,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,IAAA,gCAAqB,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;YACzF,CAAC;YAAC,MAAM,CAAC;gBACP,GAAG,EAAE,IAAI,CAAC,yDAAyD,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/dist/door.js
CHANGED
|
@@ -8,6 +8,7 @@ const ctpp_1 = require("./ctpp");
|
|
|
8
8
|
const protocol_1 = require("./protocol");
|
|
9
9
|
const DOOR_CTPP_INIT_TIMEOUT_MS = 5_000;
|
|
10
10
|
const DOOR_RESPONSE_TIMEOUT_MS = 2_000;
|
|
11
|
+
const ZMAN_OPEN_REPLY_TIMEOUT_MS = 10_000;
|
|
11
12
|
class DoorOpenError extends Error {
|
|
12
13
|
}
|
|
13
14
|
exports.DoorOpenError = DoorOpenError;
|
|
@@ -22,7 +23,7 @@ async function openDoor(client, config, door) {
|
|
|
22
23
|
ctpp = await openCtppChannel(client, config);
|
|
23
24
|
}
|
|
24
25
|
try {
|
|
25
|
-
await openDoorOnChannel(client, ctpp, config.aptAddress, door, `${config.aptAddress}${config.aptSubaddress}`);
|
|
26
|
+
return await openDoorOnChannel(client, ctpp, config.aptAddress, door, `${config.aptAddress}${config.aptSubaddress}`);
|
|
26
27
|
}
|
|
27
28
|
catch (e) {
|
|
28
29
|
throw new DoorOpenError(`Failed to open door '${door.name}': ${e.message}`);
|
|
@@ -48,11 +49,11 @@ async function openCtppChannel(client, config) {
|
|
|
48
49
|
}
|
|
49
50
|
}
|
|
50
51
|
async function openDoorOnChannel(client, channel, aptAddr, door, ourAddr) {
|
|
51
|
-
|
|
52
|
+
const zr = global.__zmanCallOpen && await global.__zmanCallOpen(door); // zman: answer
|
|
53
|
+
if (zr) return zr;
|
|
52
54
|
// zman: open like comelit-vip - OP_OPEN_DOOR on a fresh connection, sent from our own address
|
|
53
55
|
if (!door.isActuator) {
|
|
54
|
-
await zmanOpenDoor(client, channel, ourAddr, door);
|
|
55
|
-
return;
|
|
56
|
+
return await zmanOpenDoor(client, channel, ourAddr, door);
|
|
56
57
|
}
|
|
57
58
|
// Phase B: Open + Confirm (regular doors only)
|
|
58
59
|
if (!door.isActuator) {
|
|
@@ -92,5 +93,25 @@ async function zmanOpenDoor(client, channel, ourAddr, door) {
|
|
|
92
93
|
head.writeUInt16BE(body.length, 6);
|
|
93
94
|
const pad = Buffer.alloc((4 - (body.length % 4)) % 4);
|
|
94
95
|
const pkt = Buffer.concat([head, body, pad, Buffer.from([0xff, 0xff, 0xff, 0xff]), la(ourAddr), la(door.aptAddress)]);
|
|
95
|
-
|
|
96
|
+
// Wait for the intercom's answer: RELEASE (0x000E) on the peer of our connection, cause 0 = opened.
|
|
97
|
+
// It can take several seconds (the intercom delays it while busy).
|
|
98
|
+
const key = `${head[2] ^ 0x80}:${head[3]}`;
|
|
99
|
+
const waiters = (global.__zmanOpenWaiters = global.__zmanOpenWaiters || new Map());
|
|
100
|
+
const reply = new Promise((resolve) => {
|
|
101
|
+
const t = setTimeout(() => { waiters.delete(key); resolve(null); }, ZMAN_OPEN_REPLY_TIMEOUT_MS);
|
|
102
|
+
waiters.set(key, (cause) => { clearTimeout(t); waiters.delete(key); resolve(cause); });
|
|
103
|
+
});
|
|
104
|
+
try {
|
|
105
|
+
await client.sendBinary(channel, pkt);
|
|
106
|
+
}
|
|
107
|
+
catch (e) {
|
|
108
|
+
waiters.get(key)?.(null);
|
|
109
|
+
throw e;
|
|
110
|
+
}
|
|
111
|
+
const cause = await reply;
|
|
112
|
+
if (cause === null)
|
|
113
|
+
return { confirmed: false };
|
|
114
|
+
if (cause !== 0)
|
|
115
|
+
throw new DoorOpenError(`intercom refused (cause ${cause}${cause === 8 ? ', busy: a call is ringing and was not answered' : ''})`);
|
|
116
|
+
return { confirmed: true };
|
|
96
117
|
}
|
package/dist/door.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"door.js","sourceRoot":"","sources":["../src/door.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,yCAAqD;AACrD,yCAAwD;AAExD,iBAAS,CAAC,GAAQ,EAAQ,EAAE;IAC1B,GAAG,CAAC,gBAAgB,CAAC,sBAAW,EAAE,wBAAa,EAAE,kCAAuB,CAAC,CAAC;AAC5E,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":""}
|
package/dist/platform.js
CHANGED
|
@@ -220,7 +220,7 @@ class ComelitIntercomPlatform {
|
|
|
220
220
|
if (!this.client || !this.config_) {
|
|
221
221
|
throw new Error('Not connected');
|
|
222
222
|
}
|
|
223
|
-
await (0, door_1.openDoor)(this.client, this.config_, door);
|
|
223
|
+
return await (0, door_1.openDoor)(this.client, this.config_, door);
|
|
224
224
|
}
|
|
225
225
|
// ─── Accessory discovery ──────────────────────────────────────────────────
|
|
226
226
|
discoverAccessories(config) {
|
|
@@ -239,6 +239,7 @@ class ComelitIntercomPlatform {
|
|
|
239
239
|
this.lockAccessories.set(uuid, lockAcc);
|
|
240
240
|
if (isNew) {
|
|
241
241
|
this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
242
|
+
this.cachedAccessories.push(accessory); // register once: later reconnects find it here
|
|
242
243
|
this.log.info(`Registered door: ${door.name}`);
|
|
243
244
|
}
|
|
244
245
|
else {
|
|
@@ -257,6 +258,7 @@ class ComelitIntercomPlatform {
|
|
|
257
258
|
this.doorbellAccessory = new doorbellAccessory_1.DoorbellAccessory(this, accessory);
|
|
258
259
|
if (isNew) {
|
|
259
260
|
this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
261
|
+
this.cachedAccessories.push(accessory); // register once: later reconnects find it here
|
|
260
262
|
this.log.info('Registered doorbell');
|
|
261
263
|
}
|
|
262
264
|
else {
|
|
@@ -277,6 +279,7 @@ class ComelitIntercomPlatform {
|
|
|
277
279
|
this.cameraAccessories.set(uuid, camAcc);
|
|
278
280
|
if (isNew) {
|
|
279
281
|
this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
282
|
+
this.cachedAccessories.push(accessory); // register once: later reconnects find it here
|
|
280
283
|
this.log.info(`Registered camera: ${camera.name}`);
|
|
281
284
|
}
|
|
282
285
|
else {
|
|
@@ -287,6 +290,7 @@ class ComelitIntercomPlatform {
|
|
|
287
290
|
const toRemove = this.cachedAccessories.filter((a) => staleUuids.has(a.UUID));
|
|
288
291
|
if (toRemove.length > 0) {
|
|
289
292
|
this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, toRemove);
|
|
293
|
+
this.cachedAccessories = this.cachedAccessories.filter((a) => !staleUuids.has(a.UUID));
|
|
290
294
|
this.log.info(`Removed ${toRemove.length} stale accessory/accessories`);
|
|
291
295
|
}
|
|
292
296
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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"}
|
package/dist/push.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../src/push.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":";;;AAAA,wGAAwG;AAC3F,QAAA,aAAa,GAAG,iBAAiB,CAAC;AAClC,QAAA,WAAW,GAAG,6BAA6B,CAAC;AACzD;;;GAGG;AACU,QAAA,SAAS,GAAG,6BAA6B,CAAC;AAE1C,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAC1B,QAAA,kBAAkB,GAAG,MAAM,CAAC;AAC5B,QAAA,eAAe,GAAG,MAAM,CAAC;AACzB,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC/B,QAAA,yBAAyB,GAAG,EAAE,CAAC"}
|
package/dist/vipListener.js
CHANGED
|
@@ -73,7 +73,9 @@ global.__zmanCallOpen = async (door) => {
|
|
|
73
73
|
const r = await zmanCall.wait(c, 0x002d, 4000);
|
|
74
74
|
vip.log?.info(`zman-call: open reply ${r ? `op=0x${r.op.toString(16)} body=${zmanCall.hex(r.body)}` : 'none within 4 s'}`);
|
|
75
75
|
if (!c.ended) { await new Promise((z) => setTimeout(z, 1500)); await zmanCall.send(vip, c, 0x60, Buffer.from([0x00, 0x0e, 0x00]), 'hang up 000e'); c.ended = true; }
|
|
76
|
-
|
|
76
|
+
if (r && r.op === 0x000e && r.body.length >= 3 && r.body[2] !== 0)
|
|
77
|
+
throw new Error(`intercom refused the open in the call (cause ${r.body[2]})`);
|
|
78
|
+
return { confirmed: !!(r && r.op === 0x000e && r.body[2] === 0) };
|
|
77
79
|
};
|
|
78
80
|
const MIN_MSG_SIZE = 8;
|
|
79
81
|
const DEDUP_WINDOW_MS = 10_000;
|
|
@@ -184,14 +186,30 @@ class VipEventListener {
|
|
|
184
186
|
if (global.__zmanAnswerMode && global.__zmanAnswerMode !== 'off') await zmanCall.onMsg(this, msg).catch((e) => this.log?.warn(`zman-call: ${e.message}`)); // zman: answer
|
|
185
187
|
if (isRetransmit && prefix === PREFIX_VIDEO_EVENT)
|
|
186
188
|
return;
|
|
189
|
+
// Answer to one of our door-open requests: RELEASE (0x000E) carrying the cause
|
|
190
|
+
if (msg.flags === 0x000e && msg.raw.length >= 11) {
|
|
191
|
+
const waiter = global.__zmanOpenWaiters?.get(`${msg.raw[2]}:${msg.raw[3]}`);
|
|
192
|
+
if (waiter) {
|
|
193
|
+
waiter(msg.raw[10]);
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
// A new call towards us: only an INVITE (opcode 0x0001) is a ring
|
|
187
198
|
if (prefix === PREFIX_CALL_INIT) {
|
|
188
|
-
|
|
199
|
+
if (msg.flags === 0x0001)
|
|
200
|
+
this._fireEvent('doorbell_ring', msg.addresses);
|
|
201
|
+
else
|
|
202
|
+
this.log?.debug(`VIP: new connection from the intercom, opcode 0x${(msg.flags ?? 0).toString(16)} (not a ring)`);
|
|
189
203
|
return;
|
|
190
204
|
}
|
|
191
205
|
if (prefix === PREFIX_VIP_EVENT && action !== 0) {
|
|
192
206
|
if (action === ACTION_IN_ALERTING) {
|
|
193
207
|
this._fireEvent('doorbell_ring', msg.addresses);
|
|
194
208
|
}
|
|
209
|
+
else if (action === ACTION_DOOR_OPENED && msg.flags === 0x000e) {
|
|
210
|
+
// 3-byte body 0x000E + cause: a call or request being released, not a door opening
|
|
211
|
+
this.log?.debug(`VIP: release, cause ${msg.raw[10]}`);
|
|
212
|
+
}
|
|
195
213
|
else if (action === ACTION_DOOR_OPENED) {
|
|
196
214
|
this._fireEvent('door_opened', msg.addresses);
|
|
197
215
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vipListener.js","sourceRoot":"","sources":["../src/vipListener.ts"],"names":[],"mappings":";;;AAkCA,4CA4BC;AAnDD,+BAAsE;AAEtE,yCAAmD;AAEnD,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAC3C,MAAM,eAAe,GAAG,MAAM,CAAC;AAa/B,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAgB;QACvB,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5B,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC/B,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5B,SAAS,EAAE,EAAE;QACb,GAAG,EAAE,IAAI;KACV,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QACtB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,uEAAuE;IACvE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QAChB,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM;YACR,CAAC;YACD,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5D,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAa,gBAAgB;IAUR;IACA;IACA;IACA;IACA;IAbX,OAAO,CAAW;IAClB,OAAO,GAAG,KAAK,CAAC;IAChB,WAAW,CAAiB;IACnB,SAAS,GAAG,IAAI,GAAG,EAA6B,CAAC;IACjD,QAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;IAChE,yGAAyG;IACxF,cAAc,GAAG,IAAI,GAAG,EAAmC,CAAC;IAE7E,YACmB,MAAyB,EACzB,MAAoB,EACpB,QAAwC,EACxC,GAAa,EACb,IAAkB;QAJlB,WAAM,GAAN,MAAM,CAAmB;QACzB,WAAM,GAAN,MAAM,CAAc;QACpB,aAAQ,GAAR,QAAQ,CAAgC;QACxC,QAAG,GAAH,GAAG,CAAU;QACb,SAAI,GAAJ,IAAI,CAAc;IAClC,CAAC;IAEJ,IAAY,UAAU;QACpB,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,6BAA8B,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACzH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC9C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC/B,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,KAAa,EAAE,KAAa,EAAE,SAAiB;QAC5D,MAAM,GAAG,GAAG,IAAA,aAAO,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAClC,IAAI,MAAM,GAA+B,GAAG,EAAE,CAAC,SAAS,CAAC;QACzD,MAAM,MAAM,GAAG,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;YACpD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;YACxD,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE;gBACb,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,OAAO,CAAC,CAAC,CAAC,CAAC;YACb,CAAC,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAQ,CAAC;QAC9B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM;YACR,CAAC;YACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,kCAAmC,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACzH,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY;QAC/B,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO;QACT,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,YAAY,GAAG,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,SAAS,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QAC/F,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,EAAE,KAAK,CACb,qBAAqB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,aAAa,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACjL,CAAC;QAEF,iDAAiD;QACjD,IAAI,MAAM,KAAK,gBAAgB,IAAI,MAAM,KAAK,2BAA2B,EAAE,CAAC;YAC1E,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAC/B,OAAO;QACT,CAAC;QACD,IAAI,MAAM,KAAK,gBAAgB,IAAI,MAAM,KAAK,kBAAkB,IAAI,MAAM,KAAK,gBAAgB,EAAE,CAAC;YAChG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;QACD,kEAAkE;QAClE,IAAI,MAAM,KAAK,gBAAgB,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC;QAED,MAAM,KAAK,GAAG,IAAA,gBAAU,EAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAU,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9G,CAAC;QAED,IAAI,YAAY,IAAI,MAAM,KAAK,kBAAkB,EAAE,CAAC;YAClD,OAAO;QACT,CAAC;QAED,2CAA2C;QAC3C,IAAI,GAAG,CAAC,MAAM,4BAAmB,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YACvD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAChE,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjB,OAAO;YACT,CAAC;QACH,CAAC;QAED,mDAAmD;QACnD,IAAI,MAAM,KAAK,gBAAgB,EAAE,CAAC;YAChC,IAAI,GAAG,CAAC,MAAM,0BAAkB,EAAE,CAAC;gBACjC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,mDAAmD,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;YACpH,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,MAAM,KAAK,gBAAgB,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YAChD,IAAI,MAAM,KAAK,kBAAkB,EAAE,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YACjD,CAAC;iBAAM,IAAI,MAAM,KAAK,kBAAkB,IAAI,GAAG,CAAC,MAAM,4BAAmB,EAAE,CAAC;gBAC1E,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,uBAAuB,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACrD,CAAC;iBAAM,IAAI,MAAM,KAAK,kBAAkB,EAAE,CAAC;gBACzC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,KAAK,CAAC,SAAS,CAAC,KAAa;QAC3B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,GAAgB,EAAE,GAAY;QACvD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QACD,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAChE,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,IAAA,aAAO,EAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,aAAO,EAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAA,gCAAqB,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAChI,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,kCAAmC,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAgB;QAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnC,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QACvC,MAAM,IAAI,GAAG,IAAA,aAAO,EAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,yBAAyB,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAW,IAAI,CAAC,UAAU,WAAW,OAAO,cAAc,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/I,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAA,gCAAqB,EAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAClG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAA,gCAAqB,EAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YAC1G,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,oCAAqC,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,SAA4B,EAAE,SAAmB;QACjE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,eAAe,EAAE,CAAC;YACjE,OAAO;QACT,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,SAAS,WAAW,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1E,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QAC9H,CAAC;QAAC,MAAM,CAAC;YACP,8CAA8C;QAChD,CAAC;IACH,CAAC;CACF;AA5LD,4CA4LC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "homebridge-comelit-doorbell",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.4",
|
|
4
4
|
"description": "Homebridge plugin for Comelit ViP intercoms (6701W/6741W Mini): doorbell notifications, door release and an experimental answer, fully local",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -33,7 +33,8 @@
|
|
|
33
33
|
"6741W"
|
|
34
34
|
],
|
|
35
35
|
"scripts": {
|
|
36
|
-
"check": "for f in dist/*.js dist/accessories/*.js; do node --check \"$f\" || exit 1; done"
|
|
36
|
+
"check": "for f in dist/*.js dist/accessories/*.js; do node --check \"$f\" || exit 1; done",
|
|
37
|
+
"test": "node test/frames.test.js && node test/platform.test.js"
|
|
37
38
|
},
|
|
38
39
|
"engines": {
|
|
39
40
|
"homebridge": ">=2.0.0-beta.0",
|