@ing.jorgeu/wargaming-overlay 2.2.1 → 2.4.0

package/public/toast.js

@@ -0,0 +1,21 @@
+(() => {
+  const toast = document.querySelector('#stream-toast');
+  let timer, token;
+  function hide() { toast.classList.remove('is-visible'); toast.setAttribute('aria-hidden','true'); }
+  const events = new EventSource('/toasts/events');
+  events.addEventListener('toast', event => {
+    const message = JSON.parse(event.data);
+    clearTimeout(timer);
+    if (!message || message.remainingMs <= 0) { token=null; hide(); return; }
+    // Reconnection reuses the remaining lifetime rather than replaying 15 seconds.
+    if (message.token !== token) {
+      document.querySelector('#toast-heading').textContent = message.title;
+      document.querySelector('#toast-text').textContent = message.text;
+      document.querySelector('#toast-footer').textContent = message.footer || '';
+      token = message.token;
+    }
+    toast.classList.add('is-visible'); toast.setAttribute('aria-hidden','false');
+    timer = setTimeout(hide, Math.min(message.remainingMs,15000));
+  });
+  window.addEventListener('pagehide',()=>{clearTimeout(timer);events.close();});
+})();

package/reader.py

@@ -5,32 +5,23 @@ from battle_reader import parse, capture
 ADB = os.environ.get('OVERLAY_ADB', 'adb')
 SERIAL = os.environ.get('OVERLAY_SERIAL', '')
 
-def select_device(output):
-    devices = [line.split()[:2] for line in output.splitlines() if line.strip() and not line.startswith(('List of', '*'))]
-    if not devices:
-        raise ValueError('ADB no detecta un teléfono. Conecta un cable de datos, desbloquea Android y activa Opciones de desarrollador → Depuración USB. No se puede distinguir cable desconectado de depuración desactivada.')
-    if not SERIAL and len(devices) > 1:
-        raise ValueError('Hay varios dispositivos. Reinicia con --serial SERIAL: ' + ', '.join(d[0] for d in devices))
-    device = next((d for d in devices if d[0] == SERIAL), None) if SERIAL else devices[0]
-    if not device: raise ValueError('El dispositivo seleccionado no está conectado: ' + SERIAL)
-    serial, status = device
-    if status == 'unauthorized': raise ValueError('Teléfono sin autorizar. Desbloquéalo y acepta «Permitir depuración USB» para este equipo. Si no aparece, reconecta el cable.')
-    if status == 'no': raise ValueError('Sin permisos USB. Revisa reglas udev y grupos del usuario; en Ubuntu, android-sdk-platform-tools-common y plugdev. Vuelve a iniciar sesión después de cambiar grupos.')
-    if status == 'offline': raise ValueError('Teléfono offline. Desbloquéalo y reconecta el cable USB.')
-    if status != 'device': raise ValueError('Dispositivo no disponible: ' + status)
-    return serial
+from device_connection import DeviceConnection
+from pathlib import Path
 
 if __name__ == '__main__':
+    data_dir = os.environ.get('OVERLAY_DATA_DIR')
+    connection = DeviceConnection(SERIAL, Path(data_dir) / 'phone-connection.json' if data_dir else None)
     while True:
+        device = None
         try:
-            result = subprocess.run([ADB, 'devices', '-l'], capture_output=True, text=True, encoding='utf-8', errors='replace', check=True, timeout=10)
-            serial = select_device(result.stdout)
+            device = connection.select()
+            serial = device['serial']
             state = parse(capture(serial))
-            print(json.dumps(dict(state, connected=True, updatedAt=time.time(), error=None)), flush=True)
+            print(json.dumps(dict(state, connected=True, phoneConnected=True, transport=device["transport"], deviceSerial=serial, updatedAt=time.time(), error=None)), flush=True)
         except Exception as e:
             message = str(e)
             if isinstance(e, subprocess.TimeoutExpired): message = 'El teléfono no respondió a tiempo. Desbloquéalo y abre la ronda; volveré a intentar la lectura.'
             elif isinstance(e, subprocess.CalledProcessError): message = 'No se pudo leer Android. Abre la ronda y cierra otros lectores UIAutomator. Se reintentará. ' + (e.stderr or '').strip()[:300]
             elif isinstance(e, FileNotFoundError): message = 'ADB no está disponible. Ejecuta wargaming-overlay setup --install-adb.'
-            print(json.dumps({'connected':False, 'error':message}), flush=True)
+            print(json.dumps({'connected':False, 'phoneConnected':device is not None and isinstance(e, ValueError), 'transport':device['transport'] if device is not None else None, 'error':message}), flush=True)
         time.sleep(float(os.environ.get('OVERLAY_INTERVAL', '3')))

package/scripts/fact-coverage.js

@@ -0,0 +1,9 @@
+// Reports actual lore coverage; statistics are deliberately excluded.
+const {names,canonicalFaction}=require('../factions');
+const facts=require('../data/faction-facts.json').facts;
+const target=120;
+const rows=names.map(faction=>({faction,facts:new Set(facts.filter(f=>canonicalFaction(f.faction)===faction).map(f=>f.id)).size}));
+const deficient=rows.filter(r=>r.facts<target);
+console.table(rows.map(r=>({...r,minutes:r.facts*2,missingForMirror:Math.max(0,target-r.facts)})));
+console.log(`Goal: ${target} distinct facts per faction, including mirror games; ${rows.length-deficient.length}/${rows.length} factions ready.`);
+if(process.argv.includes('--require-four-hours')&&deficient.length)process.exitCode=1;

package/server.js

@@ -25,10 +25,12 @@ reader.on('exit', () => { game = mergeGame(game, {connected:false, error:'Lector
 }
 for (const signal of ['SIGINT', 'SIGTERM']) process.on(signal, () => { reader?.kill(); process.exit(); });
 process.on('exit', () => reader?.kill());
+const {syncStats} = require('./listhammer');
 const root = path.join(__dirname, 'public');
 const statePath = path.join(dataDir, 'overlay-state.json');
 const defaultState = {
   title: '',
+  roundHalf: '',
   left: { name: 'PLAYER ONE', faction: 'Space Marines', color: '#245eb8' },
   right: { name: 'PLAYER TWO', faction: 'Chaos Space Marines', color: '#7d1520' }
 };
@@ -40,10 +42,53 @@ function broadcast() { const msg = `data: ${JSON.stringify(state)}\n\n`; listene
 function send(res, code, type, body) { res.writeHead(code, { 'Content-Type': type }); res.end(body); }
 function saveState() { const temporaryPath = `${statePath}.tmp`; fs.writeFileSync(temporaryPath, JSON.stringify(state, null, 2)); fs.renameSync(temporaryPath, statePath); }
 
-const server = http.createServer((req, res) => {
+const {Announcements} = require('./announcements');
+const toastSessionPath = path.join(dataDir, 'toast-session.json');
+let toastSaved = {}, statsCache = null;
+try { toastSaved = JSON.parse(fs.readFileSync(toastSessionPath, 'utf8')); } catch {}
+try { statsCache = JSON.parse(fs.readFileSync(path.join(dataDir, 'listhammer-stats.json'), 'utf8')); } catch {}
+const toastListeners = new Map();
+const announcements = new Announcements({
+  layout: () => state, stats: () => statsCache, saved: toastSaved,
+  save: data => { const temp = toastSessionPath + '.tmp'; fs.writeFileSync(temp, JSON.stringify(data, null, 2)); fs.renameSync(temp, toastSessionPath); },
+  emit: (event, data) => toastListeners.forEach((_, res) => res.write(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`))
+});
+const toastTimer = setInterval(() => { try { announcements.tick([...toastListeners.values()].includes('overlay')); } catch(e) { console.error('Mensajes: '+e.message); } }, 1000);
+toastTimer.unref();
+async function readToastBody(req) {
+  const chunks = []; let size = 0;
+  for await (const chunk of req) {
+    size += chunk.length;
+    if (size > 8192) throw new Error('El mensaje es demasiado largo.');
+    chunks.push(chunk);
+  }
+  return JSON.parse(Buffer.concat(chunks).toString('utf8') || '{}');
+}
+
+const server = http.createServer(async (req, res) => {
   res.setHeader('Cache-Control','no-store');
   const url = new URL(req.url, 'http://localhost');
-  if (url.pathname === '/game/reset' && req.method === 'POST') { game = emptyGame(); persistGame(); return send(res, 200, 'application/json', JSON.stringify({ok:true})); }
+  if (url.pathname === '/toasts/events' && req.method === 'GET') {
+    res.writeHead(200, {'Content-Type':'text/event-stream', 'Cache-Control':'no-cache', Connection:'keep-alive'});
+    toastListeners.set(res, url.searchParams.get('client') === 'control' ? 'control' : 'overlay');
+    res.write(`event: toast\ndata: ${JSON.stringify(announcements.current())}\n\n`);
+    res.write(`event: status\ndata: ${JSON.stringify(announcements.status())}\n\n`);
+    req.on('close', () => toastListeners.delete(res)); return;
+  }
+  if (url.pathname === '/toasts/state' && req.method === 'GET') return send(res, 200, 'application/json', JSON.stringify(announcements.status()));
+  if (['/toasts/message','/toasts/next','/toasts/config','/toasts/reset'].includes(url.pathname)) {
+    if (req.method !== 'POST') return send(res, 405, 'application/json', JSON.stringify({error:'Usa POST.'}));
+    try {
+      const input = await readToastBody(req);
+      let toast;
+      if (url.pathname === '/toasts/message') toast = announcements.manual(input.text);
+      if (url.pathname === '/toasts/next') toast = announcements.next();
+      if (url.pathname === '/toasts/config') announcements.configure(input);
+      if (url.pathname === '/toasts/reset') announcements.reset();
+      return send(res, 200, 'application/json', JSON.stringify({ok:true,toast,status:announcements.status()}));
+    } catch(e) { return send(res, 400, 'application/json', JSON.stringify({error:e.message})); }
+  }
+  if (url.pathname === '/game/reset' && req.method === 'POST') { game = emptyGame(); persistGame(); state = {...state, roundHalf:''}; saveState(); broadcast(); return send(res, 200, 'application/json', JSON.stringify({ok:true})); }
   if (url.pathname === '/game-state.json') { res.setHeader('Cache-Control', 'no-store'); return send(res, 200, 'application/json', JSON.stringify(game)); }
   if (url.pathname === '/events') {
     res.writeHead(200, { 'Content-Type': 'text/event-stream', 'Cache-Control': 'no-cache', Connection: 'keep-alive' });
@@ -53,7 +98,7 @@ const server = http.createServer((req, res) => {
   if (url.pathname === '/state' && req.method === 'GET') return send(res, 200, 'application/json', JSON.stringify(state));
   if (url.pathname === '/state' && req.method === 'POST') {
     let body = ''; req.on('data', c => body += c); req.on('end', () => {
-      try { state = JSON.parse(body); saveState(); broadcast(); send(res, 200, 'application/json', JSON.stringify({ ok: true })); }
+      try { state = JSON.parse(body); saveState(); broadcast(); announcements.refresh(); send(res, 200, 'application/json', JSON.stringify({ ok: true })); }
       catch { send(res, 400, 'application/json', JSON.stringify({ error: 'Invalid data' })); }
     }); return;
   }
@@ -64,4 +109,4 @@ const server = http.createServer((req, res) => {
   send(res, 200, types[path.extname(filePath)] || 'application/octet-stream', fs.readFileSync(filePath));
 });
 server.on('error', e => { console.error(e.code==='EADDRINUSE' ? 'El puerto está ocupado. Detén el otro servidor o usa --port 8766.' : 'No se pudo iniciar: '+e.message); reader?.kill(); process.exitCode=1; });
-server.listen(Number(process.env.PORT || 8765), '127.0.0.1', () => { startReader(); console.log(`Panel: http://127.0.0.1:${process.env.PORT || 8765}\nOBS: http://127.0.0.1:${process.env.PORT || 8765}/overlay-art.html\nDatos: ${dataDir}\nCtrl+C para detener.`); });
+server.listen(Number(process.env.PORT || 8765), '127.0.0.1', () => { startReader(); syncStats(dataDir).then(stats => { statsCache = stats; announcements.refresh(); }).catch(e => console.error('Listhammer: ' + e.message + ' Se conserva la última copia completa, si existe. El overlay sigue funcionando; se reintentará en el próximo inicio.')); console.log(`Panel: http://127.0.0.1:${process.env.PORT || 8765}\nOBS: http://127.0.0.1:${process.env.PORT || 8765}/overlay-art.html\nDatos: ${dataDir}\nCtrl+C para detener.`); });

package/turn-tracker.js

@@ -0,0 +1,37 @@
+// Accessibility snapshots can be partial. Only increases of previously seen
+// values are activity; discovering a mission while scrolling is not activity.
+function inferTurn(previous, incoming, samePlayers) {
+ const fresh={firstPlayer:null,activePlayer:null,half:null,highestRound:incoming.round,eligible:incoming.round===1 && incoming.players.every(p=>p.score===0),seen:{},reason:'Esperando actividad para detectar el turno'};
+ let t=samePlayers && previous.turn ? structuredClone(previous.turn) : fresh;
+ if(incoming.round<t.highestRound) return {...t,reason:'Ronda histórica: turno sin determinar'};
+ if(incoming.round>t.highestRound){t={...t,highestRound:incoming.round,eligible:true,seen:{},activePlayer:null,half:null};}
+ const events=[];
+ for(const p of incoming.players){
+  const old=t.seen[p.name]||{},next={...old};let activity=false;
+  const values={};
+  for(const key of ['primary','secondary']) if(Number.isFinite(p[key]?.score))values[key]=p[key].score;
+  if(Number.isFinite(p.score))values.score=p.score;
+  for(const m of p.secondaries||[])if(Number.isFinite(m.score))values[`mission:${m.name}`]=m.score;
+  for(const m of p.primaryObjectives||[]){
+   if(m.checked!=null)values[`checked:${m.name}`]=Number(m.checked);
+   if(Number.isFinite(m.counter))values[`counter:${m.name}`]=m.counter;
+  }
+  for(const [key,value] of Object.entries(values)){
+   if(Number.isFinite(old[key]) && value>old[key])activity=true;
+   next[key]=value;
+  }
+  t.seen[p.name]=next;
+  if(activity)events.push(p.name);
+ }
+ if(events.length===1){
+  const name=events[0];
+  if(!t.firstPlayer && t.eligible)t.firstPlayer=name;
+  t.activePlayer=name;
+  // Bottom is terminal for this round: delayed scoring cannot rewind it.
+  if(t.firstPlayer && t.half!=='bottom')t.half=name===t.firstPlayer?'top':'bottom';
+  t.reason=t.half?'Turno inferido por actividad de puntuación':`Actividad de ${name}; esperando conocer el orden de juego`;
+ }
+ if(events.length>1)t.reason='Cambios en ambos jugadores; se conserva el último turno detectado';
+ return t;
+}
+module.exports={inferTurn};