npm - @bitpoolos/edge-bacnet - Versions diffs - 1.5.3 → 1.6.1 - Mend

@bitpoolos/edge-bacnet 1.5.3 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

package/CHANGELOG.md +155 -10
package/bacnet_client.js +123 -107
package/bacnet_gateway.html +22 -6
package/bacnet_gateway.js +346 -250
package/bacnet_inspector.html +43 -0
package/bacnet_inspector.js +1420 -0
package/bacnet_inspector_worker.js +535 -0
package/bacnet_read.html +27 -27
package/bacnet_read.js +0 -3
package/common.js +201 -38
package/examples/1-Discover-Read.json +170 -1
package/examples/2-Discover-Write.json +164 -1
package/examples/3-Discover-Read-Write.json +227 -1
package/examples/4-Inspector.json +368 -0
package/inspector.html +455 -0
package/package.json +6 -2
package/resources/Logo_Simplified_Positive.svg +32 -0
package/resources/downloadAsHtml.js +656 -0
package/resources/icons/device-id-change-icon.svg +4 -0
package/resources/icons/device-id-conflict-icon.svg +4 -0
package/resources/icons/favicon.ico +0 -0
package/resources/icons/points-error-icon.svg +4 -0
package/resources/icons/points-missing-icon.svg +4 -0
package/resources/icons/points-ok-icon.svg +4 -0
package/resources/icons/points-unmapped-icon.svg +5 -0
package/resources/icons/points-warning-icon.svg +4 -0
package/resources/inspector.css +25312 -0
package/resources/inspectorStyle.css +254 -0
package/resources/inspectorStyles.css +503 -0
package/resources/primevue.min.js +1 -0
package/resources/style.css +17 -1
package/resources/vue3513.global.prod.js +9 -0
package/ssrHtmlExporter.js +537 -0
package/treeBuilder.js +3 -3

package/inspector.html ADDED Viewed

@@ -0,0 +1,455 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Bitpool BACnet Inspector</title>
+  <link rel="icon" type="image/x-icon" href="resources/@bitpoolos/edge-bacnet/icons/favicon.ico">
+  <!-- Vue 3 -->
+  <script src="resources/@bitpoolos/edge-bacnet/vue3513.global.prod.js"></script>
+  <script src="resources/@bitpoolos/edge-bacnet/primevue.min.js"></script>
+  <script src="resources/@bitpoolos/edge-bacnet/downloadAsHtml.js"></script>
+  <link href="resources/@bitpoolos/edge-bacnet/primevue-saga-blue-theme.css" rel="stylesheet" />
+  <link href="resources/@bitpoolos/edge-bacnet/primevue.min.css" rel="stylesheet" />
+  <link href="resources/@bitpoolos/edge-bacnet/primeflex.min.css" rel="stylesheet" />
+  <link href="resources/@bitpoolos/edge-bacnet/primeicons.css" rel="stylesheet" />
+  <link href="resources/@bitpoolos/edge-bacnet/inspectorStyles.css" rel="stylesheet" />
+</head>
+<body>
+  <div id="app">
+    <div class="card header-content">
+      <div class="header">
+        <div class="dividerRight">
+          <img src="resources/@bitpoolos/edge-bacnet/Logo_Simplified_Positive.svg" class="logo" alt="Bitpool" />
+        </div>
+        <div class="status">
+          <span @click="statusItemClicked" class="statusItem status-with-icon">
+            <span class="status-icon-wrapper" style="background-color: #10B981;">
+              <img src="resources/@bitpoolos/edge-bacnet/icons/points-ok-icon.svg" class="status-icon ok-icon"
+                alt="Points OK" />
+            </span>
+            <div class="status-text">
+              <span class="statBlockValue">
+                {{statCounts?.statBlock.ok}}
+                <span class="stat-percentage">{{statPercentages.ok}}%</span>
+              </span>
+              <span class="statBlockKey">Points OK</span>
+            </div>
+          </span>
+          <span @click="statusItemClicked" class="statusItem status-with-icon">
+            <span class="status-icon-wrapper" style="background-color: #F1707B;">
+              <img src="resources/@bitpoolos/edge-bacnet/icons/points-error-icon.svg" class="status-icon error-icon"
+                alt="Points Error" />
+            </span>
+            <div class="status-text">
+              <span class="statBlockValue">
+                {{statCounts?.statBlock.error}}
+                <span class="stat-percentage">{{statPercentages.error}}%</span>
+              </span>
+              <span class="statBlockKey">Points Error</span>
+            </div>
+          </span>
+          <span @click="statusItemClicked" class="statusItem status-with-icon">
+            <span class="status-icon-wrapper" style="background-color: #133547;">
+              <img src="resources/@bitpoolos/edge-bacnet/icons/points-missing-icon.svg" class="status-icon missing-icon"
+                alt="Points Missing" />
+            </span>
+            <div class="status-text">
+              <span class="statBlockValue">
+                {{statCounts?.statBlock.missing}}
+                <span class="stat-percentage">{{statPercentages.missing}}%</span>
+              </span>
+              <span class="statBlockKey">Points Missing</span>
+            </div>
+          </span>
+          <span @click="statusItemClicked" class="statusItem status-with-icon">
+            <span class="status-icon-wrapper" style="background-color: #F59E0B;">
+              <img src="resources/@bitpoolos/edge-bacnet/icons/points-warning-icon.svg" class="status-icon warning-icon"
+                alt="Points Warning" />
+            </span>
+            <div class="status-text">
+              <span class="statBlockValue">
+                {{statCounts?.statBlock.warnings}}
+                <span class="stat-percentage">{{statPercentages.warnings}}%</span>
+              </span>
+              <span class="statBlockKey">Points Warnings</span>
+            </div>
+          </span>
+          <span @click="statusItemClicked" class="statusItem status-with-icon">
+            <span class="status-icon-wrapper" style="background-color: #00ADEF;">
+              <img src="resources/@bitpoolos/edge-bacnet/icons/points-unmapped-icon.svg"
+                class="status-icon unmapped-icon" alt="Points Unmapped" />
+            </span>
+            <div class="status-text">
+              <span class="statBlockValue">
+                {{statCounts?.statBlock.unmapped}}
+                <span class="stat-percentage">{{statPercentages.unmapped}}%</span>
+              </span>
+              <span class="statBlockKey">Points Unmapped</span>
+            </div>
+          </span>
+          <span @click="statusItemClicked" class="statusItem status-with-icon">
+            <span class="status-icon-wrapper" style="background-color: #0689BC;">
+              <img src="resources/@bitpoolos/edge-bacnet/icons/device-id-change-icon.svg"
+                class="status-icon device-id-change-icon" alt="Device ID Change" />
+            </span>
+            <div class="status-text">
+              <span class="statBlockValue">
+                {{statCounts?.statBlock.deviceIdChange}}
+                <span class="stat-percentage">{{statPercentages.deviceIdChange}}%</span>
+              </span>
+              <span class="statBlockKey">Changed Device ID's</span>
+            </div>
+          </span>
+          <span @click="statusItemClicked" class="statusItem status-with-icon">
+            <span class="status-icon-wrapper" style="background-color: #406C7D;">
+              <img src="resources/@bitpoolos/edge-bacnet/icons/device-id-conflict-icon.svg"
+                class="status-icon device-id-conflict-icon" alt="Device ID Conflict" />
+            </span>
+            <div class="status-text">
+              <span class="statBlockValue">
+                {{statCounts?.statBlock.deviceIdConflict}}
+                <span class="stat-percentage">{{statPercentages.deviceIdConflict}}%</span>
+              </span>
+              <span class="statBlockKey">Conflicting Device ID's</span>
+            </div>
+          </span>
+        </div>
+        <div class="actionButtons">
+          <p-button icon="pi pi-refresh" onclick="window.location.reload()" class="refreshButton" label="Refresh">
+          </p-button>
+          <p-button icon="pi pi-download" @click="downloadCSV()" class="bitpool-blue" label="Download CSV"></p-button>
+          <p-button icon="pi pi-download" @click="downloadHTML()" class="bitpool-blue" label="Download HTML"></p-button>
+        </div>
+      </div>
+    </div>
+    <div class="content-wrapper">
+      <div class="card datatable-card">
+        <div class="center">
+          <p class="headertext">{{siteName}} - Point Status Display</p>
+        </div>
+        <p-datatable :value="displayData" paginator :rows="12" filterDisplay="menu" :filters="filters"
+          v-model:filters="filters" :sortMode="'multiple'" @filter="onFilter" scrollable scrollHeight="800px"
+          class="datatable fixed-height-table">
+          <template #header>
+            <div class="tableHeaderDiv">
+              <div style="margin-right: 5px">
+                <p-multiselect v-model="selectedColumns" :options="allColumns" optionLabel="header" dataKey="field"
+                  placeholder="Select Columns" :maxSelectedLabels="3" class="columnSelector w-full md:w-20rem"
+                  display="chip">
+                  <template #option="slotProps">
+                    <div style="display: flex; align-items: center">
+                      <div class="custom-checkbox">
+                        <div :class="['custom-checkbox-box', {'selected': isSelected(slotProps.option)}]">
+                          <i v-if="isSelected(slotProps.option)" class="pi pi-check custom-checkbox-icon"></i>
+                        </div>
+                      </div>
+                      <span>{{ slotProps.option.header }}</span>
+                    </div>
+                  </template>
+                  <template #value="slotProps">
+                    <template v-if="slotProps.value && slotProps.value.length > 0">
+                      <template v-if="slotProps.value.length <= 3">
+                        <div class="p-multiselect-token" v-for="(item, index) in slotProps.value" :key="item.field">
+                          <span class="p-multiselect-token-label">{{ item.header }}</span>
+                          <span v-if="index < slotProps.value.length - 1">, </span>
+                        </div>
+                      </template>
+                      <template v-else>
+                        <div class="p-multiselect-token-label">{{ slotProps.value.length }} items selected</div>
+                      </template>
+                    </template>
+                    <span v-else class="p-multiselect-placeholder">{{ 'Select Columns' }}</span>
+                  </template>
+                </p-multiselect>
+              </div>
+              <div style="width: 100%">
+                <i class="pi pi-search searchBarContainer"></i>
+                <p-input-text class="searchBar" type="text" pInputText v-model="filters['global'].value"
+                  placeholder="Search"></p-input-text>
+              </div>
+            </div>
+          </template>
+          <p-column v-for="col in visibleColumns" :key="col.field" :field="col.field" :header="col.header" sortable
+            filter></p-column>
+          <template #paginatorstart>
+          </template>
+          <template #paginatorend="slotProps">
+            <span class="">
+              <span class="statBlockValue">{{displayedRowsCount}} results</span>
+            </span>
+          </template>
+        </p-datatable>
+      </div>
+    </div>
+  </div>
+  <script>
+    const { createApp, ref } = Vue;
+    // Create app
+    const app = createApp({
+      data() {
+        return {
+          tableData: null,
+          loading: false,
+          totalRecords: 0,
+          first: 0,
+          lazyParams: {},
+          siteName: ref(),
+          statCounts: ref(),
+          displayedRowsCount: 0, // Track how many rows are visible
+          filters: {
+            global: { value: null, matchMode: "contains" },
+            deviceID: { value: null, matchMode: "contains" },
+            ObjectType: { value: null, matchMode: "contains" },
+            objectInstance: { value: null, matchMode: "contains" },
+            presentValue: { value: null, matchMode: "contains" },
+            dataModelStatus: { value: null, matchMode: "contains" },
+            pointName: { value: null, matchMode: "contains" },
+            discoveredBACnetPointName: { value: null, matchMode: "contains" },
+            displayName: { value: null, matchMode: "contains" },
+            deviceName: { value: null, matchMode: "contains" },
+            ipAddress: { value: null, matchMode: "contains" },
+            area: { value: null, matchMode: "contains" },
+            key: { value: null, matchMode: "contains" },
+            topic: { value: null, matchMode: "contains" },
+            lastSeen: { value: null, matchMode: "contains" },
+            error: { value: null, matchMode: "contains" },
+          },
+          allColumns: [
+            { field: "deviceID", header: "Device ID" },
+            { field: "objectType", header: "Object Type" },
+            { field: "objectInstance", header: "Object Instance" },
+            { field: "presentValue", header: "Present Value" },
+            { field: "dataModelStatus", header: "Data Model Status" },
+            { field: "pointName", header: "Mapped Point Name" },
+            { field: "discoveredBACnetPointName", header: "Discovered Point Name" },
+            { field: "displayName", header: "Display Name" },
+            { field: "deviceName", header: "Device Name" },
+            { field: "ipAddress", header: "IP Address" },
+            { field: "area", header: "Area" },
+            { field: "key", header: "Key" },
+            { field: "topic", header: "Topic" },
+            { field: "lastSeen", header: "Last Seen" },
+            { field: "error", header: "Error" },
+          ],
+          selectedColumns: [],
+          statPercentages: {
+            readCount: 0,
+            ok: 0,
+            error: 0,
+            missing: 0,
+            warnings: 0,
+            deviceIdChange: 0,
+            deviceIdConflict: 0,
+            unmapped: 0
+          },
+          activeFilter: null,
+        };
+      },
+      setup() {
+        return {};
+      },
+      mounted() {
+        let app = this;
+        this.observeHeaderHeight();
+        this.selectedColumns = JSON.parse(JSON.stringify(this.allColumns));
+        fetch("/getModelStats")
+          .then((response) => {
+            // Check if the response is successful
+            if (!response.ok) {
+              throw new Error(`HTTP error! Status: ${response.status}`);
+            }
+            // Parse the JSON response
+            return response.json();
+          })
+          .then((data) => {
+            let tableData = [];
+            if (data.resultList) {
+              for (let item in data.resultList) {
+                tableData.push(data.resultList[item]);
+              }
+            }
+            app.tableData = tableData;
+            app.siteName = data.siteName;
+            app.statCounts = data.statCounts;
+            // Calculate percentages
+            const total = tableData.length || 1; // Avoid division by zero
+            app.statPercentages = {
+              readCount: Math.round((data.statCounts.readCount / total) * 100),
+              ok: Math.round((data.statCounts.statBlock.ok / total) * 100),
+              error: Math.round((data.statCounts.statBlock.error / total) * 100),
+              missing: Math.round((data.statCounts.statBlock.missing / total) * 100),
+              warnings: Math.round((data.statCounts.statBlock.warnings / total) * 100),
+              deviceIdChange: Math.round((data.statCounts.statBlock.deviceIdChange / total) * 100),
+              deviceIdConflict: Math.round((data.statCounts.statBlock.deviceIdConflict / total) * 100),
+              unmapped: Math.round((data.statCounts.statBlock.unmapped / total) * 100)
+            };
+          })
+          .catch((error) => {
+            // Handle any errors
+            console.error("Error:", error);
+          });
+      },
+      computed: {
+        visibleColumns() {
+          return this.selectedColumns || []; // Handle null case
+        },
+        displayData() {
+          if (!this.tableData || this.tableData.length === 0) {
+            // Create empty rows to maintain height
+            return Array(20)
+              .fill({})
+              .map(() => ({}));
+          }
+          return this.tableData;
+        },
+      },
+      methods: {
+        statusItemClicked(e) {
+          // Get the filter category from the clicked item's text content
+          const clickedItem = e.currentTarget;
+          const statusType = clickedItem.querySelector('.statBlockKey').textContent.trim();
+          // Clear previous active status styling
+          document.querySelectorAll('.statusItem').forEach(item => {
+            item.classList.remove('active-filter');
+          });
+          // If clicking the already active filter, clear it
+          if (this.activeFilter === statusType) {
+            this.activeFilter = null;
+            this.filters['dataModelStatus'].value = null;
+            return;
+          }
+          // Set this item as active
+          clickedItem.classList.add('active-filter');
+          this.activeFilter = statusType;
+          // Apply the appropriate filter based on which status item was clicked
+          let filterValue = '';
+          switch (statusType) {
+            case 'Points OK':
+              filterValue = 'Point Ok';
+              break;
+            case 'Points Error':
+              filterValue = 'Point Error';
+              break;
+            case 'Points Missing':
+              filterValue = 'Point Missing';
+              break;
+            case 'Points Warnings':
+              filterValue = 'Point Warning';
+              break;
+            case 'Points Unmapped':
+              filterValue = 'Point Unmapped';
+              break;
+            case 'Changed Device ID\'s':
+              filterValue = 'Device ID Changed';
+              break;
+            case 'Conflicting Device ID\'s':
+              filterValue = 'Device ID Conflict';
+              break;
+            default:
+              filterValue = '';
+          }
+          // Apply the filter
+          this.filters['dataModelStatus'].value = filterValue;
+        },
+        observeHeaderHeight() {
+          const header = document.querySelector('.header-content');
+          const updateContentMargin = () => {
+            const headerHeight = header.offsetHeight;
+            document.documentElement.style.setProperty('--header-height', `${headerHeight}px`);
+          };
+          // Update initially
+          updateContentMargin();
+          // Observe header size changes
+          const resizeObserver = new ResizeObserver(updateContentMargin);
+          resizeObserver.observe(header);
+          // Update on window resize
+          window.addEventListener('resize', updateContentMargin);
+        },
+        enforceTableHeight() {
+          // Force minimum height on table elements
+          const tableWrapper = document.querySelector(".p-datatable-wrapper");
+          if (tableWrapper) {
+            tableWrapper.style.minHeight = "800px";
+          }
+          const tableBody = document.querySelector(".p-datatable-tbody");
+          if (tableBody) {
+            tableBody.style.minHeight = "760px";
+          }
+        },
+        isSelected(option) {
+          if (!this.selectedColumns) return false;
+          return this.selectedColumns.some((item) => item.field === option.field);
+        },
+        downloadCSV() {
+          window.location.href = "/getmodelstatscsv";
+        },
+        downloadHTML() {
+          let filename = `${this.siteName}_BACnetStats_${Date.now()}.html`;
+          // Create data object with all necessary properties
+          const data = {
+            tableData: this.tableData,
+            siteName: this.siteName,
+            statCounts: this.statCounts,
+            displayedRowsCount: this.displayedRowsCount,
+            filters: this.filters,
+            selectedColumns: this.selectedColumns,
+            allColumns: this.allColumns,
+            statPercentages: this.statPercentages  // Include the calculated percentages
+          };
+          downloadPrimeVueAppAsHtml(filename, data);
+        },
+        onFilter(e) {
+          // e.filteredValue contains the new filtered dataset
+          if (e.filteredValue) {
+            this.displayedRowsCount = e.filteredValue.length;
+          } else {
+            // if no filter is applied, revert to full tableData length
+            this.displayedRowsCount = this.tableData ? this.tableData.length : 0;
+          }
+          this.$nextTick(() => {
+            this.enforceTableHeight();
+          });
+        },
+      },
+      components: {
+        "p-button": PrimeVue.Button,
+        "p-card": PrimeVue.Card,
+        "p-input-text": PrimeVue.InputText,
+        "p-datatable": PrimeVue.DataTable,
+        "p-column": PrimeVue.Column,
+        "p-icon-field": PrimeVue.IconField,
+        "p-input-icon": PrimeVue.InputIcon,
+        "p-multiselect": PrimeVue.MultiSelect,
+      },
+    });
+    app.use(PrimeVue.Config);
+    app.mount("#app");
+  </script>
+</body>
+</html>

package/package.json CHANGED Viewed

@@ -1,15 +1,18 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",
+    "@vue/server-renderer": "^3.5.13",
     "async-mutex": "^0.4.0",
     "cronosjs": "^1.7.1",
     "debug": "^4.1.1",
     "iconv-lite": "^0.6.3",
+    "primevue": "^4.3.2",
     "toad-scheduler": "^1.6.0",
     "underscore": "^1.10.2",
+    "vue": "^3.5.13",
     "winston": "^3.2.1"
   },
   "node-red": {
@@ -18,7 +21,8 @@
       "Bacnet-Gateway": "bacnet_gateway.js",
       "Bacnet-Discovery": "bacnet_read.js",
       "Bacnet-Write": "bacnet_write.js",
-      "Bitpool-Inject": "bitpool_inject.js"
+      "Bitpool-Inject": "bitpool_inject.js",
+      "Bacnet-Inspector": "bacnet_inspector.js"
     }
   },
   "keywords": [

package/resources/Logo_Simplified_Positive.svg ADDED Viewed

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 617.93 192.79">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #162732;
+      }
+      .cls-1, .cls-2 {
+        stroke-width: 0px;
+      }
+      .cls-2 {
+        fill: url(#linear-gradient);
+      }
+    </style>
+    <linearGradient id="linear-gradient" x1="0" y1="96.39" x2="171.04" y2="96.39" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#83d7f7"/>
+      <stop offset="1" stop-color="#00adef"/>
+    </linearGradient>
+  </defs>
+  <g>
+    <path class="cls-1" d="M255.61,94.18c14.39,1.25,19.23,10.24,19.23,25.46,0,19.64-8.99,24.9-31.27,24.9-17.43,0-26.56-.14-38.04-1.1V47.97c10.24-.97,18.54-1.11,33.76-1.11,24.07,0,32.65,5.26,32.65,24.9,0,13.7-4.7,20.75-16.32,21.86v.55ZM239.84,87.68c11.62,0,15.49-2.77,15.49-13.7s-4.15-13.14-16.88-13.14h-15.91v26.84h17.29ZM240.67,130.57c12.87,0,16.88-2.63,16.88-14.11,0-12.73-4.29-16.05-17.43-16.19h-17.57v30.16l18.12.14Z"/>
+    <path class="cls-1" d="M295.64,46.17c3.32,0,4.84,1.8,4.84,4.84v7.61c0,3.18-1.52,4.84-4.84,4.84h-7.75c-3.18,0-4.84-1.66-4.84-4.84v-7.61c0-3.04,1.66-4.84,4.84-4.84h7.75ZM283.46,143.43v-67.79h16.74v67.79h-16.74Z"/>
+    <path class="cls-1" d="M337.38,122.27c0,5.95,2.07,7.88,8.16,7.88h9.27l1.8,12.45c-4.7,1.52-13.28,2.35-17.43,2.35-11.9,0-18.4-7.19-18.4-19.78v-37.35h-12.31v-11.48l12.17-.69v-19.51h16.74v19.51h19.92v12.17h-19.92v34.45Z"/>
+    <path class="cls-1" d="M380.95,85.74c6.36-7.06,17.85-11.9,27.81-11.9,16.46,0,23.1,13.28,23.1,36.25,0,26.56-8.85,35-26.01,35-8.3,0-16.6-1.94-23.52-6.64.41,4.7.55,9.27.41,14.11v17.85h-16.74v-94.76h13.83l1.11,10.1ZM382.75,128.49c6.78,1.52,11.62,2.9,18.12,2.9,9.96,0,13.69-3.46,13.69-21.44s-3.32-22.27-12.03-22.27c-6.5,0-11.9,3.04-19.78,8.44v32.37Z"/>
+    <path class="cls-1" d="M505.18,109.54c0,26.01-8.99,35.69-33.34,35.69s-33.62-9.68-33.62-35.69,9.13-35.83,33.62-35.83,33.34,9.82,33.34,35.83ZM455.8,109.54c0,17.43,3.6,22.27,16.05,22.27s15.91-4.84,15.91-22.27-3.74-22.41-15.91-22.41-16.05,4.84-16.05,22.41Z"/>
+    <path class="cls-1" d="M578.64,109.54c0,26.01-8.99,35.69-33.34,35.69s-33.62-9.68-33.62-35.69,9.13-35.83,33.62-35.83,33.34,9.82,33.34,35.83ZM529.25,109.54c0,17.43,3.6,22.27,16.05,22.27s15.91-4.84,15.91-22.27-3.74-22.41-15.91-22.41-16.05,4.84-16.05,22.41Z"/>
+    <path class="cls-1" d="M602.16,122.27c-.14,5.39,2.63,7.88,8.02,7.88h5.81l1.94,12.45c-3.04,1.52-10.52,2.35-14.39,2.35-11.21,0-18.26-6.64-18.26-18.54V46.59h16.88v75.67Z"/>
+  </g>
+  <path class="cls-2" d="M85.52,192.79c-2.6,0-5.1-.62-7.03-1.74L7.04,149.8C3.02,147.49,0,142.25,0,137.61V55.11C0,50.48,3.02,45.24,7.04,42.93L78.48,1.68c3.88-2.24,10.19-2.24,14.07,0l71.45,41.25c4.01,2.32,7.04,7.55,7.04,12.19v82.5c0,4.63-3.02,9.87-7.04,12.19l-71.45,41.25c-1.94,1.12-4.44,1.74-7.04,1.74ZM85.52,8.09c-1.16,0-2.26.24-2.96.65L11.11,49.98c-1.5.86-2.96,3.41-2.96,5.13v82.5c0,1.73,1.47,4.27,2.96,5.13l71.45,41.25c1.4.81,4.53.81,5.93,0l71.45-41.25c1.5-.86,2.96-3.4,2.96-5.13V55.11c0-1.73-1.47-4.27-2.96-5.13L88.48,8.73c-.7-.4-1.81-.65-2.96-.65ZM85.69,165.46h0s59.76-34.67,59.76-34.67v-19.74l-59.76,34.64-25.62-14.79v19.75l25.62,14.81h0s0,0,0,0h0ZM111.28,81.34l-25.6-14.83-25.6,14.83v29.74l25.58,14.8v.03l.02-.02.02.02v-.03l25.58-14.8v-29.61M145.45,61.72l-59.71-34.61-17.07,9.86,59.71,34.62v29.67l17.07-9.87v-29.67ZM25.9,61.77v68.85l17.07,9.88v-68.87l25.77-15.05-17.08-9.86-25.77,15.05Z"/>
+</svg>