updated to comply with new api version

plejd/api.js

@@ -5,7 +5,8 @@ const _ = require('lodash');
 API_APP_ID = 'zHtVqXt8k4yFyk2QGmgp48D9xZr2G94xWYnF4dak';
 API_BASE_URL = 'https://cloud.plejd.com/parse/';
 API_LOGIN_URL = 'login';
-API_SITES_URL = 'functions/getSites';
+API_SITE_LIST_URL = 'functions/getSiteList';
+API_SITE_DETAILS_URL = 'functions/getSiteById';
 
 // #region logging
 let debug = '';
@@ -56,6 +57,7 @@ class PlejdApi extends EventEmitter {
       }
     });
 
+    return new Promise((resolve, reject) => {
       logger('sending POST to ' + API_BASE_URL + API_LOGIN_URL);
 
       instance.post(
@@ -67,7 +69,13 @@ class PlejdApi extends EventEmitter {
         .then((response) => {
           console.log('plejd-api: got session token response');
           self.sessionToken = response.data.sessionToken;
-        self.emit('loggedIn');
+
+          if (!self.sessionToken) {
+            console.log('plejd-api: error: no session token received');
+            reject('no session token received.');
+          }
+
+          resolve();
         })
         .catch((error) => {
           if (error.response.status === 400) {
@@ -76,11 +84,14 @@ class PlejdApi extends EventEmitter {
           else {
             console.log('error: unable to retrieve session token response: ' + error);
           }
+
+          reject('unable to retrieve session token response: ' + error);
+        });
     });
   }
 
-  getCryptoKey(callback) {
-    console.log('plejd-api: getCryptoKey()');
+  getSites() {
+    console.log('plejd-api: getSites()');
     const self = this;
 
     const instance = axios.create({
@@ -92,19 +103,64 @@ class PlejdApi extends EventEmitter {
       }
     });
 
-    logger('sending POST to ' + API_BASE_URL + API_SITES_URL);
+    return new Promise((resolve, reject) => {
+      logger('sending POST to ' + API_BASE_URL + API_SITE_LIST_URL);
 
-    instance.post(API_SITES_URL)
+      instance.post(API_SITE_LIST_URL)
         .then((response) => {
-        console.log('plejd-api: got sites response');
-        self.site = response.data.result.find(x => x.site.title == self.siteName);
-        self.cryptoKey = self.site.plejdMesh.cryptoKey;
+          console.log('plejd-api: got site list response');
+          const site = response.data.result.find(x => x.site.title == self.siteName);
 
-        this.emit('ready', self.cryptoKey, self.site);
+          if (!site) {
+            console.log('plejd-api: error: failed to find a site named ' + self.siteName);
+            reject('failed to find a site named ' + self.siteName);
+            return;
+          }
+
+          resolve(site);
         })
         .catch((error) => {
-        console.log('error: unable to retrieve the crypto key. error: ' + error);
-        return Promise.reject('unable to retrieve the crypto key. error: ' + error);
+          console.log('plejd-api: error: unable to retrieve list of sites. error: ' + error);
+          return reject('plejd-api: unable to retrieve list of sites. error: ' + error);
+        });
+    });
+  }
+
+  getSite(siteId) {
+    console.log('plejd-api: getSites()');
+    const self = this;
+
+    const instance = axios.create({
+      baseURL: API_BASE_URL,
+      headers: {
+        'X-Parse-Application-Id': API_APP_ID,
+        'X-Parse-Session-Token': this.sessionToken,
+        'Content-Type': 'application/json'
+      }
+    });
+
+    return new Promise((resolve, reject) => {
+      logger('sending POST to ' + API_BASE_URL + API_SITE_DETAILS_URL);
+
+      instance.post(API_SITE_DETAILS_URL, { siteId: siteId })
+        .then((response) => {
+          console.log('plejd-api: got site details response');
+          if (response.data.result.length === 0) {
+            const msg = 'no site with ID ' + siteId + ' was found.';
+            console.log('plejd-api: error: ' + msg);
+            reject(msg);
+            return;
+          }
+
+          self.site = response.data.result[0];
+          self.cryptoKey = self.site.plejdMesh.cryptoKey;
+
+          resolve(self.cryptoKey);
+        })
+        .catch((error) => {
+          console.log('plejd-api: error: unable to retrieve the crypto key. error: ' + error);
+          return reject('plejd-api: unable to retrieve the crypto key. error: ' + error);
+        });
     });
   }
 

plejd/config.json

@@ -1,6 +1,6 @@
 {
   "name": "Plejd",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "slug": "plejd",
   "description": "Adds support for the Swedish home automation devices from Plejd.",
   "url": "https://github.com/icanos/hassio-plejd/",

plejd/main.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const PlejdService = require('./ble.bluez');
 const SceneManager = require('./scene.manager');
 
-const version = "0.4.2";
+const version = "0.4.3";
 
 async function main() {
   console.log('starting Plejd add-on v. ' + version);
@@ -19,8 +19,12 @@ async function main() {
   const plejdApi = new api.PlejdApi(config.site, config.username, config.password);
   const client = new mqtt.MqttClient(config.mqttBroker, config.mqttUsername, config.mqttPassword);
 
-  plejdApi.once('loggedIn', () => {
-    plejdApi.on('ready', (cryptoKey, site) => {
+  plejdApi.login().then(() => {
+    // load all sites and find the one that we want (from config)
+    plejdApi.getSites().then((site) => {
+      // load the site and retrieve the crypto key
+      plejdApi.getSite(site.site.siteId).then((cryptoKey) => {
+        // parse all devices from the API
         const devices = plejdApi.getDevices();
 
         client.on('connected', () => {
@@ -104,11 +108,8 @@ async function main() {
           }
         });
       });
-
-    plejdApi.getCryptoKey();
     });
-
-  plejdApi.login();
+  });
 }
 
 main();