Skip to content

Commit 8ca3886

Browse files
TabrizianTabrizian
committed
lint all of the existing code base with MQTT.js lint
1 parent 0c35c89 commit 8ca3886

File tree

3 files changed

+134
-132
lines changed

3 files changed

+134
-132
lines changed

‎.eslintrc.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
1,
4646
"always"
4747
],
48-
"space-after-keywords": [
49-
2,
50-
"always"
48+
"keyword-spacing": [
49+
2,
50+
{"after": true}
5151
],
5252
"space-before-blocks": 2,
5353
"spaced-comment": [

‎index.js‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
"use strict";
2-
var mqtt = require("mqtt");
3-
var inArray = require("in-array");
1+
'use strict';
2+
var mqtt = require('mqtt');
3+
var inArray = require('in-array');
44

55
var RegularClientPrototype = mqtt.MqttClient.prototype;
66

7-
var ASYNC_METHODS = ["publish",
8-
"subscribe",
9-
"unsubscribe",
10-
"unsubscribe",
11-
"end"
7+
var ASYNC_METHODS = ['publish',
8+
'subscribe',
9+
'unsubscribe',
10+
'unsubscribe',
11+
'end'
1212
];
1313

1414
var SYNC_METHODS = [
15-
"emit",
16-
"addListener",
17-
"on",
18-
"once",
19-
"removeListener",
20-
"removeAllListeners",
21-
"setMaxListeners",
22-
"getMaxListeners",
23-
"listeners",
24-
"listenerCount"
15+
'emit',
16+
'addListener',
17+
'on',
18+
'once',
19+
'removeListener',
20+
'removeAllListeners',
21+
'setMaxListeners',
22+
'getMaxListeners',
23+
'listeners',
24+
'listenerCount'
2525
];
2626

2727
module.exports = {
28-
connect: connect,
29-
AsyncClient: AsyncClient
28+
connect: connect,
29+
AsyncClient: AsyncClient
3030
};
3131

32-
function connect(brokerURL, opts) {
33-
var client = mqtt.connect(brokerURL, opts);
32+
function connect (brokerURL, opts) {
33+
var client = mqtt.connect(brokerURL, opts);
3434

35-
var asyncClient = new AsyncClient(client);
35+
var asyncClient = new AsyncClient(client);
3636

37-
return asyncClient;
37+
return asyncClient;
3838
}
3939

40-
function AsyncClient(client) {
41-
this._client = client;
40+
function AsyncClient (client) {
41+
this._client = client;
4242
}
4343

4444
AsyncClient.prototype = {
45-
set handleMessage(newHandler) {
46-
this._client.handleMessage = newHandler;
47-
},
48-
get handleMessage() {
49-
return this._client.handleMessage;
50-
}
45+
set handleMessage (newHandler) {
46+
this._client.handleMessage = newHandler;
47+
},
48+
get handleMessage () {
49+
return this._client.handleMessage;
50+
}
5151
};
5252

5353
ASYNC_METHODS.forEach(defineAsync);
5454
SYNC_METHODS.forEach(definePassthrough);
5555

56-
function definePassthrough(name) {
57-
AsyncClient.prototype[name] = function() {
58-
var client = this._client;
59-
return client[name].apply(client, arguments);
60-
};
56+
function definePassthrough (name) {
57+
AsyncClient.prototype[name] = function () {
58+
var client = this._client;
59+
return client[name].apply(client, arguments);
60+
};
6161
}
6262

63-
function defineAsync(name) {
64-
AsyncClient.prototype[name] = function asyncMethod() {
65-
var client = this._client;
66-
var args = [];
67-
var length = arguments.length;
68-
var i = 0;
69-
for (i; i < length; i++)
70-
args.push(arguments[i]);
63+
function defineAsync (name) {
64+
AsyncClient.prototype[name] = function asyncMethod () {
65+
var client = this._client;
66+
var args = [];
67+
var length = arguments.length;
68+
var i = 0;
69+
for (i; i < length; i++)
70+
args.push(arguments[i]);
7171

72-
return new Promise(function(resolve, reject) {
73-
args.push(makeCallback(resolve, reject));
74-
client[name].apply(client, args);
75-
});
76-
};
72+
return new Promise(function (resolve, reject) {
73+
args.push(makeCallback(resolve, reject));
74+
client[name].apply(client, args);
75+
});
76+
};
7777
}
7878

79-
function makeCallback(resolve, reject) {
80-
return function(err, data) {
81-
if (err)
82-
reject(err);
83-
else resolve(data);
84-
};
79+
function makeCallback (resolve, reject) {
80+
return function (err, data) {
81+
if (err)
82+
reject(err);
83+
else resolve(data);
84+
};
8585
}

‎test.js‎

Lines changed: 75 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,105 @@
1-
"use strict";
1+
'use strict';
22

3-
var Server = require("mqtt/test/server");
3+
var Server = require('mqtt/test/server');
44

5-
var AsyncMQTT = require("./");
5+
var AsyncMQTT = require('./');
66
var AsyncClient = AsyncMQTT.AsyncClient;
77

8-
var test = require("tape");
8+
var test = require('tape');
99

1010
var SERVER_PORT = 1883;
11-
var SERVER_URL = "mqtt://localhost:" + SERVER_PORT;
11+
var SERVER_URL = 'mqtt://localhost:' + SERVER_PORT;
1212

1313
var server = buildServer().listen(SERVER_PORT);
1414
server.unref();
1515

16-
server.on("listening", runTests);
16+
server.on('listening', runTests);
1717

18-
function runTests() {
19-
test("Connect should return an instance of AsyncClient", function (t) {
20-
t.plan(1);
21-
var client = AsyncMQTT.connect(SERVER_URL);
18+
function runTests () {
19+
test('Connect should return an instance of AsyncClient', function (t) {
20+
t.plan(1);
21+
var client = AsyncMQTT.connect(SERVER_URL);
2222

23-
t.ok(client instanceof AsyncClient, "Connect returned an AsyncClient");
23+
t.ok(client instanceof AsyncClient, 'Connect returned an AsyncClient');
2424

25-
client.end();
26-
});
25+
client.end();
26+
});
2727

28-
test("Should be able to listen on event on client", function (t) {
29-
t.plan(1);
28+
test('Should be able to listen on event on client', function (t) {
29+
t.plan(1);
3030

31-
var client = AsyncMQTT.connect(SERVER_URL);
31+
var client = AsyncMQTT.connect(SERVER_URL);
3232

33-
client.once("connect", function () {
34-
t.pass("Connected");
35-
client.end();
36-
});
37-
});
33+
client.once('connect', function () {
34+
t.pass('Connected');
35+
client.end();
36+
});
37+
});
3838

39-
test("Calling end() should resolve once disconnected", function (t) {
40-
t.plan(2);
39+
test('Calling end() should resolve once disconnected', function (t) {
40+
t.plan(2);
4141

42-
var client = AsyncMQTT.connect(SERVER_URL);
42+
var client = AsyncMQTT.connect(SERVER_URL);
4343

44-
client.on("close", function () {
45-
t.pass("Close event occured");
46-
});
44+
client.on('close', function () {
45+
t.pass('Close event occured');
46+
});
4747

48-
client.on("connect", function () {
49-
// Wait for connect to emit before ending
50-
client.end().then(function(){
51-
t.pass("End resolved");
52-
});
53-
});
54-
});
48+
client.on('connect', function () {
49+
// Wait for connect to emit before ending
50+
client.end().then(function () {
51+
t.pass('End resolved');
52+
});
53+
});
54+
});
5555

56-
test("Calling subscribe should resolve once subscribed", function (t) {
57-
t.plan(1);
56+
test('Calling subscribe should resolve once subscribed', function (t) {
57+
t.plan(1);
5858

59-
var client = AsyncMQTT.connect(SERVER_URL);
59+
var client = AsyncMQTT.connect(SERVER_URL);
6060

61-
client.subscribe("example", {
62-
qos: 1
63-
}).then(function(){
64-
t.pass("Subscribed");
65-
client.end();
66-
})
67-
});
68-
69-
test("Calling unsubscribe should resolve once completed", function(t){
70-
t.plan(1);
71-
72-
var client = AsyncMQTT.connect(SERVER_URL);
73-
74-
client.subscribe("example", {
75-
qos: 1
76-
}).then(function(){
77-
return client.unsubscribe("example");
78-
}).then(function(){
79-
t.pass("Unsunbscribed");
80-
return client.end();
81-
});
82-
});
83-
84-
test("Calling publish should resolve once completed", function (t) {
85-
t.plan(1);
86-
87-
var client = AsyncMQTT.connect(SERVER_URL);
88-
89-
client.publish("example", "test", {
90-
qos: 1
91-
}).then(function(){
92-
t.pass("Published");
93-
return client.end();
94-
});
95-
});
61+
client.subscribe('example', {
62+
qos: 1
63+
}).then(function () {
64+
t.pass('Subscribed');
65+
client.end();
66+
})
67+
});
68+
69+
test('Calling unsubscribe should resolve once completed', function (t) {
70+
t.plan(1);
71+
72+
var client = AsyncMQTT.connect(SERVER_URL);
73+
74+
client.subscribe('example', {
75+
qos: 1
76+
}).then(function () {
77+
return client.unsubscribe('example');
78+
}).then(function () {
79+
t.pass('Unsunbscribed');
80+
return client.end();
81+
});
82+
});
83+
84+
test('Calling publish should resolve once completed', function (t) {
85+
t.plan(1);
86+
87+
var client = AsyncMQTT.connect(SERVER_URL);
88+
89+
client.publish('example', 'test', {
90+
qos: 1
91+
}).then(function () {
92+
t.pass('Published');
93+
return client.end();
94+
});
95+
});
9696
}
9797

9898
// Taken from MQTT.js tests
9999
function buildServer () {
100100
return new Server(function (client) {
101101
client.on('connect', function (packet) {
102-
if (packet.clientId === 'invalid') {
102+
if ('invalid' === packet.clientId) {
103103
client.connack({returnCode: 2})
104104
} else {
105105
client.connack({returnCode: 0})
@@ -117,6 +117,8 @@ function buildServer () {
117117
case 2:
118118
client.pubrec(packet)
119119
break
120+
default:
121+
break
120122
}
121123
})
122124
})

0 commit comments

Comments
 (0)