Skip to content

Commit 21b1b70

Browse files
stevetreasestevetrease
committed
code changes to improve codacity score
1 parent ac35b8b commit 21b1b70

File tree

2 files changed

+158
-161
lines changed

2 files changed

+158
-161
lines changed

‎homemon-server/homemon-server.js‎

Lines changed: 83 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
console.log("process.env.NODE_ENV:" + process.env.NODE_ENV);
22
switch (process.env.NODE_ENV) {
3-
case 'development':
3+
case "development":
44
console.log ("development mode");
5-
var config = require('../config.json');
5+
var config = require("../config.json");
66
break;
7-
case 'production':
7+
case "production":
88
default:
99
console.log ("production mode");
10-
var config = require('../config.json');
10+
var config = require("../config.json");
1111
}
1212

1313

1414
// function to if a string starts with nother one
1515
String.prototype.beginsWith = function (string) {
16-
return(this.indexOf(string) === 0);
16+
return(this.indexOf(string) === 0);
1717
};
1818

19-
var names = require('../names.json');
19+
var names = require("../names.json");
2020
var topicHistory = {};
2121
var topicHistoryTimeStamp = {};
2222

2323

24-
var fs = require('fs');
25-
var path = require('path');
26-
var express = require('express');
24+
var fs = require("fs");
25+
var path = require("path");
26+
var express = require("express");
2727
var app = express();
28-
var http = require('http');
28+
var http = require("http");
2929
var server = http.createServer(app);
30-
var io = require('socket.io').listen(server, {'log level': 1});
30+
var io = require("socket.io").listen(server, {"log level": 1});
3131

32-
app.set('port', config.host_port);
33-
app.set('host', "127.0.0.1");
34-
app.set('views', __dirname + '/views');
35-
app.set('view engine', 'jade');
32+
app.set("port", config.host_port);
33+
app.set("host", "127.0.0.1");
34+
app.set("views", __dirname + "/views");
35+
app.set("view engine", "jade");
3636
app.use(express.logger());
37-
app.use(express.favicon(__dirname + '/public/favicon.ico'));
38-
app.use(express.static(path.join(__dirname, 'public')));
37+
app.use(express.favicon(__dirname + "/public/favicon.ico"));
38+
app.use(express.static(path.join(__dirname, "public")));
3939

40-
var routes = require('./routes');
41-
var page_mqtt = require('./routes/page_mqtt');
42-
var page_mqttstats = require('./routes/page_mqttstats');
43-
var page_power = require('./routes/page_power');
44-
var page_powerbar = require('./routes/page_powerbar');
45-
var page_pushmessage = require('./routes/page_pushmessage');
46-
var page_sensors = require('./routes/page_sensors');
47-
var page_sensors2 = require('./routes/page_sensors2');
48-
var page_snmp = require('./routes/page_snmp');
40+
var routes = require("./routes");
41+
var page_mqtt = require("./routes/page_mqtt");
42+
var page_mqttstats = require("./routes/page_mqttstats");
43+
var page_power = require("./routes/page_power");
44+
var page_powerbar = require("./routes/page_powerbar");
45+
var page_pushmessage = require("./routes/page_pushmessage");
46+
var page_sensors = require("./routes/page_sensors");
47+
var page_sensors2 = require("./routes/page_sensors2");
48+
var page_snmp = require("./routes/page_snmp");
4949

5050

5151

52-
app.get('/', routes.index);
53-
app.get('/mqtt', page_mqtt.page);
54-
app.get('/pushmessage', page_pushmessage.page);
55-
app.get('/mqttstats', page_mqttstats.page);
56-
app.get('/power', page_power.page);
57-
app.get('/powerbar', page_powerbar.page);
58-
app.get('/pushmessage', page_pushmessage.page);
59-
app.get('/sensors', page_sensors.page);
60-
app.get('/sensors2', page_sensors2.page);
61-
app.get('/snmp', page_snmp.page);
52+
app.get("/", routes.index);
53+
app.get("/mqtt", page_mqtt.page);
54+
app.get("/pushmessage", page_pushmessage.page);
55+
app.get("/mqttstats", page_mqttstats.page);
56+
app.get("/power", page_power.page);
57+
app.get("/powerbar", page_powerbar.page);
58+
app.get("/pushmessage", page_pushmessage.page);
59+
app.get("/sensors", page_sensors.page);
60+
app.get("/sensors2", page_sensors2.page);
61+
app.get("/snmp", page_snmp.page);
6262

6363

6464
// and finally a 404
6565
app.use(function(req, res, next){
6666
res.send(404, "This is not the webpage you are looking for.");
6767
});
68-
server.listen(config.host_port, 'localhost');
69-
console.log('listening on port ' + config.host_port);
68+
server.listen(config.host_port, "localhost");
69+
console.log("listening on port " + config.host_port);
7070

7171

72-
io.sockets.on('connection', function (socket) {
73-
socket.on('subscribe', function(data) {
72+
io.sockets.on("connection", function (socket) {
73+
socket.on("subscribe", function(data) {
7474
console.log (socket.id + " on " + socket.request.connection.remoteAddress + " subscribed to room " + data.room );
7575
socket.join(data.room);
7676

@@ -92,108 +92,107 @@ io.sockets.on('connection', function (socket) {
9292
});
9393

9494

95-
var nsp = io.of('/');
96-
nsp.on('connection', function(socket){
95+
var nsp = io.of("/");
96+
nsp.on("connection", function(socket){
9797
console.log(socket.id + " on " + socket.request.connection.remoteAddress + " connected connected to /");
9898
});
9999

100100

101101

102-
var mqtt = require('mqtt');
102+
var mqtt = require("mqtt");
103103
var mqttclient = mqtt.connect(config.mqtt.host, config.mqtt.options);
104104

105-
mqttclient.on('connect', function() {
106-
// mqttclient.subscribe('jsonsensors');
107-
mqttclient.subscribe('#');
108-
mqttclient.subscribe('$SYS/#');
109-
mqttclient.on('message', function(topic, message) {
110-
var value = Number(message);
111-
messageString = value.toString();
112-
// console.log (topic + " " + message.toString());
113-
114-
if (topic == "push/alert") {
115-
io.sockets.in("pushmessage").emit('data', { topic: message.toString() });
116-
}
117-
118-
if (topic == "jsonsensors") {
119-
// var messageData = JSON.parse(message.toString());
120-
//io.sockets.in("mqtt").emit('data', { topic: messageData.topic, value: messageData.value });
105+
mqttclient.on("connect", function() {
106+
// mqttclient.subscribe("jsonsensors");
107+
mqttclient.subscribe("#");
108+
mqttclient.subscribe("$SYS/#");
109+
mqttclient.on("message", function(topic, message) {
110+
var value = Number(message);
111+
messageString = value.toString();
112+
// console.log (topic + " " + message.toString());
113+
114+
if (topic == "push/alert") {
115+
io.sockets.in("pushmessage").emit("data", { topic: message.toString() });
121116
}
122-
117+
118+
if (topic == "jsonsensors") {
119+
// var messageData = JSON.parse(message.toString());
120+
//io.sockets.in("mqtt").emit("data", { topic: messageData.topic, value: messageData.value });
121+
}
122+
123123
if (topic.beginsWith("$SYS/")) {
124-
io.sockets.in("mqttstats").emit('data', { topic: topic, value: message.toString() })
124+
io.sockets.in("mqttstats").emit("data", { topic: topic, value: message.toString() })
125125
return;
126126
}
127-
127+
128128
if (topic.beginsWith("snmp")) {
129129
// console.log(message.toString());
130-
io.sockets.in("snmp").emit('data', { message: message.toString() });
130+
io.sockets.in("snmp").emit("data", { message: message.toString() });
131131
}
132-
132+
133133
// retain messages so that we have starting data for new clients
134134
if (topic.beginsWith("sensors/")) {
135135
var time = new Date();
136136
topicHistoryTimeStamp[topic] = time;
137137
topicHistory[topic] = message;
138-
}
139-
138+
}
139+
140140
if (topic.beginsWith("sensors/power")) {
141141
var name = null;
142142
if (names[topic] != undefined) name = names[topic].name;
143143
messageString = value.toFixed(0);
144-
io.sockets.in("power").emit('data', { topic: topic, value: messageString, name: name });
144+
io.sockets.in("power").emit("data", { topic: topic, value: messageString, name: name });
145145
}
146-
146+
147147
if (topic.beginsWith("sensors/power") || topic.beginsWith("rate/sensors/snmp/router/total")
148148
|| topic.beginsWith("sensors/power") || topic.beginsWith("sensors/co/") || topic.beginsWith("sensors/co2/")
149149
|| topic.beginsWith("sensors/no2") || topic.beginsWith("sensors/pressure")) {
150150
var name = null;
151151
if (names[topic] != undefined) name = names[topic].name;
152-
io.sockets.in("sensors").emit('data', { topic: topic, value: messageString, name: name });
152+
io.sockets.in("sensors").emit("data", { topic: topic, value: messageString, name: name });
153153
}
154-
154+
155155
if (topic.beginsWith("sensors/co/") || topic.beginsWith("sensors/co2/")
156156
|| topic.beginsWith("sensors/temperature/") || topic.beginsWith("sensors/humidity/")
157157
|| topic.beginsWith("sensors/no2") || topic.beginsWith("sensors/pressure")) {
158158
var name = null;
159159
if (names[topic] != undefined) name = names[topic].name;
160-
io.sockets.in("sensors2").emit('data', { topic: topic, value: messageString, name: name });
160+
io.sockets.in("sensors2").emit("data", { topic: topic, value: messageString, name: name });
161161
}
162162

163-
164163
if (topic.beginsWith("sensors/iosbattery")) {
165164
var name = null;
166165
if (names[topic] != undefined) name = names[topic].name;
167166
var p = value * 100;
168167
messageString = p.toFixed(0);
169-
io.sockets.in("sensors").emit('data', { topic: topic, value: messageString, name: name });
168+
io.sockets.in("sensors").emit("data", { topic: topic, value: messageString, name: name });
170169
}
171170

172171
if (topic.beginsWith("sensors/humidity")) {
173172
var name = null;
174173
if (names[topic] != undefined) name = names[topic].name;
175174
messageString = value.toFixed(0) + "%";
176-
io.sockets.in("sensors").emit('data', { topic: topic, value: messageString, name: name });
177-
io.sockets.in("humidity").emit('data', { topic: topic, value: messageString, name: name });
175+
io.sockets.in("sensors").emit("data", { topic: topic, value: messageString, name: name });
176+
io.sockets.in("humidity").emit("data", { topic: topic, value: messageString, name: name });
178177
}
179-
178+
180179
if (topic.beginsWith("sensors/temperature") || topic.beginsWith("sensors/boiler")) {
181180
var name = null;
182181
if (names[topic] != undefined) name = names[topic].name;
183182
messageString = value.toFixed(1);
184-
io.sockets.in("sensors").emit('data', { topic: topic, value: messageString, name: name });
185-
io.sockets.in("temperature").emit('data', { topic: topic, value: messageString, name: name });
183+
io.sockets.in("sensors").emit("data", { topic: topic, value: messageString, name: name });
184+
io.sockets.in("temperature").emit("data", { topic: topic, value: messageString, name: name });
186185
}
187-
186+
188187
if (topic == "cumulative/hour/sensors/power/0" || topic == "cumulative/daily/sensors/power/0") {
189-
io.sockets.in("sensors").emit('data', { topic: topic, value: messageString });
188+
io.sockets.in("sensors").emit("data", { topic: topic, value: messageString });
190189
}
191-
190+
192191
if (topic.beginsWith("cumulative/hour/sensors/power/") || topic.beginsWith("cumulative/daily/sensors/power/")) {
193-
io.sockets.in("power_cumulative").emit('data', { topic: topic, value: messageString });
192+
io.sockets.in("power_cumulative").emit("data", { topic: topic, value: messageString });
194193
}
195194

196195
// emit everything to the mqtt room
197-
io.sockets.in("mqtt").emit('data', { topic: topic, value: message.toString() });
198-
});
196+
io.sockets.in("mqtt").emit("data", { topic: topic, value: message.toString() });
197+
});
199198
});

0 commit comments

Comments
 (0)