homebridge-plejd 1.3.3 → 1.3.6

package/dist/plejdPlatformAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"plejdPlatformAccessory.js","sourceRoot":"","sources":["../src/plejdPlatformAccessory.ts"],"names":[],"mappings":";;;AAIA,yCAA2C;AAO3C;;;;GAIG;AACH,MAAa,6BAA6B;IAIxC,YACmB,QAAuB,EACvB,SAA4B,EAC7B,MAAc;;QAFb,aAAQ,GAAR,QAAQ,CAAe;QACvB,cAAS,GAAT,SAAS,CAAmB;QAC7B,WAAM,GAAN,MAAM,CAAQ;QAoDhC,gBAAW,GAAG,CAAC,IAAa,EAAE,UAAmB,EAAE,EAAE;YACnD,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,IAAI,CAAC,CAAC;YAC5D,IAAI,CAAC,OAAO;iBACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;iBAClD,WAAW,CAAC,IAAI,CAAC,CAAC;YAErB,IAAI,UAAU,EAAE;gBACd,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAC/C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,mCAAmC,EACnC,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;gBACF,IAAI,CAAC,OAAO;qBACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;qBAC1D,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;aACvC;YAED,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC3E,CAAC,CAAC;QAEM,UAAK,GAAG,KAAK,EAAE,KAA0B,EAAE,EAAE;;YACnD,MAAM,MAAM,GAAG,KAAgB,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CACpB,oBAAoB,IAAI,CAAC,MAAM,CAAC,IAAI,SAClC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAClB,WAAW,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC5C,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAChD,MAAA,IAAI,CAAC,QAAQ,CAAC,YAAY,0CAAE,WAAW,CACrC,IAAI,CAAC,MAAM,CAAC,UAAU,EACtB,MAAM,EACN,IAAI,CACL,CAAC;QACJ,CAAC,CAAC;QAEM,UAAK,GAAG,KAAK,IAAkC,EAAE;YACvD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,uBAAuB,EACvB,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAChB,CAAC;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QACzB,CAAC,CAAC;QAEM,kBAAa,GAAG,KAAK,EAAE,KAA0B,EAAE,EAAE;;YAC3D,MAAM,MAAM,GAAG,KAAe,CAAC,CAAC,uBAAuB;YACvD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,yBAAyB,IAAI,CAAC,MAAM,CAAC,IAAI,SAAS,MAAM,WAAW,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAC3F,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC1C,MAAA,IAAI,CAAC,QAAQ,CAAC,YAAY,0CAAE,WAAW,CACrC,IAAI,CAAC,MAAM,CAAC,UAAU,EACtB,IAAI,CAAC,KAAK,CAAC,IAAI,EACf,MAAM,CACP,CAAC;QACJ,CAAC,CAAC;QAEM,kBAAa,GAAG,KAAK,IAAkC,EAAE;YAC/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,+BAA+B,EAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QAC/B,CAAC,CAAC;QApHA,QAAQ,CAAC,GAAG,CAAC,KAAK,CAChB,wBAAwB,IAAI,CAAC,MAAM,CAAC,KAAK,YAAY,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAC9E,CAAC;QAEF,IAAI,CAAC,KAAK,GAAG;YACX,UAAU,EAAE,MAAA,SAAS,CAAC,OAAO,CAAC,UAAU,mCAAI,GAAG;YAC/C,IAAI,EAAE,MAAA,SAAS,CAAC,OAAO,CAAC,IAAI,mCAAI,KAAK;SACtC,CAAC;QAEF,4BAA4B;QAC5B,IAAI,CAAC,SAAS;aACX,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACvD,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,wBAAa,CACd;aACA,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;aACxE,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAClC,CAAC;QAEJ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxB,mFAAmF;YACnF,IAAI,CAAC,OAAO;gBACV,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;oBAC1D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE7D,IAAI,CAAC,OAAO;iBACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;iBAC1D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACpC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACzC;aAAM;YACL,IAAI,CAAC,OAAO;gBACV,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;oBACvD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAC3D;QAED,kDAAkD;QAClD,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAClD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAC5B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CACjB,CAAC;IACJ,CAAC;CAqEF;AA9HD,sEA8HC"}
+{"version":3,"file":"plejdPlatformAccessory.js","sourceRoot":"","sources":["../src/plejdPlatformAccessory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAO3C;;;;GAIG;AACH,MAAM,OAAO,6BAA6B;IAKrB;IACA;IACD;IANV,OAAO,CAAU;IACjB,KAAK,CAAc;IAE3B,YACmB,QAAuB,EACvB,SAA4B,EAC7B,MAAc;QAFb,aAAQ,GAAR,QAAQ,CAAe;QACvB,cAAS,GAAT,SAAS,CAAmB;QAC7B,WAAM,GAAN,MAAM,CAAQ;QAE9B,QAAQ,CAAC,GAAG,CAAC,KAAK,CAChB,wBAAwB,IAAI,CAAC,MAAM,CAAC,KAAK,YAAY,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAC9E,CAAC;QAEF,IAAI,CAAC,KAAK,GAAG;YACX,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG;YAC/C,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,IAAI,KAAK;SACtC,CAAC;QAEF,4BAA4B;QAC5B,IAAI,CAAC,SAAS;aACX,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACvD,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,aAAa,CACd;aACA,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;aACxE,iBAAiB,CAChB,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAClC,CAAC;QAEJ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACzB,mFAAmF;YACnF,IAAI,CAAC,OAAO;gBACV,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;oBAC1D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAE7D,IAAI,CAAC,OAAO;iBACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;iBAC1D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACpC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO;gBACV,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;oBACvD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5D,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAClD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAC5B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CACjB,CAAC;IACJ,CAAC;IAED,WAAW,GAAG,CAAC,IAAa,EAAE,UAAmB,EAAE,EAAE;QACnD,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAClD,WAAW,CAAC,IAAI,CAAC,CAAC;QAErB,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,mCAAmC,EACnC,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;YACF,IAAI,CAAC,OAAO;iBACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;iBAC1D,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC;IAEM,KAAK,GAAG,KAAK,EAAE,KAA0B,EAAE,EAAE;QACnD,MAAM,MAAM,GAAG,KAAgB,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CACpB,oBAAoB,IAAI,CAAC,MAAM,CAAC,IAAI,SAClC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAClB,WAAW,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAC5C,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,CACrC,IAAI,CAAC,MAAM,CAAC,UAAU,EACtB,MAAM,EACN,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;IAEM,KAAK,GAAG,KAAK,IAAkC,EAAE;QACvD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,uBAAuB,EACvB,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAChB,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC,CAAC;IAEM,aAAa,GAAG,KAAK,EAAE,KAA0B,EAAE,EAAE;QAC3D,MAAM,MAAM,GAAG,KAAe,CAAC,CAAC,uBAAuB;QACvD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,yBAAyB,IAAI,CAAC,MAAM,CAAC,IAAI,SAAS,MAAM,WAAW,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAC3F,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,CACrC,IAAI,CAAC,MAAM,CAAC,UAAU,EACtB,IAAI,CAAC,KAAK,CAAC,IAAI,EACf,MAAM,CACP,CAAC;IACJ,CAAC,CAAC;IAEM,aAAa,GAAG,KAAK,IAAkC,EAAE;QAC/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CACrB,+BAA+B,EAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB,IAAI,CAAC,KAAK,CAAC,UAAU,CACtB,CAAC;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;IAC/B,CAAC,CAAC;CACH"}

package/dist/plejdService.d.ts

@@ -1,5 +1,5 @@
-import { Logger } from 'homebridge';
-import { UserInputConfig } from './model/userInputConfig';
+import { Logger } from "homebridge";
+import { UserInputConfig } from "./model/userInputConfig";
 export declare class PlejdService {
     private readonly config;
     readonly log: Logger;
@@ -26,4 +26,3 @@ export declare class PlejdService {
     private gotData;
     private plejdWrite;
 }
-//# sourceMappingURL=plejdService.d.ts.map

package/dist/plejdService.js

@@ -1,302 +1,308 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlejdService = void 0;
-const plejdUtils_1 = require("./plejdUtils");
-const crypto_1 = require("crypto");
-const noble_1 = __importDefault(require("@abandonware/noble"));
-const settings_1 = require("./settings");
-const NOBLE_IS_POWER_ON = 'poweredOn';
+import { plejdChalResp as plejdCharResp, plejdEncodeDecode, reverseBuffer, } from "./plejdUtils";
+import { randomBytes } from "crypto";
+import noble from "@abandonware/noble";
+import { PLEJD_WRITE_TIMEOUT } from "./settings";
+const NOBLE_IS_POWER_ON = "oweredOn";
 /**
  * Plejd BLE UUIDs
  */
 var PlejdCharacteristics;
 (function (PlejdCharacteristics) {
-    PlejdCharacteristics["Service"] = "31ba000160854726be45040c957391b5";
-    PlejdCharacteristics["LightLevel"] = "31ba000360854726be45040c957391b5";
-    PlejdCharacteristics["Data"] = "31ba000460854726be45040c957391b5";
-    PlejdCharacteristics["LastData"] = "31ba000560854726be45040c957391b5";
-    PlejdCharacteristics["Auth"] = "31ba000960854726be45040c957391b5";
-    PlejdCharacteristics["Ping"] = "31ba000a60854726be45040c957391b5";
+    PlejdCharacteristics["Service"] = "1ba000160854726be45040c957391b5";
+    PlejdCharacteristics["LightLevel"] = "1ba000360854726be45040c957391b5";
+    PlejdCharacteristics["Data"] = "1ba000460854726be45040c957391b5";
+    PlejdCharacteristics["LastData"] = "1ba000560854726be45040c957391b5";
+    PlejdCharacteristics["Auth"] = "1ba000960854726be45040c957391b5";
+    PlejdCharacteristics["Ping"] = "1ba000a60854726be45040c957391b5";
 })(PlejdCharacteristics || (PlejdCharacteristics = {}));
 var PlejdCommand;
 (function (PlejdCommand) {
-    PlejdCommand["UpdateState"] = "0097";
-    PlejdCommand["StateBrightness"] = "00c8";
-    PlejdCommand["Brightness"] = "0098";
-    PlejdCommand["Time"] = "001b";
-    PlejdCommand["Scene"] = "0021";
-    PlejdCommand["RequestResponse"] = "0102";
-    PlejdCommand["RequestNoResponse"] = "0110";
-    PlejdCommand["RequestReadValue"] = "0103";
-    PlejdCommand["ButtonClick"] = "1006";
+    PlejdCommand["UpdateState"] = "097";
+    PlejdCommand["StateBrightness"] = "0c8";
+    PlejdCommand["Brightness"] = "098";
+    PlejdCommand["Time"] = "01b";
+    PlejdCommand["Scene"] = "021";
+    PlejdCommand["RequestResponse"] = "102";
+    PlejdCommand["RequestNoResponse"] = "110";
+    PlejdCommand["RequestReadValue"] = "103";
+    PlejdCommand["ButtonClick"] = "006";
 })(PlejdCommand || (PlejdCommand = {}));
-class PlejdService {
+export class PlejdService {
+    config;
+    log;
+    onUpdate;
+    connectedPeripheral;
+    addressBuffer;
+    dataCharacteristic;
+    pingTimer;
+    queueTimer;
+    sendQueue;
     constructor(config, log, onUpdate) {
         this.config = config;
         this.log = log;
         this.onUpdate = onUpdate;
-        /// Brightness should be between 1-100
-        this.updateState = (identifier, isOn, brightness) => {
-            if (!this.dataCharacteristic || !this.addressBuffer) {
-                this.log.warn(`UpdateState | characteristic (${this.dataCharacteristic}) or address (${this.addressBuffer}) not found`);
+        this.addressBuffer = null;
+        this.dataCharacteristic = null;
+        this.connectedPeripheral = null;
+        this.sendQueue = [];
+        noble.on("stateChange", (state) => this.stateChange(state));
+        noble.on("warning", (msg) => {
+            this.log.debug("Noble warning: ", msg);
+        });
+    }
+    /// Brightness should be between 1-100
+    updateState = (identifier, isOn, brightness) => {
+        if (!this.dataCharacteristic || !this.addressBuffer) {
+            this.log.warn(`UpdateState | characteristic (${this.dataCharacteristic}) or address (${this.addressBuffer}) not found`);
+            return;
+        }
+        const dimming = brightness !== null;
+        const command = isOn && dimming ? PlejdCommand.Brightness : PlejdCommand.UpdateState;
+        const on = isOn ? "01" : "00";
+        let payload = Buffer.from(identifier.toString(16).padStart(2, "0") +
+            PlejdCommand.RequestNoResponse +
+            command +
+            on, "hex");
+        if (dimming) {
+            const dim = Math.round(2.55 * brightness); // Convert to Plejd 0-255
+            this.log.debug(`Dim value sent over BLE ${dim}`);
+            payload = Buffer.concat([
+                payload,
+                Buffer.from(dim.toString(16).padStart(4, "0"), "hex"),
+            ]);
+        }
+        this.log.debug("UpdateState:", this.config.cryptoKey, this.addressBuffer, payload);
+        const data = plejdEncodeDecode(this.config.cryptoKey, this.addressBuffer, payload);
+        this.sendQueue.push(data);
+    };
+    //   -------------- Private -------------- \\
+    stateChange = (state) => {
+        if (state !== NOBLE_IS_POWER_ON) {
+            this.log.debug("stateChange | Stopped | " + state);
+            noble.stopScanning();
+        }
+        this.log.debug("stateChange | Started | " + state);
+        this.startConnection();
+    };
+    startConnection = () => {
+        if (this.connectedPeripheral === null || noble._state !== "poweredOn") {
+            noble.startScanning([PlejdCharacteristics.Service], false, (e) => {
+                if (e) {
+                    this.log.error("Unable to start scanning", e);
+                }
+            });
+            noble.once("discover", (peripheral) => this.discover(peripheral));
+        }
+        else {
+            this.connectedPeripheral?.cancelConnect();
+            this.connectedPeripheral.connect((e) => {
+                this.log.error("Unable to reconnect", e);
+            });
+        }
+    };
+    discover = (peripheral) => {
+        noble.stopScanning();
+        this.log.info(`Discovered | ${peripheral.advertisement.localName} | addr: ${peripheral.address} | RSSI: ${peripheral.rssi} dB`);
+        peripheral.connect((error) => {
+            if (error) {
+                this.log.error(`Connecting failed | ${peripheral.advertisement.localName} | addr: ${peripheral.address}) - err: ${error}`);
+                this.startConnection();
                 return;
             }
-            const dimming = brightness !== null;
-            const command = isOn && dimming ? PlejdCommand.Brightness : PlejdCommand.UpdateState;
-            const on = isOn ? '01' : '00';
-            let payload = Buffer.from(identifier.toString(16).padStart(2, '0') +
-                PlejdCommand.RequestNoResponse +
-                command +
-                on, 'hex');
-            if (dimming) {
-                const dim = Math.round(2.55 * brightness); // Convert to Plejd 0-255
-                this.log.debug(`Dim value sent over BLE ${dim}`);
-                payload = Buffer.concat([
-                    payload,
-                    Buffer.from(dim.toString(16).padStart(4, '0'), 'hex'),
-                ]);
-            }
-            this.log.debug('UpdateState:', this.config.cryptoKey, this.addressBuffer, payload);
-            const data = (0, plejdUtils_1.plejdEncodeDecode)(this.config.cryptoKey, this.addressBuffer, payload);
-            this.sendQueue.push(data);
-        };
-        //   -------------- Private -------------- \\
-        this.stateChange = (state) => {
-            if (state !== NOBLE_IS_POWER_ON) {
-                this.log.debug('stateChange | Stopped | ' + state);
-                noble_1.default.stopScanning();
-            }
-            this.log.debug('stateChange | Started | ' + state);
-            this.startConnection();
-        };
-        this.startConnection = () => {
-            var _a;
-            if (this.connectedPeripheral === null || noble_1.default.state === 'disconnected') {
-                noble_1.default.startScanning([PlejdCharacteristics.Service], false, (e) => {
-                    if (e) {
-                        this.log.error('Unable to start scanning', e);
-                    }
-                });
-                noble_1.default.once('discover', (peripheral) => this.discover(peripheral));
-            }
-            else {
-                (_a = this.connectedPeripheral) === null || _a === void 0 ? void 0 : _a.cancelConnect();
-                this.connectedPeripheral.connect((e) => {
-                    this.log.error('Unable to reconnect', e);
-                });
+            this.connectToPeripheral(peripheral);
+        });
+    };
+    connectToPeripheral = (peripheral) => {
+        const addr = peripheral.address;
+        this.log.info(`Connected | ${peripheral.advertisement.localName} (addr: ${addr})`);
+        this.connectedPeripheral = peripheral;
+        this.addressBuffer = reverseBuffer(Buffer.from(String(addr).replace(/:/g, ""), "hex"));
+        const services = [PlejdCharacteristics.Service];
+        const characteristics = [
+            PlejdCharacteristics.Data,
+            PlejdCharacteristics.LastData,
+            PlejdCharacteristics.Auth,
+            PlejdCharacteristics.Ping,
+        ];
+        peripheral.discoverSomeServicesAndCharacteristics(services, characteristics, (error, services, characteristics) => {
+            if (error) {
+                this.log.error(`Discover failed | ${peripheral.advertisement.localName} (${peripheral.address}) | ${error}`);
+                return;
             }
-        };
-        this.discover = (peripheral) => {
-            noble_1.default.stopScanning();
-            this.log.info(`Discovered | ${peripheral.advertisement.localName} | addr: ${peripheral.address} | RSSI: ${peripheral.rssi} dB`);
-            peripheral.connect((error) => {
+            this.discovered(peripheral, services, characteristics);
+        });
+        peripheral.once("disconnect", () => {
+            this.log.info("Peripheral disconnected");
+        });
+    };
+    discovered = (peripheral, services, characteristics) => {
+        const authChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.Auth);
+        const lastDataChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.LastData);
+        const pingChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.Ping);
+        this.dataCharacteristic =
+            peripheral?.services[0]?.characteristics?.find((char) => char.uuid === PlejdCharacteristics.Data) ?? null;
+        if (!authChar || !lastDataChar || !pingChar) {
+            this.log.error("Unable to extract characteristic during discovery", authChar, lastDataChar, pingChar);
+            return;
+        }
+        this.plejdAuth(authChar, () => {
+            this.startPlejdPing(pingChar);
+            this.startPlejdQueue();
+            lastDataChar.subscribe((error) => {
                 if (error) {
-                    this.log.error(`Connecting failed | ${peripheral.advertisement.localName} | addr: ${peripheral.address}) - err: ${error}`);
-                    this.startConnection();
+                    this.log.error("Error subscribing | " + error);
                     return;
                 }
-                this.connectToPeripheral(peripheral);
+                lastDataChar.on("data", (data, isNotification) => this.gotData(data, isNotification));
             });
-        };
-        this.connectToPeripheral = (peripheral) => {
-            const addr = peripheral.address;
-            this.log.info(`Connected | ${peripheral.advertisement.localName} (addr: ${addr})`);
-            this.connectedPeripheral = peripheral;
-            this.addressBuffer = (0, plejdUtils_1.reverseBuffer)(Buffer.from(String(addr).replace(/:/g, ''), 'hex'));
-            const services = [PlejdCharacteristics.Service];
-            const characteristics = [
-                PlejdCharacteristics.Data,
-                PlejdCharacteristics.LastData,
-                PlejdCharacteristics.Auth,
-                PlejdCharacteristics.Ping,
-            ];
-            peripheral.discoverSomeServicesAndCharacteristics(services, characteristics, (error, services, characteristics) => {
-                if (error) {
-                    this.log.error(`Discover failed | ${peripheral.advertisement.localName} (${peripheral.address}) | ${error}`);
-                    return;
-                }
-                this.discovered(peripheral, services, characteristics);
-            });
-            peripheral.once('disconnect', () => {
-                this.log.info('Peripheral disconnected');
-            });
-        };
-        this.discovered = (peripheral, services, characteristics) => {
-            var _a, _b, _c;
-            const authChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.Auth);
-            const lastDataChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.LastData);
-            const pingChar = characteristics.find((char) => char.uuid === PlejdCharacteristics.Ping);
-            this.dataCharacteristic =
-                (_c = (_b = (_a = peripheral === null || peripheral === void 0 ? void 0 : peripheral.services[0]) === null || _a === void 0 ? void 0 : _a.characteristics) === null || _b === void 0 ? void 0 : _b.find((char) => char.uuid === PlejdCharacteristics.Data)) !== null && _c !== void 0 ? _c : null;
-            if (!authChar || !lastDataChar || !pingChar) {
-                this.log.error('Unable to extract characteristic during discovery', authChar, lastDataChar, pingChar);
+        });
+    };
+    plejdAuth = (authChar, callback) => {
+        authChar.write(Buffer.from([0x00]), false, (error) => {
+            if (error) {
+                this.log.error("Error writing auth start | " + error);
                 return;
             }
-            this.plejdAuth(authChar, () => {
-                this.startPlejdPing(pingChar);
-                this.startPlejdQueue();
-                lastDataChar.subscribe((error) => {
-                    if (error) {
-                        this.log.error('Error subscribing | ' + error);
-                        return;
-                    }
-                    lastDataChar.on('data', (data, isNotification) => this.gotData(data, isNotification));
-                });
-            });
-        };
-        this.plejdAuth = (authChar, callback) => {
-            authChar.write(Buffer.from([0x00]), false, (error) => {
+            authChar.read((error, data) => {
                 if (error) {
-                    this.log.error('Error writing auth start | ' + error);
+                    this.log.error("Error reading auth | " + error);
                     return;
                 }
-                authChar.read((error, data) => {
+                authChar.write(plejdCharResp(this.config.cryptoKey, data), false, (error) => {
                     if (error) {
-                        this.log.error('Error reading auth | ' + error);
+                        this.log.error("Error writing auth char | " + error);
                         return;
                     }
-                    authChar.write((0, plejdUtils_1.plejdChalResp)(this.config.cryptoKey, data), false, (error) => {
-                        if (error) {
-                            this.log.error('Error writing auth char | ' + error);
-                            return;
-                        }
-                        callback();
-                    });
+                    callback();
                 });
             });
-        };
-        this.startPlejdQueue = () => {
+        });
+    };
+    startPlejdQueue = () => {
+        if (this.queueTimer) {
             clearInterval(this.queueTimer);
-            this.queueTimer = setTimeout(() => this.writePlejdQueueItems(), settings_1.PLEJD_WRITE_TIMEOUT);
-        };
-        this.writePlejdQueueItems = () => {
-            const data = this.sendQueue.pop();
-            if (this.dataCharacteristic && data) {
-                this.plejdWrite(this.dataCharacteristic, data);
-                this.queueTimer = setTimeout(() => this.startPlejdQueue(), settings_1.PLEJD_WRITE_TIMEOUT / 2);
+        }
+        this.queueTimer = setTimeout(() => this.writePlejdQueueItems(), PLEJD_WRITE_TIMEOUT);
+    };
+    writePlejdQueueItems = () => {
+        const data = this.sendQueue.pop();
+        if (this.dataCharacteristic && data) {
+            this.plejdWrite(this.dataCharacteristic, data);
+            this.queueTimer = setTimeout(() => this.startPlejdQueue(), PLEJD_WRITE_TIMEOUT / 2);
+        }
+        else {
+            this.queueTimer = setTimeout(() => this.startPlejdQueue(), PLEJD_WRITE_TIMEOUT);
+        }
+    };
+    startPlejdPing = (pingChar) => {
+        if (this.pingTimer) {
+            clearInterval(this.pingTimer);
+        }
+        this.pingTimer = setInterval(() => {
+            if (this.connectedPeripheral) {
+                this.plejdPing(pingChar, (pingOk) => {
+                    if (!pingOk) {
+                        this.disconnect(() => {
+                            this.startConnection();
+                        });
+                    }
+                });
             }
-            else {
-                this.queueTimer = setTimeout(() => this.startPlejdQueue(), settings_1.PLEJD_WRITE_TIMEOUT);
+        }, 1000 * 60 * 3);
+    };
+    plejdPing = (pingChar, callback) => {
+        const ping = randomBytes(1);
+        pingChar.write(ping, false, (error) => {
+            if (error) {
+                this.log.error("Error sending ping | " + error);
+                return callback(false);
             }
-        };
-        this.startPlejdPing = (pingChar) => {
-            clearInterval(this.pingTimer);
-            this.pingTimer = setInterval(() => {
-                if (this.connectedPeripheral) {
-                    this.plejdPing(pingChar, (pingOk) => {
-                        if (!pingOk) {
-                            this.disconnect(() => {
-                                this.startConnection();
-                            });
-                        }
-                    });
-                }
-            }, 1000 * 60 * 3);
-        };
-        this.plejdPing = (pingChar, callback) => {
-            const ping = (0, crypto_1.randomBytes)(1);
-            pingChar.write(ping, false, (error) => {
+            pingChar.read((error, pong) => {
                 if (error) {
-                    this.log.error('Error sending ping | ' + error);
+                    this.log.error("Error reading pong | " + error);
                     return callback(false);
                 }
-                pingChar.read((error, pong) => {
-                    if (error) {
-                        this.log.error('Error reading pong | ' + error);
-                        return callback(false);
-                    }
-                    if (((ping[0] + 1) & 0xff) !== pong[0]) {
-                        this.log.error(`Ping failed: ${ping[0]} ${pong[0]}`);
-                        callback(false);
-                    }
-                    else {
-                        this.log.debug(`Ping success: ${ping[0]} ${pong[0]}`);
-                        callback(true);
-                    }
-                });
+                if (((ping[0] + 1) & 0xff) !== pong[0]) {
+                    this.log.error(`Ping failed: ${ping[0]} ${pong[0]}`);
+                    callback(false);
+                }
+                else {
+                    this.log.debug(`Ping success: ${ping[0]} ${pong[0]}`);
+                    callback(true);
+                }
             });
+        });
+    };
+    disconnect = (callback) => {
+        if (!this.pingTimer) {
+            return;
+        }
+        clearInterval(this.pingTimer);
+        if (this.connectedPeripheral) {
+            this.log.info("Disconnecting peripheral");
+            this.connectedPeripheral.disconnect();
+        }
+        if (callback) {
+            callback();
+        }
+    };
+    gotData = (data, isNotification) => {
+        if (!this.addressBuffer || this.addressBuffer?.byteLength === 0) {
+            return;
+        }
+        this.log.debug("GotData:", this.config.cryptoKey, this.addressBuffer, data);
+        const decodedData = plejdEncodeDecode(this.config.cryptoKey, this.addressBuffer, data);
+        const id = parseInt(decodedData[0].toString(), 10);
+        const command = decodedData.toString("hex", 3, 5);
+        const isOn = parseInt(decodedData.toString("hex", 5, 6), 10) === 1;
+        const commandType = Object.values(PlejdCommand).find((x) => x.toString() === command) ??
+            "Unknown";
+        const d = {
+            id: id,
+            command: command,
+            commandType: commandType,
+            on: isOn,
+            Notification: isNotification,
+            payload: decodedData.toString("hex"),
         };
-        this.disconnect = (callback) => {
-            if (!this.pingTimer) {
-                return;
+        this.log.debug("GotData", d);
+        switch (command) {
+            case PlejdCommand.Time: {
+                const arg = parseInt(reverseBuffer(decodedData.subarray(5, 9)).toString("hex"), 16);
+                const date = new Date(arg * 1000);
+                this.log.debug("Time sync: " + date.toString());
+                break;
             }
-            clearInterval(this.pingTimer);
-            if (this.connectedPeripheral) {
-                this.log.info('Disconnecting peripheral');
-                this.connectedPeripheral.disconnect();
+            case PlejdCommand.Brightness:
+            case PlejdCommand.StateBrightness: {
+                const dim = parseInt(decodedData.toString("hex", 7, 8), 16);
+                // Convert to Homebridge 1-100
+                const converted = dim === 0 ? 1 : (100 / 255) * dim;
+                this.onUpdate(id, isOn, converted);
+                break;
             }
-            if (callback) {
-                callback();
+            case PlejdCommand.Scene:
+            case PlejdCommand.UpdateState:
+            case PlejdCommand.ButtonClick:
+            case PlejdCommand.RequestResponse:
+            case PlejdCommand.RequestNoResponse:
+            case PlejdCommand.RequestReadValue: {
+                this.onUpdate(id, isOn);
+                break;
             }
-        };
-        this.gotData = (data, isNotification) => {
-            var _a, _b;
-            if (!this.addressBuffer || ((_a = this.addressBuffer) === null || _a === void 0 ? void 0 : _a.byteLength) === 0) {
-                return;
+            default: {
+                this.onUpdate(id, isOn);
+                this.log.debug(`Unknown | command: ${command} | id: ${id} | ${decodedData.toString("hex")}`);
             }
-            this.log.debug('GotData:', this.config.cryptoKey, this.addressBuffer, data);
-            const decodedData = (0, plejdUtils_1.plejdEncodeDecode)(this.config.cryptoKey, this.addressBuffer, data);
-            const id = parseInt(decodedData[0].toString(), 10);
-            const command = decodedData.toString('hex', 3, 5);
-            const isOn = parseInt(decodedData.toString('hex', 5, 6), 10) === 1;
-            const commandType = (_b = Object.values(PlejdCommand).find((x) => x.toString() === command)) !== null && _b !== void 0 ? _b : 'Unknown';
-            const d = {
-                id: id,
-                command: command,
-                commandType: commandType,
-                on: isOn,
-                Notification: isNotification,
-                payload: decodedData.toString('hex'),
-            };
-            this.log.debug('GotData', d);
-            switch (command) {
-                case PlejdCommand.Time: {
-                    const arg = parseInt((0, plejdUtils_1.reverseBuffer)(decodedData.subarray(5, 9)).toString('hex'), 16);
-                    const date = new Date(arg * 1000);
-                    this.log.debug('Time sync: ' + date.toString());
-                    break;
-                }
-                case PlejdCommand.Brightness:
-                case PlejdCommand.StateBrightness: {
-                    const dim = parseInt(decodedData.toString('hex', 7, 8), 16);
-                    // Convert to Homebridge 1-100
-                    const converted = dim === 0 ? 1 : (100 / 255) * dim;
-                    this.onUpdate(id, isOn, converted);
-                    break;
-                }
-                case PlejdCommand.Scene:
-                case PlejdCommand.UpdateState:
-                case PlejdCommand.ButtonClick:
-                case PlejdCommand.RequestResponse:
-                case PlejdCommand.RequestNoResponse:
-                case PlejdCommand.RequestReadValue: {
-                    this.onUpdate(id, isOn);
-                    break;
-                }
-                default: {
-                    this.onUpdate(id, isOn);
-                    this.log.debug(`Unknown | command: ${command} | id: ${id} | ${decodedData.toString('hex')}`);
-                }
+        }
+    };
+    plejdWrite = (dataChar, data) => {
+        dataChar.write(data, false, (error) => {
+            if (error) {
+                this.log.error("Error writing data | " + error);
+                return;
             }
-        };
-        this.plejdWrite = (dataChar, data) => {
-            dataChar.write(data, false, (error) => {
-                if (error) {
-                    this.log.error('Error writing data | ' + error);
-                    return;
-                }
-            });
-        };
-        this.addressBuffer = null;
-        this.dataCharacteristic = null;
-        this.connectedPeripheral = null;
-        this.sendQueue = [];
-        noble_1.default.on('stateChange', (state) => this.stateChange(state));
-        noble_1.default.on('warning', (msg) => this.log.warn('Noble warning: ', msg));
-    }
+        });
+    };
 }
-exports.PlejdService = PlejdService;
 //# sourceMappingURL=plejdService.js.map