Skip to content

Added realtime updates and updated API lib #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smarthomesven wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added realtime updates and updated API lib #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">

<link rel="shortcut icon" href="./img/favicon.png" type="image/png" />
<link rel="apple-touch-icon" href="./img/favicon.png">
<link rel="shortcut icon" href="https://etc.athom.com/logo/transparent/128.png" type="image/png" />
<link rel="apple-touch-icon" href="https://etc.athom.com/logo/transparent/128.png">
<link rel="stylesheet" type="text/css" href="./css/homey.ink.css">

<script type="text/javascript">
Expand All @@ -23,7 +23,7 @@
});
</script>

<script type="text/javascript" src="./js/athom-api.min.js"></script>
<script type="text/javascript" src="https://cdn.athom.com/homey-api/3.14.23.js"></script>
<script type="text/javascript" src="./js/moment.min.js"></script>
<script type="text/javascript" src="./js/polyfill.js"></script>
<script type="text/javascript" src="./js/later.js"></script>
Expand Down
128 changes: 120 additions & 8 deletions app/js/homey.ink.app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
var CLIENT_ID = '5cbb504da1fc782009f52e46';
var CLIENT_SECRET = 'gvhs0gebgir8vz8yo2l0jfb49u9xzzhrkuo1uvs8';

var flowCache = {};
var advancedFlowCache = {};
var deviceCache = {};

window.addEventListener('load', function () {
try {
var homey;
Expand All @@ -23,12 +27,10 @@ window.addEventListener('load', function () {
renderText();
}, later.parse.text('every 1 hour'));

var api = new AthomCloudAPI({
clientId: CLIENT_ID,
clientSecret: CLIENT_SECRET,
});

var theme = getQueryVariable('theme');
if (!theme) {
theme = 'web';
}
var $css = document.createElement('link');
$css.rel = 'stylesheet';
$css.type = 'text/css';
Expand All @@ -42,7 +44,17 @@ window.addEventListener('load', function () {

token = atob(token);
token = JSON.parse(token);
api.setToken(token);
var tokenInstance = new AthomCloudAPI.Token({
access_token: token.access_token,
token_type: 'bearer',
refresh_token: token.refresh_token,
expires_in: token.expires_in,
});
var api = new AthomCloudAPI({
clientId: CLIENT_ID,
clientSecret: CLIENT_SECRET,
token: tokenInstance,
});

api.isLoggedIn().then(function (loggedIn) {
if (!loggedIn)
Expand All @@ -57,12 +69,17 @@ window.addEventListener('load', function () {
homey = homey_;

renderHomey();
setupRealtime();
later.setInterval(function () {
renderHomey();
}, later.parse.text('every 1 hour'));
}).catch(function (err) {
console.error(err);
document.write('<pre>Error: ' + err.message + '\n' + err.stack);
document.head.innerHTML = '';
document.body.innerHTML = '';
var $pre = document.createElement('pre');
$pre.innerText = 'Error: ' + err.message + '\n' + err.stack;
document.body.appendChild($pre);
});

function renderHomey() {
Expand All @@ -77,9 +94,11 @@ window.addEventListener('load', function () {
}).catch(console.error);

homey.flow.getFlows().then(function (flows) {
flowCache = flows;
return homey.flow.getAdvancedFlows()
.catch(function () { return {} })
.then(function (advancedFlows) {
advancedFlowCache = advancedFlows;
var favoriteFlows = me.properties.favoriteFlows.map(function (flowId) {
return flows[flowId] || advancedFlows[flowId];
}).filter(function (flow) {
Expand All @@ -90,6 +109,7 @@ window.addEventListener('load', function () {
}).catch(console.error);

homey.devices.getDevices().then(function (devices) {
deviceCache = devices;
var favoriteDevices = me.properties.favoriteDevices.map(function (deviceId) {
return devices[deviceId];
}).filter(function (device) {
Expand Down Expand Up @@ -122,6 +142,7 @@ window.addEventListener('load', function () {
function renderFlows(flows) {
$flowsInner.innerHTML = '';
flows.forEach(function (flow) {
if (!flow.triggerable) return;
var $flow = document.createElement('div');
$flow.id = 'flow-' + flow.id;
$flow.classList.add('flow');
Expand Down Expand Up @@ -201,7 +222,98 @@ window.addEventListener('load', function () {
$textLarge.innerText = 'Good ' + tod + '!';
$textSmall.innerText = 'Today is ' + moment(now).format('dddd[, the ]Do[ of ]MMMM YYYY[.]');
}

async function setupRealtime() {
await homey.devices.connect();
homey.devices.on('device.create', function (deviceData) {
deviceCache[deviceData.id] = deviceData;
});
homey.devices.on('device.update', function (deviceData) {
deviceCache[deviceData.id] = Object.assign({}, deviceCache[deviceData.id] || {}, deviceData);
var $device = document.getElementById('device-' + deviceData.id);
if ($device && deviceData.name !== $device.innerText) {
$device.querySelector('.name').innerText = deviceData.name;
}
});
homey.devices.on('device.delete', function (deviceData) {
delete deviceCache[deviceData.id];
var $device = document.getElementById('device-' + deviceData.id);
if ($device) {
$device.remove();
}
});
await homey.flow.connect();
homey.flow.on('flow.update', function (flowData) {
flowCache[flowData.id] = Object.assign({}, flowCache[flowData.id] || {}, flowData);
var $flow = document.getElementById('flow-' + flowData.id);
if ($flow && flowData.name !== $flow.innerText) {
$flow.querySelector('.name').innerText = flowData.name;
}
if ($flow && flowData.triggerable === false) {
$flow.remove();
}
});
homey.flow.on('flow.delete', function (flowData) {
delete flowCache[flowData.id];
var $flow = document.getElementById('flow-' + flowData.id);
if ($flow) {
$flow.remove();
}
});
homey.flow.on('flow.create', function (flowData) {
flowCache[flowData.id] = flowData;
});
homey.flow.on('advancedflow.update', function (flowData) {
advancedFlowCache[flowData.id] = Object.assign({}, advancedFlowCache[flowData.id] || {}, flowData);
var $flow = document.getElementById('flow-' + flowData.id);
if ($flow && flowData.name !== $flow.innerText) {
$flow.querySelector('.name').innerText = flowData.name;
}
if ($flow && flowData.triggerable === false) {
$flow.remove();
}
});
homey.flow.on('advancedflow.delete', function (flowData) {
delete advancedFlowCache[flowData.id];
var $flow = document.getElementById('flow-' + flowData.id);
if ($flow) {
$flow.remove();
}
});
homey.flow.on('advancedflow.create', function (flowData) {
advancedFlowCache[flowData.id] = flowData;
});
await homey.users.connect();
homey.users.on('user.update', function (userData) {
if (userData.id !== me.id || !userData.properties) return;
if (userData.properties.favoriteDevices) {
var favoriteDevices = userData.properties.favoriteDevices.map(function (deviceId) {
return deviceCache[deviceId];
}).filter(function (device) {
return !!device;
}).filter(function (device) {
if (!device.ui) return false;
if (!device.ui.quickAction) return false;
return true;
});
renderDevices(favoriteDevices);
}
if (userData.properties.favoriteFlows) {
var favoriteFlows = userData.properties.favoriteFlows.map(function (flowId) {
return flowCache[flowId] || advancedFlowCache[flowId];
}).filter(function (flow) {
return !!flow;
});
renderFlows(favoriteFlows);
}
});
}
} catch (err) {
document.write('<pre>Error: ' + err.message + '\n' + err.stack);
document.body.innerHTML = '';
document.head.innerHTML = '';
var $pre = document.createElement('pre');
$pre.innerText = 'Error: ' + err.message + '\n' + err.stack;
document.body.appendChild($pre);
console.error(err);
}
});