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

updated to comply with new api version

Browse source
This commit is contained in:
Marcus Westin 2020-03-13 11:58:15 +01:00
parent fa64f6b8cd
commit 40b538589b
3 changed files with 167 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

149
plejd/main.js
View file

@ -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,96 +19,97 @@ 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) => {
const devices = plejdApi.getDevices();
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', () => {
console.log('plejd-mqtt: connected to mqtt.');
client.discover(devices);
});
client.on('connected', () => {
console.log('plejd-mqtt: connected to mqtt.');
client.discover(devices);
});
client.init();
client.init();
// init the BLE interface
const sceneManager = new SceneManager(site, devices);
const plejd = new PlejdService(cryptoKey, devices, sceneManager, config.connectionTimeout, config.writeQueueWaitTime, true);
plejd.on('connectFailed', () => {
console.log('plejd-ble: were unable to connect, will retry connection in 10 seconds.');
setTimeout(() => {
plejd.init();
}, 10000);
});
// init the BLE interface
const sceneManager = new SceneManager(site, devices);
const plejd = new PlejdService(cryptoKey, devices, sceneManager, config.connectionTimeout, config.writeQueueWaitTime, true);
plejd.on('connectFailed', () => {
console.log('plejd-ble: were unable to connect, will retry connection in 10 seconds.');
setTimeout(() => {
plejd.init();
}, 10000);
});
plejd.init();
plejd.init();
plejd.on('authenticated', () => {
console.log('plejd: connected via bluetooth.');
});
plejd.on('authenticated', () => {
console.log('plejd: connected via bluetooth.');
});
// subscribe to changes from Plejd
plejd.on('stateChanged', (deviceId, command) => {
client.updateState(deviceId, command);
});
// subscribe to changes from Plejd
plejd.on('stateChanged', (deviceId, command) => {
client.updateState(deviceId, command);
});
plejd.on('sceneTriggered', (deviceId, scene) => {
client.sceneTriggered(scene);
});
plejd.on('sceneTriggered', (deviceId, scene) => {
client.sceneTriggered(scene);
});
// subscribe to changes from HA
client.on('stateChanged', (device, command) => {
const deviceId = device.id;
// subscribe to changes from HA
client.on('stateChanged', (device, command) => {
const deviceId = device.id;
if (device.typeName === 'Scene') {
// we're triggering a scene, lets do that and jump out.
// since scenes aren't "real" devices.
plejd.triggerScene(device.id);
return;
}
if (device.typeName === 'Scene') {
// we're triggering a scene, lets do that and jump out.
// since scenes aren't "real" devices.
plejd.triggerScene(device.id);
return;
}
let state = 'OFF';
let commandObj = {};
let state = 'OFF';
let commandObj = {};
if (typeof command === 'string') {
// switch command
state = command;
commandObj = { state: state };
if (typeof command === 'string') {
// switch command
state = command;
commandObj = { state: state };
// since the switch doesn't get any updates on whether it's on or not,
// we fake this by directly send the updateState back to HA in order for
// it to change state.
client.updateState(deviceId, { state: state === 'ON' ? 1 : 0 });
}
else {
state = command.state;
commandObj = command;
}
// since the switch doesn't get any updates on whether it's on or not,
// we fake this by directly send the updateState back to HA in order for
// it to change state.
client.updateState(deviceId, { state: state === 'ON' ? 1 : 0 });
}
else {
state = command.state;
commandObj = command;
}
if (state === 'ON') {
plejd.turnOn(deviceId, commandObj);
}
else {
plejd.turnOff(deviceId, commandObj);
}
});
if (state === 'ON') {
plejd.turnOn(deviceId, commandObj);
}
else {
plejd.turnOff(deviceId, commandObj);
}
});
client.on('settingsChanged', (settings) => {
if (settings.module === 'mqtt') {
client.updateSettings(settings);
}
else if (settings.module === 'ble') {
plejd.updateSettings(settings);
}
else if (settings.module === 'api') {
plejdApi.updateSettings(settings);
}
client.on('settingsChanged', (settings) => {
if (settings.module === 'mqtt') {
client.updateSettings(settings);
}
else if (settings.module === 'ble') {
plejd.updateSettings(settings);
}
else if (settings.module === 'api') {
plejdApi.updateSettings(settings);
}
});
});
});
plejdApi.getCryptoKey();
});
plejdApi.login();
}
main();