rasperrypi-home/hassio-plejd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #141 from SweVictor/feature/fix-rooms-lights

Browse source 
Fix includeRoomsAsLights and improve logging
This commit is contained in:
Marcus Westin 2021-01-19 11:46:15 +01:00 • committed by GitHub
commit 38beca6d6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

75
plejd/api.js
View file

@ -1,6 +1,5 @@
const axios = require('axios'); const axios = require('axios');
const EventEmitter = require('events'); const EventEmitter = require('events');
const _ = require('lodash');
API_APP_ID = 'zHtVqXt8k4yFyk2QGmgp48D9xZr2G94xWYnF4dak'; API_APP_ID = 'zHtVqXt8k4yFyk2QGmgp48D9xZr2G94xWYnF4dak';
API_BASE_URL = 'https://cloud.plejd.com/parse/'; API_BASE_URL = 'https://cloud.plejd.com/parse/';
@ -8,19 +7,20 @@ API_LOGIN_URL = 'login';
API_SITE_LIST_URL = 'functions/getSiteList'; API_SITE_LIST_URL = 'functions/getSiteList';
API_SITE_DETAILS_URL = 'functions/getSiteById'; API_SITE_DETAILS_URL = 'functions/getSiteById';
// #region logging const logInfo = true;
let debug = ''; const logVerbose = true;
const logDebug = false;
const getLogger = () => { const consoleLogger = (level) => (...msg) =>
const consoleLogger = msg => console.log('plejd-api', msg); console.log(new Date().toISOString().replace("T", " ").substring(0, 19) + "Z", level, "plejd-api", ...msg);
if (debug === 'console') {
return consoleLogger; const getLogger = (level, shouldLog) => (shouldLog ? consoleLogger(level) : () => {});
}
return _.noop; const errLogger = getLogger("ERR", true);
}; const infLogger = getLogger("INF", logInfo);
const vrbLogger = getLogger("VRB", logVerbose);
const dbgLogger = getLogger("DBG", logDebug);
const logger = getLogger();
// #endregion
class PlejdApi extends EventEmitter { class PlejdApi extends EventEmitter {
constructor(siteName, username, password, includeRoomsAsLights) { constructor(siteName, username, password, includeRoomsAsLights) {
@ -36,17 +36,12 @@ class PlejdApi extends EventEmitter {
} }
updateSettings(settings) { updateSettings(settings) {
if (settings.debug) { logVerbose("Got new settings: ", settings);
debug = 'console';
}
else {
debug = '';
}
} }
login() { login() {
console.log('plejd-api: login()'); infLogger('login()');
console.log('plejd-api: logging into ' + this.siteName); infLogger('logging into ' + this.siteName);
const self = this; const self = this;
const instance = axios.create({ const instance = axios.create({
@ -58,7 +53,7 @@ class PlejdApi extends EventEmitter {
}); });
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
logger('sending POST to ' + API_BASE_URL + API_LOGIN_URL); vrbLogger('sending POST to ' + API_BASE_URL + API_LOGIN_URL);
instance.post( instance.post(
API_LOGIN_URL, API_LOGIN_URL,
@ -67,11 +62,11 @@ class PlejdApi extends EventEmitter {
'password': this.password 'password': this.password
}) })
.then((response) => { .then((response) => {
console.log('plejd-api: got session token response'); infLogger('got session token response');
self.sessionToken = response.data.sessionToken; self.sessionToken = response.data.sessionToken;
if (!self.sessionToken) { if (!self.sessionToken) {
console.log('plejd-api: error: no session token received'); infError('No session token received');
reject('no session token received.'); reject('no session token received.');
} }
@ -79,10 +74,10 @@ class PlejdApi extends EventEmitter {
}) })
.catch((error) => { .catch((error) => {
if (error.response.status === 400) { if (error.response.status === 400) {
console.log('error: server returned status 400. probably invalid credentials, please verify.'); errLogger('Server returned status 400. probably invalid credentials, please verify.');
} }
else { else {
console.log('error: unable to retrieve session token response: ' + error); errLogger('Unable to retrieve session token response: ' + error);
} }
reject('unable to retrieve session token response: ' + error); reject('unable to retrieve session token response: ' + error);
@ -91,7 +86,7 @@ class PlejdApi extends EventEmitter {
} }
getSites() { getSites() {
console.log('plejd-api: getSites()'); infLogger('getSites()');
const self = this; const self = this;
const instance = axios.create({ const instance = axios.create({
@ -104,15 +99,15 @@ class PlejdApi extends EventEmitter {
}); });
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
logger('sending POST to ' + API_BASE_URL + API_SITE_LIST_URL); vrbLogger('sending POST to ' + API_BASE_URL + API_SITE_LIST_URL);
instance.post(API_SITE_LIST_URL) instance.post(API_SITE_LIST_URL)
.then((response) => { .then((response) => {
console.log('plejd-api: got site list response'); infLogger('got site list response');
const site = response.data.result.find(x => x.site.title == self.siteName); const site = response.data.result.find(x => x.site.title == self.siteName);
if (!site) { if (!site) {
console.log('plejd-api: error: failed to find a site named ' + self.siteName); errLogger('error: failed to find a site named ' + self.siteName);
reject('failed to find a site named ' + self.siteName); reject('failed to find a site named ' + self.siteName);
return; return;
} }
@ -120,14 +115,14 @@ class PlejdApi extends EventEmitter {
resolve(site); resolve(site);
}) })
.catch((error) => { .catch((error) => {
console.log('plejd-api: error: unable to retrieve list of sites. error: ' + error); errLogger('error: unable to retrieve list of sites. error: ' + error);
return reject('plejd-api: unable to retrieve list of sites. error: ' + error); return reject('plejd-api: unable to retrieve list of sites. error: ' + error);
}); });
}); });
} }
getSite(siteId) { getSite(siteId) {
console.log('plejd-api: getSite(...)'); infLogger('getSite(...)');
const self = this; const self = this;
const instance = axios.create({ const instance = axios.create({
@ -140,14 +135,14 @@ class PlejdApi extends EventEmitter {
}); });
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
logger('sending POST to ' + API_BASE_URL + API_SITE_DETAILS_URL); vrbLogger('sending POST to ' + API_BASE_URL + API_SITE_DETAILS_URL);
instance.post(API_SITE_DETAILS_URL, { siteId: siteId }) instance.post(API_SITE_DETAILS_URL, { siteId: siteId })
.then((response) => { .then((response) => {
console.log('plejd-api: got site details response'); infLogger('got site details response');
if (response.data.result.length === 0) { if (response.data.result.length === 0) {
const msg = 'no site with ID ' + siteId + ' was found.'; const msg = 'no site with ID ' + siteId + ' was found.';
console.log('plejd-api: error: ' + msg); errLogger('error: ' + msg);
reject(msg); reject(msg);
return; return;
} }
@ -158,7 +153,7 @@ class PlejdApi extends EventEmitter {
resolve(self.cryptoKey); resolve(self.cryptoKey);
}) })
.catch((error) => { .catch((error) => {
console.log('plejd-api: error: unable to retrieve the crypto key. error: ' + error); errLogger('error: unable to retrieve the crypto key. error: ' + error);
return reject('plejd-api: unable to retrieve the crypto key. error: ' + error); return reject('plejd-api: unable to retrieve the crypto key. error: ' + error);
}); });
}); });
@ -167,10 +162,7 @@ class PlejdApi extends EventEmitter {
getDevices() { getDevices() {
let devices = []; let devices = [];
// Just log the devices if debug logging enabled dbgLogger(JSON.stringify(this.site));
if (debug) {
logger(JSON.stringify(this.site));
}
const roomDevices = {}; const roomDevices = {};
@ -260,7 +252,7 @@ class PlejdApi extends EventEmitter {
} }
if (this.includeRoomsAsLights) { if (this.includeRoomsAsLights) {
logger('includeRoomsAsLights is set to true, adding rooms too.'); vrbLogger('includeRoomsAsLights is set to true, adding rooms too.');
for (let i = 0; i < this.site.rooms.length; i++) { for (let i = 0; i < this.site.rooms.length; i++) {
const room = this.site.rooms[i]; const room = this.site.rooms[i];
const roomId = room.roomId; const roomId = room.roomId;
@ -271,11 +263,12 @@ class PlejdApi extends EventEmitter {
name: room.title, name: room.title,
type: 'light', type: 'light',
typeName: 'Room', typeName: 'Room',
dimmable: roomDevices[roomId].find(x => x.dimmable).length > 0 dimmable: roomDevices[roomId].filter(x => x.dimmable).length > 0
}; };
devices.push(newDevice); devices.push(newDevice);
} }
vrbLogger('includeRoomsAsLights done.');
} }
// add scenes as switches // add scenes as switches

2
plejd/main.js
View file

@ -16,7 +16,7 @@ async function main() {
config.connectionTimeout = 2; config.connectionTimeout = 2;
} }
const plejdApi = new api.PlejdApi(config.site, config.username, config.password); const plejdApi = new api.PlejdApi(config.site, config.username, config.password, config.includeRoomsAsLights);
const client = new mqtt.MqttClient(config.mqttBroker, config.mqttUsername, config.mqttPassword); const client = new mqtt.MqttClient(config.mqttBroker, config.mqttUsername, config.mqttPassword);
plejdApi.login().then(() => { plejdApi.login().then(() => {