Adapt flagcarrier to accept buttons over http

configschema.json

@@ -633,36 +633,14 @@
           "type": "boolean",
           "default": true
         },
-        "allowedDevices": {
-          "oneOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "array",
-              "items": {
-                "type": "string"
-              },
-              "uniqueItems": true,
-              "minItems": 1
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "group": {
-          "type": "string",
-          "default": "stream1"
-        },
         "availableButtons": {
           "type": "array",
           "items": {
             "type": "object",
             "additionalProperties": false,
             "properties": {
               "id": {
-                "type": "string"
+                "type": "number"
               },
               "name": {
                 "type": "string"
@@ -675,27 +653,22 @@
           },
           "default": [
             {
-              "id": "1",
-              "name": "PC 1"
-            },
-            {
-              "id": "2",
-              "name": "PC 2"
+              "id": 1,
+              "name": "Runner 1"
             },
             {
-              "id": "3",
-              "name": "Console 1"
+              "id": 2,
+              "name": "Runner 2"
             },
             {
-              "id": "4",
-              "name": "Console 2"
+              "id": 3,
+              "name": "Runner 3"
             }
           ]
         }
       },
       "required": [
         "enabled",
-        "group",
         "availableButtons"
       ]
     },

package.json

@@ -255,10 +255,10 @@
       },
       {
         "name": "bigbutton-tag-scan-control",
-        "title": "Big Button Tag Scan Control",
+        "title": "Button tester",
         "width": 3,
         "file": "bigbutton-tag-scan-control.html",
-        "workspace": "ESA",
+        "workspace": "Z9 - Debug",
         "headerColor": "#c49215"
       },
       {

src/dashboard/bigbutton-tag-scan-control/main.vue

@@ -10,75 +10,21 @@
     </span>
   </v-app>
   <v-app v-else>
-    <!-- Big button tag scanning alerts. -->
-    <v-alert
-      v-if="typeof tagScanned !== 'boolean'
-        && ['success_player', 'success_comm'].includes(tagScanned)"
-      type="success"
-    >
-      <template v-if="tagScanned === 'success_player'">
-        {{ scannedData.user.displayName }} scanned in as player on button
-        {{ scannedData.flagcarrier.id }}
-      </template>
-      <template v-else-if="tagScanned === 'success_comm'">
-        {{ scannedData.user.displayName }} scanned in as commentator on button
-        {{ scannedData.flagcarrier.id }}
-      </template>
-    </v-alert>
-    <v-alert v-else-if="tagScanned === 'fail_player'" type="error">
-      {{ scannedData.user.displayName }} scanned in on button
-      {{ scannedData.flagcarrier.id }} but already used by another team!
-    </v-alert>
-    <v-alert v-else-if="tagScanned">
-      {{ scannedData.user.displayName }} scanned in on button
-      {{ scannedData.flagcarrier.id }} but no action is needed.
-    </v-alert>
-    <v-alert v-else class="font-italic">
-      Scan notifications will appear here.
-    </v-alert>
     <div v-if="!activeRun || !activeRunInArr">
       There is currently no active run available.
     </div>
     <div v-else>
-      <div v-if="!activeRun.teams.length">
-        <div>
-          <span class="font-weight-bold">Players left to scan:</span>
-          <span v-if="!leftToScan.length">All scanned</span>
-          <span v-else>{{ leftToScan.map((p) => p.name).join(', ') }}</span>
-        </div>
-        <div>
-          <span class="font-weight-bold">Players currently scanned:</span>
-          <span v-if="!allScannedPlayers.length">None</span>
-          <span v-else>{{ allScannedPlayers.map((p) => p.user.displayName).join(', ') }}</span>
-        </div>
-      </div>
-      <div v-else>
-        All players scanned!
-      </div>
-      <div class="mt-2">
-        <span class="text-h6">Button to Player Mappings</span>
-        <template v-if="mapArr.length">
-          <div v-for="[key, value] in mapArr" :key="key">
-            <template v-if="value.length">
-              <span class="font-weight-bold">Button {{ key }}:</span>
-              <span>{{ value.map((p) => p.user.displayName).join(', ') }}</span>
-            </template>
-          </div>
-        </template>
-        <div v-else>No button to player mapping to show.</div>
-      </div>
-      <v-btn class="mt-2" @click="reset" block :disabled="disableChanges">
-        Reset all player tag scanning
-      </v-btn>
       <div
-        v-show="leftToScan.length"
         v-for="btn of config.flagcarrier.availableButtons"
         :key="btn.id"
         class="mt-2"
       >
-        Manually Assign to {{ btn.id }} ({{ btn.name }})<br>
-        <v-btn v-for="p of leftToScan" :key="p.id" @click="manualAssign(btn.id, p)">
-          {{ p.name }}
+        Test button {{ btn.id }} ({{ btn.name }})<br>
+        <v-btn @click="testShortPress(btn.id)">
+          Normal press
+        </v-btn>
+        <v-btn @click="testLongPress(btn.id)">
+          Long press
         </v-btn>
       </div>
     </div>
@@ -87,73 +33,45 @@
 
 <script lang="ts">
 import { replicantNS } from '@esa-layouts/browser_shared/replicant_store';
-import { BigbuttonPlayerMap } from '@esa-layouts/types/schemas';
-import { FlagCarrier } from '@esamarathon/mq-events/types';
-import { differenceWith } from 'lodash';
-import { RunData, RunDataActiveRun, RunDataArray, RunDataPlayer, Timer } from 'speedcontrol-util/types';
+import { RunData, RunDataActiveRun, RunDataArray } from 'speedcontrol-util/types';
 import { Component, Vue } from 'vue-property-decorator';
 
 @Component
 export default class extends Vue {
-  @replicantNS.State((s) => s.reps.timer) readonly timer!: Timer;
   @replicantNS.State((s) => s.reps.runDataArray) readonly runArray!: RunDataArray;
   @replicantNS.State((s) => s.reps.runDataActiveRun) readonly activeRun!: RunDataActiveRun;
-  @replicantNS.State((s) => s.reps.bigbuttonPlayerMap) readonly bbpMap!: BigbuttonPlayerMap;
   config = nodecg.bundleConfig;
-  tagScanned: 'success_comm' | 'success_player' | 'fail_player' | boolean = false;
-  scannedData: FlagCarrier.TagScanned | null = null;
-  tagScanTimeout!: number;
-
-  get mapArr(): [string, BigbuttonPlayerMap[0]][] {
-    return Object.entries(this.bbpMap);
-  }
 
   get activeRunInArr(): RunData | undefined {
     return this.runArray.find((r) => r.id === this.activeRun?.id);
   }
 
-  get allPlayersRun(): RunDataPlayer[] {
-    return this.activeRunInArr?.teams
-      .reduce<RunDataPlayer[]>((prev, team) => prev.concat(...team.players), []) || [];
-  }
-
-  get allScannedPlayers(): BigbuttonPlayerMap[0] {
-    const arr = Object.values(this.bbpMap)
-      .reduce<BigbuttonPlayerMap[0]>((prev, button) => prev.concat(...button), []);
-    return arr;
-  }
-
-  get leftToScan(): RunDataPlayer[] {
-    return differenceWith(this.allPlayersRun, this.allScannedPlayers, (x, y) => x.name
-      .toLowerCase() === y.user.displayName.toLowerCase());
-  }
-
-  get disableChanges(): boolean {
-    return this.timer.state !== 'stopped';
-  }
-
-  manualAssign(btn: string, player: RunDataPlayer): void {
-    nodecg.sendMessage('bigButtonManualAssign', { btn, player });
-  }
-
-  reset(): void {
-    nodecg.sendMessage('bigbuttonResetPlayers');
+  async testShortPress(buttonId: number): Promise<void> {
+    await fetch(
+      `/${nodecg.bundleName}/button/${buttonId}`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          action: 'toggle-timer',
+        }),
+      },
+    );
   }
 
-  created(): void {
-    nodecg.listenFor(
-      'bigbuttonTagScanned',
-      ({ state, data }: {
-        state?: 'success_comm' | 'success_player' | 'fail_player',
-        data: FlagCarrier.TagScanned,
-      }) => {
-        window.clearTimeout(this.tagScanTimeout);
-        this.tagScanned = state || true;
-        this.scannedData = data;
-        this.tagScanTimeout = window.setTimeout(() => {
-          this.tagScanned = false;
-          this.scannedData = null;
-        }, 7000);
+  async testLongPress(buttonId: number): Promise<void> {
+    await fetch(
+      `/${nodecg.bundleName}/button/${buttonId}`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          action: 'reset-timer',
+        }),
       },
     );
   }