From 95dc21a55c641e9d52ec9120d53de1267fbe2c57 Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Sun, 27 Nov 2022 18:44:41 -0600
Subject: [PATCH] artnet cleanup

---
 plugins/artnet/main.js      | 95 +++++++++++++++----------------------
 plugins/artnet/template.ejs | 19 +++-----
 2 files changed, 45 insertions(+), 69 deletions(-)

diff --git a/plugins/artnet/main.js b/plugins/artnet/main.js
index c4268ed..eded517 100644
--- a/plugins/artnet/main.js
+++ b/plugins/artnet/main.js
@@ -3,6 +3,7 @@ const _ = require('lodash');
 exports.defaultName = "Art-Net";
 exports.connectionType = 'UDPsocket';
 exports.heartbeatInterval = 10000;
+
 exports.searchOptions = {
   type: 'UDPsocket',
   searchBuffer: Buffer.from([0x00]),
@@ -12,108 +13,88 @@ exports.searchOptions = {
     return msg.toString('utf8', 0, 7) === "Art-Net";
   }
 };
+
 exports.defaultPort = 6454;
 
-exports.ready = function ready(device) {
-  const d = device;
-  d.data.universes = {};
-  d.data.orderedUniverses = [];
-
+exports.ready = function ready(_device) {
+  const device = _device;
+  device.data.universes = {};
+  device.data.orderedUniverses = [];
 };
 
-exports.data = function data(device, buf) {
+exports.data = function data(_device, buf) {
   if(buf.length < 18){
     return
   }
-  const univ = buf.readUInt8(14);
-  const d = device;
-  let u = d.data.universes[univ];
+  const universeIndex = buf.readUInt8(14);
+  const device = _device;
+  let universe = device.data.universes[universeIndex];
 
-  if(!u){
-    d.data.universes[univ] = {};
-    u = d.data.universes[univ];
+  if(!universe){
+    device.data.universes[universeIndex] = {};
+    universe = device.data.universes[universeIndex];
   }
 
-  u.sequence = buf.readUInt8(12);
-  u.net = buf.readUInt8(15);
-  u.opCode = buf.readUInt8(9);
-  u.version = buf.readUInt16BE(10);
-  u.slots = Array.prototype.slice.call(buf, 18);
-  d.data.ip = d.addresses[0];
+  universe.sequence = buf.readUInt8(12);
+  universe.subnet = buf.readUInt8(15);
+  universe.opCode = buf.readUInt8(9);
+  universe.version = buf.readUInt16BE(10);
+  universe.slots = buf.slice(18)
+  device.data.ip = device.addresses[0];
 
-  if(!_.includes(d.data.orderedUniverses, univ)){
-    d.data.orderedUniverses.push(univ);
-    d.data.orderedUniverses.sort();
-    u.slotElems = [];
-    u.slotElemsSet = false;
-
-    d.draw();
-    updateElementsCache(d, d.data.universes, d.data.orderedUniverses);
+  if(!_.includes(device.data.orderedUniverses, universeIndex)){
+    device.data.orderedUniverses.push(universeIndex);
+    device.data.orderedUniverses.sort();
+    universe.slotElems = [];
+    universe.slotElemsSet = false;
 
+    device.draw();
+    device.update('elementCache');
   }
 
   device.update("universeData", {
-    u: univ,
-    universe: u
+    universeIndex,
+    universe
   });
-
-
 };
 
-
 exports.heartbeat = function heartbeat(device) {
   
 };
 
-
-
 let lastUpdate = Date.now();
-exports.update = function update(device, document, updateType, updateData){
-
+exports.update = function update(_device, _document, updateType, updateData){
+  const device = _device
   const data = updateData;
-  const doc = document;
+  const document = _document;
 
   if(updateType === "universeData" && data.universe){
 
     if(Date.now() - lastUpdate > 1000){
       lastUpdate = Date.now();
-      updateElementsCache(device, device.data.universes, device.data.orderedUniverses);
+      device.update("elementCache");
     }
 
-    const $elem = doc.getElementById(`universe-${data.u}`);
+    const $elem = document.getElementById(`universe-${data.universeIndex}`);
 
     if($elem && data.universe.slotElemsSet){
-
       for(let i = 0; i < 512; i++){
         data.universe.slotElems[i].innerText = data.universe.slots[i];
       }
 
-      doc.getElementById(`universe-${data.u}-sequence`).innerText = data.universe.sequence;
-
-
+      document.getElementById(`universe-${data.universeIndex}-sequence`).innerText = data.universe.sequence;
     }else{
       device.draw();
-      updateElementsCache(device, device.data.universes, device.data.orderedUniverses);
+      device.update("elementCache");
     }
 
   }else if(updateType === "elementCache"){
-
-    data.orderedUniverses.forEach(univ => { 
+    device.data.orderedUniverses.forEach(universeIndex => { 
       for(let i = 0; i < 512; i++){
-        data.universes[univ].slotElems[i] = doc.getElementById(`${univ}-${i}`);
+        device.data.universes[universeIndex].slotElems[i] = document.getElementById(`${universeIndex}-${i}`);
       }
-      data.universes[univ].slotElemsSet = true;
+      device.data.universes[universeIndex].slotElemsSet = true;
     });
-
   }
-  
-
-}
-
-function updateElementsCache(device, univ, ordered){
-  device.update("elementCache", {
-    universes: univ,
-    orderedUniverses: ordered
-  });
 }
 
diff --git a/plugins/artnet/template.ejs b/plugins/artnet/template.ejs
index 8373f98..b6d18ea 100644
--- a/plugins/artnet/template.ejs
+++ b/plugins/artnet/template.ejs
@@ -4,23 +4,23 @@
 
 
 <div id="universes">
-<% data.orderedUniverses.forEach(univ => { 
-  let universe = data.universes[univ];
+<% data.orderedUniverses.forEach(universeIndex => { 
+  let universe = data.universes[universeIndex];
 %>
 
-  <table id="universe-<%= univ %>">
+  <table id="universe-<%= universeIndex %>">
   <tr>
     <td class="data" colspan="2">
       Universe
-      <br><em><%= univ %></em>
+      <br><em><%= universeIndex %></em>
     </td>
     <td class="data" colspan="2">
       Sub-Net
-      <br><em><%= universe.net %></em>
+      <br><em><%= universe.subnet %></em>
     </td>
     <td class="data" colspan="2">
       Sequence
-      <br><em id="universe-<%= univ %>-sequence"><%= universe.sequence %></em>
+      <br><em id="universe-<%= universeIndex %>-sequence"><%= universe.sequence %></em>
     </td>
     <td class="data" colspan="2">
       OpCode
@@ -35,7 +35,6 @@
       <br><em><%= data.ip %></em>
     </td>
     <td class="data" colspan="3"></td>
-
   </tr>
 
   <tr>
@@ -51,14 +50,10 @@
       <th><%= row*16+1 %></th>
     <% for(col=0; col<16; col++){ %>
       <% slot++%>
-      <td id="<%= univ %>-<%= row*16+col %>" title="<%= univ %>/<%= slot %>"><%= universe.slots[slot-1] %></td>
+      <td id="<%= universeIndex %>-<%= row*16+col %>" title="<%= universeIndex %>/<%= slot %>"><%= universe.slots[slot-1] %></td>
     <% } %>
     </tr>
   <% } %>
-
-  
 </table>
-
 <% }); %>
-
 </div>
\ No newline at end of file