homebridge-plejd 1.3.8 → 1.4.0

package/CHANGELOG.md

@@ -1,8 +1,16 @@
-#### 1.3.6 (2024-06-20)
+#### 1.4.0 (2024-06-21)
+
+Move to async/await paradigm and fix flickering ouccuring when updating device brightness from home assistant and other sources.
+
+#### 1.3.9 (2024-06-21)
+
+Clear out dependencies & refactor
+
+#### 1.3.8 (2024-06-20)
 
 Updated plejd ble characteristict
 
-#### 1.3.6 (2024-06-20)
+#### 1.3.7 (2024-06-20)
 
 Fix import issues and update configurations
 

package/config.schema.json

@@ -2,7 +2,7 @@
   "pluginAlias": "Plejd",
   "pluginType": "platform",
   "headerDisplay": "Plejd Setup",
-  "footerDisplay": "Either use your login or add devices and crypto key manually.",
+  "footerDisplay": "Either use your login or add devices and crypto key manually. Crypto key and device info is printed as debug logs at startup",
   "singular": true,
   "schema": {
     "username": {
@@ -79,4 +79,4 @@
       }
     }
   }
-}
+}

package/dist/{plejdPlatformAccessory.d.ts → PlejdHbAccessory.d.ts}

@@ -1,18 +1,18 @@
-import { PlatformAccessory } from "homebridge";
-import { Device } from "./model/device.js";
-import { PlejdPlatform } from "./plejdPlatform.js";
+import { PlatformAccessory } from 'homebridge';
+import { Device } from './model/device.js';
+import { PlejdHbPlatform } from './PlejdHbPlatform.js';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-export declare class PlejdPlatformAccessoryHandler {
+export declare class PlejdHbAccessory {
     private readonly platform;
     private readonly accessory;
     readonly device: Device;
     private service;
     private state;
-    constructor(platform: PlejdPlatform, accessory: PlatformAccessory, device: Device);
+    constructor(platform: PlejdHbPlatform, accessory: PlatformAccessory, device: Device);
     updateState: (isOn: boolean, brightness?: number) => void;
     private setOn;
     private getOn;

package/dist/{plejdPlatformAccessory.js → PlejdHbAccessory.js}

@@ -1,10 +1,10 @@
-import { PLATFORM_NAME } from "./settings.js";
+import { PLATFORM_NAME } from './settings.js';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
  * Each accessory may expose multiple services of different service types.
  */
-export class PlejdPlatformAccessoryHandler {
+export class PlejdHbAccessory {
     platform;
     accessory;
     device;
@@ -14,7 +14,6 @@ export class PlejdPlatformAccessoryHandler {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
-        platform.log.debug(`Adding handler for a ${this.device.model} with id ${this.device.identifier}`);
         this.state = {
             brightness: accessory.context.brightness ?? 100,
             isOn: accessory.context.isOn ?? false,
@@ -48,40 +47,22 @@ export class PlejdPlatformAccessoryHandler {
         this.service.setCharacteristic(this.platform.Characteristic.Name, this.device.name);
     }
     updateState = (isOn, brightness) => {
+        this.platform.log.debug(`Updating Homekit state from ${this.device.name} device state`);
         this.state.isOn = isOn;
-        this.platform.log.debug("updateState | Sending isOn", isOn);
         this.service
             .getCharacteristic(this.platform.Characteristic.On)
             .updateValue(isOn);
         if (brightness) {
             this.state.brightness = Math.round(brightness);
-            this.platform.log.debug("update state | Sending brightness", this.state.brightness);
             this.service
                 .getCharacteristic(this.platform.Characteristic.Brightness)
                 .updateValue(this.state.brightness);
         }
         this.accessory.context = this.state;
-        this.platform.log.debug(`State updated | ${JSON.stringify(this.state)}`);
-    };
-    setOn = async (value) => {
-        const newVal = value;
-        this.platform.log.info(`Updating state | ${this.device.name} | to ${newVal ? "On" : "off"} | from ${this.state.isOn ? "On" : "Off"}`);
-        this.updateState(newVal, this.state.brightness);
-        this.platform.plejdService?.updateState(this.device.identifier, newVal, null);
-    };
-    getOn = async () => {
-        this.platform.log.debug("Get Characteristic On", this.device.name, this.state.isOn);
-        return this.state.isOn;
-    };
-    setBrightness = async (value) => {
-        const newVal = value; // Number between 1-100
-        this.platform.log.debug(`Updating brightness | ${this.device.name} | to ${newVal} | from ${this.state.brightness}`);
-        this.updateState(this.state.isOn, newVal);
-        this.platform.plejdService?.updateState(this.device.identifier, this.state.isOn, newVal);
-    };
-    getBrightness = async () => {
-        this.platform.log.debug("Get Characteristic Brightness", this.device.name, this.state.brightness);
-        return this.state.brightness;
     };
+    setOn = async (value) => await this.platform.plejdService?.updateState(this.device.identifier, value, null);
+    getOn = () => this.state.isOn;
+    setBrightness = async (value) => await this.platform.plejdService?.updateState(this.device.identifier, this.state.isOn, value);
+    getBrightness = () => this.state.brightness;
 }
-//# sourceMappingURL=plejdPlatformAccessory.js.map
+//# sourceMappingURL=PlejdHbAccessory.js.map

package/dist/PlejdHbAccessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PlejdHbAccessory.js","sourceRoot":"","sources":["../src/PlejdHbAccessory.ts"],"names":[],"mappings":"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"}

package/dist/{plejdPlatform.d.ts → PlejdHbPlatform.d.ts}

@@ -1,10 +1,10 @@
-import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig, Service, Characteristic } from "homebridge";
-import { PlejdPlatformAccessoryHandler } from "./plejdPlatformAccessory.js";
-import { UserInputConfig } from "./model/userInputConfig.js";
-import { Device } from "./model/device.js";
-import { PlejdService } from "./plejdService.js";
-import { Site } from "./model/plejdSite.js";
-export declare class PlejdPlatform implements DynamicPlatformPlugin {
+import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig, Service, Characteristic } from 'homebridge';
+import { PlejdHbAccessory } from './PlejdHbAccessory.js';
+import { UserInputConfig } from './model/userInputConfig.js';
+import { Device } from './model/device.js';
+import { PlejdService } from './plejdService.js';
+import { Site } from './model/plejdSite.js';
+export declare class PlejdHbPlatform implements DynamicPlatformPlugin {
     readonly log: Logger;
     readonly config: PlatformConfig;
     readonly homebridgeApi: API;
@@ -13,9 +13,9 @@ export declare class PlejdPlatform implements DynamicPlatformPlugin {
     userInputConfig?: UserInputConfig;
     plejdService?: PlejdService;
     readonly accessories: PlatformAccessory[];
-    readonly plejdHandlers: PlejdPlatformAccessoryHandler[];
+    readonly plejdHbAccessories: PlejdHbAccessory[];
     constructor(log: Logger, config: PlatformConfig, homebridgeApi: API);
-    configurePlejd: () => void;
+    configurePlejd: () => Promise<void>;
     configureDevices: (log: Logger, config: PlatformConfig, site?: Site) => void;
     /**
      * This function is invoked when homebridge restores cached accessories from disk at startup.

package/dist/{plejdPlatform.js → PlejdHbPlatform.js}

@@ -1,8 +1,8 @@
-import { PLATFORM_NAME, PLEJD_ADDONS, PLEJD_LIGHTS, PLUGIN_NAME, } from "./settings.js";
-import { PlejdPlatformAccessoryHandler } from "./plejdPlatformAccessory.js";
-import { PlejdService } from "./plejdService.js";
-import PlejdRemoteApi from "./plejdApi.js";
-export class PlejdPlatform {
+import { PLATFORM_NAME, PLEJD_ADDONS, PLEJD_LIGHTS, PLUGIN_NAME, } from './settings.js';
+import { PlejdHbAccessory } from './PlejdHbAccessory.js';
+import { PlejdService } from './plejdService.js';
+import PlejdRemoteApi from './plejdApi.js';
+export class PlejdHbPlatform {
     log;
     config;
     homebridgeApi;
@@ -12,34 +12,31 @@ export class PlejdPlatform {
     plejdService;
     // this is used to track restored cached accessories
     accessories = [];
-    plejdHandlers = [];
+    plejdHbAccessories = [];
     constructor(log, config, homebridgeApi) {
         this.log = log;
         this.config = config;
         this.homebridgeApi = homebridgeApi;
-        this.log.debug("Finished initializing platform:", this.config.platform);
-        homebridgeApi.on("didFinishLaunching", this.configurePlejd);
+        homebridgeApi.on('didFinishLaunching', this.configurePlejd);
         this.Characteristic = homebridgeApi.hap.Characteristic;
         this.Service = homebridgeApi.hap.Service;
     }
-    configurePlejd = () => {
+    configurePlejd = async () => {
         if (this.config.password && this.config.site && this.config.username) {
-            this.log.info("Using login information to fetch devices & crypto key");
-            this.log.info("Any devices added manually will update the downloaded devices");
+            this.log.info('Using login information to fetch devices & crypto key\n' +
+                'Any devices added manually will override the remote site information');
             const pApi = new PlejdRemoteApi(this.log, this.config.site, this.config.username, this.config.password, true);
-            pApi
-                .getPlejdRemoteSite()
-                .then((site) => this.configureDevices(this.log, this.config, site))
-                .catch((e) => this.log.error(`Plejd remote access error: ${e}`));
+            const site = await pApi.getPlejdRemoteSite();
+            this.configureDevices(this.log, this.config, site);
         }
         else if (this.config.crypto_key &&
             this.config.devices &&
             this.config.devices.count > 0) {
-            this.log.info("Using supplied crypto key & devices");
+            this.log.info('Using supplied crypto key & devices');
             this.configureDevices(this.log, this.config, undefined);
         }
         else {
-            this.log.warn("No settings are prepared, either supply crypto key & devices OR username, password & site");
+            this.log.warn('No settings are prepared, either supply crypto key & devices OR username, password & site');
         }
     };
     configureDevices = (log, config, site) => {
@@ -58,7 +55,7 @@ export class PlejdPlatform {
                 }
                 const room = site.rooms.find((x) => x.roomId === item.roomId);
                 let identifier = site.inputAddress[id][0];
-                if (dim.endsWith("-02") &&
+                if (dim.endsWith('-02') &&
                     items.find((a) => a.identifier === identifier) !== undefined) {
                     identifier += 1;
                 }
@@ -77,7 +74,7 @@ export class PlejdPlatform {
                 const pre = devices.findIndex((x) => x.identifier === item.identifier);
                 if (pre !== -1) {
                     if (devices[pre].hidden) {
-                        log.debug("Hiding device |", devices[pre]);
+                        log.debug('Hiding device |', devices[pre]);
                         devices.splice(pre);
                     }
                     else {
@@ -94,25 +91,25 @@ export class PlejdPlatform {
                 devices[i].isDimmer = PLEJD_LIGHTS.includes(devices[i].model);
             }
             else {
-                log.error("Missing device model |", devices[i].name);
+                log.error('Missing device model |', devices[i].name);
             }
             if (devices[i].identifier) {
                 devices[i].uuid = this.generateId(devices[i].identifier.toString());
             }
             else {
-                log.error("Missing device identifier |", devices[i].name);
+                log.error('Missing device identifier |', devices[i].name);
             }
         }
         if (!config.crypto_key) {
-            log.error("No Crypto key was found in the configuration. Check the plugin documentation for more info");
+            log.error('No Crypto key was found in the configuration. Check the plugin documentation for more info');
         }
-        const cryptoKey = Buffer.from(config.crypto_key.replace(/-/g, ""), "hex");
+        const cryptoKey = Buffer.from(config.crypto_key.replace(/-/g, ''), 'hex');
         this.userInputConfig = {
             devices: devices,
             cryptoKey: cryptoKey,
         };
-        log.info("Plejd Crypto Key:", config.crypto_key);
-        log.info("Plejd Devices connected to HomeKit:", this.userInputConfig.devices);
+        log.debug('Plejd Crypto Key:', config.crypto_key);
+        log.debug('Plejd Devices connected to HomeKit:', this.userInputConfig.devices);
         this.plejdService = new PlejdService(this.userInputConfig, log, this.onPlejdUpdates.bind(this));
         this.discoverDevices();
     };
@@ -121,7 +118,6 @@ export class PlejdPlatform {
      * It should be used to setup event handlers for characteristics and update respective values.
      */
     configureAccessory = (accessory) => {
-        this.log.info("Loading accessory from cache | ", accessory.displayName);
         this.accessories.push(accessory);
     };
     discoverDevices = () => {
@@ -130,14 +126,13 @@ export class PlejdPlatform {
         if (notRegistered.length > 0) {
             this.homebridgeApi.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, notRegistered);
         }
-        this.log.debug("registering devices", this.userInputConfig?.devices);
         for (const device of this.userInputConfig.devices) {
             if (device.hidden) {
                 continue;
             }
             const existingAccessory = this.accessories.find((accessory) => accessory.UUID === device.uuid);
             if (existingAccessory) {
-                this.plejdHandlers.push(new PlejdPlatformAccessoryHandler(this, existingAccessory, device));
+                this.plejdHbAccessories.push(new PlejdHbAccessory(this, existingAccessory, device));
             }
             else {
                 this.addNewDevice(device);
@@ -145,15 +140,10 @@ export class PlejdPlatform {
         }
     };
     addNewDevice = (device) => {
-        let name = device.name;
-        this.log.info("Adding new accessory |", name);
-        if (device.room) {
-            name = device.room + " - " + name;
-        }
         const accessory = new this.homebridgeApi.platformAccessory(device.name, device.uuid);
         accessory.context.device = device;
         // See above.
-        this.plejdHandlers.push(new PlejdPlatformAccessoryHandler(this, accessory, device));
+        this.plejdHbAccessories.push(new PlejdHbAccessory(this, accessory, device));
         // link the accessory to your platform
         this.homebridgeApi.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [
             accessory,
@@ -170,16 +160,16 @@ export class PlejdPlatform {
         }
         const existingAccessory = this.accessories.find((accessory) => accessory.UUID === uuid);
         const device = this.userInputConfig.devices.find((dev) => dev.identifier === identifier);
-        const plejdHandler = this.plejdHandlers.find((dev) => dev.device.identifier === identifier);
-        if (existingAccessory && device && plejdHandler) {
+        const plejdHbAccessory = this.plejdHbAccessories.find((dev) => dev.device.identifier === identifier);
+        if (existingAccessory && device && plejdHbAccessory) {
             if (device.isDimmer) {
                 const ser = existingAccessory.getService(this.Service.Lightbulb);
                 if (!ser) {
-                    this.log.warn("Unable to get service");
+                    this.log.warn('Unable to get service');
                 }
                 const on = ser?.getCharacteristic(this.Characteristic.On);
                 if (!on) {
-                    this.log.warn("Unable to get Characteristic [On]");
+                    this.log.warn('Unable to get Characteristic [On]');
                 }
                 on?.updateValue(isOn);
                 if (brightness !== undefined) {
@@ -194,20 +184,17 @@ export class PlejdPlatform {
                     ?.getCharacteristic(this.Characteristic.On)
                     ?.updateValue(isOn);
             }
-            plejdHandler.updateState(isOn, brightness);
+            plejdHbAccessory.updateState(isOn, brightness);
         }
         else {
             if (device) {
                 this.addNewDevice(device);
                 this.onPlejdUpdates(identifier, isOn, brightness);
             }
-            else {
-                this.log.info("Unable find HomKit device associated with incoming Plejd update |", device);
-            }
         }
     };
     generateId = (input) => {
         return this.homebridgeApi.hap.uuid.generate(input);
     };
 }
-//# sourceMappingURL=plejdPlatform.js.map
+//# sourceMappingURL=PlejdHbPlatform.js.map

package/dist/PlejdHbPlatform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PlejdHbPlatform.js","sourceRoot":"","sources":["../src/PlejdHbPlatform.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { API } from "homebridge";
+import { API } from 'homebridge';
 /**
  * This method registers the platform with Homebridge
  */

package/dist/index.js

@@ -1,9 +1,9 @@
-import { PLATFORM_NAME, PLUGIN_NAME } from "./settings.js";
-import { PlejdPlatform } from "./plejdPlatform.js";
+import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
+import { PlejdHbPlatform } from './PlejdHbPlatform.js';
 /**
  * This method registers the platform with Homebridge
  */
 export default (api) => {
-    api.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, PlejdPlatform);
+    api.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, PlejdHbPlatform);
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;GAEG;AACH,eAAe,CAAC,GAAQ,EAAE,EAAE;IAC1B,GAAG,CAAC,gBAAgB,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AACH,eAAe,CAAC,GAAQ,EAAE,EAAE;IAC1B,GAAG,CAAC,gBAAgB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;AACpE,CAAC,CAAC"}

package/dist/plejdApi.d.ts

@@ -1,17 +1,13 @@
-/// <reference types="node" />
-import EventEmitter from "events";
-import { Logger } from "homebridge";
-import { Site } from "./model/plejdSite.js";
-export default class PlejdRemoteApi extends EventEmitter {
+import { Logger } from 'homebridge';
+import { Site } from './model/plejdSite.js';
+export default class PlejdRemoteApi {
     log: Logger;
     siteName: string;
     username: string;
     password: string;
     includeRoomsAsLights: boolean;
-    sessionToken?: string;
-    site?: Site;
     constructor(log: Logger, siteName: string, username: string, password: string, includeRoomsAsLights: boolean);
-    getPlejdRemoteSite: () => Promise<Site>;
+    getPlejdRemoteSite(): Promise<Site>;
     private login;
     private getSites;
     private getSite;

package/dist/plejdApi.js

@@ -1,143 +1,95 @@
-import axios from "axios";
-import EventEmitter from "events";
-const API_APP_ID = "zHtVqXt8k4yFyk2QGmgp48D9xZr2G94xWYnF4dak";
-const API_BASE_URL = "https://cloud.plejd.com/parse/";
-const API_LOGIN_URL = "login";
-const API_SITE_LIST_URL = "functions/getSiteList";
-const API_SITE_DETAILS_URL = "functions/getSiteById";
-export default class PlejdRemoteApi extends EventEmitter {
+const API_APP_ID = 'zHtVqXt8k4yFyk2QGmgp48D9xZr2G94xWYnF4dak';
+const API_BASE_URL = 'https://cloud.plejd.com/parse/';
+const API_LOGIN_URL = 'login';
+const API_SITE_LIST_URL = 'functions/getSiteList';
+const API_SITE_DETAILS_URL = 'functions/getSiteById';
+export default class PlejdRemoteApi {
     log;
     siteName;
     username;
     password;
     includeRoomsAsLights;
-    sessionToken;
-    site;
     constructor(log, siteName, username, password, includeRoomsAsLights) {
-        super();
         this.log = log;
         this.includeRoomsAsLights = includeRoomsAsLights;
         this.siteName = siteName;
         this.username = username;
         this.password = password;
     }
-    getPlejdRemoteSite = () => {
-        return new Promise((resolve, reject) => {
-            this.login()
-                .then(() => {
-                this.getSites()
-                    .then((site) => {
-                    this.getSite(site)
-                        .then((site) => {
-                        resolve(site);
-                    })
-                        .catch((e) => {
-                        this.log.error(`${e}`);
-                        reject(e);
-                    });
-                })
-                    .catch((e) => {
-                    this.log.error(`${e}`);
-                    reject(e);
-                });
-            })
-                .catch((e) => {
-                this.log.error(`${e}`);
-                reject(e);
-            });
-        });
-    };
-    login = () => {
-        const instance = axios.create({
-            baseURL: API_BASE_URL,
+    async getPlejdRemoteSite() {
+        const token = await this.login();
+        const site = await this.getSites(token);
+        return await this.getSite(site, token);
+    }
+    async login() {
+        const response = await fetch(API_BASE_URL + API_LOGIN_URL, {
+            method: 'POST',
             headers: {
-                "X-Parse-Application-Id": API_APP_ID,
-                "Content-Type": "application/json",
+                'X-Parse-Application-Id': API_APP_ID,
+                'Content-Type': 'application/json',
             },
-        });
-        return new Promise((resolve, reject) => {
-            instance
-                .post(API_LOGIN_URL, {
+            body: JSON.stringify({
                 username: this.username,
                 password: this.password,
-            })
-                .then((response) => {
-                this.log.debug("plejd-api: got session token response");
-                this.sessionToken = response.data.sessionToken;
-                if (!this.sessionToken) {
-                    reject("no session token received.");
-                    return;
-                }
-                resolve(response.data.sessionToken);
-            })
-                .catch((error) => {
-                if (error.response.status === 400) {
-                    reject("error: server returned status 400. probably invalid credentials, please verify.");
-                }
-                else {
-                    reject("error: unable to retrieve session token response: " + error);
-                }
-            });
+            }),
         });
-    };
-    getSites = () => {
-        const instance = axios.create({
-            baseURL: API_BASE_URL,
+        if (!response.ok) {
+            if (response.status === 400) {
+                throw new Error('error: server returned status 400. probably invalid credentials, please verify.');
+            }
+            else {
+                throw new Error('error: unable to retrieve session token response: ' + response.statusText);
+            }
+        }
+        const data = await response.json();
+        if (!data.sessionToken) {
+            throw new Error('no session token received.');
+        }
+        return data.sessionToken;
+    }
+    async getSites(token) {
+        const response = await fetch(API_BASE_URL + API_SITE_LIST_URL, {
+            method: 'POST',
             headers: {
-                "X-Parse-Application-Id": API_APP_ID,
-                "X-Parse-Session-Token": this.sessionToken,
-                "Content-Type": "application/json",
+                'X-Parse-Application-Id': API_APP_ID,
+                'X-Parse-Session-Token': token,
+                'Content-Type': 'application/json',
             },
         });
-        return new Promise((resolve, reject) => {
-            this.log.debug("Sending POST to " + API_BASE_URL + API_SITE_LIST_URL);
-            instance
-                .post(API_SITE_LIST_URL)
-                .then((response) => {
-                this.log.debug("plejd-api: got detailed sites response");
-                const site = response.data.result.find((x) => x.site.title === this.siteName);
-                if (!site) {
-                    reject("failed to find a site named " + this.siteName);
-                    return;
-                }
-                resolve(site);
-            })
-                .catch((error) => {
-                return reject("plejd-api: unable to retrieve list of sites. error: " + error);
-            });
-        });
-    };
-    getSite = (site) => {
-        const instance = axios.create({
-            baseURL: API_BASE_URL,
+        if (!response.ok) {
+            throw new Error('plejd-api: unable to retrieve list of sites. error: ' + response.statusText);
+        }
+        const data = await response.json();
+        const site = data.result.find((x) => x.site.title === this.siteName);
+        if (!site) {
+            throw new Error('failed to find a site named ' + this.siteName);
+        }
+        return site;
+    }
+    async getSite(site, token) {
+        const response = await fetch(API_BASE_URL + API_SITE_DETAILS_URL, {
+            method: 'POST',
             headers: {
-                "X-Parse-Application-Id": API_APP_ID,
-                "X-Parse-Session-Token": this.sessionToken,
-                "Content-Type": "application/json",
+                'X-Parse-Application-Id': API_APP_ID,
+                'X-Parse-Session-Token': token,
+                'Content-Type': 'application/json',
             },
+            body: JSON.stringify({ siteId: site.site.siteId }),
         });
-        return new Promise((resolve, reject) => {
-            this.log.debug("Sending POST to " + API_BASE_URL + API_SITE_DETAILS_URL);
-            instance
-                .post(API_SITE_DETAILS_URL, { siteId: site.site.siteId })
-                .then((response) => {
-                this.log.debug("plejd-api: got site details response");
-                if (response.data.result.length === 0) {
-                    reject("No devices fount");
-                    return;
-                }
-                this.site = response.data.result[0];
-                if (this.site) {
-                    resolve(this.site);
-                }
-                else {
-                    reject("No Crypto has been retrieved yet");
-                }
-            })
-                .catch((error) => {
-                return reject("plejd-api: unable to retrieve the crypto key. error: " + error);
-            });
-        });
-    };
+        if (!response.ok) {
+            throw new Error('plejd-api: unable to retrieve the crypto key. error: ' + response.statusText);
+        }
+        const data = await response.json();
+        if (data.result.length === 0) {
+            throw new Error('No devices found');
+        }
+        const res = data.result[0];
+        if (res) {
+            return res;
+        }
+        else {
+            throw new Error('No Crypto has been retrieved yet');
+        }
+    }
 }
 //# sourceMappingURL=plejdApi.js.map