Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

streamlined error handling and added timeout option #30

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

streamlined error handling and added timeout option #30

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c21630
streamlined erro handling and added timeout option
sowo Mar 5, 2017
44327d9
fixed authenticate_refresh
sowo Mar 6, 2017
0eaa888
methods now return error after invoking callback
sowo Mar 6, 2017
5dcbcee
changed crlf setting
sowo Jun 13, 2017
6371f8b
methods now return error after invoking callback
sowo Jun 13, 2017
3a4cfff
Merge branch 'master' of https://github.com/sowo/netatmo.git
sowo Jun 13, 2017
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
87 changes: 73 additions & 14 deletions netatmo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ var client_id;
var client_secret;
var scope;
var access_token;
var timeout;

/**
* @constructor
* @constructor
* @param args
*/
var netatmo = function (args) {
Expand Down Expand Up @@ -93,6 +94,7 @@ netatmo.prototype.authenticate = function (args, callback) {
password = args.password;
client_id = args.client_id;
client_secret = args.client_secret;
timeout = args.timeout;
scope = args.scope || 'read_station read_thermostat write_thermostat read_camera read_homecoach';

var form = {
Expand All @@ -110,9 +112,14 @@ netatmo.prototype.authenticate = function (args, callback) {
url: url,
method: "POST",
form: form,
timeout: timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "Authenticate error", true);
var error = this.handleRequestError(err, response, body, "Authenticate error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -155,6 +162,7 @@ netatmo.prototype.authenticate_refresh = function (refresh_token) {
url: url,
method: "POST",
form: form,
timeout: timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "Authenticate refresh error");
Expand Down Expand Up @@ -212,9 +220,14 @@ netatmo.prototype.getStationsData = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getStationsDataError error");
var error = this.handleRequestError(err, response, body, "getStationsData error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -261,9 +274,14 @@ netatmo.prototype.getThermostatsData = function (options, callback) {
request({
url: url,
method: "GET",
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getThermostatsDataError error");
var error = this.handleRequestError(err, response, body, "getThermostatsData error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -378,13 +396,14 @@ netatmo.prototype.getMeasure = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
var error = this.handleRequestError(err, response, body, "getMeasure error");
if (callback) {
callback(error);
}
return;
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -457,9 +476,14 @@ netatmo.prototype.setSyncSchedule = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "setSyncSchedule error");
var error = this.handleRequestError(err, response, body, "setSyncSchedule error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -536,9 +560,14 @@ netatmo.prototype.setThermpoint = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "setThermpoint error");
var error = this.handleRequestError(err, response, body, "setThermpoint error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -594,9 +623,14 @@ netatmo.prototype.getHomeData = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getHomeData error");
var error = this.handleRequestError(err, response, body, "getHomeData error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -659,9 +693,14 @@ netatmo.prototype.getNextEvents = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getNextEvents error");
var error = this.handleRequestError(err, response, body, "getNextEvents error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -724,9 +763,14 @@ netatmo.prototype.getLastEventOf = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getLastEventOf error");
var error = this.handleRequestError(err, response, body, "getLastEventOf error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -785,9 +829,14 @@ netatmo.prototype.getEventsUntil = function (options, callback) {
url: url,
method: "POST",
form: form,
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getEventsUntil error");
var error = this.handleRequestError(err, response, body, "getEventsUntil error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down Expand Up @@ -847,10 +896,15 @@ netatmo.prototype.getCameraPicture = function (options, callback) {
method: "GET",
qs: qs,
encoding: null,
contentType: 'image/jpg'
contentType: 'image/jpg',
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getCameraPicture error");
var error = this.handleRequestError(err, response, body, "getCameraPicture error");
if (callback) {
callback(error);
}
return error;
}

this.emit('get-camerapicture', err, body);
Expand Down Expand Up @@ -893,9 +947,14 @@ netatmo.prototype.getHealthyHomeCoachData = function (options, callback) {
request({
url: url,
method: "GET",
timeout: options && options.timeout || timeout
}, function (err, response, body) {
if (err || response.statusCode != 200) {
return this.handleRequestError(err, response, body, "getHealthyHomeCoachData error");
var error = this.handleRequestError(err, response, body, "getHealthyHomeCoachData error");
if (callback) {
callback(error);
}
return error;
}

body = JSON.parse(body);
Expand Down