getpicked 1.0.0 → 1.1.0

package/index.js

@@ -2,12 +2,38 @@
 
 import blessed from "blessed";
 import WebSocket from "ws";
+import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+import { randomUUID } from "node:crypto";
 
 const isLocal = process.argv.includes("--local");
 const SERVER_URL = process.env.PORTO_SERVER ||
   (isLocal ? "ws://localhost:8111/ws" : "wss://shapely-insect.spcf.app/ws");
 
-// ─── Colors ──────────────────────────────────────────────────────
+// ─── Device Identity ─────────────────────────────────────────
+const IDENTITY_DIR = join(homedir(), ".getpicked");
+const IDENTITY_FILE = join(IDENTITY_DIR, "identity.json");
+
+function loadIdentity() {
+  try {
+    return JSON.parse(readFileSync(IDENTITY_FILE, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+
+function saveIdentity(identity) {
+  try {
+    mkdirSync(IDENTITY_DIR, { recursive: true });
+    writeFileSync(IDENTITY_FILE, JSON.stringify(identity, null, 2));
+  } catch {}
+}
+
+let identity = loadIdentity() || { device_id: randomUUID(), secret: null };
+saveIdentity(identity);
+
+// ─── Colors ──────────────────────────────────────────────────
 const C = {
   bg: "#0a0a0f",
   panel: "#111118",
@@ -25,10 +51,10 @@ const C = {
   dark: "#181820",
 };
 
-// ─── Screen ──────────────────────────────────────────────────────
+// ─── Screen ──────────────────────────────────────────────────
 const screen = blessed.screen({
   smartCSR: true,
-  title: "Porto",
+  title: "getpicked",
   fullUnicode: true,
 });
 
@@ -53,14 +79,20 @@ function clearSceneKeys() {
 
 function clearScreen() {
   clearSceneKeys();
-  // Detach all children
   while (screen.children.length) {
     screen.children[0].detach();
   }
 }
 
-// Global exit
-screen.key(["C-c"], () => process.exit(0));
+// Track active WebSocket for clean shutdown
+let activeWs = null;
+
+screen.key(["C-c"], () => {
+  if (activeWs) {
+    try { activeWs.close(); } catch {}
+  }
+  process.exit(0);
+});
 
 // ═══════════════════════════════════════════════════════════════════
 //  MAIN MENU
@@ -314,7 +346,6 @@ function showUsernameInput(thenJoin = false) {
     else showMainMenu();
   }
 
-  // Single keypress handler for all input — avoids conflicts with screen.key()
   function onKeypress(ch, key) {
     if (!key) return;
 
@@ -441,11 +472,14 @@ function showLobby() {
   let myId = null;
   let pingInterval = null;
   let renderInterval = null;
+  let connectTimeout = null;
   let dead = false;
 
   function leave() {
     clearInterval(pingInterval);
     clearInterval(renderInterval);
+    clearTimeout(connectTimeout);
+    activeWs = null;
     if (ws) {
       try { ws.close(); } catch {}
     }
@@ -458,10 +492,24 @@ function showLobby() {
   headerBox.setContent(`{center}{${C.yellow}-fg}⟳ Connecting...{/}{/center}`);
   screen.render();
 
-  const wsUrl = `${SERVER_URL}?username=${encodeURIComponent(username)}`;
-  ws = new WebSocket(wsUrl);
+  const params = new URLSearchParams({
+    username,
+    device_id: identity.device_id,
+  });
+  if (identity.secret) params.set("secret", identity.secret);
+
+  ws = new WebSocket(`${SERVER_URL}?${params}`, { handshakeTimeout: 10000 });
+  activeWs = ws;
+
+  // Manual connection timeout fallback
+  connectTimeout = setTimeout(() => {
+    if (ws.readyState !== WebSocket.OPEN) {
+      ws.terminate();
+    }
+  }, 12000);
 
   ws.on("open", () => {
+    clearTimeout(connectTimeout);
     pingInterval = setInterval(() => {
       if (ws.readyState === WebSocket.OPEN) {
         ws.send(JSON.stringify({ type: "ping" }));
@@ -470,7 +518,21 @@ function showLobby() {
   });
 
   ws.on("message", (raw) => {
-    const msg = JSON.parse(raw.toString());
+    let msg;
+    try {
+      msg = JSON.parse(raw.toString());
+    } catch {
+      return;
+    }
+
+    if (msg.type === "welcome") {
+      // Persist server-issued auth credentials
+      identity.device_id = msg.device_id;
+      identity.secret = msg.secret;
+      saveIdentity(identity);
+      return;
+    }
+
     if (msg.type === "lobby_state") {
       if (msg.your_id) myId = msg.your_id;
       lobbyState = msg;
@@ -481,6 +543,9 @@ function showLobby() {
 
   ws.on("close", () => {
     clearInterval(pingInterval);
+    clearInterval(renderInterval);
+    clearTimeout(connectTimeout);
+    activeWs = null;
     dead = true;
     headerBox.setContent(`{center}{${C.red}-fg}● Disconnected{/}{/center}`);
     footerBox.setContent(`{center}{${C.dim}-fg}Press Q or Esc to return{/}{/center}`);
@@ -489,6 +554,9 @@ function showLobby() {
 
   ws.on("error", () => {
     clearInterval(pingInterval);
+    clearInterval(renderInterval);
+    clearTimeout(connectTimeout);
+    activeWs = null;
     dead = true;
     headerBox.setContent(`{center}{${C.red}-fg}● Connection failed — is the server running?{/}{/center}`);
     footerBox.setContent(`{center}{${C.dim}-fg}Press Q or Esc to return{/}{/center}`);
@@ -501,7 +569,6 @@ function showLobby() {
   }, 200);
 
   // 256-color index 231 = true #ffffff white, NOT remappable by terminal themes
-  // (palette indices 0-15 like SGR 97 are theme-dependent and render as grey)
   const W = "\x1b[38;5;231m";
   const B = "\x1b[1m";
   const R = "\x1b[0m";
@@ -513,7 +580,7 @@ function showLobby() {
 
     const elapsed = (Date.now() - stateReceivedAt) / 1000;
 
-    // ── Header ── uses {|} for left/right split
+    // ── Header ──
     if (state === "waiting") {
       const t = Math.max(0, Math.ceil(time_remaining - elapsed));
       const lid = lobbyState.lobby_id;
@@ -521,7 +588,7 @@ function showLobby() {
         `{${C.green}-fg}● LOBBY{/} {${C.dim}-fg}#${lid}{/}{|}${W}${player_count}${R}{${C.dim}-fg}/${max_players}{/}  {${C.yellow}-fg}⏱ ${t}s{/}`
       );
       const barW = screen.width;
-      const filled = Math.round((player_count / max_players) * barW);
+      const filled = max_players > 0 ? Math.round((player_count / max_players) * barW) : 0;
       progressBox.setContent(
         `{${C.green}-fg}${"▀".repeat(Math.min(filled, barW))}{/}` +
         `{${C.dark}-fg}${"▀".repeat(Math.max(0, barW - filled))}{/}`
@@ -547,7 +614,7 @@ function showLobby() {
       progressBox.setContent(`{${C.green}-fg}${"▀".repeat(screen.width)}{/}`);
     }
 
-    // ── Grid ── uses raw ANSI for white names
+    // ── Grid ──
     const colW = 26;
     const availW = gridBox.width - 4;
     const cols = Math.max(1, Math.floor(availW / colW));
@@ -567,7 +634,6 @@ function showLobby() {
           nameAnsi = `{${C.dim}-fg}`;
         }
       } else if (state === "countdown") {
-        // All dots dark during countdown — suspense, no winner known
         dot = `{${C.dark}-fg}●{/}`;
         nameAnsi = `{${C.dark}-fg}`;
       } else if (state === "reveal") {
@@ -593,7 +659,6 @@ function showLobby() {
         : player.username;
 
       const pad = " ".repeat(Math.max(1, 22 - name.length));
-      // Use {/} reset for tag-based styles, \x1b[0m for ANSI-based
       const resetStr = nameAnsi.startsWith("\x1b") ? R : "{/}";
       row += ` ${dot} ${nameAnsi}${name}${resetStr}${pad}`;
       c++;
@@ -612,7 +677,7 @@ function showLobby() {
 
     gridBox.setContent(lines.join("\n\n"));
 
-    // ── Footer ── uses {|} for left/right split
+    // ── Footer ──
     if (state === "waiting") {
       footerBox.setContent(
         `{${C.text}-fg}You: ${W}${B}${username}${R}{|}{${C.dim}-fg}Q{/} {${C.text}-fg}leave lobby{/}`
@@ -651,5 +716,5 @@ function showLobby() {
   }
 }
 
-// ─── Go ──────────────────────────────────────────────────────────
+// ─── Go ──────────────────────────────────────────────────────
 showMainMenu();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getpicked",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Join a lobby, enter the raffle, win the draw",
   "bin": {
     "getpicked": "./index.js"
@@ -9,9 +9,11 @@
   "keywords": ["raffle", "game", "multiplayer", "terminal", "cli"],
   "license": "MIT",
   "files": ["index.js"],
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "dependencies": {
     "blessed": "^0.1.81",
-    "blessed-contrib": "^4.11.0",
     "ws": "^8.16.0"
   }
 }