Skip to content

Commit

Permalink
refactor(services): restructure service function setup
Browse files Browse the repository at this point in the history
  • Loading branch information
fh1ch committed Apr 2, 2018
1 parent 707d464 commit f28952a
Show file tree
Hide file tree
Showing 32 changed files with 340 additions and 441 deletions.
136 changes: 68 additions & 68 deletions lib/client.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/services/add-list-element.js
Expand Up @@ -2,7 +2,7 @@

const baAsn1 = require('../asn1');

module.exports.encodeAddListElement = (buffer, objectId, propertyId, arrayIndex, values) => {
module.exports.encode = (buffer, objectId, propertyId, arrayIndex, values) => {
baAsn1.encodeContextObjectId(buffer, 0, objectId.type, objectId.instance);
baAsn1.encodeContextEnumerated(buffer, 1, propertyId);
if (arrayIndex !== baAsn1.BACNET_ARRAY_ALL) {
Expand All @@ -15,7 +15,7 @@ module.exports.encodeAddListElement = (buffer, objectId, propertyId, arrayIndex,
baAsn1.encodeClosingTag(buffer, 3);
};

module.exports.decodeAddListElement = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down
4 changes: 2 additions & 2 deletions lib/services/alarm-acknowledge.js
Expand Up @@ -3,7 +3,7 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeAlarmAcknowledge = (buffer, ackProcessId, eventObjectId, eventStateAcknowledged, ackSource, eventTimeStamp, ackTimeStamp) => {
module.exports.encode = (buffer, ackProcessId, eventObjectId, eventStateAcknowledged, ackSource, eventTimeStamp, ackTimeStamp) => {
baAsn1.encodeContextUnsigned(buffer, 0, ackProcessId);
baAsn1.encodeContextObjectId(buffer, 1, eventObjectId.type, eventObjectId.instance);
baAsn1.encodeContextEnumerated(buffer, 2, eventStateAcknowledged);
Expand All @@ -12,7 +12,7 @@ module.exports.encodeAlarmAcknowledge = (buffer, ackProcessId, eventObjectId, ev
baAsn1.bacappEncodeContextTimestamp(buffer, 5, ackTimeStamp);
};

module.exports.decodeAlarmAcknowledge = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let value = {};
let result;
Expand Down
4 changes: 2 additions & 2 deletions lib/services/alarm-summary.js
Expand Up @@ -2,15 +2,15 @@

const baAsn1 = require('../asn1');

module.exports.encodeAlarmSummary = (buffer, alarms) => {
module.exports.encode = (buffer, alarms) => {
alarms.forEach((alarm) => {
baAsn1.encodeContextObjectId(buffer, 12, alarm.objectId.type, alarm.objectId.instance);
baAsn1.encodeContextEnumerated(buffer, 9, alarm.alarmState);
baAsn1.encodeContextBitstring(buffer, 8, alarm.acknowledgedTransitions);
});
};

module.exports.decodeAlarmSummary = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down
8 changes: 4 additions & 4 deletions lib/services/atomic-read-file.js
Expand Up @@ -3,7 +3,7 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeAtomicReadFile = (buffer, isStream, objectId, position, count) => {
module.exports.encode = (buffer, isStream, objectId, position, count) => {
baAsn1.encodeApplicationObjectId(buffer, objectId.type, objectId.instance);
if (isStream) {
baAsn1.encodeOpeningTag(buffer, 0);
Expand All @@ -18,7 +18,7 @@ module.exports.encodeAtomicReadFile = (buffer, isStream, objectId, position, cou
}
};

module.exports.decodeAtomicReadFile = (buffer, offset) => {
module.exports.decode = (buffer, offset) => {
let len = 0;
let result;
let decodedValue;
Expand Down Expand Up @@ -78,7 +78,7 @@ module.exports.decodeAtomicReadFile = (buffer, offset) => {
};
};

module.exports.encodeAtomicReadFileAcknowledge = (buffer, isStream, endOfFile, position, blockCount, blocks, counts) => {
module.exports.encodeAcknowledge = (buffer, isStream, endOfFile, position, blockCount, blocks, counts) => {
baAsn1.encodeApplicationBoolean(buffer, endOfFile);
if (isStream) {
baAsn1.encodeOpeningTag(buffer, 0);
Expand All @@ -96,7 +96,7 @@ module.exports.encodeAtomicReadFileAcknowledge = (buffer, isStream, endOfFile, p
}
};

module.exports.decodeAtomicReadFileAcknowledge = (buffer, offset) => {
module.exports.decodeAcknowledge = (buffer, offset) => {
let len = 0;
let result;
let decodedValue;
Expand Down
8 changes: 4 additions & 4 deletions lib/services/atomic-write-file.js
Expand Up @@ -3,7 +3,7 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeAtomicWriteFile = (buffer, isStream, objectId, position, blocks) => {
module.exports.encode = (buffer, isStream, objectId, position, blocks) => {
baAsn1.encodeApplicationObjectId(buffer, objectId.type, objectId.instance);
if (isStream) {
baAsn1.encodeOpeningTag(buffer, 0);
Expand All @@ -21,7 +21,7 @@ module.exports.encodeAtomicWriteFile = (buffer, isStream, objectId, position, bl
}
};

module.exports.decodeAtomicWriteFile = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down Expand Up @@ -89,15 +89,15 @@ module.exports.decodeAtomicWriteFile = (buffer, offset, apduLen) => {
};
};

module.exports.encodeAtomicWriteFileAcknowledge = (buffer, isStream, position) => {
module.exports.encodeAcknowledge = (buffer, isStream, position) => {
if (isStream) {
baAsn1.encodeContextSigned(buffer, 0, position);
} else {
baAsn1.encodeContextSigned(buffer, 1, position);
}
};

module.exports.decodeAtomicWriteFileAcknowledge = (buffer, offset) => {
module.exports.decodeAcknowledge = (buffer, offset) => {
let len = 0;
let isStream = false;
let position = 0;
Expand Down
4 changes: 2 additions & 2 deletions lib/services/cov-notify.js
Expand Up @@ -3,7 +3,7 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeCOVNotify = (buffer, subscriberProcessId, initiatingDeviceId, monitoredObjectId, timeRemaining, values) => {
module.exports.encode = (buffer, subscriberProcessId, initiatingDeviceId, monitoredObjectId, timeRemaining, values) => {
baAsn1.encodeContextUnsigned(buffer, 0, subscriberProcessId);
baAsn1.encodeContextObjectId(buffer, 1, baEnum.ObjectTypes.OBJECT_DEVICE, initiatingDeviceId);
baAsn1.encodeContextObjectId(buffer, 2, monitoredObjectId.type, monitoredObjectId.instance);
Expand All @@ -27,7 +27,7 @@ module.exports.encodeCOVNotify = (buffer, subscriberProcessId, initiatingDeviceI
baAsn1.encodeClosingTag(buffer, 4);
};

module.exports.decodeCOVNotify = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down
6 changes: 3 additions & 3 deletions lib/services/create-object.js
Expand Up @@ -2,7 +2,7 @@

const baAsn1 = require('../asn1');

module.exports.encodeCreateObject = (buffer, objectId, values) => {
module.exports.encode = (buffer, objectId, values) => {
baAsn1.encodeOpeningTag(buffer, 0);
baAsn1.encodeContextObjectId(buffer, 1, objectId.type, objectId.instance);
baAsn1.encodeClosingTag(buffer, 0);
Expand All @@ -24,7 +24,7 @@ module.exports.encodeCreateObject = (buffer, objectId, values) => {
baAsn1.encodeClosingTag(buffer, 1);
};

module.exports.decodeCreateObject = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down Expand Up @@ -90,6 +90,6 @@ module.exports.decodeCreateObject = (buffer, offset, apduLen) => {
};
};

module.exports.encodeCreateObjectAcknowledge = (buffer, objectId) => {
module.exports.encodeAcknowledge = (buffer, objectId) => {
baAsn1.encodeApplicationObjectId(buffer, objectId.type, objectId.instance);
};
4 changes: 2 additions & 2 deletions lib/services/delete-object.js
Expand Up @@ -2,7 +2,7 @@

const baAsn1 = require('../asn1');

module.exports.decodeDeleteObject = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
const result = baAsn1.decodeTagNumberAndValue(buffer, offset);
if (result.tagNumber !== 12) return;
let len = 1;
Expand All @@ -13,6 +13,6 @@ module.exports.decodeDeleteObject = (buffer, offset, apduLen) => {
return value;
};

module.exports.encodeDeleteObject = (buffer, objectId) => {
module.exports.encode = (buffer, objectId) => {
baAsn1.encodeApplicationObjectId(buffer, objectId.type, objectId.instance);
};
4 changes: 2 additions & 2 deletions lib/services/device-communication-control.js
Expand Up @@ -2,7 +2,7 @@

const baAsn1 = require('../asn1');

module.exports.encodeDeviceCommunicationControl = (buffer, timeDuration, enableDisable, password) => {
module.exports.encode = (buffer, timeDuration, enableDisable, password) => {
if (timeDuration > 0) {
baAsn1.encodeContextUnsigned(buffer, 0, timeDuration);
}
Expand All @@ -12,7 +12,7 @@ module.exports.encodeDeviceCommunicationControl = (buffer, timeDuration, enableD
}
};

module.exports.decodeDeviceCommunicationControl = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let value = {};
let decodedValue;
Expand Down
4 changes: 2 additions & 2 deletions lib/services/error.js
Expand Up @@ -2,12 +2,12 @@

const baAsn1 = require('../asn1');

module.exports.encodeError = (buffer, errorClass, errorCode) => {
module.exports.encode = (buffer, errorClass, errorCode) => {
baAsn1.encodeApplicationEnumerated(buffer, errorClass);
baAsn1.encodeApplicationEnumerated(buffer, errorCode);
};

module.exports.decodeError = (buffer, offset) => {
module.exports.decode = (buffer, offset) => {
const orgOffset = offset;
let result;
result = baAsn1.decodeTagNumberAndValue(buffer, offset);
Expand Down
4 changes: 2 additions & 2 deletions lib/services/event-information.js
Expand Up @@ -3,7 +3,7 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeEventInformation = (buffer, events, moreEvents) => {
module.exports.encode = (buffer, events, moreEvents) => {
baAsn1.encodeOpeningTag(buffer, 0);
events.forEach((event) => {
baAsn1.encodeContextObjectId(buffer, 0, event.objectId.type, event.objectId.instance);
Expand All @@ -27,7 +27,7 @@ module.exports.encodeEventInformation = (buffer, events, moreEvents) => {
baAsn1.encodeContextBoolean(buffer, 1, moreEvents);
};

module.exports.decodeEventInformation = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down
4 changes: 2 additions & 2 deletions lib/services/event-notify-data.js
Expand Up @@ -3,7 +3,7 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeEventNotifyData = (buffer, data) => {
module.exports.encode = (buffer, data) => {
baAsn1.encodeContextUnsigned(buffer, 0, data.processId);
baAsn1.encodeContextObjectId(buffer, 1, data.initiatingObjectId.type, data.initiatingObjectId.instance);
baAsn1.encodeContextObjectId(buffer, 2, data.eventObjectId.type, data.eventObjectId.instance);
Expand Down Expand Up @@ -114,7 +114,7 @@ module.exports.encodeEventNotifyData = (buffer, data) => {
}
};

module.exports.decodeEventNotifyData = (buffer, offset) => {
module.exports.decode = (buffer, offset) => {
let len = 0;
let result;
let decodedValue;
Expand Down
8 changes: 4 additions & 4 deletions lib/services/get-enrollment-summary.js
Expand Up @@ -3,7 +3,7 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeGetEnrollmentSummary = (buffer, acknowledgmentFilter, enrollmentFilter, eventStateFilter, eventTypeFilter, priorityFilter, notificationClassFilter) => {
module.exports.encode = (buffer, acknowledgmentFilter, enrollmentFilter, eventStateFilter, eventTypeFilter, priorityFilter, notificationClassFilter) => {
baAsn1.encodeContextEnumerated(buffer, 0, acknowledgmentFilter);
if (enrollmentFilter) {
baAsn1.encodeOpeningTag(buffer, 1);
Expand Down Expand Up @@ -36,7 +36,7 @@ module.exports.encodeGetEnrollmentSummary = (buffer, acknowledgmentFilter, enrol
}
};

module.exports.decodeGetEnrollmentSummary = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down Expand Up @@ -110,7 +110,7 @@ module.exports.decodeGetEnrollmentSummary = (buffer, offset, apduLen) => {
return value;
};

module.exports.encodeGetEnrollmentSummaryAcknowledge = (buffer, enrollmentSummaries) => {
module.exports.encodeAcknowledge = (buffer, enrollmentSummaries) => {
enrollmentSummaries.forEach((enrollmentSummary) => {
baAsn1.encodeApplicationObjectId(buffer, enrollmentSummary.objectId.type, enrollmentSummary.objectId.instance);
baAsn1.encodeApplicationEnumerated(buffer, enrollmentSummary.eventType);
Expand All @@ -120,7 +120,7 @@ module.exports.encodeGetEnrollmentSummaryAcknowledge = (buffer, enrollmentSummar
});
};

module.exports.decodeGetEnrollmentSummaryAcknowledge = (buffer, offset, apduLen) => {
module.exports.decodeAcknowledge = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down
8 changes: 4 additions & 4 deletions lib/services/get-event-information.js
Expand Up @@ -3,11 +3,11 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeGetEventInformation = (buffer, lastReceivedObjectId) => {
module.exports.encode = (buffer, lastReceivedObjectId) => {
baAsn1.encodeContextObjectId(buffer, 0, lastReceivedObjectId.type, lastReceivedObjectId.instance);
};

module.exports.decodeGetEventInformation = (buffer, offset) => {
module.exports.decode = (buffer, offset) => {
let len = 0;
let result;
let decodedValue;
Expand All @@ -21,7 +21,7 @@ module.exports.decodeGetEventInformation = (buffer, offset) => {
return value;
};

module.exports.encodeGetEventInformationAcknowledge = (buffer, events, moreEvents) => {
module.exports.encodeAcknowledge = (buffer, events, moreEvents) => {
baAsn1.encodeOpeningTag(buffer, 0);
events.forEach((eventData) => {
baAsn1.encodeContextObjectId(buffer, 0, eventData.objectId.type, eventData.objectId.instance);
Expand All @@ -44,7 +44,7 @@ module.exports.encodeGetEventInformationAcknowledge = (buffer, events, moreEvent
baAsn1.encodeContextBoolean(buffer, 1, moreEvents);
};

module.exports.decodeGetEventInformationAcknowledge = (buffer, offset, apduLen) => {
module.exports.decodeAcknowledge = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down
4 changes: 2 additions & 2 deletions lib/services/i-am-broadcast.js
Expand Up @@ -3,14 +3,14 @@
const baAsn1 = require('../asn1');
const baEnum = require('../enum');

module.exports.encodeIamBroadcast = (buffer, deviceId, maxApdu, segmentation, vendorId) => {
module.exports.encode = (buffer, deviceId, maxApdu, segmentation, vendorId) => {
baAsn1.encodeApplicationObjectId(buffer, baEnum.ObjectTypes.OBJECT_DEVICE, deviceId);
baAsn1.encodeApplicationUnsigned(buffer, maxApdu);
baAsn1.encodeApplicationEnumerated(buffer, segmentation);
baAsn1.encodeApplicationUnsigned(buffer, vendorId);
};

module.exports.decodeIamBroadcast = (buffer, offset) => {
module.exports.decode = (buffer, offset) => {
let result;
let apduLen = 0;
const orgOffset = offset;
Expand Down
4 changes: 2 additions & 2 deletions lib/services/i-have-broadcast.js
Expand Up @@ -2,13 +2,13 @@

const baAsn1 = require('../asn1');

module.exports.encodeIhaveBroadcast = (buffer, deviceId, objectId, objectName) => {
module.exports.encode = (buffer, deviceId, objectId, objectName) => {
baAsn1.encodeApplicationObjectId(buffer, deviceId.type, deviceId.instance);
baAsn1.encodeApplicationObjectId(buffer, objectId.type, objectId.instance);
baAsn1.encodeApplicationCharacterString(buffer, objectName);
};

module.exports.decodeIhaveBroadcast = (buffer, offset, apduLen) => {
module.exports.decode = (buffer, offset, apduLen) => {
let len = 0;
let result;
let decodedValue;
Expand Down

0 comments on commit f28952a

Please sign in to comment.