homebridge-plejd 1.2.3 → 1.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. package/README.md +10 -2
  2. package/dist/plejdPlatform.d.ts.map +1 -1
  3. package/dist/plejdPlatform.js +20 -5
  4. package/dist/plejdPlatform.js.map +1 -1
  5. package/dist/plejdService.d.ts.map +1 -1
  6. package/dist/plejdService.js +1 -4
  7. package/dist/plejdService.js.map +1 -1
  8. package/docs/Extracting crypto key.md +50 -5
  9. package/package.json +1 -1
  10. package/extractToken.sh +0 -40
package/README.md CHANGED
@@ -3,9 +3,10 @@
3
3
  <DIV ALIGN="CENTER" STYLE="text-align:center">
4
4
 
5
5
  # [Plejd](https://www.plejd.com)
6
-
7
6
  ## HomeKit support for the Plejd BLE platform using [Homebridge](https://homebridge.io)
8
7
 
8
+ ### Official support is released using the Plejd gateway.
9
+ ##### This addon exist if you don't want to use yet another bridge.
9
10
 
10
11
  <br />
11
12
 
@@ -18,7 +19,7 @@
18
19
  <br />
19
20
 
20
21
  ### Dependencies needed for Raspberry PI
21
- This is tested on a raspberry pi 3b+ using DIM-02 and DIM-01. Please let me know if there's any issues with other units. Feel free to poke around.
22
+ 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.
22
23
 
23
24
  ```bash
24
25
  sudo apt-get install bluetooth bluez libbluetooth-dev libudev-dev
@@ -33,6 +34,13 @@ To be able to communicate with Plejd you need the Crypto key. This is the hard p
33
34
 
34
35
  Besides the crypto key you will have to add your devices. The info can be extracted alongside the crypto key extraction but it's a bit overkill if you have the key and need device info. Checkout this guide on how to get [this](./docs/Device%20Info.md) info from the app.
35
36
 
37
+ ### Notes
38
+ 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.
39
+
40
+ Feel free to open a ticket if you can't get it working.
41
+
42
+ 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.)
43
+
36
44
  ## Thanks
37
45
 
38
46
  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/dist/plejdPlatform.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plejdPlatform.d.ts","sourceRoot":"","sources":["../src/plejdPlatform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5H,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAU,eAAe,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,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,CAA+B;IACpF,SAAgB,eAAe,EAAG,eAAe,CAAC;IAGlD,SAAgB,YAAY,EAAE,YAAY,CAAC;IAG3C,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;IAqB1B;;;KAGC;IACD,kBAAkB,cAAe,iBAAiB,UAGhD;IAEF,eAAe,aAqBb;IAEF,cAAc,eAAgB,MAAM,QAAQ,OAAO,2CAwCjD;IAEF,OAAO,CAAC,UAAU,CAEhB;CACH"}
1
+ {"version":3,"file":"plejdPlatform.d.ts","sourceRoot":"","sources":["../src/plejdPlatform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5H,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAU,eAAe,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,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,CAA+B;IACpF,SAAgB,eAAe,EAAG,eAAe,CAAC;IAGlD,SAAgB,YAAY,EAAE,YAAY,CAAC;IAG3C,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;IAwC1B;;;KAGC;IACD,kBAAkB,cAAe,iBAAiB,UAGhD;IAEF,eAAe,aAqBb;IAEF,cAAc,eAAgB,MAAM,QAAQ,OAAO,2CAwCjD;IAEF,OAAO,CAAC,UAAU,CAEhB;CACH"}
package/dist/plejdPlatform.js CHANGED
@@ -6,7 +6,6 @@ const plejdPlatformAccessory_1 = require("./plejdPlatformAccessory");
6
6
  const plejdService_1 = require("./plejdService");
7
7
  class PlejdPlatform {
8
8
  constructor(log, config, api) {
9
- var _a;
10
9
  this.log = log;
11
10
  this.config = config;
12
11
  this.api = api;
@@ -84,12 +83,28 @@ class PlejdPlatform {
84
83
  };
85
84
  this.log.debug('Finished initializing platform:', this.config.platform);
86
85
  // Update this to have it computed.
87
- const devices = config['devices'];
86
+ if (!config.devices) {
87
+ log.warn('No devices are configured');
88
+ }
89
+ const devices = config.devices;
88
90
  for (let i = 0; i < devices.length; i++) {
89
- devices[i].isDimmer = settings_1.PLEJD_LIGHTS.includes((devices[i].model));
90
- devices[i].uuid = this.generateId(devices[i].identifier.toString());
91
+ if (devices[i].model) {
92
+ devices[i].isDimmer = settings_1.PLEJD_LIGHTS.includes((devices[i].model));
93
+ }
94
+ else {
95
+ log.error('Missing device model |', devices[i].name);
96
+ }
97
+ if (devices[i].identifier) {
98
+ devices[i].uuid = this.generateId(devices[i].identifier.toString());
99
+ }
100
+ else {
101
+ log.error('Missing device identifier |', devices[i].name);
102
+ }
103
+ }
104
+ if (!config.crypto_key) {
105
+ log.error('No Crypto key was found in the configuration. Check the plugin documentation for more info');
91
106
  }
92
- const cryptoKey = Buffer.from(((_a = config['crypto_key']) !== null && _a !== void 0 ? _a : config['key']).replace(/-/g, ''), 'hex');
107
+ const cryptoKey = Buffer.from((config.crypto_key).replace(/-/g, ''), 'hex');
93
108
  this.userInputConfig = {
94
109
  devices: devices,
95
110
  cryptoKey: cryptoKey,
package/dist/plejdPlatform.js.map CHANGED
@@ -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/dist/plejdService.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plejdService.d.ts","sourceRoot":"","sources":["../src/plejdService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAgC1C,qBAAa,YAAY;IAOrB,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,GAAG,EAAE,MAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,mBAAmB,CAA0B;IACrD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,SAAS,CAAgB;gBAGd,MAAM,EAAE,eAAe,EACxB,GAAG,EAAE,MAAM,EACV,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI;IAWtF,WAAW,eAAgB,MAAM,QAAQ,OAAO,cAAc,MAAM,GAAG,IAAI,UAuBzE;IAGF,OAAO,CAAC,WAAW,CAOjB;IAEF,OAAO,CAAC,eAAe,CAerB;IAEF,OAAO,CAAC,QAAQ,CAad;IAEF,OAAO,CAAC,mBAAmB,CA8BzB;IAEF,OAAO,CAAC,UAAU,CAuBhB;IAEF,OAAO,CAAC,SAAS,CAyBf;IAEF,OAAO,CAAC,cAAc,CAapB;IAEF,OAAO,CAAC,SAAS,CAwBf;IAEF,OAAO,CAAC,UAAU,CAchB;IAEF,OAAO,CAAC,OAAO,CAiDb;IAEF,OAAO,CAAC,UAAU,CAOhB;CACH"}
1
+ {"version":3,"file":"plejdService.d.ts","sourceRoot":"","sources":["../src/plejdService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAgC1C,qBAAa,YAAY;IAOrB,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,GAAG,EAAE,MAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,mBAAmB,CAA0B;IACrD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,SAAS,CAAgB;gBAGd,MAAM,EAAE,eAAe,EACxB,GAAG,EAAE,MAAM,EACV,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI;IAWtF,WAAW,eAAgB,MAAM,QAAQ,OAAO,cAAc,MAAM,GAAG,IAAI,UAuBzE;IAGF,OAAO,CAAC,WAAW,CAOjB;IAEF,OAAO,CAAC,eAAe,CAerB;IAEF,OAAO,CAAC,QAAQ,CAad;IAEF,OAAO,CAAC,mBAAmB,CA0BzB;IAEF,OAAO,CAAC,UAAU,CAuBhB;IAEF,OAAO,CAAC,SAAS,CAyBf;IAEF,OAAO,CAAC,cAAc,CAapB;IAEF,OAAO,CAAC,SAAS,CAwBf;IAEF,OAAO,CAAC,UAAU,CAchB;IAEF,OAAO,CAAC,OAAO,CAiDb;IAEF,OAAO,CAAC,UAAU,CAOhB;CACH"}
package/dist/plejdService.js CHANGED
@@ -116,9 +116,6 @@ class PlejdService {
116
116
  });
117
117
  peripheral.once('disconnect', () => {
118
118
  this.log.info('Peripheral disconnected');
119
- peripheral.connect((msg) => {
120
- this.log.info('Peripheral unable to reconnected', msg);
121
- });
122
119
  });
123
120
  };
124
121
  this.discovered = (peripheral, services, characteristics) => {
@@ -168,7 +165,7 @@ class PlejdService {
168
165
  this.pingIndex = setInterval(() => {
169
166
  if (this.connectedPeripheral) {
170
167
  this.plejdPing(pingChar, (pingOk) => {
171
- if (pingOk === false) {
168
+ if (!pingOk) {
172
169
  this.disconnect(() => {
173
170
  this.startConnection();
174
171
  });
package/dist/plejdService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plejdService.js","sourceRoot":"","sources":["../src/plejdService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plejdService.js","sourceRoot":"","sources":["../src/plejdService.ts"],"names":[],"mappings":"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"}
package/docs/Extracting crypto key.md CHANGED
@@ -23,18 +23,63 @@ Recover the .site file:
23
23
  $ cp apps/com.plejd.plejdapp/f/*/*.site site.json
24
24
  ```
25
25
 
26
- ### Steps for iOS on MacOs:
26
+ ### Steps for iOS:
27
27
 
28
+
29
+ One free alternative is to use [this](https://github.com/richinfante/iphonebackuptools) npm package.
30
+
31
+ There's some information on how to use it. This means using the terminal.
32
+
33
+ There might be other alternatives out there.
34
+
35
+ ### Using NPM & JQ
28
36
  Connect you iPhone to your computer and make a backup
29
37
 
30
- *Steps: finder -> locations -> [phone] -> un-tick 'Encrypt local backup' -> Back up now*
38
+ Mac: *Steps: finder -> locations -> [phone] -> un-tick 'Encrypt local backup' -> Back up now*
31
39
 
40
+ ```bash
41
+ # on mac you need to use sudo.
42
+ npm i -g ibackuptool
43
+ ```
44
+
45
+ Mac: *System preferences -> Security & Privacy -> Privacy -> tick Full disk access for terminal*
32
46
  ```bash
33
- ./plejd.sh
47
+ #!/bin/bash
48
+ PREFIX=`npm config get prefix`
49
+ NODE_IBACKUP_DIR=$PREFIX/lib/node_modules/ibackuptool
50
+
51
+ sudo find $NODE_IBACKUP_DIR/**/*js -exec sudo dos2unix {} \;
34
52
  ```
35
53
 
36
- All the info will be printed in the terminal for you.
54
+ Run the extraction:
55
+ ```bash
56
+ ibackuptool -l -f json > temp.json
57
+ ````
58
+ This output can be read using any editor, search for ```.PlejdMesh.CryptoKey```
59
+
60
+
61
+ If you'd want to automate it a bit more using jq:
62
+
63
+ ```
64
+ #!/bin/bash
65
+ # ----> Run the ibackup tool and put all information into a raw json variable
66
+ RAW=$(ibackuptool -l -f json)
67
+
68
+ # ----> Get the fields needed
69
+ UUID=$(echo ${RAW} | sed 's/run backups.list //' | jq '.[0].udid' | sed 's/"//g')
70
+
71
+ # ----> Extract the actual needed data into a temp dir
72
+ mkdir temp
73
+ Q=$(sudo ibackuptool -b ${UUID} -r backup.files --extract ./temp --regex-filter '\.(site)$')
74
+ mv temp/App/com.plejd.consumer.light/Documents/**/*.site ./temp/site.json
75
+
76
+ # ----> List the data and remove the temp dir
77
+ cat ./temp/site.json | jq '.PlejdMesh.CryptoKey' | sed 's/-//g' | sed 's/"//g'
78
+ cat ./temp/site.json | jq '.PlejdMesh._outputAddresses' | grep -v '\$type' | jq '.[][]'
79
+ rm -rf temp
80
+ ````
81
+
82
+ Mac: *System preferences -> Security & Privacy -> Privacy -> un-tick Full disk access for terminal*
37
83
 
38
- Requirements: ```node``` & ```jq```
39
84
  <br />
40
85
 
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "displayName": "Plejd",
4
4
  "name": "homebridge-plejd",
5
5
  "author": "Alexander Herlin",
6
- "version": "1.2.3",
6
+ "version": "1.2.5",
7
7
  "description": "HomeKit support for the Plejd BLE platform using Homebridge",
8
8
  "license": "MIT",
9
9
  "repository": {
package/extractToken.sh DELETED
@@ -1,40 +0,0 @@
1
- #/bin/bash
2
-
3
- # ----> Check if you're using a mac, if not don't continue
4
- UNAME=$(uname)
5
- if [ $UNAME != 'Darwin' ]; then
6
- echo "For now only works on mac"
7
- exit 0
8
- fi
9
-
10
- # ----> Look for global NPM modules and set the path to ibackuptool that we'll use for extraction
11
- PREFIX=$(npm config get prefix)
12
- NODE_IBACKUP_DIR=$PREFIX/lib/node_modules/ibackuptool
13
-
14
- # ----> If the ibackup tool is not installed, let's install it
15
- if [ ! -d "$NODE_IBACKUP_DIR" ]; then
16
- then
17
- sudo npm i -g ibackuptool
18
- echo "Installing ibackuptool https://github.com/richinfante/iphonebackuptools"
19
- # To make it run on mac we need to fix the line breaks in the files.
20
- sudo find $NODE_IBACKUP_DIR/**/*js -exec sudo dos2unix {} \;
21
- echo "System preferences -> Security & Privacy -> Privacy -> tick Full disk access for terminal"
22
- fi
23
-
24
- # ----> Run the ibackup tool and put all information into a raw json variable
25
- RAW=$(ibackuptool -l -f json)
26
-
27
- # ----> Get the fields needed
28
- UUID=$(echo ${RAW} | sed 's/run backups.list //' | jq '.[0].udid' | sed 's/"//g')
29
-
30
- # ----> Extract the actual needed data into a temp dir
31
- mkdir temp
32
- Q=$(sudo ibackuptool -b ${UUID} -r backup.files --extract ./temp --regex-filter '\.(site)$')
33
- mv temp/App/com.plejd.consumer.light/Documents/**/*.site ./temp/site.json
34
-
35
- # ----> List the data and remove the temp dir
36
- cat ./temp/site.json | jq '.PlejdMesh.CryptoKey' | sed 's/-//g' | sed 's/"//g'
37
- cat ./temp/site.json | jq '.PlejdMesh._outputAddresses' | grep -v '\$type' | jq '.[][]'
38
- rm -rf temp
39
-
40
- echo "System preferences -> Security & Privacy -> Privacy -> un-tick Full disk access for terminal"