@brandonarrindell/homebridge-envisalink 2.0.0 → 2.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -0
- package/RELEASE_NOTES.md +65 -0
- package/config.schema.json +10 -3
- package/dist/configTypes.d.ts +4 -4
- package/dist/configTypes.d.ts.map +1 -1
- package/dist/customCommandAccessory.d.ts.map +1 -1
- package/dist/customCommandAccessory.js +3 -1
- package/dist/customCommandAccessory.js.map +1 -1
- package/dist/names.d.ts +5 -0
- package/dist/names.d.ts.map +1 -0
- package/dist/names.js +45 -0
- package/dist/names.js.map +1 -0
- package/dist/panicAccessory.d.ts +1 -1
- package/dist/panicAccessory.d.ts.map +1 -1
- package/dist/panicAccessory.js +5 -1
- package/dist/panicAccessory.js.map +1 -1
- package/dist/partitionAccessory.d.ts.map +1 -1
- package/dist/partitionAccessory.js +7 -5
- package/dist/partitionAccessory.js.map +1 -1
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +27 -10
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +1 -1
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +1 -1
- package/dist/settings.js.map +1 -1
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +3 -2
- package/dist/util.js.map +1 -1
- package/dist/zoneAccessory.d.ts.map +1 -1
- package/dist/zoneAccessory.js +6 -4
- package/dist/zoneAccessory.js.map +1 -1
- package/docs/testing.md +31 -2
- package/package.json +1 -1
- package/src/configTypes.ts +4 -4
- package/src/customCommandAccessory.ts +3 -1
- package/src/names.ts +42 -0
- package/src/panicAccessory.ts +6 -2
- package/src/partitionAccessory.ts +7 -5
- package/src/platform.ts +27 -10
- package/src/settings.ts +1 -1
- package/src/util.ts +3 -2
- package/src/zoneAccessory.ts +6 -4
- package/test/e2e/dsc-simulator.cjs +2 -0
- package/test/e2e/homebridge.test.cjs +375 -15
- package/test/names.spec.ts +70 -0
- package/test/settings.spec.ts +7 -0
package/README.md
CHANGED
|
@@ -15,6 +15,10 @@ This Homebridge plugin integrates your Envisalink security system with HomeKit,
|
|
|
15
15
|
|
|
16
16
|
This fork continues from version 1.2.10 of the original plugin:
|
|
17
17
|
|
|
18
|
+
- v2.0.2 (2026-09-30) - Fix scoped plugin registration and verify legacy cache
|
|
19
|
+
migration. Thanks to Marc Kagan for [PR #75](https://github.com/brandonarrindell/homebridge-envisalink/pull/75).
|
|
20
|
+
- v2.0.1 (2026-09-30) - Missing-name fallbacks, valid HomeKit names and cached
|
|
21
|
+
accessory-name repairs. See [upgrade and release notes](RELEASE_NOTES.md).
|
|
18
22
|
- v2.0.0 (2026-09-30) - Node.js 22/24 support, custom-command cache cleanup,
|
|
19
23
|
dependency refresh, and simulated end-to-end tests. **Breaking runtime change:**
|
|
20
24
|
see [migration and release notes](RELEASE_NOTES.md).
|
|
@@ -59,6 +63,7 @@ Add to your Homebridge config.json:
|
|
|
59
63
|
"platforms": [
|
|
60
64
|
{
|
|
61
65
|
"platform": "Envisalink",
|
|
66
|
+
"name": "Envisalink",
|
|
62
67
|
"enableAutoDiscovery": true,
|
|
63
68
|
"host": "192.168.0.XXX", // Optional if enableAutoDiscovery is true
|
|
64
69
|
"deviceType": "DSC",
|
|
@@ -106,6 +111,7 @@ Add to your Homebridge config.json:
|
|
|
106
111
|
|
|
107
112
|
| Option | Type | Default | Description |
|
|
108
113
|
|--------|------|---------|-------------|
|
|
114
|
+
| name | string | "Envisalink" | Platform display name; set explicitly for a child bridge |
|
|
109
115
|
| enableAutoDiscovery | boolean | true | Automatically discover Envisalink devices |
|
|
110
116
|
| host | string | - | IP address of Envisalink (optional with auto-discovery) |
|
|
111
117
|
| deviceType | string | "DSC" | Panel type ("DSC" or "Honeywell") |
|
|
@@ -116,6 +122,37 @@ Add to your Homebridge config.json:
|
|
|
116
122
|
|
|
117
123
|
See [config.schema.json](./config.schema.json) for full configuration options.
|
|
118
124
|
|
|
125
|
+
### Display names and upgrading existing caches
|
|
126
|
+
|
|
127
|
+
Missing or blank partition names use numbered defaults (`Partition 1`,
|
|
128
|
+
`Partition 2`, etc.). Zone defaults use the actual zone number, including sparse
|
|
129
|
+
zones. Panic switches and custom commands also receive usable defaults. Names
|
|
130
|
+
are trimmed, unsupported symbols (such as emoji and `@`) become spaces, and names
|
|
131
|
+
are limited to 64 characters. Unicode letters and numbers, apostrophes and the
|
|
132
|
+
interior punctuation supported by current HAP-NodeJS are preserved. Only display
|
|
133
|
+
names change; partition/zone UUIDs, command-derived identities, service subtypes,
|
|
134
|
+
PINs and panel command strings keep their existing behavior.
|
|
135
|
+
|
|
136
|
+
For a child bridge, set the platform's `"name": "Envisalink"` explicitly in
|
|
137
|
+
Homebridge's configuration UI or JSON. An existing `"_bridge": { "name":
|
|
138
|
+
"Envisalink", ... }` overrides the platform display name. Replace an invalid
|
|
139
|
+
explicit `_bridge.name` too. Homebridge chooses this name **before** constructing
|
|
140
|
+
the plugin; the plugin's runtime fallback cannot repair that bridge itself.
|
|
141
|
+
Keep the existing `_bridge.username` and other bridge settings when renaming it.
|
|
142
|
+
The npm identifier remains `@brandonarrindell/homebridge-envisalink`; use a display
|
|
143
|
+
name rather than changing the package or platform identifier.
|
|
144
|
+
|
|
145
|
+
On the first startup with an old invalid cache, Homebridge 2 can warn while
|
|
146
|
+
loading that cache before the plugin receives its accessories. The plugin updates
|
|
147
|
+
the restored accessory, Accessory Information, sensor, security, chime, bypass,
|
|
148
|
+
panic and custom-command names and saves them in place. Cached names are also
|
|
149
|
+
normalized before DSC status arrives, including inactive controls. Active
|
|
150
|
+
accessories receive their configured names after DSC initialization.
|
|
151
|
+
After a normal restart, the repaired cache should load without those
|
|
152
|
+
naming warnings. UUIDs and HomeKit AIDs remain stable; deleting the cache or
|
|
153
|
+
unpairing the bridge is unnecessary. This does not test Apple Home's own cached
|
|
154
|
+
labels or pairing behavior.
|
|
155
|
+
|
|
119
156
|
## Auto-Discovery
|
|
120
157
|
|
|
121
158
|
The auto-discovery feature scans your network for Envisalink devices:
|
package/RELEASE_NOTES.md
CHANGED
|
@@ -1,3 +1,68 @@
|
|
|
1
|
+
# 2.0.2 — 2026-09-30
|
|
2
|
+
|
|
3
|
+
## Fixed
|
|
4
|
+
|
|
5
|
+
- Register accessories under `@brandonarrindell/homebridge-envisalink`, matching
|
|
6
|
+
the installed package name and preventing Homebridge's "no loaded plugin"
|
|
7
|
+
registration warning. Thanks to Marc Kagan for contributing
|
|
8
|
+
[PR #75](https://github.com/brandonarrindell/homebridge-envisalink/pull/75).
|
|
9
|
+
|
|
10
|
+
## Upgrading and verification
|
|
11
|
+
|
|
12
|
+
Keep the existing accessory cache, bridge username and panel settings.
|
|
13
|
+
Homebridge migrates legacy unscoped plugin associations through the active
|
|
14
|
+
Envisalink platform; regression tests verify unchanged accessory UUIDs and
|
|
15
|
+
HomeKit AIDs/IIDs, working restored controls, and persisted migration across
|
|
16
|
+
restarts. No cache deletion or re-pairing is required in the tested scenarios.
|
|
17
|
+
|
|
18
|
+
Real Homebridge-process, simulated DSC TCP panel and HAP HTTP tests cover fresh
|
|
19
|
+
scoped registrations, legacy cache migration, custom-command add/remove/restart,
|
|
20
|
+
and main/child bridges across Homebridge 1.6.0, 1.11.4 and 2.4.0 on supported Node
|
|
21
|
+
22/24 runtimes. All 41 active unit tests and 8 E2E scenarios pass. Physical alarm
|
|
22
|
+
hardware and Apple Home pairing remain outside the simulated test scope.
|
|
23
|
+
See [testing documentation](docs/testing.md) for details.
|
|
24
|
+
|
|
25
|
+
The Node.js 22/24 requirement introduced in 2.0.0 is unchanged.
|
|
26
|
+
|
|
27
|
+
# 2.0.1 — 2026-09-30
|
|
28
|
+
|
|
29
|
+
## Fixed
|
|
30
|
+
|
|
31
|
+
- Publish partitions with numbered fallback names when their configured names
|
|
32
|
+
are missing, empty or whitespace (issue #45)
|
|
33
|
+
- Normalize accessory and service names using current HAP Unicode and
|
|
34
|
+
punctuation rules, including trailing-space names such as `Smoke detector `
|
|
35
|
+
(issue #74)
|
|
36
|
+
- Repair restored accessory, Accessory Information, service and existing
|
|
37
|
+
ConfiguredName values while preserving UUIDs, HomeKit AIDs and panel commands
|
|
38
|
+
- Apply the platform-name fallback and expose its supported configuration field
|
|
39
|
+
- Persist repaired names on the Homebridge 1.6 compatibility floor as well as
|
|
40
|
+
current Homebridge 1 and 2 releases
|
|
41
|
+
|
|
42
|
+
## Upgrading
|
|
43
|
+
|
|
44
|
+
Set a valid platform `name`, such as `"name": "Envisalink"`, or an explicit
|
|
45
|
+
`_bridge.name` when using a child bridge. Homebridge selects the child-bridge name
|
|
46
|
+
before constructing the plugin, so the plugin's runtime fallback cannot repair
|
|
47
|
+
the preselected scoped-package default. Keep the existing bridge username,
|
|
48
|
+
settings and accessory cache to preserve HomeKit identity.
|
|
49
|
+
|
|
50
|
+
Homebridge may emit invalid-name warnings while deserializing an old cache before
|
|
51
|
+
plugin callbacks run. The plugin repairs and saves those names; the next restart
|
|
52
|
+
uses the repaired cache. Apple Home's own cached labels and pairing UI are outside
|
|
53
|
+
the simulated tests.
|
|
54
|
+
|
|
55
|
+
The Node.js 22/24 requirement introduced in 2.0.0 is unchanged.
|
|
56
|
+
|
|
57
|
+
## Verification
|
|
58
|
+
|
|
59
|
+
Real Homebridge-process, simulated DSC TCP panel and HAP HTTP tests cover absent
|
|
60
|
+
and malformed names, legacy cache upgrades, main and child bridges, actual
|
|
61
|
+
restarts, stable identities and restored controls across every accessory type.
|
|
62
|
+
They include the production 60-second reconnect delay and the Homebridge 1.6 /
|
|
63
|
+
Node 22.0.0 compatibility floor. Test-port selection uses Node's uniform
|
|
64
|
+
`crypto.randomInt` API. See [testing documentation](docs/testing.md) for scope.
|
|
65
|
+
|
|
1
66
|
# 2.0.0 — 2026-09-30
|
|
2
67
|
|
|
3
68
|
## Breaking change: Node.js 22 or 24 required
|
package/config.schema.json
CHANGED
|
@@ -4,6 +4,13 @@
|
|
|
4
4
|
"schema": {
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
|
+
"name": {
|
|
8
|
+
"title": "Platform Name",
|
|
9
|
+
"type": "string",
|
|
10
|
+
"required": false,
|
|
11
|
+
"default": "Envisalink",
|
|
12
|
+
"description": "Display name for this platform and its default child bridge. Set Envisalink explicitly when using a child bridge; Homebridge chooses the bridge name before loading the plugin."
|
|
13
|
+
},
|
|
7
14
|
"host": {
|
|
8
15
|
"title": "Host/IP Address",
|
|
9
16
|
"type": "string",
|
|
@@ -125,8 +132,8 @@
|
|
|
125
132
|
"name": {
|
|
126
133
|
"title": "Name",
|
|
127
134
|
"type": "string",
|
|
128
|
-
"description": "Distinguish between partitions
|
|
129
|
-
"required":
|
|
135
|
+
"description": "Distinguish between partitions (e.g. Upstairs/Downstairs). Missing, empty or unusable names default to Partition 1, Partition 2, etc.",
|
|
136
|
+
"required": false
|
|
130
137
|
},
|
|
131
138
|
"enableChimeSwitch": {
|
|
132
139
|
"title": "Enable Chime Switch",
|
|
@@ -237,4 +244,4 @@
|
|
|
237
244
|
}
|
|
238
245
|
}
|
|
239
246
|
}
|
|
240
|
-
}
|
|
247
|
+
}
|
package/dist/configTypes.d.ts
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import { PlatformConfig } from 'homebridge';
|
|
2
2
|
import { ZoneType } from './types';
|
|
3
3
|
export type PartitionConfig = {
|
|
4
|
-
name
|
|
4
|
+
name?: string;
|
|
5
5
|
enableChimeSwitch?: boolean;
|
|
6
6
|
pin?: string;
|
|
7
7
|
};
|
|
8
8
|
export type ZoneConfig = {
|
|
9
|
-
name
|
|
9
|
+
name?: string;
|
|
10
10
|
partition: number;
|
|
11
11
|
zoneNumber: number;
|
|
12
12
|
type: ZoneType;
|
|
13
13
|
};
|
|
14
14
|
export type PanicConfig = {
|
|
15
15
|
enabled: boolean;
|
|
16
|
-
name
|
|
16
|
+
name?: string;
|
|
17
17
|
};
|
|
18
18
|
export type CustomCommandConfig = {
|
|
19
|
-
name
|
|
19
|
+
name?: string;
|
|
20
20
|
command: string;
|
|
21
21
|
};
|
|
22
22
|
export type EnvisalinkConfig = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../src/configTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAEjC,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../src/configTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAEjC,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,uBAAuB,EAAE,OAAO,CAAC;IACjC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,WAAW,CAAC;IAC5B,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAC3C,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IACjC,cAAc,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;IACnD,oBAAoB,EAAE,OAAO,CAAC;CACjC,GAAG,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customCommandAccessory.d.ts","sourceRoot":"","sources":["../src/customCommandAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAU,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAC,4BAA4B,EAAC,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"customCommandAccessory.d.ts","sourceRoot":"","sources":["../src/customCommandAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAU,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAC,4BAA4B,EAAC,MAAM,YAAY,CAAC;AAIxD;;;;GAIG;AACH,qBAAa,gCAAgC;IAIrC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAGb,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB,EAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM;IAmB9B,aAAa,CAAC,KAAK,EAAE,mBAAmB;CAkBjD"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EnvisalinkCustomCommandAccessory = void 0;
|
|
4
4
|
const constants_1 = require("./constants");
|
|
5
|
+
const names_1 = require("./names");
|
|
5
6
|
/**
|
|
6
7
|
* Platform Accessory
|
|
7
8
|
* An instance of this class is created for each accessory your platform registers
|
|
@@ -13,6 +14,7 @@ class EnvisalinkCustomCommandAccessory {
|
|
|
13
14
|
this.accessory = accessory;
|
|
14
15
|
this.name = name;
|
|
15
16
|
this.command = command;
|
|
17
|
+
(0, names_1.updateAccessoryName)(this.accessory, this.name, this.platform.Characteristic);
|
|
16
18
|
const infoService = this.accessory.getService(this.platform.Service.AccessoryInformation);
|
|
17
19
|
if (infoService) {
|
|
18
20
|
infoService.setCharacteristic(this.platform.Characteristic.Name, this.name)
|
|
@@ -22,7 +24,7 @@ class EnvisalinkCustomCommandAccessory {
|
|
|
22
24
|
}
|
|
23
25
|
this.service = this.accessory.getService(this.platform.Service.Switch) ||
|
|
24
26
|
this.accessory.addService(this.platform.Service.Switch, this.name);
|
|
25
|
-
this.service.
|
|
27
|
+
(0, names_1.updateServiceName)(this.service, this.name, this.platform.Characteristic);
|
|
26
28
|
this.service.getCharacteristic(this.platform.Characteristic.On)
|
|
27
29
|
.onSet(this.invokeCommand.bind(this));
|
|
28
30
|
this.service.updateCharacteristic(this.platform.Characteristic.On, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customCommandAccessory.js","sourceRoot":"","sources":["../src/customCommandAccessory.ts"],"names":[],"mappings":";;;AAGA,2CAAgD;
|
|
1
|
+
{"version":3,"file":"customCommandAccessory.js","sourceRoot":"","sources":["../src/customCommandAccessory.ts"],"names":[],"mappings":";;;AAGA,2CAAgD;AAChD,mCAA+D;AAE/D;;;;GAIG;AACH,MAAa,gCAAgC;IAGzC,YACqB,QAAsC,EACtC,SAA4B,EAC5B,IAAY,EACZ,OAAe;QAHf,aAAQ,GAAR,QAAQ,CAA8B;QACtC,cAAS,GAAT,SAAS,CAAmB;QAC5B,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAQ;QAEhC,IAAA,2BAAmB,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC1F,IAAI,WAAW,EAAE,CAAC;YACd,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;iBACtE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,wBAAY,CAAC;iBAC1E,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,iBAAK,CAAC;iBAC5D,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/E,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YAClE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACvE,IAAA,yBAAiB,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAC1D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAC7D,KAAK,CAAC,CAAC;IACf,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA0B;QAC1C,IAAI,CAAC;YACD,IAAI,KAAgB,EAAE,CAAC;gBACnB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;gBACpE,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;YACvE,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACrE,CAAC;gBAAS,CAAC;YACP,gDAAgD;YAChD,UAAU,CAAC,GAAG,EAAE;gBACZ,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC9E,CAAC,EAAE,IAAI,CAAC,CAAC;QACb,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AA5CD,4EA4CC"}
|
package/dist/names.d.ts
ADDED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Characteristic, PlatformAccessory, Service } from 'homebridge';
|
|
2
|
+
export declare function normalizeName(value: unknown, fallback: string): string;
|
|
3
|
+
export declare function updateServiceName(service: Service, name: string, characteristic: typeof Characteristic): void;
|
|
4
|
+
export declare function updateAccessoryName(accessory: PlatformAccessory, name: string, characteristic: typeof Characteristic): void;
|
|
5
|
+
//# sourceMappingURL=names.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"names.d.ts","sourceRoot":"","sources":["../src/names.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,iBAAiB,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAItE,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAStE;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,cAAc,GAAG,IAAI,CAM7G;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,cAAc,GAAG,IAAI,CAkB3H"}
|
package/dist/names.js
ADDED
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeName = normalizeName;
|
|
4
|
+
exports.updateServiceName = updateServiceName;
|
|
5
|
+
exports.updateAccessoryName = updateAccessoryName;
|
|
6
|
+
// Match the Unicode letters/numbers and interior punctuation accepted by current
|
|
7
|
+
// HAP-NodeJS. Never apply this to plugin identifiers, UUID seeds or panel commands.
|
|
8
|
+
function normalizeName(value, fallback) {
|
|
9
|
+
const name = (typeof value === 'string' ? value : '').normalize('NFC')
|
|
10
|
+
.replace(/[^\p{L}\p{N}\p{Zs}\u2019'&!._:;()/,-]+/gu, ' ')
|
|
11
|
+
.replace(/\p{Zs}+/gu, ' ')
|
|
12
|
+
.slice(0, 64)
|
|
13
|
+
.replace(/^[^\p{L}\p{N}]+|[^\p{L}\p{N}]+$/gu, '');
|
|
14
|
+
// HAP's current validator also requires at least two letters/numbers at the
|
|
15
|
+
// edges (a single-character name does not match its expression).
|
|
16
|
+
return /^[\p{L}\p{N}][\p{L}\p{N}\p{Zs}\u2019'&!._:;()/,-]*[\p{L}\p{N}]$/u.test(name) ? name : fallback;
|
|
17
|
+
}
|
|
18
|
+
function updateServiceName(service, name, characteristic) {
|
|
19
|
+
service.displayName = name;
|
|
20
|
+
service.setCharacteristic(characteristic.Name, name);
|
|
21
|
+
if (service.testCharacteristic(characteristic.ConfiguredName)) {
|
|
22
|
+
service.setCharacteristic(characteristic.ConfiguredName, name);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function updateAccessoryName(accessory, name, characteristic) {
|
|
26
|
+
// updateDisplayName was added after the supported Homebridge 1.6 API floor.
|
|
27
|
+
if (typeof accessory.updateDisplayName === 'function') {
|
|
28
|
+
accessory.updateDisplayName(name);
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
accessory.displayName = name;
|
|
32
|
+
// Homebridge 1.6 serializes the HAP object rather than the public mirror.
|
|
33
|
+
// Its API has no display-name setter; keep this compatibility access
|
|
34
|
+
// isolated here. Later versions use their public setter above.
|
|
35
|
+
const legacy = accessory;
|
|
36
|
+
if (legacy._associatedHAPAccessory) {
|
|
37
|
+
legacy._associatedHAPAccessory.displayName = name;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
const information = accessory.services.find(service => service.UUID === '0000003E-0000-1000-8000-0026BB765291');
|
|
41
|
+
if (information) {
|
|
42
|
+
updateServiceName(information, name, characteristic);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=names.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"names.js","sourceRoot":"","sources":["../src/names.ts"],"names":[],"mappings":";;AAIA,sCASC;AAED,8CAMC;AAED,kDAkBC;AAvCD,iFAAiF;AACjF,oFAAoF;AACpF,SAAgB,aAAa,CAAC,KAAc,EAAE,QAAgB;IAC1D,MAAM,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC;SACjE,OAAO,CAAC,0CAA0C,EAAE,GAAG,CAAC;SACxD,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC;SACzB,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACZ,OAAO,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;IACtD,4EAA4E;IAC5E,iEAAiE;IACjE,OAAO,kEAAkE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC3G,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAgB,EAAE,IAAY,EAAE,cAAqC;IACnG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrD,IAAI,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;QAC5D,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACnE,CAAC;AACL,CAAC;AAED,SAAgB,mBAAmB,CAAC,SAA4B,EAAE,IAAY,EAAE,cAAqC;IACjH,4EAA4E;IAC5E,IAAI,OAAO,SAAS,CAAC,iBAAiB,KAAK,UAAU,EAAE,CAAC;QACpD,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACJ,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC;QAC7B,0EAA0E;QAC1E,qEAAqE;QACrE,+DAA+D;QAC/D,MAAM,MAAM,GAAG,SAA6E,CAAC;QAC7F,IAAI,MAAM,CAAC,uBAAuB,EAAE,CAAC;YACjC,MAAM,CAAC,uBAAuB,CAAC,WAAW,GAAG,IAAI,CAAC;QACtD,CAAC;IACL,CAAC;IACD,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,sCAAsC,CAAC,CAAC;IAChH,IAAI,WAAW,EAAE,CAAC;QACd,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IACzD,CAAC;AACL,CAAC"}
|
package/dist/panicAccessory.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export declare class EnvisalinkPanicAccessory {
|
|
|
16
16
|
private readonly accessory;
|
|
17
17
|
private readonly config;
|
|
18
18
|
constructor(platform: EnvisalinkHomebridgePlatform, accessory: PlatformAccessory, config: EnvisalinkConfig);
|
|
19
|
-
bindPanicSwitch(panicType: PanicType, name
|
|
19
|
+
bindPanicSwitch(panicType: PanicType, name?: string): void;
|
|
20
20
|
activatePanic(panicType: PanicType, service: Service, value: CharacteristicValue): Promise<void>;
|
|
21
21
|
}
|
|
22
22
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"panicAccessory.d.ts","sourceRoot":"","sources":["../src/panicAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAC,4BAA4B,EAAC,MAAM,YAAY,CAAC;AAExD,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"panicAccessory.d.ts","sourceRoot":"","sources":["../src/panicAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAC,4BAA4B,EAAC,MAAM,YAAY,CAAC;AAExD,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAG/C,aAAK,SAAS;IACV,IAAI,IAAI;IACR,SAAS,IAAI;IACb,MAAM,IAAI;CACb;AAID;;;;GAIG;AACH,qBAAa,wBAAwB;IAE7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,gBAAgB;IAgB7C,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAmBpD,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,mBAAmB;CAgBzF"}
|
package/dist/panicAccessory.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EnvisalinkPanicAccessory = void 0;
|
|
4
4
|
const constants_1 = require("./constants");
|
|
5
|
+
const names_1 = require("./names");
|
|
5
6
|
var PanicType;
|
|
6
7
|
(function (PanicType) {
|
|
7
8
|
PanicType[PanicType["Fire"] = 1] = "Fire";
|
|
@@ -20,6 +21,7 @@ class EnvisalinkPanicAccessory {
|
|
|
20
21
|
this.platform = platform;
|
|
21
22
|
this.accessory = accessory;
|
|
22
23
|
this.config = config;
|
|
24
|
+
(0, names_1.updateAccessoryName)(this.accessory, 'Panic', this.platform.Characteristic);
|
|
23
25
|
if ((_a = config.firePanic) === null || _a === void 0 ? void 0 : _a.enabled) {
|
|
24
26
|
this.bindPanicSwitch(PanicType.Fire, config.firePanic.name);
|
|
25
27
|
}
|
|
@@ -38,9 +40,11 @@ class EnvisalinkPanicAccessory {
|
|
|
38
40
|
.setCharacteristic(this.platform.Characteristic.SerialNumber, 'Panic');
|
|
39
41
|
}
|
|
40
42
|
const panicTypeString = PanicType[panicType];
|
|
43
|
+
const displayName = (0, names_1.normalizeName)(name, `${panicTypeString} Panic`);
|
|
41
44
|
const panicServiceId = `${PANIC_SERVICE_NAME}.${panicTypeString}`;
|
|
42
45
|
const panicService = this.accessory.getService(panicServiceId) ||
|
|
43
|
-
this.accessory.addService(this.platform.Service.Switch,
|
|
46
|
+
this.accessory.addService(this.platform.Service.Switch, displayName, panicServiceId);
|
|
47
|
+
(0, names_1.updateServiceName)(panicService, displayName, this.platform.Characteristic);
|
|
44
48
|
panicService.getCharacteristic(this.platform.Characteristic.On)
|
|
45
49
|
.onSet(this.activatePanic.bind(this, panicType, panicService));
|
|
46
50
|
panicService.updateCharacteristic(this.platform.Characteristic.On, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"panicAccessory.js","sourceRoot":"","sources":["../src/panicAccessory.ts"],"names":[],"mappings":";;;AAGA,2CAAgD;
|
|
1
|
+
{"version":3,"file":"panicAccessory.js","sourceRoot":"","sources":["../src/panicAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partitionAccessory.d.ts","sourceRoot":"","sources":["../src/partitionAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElE,OAAO,EAAC,4BAA4B,EAAmB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"partitionAccessory.d.ts","sourceRoot":"","sources":["../src/partitionAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElE,OAAO,EAAC,4BAA4B,EAAmB,MAAM,YAAY,CAAC;AAQ1E;;;;GAIG;AACH,qBAAa,4BAA4B;IAIjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAJ9B,OAAO,CAAC,SAAS,CAAY;gBAGR,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB;IAcjD,oBAAoB;IAUpB,eAAe,CAAC,KAAK,EAAE,MAAM;IAkB7B,gBAAgB,CAAC,KAAK,EAAE,MAAM;IAexB,cAAc,CAAC,KAAK,EAAE,mBAAmB;IAUzC,eAAe,CAAC,KAAK,EAAE,mBAAmB;IAUhD,iBAAiB;IAmFX,aAAa,CAAC,KAAK,EAAE,mBAAmB;CAwCjD"}
|
|
@@ -4,6 +4,7 @@ exports.EnvisalinkPartitionAccessory = void 0;
|
|
|
4
4
|
const platform_1 = require("./platform");
|
|
5
5
|
const constants_1 = require("./constants");
|
|
6
6
|
const types_1 = require("./types");
|
|
7
|
+
const names_1 = require("./names");
|
|
7
8
|
const CHIME_SERVICE_NAME = 'Chime';
|
|
8
9
|
const BYPASS_SERVICE_NAME = 'Bypass';
|
|
9
10
|
/**
|
|
@@ -16,6 +17,7 @@ class EnvisalinkPartitionAccessory {
|
|
|
16
17
|
this.platform = platform;
|
|
17
18
|
this.accessory = accessory;
|
|
18
19
|
this.partition = this.accessory.context;
|
|
20
|
+
(0, names_1.updateAccessoryName)(this.accessory, this.partition.name, this.platform.Characteristic);
|
|
19
21
|
this.platform.log.debug(`Setting accessory details for partition: ${JSON.stringify(this.partition, null, 2)}`);
|
|
20
22
|
this.bindAccessoryDetails();
|
|
21
23
|
this.bindSecurityPanel();
|
|
@@ -35,27 +37,27 @@ class EnvisalinkPartitionAccessory {
|
|
|
35
37
|
if (!this.partition.enableChimeSwitch) {
|
|
36
38
|
return false;
|
|
37
39
|
}
|
|
40
|
+
const displayName = (0, names_1.normalizeName)(`${this.partition.name.slice(0, 63 - CHIME_SERVICE_NAME.length)} ${CHIME_SERVICE_NAME}`, CHIME_SERVICE_NAME);
|
|
38
41
|
let chimeService = this.accessory.getService(CHIME_SERVICE_NAME);
|
|
39
42
|
if (!chimeService) {
|
|
40
|
-
const displayName = `${this.partition.name} ${CHIME_SERVICE_NAME}`;
|
|
41
43
|
chimeService = new this.platform.Service.Switch(displayName, CHIME_SERVICE_NAME);
|
|
42
|
-
chimeService.setCharacteristic(this.platform.Characteristic.Name, displayName);
|
|
43
44
|
chimeService.setCharacteristic(this.platform.Characteristic.ServiceLabelIndex, index);
|
|
44
45
|
this.accessory.addService(chimeService);
|
|
45
46
|
}
|
|
47
|
+
(0, names_1.updateServiceName)(chimeService, displayName, this.platform.Characteristic);
|
|
46
48
|
chimeService.getCharacteristic(this.platform.Characteristic.On)
|
|
47
49
|
.onSet(this.setChimeActive.bind(this));
|
|
48
50
|
chimeService.updateCharacteristic(this.platform.Characteristic.On, this.partition.chimeActive === undefined ? false : this.partition.chimeActive);
|
|
49
51
|
}
|
|
50
52
|
bindBypassSwitch(index) {
|
|
53
|
+
const displayName = (0, names_1.normalizeName)(`${this.partition.name.slice(0, 63 - BYPASS_SERVICE_NAME.length)} ${BYPASS_SERVICE_NAME}`, BYPASS_SERVICE_NAME);
|
|
51
54
|
let bypassService = this.accessory.getService(BYPASS_SERVICE_NAME);
|
|
52
55
|
if (!bypassService) {
|
|
53
|
-
const displayName = `${this.partition.name} ${BYPASS_SERVICE_NAME}`;
|
|
54
56
|
bypassService = new this.platform.Service.Switch(displayName, BYPASS_SERVICE_NAME);
|
|
55
|
-
bypassService.setCharacteristic(this.platform.Characteristic.Name, displayName);
|
|
56
57
|
bypassService.setCharacteristic(this.platform.Characteristic.ServiceLabelIndex, index);
|
|
57
58
|
this.accessory.addService(bypassService);
|
|
58
59
|
}
|
|
60
|
+
(0, names_1.updateServiceName)(bypassService, displayName, this.platform.Characteristic);
|
|
59
61
|
bypassService.getCharacteristic(this.platform.Characteristic.On)
|
|
60
62
|
.onSet(this.setBypassActive.bind(this));
|
|
61
63
|
bypassService.updateCharacteristic(this.platform.Characteristic.On, this.partition.bypassEnabled === undefined ? false : this.partition.bypassEnabled);
|
|
@@ -83,7 +85,7 @@ class EnvisalinkPartitionAccessory {
|
|
|
83
85
|
bindSecurityPanel() {
|
|
84
86
|
const service = this.accessory.getService(this.platform.Service.SecuritySystem)
|
|
85
87
|
|| this.accessory.addService(this.platform.Service.SecuritySystem);
|
|
86
|
-
|
|
88
|
+
(0, names_1.updateServiceName)(service, this.partition.name, this.platform.Characteristic);
|
|
87
89
|
let currentState = undefined;
|
|
88
90
|
let targetState = undefined;
|
|
89
91
|
let obstructionDetected = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partitionAccessory.js","sourceRoot":"","sources":["../src/partitionAccessory.ts"],"names":[],"mappings":";;;AAEA,yCAA0E;AAC1E,2CAAgD;AAChD,mCAAiD;
|
|
1
|
+
{"version":3,"file":"partitionAccessory.js","sourceRoot":"","sources":["../src/partitionAccessory.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,GAAG,IAAI,aAAa,EACpB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACV,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAC,gBAAgB,EAAa,MAAM,eAAe,CAAC;AAO3D,OAAO,EAAqD,SAAS,EAAE,eAAe,EAAE,IAAI,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,GAAG,IAAI,aAAa,EACpB,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACV,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAC,gBAAgB,EAAa,MAAM,eAAe,CAAC;AAO3D,OAAO,EAAqD,SAAS,EAAE,eAAe,EAAE,IAAI,EAAC,MAAM,SAAS,CAAC;AAW7G,eAAO,MAAM,gBAAgB,QAA+D,CAAC;AAQ7F;;;;GAIG;AACH,qBAAa,4BAA6B,YAAW,qBAAqB;aAalD,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,aAAa;IAdtC,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAa;IAExE,OAAO,CAAC,KAAK,CAAC,CAAiB;IAC/B,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,mBAAmB,CAAC,CAAY;gBAGpB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,aAAa;IA+EtC;;;OAGG;IACH,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAmBzC,gBAAgB;IAIhB,eAAe,CAAC,GAAG,KAAA;IAiBzB,wBAAwB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAkClE,gCAAgC;IAyChC,OAAO,CAAC,wBAAwB;IAUhC,wBAAwB;IAqBlB,OAAO;IAgBb,mBAAmB,CAAC,IAAI,EAAE,IAAI;IAmBxB,kBAAkB,CAAC,SAAS,EAAE,MAAM;IAqB1C,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAa5D,wBAAwB,CAAC,SAAS,EAAE,SAAS;IA4C7C,UAAU,CAAC,IAAI,KAAA;IAkCf,eAAe,CAAC,IAAI,KAAA;IAkBpB,kBAAkB,CAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQ9D,mBAAmB,CAAC,IAAI,KAAA;IASxB,UAAU,CAAC,IAAI,KAAA;IAsBf;;;OAGG;IACH,YAAY,CAAC,IAAI,KAAA;IAUX,YAAY;IAiBlB,IAAI,CAAC,IAAI,KAAA;IAIT,SAAS,IAAI,gBAAgB;IAItB,sBAAsB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIlD,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9B,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B/H;;OAEG;YACW,wBAAwB;CAezC"}
|
package/dist/platform.js
CHANGED
|
@@ -47,6 +47,7 @@ const partitionAccessory_1 = require("./partitionAccessory");
|
|
|
47
47
|
const panicAccessory_1 = require("./panicAccessory");
|
|
48
48
|
const customCommandAccessory_1 = require("./customCommandAccessory");
|
|
49
49
|
const networkScanner_1 = require("./networkScanner");
|
|
50
|
+
const names_1 = require("./names");
|
|
50
51
|
const envisalinkCodes = require("nodealarmproxy/envisalink.js");
|
|
51
52
|
const util = __importStar(require("util"));
|
|
52
53
|
const packageJSON = require('../package.json');
|
|
@@ -70,6 +71,7 @@ class EnvisalinkHomebridgePlatform {
|
|
|
70
71
|
// this is used to track restored cached accessories
|
|
71
72
|
this.accessories = new Map();
|
|
72
73
|
this.chimeInitialized = false;
|
|
74
|
+
this.config.name = (0, names_1.normalizeName)(this.config.name, settings_1.PLATFORM_NAME);
|
|
73
75
|
this.log.debug('Finished initializing platform:', this.config.name);
|
|
74
76
|
const co = this.getConfig();
|
|
75
77
|
this.alarm = undefined;
|
|
@@ -124,9 +126,7 @@ class EnvisalinkHomebridgePlatform {
|
|
|
124
126
|
if (!zoneConfig.zoneNumber) {
|
|
125
127
|
zoneConfig.zoneNumber = increment;
|
|
126
128
|
}
|
|
127
|
-
|
|
128
|
-
zoneConfig.name = `Zone ${increment}`;
|
|
129
|
-
}
|
|
129
|
+
zoneConfig.name = (0, names_1.normalizeName)(zoneConfig.name, `Zone ${zoneConfig.zoneNumber}`);
|
|
130
130
|
map.set(`${zoneConfig.zoneNumber}`, zoneConfig);
|
|
131
131
|
return map;
|
|
132
132
|
}, new Map());
|
|
@@ -147,7 +147,21 @@ class EnvisalinkHomebridgePlatform {
|
|
|
147
147
|
*/
|
|
148
148
|
configureAccessory(accessory) {
|
|
149
149
|
this.log.debug(`Loading accessory from cache: ${accessory.displayName}`);
|
|
150
|
+
// Repair persisted names even before DSC status arrives, including cached
|
|
151
|
+
// controls currently disabled in config. Discovery later applies config
|
|
152
|
+
// names to active accessories without changing identities or handlers.
|
|
153
|
+
const name = (0, names_1.normalizeName)(accessory.displayName, 'Envisalink Accessory');
|
|
154
|
+
(0, names_1.updateAccessoryName)(accessory, name, this.Characteristic);
|
|
155
|
+
for (const service of accessory.services) {
|
|
156
|
+
if (service.testCharacteristic(this.Characteristic.Name)) {
|
|
157
|
+
(0, names_1.updateServiceName)(service, (0, names_1.normalizeName)(service.getCharacteristic(this.Characteristic.Name).value, (0, names_1.normalizeName)(service.displayName, name)), this.Characteristic);
|
|
158
|
+
}
|
|
159
|
+
else if (service.displayName) {
|
|
160
|
+
service.displayName = (0, names_1.normalizeName)(service.displayName, name);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
150
163
|
this.accessories.set(accessory.UUID, accessory);
|
|
164
|
+
this.api.updatePlatformAccessories([accessory]);
|
|
151
165
|
}
|
|
152
166
|
async handleDisconnect() {
|
|
153
167
|
this.resetConnection(new Error('Unknown disconnect occurred.'));
|
|
@@ -207,7 +221,9 @@ class EnvisalinkHomebridgePlatform {
|
|
|
207
221
|
// Keep the established command-derived identity so existing HomeKit rooms and
|
|
208
222
|
// automations survive upgrades and name-only changes.
|
|
209
223
|
const configuredUUIDs = new Set();
|
|
224
|
+
let commandNumber = 0;
|
|
210
225
|
for (const customCommand of this.getConfig().customCommands || []) {
|
|
226
|
+
const name = (0, names_1.normalizeName)(customCommand.name, `Custom Command ${++commandNumber}`);
|
|
211
227
|
const uuid = this.api.hap.uuid.generate(`envisalink.customCommand.${customCommand.command}`);
|
|
212
228
|
if (configuredUUIDs.has(uuid)) {
|
|
213
229
|
this.log.warn('Ignoring duplicate custom command:', customCommand.name);
|
|
@@ -217,17 +233,16 @@ class EnvisalinkHomebridgePlatform {
|
|
|
217
233
|
let accessory = this.accessories.get(uuid);
|
|
218
234
|
if (accessory) {
|
|
219
235
|
this.log.debug('Restoring existing custom command accessory from cache:', accessory.displayName);
|
|
220
|
-
accessory.displayName = customCommand.name;
|
|
221
236
|
accessory.context.type = 'customCommand';
|
|
222
|
-
new customCommandAccessory_1.EnvisalinkCustomCommandAccessory(this, accessory,
|
|
237
|
+
new customCommandAccessory_1.EnvisalinkCustomCommandAccessory(this, accessory, name, customCommand.command);
|
|
223
238
|
this.api.updatePlatformAccessories([accessory]);
|
|
224
239
|
}
|
|
225
240
|
else {
|
|
226
241
|
this.log.debug('Adding new custom command accessory because accessory was not restored from cache.');
|
|
227
|
-
accessory = new this.api.platformAccessory(
|
|
242
|
+
accessory = new this.api.platformAccessory(name, uuid);
|
|
228
243
|
accessory.context.type = 'customCommand';
|
|
229
244
|
this.accessories.set(uuid, accessory);
|
|
230
|
-
new customCommandAccessory_1.EnvisalinkCustomCommandAccessory(this, accessory,
|
|
245
|
+
new customCommandAccessory_1.EnvisalinkCustomCommandAccessory(this, accessory, name, customCommand.command);
|
|
231
246
|
this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
232
247
|
}
|
|
233
248
|
}
|
|
@@ -262,8 +277,8 @@ class EnvisalinkHomebridgePlatform {
|
|
|
262
277
|
let accessory = this.accessories.get(uuid);
|
|
263
278
|
if (accessory) {
|
|
264
279
|
this.log.debug('Restoring existing panic accessory from cache:', accessory.displayName);
|
|
265
|
-
this.api.updatePlatformAccessories([accessory]);
|
|
266
280
|
new panicAccessory_1.EnvisalinkPanicAccessory(this, accessory, this.getConfig());
|
|
281
|
+
this.api.updatePlatformAccessories([accessory]);
|
|
267
282
|
}
|
|
268
283
|
else {
|
|
269
284
|
this.log.debug('Adding new panic accessory because accessory was not restored from cache.');
|
|
@@ -289,13 +304,14 @@ class EnvisalinkHomebridgePlatform {
|
|
|
289
304
|
}
|
|
290
305
|
}
|
|
291
306
|
updateZoneAccessory(zone) {
|
|
307
|
+
zone.name = (0, names_1.normalizeName)(zone.name, `Zone ${zone.number}`);
|
|
292
308
|
const uuid = this.api.hap.uuid.generate(`envisalink.${zone.partition}.${zone.number}`);
|
|
293
309
|
let accessory = this.accessories.get(uuid);
|
|
294
310
|
if (accessory) {
|
|
295
311
|
this.log.debug('Restoring existing zone accessory from cache:', accessory.displayName);
|
|
296
312
|
accessory.context = zone;
|
|
297
|
-
this.api.updatePlatformAccessories([accessory]);
|
|
298
313
|
new zoneAccessory_1.EnvisalinkZoneAccessory(this, accessory);
|
|
314
|
+
this.api.updatePlatformAccessories([accessory]);
|
|
299
315
|
}
|
|
300
316
|
else {
|
|
301
317
|
this.log.debug(`Adding new zone accessory because ${accessory} was not restored from cache:`, zone.name);
|
|
@@ -341,6 +357,7 @@ class EnvisalinkHomebridgePlatform {
|
|
|
341
357
|
}
|
|
342
358
|
updatePartitionAccessory(partition) {
|
|
343
359
|
var _a, _b;
|
|
360
|
+
partition.name = (0, names_1.normalizeName)(partition.name, `Partition ${partition.number}`);
|
|
344
361
|
const uuid = this.api.hap.uuid.generate(`envisalink.${partition.number}`);
|
|
345
362
|
let accessory = this.accessories.get(uuid);
|
|
346
363
|
partition.pin = partition.pin || this.getConfig().pin;
|
|
@@ -357,8 +374,8 @@ class EnvisalinkHomebridgePlatform {
|
|
|
357
374
|
partition.bypassEnabled = previousBypassEnabled;
|
|
358
375
|
}
|
|
359
376
|
accessory.context = partition;
|
|
360
|
-
this.api.updatePlatformAccessories([accessory]);
|
|
361
377
|
new partitionAccessory_1.EnvisalinkPartitionAccessory(this, accessory);
|
|
378
|
+
this.api.updatePlatformAccessories([accessory]);
|
|
362
379
|
}
|
|
363
380
|
else {
|
|
364
381
|
this.log.debug(`Adding new partition accessory because ${accessory} was not restored from cache:`, partition.name);
|