refactor(client): rework client interface and adapt to documentation

fh1ch · fh1ch · commit 05294dda8214 · 2017-02-26T20:20:05.000+01:00
diff --git a/index.js b/index.js
@@ -22,8 +22,8 @@ module.exports = function(settings) {
   self.enum = baEnum;
 
   // Public functions
-  self.whoIs = function(lowLimit, highLimit, receiver) {
-    client.whoIs(lowLimit, highLimit, null, function(address, deviceId, maxAdpu, segmentation, vendorId) {
+  self.whoIs = function(lowLimit, highLimit, address) {
+    client.whoIs(lowLimit, highLimit, address, function(address, deviceId, maxAdpu, segmentation, vendorId) {
       self.emit('iAm', address, deviceId, maxAdpu, segmentation, vendorId);
     });
   };
@@ -36,12 +36,8 @@ module.exports = function(settings) {
     client.writeProperty(address, objectType, objectInstance, propertyId, priority, valueList);
   };
 
-  self.readPropertyMultiple = function(address, objectType, objectInstance, propertyIdAndArrayIndex, next) {
-    client.readPropertyMultiple(address, objectType, objectInstance, propertyIdAndArrayIndex, next);
-  };
-
-  self.writePropertyMultiple = function() {
-
+  self.readPropertyMultiple = function(address, propertyIdAndArrayIndex, next) {
+    client.readPropertyMultiple(address, propertyIdAndArrayIndex, next);
   };
 
   return self;
diff --git a/lib/bacnet-client.js b/lib/bacnet-client.js
@@ -17,7 +17,7 @@ module.exports = function(settings) {
   var lastSequenceNumber = -1;
   var invokeStore = {};
   var segmentStore = [];
-  
+
   var transport = baTransport({
     port: settings.port,
     interface: settings.interface,
@@ -243,17 +243,17 @@ module.exports = function(settings) {
   };
 
   // Public Functions
-  self.whoIs = function(lowLimit, highLimit, receiver, handler) {
+  self.whoIs = function(lowLimit, highLimit, address, handler) {
     whoIsHandler = handler;
 
     var buffer = getBuffer();
-    receiver = receiver || transport.getBroadcastAddress();
-    baNpdu.Encode(buffer, baEnum.BacnetNpduControls.PriorityNormalMessage, receiver, null, DEFAULT_HOP_COUNT, baEnum.BacnetNetworkMessageTypes.NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK, 0);
+    address = address || transport.getBroadcastAddress();
+    baNpdu.Encode(buffer, baEnum.BacnetNpduControls.PriorityNormalMessage, address, null, DEFAULT_HOP_COUNT, baEnum.BacnetNetworkMessageTypes.NETWORK_MESSAGE_WHO_IS_ROUTER_TO_NETWORK, 0);
     baAdpu.encodeUnconfirmedServiceRequest(buffer, baEnum.BacnetPduTypes.PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST, baEnum.BacnetUnconfirmedServices.SERVICE_UNCONFIRMED_WHO_IS);
     baServices.EncodeWhoIsBroadcast(buffer, lowLimit, highLimit);
     // TODO: Differentiate between uni & broadcast
     baBvlc.encode(buffer.buffer, baEnum.BacnetBvlcFunctions.BVLC_ORIGINAL_BROADCAST_NPDU, buffer.offset);
-    transport.send(buffer.buffer, buffer.offset, receiver);
+    transport.send(buffer.buffer, buffer.offset, address);
   };
 
   self.readProperty = function(address, objectType, objectInstance, propertyId, arrayIndex) {
