Skip to content

Commit 9415810

Browse files
committed
refactor: rework whole project to utilize ES6
1 parent 229095c commit 9415810

40 files changed

+1672
-1621
lines changed

.jshintrc

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
"browser": true,
4444
"node": true,
4545

46+
"esversion": 6,
47+
4648
"globals": {
4749
"describe": false,
4850
"it": false

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ following services are already supported at this point in time:
6363
### Example
6464

6565
``` js
66-
var bacnet = require('bacstack');
66+
const bacnet = require('bacstack');
6767

6868
// Initialize BACStack
69-
var client = new bacnet({adpuTimeout: 6000});
69+
const client = new bacnet({adpuTimeout: 6000});
7070

7171
// Discover Devices
72-
client.on('iAm', function(device) {
72+
client.on('iAm', (device) => {
7373
console.log('address: ', device.address);
7474
console.log('deviceId: ', device.deviceId);
7575
console.log('maxAdpu: ', device.maxAdpu);
@@ -79,11 +79,11 @@ client.on('iAm', function(device) {
7979
client.whoIs();
8080

8181
// Read Device Object
82-
var requestArray = [{
82+
const requestArray = [{
8383
objectId: {type: 8, instance: 4194303},
8484
properties: [{id: 8}]
8585
}];
86-
client.readPropertyMultiple('192.168.1.43', requestArray, function(err, value) {
86+
client.readPropertyMultiple('192.168.1.43', requestArray, (err, value) => {
8787
console.log('value: ', value);
8888
});
8989
```

index.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
'use strict';
2+
13
module.exports = require('./lib/client');
24
module.exports.enum = require('./lib/enum');

lib/adpu.js

+56-54
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
var baEnum = require('./enum');
1+
'use strict';
22

3-
var getDecodedType = module.exports.getDecodedType = function(buffer, offset) {
3+
const baEnum = require('./enum');
4+
5+
const getDecodedType = module.exports.getDecodedType = (buffer, offset) => {
46
return buffer[offset];
57
};
68

7-
module.exports.setDecodedType = function(buffer, offset, type) {
9+
module.exports.setDecodedType = (buffer, offset, type) => {
810
buffer[offset] = type;
911
};
1012

11-
module.exports.getDecodedInvokeId = function(buffer, offset) {
12-
var type = getDecodedType(buffer, offset);
13+
module.exports.getDecodedInvokeId = (buffer, offset) => {
14+
const type = getDecodedType(buffer, offset);
1315
switch (type & baEnum.PduTypes.PDU_TYPE_MASK) {
1416
case baEnum.PduTypes.PDU_TYPE_SIMPLE_ACK:
1517
case baEnum.PduTypes.PDU_TYPE_COMPLEX_ACK:
@@ -24,7 +26,7 @@ module.exports.getDecodedInvokeId = function(buffer, offset) {
2426
}
2527
};
2628

27-
module.exports.encodeConfirmedServiceRequest = function(buffer, type, service, maxSegments, maxAdpu, invokeId, sequencenumber, proposedWindowSize) {
29+
module.exports.encodeConfirmedServiceRequest = (buffer, type, service, maxSegments, maxAdpu, invokeId, sequencenumber, proposedWindowSize) => {
2830
buffer.buffer[buffer.offset++] = type;
2931
buffer.buffer[buffer.offset++] = maxSegments | maxAdpu;
3032
buffer.buffer[buffer.offset++] = invokeId;
@@ -35,19 +37,19 @@ module.exports.encodeConfirmedServiceRequest = function(buffer, type, service, m
3537
buffer.buffer[buffer.offset++] = service;
3638
};
3739

38-
module.exports.decodeConfirmedServiceRequest = function(buffer, offset) {
39-
var orgOffset = offset;
40-
var type = buffer[offset++];
41-
var maxSegments = buffer[offset] & 0xF0;
42-
var maxAdpu = buffer[offset++] & 0x0F;
43-
var invokeId = buffer[offset++];
44-
var sequencenumber = 0;
45-
var proposedWindowNumber = 0;
40+
module.exports.decodeConfirmedServiceRequest = (buffer, offset) => {
41+
const orgOffset = offset;
42+
const type = buffer[offset++];
43+
const maxSegments = buffer[offset] & 0xF0;
44+
const maxAdpu = buffer[offset++] & 0x0F;
45+
const invokeId = buffer[offset++];
46+
let sequencenumber = 0;
47+
let proposedWindowNumber = 0;
4648
if ((type & baEnum.PduTypes.SEGMENTED_MESSAGE) > 0) {
4749
sequencenumber = buffer[offset++];
4850
proposedWindowNumber = buffer[offset++];
4951
}
50-
var service = buffer[offset++];
52+
const service = buffer[offset++];
5153
return {
5254
len: offset - orgOffset,
5355
type: type,
@@ -60,33 +62,33 @@ module.exports.decodeConfirmedServiceRequest = function(buffer, offset) {
6062
};
6163
};
6264

63-
module.exports.encodeUnconfirmedServiceRequest = function(buffer, type, service) {
65+
module.exports.encodeUnconfirmedServiceRequest = (buffer, type, service) => {
6466
buffer.buffer[buffer.offset++] = type;
6567
buffer.buffer[buffer.offset++] = service;
6668
};
6769

68-
module.exports.decodeUnconfirmedServiceRequest = function(buffer, offset) {
69-
var orgOffset = offset;
70-
var type = buffer[offset++];
71-
var service = buffer[offset++];
70+
module.exports.decodeUnconfirmedServiceRequest = (buffer, offset) => {
71+
const orgOffset = offset;
72+
const type = buffer[offset++];
73+
const service = buffer[offset++];
7274
return {
7375
len: offset - orgOffset,
7476
type: type,
7577
service: service
7678
};
7779
};
7880

79-
module.exports.encodeSimpleAck = function(buffer, type, service, invokeId) {
81+
module.exports.encodeSimpleAck = (buffer, type, service, invokeId) => {
8082
buffer.buffer[buffer.offset++] = type;
8183
buffer.buffer[buffer.offset++] = invokeId;
8284
buffer.buffer[buffer.offset++] = service;
8385
};
8486

85-
module.exports.decodeSimpleAck = function(buffer, offset) {
86-
var orgOffset = offset;
87-
var type = buffer[offset++];
88-
var invokeId = buffer[offset++];
89-
var service = buffer[offset++];
87+
module.exports.decodeSimpleAck = (buffer, offset) => {
88+
const orgOffset = offset;
89+
const type = buffer[offset++];
90+
const invokeId = buffer[offset++];
91+
const service = buffer[offset++];
9092
return {
9193
len: offset - orgOffset,
9294
type: type,
@@ -95,8 +97,8 @@ module.exports.decodeSimpleAck = function(buffer, offset) {
9597
};
9698
};
9799

98-
module.exports.encodeComplexAck = function(buffer, type, service, invokeId, sequencenumber, proposedWindowNumber) {
99-
var len = 3;
100+
module.exports.encodeComplexAck = (buffer, type, service, invokeId, sequencenumber, proposedWindowNumber) => {
101+
let len = 3;
100102
buffer.buffer[buffer.offset++] = type;
101103
buffer.buffer[buffer.offset++] = invokeId;
102104
if ((type & baEnum.PduTypes.SEGMENTED_MESSAGE) > 0) {
@@ -108,17 +110,17 @@ module.exports.encodeComplexAck = function(buffer, type, service, invokeId, sequ
108110
return len;
109111
};
110112

111-
module.exports.decodeComplexAck = function(buffer, offset) {
112-
var orgOffset = offset;
113-
var type = buffer[offset++];
114-
var invokeId = buffer[offset++];
115-
var sequencenumber = 0;
116-
var proposedWindowNumber = 0;
113+
module.exports.decodeComplexAck = (buffer, offset) => {
114+
const orgOffset = offset;
115+
const type = buffer[offset++];
116+
const invokeId = buffer[offset++];
117+
let sequencenumber = 0;
118+
let proposedWindowNumber = 0;
117119
if ((type & baEnum.PduTypes.SEGMENTED_MESSAGE) > 0) {
118120
sequencenumber = buffer[offset++];
119121
proposedWindowNumber = buffer[offset++];
120122
}
121-
var service = buffer[offset++];
123+
const service = buffer[offset++];
122124
return {
123125
len: offset - orgOffset,
124126
type: type,
@@ -129,19 +131,19 @@ module.exports.decodeComplexAck = function(buffer, offset) {
129131
};
130132
};
131133

132-
module.exports.encodeSegmentAck = function(buffer, type, originalInvokeId, sequencenumber, actualWindowSize) {
134+
module.exports.encodeSegmentAck = (buffer, type, originalInvokeId, sequencenumber, actualWindowSize) => {
133135
buffer.buffer[buffer.offset++] = type;
134136
buffer.buffer[buffer.offset++] = originalInvokeId;
135137
buffer.buffer[buffer.offset++] = sequencenumber;
136138
buffer.buffer[buffer.offset++] = actualWindowSize;
137139
};
138140

139-
module.exports.decodeSegmentAck = function(buffer, offset) {
140-
var orgOffset = offset;
141-
var type = buffer[offset++];
142-
var originalInvokeId = buffer[offset++];
143-
var sequencenumber = buffer[offset++];
144-
var actualWindowSize = buffer[offset++];
141+
module.exports.decodeSegmentAck = (buffer, offset) => {
142+
const orgOffset = offset;
143+
const type = buffer[offset++];
144+
const originalInvokeId = buffer[offset++];
145+
const sequencenumber = buffer[offset++];
146+
const actualWindowSize = buffer[offset++];
145147
return {
146148
len: offset - orgOffset,
147149
type: type,
@@ -151,17 +153,17 @@ module.exports.decodeSegmentAck = function(buffer, offset) {
151153
};
152154
};
153155

154-
module.exports.encodeError = function(buffer, type, service, invokeId) {
156+
module.exports.encodeError = (buffer, type, service, invokeId) => {
155157
buffer.buffer[buffer.offset++] = type;
156158
buffer.buffer[buffer.offset++] = invokeId;
157159
buffer.buffer[buffer.offset++] = service;
158160
};
159161

160-
module.exports.decodeError = function(buffer, offset) {
161-
var orgOffset = offset;
162-
var type = buffer[offset++];
163-
var invokeId = buffer[offset++];
164-
var service = buffer[offset++];
162+
module.exports.decodeError = (buffer, offset) => {
163+
const orgOffset = offset;
164+
const type = buffer[offset++];
165+
const invokeId = buffer[offset++];
166+
const service = buffer[offset++];
165167
return {
166168
len: offset - orgOffset,
167169
type: type,
@@ -170,17 +172,17 @@ module.exports.decodeError = function(buffer, offset) {
170172
};
171173
};
172174

173-
module.exports.encodeAbort = function(buffer, type, invokeId, reason) {
175+
module.exports.encodeAbort = (buffer, type, invokeId, reason) => {
174176
buffer.buffer[buffer.offset++] = type;
175177
buffer.buffer[buffer.offset++] = invokeId;
176178
buffer.buffer[buffer.offset++] = reason;
177179
};
178180

179-
module.exports.decodeAbort = function(buffer, offset) {
180-
var orgOffset = offset;
181-
var type = buffer[offset++];
182-
var invokeId = buffer[offset++];
183-
var reason = buffer[offset++];
181+
module.exports.decodeAbort = (buffer, offset) => {
182+
const orgOffset = offset;
183+
const type = buffer[offset++];
184+
const invokeId = buffer[offset++];
185+
const reason = buffer[offset++];
184186
return {
185187
len: offset - orgOffset,
186188
type: type,

0 commit comments

Comments
 (0)