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

Jump to bottom

Bump follow-redirects from 1.15.4 to 1.15.6 #194

Merged
merged 15 commits into from
Jun 27, 2024
Merged

Bump follow-redirects from 1.15.4 to 1.15.6 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
efae4de
Merge pull request #173 from phifogg/dev
phifogg Jul 23, 2023
4b71c90
Merge pull request #176 from phifogg/dev
phifogg Aug 6, 2023
cdfcc2b
Merge pull request #178 from phifogg/dev
phifogg Aug 9, 2023
628de8e
Log what is written
elek76 Sep 3, 2023
84dcea7
last_listenerupdate: not a member of json_response
elek76 Sep 3, 2023
1b58bb0
x
elek76 Sep 3, 2023
7912fba
More log
elek76 Sep 3, 2023
6f6a557
Restore last_listener_update in constants
elek76 Sep 3, 2023
0942f0f
Refine fix, remove logs
elek76 Sep 3, 2023
2ca582a
Bump axios from 0.27.2 to 1.6.0
dependabot[bot] Nov 11, 2023
fad59f3
Bump follow-redirects from 1.15.2 to 1.15.4
dependabot[bot] Jan 10, 2024
dec5c73
Merge pull request #188 from phifogg/dependabot/npm_and_yarn/follow-r…
phifogg Feb 2, 2024
bced70d
Merge pull request #183 from phifogg/dependabot/npm_and_yarn/axios-1.6.0
phifogg Feb 2, 2024
dbefaa9
Merge pull request #182 from elek76/log-last_listener_update
phifogg Feb 2, 2024
1e8d2f1
Bump follow-redirects from 1.15.4 to 1.15.6
dependabot[bot] Mar 16, 2024
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
13 changes: 13 additions & 0 deletions lib/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,19 @@ const DATAFIELDS = [
listener_conversion: null,
scheduler_conversion: null
},
{
id: 'last_listener_update',
channels: [{
channel: 'info',
name: 'Last data received from Listener (raw)'
}],
type: 'string',
wunderground: 'last_listener_update',
ecowitt: 'last_listener_update',
scheduler: null,
listener_conversion: null,
scheduler_conversion: null
},
{
id: 'UVraw',
channels: [{
Expand Down
4 changes: 2 additions & 2 deletions lib/listener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Listener {
if (my_path == this.path) {
this.adapter.log.debug('Listener received WU update: ' + JSON.stringify(json_response));
// add full string property
json_response.last_listener_update = JSON.stringify(json_response);
json_response['last_listener_update'] = JSON.stringify(json_response);
// this.adapter.setStateAsync('info.last_listener_update', { val: JSON.stringify(json_response), ack: true });

response.writeHead(200, { 'Content-Type': 'text/html' });
Expand Down Expand Up @@ -101,7 +101,7 @@ class Listener {
this.adapter.log.debug('Listener body is ' + my_body);
json_response = parse(my_body);
this.adapter.log.debug('Listener received EW update: ' + JSON.stringify(json_response));
json_response.last_listener_update = JSON.stringify(json_response);
json_response['last_listener_update'] = JSON.stringify(json_response);
//this.adapter.setStateAsync('info.last_listener_update', { val: JSON.stringify(json_response), ack: true });
response.end('ok');
this.adapter.setStates(new Date(), this.extract_values(json_response));
Expand Down
1 change: 0 additions & 1 deletion main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ class Sainlogic extends utils.Adapter {
setStates(date, obj_values) {

this.setStateAsync('info.last_update', { val: date.toString(), ack: true });
this.setStateAsync('info.last_listener_update', {val: obj_values['last_listener_update'], ack:true });

for (const attr in obj_values) {
// extract attribute id w/o channel
Expand Down
52 changes: 33 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@types/proxyquire": "^1.3.28",
"@types/sinon": "^10.0.13",
"@types/sinon-chai": "^3.2.8",
"axios": "^0.27.2",
"axios": "^1.6.0",
"chai": "^4.3.6",
"chai-as-promised": "^7.1.1",
"eslint": "^8.23.1",
Expand Down
Loading