bump Cue View version

Bump electron from 34.2.0 to 35.7.5

.github/workflows/release.yaml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version-file: .nvmrc
           cache: 'npm'
       - run: npm ci
       - run: npm run release
@@ -20,9 +20,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version-file: .nvmrc
           cache: 'npm'
       - run: npm ci
       - run: npm run release
@@ -36,9 +36,9 @@ jobs:
       APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version-file: .nvmrc
           cache: 'npm'
       - run: npm ci
       - run: npm run release

.nvmrc

@@ -1 +1 @@
-v20.12.1
+v22.21.1

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Electron: Main",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+      "runtimeArgs": ["--remote-debugging-port=9223", "."],
+      "windows": {
+        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
+      }
+    },
+    {
+      "name": "Electron: Renderer",
+      "type": "chrome",
+      "request": "attach",
+      "port": 9223,
+      "webRoot": "${workspaceFolder}",
+      "timeout": 30000
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Electron: All",
+      "configurations": ["Electron: Main", "Electron: Renderer"]
+    }
+  ]
+}

.vscode/settings.json

@@ -2,7 +2,7 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "eslint.validate": ["javascript"],
   "html.validate.styles": false // accept templates inside HTML style attributes

README.md

@@ -25,4 +25,4 @@ A dashboard for everything in your show.
 - Shure ULXD Wireless
 - DiGico SD Consoles
 - PosiStageNet
-- Livestream Studio (soon)
+- Livestream Studio

main.js

@@ -40,6 +40,7 @@ const menuTemplate = [
       { role: 'togglefullscreen' },
       {
         label: 'Toggle Sidebar',
+        accelerator: 'CommandOrControl+B',
         id: 'toggleSidebar',
         click(menuItem, window, event) {
           mainWindow.webContents.send('toggleSidebar');
@@ -151,9 +152,7 @@ const menuTemplate = [
 const windowMac = {
   width: 1500,
   height: 900,
-  titleBarStyle: 'customButtonsOnHover',
   transparent: false,
-  frame: false,
   show: false,
   vibrancy: 'window',
   visualEffectState: 'followWindow',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cue-view",
   "productName": "Cue View",
-  "version": "1.2.0",
+  "version": "1.2.3",
   "description": "A dashboard for everything in your show",
   "main": "main.js",
   "scripts": {
@@ -19,25 +19,25 @@
   "homepage": "https://github.com/stagehacks/Cue-View",
   "repository": "https://github.com/stagehacks/Cue-View",
   "devDependencies": {
-    "@electron/notarize": "^2.5.0",
-    "electron": "^33.0.2",
-    "electron-builder": "^25.1.8",
-    "eslint": "^8.57.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.31.0",
-    "prettier": "^3.3.3"
+    "@electron/notarize": "3.1.1",
+    "electron": "39.1.1",
+    "electron-builder": "26.0.12",
+    "eslint": "8.57.0",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-config-prettier": "10.1.5",
+    "eslint-plugin-import": "2.31.0",
+    "prettier": "3.5.3"
   },
   "dependencies": {
-    "@jwetzell/posistagenet": "^1.1.0",
-    "atem-connection": "^3.5.0",
-    "bonjour": "^3.5.0",
-    "electron-updater": "^6.3.9",
-    "lodash": "^4.17.21",
-    "md5": "^2.3.0",
-    "netmask": "^2.0.2",
-    "osc": "^2.4.5",
-    "uuid": "^11.0.1"
+    "@jwetzell/posistagenet": "2.1.1",
+    "atem-connection": "3.5.0",
+    "bonjour": "3.5.0",
+    "electron-updater": "6.6.2",
+    "lodash": "4.17.21",
+    "md5": "2.3.0",
+    "netmask": "2.0.2",
+    "osc": "2.4.5",
+    "uuid": "11.1.0"
   },
   "build": {
     "appId": "com.stagehacks.cueview",

plugins/posistagenet/main.js

@@ -43,15 +43,32 @@ exports.data = function data(_device, buf, info) {
   device.decoders[info.address].decode(buf);
 
   Object.keys(device.decoders).forEach((address) => {
+    console.log(device.decoders[address].trackers)
     device.data[address] = {
       trackers: device.decoders[address].trackers,
       system_name: device.decoders[address].system_name,
-      fields: device.decoders[address].getTrackerFields(),
+      fields: getTrackerFields(device.decoders[address].trackers),
     };
   });
   device.draw();
 };
 
+function getTrackerFields(trackers) {
+    const keys = new Set(
+      Object.values(trackers)
+        .map((tracker) => Object.keys(tracker))
+        .flat(1)
+    );
+
+    // NOTE(jwetzell): remove fields that definitely exist
+    keys.delete('id');
+    keys.delete('has_subchunks');
+    keys.delete('data_len');
+    keys.delete('chunk_data');
+
+    return keys;
+}
+
 exports.heartbeat = function heartbeat(device) {};
 
 exports.update = function update(_device, doc, updateType, updateData) {};

plugins/posistagenet/template.ejs

@@ -14,7 +14,7 @@
   <table>
     <tr>
       <th></th>
-      <% if(instanceData.fields.has('tracker_name')) { %>
+      <% if(instanceData.fields.has('name')) { %>
         <th></th>
       <% } %>
 
@@ -30,7 +30,7 @@
         <th colspan="3" class="bg-ori border-right">ORI</th>
       <% } %>
 
-      <% if(instanceData.fields.has('status')) { %>
+      <% if(instanceData.fields.has('validity')) { %>
         <th class="border-right"></th>
       <% } %>
 
@@ -48,7 +48,7 @@
     </tr>
     <tr>
       <th>ID</th>
-      <% if(instanceData.fields.has('tracker_name')) { %>
+      <% if(instanceData.fields.has('name')) { %>
         <th>Name</th>
       <% } %>
 
@@ -70,7 +70,7 @@
         <th class="bg-ori border-right">z</th>
       <% } %>
 
-      <% if(instanceData.fields.has('status')) { %>
+      <% if(instanceData.fields.has('validity')) { %>
         <th class="border-right">validity</th>
       <% } %>
 
@@ -96,51 +96,51 @@
 
     <tr>
       <td><%= trackerId %></td>
-      <% if(instanceData.fields.has('tracker_name')) { %>
-        <td><%= trackerData.tracker_name?.tracker_name%></td>
+      <% if(instanceData.fields.has('name')) { %>
+        <td><%= trackerData.name%></td>
       <% } %>
       
       <% if(instanceData.fields.has('pos')) { %>
         <!-- pos -->
-        <td class="bg-pos"><%= trackerData.pos?.pos_x?.toFixed(2) %></td>
-        <td class="bg-pos"><%= trackerData.pos?.pos_y?.toFixed(2) %></td>
-        <td class="bg-pos border-right"><%= trackerData.pos?.pos_z?.toFixed(2) %></td>
+        <td class="bg-pos"><%= trackerData.pos?.x?.toFixed(2) %></td>
+        <td class="bg-pos"><%= trackerData.pos?.y?.toFixed(2) %></td>
+        <td class="bg-pos border-right"><%= trackerData.pos?.z?.toFixed(2) %></td>
       <% } %>
 
       <% if(instanceData.fields.has('speed')) { %>
         <!-- speed -->
-        <td class="bg-speed"><%= trackerData.speed?.speed_x?.toFixed(2) %></td>
-        <td class="bg-speed"><%= trackerData.speed?.speed_y?.toFixed(2) %></td>
-        <td class="bg-speed border-right"><%= trackerData.speed?.speed_z?.toFixed(2) %></td>
+        <td class="bg-speed"><%= trackerData.speed?.x?.toFixed(2) %></td>
+        <td class="bg-speed"><%= trackerData.speed?.y?.toFixed(2) %></td>
+        <td class="bg-speed border-right"><%= trackerData.speed?.z?.toFixed(2) %></td>
       <% } %>
 
       <% if(instanceData.fields.has('ori')) { %>
         <!-- ori -->
-        <td class="bg-ori"><%= trackerData.ori?.ori_x?.toFixed(2) %></td>
-        <td class="bg-ori"><%= trackerData.ori?.ori_y?.toFixed(2) %></td>
-        <td class="bg-ori border-right"><%= trackerData.ori?.ori_z?.toFixed(2) %></td>
+        <td class="bg-ori"><%= trackerData.ori?.x?.toFixed(2) %></td>
+        <td class="bg-ori"><%= trackerData.ori?.y?.toFixed(2) %></td>
+        <td class="bg-ori border-right"><%= trackerData.ori?.z?.toFixed(2) %></td>
       <% } %>
 
-      <% if(instanceData.fields.has('status')) { %>
-        <td class="border-right"><%= trackerData.status?.validity?.toFixed(2) %></td>
+      <% if(instanceData.fields.has('validity')) { %>
+        <td class="border-right"><%= trackerData.validity?.toFixed(2) %></td>
       <% } %>
 
       <% if(instanceData.fields.has('accel')) { %>
         <!-- accel -->
-        <td class="bg-accel"><%= trackerData.accel?.accel_x?.toFixed(2) %></td>
-        <td class="bg-accel"><%= trackerData.accel?.accel_y?.toFixed(2) %></td>
-        <td class="bg-accel border-right"><%= trackerData.accel?.accel_z?.toFixed(2) %></td>
+        <td class="bg-accel"><%= trackerData.accel?.x?.toFixed(2) %></td>
+        <td class="bg-accel"><%= trackerData.accel?.y?.toFixed(2) %></td>
+        <td class="bg-accel border-right"><%= trackerData.accel?.z?.toFixed(2) %></td>
       <% } %>
 
       <% if(instanceData.fields.has('trgtpos')) { %>
         <!-- trgtpos -->
-        <td class="bg-trgtpos"><%= trackerData.trgtpos?.trgtpos_x?.toFixed(2) %></td>
-        <td class="bg-trgtpos"><%= trackerData.trgtpos?.trgtpos_y?.toFixed(2) %></td>
-        <td class="bg-trgtpos border-right"><%= trackerData.trgtpos?.trgtpos_z?.toFixed(2) %></td>
+        <td class="bg-trgtpos"><%= trackerData.trgtpos?.x?.toFixed(2) %></td>
+        <td class="bg-trgtpos"><%= trackerData.trgtpos?.y?.toFixed(2) %></td>
+        <td class="bg-trgtpos border-right"><%= trackerData.trgtpos?.z?.toFixed(2) %></td>
       <% } %>
 
       <% if(instanceData.fields.has('timestamp')) { %>
-        <td><%= trackerData.timestamp?.tracker_timestamp %></td>
+        <td><%= trackerData.timestamp %></td>
       <% } %>
 
     </tr>

plugins/qlab/main.js

@@ -73,7 +73,7 @@ exports.data = function data(_device, oscData) {
       return;
     }
     if (json.status === 'error') {
-      device.send('/workspaces');
+      // device.send('/workspaces');
       return;
     }
   }

src/device.js

@@ -257,13 +257,13 @@ module.exports.deleteActive = function deleteActive() {
 
   if (choice) {
     if (device.plugin.config.connectionType === 'TCPsocket') {
-      device.connection.destroy();
+      device.connection?.destroy();
     } else if (device.plugin.config.connectionType === 'UDPsocket') {
-      device.connection.close();
+      device.connection?.close();
     } else if (device.plugin.config.connectionType === 'multicast') {
-      device.connection.close();
+      device.connection?.close();
     } else if (device.plugin.config.connectionType.startsWith('osc')) {
-      device.connection.close();
+      device.connection?.close();
     }
     VIEW.removeDeviceFromList(device);
     delete devices[device.id];

src/view.js

@@ -100,13 +100,21 @@ module.exports.draw = function draw(device) {
   const d = device;
   const $deviceDrawArea = document.getElementById(`device-${d.id}-draw-area`);
 
-  if ($deviceDrawArea) {
-    const scriptEl = $deviceDrawArea.contentWindow.document.createRange().createContextualFragment(generateBodyHTML(d));
-    $deviceDrawArea.contentWindow.document.body.replaceChildren(scriptEl);
-  } else {
-    drawDeviceFrame(d.id);
+  if (device.drawTimeout !== undefined) {
+    clearTimeout(device.drawTimeout);
   }
-  d.drawn = true;
+
+  d.drawTimeout = setTimeout(() => {
+    if ($deviceDrawArea) {
+      const scriptEl = $deviceDrawArea.contentWindow.document
+        .createRange()
+        .createContextualFragment(generateBodyHTML(d));
+      $deviceDrawArea.contentWindow.document.body.replaceChildren(scriptEl);
+    } else {
+      drawDeviceFrame(d.id);
+    }
+    d.drawn = true;
+  }, 200);
 };
 
 module.exports.update = function update(device, type, data) {