homebridge-plejd 1.2.8 → 1.2.9
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +30 -9
- package/config.schema.json +7 -5
- package/dist/model/device.d.ts +1 -0
- package/dist/model/device.d.ts.map +1 -1
- package/dist/plejdPlatform.d.ts +2 -0
- package/dist/plejdPlatform.d.ts.map +1 -1
- package/dist/plejdPlatform.js +25 -10
- package/dist/plejdPlatform.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
<DIV ALIGN="CENTER" STYLE="text-align:center">
|
|
4
4
|
|
|
5
5
|
# [Plejd](https://www.plejd.com)
|
|
6
|
+
|
|
6
7
|
## HomeKit support for the Plejd BLE platform using [Homebridge](https://homebridge.io)
|
|
7
8
|
|
|
8
|
-
### Official support is released using the Plejd gateway
|
|
9
|
-
##### This addon exist if you don't want to use yet another bridge.
|
|
9
|
+
### Official support is released using the Plejd gateway
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
#### This addon exist if you don't want to use yet another bridge
|
|
12
12
|
|
|
13
13
|
[](https://github.com/Herlix/homebridge-plejd/actions/workflows/build.yml)
|
|
14
14
|
[](https://github.com/Herlix/homebridge-plejd/actions/workflows/build.yml)
|
|
@@ -16,9 +16,31 @@
|
|
|
16
16
|
</DIV>
|
|
17
17
|
</SPAN>
|
|
18
18
|
|
|
19
|
-
<br />
|
|
20
19
|
|
|
21
|
-
|
|
20
|
+
## Docker Compose
|
|
21
|
+
|
|
22
|
+
I'm running this in docker-compose on a Raspberry PI 4b 8gb.
|
|
23
|
+
|
|
24
|
+
Raspberry pi is running Debian Bullseye (Raspberry Pi OS) with docker and docker compose installed, nothing extra.
|
|
25
|
+
|
|
26
|
+
```yml
|
|
27
|
+
homebridge:
|
|
28
|
+
image: oznu/homebridge:latest
|
|
29
|
+
restart: unless-stopped
|
|
30
|
+
network_mode: host
|
|
31
|
+
privileged: true
|
|
32
|
+
volumes:
|
|
33
|
+
- /home/pi/.homebridge:/homebridge
|
|
34
|
+
logging:
|
|
35
|
+
driver: json-file
|
|
36
|
+
options:
|
|
37
|
+
max-size: "10mb"
|
|
38
|
+
max-file: "1"
|
|
39
|
+
|
|
40
|
+
```
|
|
41
|
+
|
|
42
|
+
### If not docker: Dependencies needed for Raspberry PI
|
|
43
|
+
|
|
22
44
|
This is tested on a raspberry pi 3b+ & 4b using DIM-02 and DIM-01. Please let me know if there's any issues with other units. Feel free to poke around.
|
|
23
45
|
|
|
24
46
|
```bash
|
|
@@ -27,9 +49,8 @@ sudo apt-get install bluetooth bluez libbluetooth-dev libudev-dev
|
|
|
27
49
|
|
|
28
50
|
Check out ble lib [@abandonware/Noble](https://github.com/abandonware/noble) for you specific platform
|
|
29
51
|
|
|
30
|
-
<br/>
|
|
31
|
-
|
|
32
52
|
### Settings
|
|
53
|
+
|
|
33
54
|
Use Plejd Login information (username, password, site) to let the addon take care of getting token.
|
|
34
55
|
|
|
35
56
|
Another alternative is to list the crypto key and devices manually.
|
|
@@ -39,13 +60,13 @@ If you choose to use both, the devices will be updated according yo what you set
|
|
|
39
60
|
Check the logs on start up if you'd like to remove the login info after it's been used.
|
|
40
61
|
|
|
41
62
|
Device info can be found like [this](./docs/Device%20Info.md)!
|
|
63
|
+
|
|
42
64
|
### Notes
|
|
65
|
+
|
|
43
66
|
This plugin lacks testing for multiple platforms. Feel free to test on your system. The main dependency [@abandonware/Noble](https://github.com/abandonware/noble) is your guide in case of your separate system. Usually BLE is the problem.
|
|
44
67
|
|
|
45
68
|
Feel free to open a ticket if you can't get it working.
|
|
46
69
|
|
|
47
|
-
Docker: BLE seems to be a hassle to get up an running. If you get it up and running please let me know. (I've not poured much time into it.)
|
|
48
|
-
|
|
49
70
|
## Thanks
|
|
50
71
|
|
|
51
72
|
Big thanks to [@blommegard](https://github.com/blommegard) with [this](https://github.com/blommegard/homebridge-plejd) project. As well as [@klali](https://github.com/klali) with [this](https://github.com/klali/ha-plejd) project.
|
package/config.schema.json
CHANGED
|
@@ -49,15 +49,17 @@
|
|
|
49
49
|
"title": "Model",
|
|
50
50
|
"type": "string",
|
|
51
51
|
"enum": [
|
|
52
|
-
"CTR-01",
|
|
53
|
-
"DAL-01",
|
|
54
52
|
"DIM-01",
|
|
55
|
-
"DIM-01-2P",
|
|
56
53
|
"DIM-02",
|
|
57
54
|
"LED-10",
|
|
58
|
-
"
|
|
55
|
+
"DIM-01-2P",
|
|
56
|
+
"REL-01",
|
|
59
57
|
"REL-02",
|
|
60
|
-
"
|
|
58
|
+
"REL-01-2P",
|
|
59
|
+
"DAL-01",
|
|
60
|
+
"SPR-01",
|
|
61
|
+
"CTR-01",
|
|
62
|
+
"WPH-01"
|
|
61
63
|
],
|
|
62
64
|
"required": true
|
|
63
65
|
},
|
package/dist/model/device.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/model/device.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/model/device.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
|
package/dist/plejdPlatform.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig, Service, Characteristic } from 'homebridge';
|
|
2
2
|
import { PlejdPlatformAccessoryHandler } from './plejdPlatformAccessory';
|
|
3
3
|
import { UserInputConfig } from './model/userInputConfig';
|
|
4
|
+
import { Device } from './model/device';
|
|
4
5
|
import { PlejdService } from './plejdService';
|
|
5
6
|
import { Site } from './model/plejdSite';
|
|
6
7
|
export declare class PlejdPlatform implements DynamicPlatformPlugin {
|
|
@@ -22,6 +23,7 @@ export declare class PlejdPlatform implements DynamicPlatformPlugin {
|
|
|
22
23
|
*/
|
|
23
24
|
configureAccessory: (accessory: PlatformAccessory) => void;
|
|
24
25
|
discoverDevices: () => void;
|
|
26
|
+
addNewDevice: (device: Device) => void;
|
|
25
27
|
onPlejdUpdates: (identifier: number, isOn: boolean, brightness?: number) => void;
|
|
26
28
|
private generateId;
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plejdPlatform.d.ts","sourceRoot":"","sources":["../src/plejdPlatform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,cAAc,EACf,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"plejdPlatform.d.ts","sourceRoot":"","sources":["../src/plejdPlatform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,cAAc,EACf,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,qBAAa,aAAc,YAAW,qBAAqB;aAcvC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAf1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CACvB;IAEvB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,YAAY,CAAC;IAGnC,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAEtD,SAAgB,aAAa,EAAE,6BAA6B,EAAE,CAAM;gBAGlD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAO1B,cAAc,aA8BZ;IAEF,gBAAgB,QAAS,MAAM,UAAU,cAAc,SAAS,IAAI,UAkFlE;IAEF;;;OAGG;IACH,kBAAkB,cAAe,iBAAiB,UAGhD;IAEF,eAAe,aA2Bb;IAEF,YAAY,WAAY,MAAM,UAiB5B;IAEF,cAAc,eAAgB,MAAM,QAAQ,OAAO,eAAe,MAAM,UA2DtE;IAEF,OAAO,CAAC,UAAU,CAEhB;CACH"}
|
package/dist/plejdPlatform.js
CHANGED
|
@@ -49,6 +49,7 @@ class PlejdPlatform {
|
|
|
49
49
|
const id = item.deviceId;
|
|
50
50
|
const e = site.plejdDevices.find((x) => x.deviceId === id);
|
|
51
51
|
const dim = e.firmware.notes;
|
|
52
|
+
const room = site.rooms.find((x) => x.roomId === item.roomId);
|
|
52
53
|
let identifier = site.inputAddress[id][0];
|
|
53
54
|
if (dim.endsWith('-02') &&
|
|
54
55
|
items.find((a) => a.identifier === identifier) !== undefined) {
|
|
@@ -60,6 +61,7 @@ class PlejdPlatform {
|
|
|
60
61
|
identifier: identifier,
|
|
61
62
|
isDimmer: settings_1.PLEJD_LIGHTS.includes(dim),
|
|
62
63
|
uuid: this.generateId(identifier.toString()),
|
|
64
|
+
room: room === null || room === void 0 ? void 0 : room.title,
|
|
63
65
|
};
|
|
64
66
|
items.push(res);
|
|
65
67
|
});
|
|
@@ -122,18 +124,25 @@ class PlejdPlatform {
|
|
|
122
124
|
this.plejdHandlers.push(new plejdPlatformAccessory_1.PlejdPlatformAccessoryHandler(this, existingAccessory, device));
|
|
123
125
|
}
|
|
124
126
|
else {
|
|
125
|
-
this.
|
|
126
|
-
const accessory = new this.api.platformAccessory(device.name, device.uuid);
|
|
127
|
-
accessory.context.device = device;
|
|
128
|
-
// See above.
|
|
129
|
-
this.plejdHandlers.push(new plejdPlatformAccessory_1.PlejdPlatformAccessoryHandler(this, accessory, device));
|
|
130
|
-
// link the accessory to your platform
|
|
131
|
-
this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [
|
|
132
|
-
accessory,
|
|
133
|
-
]);
|
|
127
|
+
this.addNewDevice(device);
|
|
134
128
|
}
|
|
135
129
|
}
|
|
136
130
|
};
|
|
131
|
+
this.addNewDevice = (device) => {
|
|
132
|
+
let name = device.name;
|
|
133
|
+
this.log.info('Adding new accessory |', name);
|
|
134
|
+
if (device.room) {
|
|
135
|
+
name = device.room + ' - ' + name;
|
|
136
|
+
}
|
|
137
|
+
const accessory = new this.api.platformAccessory(device.name, device.uuid);
|
|
138
|
+
accessory.context.device = device;
|
|
139
|
+
// See above.
|
|
140
|
+
this.plejdHandlers.push(new plejdPlatformAccessory_1.PlejdPlatformAccessoryHandler(this, accessory, device));
|
|
141
|
+
// link the accessory to your platform
|
|
142
|
+
this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [
|
|
143
|
+
accessory,
|
|
144
|
+
]);
|
|
145
|
+
};
|
|
137
146
|
this.onPlejdUpdates = (identifier, isOn, brightness) => {
|
|
138
147
|
var _a, _b, _c;
|
|
139
148
|
const uuid = (_a = this.userInputConfig.devices.find((d) => d.identifier === identifier)) === null || _a === void 0 ? void 0 : _a.uuid;
|
|
@@ -166,7 +175,13 @@ class PlejdPlatform {
|
|
|
166
175
|
plejdHandler.updateState(isOn, brightness);
|
|
167
176
|
}
|
|
168
177
|
else {
|
|
169
|
-
|
|
178
|
+
if (device) {
|
|
179
|
+
this.addNewDevice(device);
|
|
180
|
+
this.onPlejdUpdates(identifier, isOn, brightness);
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
this.log.info('Unable find HomKit device associated with incoming Plejd update |', device);
|
|
184
|
+
}
|
|
170
185
|
}
|
|
171
186
|
};
|
|
172
187
|
this.generateId = (input) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plejdPlatform.js","sourceRoot":"","sources":["../src/plejdPlatform.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plejdPlatform.js","sourceRoot":"","sources":["../src/plejdPlatform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED