Skip to content

Refactored js files #49

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

Refactored js files #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2116f89
Refactored lib/dasher.js
Dec 10, 2016
a9d16cf
Added semicolons
Dec 10, 2016
aef070e
Added semicolons
Dec 10, 2016
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
10 changes: 5 additions & 5 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var DasherButton = require('./lib/dasher')
var config = require('./config/config.json')
var DasherButton = require('./lib/dasher');
var config = require('./config/config.json');

var buttons = []
var buttons = [];

for (var i = 0; i < config.buttons.length; i++) {
button = config.buttons[i]
buttons.push(new DasherButton(button))
button = config.buttons[i];
buttons.push(new DasherButton(button));
}
34 changes: 17 additions & 17 deletions lib/dasher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
var url = require('url')
var url = require('url');
var dashButton = require('node-dash-button');
var request = require('request')
var request = require('request');

function doLog(message) {
console.log('[' + (new Date().toISOString()) + '] ' + message);
}

function DasherButton(button) {
var options = {headers: button.headers, body: button.body, json: button.json, formData: button.formData}
var options = {headers: button.headers, body: button.body, json: button.json, formData: button.formData};

this.dashButton = dashButton(button.address, button.interface, button.timeout)
this.dashButton = dashButton(button.address, button.interface, button.timeout);

this.dashButton.on("detected", function() {
doLog(button.name + " pressed.")
doRequest(button.url, button.method, options)
})
doLog(button.name + " pressed.");
doRequest(button.url, button.method, options);
});

doLog(button.name + " added.")
doLog(button.name + " added.");
}

function doRequest(requestUrl, method, options, callback) {
options = options || {}
options.query = options.query || {}
options.json = options.json || false
options.headers = options.headers || {}
options = options || {};
options.query = options.query || {};
options.json = options.json || false;
options.headers = options.headers || {};

var reqOpts = {
url: url.parse(requestUrl),
Expand All @@ -33,11 +33,11 @@ function doRequest(requestUrl, method, options, callback) {
json: options.json,
headers: options.headers,
formData: options.formData
}
};

request(reqOpts, function onResponse(error, response, body) {
if (error) {
doLog("there was an error");
doLog("There was an error");
console.log(error);
}
if (response && response.statusCode === 401) {
Expand All @@ -50,9 +50,9 @@ function doRequest(requestUrl, method, options, callback) {
}

if (callback) {
callback(error, response, body)
callback(error, response, body);
}
})
});
}

module.exports = DasherButton
module.exports = DasherButton;