Post event bug fixes (#18)

* First batch of post event fixes

* Improve game info box

* Better url parsing for tracker

* Fix 1v1 bidwars not updating when pinned

* Fix multi bidwars not updating when pinned

* Cleanup

* Apply mask to fade out war

* Move over last el a bit

* Add arrow mask

* Development for dummies

* Fix default theme

* Store css vars in a prop

Author: duncte123

README.md

@@ -70,6 +70,8 @@ Alternatively, you can use [DeaDBeeF](https://deadbeef.sourceforge.io/) with the
 * https://calculateaspectratio.com/ for helping me (duncte) wiht some math
 
 ## Development
+***Install nodecg first before doing anything else***
+
 To get this bundle set-up for development run the following commands.
 ***Make sure to install speedcontrol!***
 > ```

configschema.json

@@ -47,7 +47,8 @@
       "properties": {
         "theme": {
           "$comment": "Theme to be used in the graphical overlays; will use default if none supplied.",
-          "type": "string"
+          "type": "string",
+          "default": "bsg"
         },
         "shorts": {
           "$comment": "This/these must match the tracker, if that feature is enabled.",
@@ -99,7 +100,8 @@
       "required": [
         "shorts",
         "thisEvent",
-        "online"
+        "online",
+        "theme"
       ]
     },
     "omnibar": {

layout_assets/arrow mask.png

@@ -50,7 +50,8 @@ function getPrize(): Prizes[0] | undefined {
 
 // Gets a random (but weighted) active milestone.
 let lastBidId = -1;
-function getBid(): Bids[0] | undefined {
+
+function getClonedBid(): Bids[0] | undefined {
   // Just return nothing if there are no bids to show.
   if (!bids.value.length) return undefined;
   let filtered = clone(bids.value).filter((b) => b.id !== lastBidId);
@@ -90,13 +91,16 @@ let loopsWithoutResult = 0;
 async function showNext(): Promise<void> {
   // If there is a pin to start showing.
   const { pin } = omnibar.value;
+
   if (pin) {
     let item: DonationTotalMilestones[0] | Bids[0] | undefined;
+
     if (pin.type === 'Milestone') {
       item = donationTotalMilestones.value.find((m) => m.id === pin.id);
     } else if (pin.type === 'Bid') {
       item = bids.value.find((b) => b.id === pin.id);
     }
+
     if (item) {
       item = clone(item);
       nodecg().log.debug('[Omnibar] Pin available, will show:', pin.type);
@@ -115,6 +119,7 @@ async function showNext(): Promise<void> {
         id: uuid(),
         props: {
           seconds: -1,
+          bidId: pin.type === 'Bid' ? item.id : undefined,
           bid: pin.type === 'Bid' ? item : undefined,
           milestone: pin.type === 'Milestone' ? item : undefined,
           dash: dashConfig,
@@ -201,12 +206,13 @@ async function showNext(): Promise<void> {
         },
       };
     } else if (next.type === 'Bid') {
-      const bid = getBid();
+      const bid = getClonedBid();
       if (!bid) { showNext(); return; }
       omnibar.value.current = { ...next,
         props: {
           ...next.props,
           bid,
+          bidId: bid.id,
           dash: {
             text: bid.war ? 'Upcoming Bid War' : 'Upcoming Goal',
             fontSize: 34,

src/extension/omnibar.ts

@@ -3,9 +3,7 @@ import needle from 'needle';
 import { eventInfo, getCookies } from '.';
 import { get as nodecg } from '../util/nodecg';
 import { bids } from '../util/replicants';
-import utils from './utils';
-
-const { trackerUrl } = utils;
+import { trackerUrl } from './utils';
 
 const eventConfig = nodecg().bundleConfig.event;
 const { useTestData } = nodecg().bundleConfig;
@@ -61,12 +59,23 @@ function processRawBids(rawBids: Tracker.Bid[]): Tracker.FormattedBid[] {
     // Sort bid war options from largest to smallest.
     if (bid.options && bid.options.length) {
       bid.options = bid.options.sort((a, b) => {
-        if (a.total > b.total) {
-          return -1;
-        }
-        if (a.total < b.total) {
+        // TODO: revert if we want this
+        // if (a.total > b.total) {
+        //   return -1;
+        // }
+        // if (a.total < b.total) {
+        //   return 1;
+        // }
+        // return 0;
+
+        if (a.id > b.id) {
           return 1;
         }
+
+        if (a.id < b.id) {
+          return -1;
+        }
+
         return 0;
       });
     }
@@ -103,22 +112,29 @@ async function updateBids(): Promise<void> {
         cookies: getCookies(),
       },
     );
+
     if (!resp.statusCode || resp.statusCode >= 300 || resp.statusCode < 200) {
       throw new Error(`status code ${resp.statusCode ?? 'unknown'}`);
     }
+
     if (!Array.isArray(resp.body)) {
       throw new Error('received non-array type');
     }
+
     const currentBids = processRawBids(resp.body);
+
     if (!Array.isArray(currentBids)) {
       throw new Error('currentBids result was non-array type');
     }
+
+    nodecg().log.debug('[Tracker] Updated bids:', JSON.stringify(currentBids));
     bids.value = currentBids;
   } catch (err) {
     nodecg().log.warn('[Tracker] Error updating bids');
     nodecg().log.debug('[Tracker] Error updating bids:', err);
     bids.value.length = 0; // Clear the array so we do not display incorrect information.
   }
+
   setTimeout(updateBids, refreshTime);
 }
 

src/extension/tracker/bids.ts

@@ -3,9 +3,7 @@ import needle from 'needle';
 import { get as nodecg } from '../util/nodecg';
 import { donationsToRead } from '../util/replicants';
 import { eventInfo, getCookies } from './index';
-import utils from './utils';
-
-const { trackerUrl } = utils;
+import { trackerUrl } from './utils';
 
 const eventConfig = nodecg().bundleConfig.event;
 const { useTestData } = nodecg().bundleConfig;

src/extension/tracker/donations.ts

@@ -8,9 +8,7 @@ import type { DeepWritable } from 'ts-essentials';
 import { get as nodecg } from '../util/nodecg';
 import { mq } from '../util/rabbitmq';
 import { donationTotal } from '../util/replicants';
-import utils from './utils';
-
-const { trackerUrl } = utils;
+import { trackerUrl, trackerAdminUrl } from './utils';
 
 export const eventInfo: Tracker.EventInfo[] = [];
 const eventConfig = nodecg().bundleConfig.event;
@@ -200,7 +198,7 @@ async function loginToTracker(): Promise<void> {
   if (isFirstLogin) nodecg().log.info('[Tracker] Logging in');
   else nodecg().log.info('[Tracker] Refreshing session');
 
-  const loginURL = `https://${config.address}/admin/login/`;
+  const loginURL = trackerAdminUrl('/login/');
   try {
     // Access login page to get CSRF token.
     const resp1 = await needle('get', loginURL);
@@ -225,8 +223,15 @@ async function loginToTracker(): Promise<void> {
       },
     );
 
+    nodecg().log.debug('[Tracker] Login response:', {
+      status: resp2.statusCode,
+      body: resp2.body,
+      headers: resp2.headers,
+      cookies: resp2.cookies,
+    });
+
     // If we're not being redirected or there's no session token, the login failed.
-    if (resp2.statusCode !== 302 || (resp2.cookies && !resp2.cookies.tracker_session)) {
+    if (resp2.statusCode !== 302 || (resp2.cookies && !resp2.cookies.sessionid)) {
       throw new Error('Log in was unsuccessful, is your username/password correct?');
     }
 
@@ -294,7 +299,13 @@ async function setup(): Promise<void> {
     // Update the donation total to a random number while testing
     if (useTestData) {
       setInterval(() => {
-        donationTotal.value += Math.random() * 1000;
+        let newDonoAmount = donationTotal.value + (Math.random() * 1000);
+
+        if (newDonoAmount > 70_000) {
+          newDonoAmount = 0;
+        }
+
+        donationTotal.value = newDonoAmount;
         nodecg().sendMessage('donationTotalUpdated', { total: donationTotal.value });
       }, 10 * 1000);
     }

src/extension/tracker/index.ts

@@ -3,9 +3,7 @@ import needle from 'needle';
 import { eventInfo, getCookies } from '.';
 import { get as nodecg } from '../util/nodecg';
 import { prizes } from '../util/replicants';
-import utils from './utils';
-
-const { trackerUrl } = utils;
+import { trackerUrl } from './utils';
 
 const { useTestData } = nodecg().bundleConfig;
 const refreshTime = 60 * 1000; // Get prizes every 60s.

src/extension/tracker/prizes.ts

@@ -2,10 +2,21 @@ import { get as nodecg } from '@esa-layouts/util/nodecg';
 
 const config = nodecg().bundleConfig.tracker;
 
-function trackerUrl(path: string): string {
-  return `https://${config.address}/tracker${path}`;
+function getTrackerBaseUrl(): string {
+  const addr = config.address;
+  const proto = addr.startsWith('http') ? '' : 'https://';
+
+  return `${proto}${addr}`;
+}
+
+export function trackerUrl(path: string): string {
+  const addr = getTrackerBaseUrl();
+
+  return `${addr}/tracker${path}`;
 }
 
-export default {
-  trackerUrl,
-};
+export function trackerAdminUrl(path: string): string {
+  const addr = getTrackerBaseUrl();
+
+  return `${addr}/admin${path}`;
+}

src/extension/tracker/utils.ts

@@ -33,7 +33,7 @@
         height: '176px',
       }"
     >
-      <run-info text-align="left" line-right/>
+      <run-info text-align="left" line-right info-is-row/>
     </div>
 
     <!-- Timer -->

src/graphics/game-layout/16x9-1p-largecam.vue

@@ -63,7 +63,7 @@
         height: '176px',
       }"
     >
-      <run-info text-align="left" />
+      <run-info text-align="left" info-is-row />
     </div>
 
     <!-- Media Box / Reader / Comms -->

src/graphics/game-layout/16x9-1p.vue

@@ -91,7 +91,7 @@ export default class extends Vue {
 
   @Watch('x32GameAudio')
   onX32GameAudioChange(newVal: ChanData[]): void {
-    if (this.gameLayouts?.selected?.endsWith('1p')) {
+    if (this.gameLayouts?.selected?.includes('-1p')) {
       this.showSpeakerIcon = false;
       return;
     }