Skip to content
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

Add support for sonoff dual #32 #34

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

Add support for sonoff dual #32 #34

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
60 changes: 39 additions & 21 deletions sonoff.server.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports.createServer = function (config) {
const CONNECTION_IS_ALIVE_CHECK_INTERVAL = 30000;
const CONNECTION_IS_ALIVE_CHECK_INTERVAL = 5000;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i know you want to see immediately if a device is offline. But this will send a message every 5 secounds to all devices. This is a little bit too much. If you want this short timings, it would be best to add it to a config and let everybody choose how long they want the interval


const fs = require('fs');
const path = require('path');
Expand Down Expand Up @@ -58,19 +58,33 @@ module.exports.createServer = function (config) {
}
}

function updateDevice(deviceId, index, switchState) {
var d = state.getDeviceById(deviceId);
if (!d || (typeof d.conn == 'undefined')) return "disconnected";

var dstate = d.state;

if(index > dstate.length - 1) return "not found";

dstate[index]['switch'] = (switchState ? "on" : "off");
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again dual specific implementation.


state.pushMessage({ action: 'update', value: {switches : dstate}, target: deviceId });
}

state.pushMessage = a => {
var rq = {
"apikey": "111111111-1111-1111-1111-111111111111",
"selfApikey" : "111111111-1111-1111-1111-111111111111",
"action": a.action,
"deviceid": a.target,
"params": a.value,
"userAgent": "app",
"sequence": Date.now().toString(),
"ts": 0,
"from": "app"
// "ts": 0,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was this interface changed? are there new informations available about sonoff devices?

"userAgent": "app"
};
var r = JSON.stringify(rq);
log.trace('REQ | WS | APP | ' + r);
log.trace('>>> | WS | ' + r);
var device = state.getDeviceById(a.target);
if (!device.messages) device.messages = [];
device.messages.push(rq);
Expand Down Expand Up @@ -121,8 +135,8 @@ module.exports.createServer = function (config) {

// Register routes
server.post('/dispatch/device', function (req, res) {
log.log('REQ | %s | %s ', req.method, req.url);
log.trace('REQ | %s', JSON.stringify(req.body));
log.log('<<< | HTTPS | %s ', req.url);
log.trace('DATA | %s', JSON.stringify(req.body));
res.json({
"error": 0,
"reason": "ok",
Expand Down Expand Up @@ -151,7 +165,7 @@ module.exports.createServer = function (config) {

conn.on("text", function (str) {
var data = JSON.parse(str);
log.trace('REQ | WS | DEV | %s', JSON.stringify(data));
log.trace('<<< | WS | %s | %s', data.action, JSON.stringify(data));
res = {
"error": 0,
"deviceid": data.deviceid,
Expand Down Expand Up @@ -186,7 +200,7 @@ module.exports.createServer = function (config) {
if (!device) {
log.error('ERR | WS | Unknown device ', data.deviceid);
} else {
device.state = data.params.switch;
device.state = data.params.switches;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is dual specific, and will break the functionality of other devices

device.conn = conn;
device.rawMessageLastUpdate = data;
device.rawMessageLastUpdate.timestamp = Date.now();
Expand Down Expand Up @@ -228,9 +242,15 @@ module.exports.createServer = function (config) {
device.messages = device.messages.filter(function (item) {
return item !== message;
})
device.state = message.params.switch;
state.updateKnownDevice(device);
log.trace('INFO | WS | APP | action has been accnowlaged by the device ' + JSON.stringify(data));

device.isAlive = true;

if(message.params.switches){
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please add an "else" where the old behaviour is triggered? so that the other devices will still work?

device.state = message.params.switches;
state.updateKnownDevice(device);
}

log.trace('INFO | WS | APP | action "'+message.action+'" has been accnowlaged by the device ' + JSON.stringify(data));
} else {
log.error('ERR | WS | No message send, but received an anser', JSON.stringify(data));
}
Expand All @@ -243,7 +263,7 @@ module.exports.createServer = function (config) {
}
}
var r = JSON.stringify(res);
log.trace('RES | WS | DEV | ' + r);
log.trace('>>> | DEV | ' + r);
conn.sendText(r);
});
conn.on("close", function (code, reason) {
Expand Down Expand Up @@ -272,21 +292,19 @@ module.exports.createServer = function (config) {

getDeviceState: (deviceId) => {
var d = state.getDeviceById(deviceId);
if (!d || (typeof d.conn == 'undefined')) return "disconnected";
if (!d || (typeof d.conn == 'undefined')) {
return "disconnected";
}
return d.state;
},

turnOnDevice: (deviceId) => {
var d = state.getDeviceById(deviceId);
if (!d || (typeof d.conn == 'undefined')) return "disconnected";
state.pushMessage({ action: 'update', value: { switch: "on" }, target: deviceId });
turnOnDevice: (deviceId, index) => {
updateDevice(deviceId, index, true);
return "on";
},

turnOffDevice: (deviceId) => {
var d = state.getDeviceById(deviceId);
if (!d || (typeof d.conn == 'undefined')) return "disconnected";
state.pushMessage({ action: 'update', value: { switch: "off" }, target: deviceId });
turnOffDevice: (deviceId, index) => {
updateDevice(deviceId, index, false);
return "off";
},

Expand Down