Skip to content

Use CloudTokens instead of deviceId for communication #1

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
Clindbergh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use CloudTokens instead of deviceId for communication #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa9899
Set a cloudToken if none is set and use it instead of the deviceId fo…
Clindbergh Nov 13, 2018
7a225fc
Fix: Use cloudtoken also for incoming write/read requests.
Clindbergh Dec 16, 2018
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
75 changes: 57 additions & 18 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ let deviceGrid = document.getElementById("device-grid");
Buffer = Buffer.Buffer;
let client = undefined;

let deviceMap = {}
let deviceMapByDeviceId = {};
let deviceMapByCloudToken = {};

modalBtn.addEventListener('click', function() {
if (client && client.connected) {
Expand Down Expand Up @@ -40,9 +41,9 @@ connectForm.addEventListener('submit', e => {
document.getElementById('connect-dialog').close();
modalBtn.enabled = true;
modalBtn.value = 'Disconnect';
for (var deviceUri in deviceMap) {
const topic = deviceUri+'/+/+'
client.subscribe([`${topic}/read`, `${topic}/write`])
for (let deviceUri in deviceMapByDeviceId) {
const topic = deviceMapByDeviceId[deviceUri].cloudToken+'/+/+'
client.subscribe([`${topic}/read`, `${topic}/write`]);
}
});
client.on('message', onMessage);
Expand All @@ -59,21 +60,22 @@ cancelBtn.addEventListener('click', function() {

function onMessage(topic, message) {
// message is Buffer
let deviceUri, serviceUUID, characteristicUUID, action;
[deviceUri, serviceUUID, characteristicUUID, action] = topic.split('/');
let device = deviceMap[deviceUri];
let cloudToken, serviceUUID, characteristicUUID, action;
[cloudToken, serviceUUID, characteristicUUID, action] = topic.split('/');
let device = deviceMapByCloudToken[cloudToken];
if (!device.gatt.connected)
return;
device.gatt.getPrimaryService(serviceUUID)
.then(service => service.getCharacteristic(characteristicUUID))
.then(characteristic => {
if (action == 'write') {
console.log("Write ");
return characteristic.writeValue(message);
}
else if (action == 'read')
return characteristic.readValue().then(value => {
if (client.connected)
client.publish(`${deviceUri}/${serviceUUID}/${characteristicUUID}`, Buffer.from(value.buffer));
client.publish(`${deviceMapByDeviceId[deviceUri].cloudToken}/${serviceUUID}/${characteristicUUID}`, Buffer.from(value.buffer));
})
})
.catch(error => { console.log(error); });
Expand Down Expand Up @@ -144,7 +146,7 @@ bleBtn.addEventListener('pointerup', function(event) {
}).then(device => {
console.log(device);
const deviceUri = escape(device.id);
deviceMap[deviceUri] = device;
deviceMapByDeviceId[deviceUri] = device;

let deviceRow = Object.assign(document.createElement("div"), {className:'row device'});
deviceGrid.appendChild(deviceRow);
Expand Down Expand Up @@ -176,7 +178,6 @@ bleBtn.addEventListener('pointerup', function(event) {

connectBtn.onclick = function(){
connectBtn.disabled = true;
let topic = deviceUri+'/+/+'
if (connectBtn.checked) {
device.gatt.connect().then(server => {
getCharacteristics(device).then(characteristics => {
Expand All @@ -185,15 +186,22 @@ bleBtn.addEventListener('pointerup', function(event) {
errors.appendChild(document.createTextNode(error));
});
deviceRow.classList.add("connected");
if (client && client.connected) {
client.publish(deviceUri + '/connected', "true");
client.subscribe([`${topic}/read`, `${topic}/write`])
}
connectBtn.disabled = false;
getCloudToken(server).then(cloudToken => {
deviceMapByDeviceId[deviceUri].cloudToken = cloudToken;
deviceMapByCloudToken[cloudToken] = deviceMapByDeviceId[deviceUri];
let topic = cloudToken + '/+/+';
if (client && client.connected) {
client.publish(cloudToken + '/connected', "true");
console.log("Sent connected event")
client.subscribe([`${topic}/read`, `${topic}/write`])
}
connectBtn.disabled = false;
});
}).catch(error => {
errors.appendChild(document.createTextNode(error));
});
} else {
let topic = deviceMapByDeviceId.deviceUri.cloudToken+'/+/+';
device.gatt.disconnect();
deviceRow.classList.remove("connected");
if (client && client.connected) {
Expand All @@ -203,9 +211,41 @@ bleBtn.addEventListener('pointerup', function(event) {
connectBtn.disabled = false;
}
};
});
});
});

function getCloudToken(server) {
return new Promise((resolve, reject) => {
let configurationServiceUUID = 'ef680100-9b35-4933-9b10-52ffa9740042';
let cloudTokenUUID = 'ef680106-9b35-4933-9b10-52ffa9740042';

function generateToken() {
let digits = 10 ^ 7;
let randomNumber = Math.trunc(new Date().getTime() * digits + (Math.random() * digits));
return randomNumber.toString(36);
}

server.getPrimaryService(configurationServiceUUID).then(service => {
return service.getCharacteristic(cloudTokenUUID);
}).then(characteristic => {
characteristic.readValue().then(dataView => {
let decoder = new TextDecoder("utf-8");
let token = decoder.decode(dataView.buffer).toString();
if (token === "") {
token = generateToken();
let encoder = new TextEncoder();
let encoded = encoder.encode(token);
console.log("Assigning cloud token " + token);
characteristic.writeValue(encoded);
}
console.log("Cloud token: " + token);
resolve(token);
})
}).catch(error => reject("Error while getting cloud token" + error));
});
}


function getCharacteristics(device){
var supportedCharacteristics = {}
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -234,8 +274,7 @@ function handleCharacteristic(characteristic) {
characteristic.addEventListener('characteristicvaluechanged', e => {
const view = e.target.value;
if (client && client.connected) {
const deviceUri = escape(characteristic.service.device.id);
client.publish(deviceUri + '/' + characteristic.service.uuid +
client.publish(characteristic.service.device.cloudToken + '/' + characteristic.service.uuid +
'/' + characteristic.uuid, Buffer.from(view.buffer));
}
});
Expand Down