From 7db57e289a9556c662a7d8e568d5bfe77fecca2c Mon Sep 17 00:00:00 2001
From: Raven Scott <raven@ssh.surf>
Date: Thu, 14 Nov 2024 03:44:12 -0500
Subject: [PATCH] Add modal for station key selection, support for reusable
 keys, and improved error handling for broadcasting/receiving audio

---
 app.js     | 37 +++++++++++++++++++++++++++++--------
 index.html | 21 +++++++++++++++++++++
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/app.js b/app.js
index ac410d4..ebbee56 100644
--- a/app.js
+++ b/app.js
@@ -9,18 +9,39 @@ let isBroadcasting = false;
 let conns = [];
 let currentDeviceId = null; // To store the selected audio device ID
 let accumulatedBuffer = b4a.alloc(0); // Buffer for accumulating received audio data
-const topic = crypto.randomBytes(32);
+let stationKey = crypto.randomBytes(32); // Default random key for the station
 
 document.addEventListener("DOMContentLoaded", () => {
   document.getElementById('create-station').addEventListener('click', () => {
-    setupStation();
+    // Show the Create Station modal when clicking "Create Station" button
+    const createStationModal = new bootstrap.Modal(document.getElementById('createStationModal'));
+    createStationModal.show();
   });
-  
+
+  document.getElementById('generate-new-key').addEventListener('click', () => {
+    // Generate a new station key automatically
+    stationKey = crypto.randomBytes(32);
+    document.getElementById('existing-key').value = b4a.toString(stationKey, 'hex'); // Display the new key in the text box
+  });
+
+  document.getElementById('create-station-button').addEventListener('click', () => {
+    // Check if the user provided an existing key or use the generated one
+    const existingKey = document.getElementById('existing-key').value.trim();
+    stationKey = existingKey ? b4a.from(existingKey, 'hex') : stationKey;
+
+    // Set up the station with the chosen key
+    setupStation(stationKey);
+    
+    // Hide the modal after setting up the station
+    const createStationModal = bootstrap.Modal.getInstance(document.getElementById('createStationModal'));
+    createStationModal.hide();
+  });
+
   document.getElementById('leave-stream').addEventListener('click', () => {
     stopBroadcast();
     leaveStation();
   });
-  
+
   document.getElementById('join-station-button').addEventListener('click', joinStation);
   document.getElementById('apply-audio-source').addEventListener('click', applyAudioSource);
 
@@ -117,15 +138,15 @@ function broadcastStopSignal() {
 }
 
 // Function to create a broadcasting station
-async function setupStation() {
+async function setupStation(key) {
   swarm = new Hyperswarm();
-  swarm.join(topic, { client: false, server: true });
+  swarm.join(key, { client: false, server: true });
   
   // Show broadcaster controls
   document.getElementById('broadcaster-controls').classList.remove('d-none');
 
   // Update UI
-  document.getElementById('station-info').textContent = `Station ID: ${b4a.toString(topic, 'hex')}`;
+  document.getElementById('station-info').textContent = `Station ID: ${b4a.toString(key, 'hex')}`;
   document.getElementById('setup').classList.add('d-none');
   document.getElementById('controls').classList.remove('d-none');
 
@@ -139,7 +160,7 @@ async function setupStation() {
       conns.splice(conns.indexOf(conn), 1);
       console.log("Peer disconnected.");
     });
-    conn.on('data', handleData); // Use handleData function to process incoming data
+    conn.on('data', handleData);
 
     // Add error handler to log disconnects and suppress crashes
     conn.on('error', (err) => {
diff --git a/index.html b/index.html
index 0198543..e8c7c1f 100644
--- a/index.html
+++ b/index.html
@@ -67,6 +67,27 @@
     </div>
   </div>
 
+  <!-- Create Station Modal -->
+<div class="modal fade" id="createStationModal" tabindex="-1" aria-labelledby="createStationModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content bg-dark text-light">
+      <div class="modal-header">
+        <h5 class="modal-title" id="createStationModalLabel">Create Station</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <p>Generate a new station ID or use an existing ID?</p>
+        <button id="generate-new-key" class="btn btn-primary mt-2">Generate New Key</button>
+        <input type="text" id="existing-key" class="form-control mt-3" placeholder="You may manually enter an ID here">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-primary" id="create-station-button">Create Station</button>
+      </div>
+    </div>
+  </div>
+</div>
+
   <!-- Bootstrap JavaScript Bundle (includes Popper) -->
   <script src="./assets/bootstrap.bundle.min.js"></script>
   <script type="module" src="app.js"></script>