Skip to content

Commit

Permalink
refactor(bacnet-asn1): rename base operations to use kebab-case
Browse files Browse the repository at this point in the history
  • Loading branch information
@fh1ch
fh1ch committed May 16, 2017
1 parent 00a57ee commit 2d2ab28
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
34 changes: 17 additions & 17 deletions lib/bacnet-asn1.js
View file
Expand Up @@ -31,7 +31,7 @@ var encodeSigned = function(buffer, value, length) {
buffer.offset += length;
};

var encode_bacnet_signed = function(buffer, value) {
var encodeBacnetSigned = function(buffer, value) {
if ((value >= -128) && (value < 128)) {
encodeSigned(buffer, value, 1);
} else if ((value >= -32768) && (value < 32768)) {
Expand All @@ -53,15 +53,15 @@ var encodeBacnetDouble = function(buffer, value) {
buffer.offset += 8;
};

var decode_unsigned = module.exports.decode_unsigned = function(buffer, offset, length) {
var decodeUnsigned = module.exports.decodeUnsigned = function(buffer, offset, length) {
return {
len: length,
value: buffer.readUIntBE(offset, length, true)
};
};

var decode_enumerated = module.exports.decode_enumerated = function(buffer, offset, lenValue) {
return decode_unsigned(buffer, offset, lenValue);
var decodeEnumerated = module.exports.decodeEnumerated = function(buffer, offset, lenValue) {
return decodeUnsigned(buffer, offset, lenValue);
};

var encodeBacnetObjectId = module.exports.encodeBacnetObjectId = function(buffer, objectType, instance) {
Expand Down Expand Up @@ -242,7 +242,7 @@ var encode_application_signed = function(buffer, value) {
buffer: Buffer.alloc(1472),
offset: 0
};
encode_bacnet_signed(tmp, value);
encodeBacnetSigned(tmp, value);
encodeTag(buffer, baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_SIGNED_INT, false, tmp.offset);
tmp.buffer.copy(buffer.buffer, buffer.offset, 0, tmp.offset);
buffer.offset += tmp.offset;
Expand Down Expand Up @@ -588,7 +588,7 @@ var encode_context_signed = function(buffer, tagNumber, value) {
len = 4;
}
encodeTag(buffer, tagNumber, true, len);
encode_bacnet_signed(buffer, value);
encodeBacnetSigned(buffer, value);
};

var encode_context_time = function(buffer, tagNumber, value) {
Expand Down Expand Up @@ -643,7 +643,7 @@ var decode_is_opening_tag = function(buffer, offset) {
};

var decode_object_id = module.exports.decode_object_id = function(buffer, offset) {
var result = decode_unsigned(buffer, offset, 4);
var result = decodeUnsigned(buffer, offset, 4);
var objectType = (result.value >> BACNET_INSTANCE_BITS) & BACNET_MAX_OBJECT;
var instance = result.value & BACNET_MAX_INSTANCE;
return {
Expand Down Expand Up @@ -672,12 +672,12 @@ var decode_tag_number_and_value = module.exports.decode_tag_number_and_value = f
if (IS_EXTENDED_VALUE(buffer[offset])) {
if (buffer[offset + len] === 255) {
len++;
result = decode_unsigned(buffer, offset + len, 4);
result = decodeUnsigned(buffer, offset + len, 4);
len += result.len;
value = result.value;
} else if (buffer[offset + len] === 254) {
len++;
result = decode_unsigned(buffer, offset + len, 2);
result = decodeUnsigned(buffer, offset + len, 2);
len += result.len;
value = result.value;
} else {
Expand Down Expand Up @@ -768,14 +768,14 @@ var decode_read_access_result = module.exports.decode_read_access_result = funct
result = decode_tag_number_and_value(buffer, offset + len);
len += result.len;
if (result.tagNumber !== 2) return;
result = decode_enumerated(buffer, offset + len, result.value);
result = decodeEnumerated(buffer, offset + len, result.value);
new_entry.propertyIdentifier = result.value;
len += result.len;

result = decode_tag_number_and_value(buffer, offset + len);
if (result.tagNumber === 3) {
len += result.len;
result = decode_unsigned(buffer, offset + len, result.value);
result = decodeUnsigned(buffer, offset + len, result.value);
new_entry.propertyArrayIndex = result.value;
len += result.len;
} else {
Expand Down Expand Up @@ -806,12 +806,12 @@ var decode_read_access_result = module.exports.decode_read_access_result = funct
var err = {};
result = decode_tag_number_and_value(buffer, offset + len);
len += result.len;
result = decode_enumerated(buffer, offset + len, result.value);
result = decodeEnumerated(buffer, offset + len, result.value);
len += result.len;
err.errorClass = result.value;
result = decode_tag_number_and_value(buffer, offset + len);
len += result.len;
result = decode_enumerated(buffer, offset + len, result.value);
result = decodeEnumerated(buffer, offset + len, result.value);
len += result.len;
err.error_code = result.value;
if (!decode_is_closing_tag_number(buffer, offset + len, 5)) return;
Expand Down Expand Up @@ -1123,7 +1123,7 @@ var bacapp_decode_data = function(buffer, offset, maxLength, tagDataType, lenVal
value.value = lenValueType > 0 ? true : false;
break;
case baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT:
result = decode_unsigned(buffer, offset, lenValueType);
result = decodeUnsigned(buffer, offset, lenValueType);
value.len += result.len;
value.value = result.value;
break;
Expand Down Expand Up @@ -1158,7 +1158,7 @@ var bacapp_decode_data = function(buffer, offset, maxLength, tagDataType, lenVal
value.value = result.value;
break;
case baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_ENUMERATED:
result = decode_enumerated(buffer, offset, lenValueType);
result = decodeEnumerated(buffer, offset, lenValueType);
value.len += result.len;
value.value = result.value;
break;
Expand Down Expand Up @@ -1368,7 +1368,7 @@ var bacapp_decode_context_application_data = function(buffer, offset, max_offset
len: subEvtResult.len + 1
};
} else if (evtResult.tagNumber === 1) {
subEvtResult = decode_unsigned(buffer, offset + len, evtResult.value);
subEvtResult = decodeUnsigned(buffer, offset + len, evtResult.value);
return {
tag: baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT,
value: subEvtResult.value,
Expand Down Expand Up @@ -1440,7 +1440,7 @@ var bacapp_decode_context_application_data = function(buffer, offset, max_offset
};

var decode_object_id = function(buffer, offset) {
var result = decode_unsigned(buffer, offset, 4);
var result = decodeUnsigned(buffer, offset, 4);
var objectType = (result.value >> BACNET_INSTANCE_BITS) & BACNET_MAX_OBJECT;
var instance = result.value & BACNET_MAX_INSTANCE;
return {
Expand Down
10 changes: 5 additions & 5 deletions lib/bacnet-services.js
View file
Expand Up @@ -28,15 +28,15 @@ module.exports.decodeIamBroadcast = function(buffer, offset) {
if (result.tagNumber !== baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT) {
return;
}
result = baAsn1.decode_unsigned(buffer, offset + apduLen, result.value);
result = baAsn1.decodeUnsigned(buffer, offset + apduLen, result.value);
apduLen += result.len;
var maxApdu = result.value;
result = baAsn1.decode_tag_number_and_value(buffer, offset + apduLen);
apduLen += result.len;
if (result.tagNumber !== baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_ENUMERATED) {
return;
}
result = baAsn1.decode_enumerated(buffer, offset + apduLen, result.value);
result = baAsn1.decodeEnumerated(buffer, offset + apduLen, result.value);
apduLen += result.len;
if (result.value > baEnum.BacnetSegmentations.SEGMENTATION_NONE) {
return;
Expand All @@ -47,7 +47,7 @@ module.exports.decodeIamBroadcast = function(buffer, offset) {
if (result.tagNumber !== baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT) {
return;
}
result = baAsn1.decode_unsigned(buffer, offset + apduLen, result.value);
result = baAsn1.decodeUnsigned(buffer, offset + apduLen, result.value);
apduLen += result.len;
if (result.value > 0xFFFF) {
return;
Expand Down Expand Up @@ -227,13 +227,13 @@ module.exports.DecodeReadPropertyAcknowledge = function(buffer, offset, apduLen)
if (result.tagNumber !== 1) {
return;
}
result = baAsn1.decode_enumerated(buffer, offset + len, result.value);
result = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
len += result.len;
property.propertyIdentifier = result.propertyIdentifier;
result = baAsn1.decode_tag_number_and_value(buffer, offset + len);
if (result.tagNumber === 2) {
len += result.len;
len += baAsn1.decode_unsigned(buffer, offset + len, result.value);
len += baAsn1.decodeUnsigned(buffer, offset + len, result.value);
property.propertyArrayIndex = result.propertyArrayIndex;
} else {
property.propertyArrayIndex = baAsn1.BACNET_ARRAY_ALL;
Expand Down
10 changes: 5 additions & 5 deletions test/unit/bacnet-asn1.spec.js
View file
Expand Up @@ -3,26 +3,26 @@ var expect = require('chai').expect;
var baAsn1 = require('../../lib/bacnet-asn1');

describe('bacstack - ASN1 layer', function() {
describe('decode_unsigned', function() {
describe('decodeUnsigned', function() {
it('should fail if unsuport length', function() {
var result = baAsn1.decode_unsigned(Buffer.from([0xFF, 0xFF]), 0, 5);
var result = baAsn1.decodeUnsigned(Buffer.from([0xFF, 0xFF]), 0, 5);
expect(result).to.eql({len: 5, value: NaN});
});

it('should successfully decode 8-bit unsigned integer', function() {
var result = baAsn1.decode_unsigned(Buffer.from([0x00, 0xFF, 0xFF, 0xFF, 0xFF]), 1, 1);
var result = baAsn1.decodeUnsigned(Buffer.from([0x00, 0xFF, 0xFF, 0xFF, 0xFF]), 1, 1);
expect(result.value).to.eql(255);
expect(result.len).to.eql(1);
});

it('should successfully decode 16-bit unsigned integer', function() {
var result = baAsn1.decode_unsigned(Buffer.from([0x00, 0xFF, 0xFF, 0xFF, 0xFF]), 1, 2);
var result = baAsn1.decodeUnsigned(Buffer.from([0x00, 0xFF, 0xFF, 0xFF, 0xFF]), 1, 2);
expect(result.value).to.eql(65535);
expect(result.len).to.eql(2);
});

it('should successfully decode 24-bit unsigned integer', function() {
var result = baAsn1.decode_unsigned(Buffer.from([0x00, 0xFF, 0xFF, 0xFF, 0xFF]), 1, 3);
var result = baAsn1.decodeUnsigned(Buffer.from([0x00, 0xFF, 0xFF, 0xFF, 0xFF]), 1, 3);
expect(result.value).to.eql(16777215);
expect(result.len).to.eql(3);
});
Expand Down

0 comments on commit 2d2ab28

Please sign in to comment.