@tplnet/homebridge-tahoma 2.3.4 → 2.3.6
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/.github/dependabot.yml +27 -0
- package/.github/workflows/compat.yml +55 -0
- package/.github/workflows/publish.yml +4 -0
- package/.github/workflows/stale-issue.yml +6 -1
- package/CHANGELOG.md +12 -0
- package/README.md +23 -5
- package/SECURITY.md +20 -0
- package/config.schema.json +1 -1
- package/dist/Mapper.d.ts +1 -1
- package/dist/Mapper.js +5 -4
- package/dist/Mapper.js.map +1 -1
- package/dist/Platform.d.ts +4 -0
- package/dist/Platform.js +28 -18
- package/dist/Platform.js.map +1 -1
- package/dist/hapName.d.ts +1 -0
- package/dist/hapName.js +23 -0
- package/dist/hapName.js.map +1 -0
- package/package.json +5 -4
- package/platform.schema.json +2 -2
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
# Weekly pull requests for dependency and GitHub Actions updates (security updates as soon as available).
|
|
2
|
+
# Minor and patch updates of dev tools come grouped in one pull request; major updates come one by one,
|
|
3
|
+
# so a breaking major update cannot block the others. Merge a pull request when all checks are green.
|
|
4
|
+
version: 2
|
|
5
|
+
updates:
|
|
6
|
+
- package-ecosystem: npm
|
|
7
|
+
directory: /
|
|
8
|
+
schedule:
|
|
9
|
+
interval: weekly
|
|
10
|
+
day: monday
|
|
11
|
+
open-pull-requests-limit: 5
|
|
12
|
+
groups:
|
|
13
|
+
dev-dependencies:
|
|
14
|
+
dependency-type: development
|
|
15
|
+
update-types: [minor, patch]
|
|
16
|
+
ignore:
|
|
17
|
+
# TypeScript 7 is not supported by typescript-eslint 8 yet (peer typescript <6.1) - remove when it is
|
|
18
|
+
- dependency-name: typescript
|
|
19
|
+
update-types: ['version-update:semver-major']
|
|
20
|
+
# Node.js types follow the oldest supported Node.js version, not the newest
|
|
21
|
+
- dependency-name: '@types/node'
|
|
22
|
+
update-types: ['version-update:semver-major']
|
|
23
|
+
- package-ecosystem: github-actions
|
|
24
|
+
directory: /
|
|
25
|
+
schedule:
|
|
26
|
+
interval: weekly
|
|
27
|
+
day: monday
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
name: Compatibility & CVE check
|
|
2
|
+
# Runs every Monday, on demand (Actions > Compatibility & CVE check > Run workflow) and on pull
|
|
3
|
+
# requests that change dependencies (e.g. from Dependabot) – merge them when all checks are green.
|
|
4
|
+
# 1. CVE: `npm audit` – fails on any known vulnerability in the runtime dependencies.
|
|
5
|
+
# 2. Homebridge: builds the plugin and starts it with the newest Homebridge release (and the beta)
|
|
6
|
+
# on all supported Node.js versions (scripts/homebridge-smoke.mjs).
|
|
7
|
+
# GitHub notifies the repository owner by e-mail when a scheduled run fails.
|
|
8
|
+
on:
|
|
9
|
+
schedule:
|
|
10
|
+
- cron: '17 5 * * 1'
|
|
11
|
+
workflow_dispatch:
|
|
12
|
+
push:
|
|
13
|
+
branches: [master]
|
|
14
|
+
paths: ['package.json', 'package-lock.json', '.github/workflows/compat.yml', 'scripts/homebridge-smoke.mjs']
|
|
15
|
+
pull_request:
|
|
16
|
+
paths: ['package.json', 'package-lock.json', '.github/workflows/compat.yml', 'scripts/homebridge-smoke.mjs']
|
|
17
|
+
|
|
18
|
+
permissions:
|
|
19
|
+
contents: read
|
|
20
|
+
|
|
21
|
+
jobs:
|
|
22
|
+
audit:
|
|
23
|
+
name: CVE check (npm audit)
|
|
24
|
+
runs-on: ubuntu-latest
|
|
25
|
+
steps:
|
|
26
|
+
- uses: actions/checkout@v7
|
|
27
|
+
- uses: actions/setup-node@v7
|
|
28
|
+
with:
|
|
29
|
+
node-version: 24
|
|
30
|
+
- run: npm ci
|
|
31
|
+
- name: Runtime dependencies (fails on any vulnerability)
|
|
32
|
+
run: npm audit --omit=dev --audit-level=low
|
|
33
|
+
- name: All dependencies incl. dev tools (report only)
|
|
34
|
+
run: npm audit || true
|
|
35
|
+
|
|
36
|
+
homebridge:
|
|
37
|
+
name: Homebridge ${{ matrix.homebridge }} / Node ${{ matrix.node }}
|
|
38
|
+
runs-on: ubuntu-latest
|
|
39
|
+
continue-on-error: ${{ matrix.homebridge == 'beta' }}
|
|
40
|
+
strategy:
|
|
41
|
+
fail-fast: false
|
|
42
|
+
matrix:
|
|
43
|
+
homebridge: [latest, beta]
|
|
44
|
+
node: [22, 24, 26]
|
|
45
|
+
steps:
|
|
46
|
+
- uses: actions/checkout@v7
|
|
47
|
+
- uses: actions/setup-node@v7
|
|
48
|
+
with:
|
|
49
|
+
node-version: ${{ matrix.node }}
|
|
50
|
+
- run: npm ci
|
|
51
|
+
- name: Install homebridge@${{ matrix.homebridge }}
|
|
52
|
+
run: npm install --no-save homebridge@${{ matrix.homebridge }} && npx homebridge --version
|
|
53
|
+
- run: npm run build
|
|
54
|
+
- name: Start Homebridge with the plugin
|
|
55
|
+
run: node scripts/homebridge-smoke.mjs
|
|
@@ -29,8 +29,12 @@ jobs:
|
|
|
29
29
|
- name: Check tag matches package.json version
|
|
30
30
|
run: test "v$(node -p "require('./package.json').version")" = "${GITHUB_REF_NAME}"
|
|
31
31
|
- run: npm ci
|
|
32
|
+
- name: CVE check (runtime dependencies)
|
|
33
|
+
run: npm audit --omit=dev --audit-level=low
|
|
32
34
|
- run: npm run lint
|
|
33
35
|
- run: npm run build
|
|
36
|
+
- name: Compatibility check with the newest Homebridge release
|
|
37
|
+
run: npm install --no-save homebridge@latest && npm run smoke
|
|
34
38
|
- name: Stage the package on npm
|
|
35
39
|
shell: bash # -eo pipefail: fail the step if npm fails despite tee
|
|
36
40
|
run: |
|
|
@@ -4,12 +4,17 @@ on:
|
|
|
4
4
|
schedule:
|
|
5
5
|
- cron: "30 1 * * *"
|
|
6
6
|
|
|
7
|
+
# actions/stale needs write access to label and close issues and pull requests
|
|
8
|
+
permissions:
|
|
9
|
+
issues: write
|
|
10
|
+
pull-requests: write
|
|
11
|
+
|
|
7
12
|
jobs:
|
|
8
13
|
stale:
|
|
9
14
|
runs-on: ubuntu-latest
|
|
10
15
|
|
|
11
16
|
steps:
|
|
12
|
-
- uses: actions/stale@
|
|
17
|
+
- uses: actions/stale@v11
|
|
13
18
|
with:
|
|
14
19
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
|
15
20
|
stale-issue-message: >
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## 2.3.6 (2026-11-13)
|
|
2
|
+
|
|
3
|
+
* Requires `@tplnet/overkiz-client` ^1.3.1: faster reconnect after a gateway outage (last known IP address), clearer log messages, expected `400 No registered event listener` after a gateway restart handled as info
|
|
4
|
+
* Fix: `HAPStatus` is taken from the Homebridge API (`api.hap`) instead of importing the `homebridge` package at runtime – the plugin no longer depends on Homebridge's package being resolvable from the plugin directory
|
|
5
|
+
* Log: "Rename accessory …" no longer claims the naming rules as reason (also shown for devices renamed in the TaHoma app)
|
|
6
|
+
* Wording: "Apple Home" instead of "HomeKit" in README, settings and the execution label shown in the TaHoma app history (" - Apple Home")
|
|
7
|
+
|
|
8
|
+
## 2.3.5 (2026-11-12)
|
|
9
|
+
|
|
10
|
+
* Fix: accessory and service names are made HomeKit compatible (must start and end with a letter or number), e.g. "Büro kl." → "Büro kl", "IO (6649146)" → "IO 6649146". Removes the HAP-NodeJS "invalid 'Name' characteristic" warnings; cached accessories are renamed once (log: "Rename accessory …"). Names in the TaHoma app are not changed
|
|
11
|
+
* Display name in the Homebridge UI: "Homebridge Somfy TaHoma (tplnet)"
|
|
12
|
+
|
|
1
13
|
## 2.3.3 (2026-11-12)
|
|
2
14
|
|
|
3
15
|
* Fix: a discovery retry after a partial failure no longer builds already mapped accessories twice (duplicate state listeners)
|
package/README.md
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
|
-
# Homebridge TaHoma (
|
|
1
|
+
# Homebridge Somfy TaHoma (tplnet)
|
|
2
2
|
|
|
3
3
|
[](https://www.npmjs.com/package/@tplnet/homebridge-tahoma)
|
|
4
4
|
[](https://github.com/tplnet/homebridge-tahoma/actions/workflows/ci.yml)
|
|
5
|
+
[](https://github.com/tplnet/homebridge-tahoma/actions/workflows/compat.yml)
|
|
5
6
|
[](LICENSE)
|
|
6
7
|
|
|
8
|
+
Package: [`@tplnet/homebridge-tahoma`](https://www.npmjs.com/package/@tplnet/homebridge-tahoma)
|
|
9
|
+
|
|
7
10
|
Control your **Somfy TaHoma** devices – roller shutters, blinds, awnings, gates, garage doors, lights, heating, alarms, sensors – with **Apple Home** and Siri, through [Homebridge](https://homebridge.io).
|
|
8
11
|
|
|
9
12
|
Works with all **Overkiz** based platforms: Somfy TaHoma / TaHoma Switch / Connexoon, Atlantic / Thermor / Sauter **Cozytouch**, Hitachi Hi Kumo, Flexom and Rexel Energeasy – via the **local API** of your TaHoma gateway or via the manufacturer's cloud.
|
|
10
13
|
|
|
11
14
|
> This is a maintained fork of [dubocr/homebridge-tahoma](https://github.com/dubocr/homebridge-tahoma) by Romain Duboc, using the forked API client [`@tplnet/overkiz-client`](https://github.com/tplnet/overkiz-client).
|
|
12
|
-
> It is a **drop-in replacement**: the platform name stays `Tahoma`, so your configuration and
|
|
15
|
+
> It is a **drop-in replacement**: the platform name stays `Tahoma`, so your configuration and your accessories in Apple Home are kept – see [Migrating](#migrating-from-homebridge-tahoma).
|
|
13
16
|
> Changes compared to the original: [CHANGELOG.md](CHANGELOG.md).
|
|
14
17
|
|
|
15
18
|
## Contents
|
|
@@ -22,6 +25,7 @@ Works with all **Overkiz** based platforms: Somfy TaHoma / TaHoma Switch / Conne
|
|
|
22
25
|
- [Device specific configuration](#device-specific-configuration)
|
|
23
26
|
- [Supported devices](#supported-devices)
|
|
24
27
|
- [Troubleshooting](#troubleshooting)
|
|
28
|
+
- [Compatibility and security](#compatibility-and-security)
|
|
25
29
|
- [Contributing](#contributing)
|
|
26
30
|
- [Releasing (maintainers)](#releasing-maintainers)
|
|
27
31
|
- [License and credits](#license-and-credits)
|
|
@@ -57,7 +61,7 @@ Then add the platform to your `config.json` (see [Configuration](#configuration)
|
|
|
57
61
|
|
|
58
62
|
## Migrating from homebridge-tahoma
|
|
59
63
|
|
|
60
|
-
> **Important:** never have both plugins installed at the same time. Homebridge only hands the cached accessories over to the new plugin if exactly one plugin provides the `Tahoma` platform. With both installed it removes them as orphaned – and
|
|
64
|
+
> **Important:** never have both plugins installed at the same time. Homebridge only hands the cached accessories over to the new plugin if exactly one plugin provides the `Tahoma` platform. With both installed it removes them as orphaned – and Apple Home loses the rooms, scenes and automations of these accessories.
|
|
61
65
|
|
|
62
66
|
1. Back up Homebridge (Homebridge UI → *Settings* → *Backup*).
|
|
63
67
|
2. **First** uninstall `homebridge-tahoma`, **then** install `@tplnet/homebridge-tahoma`.
|
|
@@ -111,7 +115,7 @@ Then add the platform to your `config.json` (see [Configuration](#configuration)
|
|
|
111
115
|
| `refreshPeriod` | number (min) | `30` local / `1440` cloud | Periodic full state refresh, needed for RTS devices and physical remotes that do not report their state. `0` disables it. The Somfy cloud allows only one refresh per day – lower values cause `429 QUOTA_EXCEEDED` |
|
|
112
116
|
| `tlsInsecure` | boolean | `false` | Local API only: skip the gateway certificate check (by default verified against the [Overkiz root CA](https://ca.overkiz.com/overkiz-root-ca-2048.crt)). Use only if the connection fails with a certificate error |
|
|
113
117
|
| `exclude` | string[] | `[]` | Devices to hide: device name, widget, UI class or protocol (e.g. `"rts"`, `"Main door"`, `"PositionableHorizontalAwning"`) |
|
|
114
|
-
| `exposeScenarios` | boolean / string[] | `false` | Cloud only: expose TaHoma scenarios as
|
|
118
|
+
| `exposeScenarios` | boolean / string[] | `false` | Cloud only: expose TaHoma scenarios as switches in Apple Home; `true` for all or a list of scenario names |
|
|
115
119
|
| `devicesConfig` | object[] | `[]` | Per-device settings, see [below](#device-specific-configuration) |
|
|
116
120
|
| `debug` | boolean | `false` | Verbose log output |
|
|
117
121
|
|
|
@@ -129,7 +133,7 @@ The local API talks directly to your gateway in your home network: no cloud acco
|
|
|
129
133
|
|
|
130
134
|
The gateway is found in your network by its PIN (mDNS). If Homebridge runs in another network or VLAN, use the gateway's IP address as `user` (preferably with a fixed DHCP lease).
|
|
131
135
|
|
|
132
|
-
> **Note:** cloud and local API use different device identifiers. Switching an existing setup from cloud to local makes
|
|
136
|
+
> **Note:** cloud and local API use different device identifiers. Switching an existing setup from cloud to local makes Apple Home see all accessories as new ones – rooms and automations have to be set up again.
|
|
133
137
|
|
|
134
138
|
More information: [Somfy TaHoma Developer Mode](https://github.com/Somfy-Developer/Somfy-TaHoma-Developer-Mode).
|
|
135
139
|
|
|
@@ -201,6 +205,18 @@ A device type that is not supported shows up in the log as *"… not supported"*
|
|
|
201
205
|
|
|
202
206
|
For a detailed log, set `"debug": true` and restart Homebridge.
|
|
203
207
|
|
|
208
|
+
## Compatibility and security
|
|
209
|
+
|
|
210
|
+
This plugin is kept compatible with the **newest Homebridge release** and free of **known vulnerabilities (CVEs)**:
|
|
211
|
+
|
|
212
|
+
- **Weekly and on every dependency change** the [Compatibility & CVE check](https://github.com/tplnet/homebridge-tahoma/actions/workflows/compat.yml) workflow
|
|
213
|
+
- runs `npm audit` – any known vulnerability in the runtime dependencies fails the check,
|
|
214
|
+
- builds the plugin and starts it with **homebridge@latest** and **homebridge@beta** on Node.js 22, 24 and 26 (`npm run smoke`): the plugin must load, be accepted as compatible (`engines`) and initialise without errors.
|
|
215
|
+
- **Every release** runs the same CVE and Homebridge checks before the version is staged on npm – a release with a known vulnerability or an incompatibility is not published.
|
|
216
|
+
- **Dependabot** opens weekly pull requests for dependency and GitHub Actions updates. Each of them runs CI and the full compatibility & CVE check (Homebridge latest/beta, Node.js 22/24/26) – when all checks are green, the update can simply be merged.
|
|
217
|
+
|
|
218
|
+
Found a security issue? Please report it privately via GitHub (*Security* → *Report a vulnerability*) instead of a public issue.
|
|
219
|
+
|
|
204
220
|
## Contributing
|
|
205
221
|
|
|
206
222
|
Bug reports, device support requests and pull requests are welcome: <https://github.com/tplnet/homebridge-tahoma/issues>.
|
|
@@ -209,6 +225,8 @@ Please include the Homebridge log (with `"debug": true`) and the device's UI cla
|
|
|
209
225
|
## Releasing (maintainers)
|
|
210
226
|
|
|
211
227
|
```sh
|
|
228
|
+
npm audit --omit=dev # must report 0 vulnerabilities
|
|
229
|
+
npm install --no-save homebridge@latest && npm run build && npm run smoke # newest Homebridge
|
|
212
230
|
npm version patch # or minor / major – bumps package.json and creates the annotated tag vX.Y.Z
|
|
213
231
|
git push --follow-tags
|
|
214
232
|
```
|
package/SECURITY.md
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
# Security policy
|
|
2
|
+
|
|
3
|
+
## Supported versions
|
|
4
|
+
|
|
5
|
+
Only the latest released version of `@tplnet/homebridge-tahoma` receives fixes. Please update before reporting.
|
|
6
|
+
|
|
7
|
+
## How dependencies are checked
|
|
8
|
+
|
|
9
|
+
- Once a week and on every dependency change the *Compatibility & CVE check* workflow runs `npm audit`: any known vulnerability (CVE / GitHub advisory) in a runtime dependency fails the check; findings in development tools are reported.
|
|
10
|
+
- The same workflow starts the plugin with the newest Homebridge release (and the beta) on Node.js 22, 24 and 26.
|
|
11
|
+
- Dependabot opens update pull requests weekly, security updates immediately. They run all checks and are merged when green.
|
|
12
|
+
- A release is only published when the audit is clean and the plugin starts with the newest Homebridge release.
|
|
13
|
+
|
|
14
|
+
## Reporting a vulnerability
|
|
15
|
+
|
|
16
|
+
Please do **not** open a public issue. Use *Security* → *Report a vulnerability* in this GitHub repository (private vulnerability reporting).
|
|
17
|
+
|
|
18
|
+
Please include the affected version, a description and, if possible, steps to reproduce. You will get a first response within a few days. Once a fix is released, the issue is published as a GitHub security advisory.
|
|
19
|
+
|
|
20
|
+
Vulnerabilities in the API client belong to [`@tplnet/overkiz-client`](https://github.com/tplnet/overkiz-client/security); issues in Homebridge itself to [homebridge/homebridge](https://github.com/homebridge/homebridge/security).
|
package/config.schema.json
CHANGED
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
"exposeScenarios": {
|
|
102
102
|
"title": "Expose scenarios",
|
|
103
103
|
"type": "boolean",
|
|
104
|
-
"description": "Expose scenarios as
|
|
104
|
+
"description": "Expose scenarios as switches in Apple Home to trigger them"
|
|
105
105
|
},
|
|
106
106
|
"exclude": {
|
|
107
107
|
"type": "array",
|
package/dist/Mapper.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CharacteristicValue, Logger, PlatformAccessory, Service } from 'homebridge';
|
|
1
|
+
import type { CharacteristicValue, Logger, PlatformAccessory, Service } from 'homebridge';
|
|
2
2
|
import { Device, State, Command, Action } from 'overkiz-client';
|
|
3
3
|
import { Platform } from './Platform.js';
|
|
4
4
|
export default abstract class Mapper {
|
package/dist/Mapper.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Characteristics, Services } from './Platform.js';
|
|
2
|
-
import { HAPStatus } from 'homebridge';
|
|
3
2
|
import { Action, ExecutionState } from 'overkiz-client';
|
|
4
3
|
import { GREY } from './colors.js';
|
|
4
|
+
import { hapName } from './hapName.js';
|
|
5
5
|
export default class Mapper {
|
|
6
6
|
platform;
|
|
7
7
|
accessory;
|
|
@@ -44,6 +44,7 @@ export default class Mapper {
|
|
|
44
44
|
const services = this.registerServices();
|
|
45
45
|
const info = this.accessory.getService(Services.AccessoryInformation);
|
|
46
46
|
if (info) {
|
|
47
|
+
info.setCharacteristic(Characteristics.Name, hapName(this.device.label));
|
|
47
48
|
info.setCharacteristic(Characteristics.Manufacturer, this.device.manufacturer);
|
|
48
49
|
info.setCharacteristic(Characteristics.Model, this.device.model);
|
|
49
50
|
info.setCharacteristic(Characteristics.SerialNumber, this.device.address.substring(0, 64));
|
|
@@ -77,7 +78,7 @@ export default class Mapper {
|
|
|
77
78
|
}
|
|
78
79
|
registerService(type, subtype) {
|
|
79
80
|
let service;
|
|
80
|
-
const name = subtype ? this.translate(subtype) : this.device.label;
|
|
81
|
+
const name = hapName(subtype ? this.translate(subtype) : this.device.label);
|
|
81
82
|
if (subtype) {
|
|
82
83
|
service = this.accessory.getServiceById(type, subtype) || this.accessory.addService(type, name, subtype);
|
|
83
84
|
}
|
|
@@ -130,7 +131,7 @@ export default class Mapper {
|
|
|
130
131
|
async executeCommands(commands, standalone = false) {
|
|
131
132
|
if (commands === undefined || (Array.isArray(commands) && commands.length === 0)) {
|
|
132
133
|
this.error('No target command for', this.device.label);
|
|
133
|
-
throw HAPStatus.RESOURCE_DOES_NOT_EXIST;
|
|
134
|
+
throw this.platform.api.hap.HAPStatus.RESOURCE_DOES_NOT_EXIST;
|
|
134
135
|
}
|
|
135
136
|
else if (Array.isArray(commands)) {
|
|
136
137
|
for (const c of commands) {
|
|
@@ -165,7 +166,7 @@ export default class Mapper {
|
|
|
165
166
|
// Execution never started: no terminal event will release the slot.
|
|
166
167
|
release();
|
|
167
168
|
this.error(commandName + ' ' + error.message);
|
|
168
|
-
reject(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
|
|
169
|
+
reject(this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE);
|
|
169
170
|
}
|
|
170
171
|
this.actionPromise = null;
|
|
171
172
|
}, 100);
|
package/dist/Mapper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../src/Mapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../src/Mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAA0B,MAAM,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhF,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,OAAO,OAAgB,MAAM;IAmBT;IACA;IACA;IApBf,MAAM,CAAU,eAAe,GAA0B;QAC7D,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,eAAe;KAC5G,CAAC;IAEQ,GAAG,CAAS;IACd,aAAa,CAAC;IACd,aAAa,CAAC;IACZ,SAAS,GAAG,KAAK,CAAC;IAC5B,mEAAmE;IAC3D,WAAW,CAAC;IACZ,aAAa,CAAC;IACtB,8EAA8E;IAC9E,8EAA8E;IAC9E,8EAA8E;IACtE,QAAQ,GAAG,CAAC,CAAC;IACX,cAAc,GAAkB,EAAE,CAAC;IAE7C,YACuB,QAAkB,EAClB,SAA4B,EAC5B,MAAc;QAFd,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAmB;QAC5B,WAAM,GAAN,MAAM,CAAQ;QAEjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;IACjC,CAAC;IAEM,KAAK;QACR,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAC3B,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAC3D,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,EAC9D,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAC9C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAChD,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;YAC5C,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1G,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,OAAO,MAAM,CAAC,GAAG,CAAC;YAClB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YACzD,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAEzC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QACtE,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACzE,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC/E,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3F,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACxC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClF,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,mCAAmC;YACnC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;YAEjE,2CAA2C;YAC3C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACnC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAC1C,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;QACP,CAAC;QAED,8CAA8C;QAC9C,8BAA8B;QAC9B,oFAAoF;IACxF,CAAC;IAED;;OAEG;IAEH,6DAA6D;IACnD,WAAW,CAAC,MAAM;QACxB,EAAE;IACN,CAAC;IAES,eAAe,CAAC,IAAS,EAAE,OAAgB;QACjD,IAAI,OAAgB,CAAC;QACrB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7G,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,CAAC,iBAAiB,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtD;;;;;;;UAOE;QACF,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,SAAS,CAAC,KAAa;QAC3B,QAAQ,KAAK,EAAE,CAAC;YACZ,KAAK,OAAO,CAAC,CAAC,OAAO,OAAO,CAAC;YAC7B,KAAK,QAAQ,CAAC,CAAC,OAAO,SAAS,CAAC;YAChC,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,IAAI,EAAE,YAAwC,EAAE;QAC/D,OAAO,KAAK,EAAE,KAA0B,EAAE,EAAE;YACxC,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC9B,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5B,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;oBACvC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;oBAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC/C,CAAC,EAAE,GAAG,CAAC,CAAC;YACZ,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IAES,QAAQ,CAAC,IAAI,EAAE,GAAG,IAAI;QAC5B,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;YAC9B,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAC/B,CAAC,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,QAA8C,EAAE,UAAU,GAAG,KAAK;QAC9F,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAC/E,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,uBAAuB,CAAC;QAClE,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACvB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/D,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CACzC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAChG,CAAC;QACF;;;;UAIE;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACtF,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC;QAExD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACjD,UAAU,CAAC,KAAK,IAAI,EAAE;oBAClB,IAAI,CAAC;wBACD,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;wBACjH,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBACvC,CAAC;oBAAC,OAAO,KAAU,EAAE,CAAC;wBAClB,oEAAoE;wBACpE,OAAO,EAAE,CAAC;wBACV,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC9C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;oBAC1E,CAAC;oBACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC9B,CAAC,EAAE,GAAG,CAAC,CAAC;YAEZ,CAAC,CAAC,CAAC;YACH,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,MAAM,OAAO,GAAG,GAAG,EAAE;gBACjB,IAAI,CAAC,OAAO,EAAE,CAAC;oBACX,OAAO,GAAG,IAAI,CAAC;oBACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;gBACnD,CAAC;YACL,CAAC,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC3D,qFAAqF;YACrF,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC;YACnC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACjC,IAAI,KAAK,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC;oBAClC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;gBAChD,CAAC;qBAAM,IAAI,KAAK,KAAK,cAAc,CAAC,SAAS,EAAE,CAAC;oBAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;gBAClC,CAAC;qBAAM,IAAI,KAAK,KAAK,cAAc,CAAC,SAAS,IAAI,KAAK,KAAK,cAAc,CAAC,eAAe,EAAE,CAAC;oBACxF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;gBACnC,CAAC;gBACD,IAAI,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzC,OAAO,EAAE,CAAC;gBACd,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,QAAQ;QACxB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjE,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,KAAc;QAC9C,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IAEO,KAAK,CAAC,GAAG,IAAI;QACnB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;IAES,IAAI,CAAC,GAAG,IAAI;QAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC;IAES,IAAI,CAAC,GAAG,IAAI;QAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9D,CAAC;IAES,KAAK,CAAC,GAAG,IAAI;QACnB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC/D,CAAC;IAES,gBAAgB;QACtB,IAAI,OAAO,IAAI,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;YACjD,IAAI,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,GAAG,iBAAiB,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAES,eAAe,CAAC,MAAoB,EAAE,IAAI,GAAG,KAAK;QACxD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAY,EAAE,EAAE;YAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,CAAC;YACD,IAAI,OAAO,IAAI,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;gBAC5C,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YACjD,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjE,CAAC"}
|
package/dist/Platform.d.ts
CHANGED
|
@@ -37,6 +37,10 @@ export declare class Platform implements DynamicPlatformPlugin {
|
|
|
37
37
|
* must not be registered again to prevent "duplicate UUID" errors.
|
|
38
38
|
*/
|
|
39
39
|
discoverDevices(): Promise<void>;
|
|
40
|
+
/**
|
|
41
|
+
* Give a cached accessory a HomeKit compatible name (see hapName), e.g. "Büro kl." -> "Büro kl".
|
|
42
|
+
*/
|
|
43
|
+
private renameCachedAccessory;
|
|
40
44
|
executeAction(label: string, action: Action, highPriority?: boolean, standalone?: boolean): any;
|
|
41
45
|
/**
|
|
42
46
|
* Translate
|
package/dist/Platform.js
CHANGED
|
@@ -4,6 +4,7 @@ import Mapper from './Mapper.js';
|
|
|
4
4
|
import SceneMapper from './SceneMapper.js';
|
|
5
5
|
import { CustomCharacteristics } from './CustomCharacteristics.js';
|
|
6
6
|
import { BLUE, GREY, RESET } from './colors.js';
|
|
7
|
+
import { hapName } from './hapName.js';
|
|
7
8
|
export let Services;
|
|
8
9
|
export let Characteristics;
|
|
9
10
|
const DEFAULT_RETRY_DELAY = 60;
|
|
@@ -105,6 +106,7 @@ export class Platform {
|
|
|
105
106
|
async discoverDevices() {
|
|
106
107
|
try {
|
|
107
108
|
const uuids = Array();
|
|
109
|
+
const renamed = Array();
|
|
108
110
|
const devices = await this.client.getDevices();
|
|
109
111
|
this.log.debug(devices.length + ' devices discovered');
|
|
110
112
|
// loop over the discovered devices and register each one if it has not already been registered
|
|
@@ -120,23 +122,13 @@ export class Platform {
|
|
|
120
122
|
// the cached devices we stored in the `configureAccessory` method above
|
|
121
123
|
let accessory = this.accessories.find(accessory => accessory.UUID === device.uuid);
|
|
122
124
|
if (accessory) {
|
|
123
|
-
// the accessory already exists
|
|
124
|
-
|
|
125
|
-
/*
|
|
126
|
-
const newaccessory = new this.api.platformAccessory(device.label, device.uuid);
|
|
127
|
-
newaccessory.context.device = device;
|
|
128
|
-
await this.configureAccessory(newaccessory);
|
|
129
|
-
const services = newaccessory.services.map((service) => service.UUID);
|
|
130
|
-
accessory.services
|
|
131
|
-
.filter((service) => !services.includes(service.UUID))
|
|
132
|
-
.forEach((services) => accessory?.removeService(services));
|
|
133
|
-
this.api.updatePlatformAccessories([accessory]);
|
|
134
|
-
*/
|
|
125
|
+
// the accessory already exists: fix a cached name that HomeKit does not accept
|
|
126
|
+
this.renameCachedAccessory(accessory, hapName(device.label), renamed);
|
|
135
127
|
}
|
|
136
128
|
else {
|
|
137
129
|
// the accessory does not yet exist, so we need to create it
|
|
138
130
|
this.log.info('Create accessory:', device.label);
|
|
139
|
-
accessory = new this.api.platformAccessory(device.label, device.uuid);
|
|
131
|
+
accessory = new this.api.platformAccessory(hapName(device.label), device.uuid);
|
|
140
132
|
//accessory.context.device = device;
|
|
141
133
|
await this.configureAccessory(accessory);
|
|
142
134
|
this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
|
|
@@ -166,10 +158,13 @@ export class Platform {
|
|
|
166
158
|
continue;
|
|
167
159
|
}
|
|
168
160
|
let accessory = this.accessories.find(accessory => accessory.UUID === actionGroup.oid);
|
|
169
|
-
if (
|
|
161
|
+
if (accessory) {
|
|
162
|
+
this.renameCachedAccessory(accessory, hapName(actionGroup.label, 'Scenario'), renamed);
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
170
165
|
// the accessory does not yet exist, so we need to create it
|
|
171
166
|
this.log.info('Create accessory', actionGroup.label);
|
|
172
|
-
accessory = new this.api.platformAccessory(actionGroup.label, actionGroup.oid);
|
|
167
|
+
accessory = new this.api.platformAccessory(hapName(actionGroup.label, 'Scenario'), actionGroup.oid);
|
|
173
168
|
await this.configureAccessory(accessory);
|
|
174
169
|
this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
|
|
175
170
|
}
|
|
@@ -181,6 +176,10 @@ export class Platform {
|
|
|
181
176
|
uuids.push(actionGroup.oid);
|
|
182
177
|
}
|
|
183
178
|
}
|
|
179
|
+
if (renamed.length > 0) {
|
|
180
|
+
// persist the new names in the accessory cache
|
|
181
|
+
this.api.updatePlatformAccessories(renamed);
|
|
182
|
+
}
|
|
184
183
|
const deleted = this.accessories.filter((accessory) => !uuids.includes(accessory.UUID));
|
|
185
184
|
this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, deleted);
|
|
186
185
|
this.retryDelay = DEFAULT_RETRY_DELAY;
|
|
@@ -199,19 +198,30 @@ export class Platform {
|
|
|
199
198
|
this.retryDelay = Math.min(this.retryDelay * 2, MAX_RETRY_DELAY);
|
|
200
199
|
}
|
|
201
200
|
}
|
|
201
|
+
/**
|
|
202
|
+
* Give a cached accessory a HomeKit compatible name (see hapName), e.g. "Büro kl." -> "Büro kl".
|
|
203
|
+
*/
|
|
204
|
+
renameCachedAccessory(accessory, name, renamed) {
|
|
205
|
+
if (accessory.displayName !== name) {
|
|
206
|
+
// Either renamed in the TaHoma app or adjusted to the naming rules of Apple Home (see hapName)
|
|
207
|
+
this.log.info(`Rename accessory '${accessory.displayName}' to '${name}'`);
|
|
208
|
+
accessory.updateDisplayName(name);
|
|
209
|
+
renamed.push(accessory);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
202
212
|
/*
|
|
203
213
|
action: The action to execute
|
|
204
214
|
*/
|
|
205
215
|
executeAction(label, action, highPriority = false, standalone = false) {
|
|
206
216
|
if (standalone) {
|
|
207
217
|
// Run action in standalone execution
|
|
208
|
-
return this.client.execute(highPriority ? 'apply/highPriority' : 'apply', new Execution(label + ' -
|
|
218
|
+
return this.client.execute(highPriority ? 'apply/highPriority' : 'apply', new Execution(label + ' - Apple Home', action));
|
|
209
219
|
}
|
|
210
220
|
else {
|
|
211
221
|
if (this.executionPromise) {
|
|
212
222
|
this.executionPromise.execution.addAction(action);
|
|
213
223
|
this.executionPromise.execution.label = 'Execute scene (' +
|
|
214
|
-
this.executionPromise.execution.actions.length + ' devices) -
|
|
224
|
+
this.executionPromise.execution.actions.length + ' devices) - Apple Home';
|
|
215
225
|
}
|
|
216
226
|
else {
|
|
217
227
|
this.executionPromise = new Promise((resolve, reject) => {
|
|
@@ -222,7 +232,7 @@ export class Platform {
|
|
|
222
232
|
this.executionPromise = null;
|
|
223
233
|
}, 100);
|
|
224
234
|
});
|
|
225
|
-
this.executionPromise.execution = new Execution(label + ' -
|
|
235
|
+
this.executionPromise.execution = new Execution(label + ' - Apple Home', action);
|
|
226
236
|
}
|
|
227
237
|
return this.executionPromise;
|
|
228
238
|
}
|
package/dist/Platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../src/Platform.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../src/Platform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAU,MAAM,gBAAgB,CAAC;AAC3D,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,MAAM,CAAC,IAAI,QAAwB,CAAC;AACpC,MAAM,CAAC,IAAI,eAAsC,CAAC;AAElD,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,+FAA+F;AAC/F,IAAI,wBAAwB,GAAG,KAAK,CAAC;AAErC;;;;GAIG;AACH,MAAM,OAAO,QAAQ;IAgBW;IAA6B;IAAwC;IAfjG,oDAAoD;IACnC,WAAW,GAAwB,EAAE,CAAC;IACvC,MAAM,CAAS;IAEd,OAAO,CAAgB;IACvB,eAAe,CAA0B;IAC1C,aAAa,GAAmB,EAAE,CAAC;IAE3C,YAAY,CAAC;IACb,gBAAgB,CAAC;IACjB,UAAU,GAAG,mBAAmB,CAAC;IACzC,4FAA4F;IAC5F,gDAAgD;IAC/B,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IAE5C,YAA4B,GAAW,EAAkB,MAAsB,EAAkB,GAAQ;QAA7E,QAAG,GAAH,GAAG,CAAQ;QAAkB,WAAM,GAAN,MAAM,CAAgB;QAAkB,QAAG,GAAH,GAAG,CAAK;QACrG,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAChC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAC9C,IAAI,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEpE,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC5B,wBAAwB,GAAG,IAAI,CAAC;YAChC,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC,CAAC;YAChG,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC;QAClG,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,mBAAmB,EACzG,oBAAoB,EAAE,MAAM,EAAE,kBAAkB;QAChD,2CAA2C;QAC3C,8BAA8B,EAAE,yCAAyC,EAAE,sCAAsC,EACjH,uBAAuB,CAC1B,CAAC;QACF,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;QAC9C,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAElE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE;YAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;gBACf,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClB,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACJ,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;gBACrC,CAAC;YACL,CAAC;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEzC,8FAA8F;QAC9F,4FAA4F;QAC5F,2FAA2F;QAC3F,yCAAyC;QACzC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACnC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAClD,oEAAoE;YACpE,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY;QACd,IAAI,WAAW,GAAG,IAAI,CAAC;QACvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC,CAAC;QACxH,IAAI,QAAQ,EAAE,WAAW,EAAE,CAAC;YACxB,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC5D,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,MAAM,MAAM,CAAC,UAAU,WAAW,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;aACrF,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;aACjE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAEhC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB,CAAC,SAA4B;QACjD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe;QACjB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,EAAU,CAAC;YAC9B,MAAM,OAAO,GAAG,KAAK,EAAqB,CAAC;YAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,qBAAqB,CAAC,CAAC;YAEvD,+FAA+F;YAC/F,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,IACI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;oBAChD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;oBACnD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC;oBAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;oBACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EACxC,CAAC;oBACC,SAAS;gBACb,CAAC;gBAED,uFAAuF;gBACvF,wEAAwE;gBACxE,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;gBAEnF,IAAI,SAAS,EAAE,CAAC;oBACZ,+EAA+E;oBAC/E,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC1E,CAAC;qBAAM,CAAC;oBACJ,4DAA4D;oBAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;oBACjD,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC/E,oCAAoC;oBACpC,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;oBACzC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;gBAClF,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,GAAG,SAAS,CAAC,WAAW,GAAG,KAAK,EAAE,CAAC,CAAC;gBAC1E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,MAAM,CAAC,UAAU,CAAC,OAAO,MAAM,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEzF,mCAAmC;gBACnC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,KAAK,CAAC;qBACxH,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,MAAM,CAAC,UAAU,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,CAAC,CAAC;qBAChG,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,MAAM,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;qBAChE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;qBACtB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBAChC,IAAI,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;oBAC5C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACjC,CAAC;gBAED,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YAGD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACvB,yEAAyE;gBACzE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACrE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;oBAClD,OAAO,EAAE,CAAC;gBACd,CAAC,CAAC,CAAC;gBAEH,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;oBACrC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,KAAK,KAAK,EAAE,EAAE,CAAC;wBACpH,SAAS;oBACb,CAAC;oBAED,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,WAAW,CAAC,GAAG,CAAC,CAAC;oBAEvF,IAAI,SAAS,EAAE,CAAC;wBACZ,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;oBAC3F,CAAC;yBAAM,CAAC;wBACJ,4DAA4D;wBAC5D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;wBACrD,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;wBACpG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;wBACzC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;oBAClF,CAAC;oBAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;oBAElD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpC,IAAI,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;wBAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBACrC,CAAC;oBACD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;YACL,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,+CAA+C;gBAC/C,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;YAChD,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACxF,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;YAC5E,IAAI,CAAC,UAAU,GAAG,mBAAmB,CAAC;YAEtC,uFAAuF;YACvF,yFAAyF;YACzF,uFAAuF;YACvF,iFAAiF;YACjF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7D,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE,CAChD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC;YAClF,CAAC;QACL,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;YAC1D,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;YACpE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,SAA4B,EAAE,IAAY,EAAE,OAAiC;QACvG,IAAI,SAAS,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YACjC,+FAA+F;YAC/F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,SAAS,CAAC,WAAW,SAAS,IAAI,GAAG,CAAC,CAAC;YAC1E,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5B,CAAC;IACL,CAAC;IAED;;MAEE;IACK,aAAa,CAAC,KAAa,EAAE,MAAc,EAAE,YAAY,GAAG,KAAK,EAAE,UAAU,GAAG,KAAK;QACxF,IAAI,UAAU,EAAE,CAAC;YACb,qCAAqC;YACrC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,SAAS,CAAC,KAAK,GAAG,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9H,CAAC;aAAM,CAAC;YACJ,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAClD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,GAAG,iBAAiB;oBACrD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,wBAAwB,CAAC;YAClF,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,gBAAgB,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACpD,UAAU,CAAC,GAAG,EAAE;wBACZ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;6BAC9F,IAAI,CAAC,OAAO,CAAC;6BACb,KAAK,CAAC,MAAM,CAAC,CAAC;wBACnB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;oBACjC,CAAC,EAAE,GAAG,CAAC,CAAC;gBACZ,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,KAAK,GAAG,eAAe,EAAE,MAAM,CAAC,CAAC;YACrF,CAAC;YACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;QACjC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,KAAa;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;QACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;gBACxD,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;iBAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACjC,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBACrD,CAAC;gBACD,OAAO,WAAW,CAAC;YACvB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function hapName(label: string | undefined, fallback?: string): string;
|
package/dist/hapName.js
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HomeKit (HAP) accepts names that start and end with a letter or number and otherwise contain only
|
|
3
|
+
* letters, numbers, spaces and ’ ' & ! . _ : ; ( ) / , - Other names trigger HAP-NodeJS warnings and
|
|
4
|
+
* may be rejected by the Home app.
|
|
5
|
+
*
|
|
6
|
+
* Turns a TaHoma label into such a name, e.g. "Büro kl." → "Büro kl", "IO (6649146)" → "IO 6649146".
|
|
7
|
+
* The label in the TaHoma app is not changed.
|
|
8
|
+
*/
|
|
9
|
+
const VALID_NAME = /^[\p{L}\p{N}](?:[\p{L}\p{N}\p{Zs}’'&!._:;()/,-]*[\p{L}\p{N}])?$/u;
|
|
10
|
+
export function hapName(label, fallback = 'Accessory') {
|
|
11
|
+
const original = (label ?? '').trim();
|
|
12
|
+
if (VALID_NAME.test(original)) {
|
|
13
|
+
return original;
|
|
14
|
+
}
|
|
15
|
+
const name = original
|
|
16
|
+
.replace(/\(([^()]*)\)/g, ' $1 ') // "IO (123)" -> "IO 123 "
|
|
17
|
+
.replace(/[^\p{L}\p{N}\p{Zs}’'&!._:;()/,-]/gu, ' ') // unsupported characters -> space
|
|
18
|
+
.replace(/^[^\p{L}\p{N}]+|[^\p{L}\p{N}]+$/gu, '') // must start and end with letter/number
|
|
19
|
+
.replace(/\s+/g, ' ')
|
|
20
|
+
.trim();
|
|
21
|
+
return name || fallback;
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=hapName.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hapName.js","sourceRoot":"","sources":["../src/hapName.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,UAAU,GAAG,kEAAkE,CAAC;AAEtF,MAAM,UAAU,OAAO,CAAC,KAAyB,EAAE,QAAQ,GAAG,WAAW;IACrE,MAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ;SAChB,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAAuB,2BAA2B;SAClF,OAAO,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAC,kCAAkC;SACrF,OAAO,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAO,wCAAwC;SAC/F,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,IAAI,EAAE,CAAC;IACZ,OAAO,IAAI,IAAI,QAAQ,CAAC;AAC5B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tplnet/homebridge-tahoma",
|
|
3
|
-
"displayName": "Homebridge TaHoma (tplnet
|
|
3
|
+
"displayName": "Homebridge Somfy TaHoma (tplnet)",
|
|
4
4
|
"type": "module",
|
|
5
|
-
"version": "2.3.
|
|
5
|
+
"version": "2.3.6",
|
|
6
6
|
"description": "Homebridge plugin for TaHoma and Cozytouch services (Somfy, Atlantic, Thermor, Sauter). Maintained fork of dubocr/homebridge-tahoma.",
|
|
7
7
|
"author": "Romain DUBOC <dubocr@gmail.com>",
|
|
8
8
|
"license": "Apache-2.0",
|
|
@@ -23,7 +23,8 @@
|
|
|
23
23
|
"watch": "npm run build && npm link && nodemon",
|
|
24
24
|
"clean": "rimraf ./dist",
|
|
25
25
|
"build": "rimraf ./dist && tsc",
|
|
26
|
-
"prepublishOnly": "npm run lint && npm run build"
|
|
26
|
+
"prepublishOnly": "npm run lint && npm run build",
|
|
27
|
+
"smoke": "node scripts/homebridge-smoke.mjs"
|
|
27
28
|
},
|
|
28
29
|
"keywords": [
|
|
29
30
|
"homebridge-plugin",
|
|
@@ -34,7 +35,7 @@
|
|
|
34
35
|
],
|
|
35
36
|
"homepage": "https://github.com/tplnet/homebridge-tahoma#readme",
|
|
36
37
|
"dependencies": {
|
|
37
|
-
"overkiz-client": "npm:@tplnet/overkiz-client@^1.
|
|
38
|
+
"overkiz-client": "npm:@tplnet/overkiz-client@^1.3.1"
|
|
38
39
|
},
|
|
39
40
|
"devDependencies": {
|
|
40
41
|
"@eslint/js": "^10.0.1",
|
package/platform.schema.json
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"type": "string",
|
|
15
15
|
"required": true,
|
|
16
16
|
"default": "TaHoma",
|
|
17
|
-
"description": "The name of this platform in
|
|
17
|
+
"description": "The name of this platform in Apple Home"
|
|
18
18
|
},
|
|
19
19
|
"service": {
|
|
20
20
|
"title": "Service",
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
"exposeScenarios": {
|
|
90
90
|
"title": "Expose scenarios",
|
|
91
91
|
"type": "boolean",
|
|
92
|
-
"description": "Expose scenarios as
|
|
92
|
+
"description": "Expose scenarios as switches in Apple Home to trigger them"
|
|
93
93
|
},
|
|
94
94
|
"exclude": {
|
|
95
95
|
"type": "array",
|