@bitpoolos/edge-bacnet 1.2.8 → 1.3.1

package/resources/node-bacstack-ts/dist/lib/asn1.js

@@ -671,11 +671,15 @@ const bacappDecodeApplicationData = (buffer, offset, maxOffset, objectType, prop
             const result = bacappDecodeData(buffer, offset + len, maxOffset, tag.tagNumber, tag.value);
             if (!result)
                 return;
-            const resObj = {
+            let resObj = {
                 len: len + result.len,
                 type: result.type,
                 value: result.value
             };
+            if (result.originalBitString) {
+                //protocols supported addition
+                resObj.originalBitString = result.originalBitString;
+            }
             // HACK: Drop string specific handling ASAP
             if (result.encoding !== undefined)
                 resObj.encoding = result.encoding;
@@ -796,9 +800,9 @@ const decodeReadAccessResult = (buffer, offset, apduLen) => {
                 return;
             len++;
             newEntry.value = [{
-                    type: baEnum.ApplicationTags.ERROR,
-                    value: err
-                }];
+                type: baEnum.ApplicationTags.ERROR,
+                value: err
+            }];
         }
         values.push(newEntry);
     }
@@ -876,11 +880,13 @@ const bitstringSetBitsUsed = (bitString, bytesUsed, unusedBits) => {
 const decodeBitstring = (buffer, offset, lenValue) => {
     let len = 0;
     const bitString = { value: [], bitsUsed: 0 };
+    const originalBitString = { value: [] };
     if (lenValue > 0) {
         const bytesUsed = lenValue - 1;
         if (bytesUsed <= baEnum.ASN1_MAX_BITSTRING_BYTES) {
             len = 1;
             for (let i = 0; i < bytesUsed; i++) {
+                originalBitString.value.push(buffer[offset + len]);
                 bitString.value.push(byteReverseBits(buffer[offset + len++]));
             }
             const unusedBits = buffer[offset] & 0x07;
@@ -889,7 +895,8 @@ const decodeBitstring = (buffer, offset, lenValue) => {
     }
     return {
         len: len,
-        value: bitString
+        value: bitString,
+        originalBitString: originalBitString
     };
 };
 exports.decodeBitstring = decodeBitstring;
@@ -1033,6 +1040,10 @@ const bacappDecodeData = (buffer, offset, maxLength, tagDataType, lenValueType)
             result = (0, exports.decodeBitstring)(buffer, offset, lenValueType);
             value.len += result.len;
             value.value = result.value;
+            if (result.originalBitString) {
+                //protocols supported addition
+                value.originalBitString = result.originalBitString;
+            }
             break;
         case baEnum.ApplicationTags.ENUMERATED:
             result = (0, exports.decodeEnumerated)(buffer, offset, lenValueType);

package/resources/node-bacstack-ts/dist/lib/client.js

@@ -95,7 +95,7 @@ class Client extends events_1.EventEmitter {
             if (!result)
                 return debug('Couldn`t decode Error');
             this._invokeCallback(invokeId, new Error('BacnetError - Class:' + result.class + ' - Code:' + result.code));
-        } catch(e){
+        } catch (e) {
         }
     }
     _processAbort(invokeId, reason) {
@@ -430,7 +430,7 @@ class Client extends events_1.EventEmitter {
         const result = baNpdu.decode(buffer, offset);
         var addressObject, destAddress;
         // @todo a MSTP Dest & Source could occur. this case is not handled. 
-        if (typeof (result.source) != 'undefined') {
+        if (typeof (result.source) != 'undefined' && result && result.source) {
             addressObject = result.source;
             addressObject.ip = remoteAddress;
         } else {
@@ -619,14 +619,14 @@ class Client extends events_1.EventEmitter {
         baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
         this.sendBvlc(address, buffer);
         this._addCallback(settings.invokeId, (err, data) => {
-            try{
+            try {
                 if (err)
                     return next(err);
                 const result = baServices.readProperty.decodeAcknowledge(data.buffer, data.offset, data.length);
                 if (!result)
                     return next(new Error('INVALID_DECODING'));
                 next(null, result);
-            } catch(e){
+            } catch (e) {
                 return next(e);
             }
         });
@@ -716,7 +716,6 @@ class Client extends events_1.EventEmitter {
         baServices.readPropertyMultiple.encode(buffer, propertiesArray);
         baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
         this.sendBvlc(address, buffer);
-        //this.sendBvlc(address, buffer);
         this._addCallback(settings.invokeId, (err, data) => {
             try {
                 if (err)
@@ -725,7 +724,7 @@ class Client extends events_1.EventEmitter {
                 if (!result)
                     return next(new Error('INVALID_DECODING'));
                 next(null, result);
-            } catch(e){
+            } catch (e) {
                 return next(e);
             }
         });
@@ -1369,7 +1368,7 @@ class Client extends events_1.EventEmitter {
         baNpdu.encode(buffer, baEnum.NpduControlPriority.NORMAL_MESSAGE, receiver);
         baApdu.encodeComplexAck(buffer, baEnum.PduTypes.COMPLEX_ACK, baEnum.ConfirmedServiceChoice.READ_PROPERTY, invokeId);
         baServices.readProperty.encodeAcknowledge(buffer, objectId, property.id, property.index, value);
-        //baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
+        baBvlc.encode(buffer.buffer, baEnum.BvlcResultPurpose.ORIGINAL_UNICAST_NPDU, buffer.offset);
         this.sendBvlc(receiver, buffer);
     }
     readPropertyMultipleResponse(receiver, invokeId, values) {

package/resources/style.css

@@ -8,4 +8,325 @@
     background: url("icons/icon-read.svg") no-repeat !important;
     width: 20px;
     height: 20px;
+}
+
+
+
+
+/* Read node styles */
+
+.p-treenode-label {
+    color: black;
+    width: 100%;
+}
+.p-tree {
+    background: inherit !important;
+    border: inherit !important;
+    padding-right: 0px !important;
+}
+.p-button {
+    margin-right: .5rem;
+}
+.addPointButton {
+    float: right;
+}
+.minusPointButton {
+    float: right;
+}
+.addPointButton:hover, .minusPointButton:hover {
+    background: #d5d5d5 !important;
+}
+.pointLabel {
+    font-weight: 400;
+}
+.deviceLabel {
+    font-weight: 100;
+}
+.removeAllButton {
+    float: right;
+}
+.addAllButton {
+    float: right;
+}
+.bacnetbutton {
+    background: none;
+    border: none;
+    color: black;
+    font-weight: 400;
+}
+.bacnetbutton:hover {
+    background: #f0f0f0;
+    border-radius: 10px;
+}
+.allFunctionsText {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important;
+    padding-left: 5px;
+}
+.p-treenode-children > li > .p-treenode-children > li {
+    font-size: 14px;
+    color: #b5b5b5 !important;
+}
+.p-treenode-children > li > .p-treenode-children > .p-treenode-label {
+    color: #b5b5b5 !important;
+}
+.p-tree-toggler:enabled:hover {
+    background: #d5d5d5 !important;
+}
+.p-tree-toggler:focus {
+    border: none !important;
+    box-shadow: none !important;
+}
+.deviceStatus {
+    font-size: 10px;
+}
+.statusOnline {
+    color: #11c511;
+}
+.statusOffline {
+    color: red;
+}
+.readDeviceList {
+    .deviceLabel {
+        position: absolute;
+    }
+}
+.objectPropertiesLabel {
+    display: flex !important;
+    flex-direction: row;
+    align-items: center;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content:focus {
+    outline: 0 none !important;
+    outline-offset: 0 !important;
+    box-shadow: inset 0 0 0 1px #bdbdbd !important;
+}
+.checkbox-round {
+    width: 13px !important;
+    height: 13px !important;
+    background-color: white;
+    border-radius: 50%;
+    vertical-align: middle;
+    border: 1px solid #ddd;
+    appearance: none;
+    -webkit-appearance: none;
+    outline: none;
+    cursor: pointer;
+}
+.checkbox-round:checked {
+    background-color: #00AEEF;
+}
+.checkbox-round:focus {
+    outline: none !important;
+}
+.p-tree-filter:focus, .p-tree-filter:focus-visible, .p-inputtext:enabled:hover {
+    box-shadow: inset 0 0 0 0.15rem #dfdcdc !important;
+    border-color: transparent !important;
+}
+.bacnetbutton > .pi {
+    display: flex;
+}
+.p-tree-container {
+    margin: 0 !important;
+}
+.reloadButtonIcon {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important;
+}
+.exportReadListButton {
+    border: none;
+    background: none;
+    font-size: 14px !important;
+    float: left;
+    display: flex;
+    align-items: center;
+}
+.exportReadListButton:hover {
+    background-color: #d5d5d5;
+    border-radius: 5px;
+}
+.removeAllDevicesButton {
+    border: none;
+    background: none;
+    font-size: 14px !important;
+    float: right;
+    display: flex;
+    align-items: center;
+}
+.removeAllDevicesButton:hover {
+    background-color: #d5d5d5;
+    border-radius: 10px;
+}
+.reloadButton {
+    border: none;
+    background: none;
+    font-size: 14px !important;
+    float: right;
+}
+.rebuildDataButton {
+    border: none;
+    background: none;
+    font-size: 14px !important;
+    float: right;
+}
+.reloadButton:hover {
+    background-color: #d5d5d5;
+    border-radius: 10px;
+}
+.rebuildDataButton:hover {
+    background-color: #d5d5d5;
+    border-radius: 10px;
+}
+.headerDiv {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-around;
+    height: 20px;
+}
+.msgTypeDiv {
+    display: flex;
+    align-items: flex-start;
+    flex-direction: column;
+}
+.p-progressbar .p-progressbar-value {
+    background: #00AEEF !important;
+}
+.p-treenode-label {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.buttonGroup {
+    padding-left: 7px;
+}
+#read-readList-tab {
+    display: flex; 
+    flex-direction: column;
+}
+.removeAllDevicesDiv {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+    padding-right: 20px;
+}
+.p-tree .p-treenode-children {
+    padding: 0 !important;
+}
+.p-tree-toggler .p-link {
+    width: 25px !important;
+}
+.dot {
+    height: 13px;
+    width: 13px;
+    border: 0.75px solid #777777;
+    border-radius: 50%;
+    display: inline-block;
+    margin-right: 5px;
+}
+.dotOnline {
+    background-color: #11c511;
+}
+.dotOffline {
+    background-color: red;
+}
+.mstpDeviceCount {
+    margin-left: 10px;
+    background-color: #00aeef;
+    color: #ffffff;
+    border-radius: 45%;
+    font-size: 12px;
+}
+
+.point-context-menu {
+    --mouse-x: 0;
+    --mouse-y: 0;
+    display: none;
+    position: fixed;
+    margin: 0;
+    left: 0;
+    top: 0;
+    /* The following line is responsible for all the magic */
+    transform: translateX(min(var(--mouse-x), calc(100vw - 100%))) translateY(min(var(--mouse-y), calc(100vh - 100%)));
+    z-index: 10;
+}
+
+
+.context-menu {
+    --mouse-x: 0;
+    --mouse-y: 0;
+    display: none;
+    position: fixed;
+    margin: 0;
+    left: 0;
+    top: 0;
+    /* The following line is responsible for all the magic */
+    transform: translateX(min(var(--mouse-x), calc(100vw - 100%))) translateY(min(var(--mouse-y), calc(100vh - 100%)));
+    z-index: 10;
+}
+.context-menu-container {
+    flex-direction: column;
+    justify-content: space-evenly;
+    align-items: flex-start;
+    width: 100%;
+}
+.context-menu-item {
+    width: 100%;
+    height: 30px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+}
+.context-menu-item:hover {
+    cursor: pointer;
+}
+.context-menu-item-text {
+    padding-left: 10px;
+}
+.context-menu-icon {
+    color: white;
+}
+.export-points-button {
+    border: 1px solid var(--red-ui-secondary-border-color);
+    border-radius: 5px !important;
+    padding: 6px 12px;
+    cursor: pointer;
+    margin-right: 10px !important;
+}
+.diplayNameDialogSave {
+    background-color: #3295BD !important;
+    border-radius: 0 !important;
+    margin-right: 0 !important;
+}
+.diplayNameDialogSave > .p-button-label {
+    color: white !important;
+}
+.diplayNameDialogCancel {
+    background-color: #ffffff !important;
+    color: #666 !important;
+    border: 1px solid var(--red-ui-secondary-border-color);
+    border-radius: 0 !important;
+    margin-right: 0 !important;
+}
+.diplayNameDialogCancel:hover {
+    background-color: #e6e6e6 !important;
+    color: #666 !important;
+    border: 1px solid var(--red-ui-secondary-border-color);
+}
+.deviceNameDialog {
+
+    .p-dialog-header {
+        background: #133547 !important;
+        padding: 0.5rem !important;
+    }
+    .p-dialog-title {
+        color: white;
+        font-size: 1rem !important;
+    }
+    .p-dialog-content {
+        padding: 0.5em 0.75rem 0.5rem 0.75rem;
+
+        & label {
+            font-size: 0.9rem !important;
+        }
+        & input {
+            font-size: 1rem !important;
+        }
+    }
 }