plugin_server

Sleeping

App Files Files Community

Pepguy commited on Jul 7, 2025

Commit

072db80

verified ·

1 Parent(s): 2fe2d50

Update app.js

Browse files

Files changed (1) hide show

app.js +47 -55

app.js CHANGED Viewed

@@ -1,5 +1,6 @@
-// server.js (Bun) — with CORS enabled for WS and HTTP
 const rooms = new Map(); // roomId ⇒ Set<ServerWebSocket>
 Bun.serve({
   port: Number(Bun.env.PORT) || 7860,
@@ -9,19 +10,22 @@ Bun.serve({
     // Handle CORS preflight
     if (req.method === "OPTIONS") {
-      return new Response(null, {
-        status: 204,
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET, POST, OPTIONS",
-          "Access-Control-Allow-Headers": "Content-Type, Upgrade",
-          "Access-Control-Allow-Credentials": "true",
-        },
-      });
     }
     // Upgrade to WebSocket if requested
     if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
       // Accept the upgrade with CORS headers on the handshake
       const upgradeRes = server.upgrade(req, {
         headers: {
@@ -32,53 +36,53 @@ Bun.serve({
       return upgradeRes ?? new Response("Upgrade failed", { status: 500 });
     }
-    // Serve HTML UI for non-WebSocket requests
     if (url.pathname === "/") {
       return new Response(`<!doctype html>
-<html><head>
-  <title>Dubem Realtime Rooms</title>
-  <meta charset="utf-8"/>
-  <style>
-    body { font-family: sans-serif; padding: 20px; background: #f0f0f0; }
-    #log { border: 1px solid #ccc; height:200px; overflow-y:auto; padding:10px; background:#fff;}
-    input, button { margin:5px 0; padding:8px; font-size:16px; }
-  </style>
-</head><body>
   <h2>Join a Room & Send Messages</h2>
-  <input id="room" placeholder="Room ID"/>
-  <button onclick="joinRoom()">Join Room</button>
   <div id="log"></div>
-  <input id="msg" placeholder="Type a message" style="width:80%;"/>
-  <button onclick="sendMsg()">Send</button>
   <script>
-    var ws, currentRoom;
-    window.addEventListener('load', function() {
-      var scheme = location.protocol === 'https:' ? 'wss' : 'ws';
-      var socketUrl = scheme + '://' + location.host + '/';
-      ws = new WebSocket(socketUrl);
-      ws.onopen = function(){ log('🔌 Connected'); };
-      ws.onmessage = function(ev){
-        var m = JSON.parse(ev.data);
-        log('[' + m.roomId + '] ' + m.message);
-      };
-      ws.onerror = function(){ log('⚠️ WebSocket error'); };
-      ws.onclose = function(c){ log('❌ Disconnected (code='+c.code+')'); };
     });
     function joinRoom(){
-      var id = document.getElementById('room').value.trim();
       if(!id) return alert('Enter room ID');
       ws.send(JSON.stringify({ action:'join', roomId:id }));
-      currentRoom = id; log('➡️ Joined '+id);
     }
     function sendMsg(){
-      var t = document.getElementById('msg').value.trim();
       if(!t) return;
       if(!currentRoom) return alert('Join a room first');
       ws.send(JSON.stringify({ action:'post', roomId:currentRoom, message:t }));
       document.getElementById('msg').value = '';
     }
     function log(txt){
-      var e = document.getElementById('log');
       e.innerHTML += '<div>'+txt+'</div>';
       e.scrollTop = e.scrollHeight;
     }
@@ -101,19 +105,12 @@ Bun.serve({
     message(ws, raw) {
       let msg;
       try { msg = JSON.parse(raw); } catch { return; }
       if (msg.action === "join" && msg.roomId) {
-        // Leave all rooms
         for (const set of rooms.values()) set.delete(ws);
-        // Join target room
         let set = rooms.get(msg.roomId);
-        if (!set) {
-          set = new Set();
-          rooms.set(msg.roomId, set);
-        }
         set.add(ws);
       }
       if (msg.action === "post" && msg.roomId && msg.message) {
         const set = rooms.get(msg.roomId);
         if (!set) return;
@@ -123,19 +120,14 @@ Bun.serve({
           timestamp: Date.now(),
         });
         for (const client of set) {
-          if (client.readyState === 1) { // OPEN
-            client.send(payload);
-          }
         }
       }
     },
     close(ws) {
-      // Clean up on disconnect
       for (const set of rooms.values()) set.delete(ws);
     }
   }
 });
-console.log("✅ Bun realtime server running on port " + (Bun.env.PORT || 7860));

+// server.js (Bun)
 const rooms = new Map(); // roomId ⇒ Set<ServerWebSocket>
+const VALID_TOKEN = "mysecrettoken";  // ← your hard-coded secret
 Bun.serve({
   port: Number(Bun.env.PORT) || 7860,
     // Handle CORS preflight
     if (req.method === "OPTIONS") {
+      return new Response(null, { status: 204, headers: {
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "GET, POST, OPTIONS",
+        "Access-Control-Allow-Headers": "Content-Type, Upgrade",
+        "Access-Control-Allow-Credentials": "true",
+      }});
     }
     // Upgrade to WebSocket if requested
     if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
+      // **AUTH CHECK**: require ?token=VALID_TOKEN
+      const clientToken = url.searchParams.get("token");
+      if (clientToken !== VALID_TOKEN) {
+        return new Response("Unauthorized", { status: 401 });
+      }
       // Accept the upgrade with CORS headers on the handshake
       const upgradeRes = server.upgrade(req, {
         headers: {
       return upgradeRes ?? new Response("Upgrade failed", { status: 500 });
     }
+    // … your existing HTML serve code unchanged …
     if (url.pathname === "/") {
       return new Response(`<!doctype html>
+<html><head><title>Dubem Realtime Rooms</title><meta charset="utf-8"/></head><body>
   <h2>Join a Room & Send Messages</h2>
+  <label><input type="checkbox" id="authToggle"> Send Auth Token?</label><br/>
+  <input id="room" placeholder="Room ID"/><button onclick="joinRoom()">Join Room</button>
   <div id="log"></div>
+  <input id="msg" placeholder="Type a message" style="width:80%;"/><button onclick="sendMsg()">Send</button>
   <script>
+    const VALID_TOKEN = "mysecrettoken"; // must match backend
+    let includeAuth = false;
+    document.getElementById("authToggle").addEventListener("change", e => {
+      includeAuth = e.target.checked;
+      connect(); // reconnect on toggle
     });
+    let ws, currentRoom;
+    function connect() {
+      if (ws) ws.close();
+      const scheme = location.protocol === 'https:' ? 'wss' : 'ws';
+      let socketUrl = scheme + '://' + location.host + '/';
+      if (includeAuth) socketUrl += "?token=" + VALID_TOKEN;
+      ws = new WebSocket(socketUrl);
+      ws.onopen    = () => log('🔌 Connected');
+      ws.onmessage = ev => { const m = JSON.parse(ev.data); log('['+m.roomId+'] '+m.message); };
+      ws.onerror   = () => log('⚠️ WebSocket error');
+      ws.onclose   = c => log('❌ Disconnected (code='+c.code+')');
+    }
+    window.addEventListener('load', connect);
     function joinRoom(){
+      const id = document.getElementById('room').value.trim();
       if(!id) return alert('Enter room ID');
       ws.send(JSON.stringify({ action:'join', roomId:id }));
+      currentRoom = id;
+      log('➡️ Joined '+id);
     }
     function sendMsg(){
+      const t = document.getElementById('msg').value.trim();
       if(!t) return;
       if(!currentRoom) return alert('Join a room first');
       ws.send(JSON.stringify({ action:'post', roomId:currentRoom, message:t }));
       document.getElementById('msg').value = '';
     }
     function log(txt){
+      const e = document.getElementById('log');
       e.innerHTML += '<div>'+txt+'</div>';
       e.scrollTop = e.scrollHeight;
     }
     message(ws, raw) {
       let msg;
       try { msg = JSON.parse(raw); } catch { return; }
       if (msg.action === "join" && msg.roomId) {
         for (const set of rooms.values()) set.delete(ws);
         let set = rooms.get(msg.roomId);
+        if (!set) { set = new Set(); rooms.set(msg.roomId, set); }
         set.add(ws);
       }
       if (msg.action === "post" && msg.roomId && msg.message) {
         const set = rooms.get(msg.roomId);
         if (!set) return;
           timestamp: Date.now(),
         });
         for (const client of set) {
+          if (client.readyState === 1) client.send(payload);
         }
       }
     },
     close(ws) {
       for (const set of rooms.values()) set.delete(ws);
     }
   }
 });
+console.log("✅ Bun realtime server running on port " + (Bun.env.PORT || 7860));