homebridge-plejd 1.1.3-beta.0 → 1.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (19) hide show
  1. package/README.md +7 -4
  2. package/dist/model.d.ts.map +1 -1
  3. package/dist/plejdPlatform.d.ts +1 -6
  4. package/dist/plejdPlatform.d.ts.map +1 -1
  5. package/dist/plejdPlatform.js +13 -23
  6. package/dist/plejdPlatform.js.map +1 -1
  7. package/dist/plejdPlatformAccessory.d.ts +12 -7
  8. package/dist/plejdPlatformAccessory.d.ts.map +1 -1
  9. package/dist/plejdPlatformAccessory.js +48 -25
  10. package/dist/plejdPlatformAccessory.js.map +1 -1
  11. package/dist/plejdService.d.ts +3 -3
  12. package/dist/plejdService.d.ts.map +1 -1
  13. package/dist/plejdService.js +103 -74
  14. package/dist/plejdService.js.map +1 -1
  15. package/dist/settings.d.ts +0 -8
  16. package/dist/settings.d.ts.map +1 -1
  17. package/dist/settings.js +1 -9
  18. package/dist/settings.js.map +1 -1
  19. package/package.json +2 -2
package/README.md CHANGED
@@ -5,11 +5,16 @@
5
5
  # [Plejd](https://www.plejd.com)
6
6
 
7
7
  ## HomeKit support for the Plejd BLE platform using [Homebridge](https://homebridge.io)
8
+
9
+
10
+ <br />
11
+
12
+ [![Build and Lint](https://img.shields.io/github/workflow/status/herlix/homebridge-plejd/Build%20and%20Lint?style=flat-square)](https://github.com/Herlix/homebridge-plejd/actions/workflows/build.yml)
13
+ [![Build and Lint](https://img.shields.io/npm/dm/homebridge-plejd?style=flat-square)](https://github.com/Herlix/homebridge-plejd/actions/workflows/build.yml)
14
+
8
15
  </DIV>
9
16
  </SPAN>
10
17
 
11
-
12
- ---
13
18
  <br />
14
19
 
15
20
  ### Dependencies needed for Raspberry PI
@@ -21,7 +26,6 @@ sudo apt-get install bluetooth bluez libbluetooth-dev libudev-dev
21
26
 
22
27
  Check out ble lib [@abandonware/Noble](https://github.com/abandonware/noble) for you specific platform
23
28
 
24
- ----
25
29
  <br/>
26
30
 
27
31
  ## TODO: Extract crypto key
@@ -30,7 +34,6 @@ For now look for guides online. Backup your phone unencrypted. Download an extra
30
34
 
31
35
  ```com.plejd.consumer.light ... .site .... .PlejdMesh.CryptoKey ```
32
36
 
33
- ----
34
37
  <br />
35
38
 
36
39
  ## Thanks
package/dist/model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";AAAA,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB"}
1
+ {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";AAAA,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB"}
package/dist/plejdPlatform.d.ts CHANGED
@@ -16,13 +16,8 @@ export declare class PlejdPlatform implements DynamicPlatformPlugin {
16
16
  * It should be used to setup event handlers for characteristics and update respective values.
17
17
  */
18
18
  configureAccessory(accessory: PlatformAccessory): void;
19
- /**
20
- * This is an example method showing how to register discovered accessories.
21
- * Accessories must only be registered once, previously created accessories
22
- * must not be registered again to prevent "duplicate UUID" errors.
23
- */
24
19
  discoverDevices(): void;
25
- onPlejdUpdates(identifier: number, state: number, dim?: number): void;
20
+ onPlejdUpdates(identifier: number, isOn: boolean, dim?: number): void;
26
21
  private generateId;
27
22
  }
28
23
  //# sourceMappingURL=plejdPlatform.d.ts.map
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;AAI5H,OAAO,EAAU,eAAe,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,aAAc,YAAW,qBAAqB;aAWvC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAZ1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IACpF,SAAgB,eAAe,EAAG,eAAe,CAAC;IAElD,SAAgB,YAAY,EAAE,YAAY,CAAC;IAG3C,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;gBAGpC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAuB1B;;;KAGC;IACD,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAK/C;;;;KAIC;IACD,eAAe;IAiCf,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAuB9D,OAAO,CAAC,UAAU;CAGnB"}
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;AAI5H,OAAO,EAAU,eAAe,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,aAAc,YAAW,qBAAqB;aAWvC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAZ1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IACpF,SAAgB,eAAe,EAAG,eAAe,CAAC;IAElD,SAAgB,YAAY,EAAE,YAAY,CAAC;IAG3C,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;gBAGpC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAqB1B;;;KAGC;IACD,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAK/C,eAAe;IAuBf,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM;IAyB9D,OAAO,CAAC,UAAU;CAGnB"}
package/dist/plejdPlatform.js CHANGED
@@ -6,6 +6,7 @@ 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;
9
10
  this.log = log;
10
11
  this.config = config;
11
12
  this.api = api;
@@ -20,30 +21,23 @@ class PlejdPlatform {
20
21
  devs[i].isDimmer = settings_1.PLEJD_LIGHTS.includes((devs[i].model));
21
22
  devs[i].uuid = this.generateId(devs[i].identifier.toString());
22
23
  }
23
- const cryptoKey = Buffer.from(config['crypto_key'].replace(/-/g, ''), 'hex');
24
+ const cryptoKey = Buffer.from(((_a = config['crypto_key']) !== null && _a !== void 0 ? _a : config['key']).replace(/-/g, ''), 'hex');
24
25
  this.userInputConfig = {
25
26
  devices: devs,
26
27
  cryptoKey: cryptoKey,
27
28
  };
28
29
  this.log.debug('UserConfig: ', this.userInputConfig);
29
30
  this.plejdService = new plejdService_1.PlejdService(this.userInputConfig, log, this.onPlejdUpdates.bind(this));
30
- this.api.on('didFinishLaunching', () => {
31
- this.discoverDevices();
32
- });
31
+ this.api.on('didFinishLaunching', () => this.discoverDevices());
33
32
  }
34
33
  /**
35
34
  * This function is invoked when homebridge restores cached accessories from disk at startup.
36
35
  * It should be used to setup event handlers for characteristics and update respective values.
37
36
  */
38
37
  configureAccessory(accessory) {
39
- this.log.info('Loading accessory from cache:', accessory.displayName);
38
+ this.log.info('Loading accessory from cache | ', accessory.displayName);
40
39
  this.accessories.push(accessory);
41
40
  }
42
- /**
43
- * This is an example method showing how to register discovered accessories.
44
- * Accessories must only be registered once, previously created accessories
45
- * must not be registered again to prevent "duplicate UUID" errors.
46
- */
47
41
  discoverDevices() {
48
42
  const units = this.userInputConfig.devices.map(x => x.uuid);
49
43
  const notRegistered = this.accessories.filter(ac => !units.includes(ac.UUID));
@@ -53,26 +47,20 @@ class PlejdPlatform {
53
47
  for (const device of this.userInputConfig.devices) {
54
48
  const existingAccessory = this.accessories.find(accessory => accessory.UUID === device.uuid);
55
49
  if (existingAccessory) {
56
- this.log.info('Restoring existing accessory from cache:', existingAccessory.displayName);
57
- existingAccessory.context.device = device;
58
- existingAccessory.displayName = device.name;
59
- this.api.updatePlatformAccessories([existingAccessory]);
60
- // Create a handle for the device to take care of logic
61
- // lives for as long as "this" is active.
62
- new plejdPlatformAccessory_1.PlejdPlatformAccessory(this, existingAccessory);
50
+ new plejdPlatformAccessory_1.PlejdPlatformAccessory(this, existingAccessory, device);
63
51
  }
64
52
  else {
65
- this.log.info('Adding new accessory:', device.name);
53
+ this.log.info('Adding new accessory |', device.name);
66
54
  const accessory = new this.api.platformAccessory(device.name, device.uuid);
67
55
  accessory.context.device = device;
68
56
  // See above.
69
- new plejdPlatformAccessory_1.PlejdPlatformAccessory(this, accessory);
57
+ new plejdPlatformAccessory_1.PlejdPlatformAccessory(this, accessory, device);
70
58
  // link the accessory to your platform
71
59
  this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
72
60
  }
73
61
  }
74
62
  }
75
- onPlejdUpdates(identifier, state, dim) {
63
+ onPlejdUpdates(identifier, isOn, dim) {
76
64
  var _a, _b, _c, _d;
77
65
  const uuid = (_a = this.userInputConfig.devices.find(d => d.identifier === identifier)) === null || _a === void 0 ? void 0 : _a.uuid;
78
66
  if (uuid === undefined) {
@@ -84,11 +72,13 @@ class PlejdPlatform {
84
72
  if (existingAccessory && device) {
85
73
  if (device.isDimmer) {
86
74
  const ser = existingAccessory.getService(this.Service.Lightbulb);
87
- (_b = ser === null || ser === void 0 ? void 0 : ser.getCharacteristic(this.Characteristic.On)) === null || _b === void 0 ? void 0 : _b.updateValue(state);
88
- ser === null || ser === void 0 ? void 0 : ser.getCharacteristic(this.Characteristic.Brightness).updateValue(dim === 0 ? 1 : ((100 / 255) * dim));
75
+ (_b = ser === null || ser === void 0 ? void 0 : ser.getCharacteristic(this.Characteristic.On)) === null || _b === void 0 ? void 0 : _b.updateValue(isOn);
76
+ if (dim !== undefined) {
77
+ ser === null || ser === void 0 ? void 0 : ser.getCharacteristic(this.Characteristic.Brightness).updateValue(dim);
78
+ }
89
79
  }
90
80
  else {
91
- (_d = (_c = existingAccessory.getService(this.Service.Switch)) === null || _c === void 0 ? void 0 : _c.getCharacteristic(this.Characteristic.On)) === null || _d === void 0 ? void 0 : _d.updateValue(state);
81
+ (_d = (_c = existingAccessory.getService(this.Service.Switch)) === null || _c === void 0 ? void 0 : _c.getCharacteristic(this.Characteristic.On)) === null || _d === void 0 ? void 0 : _d.updateValue(isOn);
92
82
  }
93
83
  }
94
84
  }
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":";;;AAEA,yCAAsE;AACtE,qEAAkE;AAElE,iDAA8C;AAE9C,MAAa,aAAa;IAUxB,YACkB,GAAW,EACX,MAAsB,EACtB,GAAQ;;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QAZV,YAAO,GAAmB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/C,mBAAc,GAA0B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAKpF,oDAAoD;QACpC,gBAAW,GAAwB,EAAE,CAAC;QAOpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxE,mCAAmC;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAa,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,IAAI,CAAC,MAAM,EAAC,CAAC,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,uBAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1D,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC/D;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAA,MAAM,CAAC,YAAY,CAAC,mCAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QAChG,IAAI,CAAC,eAAe,GAAG;YACrB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,SAAS;SACrB,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAClE,CAAC;IAED;;;KAGC;IACD,kBAAkB,CAAC,SAA4B;QAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACxE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED,eAAe;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,sBAAW,EAAE,wBAAa,EAAE,aAAa,CAAC,CAAC;SACnF;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE;YACjD,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7F,IAAI,iBAAiB,EAAE;gBACrB,IAAI,+CAAsB,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;aAC7D;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrD,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC3E,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;gBAClC,aAAa;gBACb,IAAI,+CAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;gBACpD,sCAAsC;gBACtC,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aAC/E;SACF;IACH,CAAC;IAED,cAAc,CAAC,UAAkB,EAAE,IAAa,EAAE,GAAY;;QAC5D,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,0CAAE,IAAI,CAAC;QACvF,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2CAA2C,UAAU,0CAA0C,CAAC,CAAC;YAC/G,OAAO;SACR;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAK,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QACvF,IAAI,iBAAiB,IAAI,MAAM,EAAE;YAC/B,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACnB,MAAM,GAAG,GAAG,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACjE,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,0CAAE,WAAW,CAAC,IAAI,CAAC,CAAC;gBAClE,IAAI,GAAG,KAAK,SAAS,EAAE;oBACrB,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAClD,WAAW,CAAC,GAAG,CAAC,CAAC;iBACrB;aACF;iBAAM;gBACL,MAAA,MAAA,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,0CAC7C,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,0CACzC,WAAW,CAAC,IAAI,CAAC,CAAC;aACvB;SACF;IAEH,CAAC;IAEO,UAAU,CAAC,KAAa;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;CACF;AA9FD,sCA8FC"}
package/dist/plejdPlatformAccessory.d.ts CHANGED
@@ -1,5 +1,10 @@
1
1
  import { PlatformAccessory, CharacteristicValue } from 'homebridge';
2
+ import { Device } from './model';
2
3
  import { PlejdPlatform } from './plejdPlatform';
4
+ interface DeviceState {
5
+ isOn: boolean;
6
+ brightness: number;
7
+ }
3
8
  /**
4
9
  * Platform Accessory
5
10
  * An instance of this class is created for each accessory your platform registers
@@ -8,17 +13,17 @@ import { PlejdPlatform } from './plejdPlatform';
8
13
  export declare class PlejdPlatformAccessory {
9
14
  private readonly platform;
10
15
  private readonly accessory;
16
+ private readonly device;
11
17
  private service;
12
- private device;
13
- /**
14
- * These are just used to create a working example
15
- * You should implement your own code to track the state of your accessory
16
- */
17
- private deviceState;
18
- constructor(platform: PlejdPlatform, accessory: PlatformAccessory);
18
+ private state;
19
+ private cachePath;
20
+ constructor(platform: PlejdPlatform, accessory: PlatformAccessory, device: Device);
19
21
  setOn(value: CharacteristicValue): Promise<void>;
20
22
  getOn(): Promise<CharacteristicValue>;
21
23
  setBrightness(value: CharacteristicValue): Promise<void>;
22
24
  getBrightness(): Promise<CharacteristicValue>;
25
+ updateStoredStateCache(): void;
26
+ getStoredStateCache(): DeviceState;
23
27
  }
28
+ export {};
24
29
  //# sourceMappingURL=plejdPlatformAccessory.d.ts.map
package/dist/plejdPlatformAccessory.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plejdPlatformAccessory.d.ts","sourceRoot":"","sources":["../src/plejdPlatformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAG7E,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD;;;;GAIG;AACH,qBAAa,sBAAsB;IAc/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAd5B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,MAAM,CAAS;IAEvB;;;OAGG;IACH,OAAO,CAAC,WAAW,CAGjB;gBAGiB,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB;IAkCzC,KAAK,CAAC,KAAK,EAAE,mBAAmB;IAWhC,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKrC,aAAa,CAAC,KAAK,EAAE,mBAAmB;IAOxC,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAIpD"}
1
+ {"version":3,"file":"plejdPlatformAccessory.d.ts","sourceRoot":"","sources":["../src/plejdPlatformAccessory.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,UAAU,WAAW;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,qBAAa,sBAAsB;IAM/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAPzB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,SAAS,CAAS;gBAGP,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM;IA6C3B,KAAK,CAAC,KAAK,EAAE,mBAAmB;IAWhC,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAMrC,aAAa,CAAC,KAAK,EAAE,mBAAmB;IAWxC,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKnD,sBAAsB;IAUtB,mBAAmB,IAAI,WAAW;CAInC"}
package/dist/plejdPlatformAccessory.js CHANGED
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PlejdPlatformAccessory = void 0;
4
+ const fs_1 = require("fs");
5
+ const path_1 = require("path");
4
6
  const settings_1 = require("./settings");
5
7
  /**
6
8
  * Platform Accessory
@@ -8,19 +10,22 @@ const settings_1 = require("./settings");
8
10
  * Each accessory may expose multiple services of different service types.
9
11
  */
10
12
  class PlejdPlatformAccessory {
11
- constructor(platform, accessory) {
13
+ constructor(platform, accessory, device) {
12
14
  this.platform = platform;
13
15
  this.accessory = accessory;
14
- /**
15
- * These are just used to create a working example
16
- * You should implement your own code to track the state of your accessory
17
- */
18
- this.deviceState = {
19
- On: false,
20
- Brightness: 100,
21
- };
22
- this.device = this.accessory.context.device;
16
+ this.device = device;
23
17
  platform.log.debug(`Adding handler for a ${this.device.model} with id ${this.device.identifier}`);
18
+ const dirPath = (0, path_1.join)(platform.api.user.storagePath(), 'plugin-persist', 'plejd-cache');
19
+ if (!(0, fs_1.existsSync)(dirPath)) {
20
+ (0, fs_1.mkdir)(dirPath, { recursive: true }, (err) => {
21
+ if (err) {
22
+ this.platform.log.warn('Unable to create storage path |', err);
23
+ }
24
+ });
25
+ }
26
+ this.cachePath = (0, path_1.join)(dirPath, `${device.identifier}.json`);
27
+ this.state = this.getStoredStateCache();
28
+ this.updateStoredStateCache();
24
29
  // set accessory information
25
30
  this.accessory.getService(this.platform.Service.AccessoryInformation)
26
31
  .setCharacteristic(this.platform.Characteristic.Manufacturer, settings_1.PLATFORM_NAME)
@@ -45,28 +50,46 @@ class PlejdPlatformAccessory {
45
50
  this.service.setCharacteristic(this.platform.Characteristic.Name, this.device.name);
46
51
  }
47
52
  async setOn(value) {
48
- this.deviceState.On = value;
49
- this.platform.log.debug('Set Characteristic On', this.device.name, this.deviceState.On);
50
- if (this.deviceState.On) {
51
- this.platform.plejdService.turnOn(this.device.identifier);
52
- }
53
- else {
54
- this.platform.plejdService.turnOff(this.device.identifier);
53
+ const oldVal = this.state.isOn;
54
+ const newVal = value;
55
+ if (oldVal !== newVal) {
56
+ this.state.isOn = newVal;
57
+ this.updateStoredStateCache();
58
+ this.platform.log.info(`Updating state | ${this.device.name} | to ${newVal ? 'On' : 'off'} | from ${oldVal ? 'On' : 'Off'}`);
59
+ this.platform.plejdService.updateState(this.device.identifier, newVal, null);
55
60
  }
56
61
  }
57
62
  async getOn() {
58
- this.platform.log.debug('Get Characteristic On', this.device.name, this.deviceState.On);
59
- return this.deviceState.On;
63
+ this.platform.log.debug('Get Characteristic On', this.device.name, this.state.isOn);
64
+ // this.platform.plejdService.getState(this.device.identifier);
65
+ return this.state.isOn;
60
66
  }
61
67
  async setBrightness(value) {
62
- const dim = value;
63
- this.deviceState.Brightness = dim;
64
- this.platform.log.debug('Set Characteristic Brightness', this.device.name, dim);
65
- this.platform.plejdService.turnOn(this.device.identifier, dim === 0 ? 1 : Math.round((2.55 * dim)));
68
+ const oldValue = this.state.brightness;
69
+ const newVal = value; // Number between 1-100
70
+ if (oldValue !== newVal) {
71
+ this.state.brightness = newVal;
72
+ this.updateStoredStateCache();
73
+ this.platform.log.info(`Updating brightness | ${this.device.name} | to ${newVal} | from ${oldValue}`);
74
+ this.platform.plejdService.updateState(this.device.identifier, this.state.isOn, newVal);
75
+ }
66
76
  }
67
77
  async getBrightness() {
68
- this.platform.log.debug('Get Characteristic Brightness', this.device.name, this.deviceState.Brightness);
69
- return this.deviceState.Brightness;
78
+ this.platform.log.debug('Get Characteristic Brightness', this.device.name, this.state.brightness);
79
+ return this.state.brightness;
80
+ }
81
+ updateStoredStateCache() {
82
+ if (this.state) {
83
+ (0, fs_1.writeFile)(this.cachePath, JSON.stringify(this.state), 'utf-8', (err) => {
84
+ if (err) {
85
+ this.platform.log.warn('Unable to write cache file.');
86
+ }
87
+ });
88
+ }
89
+ }
90
+ getStoredStateCache() {
91
+ const file = (0, fs_1.readFileSync)(this.cachePath, 'utf-8');
92
+ return file ? JSON.parse(file) : { brightness: 100, isOn: false };
70
93
  }
71
94
  }
72
95
  exports.PlejdPlatformAccessory = PlejdPlatformAccessory;
package/dist/plejdPlatformAccessory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plejdPlatformAccessory.js","sourceRoot":"","sources":["../src/plejdPlatformAccessory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plejdPlatformAccessory.js","sourceRoot":"","sources":["../src/plejdPlatformAccessory.ts"],"names":[],"mappings":"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"}
package/dist/plejdService.d.ts CHANGED
@@ -6,9 +6,9 @@ export declare class PlejdService {
6
6
  private readonly onUpdate;
7
7
  private connectedPeripheral;
8
8
  private pingIndex;
9
- constructor(config: UserInputConfig, log: Logger, onUpdate: (identifier: number, state: number, dim?: number) => void);
10
- turnOn(identifier: number, brightness?: number): void;
11
- turnOff(identifier: number): void;
9
+ constructor(config: UserInputConfig, log: Logger, onUpdate: (identifier: number, isOn: boolean, dim?: number) => void);
10
+ updateState(identifier: number, isOn: boolean, brightness: number | null): void;
11
+ getState(identifier: number): void;
12
12
  private stateChange;
13
13
  private startConnection;
14
14
  private discover;
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;AAe1C,qBAAa,YAAY;IAKjB,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,GAAG,EAAE,MAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAN/B,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,SAAS,CAAgB;gBAGV,MAAM,EAAE,eAAe,EACxB,GAAG,EAAE,MAAM,EACV,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI;IAQ1F,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAsB9C,OAAO,CAAC,UAAU,EAAE,MAAM;IAc1B,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,QAAQ;IAchB,OAAO,CAAC,mBAAmB;IA6B3B,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,SAAS;IA2BjB,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,SAAS;IA0BjB,OAAO,CAAC,UAAU;IAoBlB,OAAO,CAAC,OAAO;IAiDf,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,kBAAkB;CAQ3B"}
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;AA8B1C,qBAAa,YAAY;IAKjB,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,GAAG,EAAE,MAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAN/B,OAAO,CAAC,mBAAmB,CAA0B;IACrD,OAAO,CAAC,SAAS,CAAgB;gBAGV,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;IAS1F,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAyBxE,QAAQ,CAAC,UAAU,EAAE,MAAM;IA2B3B,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,QAAQ;IAchB,OAAO,CAAC,mBAAmB;IA6B3B,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,SAAS;IA2BjB,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,SAAS;IA0BjB,OAAO,CAAC,UAAU;IAuBlB,OAAO,CAAC,OAAO;IA6Cf,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,kBAAkB;CAG3B"}
package/dist/plejdService.js CHANGED
@@ -7,56 +7,91 @@ exports.PlejdService = void 0;
7
7
  const plejdUtils_1 = require("./plejdUtils");
8
8
  const crypto_1 = require("crypto");
9
9
  const noble_1 = __importDefault(require("@abandonware/noble"));
10
- const settings_1 = require("./settings");
11
10
  const NOBLE_IS_POWER_ON = 'poweredOn';
11
+ /**
12
+ * Plejd BLE UUIDs
13
+ */
14
+ var PlejdCharacteristics;
15
+ (function (PlejdCharacteristics) {
16
+ PlejdCharacteristics["Service"] = "31ba000160854726be45040c957391b5";
17
+ PlejdCharacteristics["Data"] = "31ba000460854726be45040c957391b5";
18
+ PlejdCharacteristics["LastData"] = "31ba000560854726be45040c957391b5";
19
+ PlejdCharacteristics["Auth"] = "31ba000960854726be45040c957391b5";
20
+ PlejdCharacteristics["Ping"] = "31ba000a60854726be45040c957391b5";
21
+ })(PlejdCharacteristics || (PlejdCharacteristics = {}));
22
+ var PlejdCommand;
23
+ (function (PlejdCommand) {
24
+ PlejdCommand["StateOnOff"] = "0097";
25
+ PlejdCommand["StateDim"] = "00c8";
26
+ PlejdCommand["Dim"] = "0098";
27
+ PlejdCommand["Time"] = "001b";
28
+ PlejdCommand["Scene"] = "0021";
29
+ PlejdCommand["RequestResponse"] = "0102";
30
+ PlejdCommand["RequestNoResponse"] = "0110";
31
+ PlejdCommand["RequestReadValue"] = "0103";
32
+ })(PlejdCommand || (PlejdCommand = {}));
12
33
  class PlejdService {
13
34
  constructor(config, log, onUpdate) {
14
35
  this.config = config;
15
36
  this.log = log;
16
37
  this.onUpdate = onUpdate;
38
+ this.connectedPeripheral = null;
17
39
  noble_1.default.on('stateChange', (state) => this.stateChange(state));
18
40
  noble_1.default.on('warning', (msg) => this.log.warn('Noble warning: ', msg));
19
41
  }
20
- turnOn(identifier, brightness) {
42
+ /// Brightness should be between 1-100
43
+ updateState(identifier, isOn, brightness) {
21
44
  const char = this.dataCharacteristic();
22
- if (!char) {
23
- this.log.warn('TurnOn characteristic not found');
24
- return;
25
- }
26
- const command = (brightness !== undefined) ? '0098' : '0097';
27
- let payload = Buffer.from((identifier).toString(16).padStart(2, '0') + '0110' + command + '01', 'hex');
28
- if (brightness !== undefined) {
29
- payload = Buffer.concat([payload, Buffer.from(brightness.toString(16).padStart(4, '0'), 'hex')]);
30
- }
31
45
  const addr = this.addressBuffer();
32
- if (!addr) {
46
+ if (!char || !addr) {
47
+ this.log.warn(`UpdateState | characteristic (${char}) or address (${addr}) not found`);
33
48
  return;
34
49
  }
50
+ const dimming = brightness !== null;
51
+ const command = (isOn && dimming) ? PlejdCommand.Dim : PlejdCommand.StateOnOff;
52
+ const on = isOn ? '01' : '00';
53
+ let payload = Buffer.from((identifier).toString(16).padStart(2, '0') + PlejdCommand.RequestNoResponse + command + on, 'hex');
54
+ if (dimming) {
55
+ const dim = Math.round((2.55 * brightness)); // Convert to Plejd 0-255
56
+ this.log.debug(`Dim value sent over BLE ${dim}`);
57
+ payload = Buffer.concat([payload, Buffer.from(dim.toString(16).padStart(4, '0'), 'hex')]);
58
+ }
35
59
  const data = (0, plejdUtils_1.plejdEncodeDecode)(this.config.cryptoKey, addr, payload);
36
60
  this.plejdWrite(char, data);
37
61
  }
38
- turnOff(identifier) {
62
+ /// WIP, does not work.
63
+ getState(identifier) {
39
64
  const char = this.dataCharacteristic();
40
65
  const addr = this.addressBuffer();
41
66
  if (!char || !addr) {
67
+ this.log.warn(`GetState | characteristic (${char}) or address (${addr}) not found`);
42
68
  return;
43
69
  }
44
- const payload = Buffer.from((identifier).toString(16).padStart(2, '0') + '0110009700', 'hex');
70
+ const payload = Buffer.from((identifier)
71
+ .toString(16)
72
+ .padStart(2, '0') + PlejdCommand.RequestResponse + PlejdCommand.StateOnOff, 'hex');
45
73
  const data = (0, plejdUtils_1.plejdEncodeDecode)(this.config.cryptoKey, addr, payload);
46
74
  this.plejdWrite(char, data);
75
+ char.read((err, data) => {
76
+ const decodedData = (0, plejdUtils_1.plejdEncodeDecode)(this.config.cryptoKey, addr, data);
77
+ const id = parseInt(decodedData[0].toString(), 10);
78
+ const command = decodedData.toString('hex', 3, 5);
79
+ const isOn = parseInt(decodedData.toString('hex', 5, 6), 10) === 1;
80
+ this.log.debug(`getState | id: ${id} | command: ${command} | arg: ${isOn} | err ${err}`);
81
+ });
47
82
  }
48
83
  // -------------- Private -------------- \\
49
84
  stateChange(state) {
50
85
  if (state !== NOBLE_IS_POWER_ON) {
51
- this.log.debug('stateChange: Stopped | ' + state);
86
+ this.log.debug('stateChange | Stopped | ' + state);
52
87
  noble_1.default.stopScanning();
53
88
  }
54
- this.log.debug('stateChange: Started | ' + state);
89
+ this.log.debug('stateChange | Started | ' + state);
55
90
  this.startConnection();
56
91
  }
57
92
  startConnection() {
58
93
  if (noble_1.default.state === NOBLE_IS_POWER_ON) {
59
- noble_1.default.startScanning([settings_1.PLEJD_SERVICE_UUID], false);
94
+ noble_1.default.startScanning([PlejdCharacteristics.Service], false);
60
95
  noble_1.default.once('discover', (peripheral) => this.discover(peripheral));
61
96
  }
62
97
  }
@@ -74,30 +109,30 @@ class PlejdService {
74
109
  connectToPeripheral(peripheral) {
75
110
  this.log.info(`Connected | ${peripheral.advertisement.localName} (addr: ${peripheral.address})`);
76
111
  this.connectedPeripheral = peripheral;
77
- const services = [settings_1.PLEJD_SERVICE_UUID];
112
+ const services = [PlejdCharacteristics.Service];
78
113
  const characteristics = [
79
- settings_1.PLEJD_CHARACTERISTIC_DATA_UUID,
80
- settings_1.PLEJD_CHARACTERISTIC_LAST_DATA_UUID,
81
- settings_1.PLEJD_CHARACTERISTIC_AUTH_UUID,
82
- settings_1.PLEJD_CHARACTERISTIC_PING_UUID
114
+ PlejdCharacteristics.Data,
115
+ PlejdCharacteristics.LastData,
116
+ PlejdCharacteristics.Auth,
117
+ PlejdCharacteristics.Ping
83
118
  ];
84
119
  peripheral.discoverSomeServicesAndCharacteristics(services, characteristics, (error, services, characteristics) => {
85
120
  if (error) {
86
- this.log.error('Discover failed | ' + peripheral.advertisement.localName + ' (' + peripheral.address + ') | ' + error);
121
+ this.log.error(`Discover failed | ${peripheral.advertisement.localName} (${peripheral.address}) | ${error}`);
87
122
  return;
88
123
  }
89
124
  this.discovered(peripheral, services, characteristics);
90
125
  });
91
- this.log.debug('Connected - Peripheral: ', peripheral);
126
+ this.log.debug('Connected | Peripheral |', peripheral);
92
127
  peripheral.once('disconnect', () => {
93
128
  this.log.info('Peripheral disconnected');
94
129
  this.connectedPeripheral = null;
95
130
  });
96
131
  }
97
132
  discovered(peripheral, services, characteristics) {
98
- const authChar = characteristics.find((char) => char.uuid === settings_1.PLEJD_CHARACTERISTIC_AUTH_UUID);
99
- const lastDataChar = characteristics.find((char) => char.uuid === settings_1.PLEJD_CHARACTERISTIC_LAST_DATA_UUID);
100
- const pingChar = characteristics.find((char) => char.uuid === settings_1.PLEJD_CHARACTERISTIC_PING_UUID);
133
+ const authChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.Auth);
134
+ const lastDataChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.LastData);
135
+ const pingChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.Ping);
101
136
  if (!authChar || !lastDataChar || !pingChar) {
102
137
  this.log.error('Unable to extract characteristic during discovery', authChar, lastDataChar, pingChar);
103
138
  return;
@@ -126,7 +161,7 @@ class PlejdService {
126
161
  }
127
162
  authChar.write((0, plejdUtils_1.plejdChalResp)(this.config.cryptoKey, data), false, (error) => {
128
163
  if (error) {
129
- this.log.error('Error writing auth chal | ' + error);
164
+ this.log.error('Error writing auth char | ' + error);
130
165
  return;
131
166
  }
132
167
  callback();
@@ -166,17 +201,20 @@ class PlejdService {
166
201
  return callback(false);
167
202
  }
168
203
  if (((ping[0] + 1) & 0xff) !== pong[0]) {
169
- this.log.error('Ping failed: ' + ping[0] + ' ' + pong[0]);
204
+ this.log.error(`Ping failed: ${ping[0]} ${pong[0]}`);
170
205
  callback(false);
171
206
  }
172
207
  else {
173
- this.log.debug('Ping success: ' + ping[0] + ' ' + pong[0]);
208
+ this.log.debug(`Ping success: ${ping[0]} ${pong[0]}`);
174
209
  callback(true);
175
210
  }
176
211
  });
177
212
  });
178
213
  }
179
214
  disconnect(callback) {
215
+ if (!this.pingIndex) {
216
+ return;
217
+ }
180
218
  clearInterval(this.pingIndex);
181
219
  if (this.connectedPeripheral) {
182
220
  this.log.info('Disconnecting peripheral');
@@ -193,47 +231,44 @@ class PlejdService {
193
231
  }
194
232
  }
195
233
  gotData(data, isNotification) {
196
- this.log.debug(`GotData: data: ${data} - isNotification: ${isNotification}`);
197
234
  const addr = this.addressBuffer();
198
235
  if (!addr) {
236
+ this.log.warn('Got data but address in unknown');
199
237
  return;
200
238
  }
201
239
  const decodedData = (0, plejdUtils_1.plejdEncodeDecode)(this.config.cryptoKey, addr, data);
202
- let state = 0;
203
240
  const id = parseInt(decodedData[0].toString(), 10);
204
241
  const command = decodedData.toString('hex', 3, 5);
205
- const argument = parseInt(decodedData.toString('hex', 5, 6), 10);
206
- if (command === '001b') {
207
- // time
208
- const argument = parseInt((0, plejdUtils_1.reverseBuffer)(decodedData.slice(5, 9)).toString('hex'), 16);
209
- const date = new Date(argument * 1000);
210
- this.log.debug('Time sync: ' + date.toString());
211
- return;
212
- }
213
- else if (command === '0021') {
214
- // scene
215
- this.log.debug('Trigger scene: ' + argument);
216
- return;
217
- }
218
- else if (command === '00c8' || command === '0098') {
219
- // 00c8, 0098 = state + dim
220
- // state 0 or 1
221
- state = argument;
222
- const dim = parseInt(decodedData.toString('hex', 7, 8), 16);
223
- this.log.debug(id + ' state: ' + state + ' dim: ' + dim);
224
- this.onUpdate(id, state, dim);
225
- }
226
- else if (command === '0097') {
227
- // 0097 = state only
228
- // state 0 or 1
229
- state = argument;
230
- this.log.debug(id + ' state: ' + state);
231
- this.onUpdate(id, state);
232
- return;
233
- }
234
- else {
235
- this.log.warn('Unknown command: ' + command + ' for device: ' + id + ' ' + (decodedData.toString('hex')));
236
- return;
242
+ const isOn = parseInt(decodedData.toString('hex', 5, 6), 10) === 1;
243
+ this.log.debug(`GotData | id: ${id} | command: ${command} | arg: ${isOn} | isNotification: ${isNotification}`);
244
+ switch (command) {
245
+ case PlejdCommand.Time: {
246
+ const arg = parseInt((0, plejdUtils_1.reverseBuffer)(decodedData.slice(5, 9)).toString('hex'), 16);
247
+ const date = new Date(arg * 1000);
248
+ this.log.debug('Time sync: ' + date.toString());
249
+ break;
250
+ }
251
+ case PlejdCommand.Scene: {
252
+ this.log.debug('Trigger scene: ' + isOn);
253
+ break;
254
+ }
255
+ case PlejdCommand.Dim:
256
+ case PlejdCommand.StateDim: {
257
+ const dim = parseInt(decodedData.toString('hex', 7, 8), 16);
258
+ // Convert to Homebridge 1-100
259
+ const converted = dim === 0 ? 1 : ((100 / 255) * dim);
260
+ this.log.debug(`Dim value sent to HB ${converted}`);
261
+ this.onUpdate(id, isOn, converted);
262
+ break;
263
+ }
264
+ case PlejdCommand.StateOnOff: {
265
+ this.onUpdate(id, isOn);
266
+ break;
267
+ }
268
+ default: {
269
+ this.log.warn(`Unknown command | ${command} | ${id} | ${decodedData.toString('hex')}`);
270
+ break;
271
+ }
237
272
  }
238
273
  }
239
274
  plejdWrite(dataChar, data) {
@@ -245,18 +280,12 @@ class PlejdService {
245
280
  });
246
281
  }
247
282
  addressBuffer() {
248
- if (this.connectedPeripheral) {
249
- return (0, plejdUtils_1.reverseBuffer)(Buffer.from(String(this.connectedPeripheral.address).replace(/:/g, ''), 'hex'));
250
- }
251
- return null;
283
+ return this.connectedPeripheral ?
284
+ (0, plejdUtils_1.reverseBuffer)(Buffer.from(String(this.connectedPeripheral.address).replace(/:/g, ''), 'hex')) : null;
252
285
  }
253
286
  dataCharacteristic() {
254
- if (this.connectedPeripheral && this.connectedPeripheral.services.length > 0) {
255
- return this.connectedPeripheral.services[0].characteristics.find((char) => {
256
- return char.uuid === settings_1.PLEJD_CHARACTERISTIC_DATA_UUID;
257
- });
258
- }
259
- return null;
287
+ var _a, _b, _c, _d;
288
+ return (_d = (_c = (_b = (_a = this.connectedPeripheral) === null || _a === void 0 ? void 0 : _a.services[0]) === null || _b === void 0 ? void 0 : _b.characteristics) === null || _c === void 0 ? void 0 : _c.find((char) => char.uuid === PlejdCharacteristics.Data)) !== null && _d !== void 0 ? _d : null;
260
289
  }
261
290
  }
262
291
  exports.PlejdService = PlejdService;
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/dist/settings.d.ts CHANGED
@@ -11,12 +11,4 @@ export declare const PLUGIN_NAME = "homebridge-plejd";
11
11
  */
12
12
  export declare const PLEJD_LIGHTS: string[];
13
13
  export declare const PLEJD_SWITCHES: string[];
14
- /**
15
- * Plejd BLE UUIDs
16
- */
17
- export declare const PLEJD_SERVICE_UUID = "31ba000160854726be45040c957391b5";
18
- export declare const PLEJD_CHARACTERISTIC_DATA_UUID = "31ba000460854726be45040c957391b5";
19
- export declare const PLEJD_CHARACTERISTIC_LAST_DATA_UUID = "31ba000560854726be45040c957391b5";
20
- export declare const PLEJD_CHARACTERISTIC_AUTH_UUID = "31ba000960854726be45040c957391b5";
21
- export declare const PLEJD_CHARACTERISTIC_PING_UUID = "31ba000a60854726be45040c957391b5";
22
14
  //# sourceMappingURL=settings.d.ts.map
package/dist/settings.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC;;GAEG;AACH,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAE9C;;GAEG;AACH,eAAO,MAAM,YAAY,UAAiC,CAAC;AAC3D,eAAO,MAAM,cAAc,UAAwD,CAAC;AAEpF;;GAEG;AACH,eAAO,MAAM,kBAAkB,qCAAqC,CAAC;AACrE,eAAO,MAAM,8BAA8B,qCAAqC,CAAC;AACjF,eAAO,MAAM,mCAAmC,qCAAqC,CAAC;AACtF,eAAO,MAAM,8BAA8B,qCAAqC,CAAC;AACjF,eAAO,MAAM,8BAA8B,qCAAqC,CAAC"}
1
+ {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC;;GAEG;AACH,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAE9C;;GAEG;AACH,eAAO,MAAM,YAAY,UAAiC,CAAC;AAC3D,eAAO,MAAM,cAAc,UAAwD,CAAC"}
package/dist/settings.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.PLEJD_CHARACTERISTIC_PING_UUID = exports.PLEJD_CHARACTERISTIC_AUTH_UUID = exports.PLEJD_CHARACTERISTIC_LAST_DATA_UUID = exports.PLEJD_CHARACTERISTIC_DATA_UUID = exports.PLEJD_SERVICE_UUID = exports.PLEJD_SWITCHES = exports.PLEJD_LIGHTS = exports.PLUGIN_NAME = exports.PLATFORM_NAME = void 0;
3
+ exports.PLEJD_SWITCHES = exports.PLEJD_LIGHTS = exports.PLUGIN_NAME = exports.PLATFORM_NAME = void 0;
4
4
  /**
5
5
  * This is the name of the platform that users will use to register the plugin in the Homebridge config.json
6
6
  */
@@ -14,12 +14,4 @@ exports.PLUGIN_NAME = 'homebridge-plejd';
14
14
  */
15
15
  exports.PLEJD_LIGHTS = ['DIM-01', 'DIM-02', 'LED-10'];
16
16
  exports.PLEJD_SWITCHES = ['REL-02', 'REL-01-2P', 'DAL-01', 'SPR-01', 'CTR-01'];
17
- /**
18
- * Plejd BLE UUIDs
19
- */
20
- exports.PLEJD_SERVICE_UUID = '31ba000160854726be45040c957391b5';
21
- exports.PLEJD_CHARACTERISTIC_DATA_UUID = '31ba000460854726be45040c957391b5';
22
- exports.PLEJD_CHARACTERISTIC_LAST_DATA_UUID = '31ba000560854726be45040c957391b5';
23
- exports.PLEJD_CHARACTERISTIC_AUTH_UUID = '31ba000960854726be45040c957391b5';
24
- exports.PLEJD_CHARACTERISTIC_PING_UUID = '31ba000a60854726be45040c957391b5';
25
17
  //# sourceMappingURL=settings.js.map
package/dist/settings.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,aAAa,GAAG,OAAO,CAAC;AAErC;;GAEG;AACU,QAAA,WAAW,GAAG,kBAAkB,CAAC;AAE9C;;GAEG;AACU,QAAA,YAAY,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAEpF;;GAEG;AACU,QAAA,kBAAkB,GAAG,kCAAkC,CAAC;AACxD,QAAA,8BAA8B,GAAG,kCAAkC,CAAC;AACpE,QAAA,mCAAmC,GAAG,kCAAkC,CAAC;AACzE,QAAA,8BAA8B,GAAG,kCAAkC,CAAC;AACpE,QAAA,8BAA8B,GAAG,kCAAkC,CAAC"}
1
+ {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,aAAa,GAAG,OAAO,CAAC;AAErC;;GAEG;AACU,QAAA,WAAW,GAAG,kBAAkB,CAAC;AAE9C;;GAEG;AACU,QAAA,YAAY,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC"}
package/package.json CHANGED
@@ -3,8 +3,8 @@
3
3
  "displayName": "Plejd",
4
4
  "name": "homebridge-plejd",
5
5
  "author": "Alexander Herlin",
6
- "version": "1.1.3-beta.0",
7
- "description": "Make the swedish BLE devices from Plejd work with homebridge.",
6
+ "version": "1.1.6",
7
+ "description": "HomeKit support for the Plejd BLE platform using Homebridge",
8
8
  "license": "MIT",
9
9
  "repository": {
10
10
  "type": "git",