32 Commits

Author SHA1 Message Date
Pandipipas b32c0e4560 feat: implement replicant state synchronization for commentary, players, scoreboard, and graphics settings
- Added a new service for synchronizing state with replicants in `replicant-state-service.ts`.
- Refactored commentary store to utilize the new synchronization service.
- Created a new graphics settings store that syncs with replicants.
- Introduced a packs store for managing installed packs and their states.
- Updated players and scoreboard stores to use the new synchronization service.
- Created shared services for managing replicated state in graphics components.
- Refactored existing components to use the new shared services for replicant state.
- Added normalization and default values for commentary, graphics settings, players, and scoreboard.
- Improved type safety and organization in shared domain files for better maintainability.
2026-05-30 21:22:48 +02:00
Pandipipas 02a108f983 refactor: architecture base
- Moved NodeCG context management to a dedicated context module.
- Introduced message handling utilities for better message listening and sending.
- Updated startgg integration to use new message handling methods.
- Removed deprecated replicant utilities and replaced them with a new structure.
- Refactored replicant imports in graphics components to align with new structure.
- Added new pack-related types and schemas for better type safety.
- Cleaned up unused files and consolidated pack configuration into a single module.
- Updated TypeScript configurations to reflect new directory structure.
2026-05-23 21:52:07 +02:00
Pandipipas 225b2b36a2 feat: add architectural documentation for refactor; include audit, migration plan, rules, target architecture, and session handoff 2026-05-23 20:48:31 +02:00
Pandipipas 8c270feb5b feat: enhance pack management and character handling; implement automatic registry refresh and logo display updates 2026-05-22 21:19:45 +02:00
Pandipipas 618d18d8fb feat: update pack handling and character image paths; implement installed packs revision tracking 2026-05-21 23:59:22 +02:00
Pandipipas 0bc6f60b2c feat: update Gitea configuration for base URL and owner; add updateInfo to GameSelectOption interface 2026-05-21 23:06:54 +02:00
Pandipipas 88aeedb5ff feat: update character images for Tekken 8 and enhance pack management
- Updated character images for Tekken 8, including Jin, Jun, Kazuya, and others.
- Introduced a new pack configuration system to manage character packs from a Gitea instance.
- Added types for pack management, including PackCharacter, PackManifest, and PackRegistry.
- Implemented functions to register and unregister installed packs, allowing dynamic character loading.
- Enhanced the character image retrieval system to support both bundled and installed packs.
2026-05-21 17:59:13 +02:00
Pandipipas 04f2c2037a feat: add character images for Guilty Gear Strive and update fighting characters with DLC support 2026-05-20 16:34:37 +02:00
Pandipipas fd4201a882 fix: update translations for improved clarity and consistency in settings and about sections 2026-05-20 00:03:12 +02:00
Pandipipas 787de05034 feat: enhance settings view with integration options for start.gg and Challonge, add manual token dialogs, and improve keyboard shortcut management 2026-05-19 03:21:50 +02:00
Pandipipas 67d9d20b56 feat: enhance OAuth configuration to support proxy mode and update related logic 2026-05-18 21:47:06 +02:00
Pandipipas 79f6653d94 feat: update player source chips with icons and improve styling for better visual clarity 2026-05-18 00:29:31 +02:00
Pandipipas 27c0298ca2 feat: add character images for The King of Fighters XV to enhance visual representation 2026-05-17 22:07:32 +02:00
Pandipipas aea381ea35 Refactor OAuth handling: Extract OAuth server logic into a separate module, streamline session management, and enhance error handling in startgg.ts 2026-05-17 22:07:10 +02:00
Pandipipas 0857472ad4 feat: add character images for Invincible VS to enhance visual representation 2026-05-17 17:48:09 +02:00
Pandipipas 661cf1264a feat: add character images for FATAL FURY: City of the Wolves to enhance visual representation 2026-05-17 17:35:43 +02:00
Pandipipas b3fc84fde2 feat: add character lists for FATAL FURY: City of the Wolves and Invincible VS 2026-05-17 16:31:09 +02:00
Pandipipas 3de99ef810 feat: update character options for fighting games; add new characters and remove duplicates 2026-05-17 16:15:44 +02:00
Pandipipas 37f9ffb786 feat: add new character images for Mortal Kombat 1 to enhance visual diversity 2026-05-17 15:40:34 +02:00
Pandipipas d76a51c321 feat: add Akali character image for enhanced visual representation 2026-05-17 03:20:40 +02:00
Pandipipas 2ee111a0ca feat: add additional cache directories to .gitignore for improved build management 2026-05-16 19:45:52 +02:00
Pandipipas 7b302e4c21 feat: add new translations for settings and graphics; implement shortcut conflict detection and reset functionality 2026-05-16 14:15:36 +02:00
Pandipipas 6dbf648323 feat: enhance BracketPanel and CommentaryPanel with Twitter handle validation and preview functionality; update i18n for new translations 2026-05-15 15:09:11 +02:00
Pandipipas a4dc89575d feat: add preview functionality to BracketPanel and i18n support for preview text 2026-05-15 02:14:03 +02:00
Pandipipas 4da00508d3 feat: add character game management and player side functionality
- Implemented `useCharacterGame` composable to manage game selection and character state for both players.
- Added `useCountryFilter` composable for filtering country options based on locale.
- Created `usePlayerSide` composable to encapsulate state and handlers for player management on each side of the scoreboard.
- Introduced filtering and input synchronization for player names and countries.
- Enhanced player ID generation to avoid collisions and support custom player entries.
2026-05-14 14:19:44 +02:00
Pandipipas 21d885f6e6 Refactor Dashboard, Graphics, Players, and Settings views for improved layout and styling consistency 2026-05-13 03:20:28 +02:00
Pandipipas d8d3c7f03c Refactor About.vue to simplify collaborator display and remove update checking logic 2026-05-12 18:42:38 +02:00
Pandipipas 7314e73a1b Add scoreko-electron-dev directory to .gitignore 2026-05-09 17:44:57 +02:00
Pandipipas 61e565d358 Fix CI pnpm setup order.
Install pnpm before enabling setup-node pnpm caching so GitHub Actions can resolve the pnpm executable during checks.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-08 19:18:06 +02:00
Pandipipas 8040b4fe51 Remove local database file from repository.
Stop tracking the runtime SQLite file and ignore local DB artifacts to prevent accidental commits.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-08 19:13:33 +02:00
Pandipipas 91a8ce730c Migrate project setup to Node 24 runtime.
Update Node and TypeScript toolchain references, CI node version, lockfile resolution, and include current workspace/runtime files for consistency.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-08 19:11:27 +02:00
Pandipipas 7a5c1ec637 Migrate package management from npm to pnpm.
Standardize local and CI workflows on pnpm 11.0.8, replace npm commands in docs/config, and swap lockfiles for reproducible installs.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-08 18:46:55 +02:00
307 changed files with 8614 additions and 6771 deletions
+9 -4
View File
@@ -23,17 +23,22 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 11.0.8
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 24
cache: npm
cache: pnpm
- name: Install dependencies
run: npm ci
run: pnpm install --frozen-lockfile
- name: Lint
run: npm run lint
run: pnpm run lint
- name: Build
run: npm run build
run: pnpm run build
+14 -4
View File
@@ -1,7 +1,7 @@
# Logs
logs
*.log
npm-debug.log*
pnpm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
@@ -48,8 +48,11 @@ web_modules/
# TypeScript cache
*.tsbuildinfo
# Optional npm cache directory
.npm
# Optional pnpm cache directory
.pnpm-store
.corepack/
.npm-cache/
.node-gyp/
# Optional eslint cache
.eslintcache
@@ -66,7 +69,7 @@ web_modules/
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
# Output of 'pnpm pack'
*.tgz
# Yarn Integrity file
@@ -133,5 +136,12 @@ dist
/dashboard/
/extension/
/graphics/
/nodecg/
/shared/domain/
/shared/dist/
# Local runtime database
/db/
*.sqlite3
/scoreko-electron-dev/
/packs/
-1
View File
@@ -1 +0,0 @@
24.14.0
+8 -103
View File
@@ -9,113 +9,18 @@ NodeCG bundle for producing fighting game overlays.
## Requirements
- Node.js 24.14.0+
- Node.js 22+
- NodeCG 2.3+
## Scripts
- `npm run autofix`: automatically fixes lint errors.
- `npm run build`: builds dashboard/graphics and extension.
- `npm run lint`: validates project linting.
- `npm run schema-types`: generates types from schemas.
- `npm run start`: starts NodeCG using the local dependency (`nodecg start`).
- `npm run watch`: development mode with watch.
## Usage
- `npm install`
- `npm run build`
- `npm run start` (equivalent to `npx nodecg start`)
- `pnpm run autofix`: automatically fixes lint errors.
- `pnpm run build`: builds dashboard/graphics and extension.
- `pnpm run lint`: validates project linting.
- `pnpm run schema-types`: generates types from schemas.
- `pnpm run start`: starts NodeCG.
- `pnpm run watch`: development mode with watch.
## Version
Initial project version: `0.1.0`.
## Assets por HTTP (sin GitHub API)
La descarga de assets usa **únicamente HTTP**. Debes configurar un servidor propio.
1. En `cfg/scoreko-dev.json`, configura `assetsBaseUrl` (opcional, por defecto `http://localhost`):
```json
{
"scoreko-dev": {
"assetsBaseUrl": "http://localhost"
}
}
```
2. Sirve por HTTP esta estructura:
```text
games/
games.json (opcional, para nombres visibles personalizados)
street-fighter-6/
street-fighter-6.png
manifest.json
fighting-characters.json
characters/...
tekken-8/
tekken-8.png
manifest.json
...
```
`games/games.json` es opcional y permite mapear `slug -> nombre visible`.
Formato objeto:
```json
{
"2xko": "2XKO",
"tekken-8": "Tekken 8"
}
```
También se acepta array de objetos:
```json
[
{ "slug": "2xko", "title": "2XKO" },
{ "slug": "tekken-8", "title": "Tekken 8" }
]
```
## Logos en servidor HTTP (sin logos locales en el bundle)
La vista de "Game Assets" carga los logos directamente desde:
```text
{assetsBaseUrl}/games/{repoFolder}/{logoFile}
```
Ejemplos:
- `http://TU_SERVIDOR/games/street-fighter-6/street-fighter-6.png`
- `http://TU_SERVIDOR/games/tekken-8/tekken-8.png`
### Cómo guardarlos en la carpeta HTTP
1. Crea la carpeta del juego en tu web root (si no existe).
2. Copia el logo con el nombre esperado (`logoFile` de `src/shared/fighting-games.ts`).
3. Verifica desde navegador o `curl` que responde `200`.
Ejemplo rápido en Linux (Nginx/Apache):
```bash
sudo mkdir -p /var/www/assets/games/street-fighter-6
sudo cp ./street-fighter-6.png /var/www/assets/games/street-fighter-6/street-fighter-6.png
curl -I http://TU_SERVIDOR/games/street-fighter-6/street-fighter-6.png
```
Opcional (recomendado): añade cache HTTP (`Cache-Control`, `ETag`) en tu servidor para que el navegador no los vuelva a descargar en cada visita.
3. Cada `manifest.json` debe ser un array con rutas relativas, o con objetos `{ "path", "size", "url" }`.
Ejemplo mínimo:
```json
[
"fighting-characters.json",
"characters/ryu.png"
]
```
+9 -19
View File
@@ -3,49 +3,39 @@
"type": "object",
"additionalProperties": false,
"properties": {
"exampleProperty": {
"oauthProxyUrl": {
"type": "string",
"default": ""
"description": "Sobreescribe la URL base del proxy OAuth (por defecto usa la constante del código). Útil para staging o desarrollo del proxy."
},
"startggClientId": {
"type": "string",
"default": "",
"description": "Client ID de tu OAuth app de start.gg"
"description": "DEV ONLY: Client ID de tu propia OAuth app de start.gg. Si está presente junto a startggClientSecret, activa el modo dev (exchange directo, sin proxy)."
},
"startggClientSecret": {
"type": "string",
"default": "",
"description": "Client Secret de tu OAuth app de start.gg"
"description": "DEV ONLY: Client Secret de tu propia OAuth app de start.gg. NUNCA subas este valor a git."
},
"startggOAuthPort": {
"type": "integer",
"default": 34920,
"minimum": 1,
"maximum": 65535,
"description": "Puerto local para callback OAuth"
"description": "Puerto local para el servidor de callback OAuth de start.gg."
},
"challongeClientId": {
"type": "string",
"default": "",
"description": "Client ID de tu OAuth app de Challonge"
"description": "DEV ONLY: Client ID de tu propia OAuth app de Challonge. Si está presente junto a challongeClientSecret, activa el modo dev."
},
"challongeClientSecret": {
"type": "string",
"default": "",
"description": "Client Secret de tu OAuth app de Challonge"
"description": "DEV ONLY: Client Secret de tu propia OAuth app de Challonge. NUNCA subas este valor a git."
},
"challongeOAuthPort": {
"type": "integer",
"default": 34921,
"minimum": 1,
"maximum": 65535,
"description": "Puerto local para callback OAuth de Challonge"
},
"assetsBaseUrl": {
"type": "string",
"default": "http://localhost",
"description": "URL base para descargar assets por HTTP (ej: http://192.168.1.50:8080). Por defecto usa http://localhost."
"description": "Puerto local para el servidor de callback OAuth de Challonge."
}
}
},
"required": []
}
+108
View File
@@ -0,0 +1,108 @@
# Architecture Audit
Este documento resume el estado arquitectónico actual de Scoreko y debe usarse como referencia para el refactor. No redefine la arquitectura objetivo; documenta el diagnóstico existente y los riesgos detectados.
## Estado Actual
La repo es un bundle NodeCG con Vite, Vue 3, Quasar, Pinia y `vite-plugin-nodecg`.
| Área | Ruta | Responsabilidad actual |
| --- | --- | --- |
| Extension | `src/extension` | Lógica server NodeCG, OAuth, brackets y pack manager. |
| Dashboard | `src/dashboard/scoreko-dev` | App Quasar/Pinia para control. |
| Graphics | `src/graphics` | Overlays broadcast: `scoreboard`, `scoreboard-2xko`, `commentary`. |
| Browser shared | `src/browser_shared/replicants.ts` | Acceso browser a replicants. |
| Shared | `src/shared` | Tipos, utilidades, países, packs y personajes. |
| Schemas | `schemas` | Schemas de replicants principales. |
| Build outputs | `dashboard`, `graphics`, `extension`, `shared/dist` | Outputs ignorados por git. |
## Replicants
### Declarados por Schema
- `scoreboard`
- `players`
- `commentary`
- `graphicsSettings`
- `exampleReplicant`
### Declarados Solo en Código
- `installedPacks`
- `packRegistry`
- `downloadStates`
- `availableUpdates`
### Problema Principal
El contrato realtime está dividido entre schemas y código runtime. Parte vive en `schemas`, y parte en `pack-manager` o `usePackRegistry`. Esto dificulta validar cambios, regenerar tipos y entender qué estado público existe realmente.
## Flujo de Datos
1. El dashboard escribe en Pinia stores.
2. Los stores sincronizan con replicants mediante `store-sync.ts`.
3. Los overlays leen replicants directamente desde `browser_shared/replicants.ts`.
4. La extensión escucha mensajes NodeCG como `startgg:*`, `challonge:*` y `downloadPack`.
5. La extensión actualiza replicants o disco.
6. `graphicsSettings.scoreboardSkin` redirige entre overlays `scoreboard` y `scoreboard-2xko`.
## Zonas Grandes o de Riesgo
| Archivo | Riesgo |
| --- | --- |
| `src/dashboard/scoreko-dev/views/Players.vue` | Vista demasiado grande: tabla, CRUD, import/export, integraciones y dialogs. |
| `src/dashboard/scoreko-dev/components/PlayerSidePanel.vue` | UI duplicada para left/right. |
| `src/dashboard/scoreko-dev/views/Settings.vue` | Mezcla idioma, shortcuts, OAuth y tokens. |
| `src/dashboard/scoreko-dev/composables/useIntegration.ts` | Mezcla estado UI, localStorage, polling OAuth, importación y cleanup. |
| `src/extension/pack-manager.ts` | Mezcla config, tipos, FS, HTTP static, downloads, updates, replicants y handlers. |
| `src/graphics/scoreboard/main.vue` | Lógica, layout, animaciones, flags y CSS mezclados. |
| `src/graphics/scoreboard-2xko/main.vue` | Mismo riesgo que `scoreboard/main.vue`. |
## Hallazgos Técnicos
- No se detectaron ciclos de imports en los archivos TS/Vue revisados.
- Sí hay accesos frágiles al entorno NodeCG:
- `nodecg` global en composables.
- `NodeCG.Replicant` declarado manualmente.
- Imports a `package.json` desde UI.
- Tipos generados desalineados.
- Acceso directo a replicants fuera de stores o servicios.
## Problemas Reales
- La frontera NodeCG está rota: `browser_shared/replicants.ts`, stores, `Graphics.vue`, overlays y `usePackRegistry` acceden a NodeCG de formas distintas.
- Los contratos realtime no están centralizados.
- `pack-manager.ts` necesita reescritura controlada, no parcheo incremental.
- `usePackRegistry.ts` y `fighting-characters.ts` necesitan reescritura controlada.
- `startgg.ts` y `challonge.ts` duplican estructura: OAuth mode, proxy exchange, session polling API y parsing básico.
- `Players.vue` y `Settings.vue` son feature modules completos metidos en vistas.
- Los overlays son de alto riesgo visual y deben tocarse con mucho cuidado.
- Hay dead code claro: `exampleReplicant`, `example.ts`, `ExampleType` y schema de ejemplo.
- `src/types/schemas/configschema.d.ts` está stale: contiene `exampleProperty`, pero `configschema.json` ya no lo define.
- `lint` falla por `_id` en `Players.vue` y `_config` en `startgg.ts` y `challonge.ts`.
- El resto de lint son warnings de formato Vue.
## Impacto a Medio y Largo Plazo
- Añadir providers o skins duplicará lógica.
- Contributors externos no sabrán dónde tocar: store, composable, replicant o extensión.
- Refactors visuales pueden romper overlays porque no hay separación entre view model y presentación.
- El sistema de packs es el mayor riesgo por acoplar descarga, estado realtime, manifests, FS y UI.
## Zonas a Preservar
- La idea de `syncStateWithReplicant`.
- Stores `scoreboard`, `players` y `commentary` como base razonable.
- `oauth-server.ts` como pieza reusable.
- `countries.ts`, que está bien encapsulado.
- Schemas JSON como fuente de tipos.
- UI Quasar existente, preservando comportamiento visual mientras se divide.
## Baseline de Checks
| Check | Estado |
| --- | --- |
| `vue-tsc` | Pasa. |
| `tsc` | Pasa. |
| `lint` | Falla con 3 errores reales y 243 warnings de formato. |
+97
View File
@@ -0,0 +1,97 @@
# Architecture Rules
Estas reglas son obligatorias para cualquier refactor posterior. Están pensadas para mantener boundaries claros, reducir acoplamiento y preservar comportamiento durante la migración.
## TypeScript
- No usar `any`.
- Usar `unknown` solo en boundaries.
- Normalizar `unknown` inmediatamente al entrar al dominio.
- No duplicar tipos entre extension y browser.
- Todo replicant nuevo debe tener schema y tipo generado.
- Regenerar tipos siempre desde schemas.
## Boundaries NodeCG
- No acceder directamente a replicants fuera de `nodecg/browser` o `nodecg/extension`.
- No usar `nodecg.sendMessage` directo en componentes o composables de feature.
- No usar `nodecg.Replicant` directo fuera de la capa `nodecg`.
- No depender de `nodecg` global salvo dentro del boundary correspondiente.
- Centralizar nombres de replicants en `replicantNames`.
- Centralizar nombres de messages en una capa de messages.
## Shared y Dominio
- `shared/domain` solo puede contener funciones puras, tipos, normalizadores y mapping.
- `shared/domain` no puede importar Vue.
- `shared/domain` no puede importar NodeCG.
- `shared/domain` no puede acceder al DOM.
- Preferir funciones puras para normalización, parsing, derivación y mapping.
- Validar o normalizar datos externos al cruzar boundaries.
## Dashboard
- Los stores mantienen estado de aplicación y sync con replicants.
- Los stores no deben contener UI compleja.
- Las vistas no deben implementar features completos.
- Los componentes deben ser pequeños y orientados a UI.
- Los composables de feature no deben hablar directamente con NodeCG.
- Toda lógica de negocio debe vivir en dominio, services o stores según corresponda.
## Extension
- `extension/modules` debe contener handlers pequeños registrados desde bootstrap explícito.
- No mezclar FS, HTTP, replicants, downloads y parsing en el mismo módulo.
- Todo handler NodeCG debe declarar claramente qué message escucha y qué replicants toca.
- Todo acceso a `nodecg.listenFor`, `nodecg.Replicant`, `nodecg.mount` y logging debe pasar por `nodecg/extension`.
## Packs
- Pack registry, manifests, downloads y estado instalado deben compartir tipos comunes.
- Todo replicant de packs debe tener schema.
- Mantener nombres y defaults actuales durante la migración.
- Validar manifests en el boundary antes de exponerlos al dominio o UI.
- No mantener estado mutable de módulo opaco para packs instalados.
- No usar `ref` de Vue dentro de shared.
## Integraciones
- Providers como Start.gg y Challonge deben compartir patrón de OAuth, session polling y parsing.
- Cada provider debe tener cliente propio y normalizadores propios.
- El flujo OAuth debe apoyarse en `oauth-server.ts` cuando aplique.
- Todo timer o polling debe tener cleanup.
- Todo listener debe tener cleanup.
## Graphics y Overlays
- Los overlays se refactorizan al final.
- Primero preservar píxel y comportamiento; después limpiar internals.
- No cambiar CSS, SVG, posiciones o markup sensible sin baseline visual.
- Extraer view models antes de deduplicar layout.
- Helpers compartidos de flags, score animation y text fitting deben vivir en `graphics/shared`.
## Side Effects
- No side effects en imports salvo bootstrap explícito.
- No estado mutable de módulo salvo singleton justificado y documentado.
- Todo timer/listener debe registrar cleanup.
- No wrappers vacíos.
- No inventar un patrón si una función simple basta.
## Naming
| Elemento | Regla | Ejemplo |
| --- | --- | --- |
| Replicants | `camelCase`, constantes en `replicantNames` | `graphicsSettings` |
| Messages | Namespaced por dominio | `packs:download` |
| Stores | `use<Feature>Store` | `useScoreboardStore` |
| Services | `create<Domain>Service` o `create<Provider>Client` | `createPackService` |
| View models | `use<Overlay>ViewModel` | `useScoreboardOverlayViewModel` |
## Compatibilidad
- Mantener comportamiento público durante la migración.
- Mantener nombres públicos hasta completar el refactor.
- No romper overlays sin baseline visual y verificación.
- Priorizar eliminar legacy muerto antes que envolverlo.
+187
View File
@@ -0,0 +1,187 @@
# Migration Plan
Este plan define el orden de migración. Debe ejecutarse de forma secuencial para reducir riesgo, preservar comportamiento y evitar reescrituras amplias sin baseline.
## Principios
- Mantener nombres públicos y comportamiento hasta completar la migración.
- Congelar comportamiento antes de mover responsabilidades.
- Eliminar legacy muerto antes de envolverlo.
- Separar boundaries antes de reescribir módulos complejos.
- Tocar overlays al final y con verificación visual.
## Secuencia
| Paso | Objetivo | Tipo |
| --- | --- | --- |
| 1 | Congelar comportamiento con screenshots de overlays, fixtures de replicants, build, typecheck y lint baseline. | Baseline |
| 2 | Quitar `example*`, regenerar schema types y eliminar `.js` redundantes en `src/shared` si no se usan. | Limpieza |
| 3 | Crear `nodecg/browser` y `nodecg/extension` sin cambiar comportamiento. | Boundary |
| 4 | Añadir schemas para replicants de packs manteniendo nombres y defaults exactos. | Contratos |
| 5 | Extraer tipos/config de packs a `shared` y ajustar `tsconfig.extension` para no duplicar. | Shared |
| 6 | Reescribir controladamente `pack-manager`. | Reescritura |
| 7 | Reescribir controladamente `usePackRegistry` y `fighting-characters`. | Reescritura |
| 8 | Dividir `useIntegration`. | Modularización |
| 9 | Dividir `Players.vue`. | Modularización |
| 10 | Dividir `Settings.vue`. | Modularización |
| 11 | Refactor suave de dashboard scoreboard para eliminar duplicación left/right. | Modularización |
| 12 | Extraer view models y helpers de overlays sin tocar CSS/markup al inicio. | Overlays |
| 13 | Añadir tests puros para normalizadores y lógica de dominio. | Tests |
| 14 | Añadir verificación visual Playwright para overlays principales. | Visual QA |
## Detalle por Fase
### 1. Congelar Comportamiento
Crear una baseline antes de refactorizar:
- Screenshots de `scoreboard`, `scoreboard-2xko` y `commentary`.
- Fixtures representativos de replicants.
- Resultado actual de build y typecheck.
- Resultado actual de lint, incluyendo los 3 errores reales conocidos.
### 2. Limpiar Dead y Stale Code
Eliminar código que no representa comportamiento productivo:
- `exampleReplicant`.
- `example.ts`.
- `ExampleType`.
- Schema de ejemplo.
- Tipos generados stale.
- `.js` redundantes en `src/shared` si se confirma que no se usan.
### 3. Crear Boundaries NodeCG
Introducir APIs sin cambiar comportamiento:
- `src/nodecg/browser/replicants.ts`
- `src/nodecg/browser/messages.ts`
- `src/nodecg/extension/replicants.ts`
- `src/nodecg/extension/messages.ts`
- `src/nodecg/extension/context.ts`
El objetivo es centralizar acceso a replicants, messages, logging y NodeCG globals.
### 4. Centralizar Contratos Realtime
Añadir schemas para:
- `installedPacks`
- `packRegistry`
- `downloadStates`
- `availableUpdates`
Los nombres y defaults deben mantenerse exactamente para no romper dashboard, extensión ni overlays.
### 5. Extraer Shared de Packs
Mover a `shared`:
- Tipos de manifest.
- Tipos de registry.
- Tipos de estado de descarga.
- Config derivada común.
- Validación ligera en boundaries.
No duplicar tipos entre extension y browser.
### 6. Reescritura Controlada de Pack Manager
Separar `pack-manager.ts` en módulos pequeños:
| Módulo | Responsabilidad |
| --- | --- |
| Registry client | Fetch y normalización del registry remoto. |
| Downloader | Descargas, progreso y errores. |
| Disk store | Lectura/escritura en disco. |
| Static mount | Exposición HTTP de assets instalados. |
| Handlers | Registro de mensajes NodeCG. |
| Replicant sync | Actualización centralizada de replicants. |
### 7. Reescritura de Pack Registry Runtime
Rehacer `usePackRegistry` y `fighting-characters` para:
- Quitar estado mutable de módulo opaco.
- Evitar `ref` en shared.
- Modelar packs instalados como estado explícito.
- Cargar manifests mediante boundaries claros.
- Eliminar comentarios que contradicen el estado real de assets.
### 8. Dividir Integraciones
Extraer `useIntegration` en piezas:
- `nodecgMessageClient`
- `oauthClient`
- `temporaryPlayers`
- `tournamentImport`
Cada pieza debe tener cleanup explícito para timers/listeners.
### 9. Dividir Players
Extraer desde `Players.vue`:
- `PlayersTable`
- `PlayerEditorDialog`
- `IntegrationImportCard`
- `ImportPlayersDialog`
La vista debe coordinar el feature, no contener la implementación completa.
### 10. Dividir Settings
Extraer desde `Settings.vue`:
- `LanguageSettings`
- `ShortcutSettings`
- `IntegrationSettings`
Mantener UI Quasar y comportamiento actual.
### 11. Refactor Suave de Scoreboard Dashboard
Eliminar duplicación left/right con subcomponentes pequeños, sin cambiar el comportamiento público ni el layout principal.
### 12. Overlays al Final
Primero extraer sin modificar presentación:
- View models.
- Helpers de flags.
- Helpers de score animation.
- Helpers de text fitting.
Después de verificar baseline visual, deduplicar internals.
### 13. Tests Puros
Añadir tests para:
- Normalizadores.
- Pack registry.
- Shortcut parsing.
- Country resolving.
- Bracket round formatting.
### 14. Verificación Visual
Añadir Playwright para overlays principales:
- `scoreboard`.
- `scoreboard-2xko`.
- `commentary`.
Debe validar screenshots o checks visuales estables antes de tocar CSS sensible.
## Clasificación de Trabajo
| Categoría | Incluye |
| --- | --- |
| Automatizable | Moves/imports, schema generation, lint autofix, snapshots. |
| Reescritura controlada | Packs y registry runtime. |
| División | `Players.vue`, `Settings.vue`, overlays. |
| Conservar | Quasar UI, Pinia, schemas, `oauth-server`, concepto de `store-sync`, layout visual de overlays. |
+56
View File
@@ -0,0 +1,56 @@
# Phase 1 Summary
## Scope
Executed the base architecture phase only. This phase focused on structure, boundaries, shared contracts and compatibility without changing UX, overlay visuals or large feature logic.
## Completed
- Added the `src/nodecg` boundary:
- `src/nodecg/browser`
- `src/nodecg/extension`
- centralized `replicantNames`
- centralized `messageNames`
- Moved browser replicant access out of `src/browser_shared`.
- Moved dashboard stores to `src/dashboard/stores`.
- Moved pure country helpers to `src/shared/domain/players`.
- Moved pack config and pack types to `src/shared/domain/packs`.
- Added pack replicant schemas:
- `installedPacks`
- `packRegistry`
- `downloadStates`
- `availableUpdates`
- Added generated TypeScript declarations for the new pack schemas.
- Removed dead example code:
- `exampleReplicant` schema/type
- `ExampleType`
- `src/extension/example.ts`
- Removed redundant stale JS files from `src/shared`.
- Updated extension bootstrap to use an explicit NodeCG context boundary.
- Routed browser messages through `src/nodecg/browser/messages.ts`.
- Routed extension message registration through `src/nodecg/extension/messages.ts`.
- Routed pack replicant creation through NodeCG pack boundary services.
- Updated build config so generated NodeCG/shared extension outputs are ignored and cleaned.
## Preserved
- No overlay UX, CSS, SVG, layout or animation logic was intentionally changed.
- No large dashboard view was split or rewritten.
- `pack-manager.ts` behavior was preserved; only imports, types, replicant/message names and boundaries were normalized.
- Public NodeCG message names were kept unchanged for compatibility.
- Public replicant names and defaults were kept unchanged.
## Verification
- `pnpm.cmd exec vue-tsc -p tsconfig.browser.json --noEmit`: passed.
- `pnpm.cmd exec tsc -b tsconfig.extension.json --pretty false`: passed.
- `pnpm.cmd exec eslint`: passed with 0 errors and existing Vue formatting warnings.
- `pnpm.cmd run build`: passed.
## Remaining For Later Phases
- Controlled rewrite of `pack-manager.ts`.
- Controlled rewrite of `usePackRegistry` and `fighting-characters.ts`.
- Formal provider module split for Start.gg and Challonge.
- Splitting `Players.vue` and `Settings.vue`.
- Overlay view models and visual baseline work.
+85
View File
@@ -0,0 +1,85 @@
# Phase 2 Summary
## Scope
Executed the state and replicants phase only.
This phase focused on isolating state logic, normalizing Pinia stores, encapsulating browser-side replicant access, and moving side effects behind services without changing UX, visual design, overlay CSS, or public NodeCG contracts.
## Completed
- Added pure state/domain modules:
- `src/shared/domain/scoreboard`
- `src/shared/domain/commentary`
- `src/shared/domain/graphics`
- `src/shared/domain/players/state.ts`
- `src/shared/domain/packs/characters.ts`
- Moved normalization and pure state transitions out of dashboard stores.
- Replaced direct dashboard replicant imports with `src/dashboard/services/replicant-state-service.ts`.
- Added `useGraphicsSettingsStore` and moved dashboard graphics skin writes through the store.
- Reworked scoreboard, players and commentary stores to use shared domain normalizers and service-based replicant sync.
- Replaced the pack registry singleton composable with a normalized `usePacksStore`.
- Moved pack replicant listeners and NodeCG pack messages into `src/dashboard/services/pack-service.ts`.
- Removed Vue reactivity and mutable pack registration from `src/shared/fighting-characters.ts`.
- Modeled installed pack manifests as explicit store state instead of hidden module state.
- Centralized registry auto-refresh timer in the packs store.
- Routed integration NodeCG messages through `src/dashboard/services/integration-message-service.ts`.
- Added `src/graphics/shared/services/replicated-state.ts` so graphics read replicants through a service layer.
- Removed the redundant `src/dashboard/stores/store-sync.ts`.
## Preserved
- Public replicant names were unchanged.
- Public message names were unchanged.
- Existing dashboard UX was preserved.
- Overlay markup, CSS, positioning and animation logic were not intentionally changed.
- The existing `usePackRegistry` import path remains as a compatibility wrapper over the packs store.
- The legacy `src/shared/fighting-characters.ts` path remains as a compatibility export, but no longer owns mutable runtime state.
## Realtime Flow After This Phase
```text
schemas
-> nodecg/browser
-> dashboard services / graphics services
-> Pinia stores or overlay computed state
-> components
```
Pack runtime flow:
```text
pack replicants
-> pack service
-> packs store
-> pack registry compatibility composable
-> game / character UI
```
## Verification
- `pnpm.cmd exec vue-tsc -p tsconfig.browser.json --noEmit`: passed.
- `pnpm.cmd exec tsc -b tsconfig.extension.json --pretty false`: passed.
- `pnpm.cmd exec eslint`: passed with 0 errors and existing Vue formatting warnings.
- `pnpm.cmd run build`: passed.
- Searched dashboard, graphics and shared for direct NodeCG/message/replicant imports:
- remaining browser NodeCG access is contained in services and `nodecg/browser`.
- direct component/view replicant imports were removed.
- Searched for `any` in touched runtime areas:
- no new TypeScript `any` usage was added.
## Notes and Limits
- This phase did not split large views like `Players.vue` or `Settings.vue`.
- This phase did not refactor overlay internals beyond replacing direct replicant imports with a read service.
- This phase did not rewrite extension-side `pack-manager.ts`.
- This phase did not rename public messages to the future canonical names; compatibility was preserved.
- Existing Vue lint warnings remain formatting-only and were not addressed because they are outside this phase.
## Remaining For Later Phases
- Controlled rewrite of `pack-manager.ts`.
- Full split of `useIntegration` into provider clients, OAuth client, temporary players and import modules.
- Divide `Players.vue` and `Settings.vue`.
- Extract overlay view models and visual helpers after visual baseline.
- Add tests for pure normalizers and pack state derivations.
+70
View File
@@ -0,0 +1,70 @@
# Session Handoff
Este handoff resume el contexto que debe asumir cualquier sesión futura antes de continuar el refactor. El análisis arquitectónico ya está hecho; no debe repetirse desde cero.
## Estado de la Sesión
- No se habían modificado archivos antes de crear esta documentación.
- Se leyó la estructura del proyecto, configs, schemas, extensión, dashboard, overlays y shared.
- `vue-tsc` pasa.
- `tsc` pasa.
- `lint` falla con 3 errores reales y 243 warnings de formato.
## Documentación Creada
| Documento | Propósito |
| --- | --- |
| `docs/refactor/ARCHITECTURE_AUDIT.md` | Diagnóstico del estado actual y riesgos. |
| `docs/refactor/MIGRATION_PLAN.md` | Orden secuencial de migración. |
| `docs/refactor/ARCHITECTURE_RULES.md` | Reglas accionables para implementación posterior. |
| `docs/refactor/TARGET_ARCHITECTURE.md` | Source of truth de la arquitectura objetivo. |
| `docs/refactor/SESSION_HANDOFF.md` | Contexto operativo para futuras sesiones. |
## Source of Truth
Para futuras sesiones:
1. Usar `TARGET_ARCHITECTURE.md` como referencia principal.
2. Aplicar siempre `ARCHITECTURE_RULES.md`.
3. Ejecutar `MIGRATION_PLAN.md` en orden.
4. Consultar `ARCHITECTURE_AUDIT.md` solo para entender el diagnóstico original.
## Próximo Paso Recomendado
El siguiente paso técnico, cuando se decida continuar, es iniciar el Paso 1 del plan:
- Congelar comportamiento.
- Capturar screenshots de overlays.
- Crear fixtures de replicants.
- Registrar baseline de build, typecheck y lint.
No empezar moviendo código antes de tener esa baseline.
## Riesgos a Recordar
- El sistema de packs es el área de mayor riesgo.
- Los overlays son sensibles a cambios visuales y deben tocarse al final.
- La frontera NodeCG debe centralizarse antes de reescribir features.
- Los replicants de packs deben formalizarse con schemas antes de limpiar runtime.
- `Players.vue` y `Settings.vue` deben dividirse, no reescribirse desde cero.
## Checks Conocidos
| Check | Resultado |
| --- | --- |
| `vue-tsc` | Pasa. |
| `tsc` | Pasa. |
| `lint` | Falla con 3 errores reales. |
Errores lint reales conocidos:
- `_id` en `Players.vue`.
- `_config` en `startgg.ts`.
- `_config` en `challonge.ts`.
Los demás avisos conocidos son warnings de formato Vue.
## Instrucción para Futuras Sesiones
No reanalizar el proyecto desde cero salvo que el código haya cambiado de forma sustancial. Continuar desde estos documentos y ejecutar el plan en orden.
+203
View File
@@ -0,0 +1,203 @@
# Target Architecture
Este documento es la source of truth para la arquitectura objetivo del refactor. Las futuras sesiones deben alinearse con esta estructura y con las reglas de `ARCHITECTURE_RULES.md`.
## Objetivo
Crear una arquitectura simple y realista que:
- Centralice la frontera NodeCG.
- Centralice contratos realtime.
- Separe dominio puro de UI y runtime.
- Permita añadir providers, packs y skins sin duplicación.
- Preserve el comportamiento visual de overlays durante la migración.
## Estructura Objetivo
```text
src/
shared/
schemas/
types/
domain/
scoreboard/
players/
commentary/
packs/
integrations/
utils/
nodecg/
browser/
replicants.ts
messages.ts
extension/
context.ts
replicants.ts
messages.ts
extension/
modules/
packs/
integrations/
startgg/
challonge/
oauth/
dashboard/
app/
features/
scoreboard/
players/
graphics/
settings/
integrations/
packs/
stores/
ui/
graphics/
shared/
composables/
view-models/
assets/
scoreboard/
scoreboard-2xko/
commentary/
```
## Boundaries
| Boundary | Puede hacer | No puede hacer |
| --- | --- | --- |
| `shared/domain` | Tipos, funciones puras, normalizadores, mapping. | Importar Vue, NodeCG o DOM. |
| `nodecg/browser` | Acceso browser a replicants y messages. | Contener lógica de negocio o UI. |
| `nodecg/extension` | Acceso server a `nodecg.Replicant`, `listenFor`, `mount` y logging. | Implementar lógica específica de features. |
| `dashboard/stores` | Estado de aplicación y sync con replicants. | Contener UI compleja. |
| `dashboard/features` | Componentes y composables por feature. | Acceder directamente a NodeCG. |
| `graphics/shared` | View models, helpers visuales compartidos, assets compartidos. | Cambiar contratos realtime. |
| `extension/modules` | Handlers y servicios pequeños registrados desde bootstrap. | Mezclar responsabilidades sin separación. |
## Flujo Realtime Objetivo
```text
schemas
-> generated types
-> nodecg/browser + nodecg/extension
-> dashboard stores / extension modules / graphics view models
```
Reglas del flujo:
- Todo replicant persistente o realtime tiene schema.
- Los tipos se generan desde schemas.
- Dashboard y graphics no crean replicants directamente.
- Extension modules no exponen replicants sin pasar por `nodecg/extension`.
## Replicants
### Fuente de Verdad
Los schemas son la fuente de verdad para todos los replicants.
### Replicants a Mantener
- `scoreboard`
- `players`
- `commentary`
- `graphicsSettings`
### Replicants de Packs a Formalizar
- `installedPacks`
- `packRegistry`
- `downloadStates`
- `availableUpdates`
### Replicants a Eliminar
- `exampleReplicant`
## Messages
Los messages deben estar namespaced por dominio.
| Dominio | Ejemplos |
| --- | --- |
| Packs | `packs:fetchRegistry`, `packs:download` |
| Start.gg | `integrations:startgg:createOAuthSession` |
| Challonge | `integrations:challonge:createOAuthSession` |
Los componentes y composables de feature no deben llamar `nodecg.sendMessage` directamente. Deben usar clientes o services definidos en el boundary browser.
## Shared Domain
`shared/domain` contiene lógica reusable sin runtime:
- `scoreboard`: normalización de estado, mapping de jugadores, derivaciones de marcador.
- `players`: normalizadores, import/export, validación ligera.
- `commentary`: estado y mapping de comentaristas.
- `packs`: manifests, registry, installed packs y derivaciones.
- `integrations`: tipos normalizados, parsing básico y modelos comunes.
## Extension Modules
La extensión debe registrarse desde un bootstrap explícito y delegar en módulos:
| Módulo | Responsabilidad |
| --- | --- |
| `packs` | Registry, downloads, disk store, static mount, replicant sync y handlers. |
| `integrations/startgg` | Cliente Start.gg, OAuth session polling y parsing. |
| `integrations/challonge` | Cliente Challonge, OAuth session polling y parsing. |
| `oauth` | Reuso de `oauth-server.ts` y flujos comunes OAuth. |
## Dashboard
El dashboard se organiza por features:
- `scoreboard`
- `players`
- `graphics`
- `settings`
- `integrations`
- `packs`
Las vistas coordinan features. Los componentes implementan UI. Los stores mantienen estado y sincronización.
## Graphics
Los overlays deben leer estado mediante view models:
- `useScoreboardOverlayViewModel`
- `useCommentaryOverlayViewModel`
`graphics/shared` contiene:
- Composables visuales.
- View models.
- Helpers de flags.
- Helpers de score animation.
- Helpers de text fitting.
- Assets compartidos.
El layout visual existente se conserva hasta tener verificación visual estable.
## Naming Canónico
| Tipo | Convención | Ejemplo |
| --- | --- | --- |
| Replicant | `camelCase` | `graphicsSettings` |
| Replicant constants | `replicantNames` | `replicantNames.graphicsSettings` |
| Message | `<domain>:<action>` | `packs:download` |
| Integration message | `integrations:<provider>:<action>` | `integrations:startgg:createOAuthSession` |
| Store | `use<Feature>Store` | `usePlayersStore` |
| Service | `create<ServiceName>` | `createPackService` |
| Provider client | `create<Provider>Client` | `createStartggClient` |
| Overlay view model | `use<Overlay>OverlayViewModel` | `useScoreboardOverlayViewModel` |
## Arquitectura a Preservar
- Pinia como estado del dashboard.
- Quasar como UI principal.
- Schemas JSON como fuente de tipos.
- `syncStateWithReplicant` como concepto.
- `oauth-server.ts` como base reusable.
- `countries.ts` como utilidad encapsulada.
- Layout visual de overlays hasta completar verificación visual.
-49
View File
@@ -1,49 +0,0 @@
# Electron wrapper (Windows)
Este wrapper crea una app de escritorio para Windows que lanza NodeCG sin requerir que el usuario final tenga Node.js instalado.
## Requisitos de build (solo para quien genera el instalador)
1. Instalar dependencias del bundle raíz:
```bash
pnpm install
```
2. Instalar dependencias del wrapper:
```bash
cd electron
pnpm install
```
## Desarrollo local
Desde `electron/`:
```bash
pnpm start
```
## Generar instalador `.exe` (comprimido)
Desde `electron/`:
```bash
pnpm dist:win
```
Esto genera un instalador NSIS en `electron/dist/` con compresión máxima (`compression: maximum`).
## Qué incluye el instalador
- Runtime de Electron (incluye Node embebido).
- Dependencia `nodecg` dentro de la app.
- El bundle `scoreko-dev` como recurso (`resources/bundle`).
Con eso, el usuario final instala y ejecuta la app sin instalar Node.js aparte.
## Variables opcionales
- `NODECG_PORT` (por defecto `9090`)
- `NODECG_HOST` (por defecto `127.0.0.1`)
-118
View File
@@ -1,118 +0,0 @@
import { app, BrowserWindow } from 'electron';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { spawn } from 'node:child_process';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const BUNDLE_ROOT = app.isPackaged
? path.join(process.resourcesPath, 'bundle')
: path.resolve(__dirname, '..');
const NODECG_PORT = Number.parseInt(process.env.NODECG_PORT ?? '9090', 10);
const NODECG_HOST = process.env.NODECG_HOST ?? '127.0.0.1';
const NODECG_URL = `http://${NODECG_HOST}:${NODECG_PORT}`;
let nodecgProcess;
function getNodecgCliPath() {
return app.isPackaged
? path.join(process.resourcesPath, 'app.asar.unpacked', 'node_modules', 'nodecg', 'bin', 'nodecg.js')
: path.join(__dirname, 'node_modules', 'nodecg', 'bin', 'nodecg.js');
}
function startNodecg() {
const nodecgCli = getNodecgCliPath();
nodecgProcess = spawn(process.execPath, [nodecgCli, 'start'], {
cwd: BUNDLE_ROOT,
env: {
...process.env,
ELECTRON_RUN_AS_NODE: '1',
NODECG_PORT: String(NODECG_PORT),
},
stdio: 'inherit',
});
nodecgProcess.on('exit', (code) => {
if (code !== 0) {
console.error(`[electron] NodeCG process exited with code ${code}`);
}
if (!app.isQuitting) {
app.quit();
}
});
}
function stopNodecg() {
if (!nodecgProcess || nodecgProcess.killed) {
return;
}
app.isQuitting = true;
nodecgProcess.kill();
}
async function waitForNodecg(retries = 80, delayMs = 250) {
for (let attempt = 0; attempt < retries; attempt += 1) {
try {
const response = await fetch(NODECG_URL, { method: 'HEAD' });
if (response.ok || response.status >= 300) {
return;
}
} catch {
// Ignore connection errors while NodeCG boots.
}
await new Promise((resolve) => {
setTimeout(resolve, delayMs);
});
}
throw new Error(`NodeCG did not start in time at ${NODECG_URL}`);
}
async function createWindow() {
const mainWindow = new BrowserWindow({
width: 1366,
height: 768,
autoHideMenuBar: true,
webPreferences: {
contextIsolation: true,
sandbox: true,
},
});
await mainWindow.loadURL(NODECG_URL);
}
app.whenReady().then(async () => {
startNodecg();
try {
await waitForNodecg();
await createWindow();
} catch (error) {
console.error('[electron] Failed to start wrapper:', error);
app.quit();
}
app.on('activate', async () => {
if (BrowserWindow.getAllWindows().length === 0) {
await createWindow();
}
});
});
app.on('before-quit', () => {
app.isQuitting = true;
stopNodecg();
});
app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
app.quit();
}
});
-69
View File
@@ -1,69 +0,0 @@
{
"name": "scoreko-dev-electron-wrapper",
"version": "0.2.0",
"private": true,
"description": "Electron wrapper for running the scoreko-dev NodeCG bundle on Windows.",
"main": "main.mjs",
"type": "module",
"scripts": {
"start": "electron .",
"dist:win": "electron-builder --win nsis"
},
"dependencies": {
"electron": "40.6.1",
"nodecg": "^2.6.4"
},
"devDependencies": {
"electron-builder": "^26.0.12"
},
"build": {
"appId": "com.scoreko.dev",
"productName": "Scoreko Dev",
"compression": "maximum",
"asar": true,
"directories": {
"output": "dist"
},
"files": [
"main.mjs",
"package.json",
"node_modules/**/*"
],
"extraResources": [
{
"from": "../",
"to": "bundle",
"filter": [
"package.json",
"configschema.json",
"LICENSE",
"README.md",
"schemas/**/*",
"dashboard/**/*",
"graphics/**/*",
"extension/**/*",
"src/**/*",
"node_modules/**/*",
"!electron/**/*",
"!.git/**/*"
]
}
],
"win": {
"target": [
{
"target": "nsis",
"arch": [
"x64"
]
}
]
},
"nsis": {
"oneClick": false,
"allowToChangeInstallationDirectory": true,
"createDesktopShortcut": true,
"createStartMenuShortcut": true
}
}
}
+39 -38
View File
@@ -12,23 +12,52 @@
},
"license": "MIT",
"author": "Pandipipas",
"packageManager": "pnpm@11.0.8",
"type": "module",
"engines": {
"node": ">=24.14.0"
},
"scripts": {
"autofix": "eslint --fix",
"prebuild": "trash ./extension && trash ./node_modules/.vite && trash ./shared/dist && trash ./dashboard && trash ./graphics",
"prebuild": "trash ./extension && trash ./nodecg && trash ./node_modules/.vite && trash ./shared/domain && trash ./shared/dist && trash ./dashboard && trash ./graphics",
"build": "vite build && tsc -b tsconfig.extension.json",
"lint": "eslint",
"schema-types": "nodecg schema-types",
"start": "nodecg start",
"watch": "conc -n B,E -c red,blue -k vite \"tsc -b -w --preserveWatchOutput tsconfig.extension.json\"",
"electron:start": "pnpm --dir electron start",
"electron:dist": "pnpm --dir electron dist:win"
"start": "cd ../.. && node index.js",
"watch": "conc -n B,E -c red,blue -k vite \"tsc -b -w --preserveWatchOutput tsconfig.extension.json\""
},
"devDependencies": {
"@eslint/js": "^9.39.0",
"@quasar/extras": "^1.17.0",
"@quasar/vite-plugin": "^1.10.0",
"@tsconfig/node24": "^24.0.0",
"@types/node": "^24.0.0",
"@unhead/vue": "^2.0.19",
"@vitejs/plugin-vue": "^6.0.1",
"@vue/eslint-config-typescript": "^14.6.0",
"@vue/tsconfig": "^0.8.1",
"concurrently": "^9.2.1",
"eslint": "^9.39.0",
"eslint-plugin-vue": "^10.5.1",
"nodecg": "^2.6.1",
"nodecg-vue-composable": "^1.1.0",
"pinia": "^2.3.1",
"quasar": "^2.18.5",
"sass-embedded": "^1.93.3",
"trash-cli": "^7.0.0",
"typescript": "^5.9.3",
"typescript-eslint": "^8.46.2",
"vite": "^7.1.12",
"vite-plugin-checker": "^0.11.0",
"vite-plugin-nodecg": "^2.1.0",
"vue": "^3.5.22",
"vue-router": "^4.5.0",
"vue-tsc": "^3.1.2"
},
"pnpm": {
"overrides": {
"vite-plugin-nodecg>vite": "$vite"
}
},
"nodecg": {
"compatibleRange": "^2.6.0",
"compatibleRange": "^2.3.0",
"dashboardPanels": [
{
"name": "scoreko-dev",
@@ -73,35 +102,7 @@
}
},
"dependencies": {
"@quasar/extras": "^1.17.0",
"@unhead/vue": "^2.0.19",
"country-list": "^2.4.1",
"flag-icons": "^7.5.0",
"nodecg": "^2.6.4",
"nodecg-vue-composable": "^1.1.0",
"pinia": "^2.3.1",
"quasar": "^2.18.5",
"vue": "^3.5.22",
"vue-router": "^4.5.0"
},
"devDependencies": {
"@eslint/js": "^9.39.0",
"@quasar/vite-plugin": "^1.10.0",
"@tsconfig/node24": "^24.0.4",
"@types/node": "^22.18.13",
"@vitejs/plugin-vue": "^6.0.1",
"@vue/eslint-config-typescript": "^14.6.0",
"@vue/tsconfig": "^0.8.1",
"concurrently": "^9.2.1",
"eslint": "^9.39.0",
"eslint-plugin-vue": "^10.5.1",
"sass-embedded": "^1.93.3",
"trash-cli": "^7.0.0",
"typescript": "^5.9.3",
"typescript-eslint": "^8.46.2",
"vite": "^7.1.12",
"vite-plugin-checker": "^0.11.0",
"vite-plugin-nodecg": "^2.1.0",
"vue-tsc": "^3.1.2"
"flag-icons": "^7.5.0"
}
}
+1046 -1010
View File
File diff suppressed because it is too large Load Diff
+7 -7
View File
@@ -1,7 +1,7 @@
onlyBuiltDependencies:
- '@parcel/watcher'
- '@vaadin/vaadin-usage-statistics'
- better-sqlite3
- esbuild
- msgpackr-extract
- vue-demi
allowBuilds:
'@parcel/watcher': true
'@vaadin/vaadin-usage-statistics': true
better-sqlite3: true
esbuild: true
msgpackr-extract: true
vue-demi: true
+18
View File
@@ -0,0 +1,18 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"additionalProperties": {
"type": "object",
"additionalProperties": false,
"properties": {
"installedVersion": {
"type": "string"
},
"latestVersion": {
"type": "string"
}
},
"required": ["installedVersion", "latestVersion"]
},
"default": {}
}
+22
View File
@@ -0,0 +1,22 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"additionalProperties": {
"type": "object",
"additionalProperties": false,
"properties": {
"status": {
"type": "string",
"enum": ["idle", "fetching-manifest", "downloading", "done", "error"]
},
"progress": {
"type": "number"
},
"error": {
"type": "string"
}
},
"required": ["status", "progress"]
},
"default": {}
}
-14
View File
@@ -1,14 +0,0 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"additionalProperties": false,
"properties": {
"exampleProperty": {
"type": "string",
"default": "exampleString"
}
},
"required": [
"exampleProperty"
]
}
+8
View File
@@ -0,0 +1,8 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "array",
"items": {
"type": "string"
},
"default": []
}
+50
View File
@@ -0,0 +1,50 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": ["object", "null"],
"additionalProperties": false,
"properties": {
"schemaVersion": {
"type": "integer"
},
"updatedAt": {
"type": "string"
},
"packs": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"id": { "type": "string" },
"name": { "type": "string" },
"version": { "type": "string" },
"totalSizeBytes": { "type": "number" },
"logoPath": { "type": "string" },
"characterCount": { "type": "integer" },
"palette": {
"type": "object",
"additionalProperties": false,
"properties": {
"start": { "type": "string" },
"end": { "type": "string" }
},
"required": ["start", "end"]
},
"bundled": { "type": "boolean" }
},
"required": [
"id",
"name",
"version",
"totalSizeBytes",
"logoPath",
"characterCount",
"palette",
"bundled"
]
}
}
},
"required": ["schemaVersion", "updatedAt", "packs"],
"default": null
}
-17
View File
@@ -1,17 +0,0 @@
import { useReplicant } from 'nodecg-vue-composable';
import type { Schemas } from '../types';
// YOU MUST CHANGE THIS TO YOUR BUNDLE'S NAME!
const thisBundle = 'scoreko-dev';
/**
* This is where you can declare all of your replicants to import easily into other (browser based) files.
* "useReplicant" is a helper composable to make accessing/modifying replicants easier.
* For more information see https://github.com/Dan-Shields/nodecg-vue-composable
*/
export const exampleReplicant = useReplicant<Schemas.ExampleReplicant>('exampleReplicant', thisBundle);
export const playersReplicant = useReplicant<Schemas.Players>('players', thisBundle);
export const scoreboardReplicant = useReplicant<Schemas.Scoreboard>('scoreboard', thisBundle);
export const graphicsSettingsReplicant = useReplicant<Schemas.GraphicsSettings>('graphicsSettings', thisBundle);
export const commentaryReplicant = useReplicant<Schemas.Commentary>('commentary', thisBundle);
-38
View File
@@ -2,35 +2,6 @@
import { ref } from 'vue';
const loadQuotes = [
// Misc
'Demanding rollback netcode',
'Disrespecting your plus frames',
'Taking your lunch money',
// Street Fighter
'Parrying your super',
'Fighting like gentlemen',
'Fighting a new rival',
'Keeping it classy',
"Protecting Russia's skies",
'Waking up with Dragon Punch',
'Teching those throws',
'Finding the heart of battle',
'Chucking plasma',
'Executing the Yeah Nah Yeah',
// Guilty Gear
'Counter-hitting Pilebunker',
'Riding the lightning',
'Knowing the smell of the game',
'Dropping the instant kill combo',
'What are you standing up for?!',
'Stealing your soul',
'Channelling your inner gorilla',
'Initiating danger time',
'Dragon Installing',
'Practising dust loops',
// BlazBlue
'Turning the wheel of fate',
'Escaping from crossing fate',
// Tekken
"Complaining about Paul's damage",
'Nerfing Gigas',
@@ -38,15 +9,6 @@ const loadQuotes = [
'Sidestepping your electric',
'Punishing hellsweep with 1,1,2',
'Emailing Harada',
// Marvel
'Explaining the DHC glitch',
"When's Mahvel?",
'Thanking god for the machine',
'Setting up shop',
'Getting motivated',
'Activating X-Factor',
// Dragon Ball
'Adding yet another Goku',
];
const randomIndex = Math.floor(Math.random() * loadQuotes.length);
@@ -1,10 +1,12 @@
<script setup lang="ts">
import { onMounted, ref, watch } from 'vue';
import { computed, onMounted, ref, watch } from 'vue';
import { t } from '../i18n';
import { useScoreboardStore } from '../stores/scoreboard';
import { useScoreboardStore } from '../../stores/scoreboard';
const scoreboardStore = useScoreboardStore();
let customDeactivateTimer: ReturnType<typeof setTimeout> | null = null;
const stageOptions = [
'pools',
'top 128',
@@ -25,7 +27,7 @@ const stageOptions = [
const bracketSideOptions = [
{ label: 'None', value: '' },
{ label: 'Winners', value: 'Winners' },
{ label: 'Loosers', value: 'Loosers' },
{ label: 'Losers', value: 'Losers' },
];
const stage = ref(stageOptions[0]);
@@ -34,6 +36,14 @@ const customActive = ref(false);
const customText = ref('');
const hasChanges = ref(false);
const previewText = computed(() => {
if (customActive.value) {
return customText.value.trim() || '—';
}
const prefix = bracketSide.value ? `${bracketSide.value} ` : '';
return `${prefix}${stage.value}`.trim() || '—';
});
const parseInitialRound = () => {
const round = scoreboardStore.scoreboard.round.trim();
if (!round) {
@@ -73,12 +83,12 @@ const updateRound = () => {
return;
}
if (customActive.value) {
scoreboardStore.scoreboard.round = customText.value.trim();
scoreboardStore.setRound(customText.value.trim());
return;
}
const prefix = bracketSide.value ? `${bracketSide.value} ` : '';
scoreboardStore.scoreboard.round = `${prefix}${stage.value}`.trim();
scoreboardStore.setRound(`${prefix}${stage.value}`.trim());
};
watch([stage, bracketSide, customText, customActive], updateRound);
@@ -90,8 +100,14 @@ watch(customActive, (value) => {
});
watch(customText, (value) => {
if (customDeactivateTimer) {
clearTimeout(customDeactivateTimer);
}
if (!value.trim()) {
customDeactivateTimer = setTimeout(() => {
customActive.value = false;
customDeactivateTimer = null;
}, 600);
}
});
@@ -112,6 +128,7 @@ onMounted(() => {
v-model="stage"
:label="t('bracketStage')"
:options="stageOptions"
:disable="customActive"
dense
class="bracket-panel__field"
/>
@@ -119,6 +136,7 @@ onMounted(() => {
v-model="bracketSide"
:label="t('bracketSide')"
:options="bracketSideOptions"
:disable="customActive"
dense
emit-value
map-options
@@ -129,6 +147,7 @@ onMounted(() => {
v-model="customText"
:label="t('bracketCustomProgress')"
dense
clearable
class="bracket-panel-custom-input bracket-panel__field"
/>
<QToggle
@@ -138,6 +157,17 @@ onMounted(() => {
class="bracket-panel-custom-toggle"
/>
</div>
<!-- Preview -->
<div class="bracket-panel__preview">
<span class="bracket-panel__preview-label">{{ t('bracketPreview') }}</span>
<span
class="bracket-panel__preview-text"
:class="{ 'bracket-panel__preview-text--custom': customActive }"
>
{{ previewText }}
</span>
</div>
</div>
</div>
</template>
@@ -183,4 +213,36 @@ onMounted(() => {
.bracket-panel__field :deep(.q-field__label) {
color: rgba(255, 255, 255, 0.92);
}
.bracket-panel__preview {
display: flex;
align-items: baseline;
gap: 10px;
padding: 8px 10px;
border-radius: 4px;
border: 1px solid rgba(255, 255, 255, 0.12);
background: rgba(255, 255, 255, 0.04);
}
.bracket-panel__preview-label {
font-size: 0.7rem;
text-transform: uppercase;
letter-spacing: 0.08em;
color: rgba(255, 255, 255, 0.45);
white-space: nowrap;
flex-shrink: 0;
}
.bracket-panel__preview-text {
font-size: 1rem;
font-weight: 600;
color: rgba(255, 255, 255, 0.92);
letter-spacing: 0.02em;
word-break: break-word;
transition: color 0.2s ease;
}
.bracket-panel__preview-text--custom {
color: var(--q-secondary, #26a69a);
}
</style>
@@ -1,8 +1,59 @@
<script setup lang="ts">
import { computed } from 'vue';
import { stripTwitterPrefix } from '../../../shared/domain/commentary';
import { t } from '../i18n';
import { useCommentaryStore } from '../stores/commentary';
import { useCommentaryStore } from '../../stores/commentary';
const commentaryStore = useCommentaryStore();
// --- Twitter handle helpers ---
const TWITTER_MAX_LENGTH = 15;
const TWITTER_VALID_CHARS = /^[A-Za-z0-9_]*$/;
const twitterRules = [
(val: string) =>
!val || val.length <= TWITTER_MAX_LENGTH || t('commentaryTwitterMaxLength'),
(val: string) =>
!val || TWITTER_VALID_CHARS.test(val) || t('commentaryTwitterInvalidChars'),
];
function handleLeftTwitterInput(value: string | number | null) {
commentaryStore.leftCommentatorTwitter = value ? stripTwitterPrefix(String(value)) : '';
}
function handleRightTwitterInput(value: string | number | null) {
commentaryStore.rightCommentatorTwitter = value ? stripTwitterPrefix(String(value)) : '';
}
// --- Clear ---
function clearAll() {
commentaryStore.clearCommentary();
}
const isAnythingFilled = computed(() =>
!!(
commentaryStore.leftCommentator ||
commentaryStore.leftCommentatorTwitter ||
commentaryStore.rightCommentator ||
commentaryStore.rightCommentatorTwitter
)
);
// --- Handle preview ---
const leftHandlePreview = computed(() =>
commentaryStore.leftCommentatorTwitter
? `@${commentaryStore.leftCommentatorTwitter}`
: ''
);
const rightHandlePreview = computed(() =>
commentaryStore.rightCommentatorTwitter
? `@${commentaryStore.rightCommentatorTwitter}`
: ''
);
</script>
<template>
@@ -14,7 +65,9 @@ const commentaryStore = useCommentaryStore();
</div>
<div class="commentary-panel__layout">
<!-- Commentator 1 -->
<div class="commentary-panel__commentator">
<QInput
v-model="commentaryStore.leftCommentator"
:label="t('commentaryCommentator1')"
@@ -27,13 +80,27 @@ const commentaryStore = useCommentaryStore();
</QInput>
<QInput
v-model="commentaryStore.leftCommentatorTwitter"
:model-value="commentaryStore.leftCommentatorTwitter"
:label="t('commentaryTwitterText')"
:rules="twitterRules"
:maxlength="TWITTER_MAX_LENGTH"
dense
class="commentary-panel__field"
@update:model-value="handleLeftTwitterInput"
/>
<Transition name="commentary-panel__preview">
<div
v-if="leftHandlePreview"
class="commentary-panel__handle-preview"
>
{{ leftHandlePreview }}
</div>
</Transition>
</div>
<!-- Center controls -->
<div class="commentary-panel__center-controls">
<QBtn
flat
dense
@@ -41,9 +108,30 @@ const commentaryStore = useCommentaryStore();
icon="swap_horiz"
class="commentary-panel__swap-btn"
@click="commentaryStore.swapCommentators"
/>
>
<QTooltip anchor="top middle" self="bottom middle">
{{ t('commentarySwap') }}
</QTooltip>
</QBtn>
<QBtn
flat
dense
round
icon="restart_alt"
class="commentary-panel__clear-btn"
:disable="!isAnythingFilled"
@click="clearAll"
>
<QTooltip anchor="top middle" self="bottom middle">
{{ t('commentaryClear') }}
</QTooltip>
</QBtn>
</div>
<!-- Commentator 2 -->
<div class="commentary-panel__commentator">
<QInput
v-model="commentaryStore.rightCommentator"
:label="t('commentaryCommentator2')"
@@ -56,11 +144,23 @@ const commentaryStore = useCommentaryStore();
</QInput>
<QInput
v-model="commentaryStore.rightCommentatorTwitter"
:model-value="commentaryStore.rightCommentatorTwitter"
:label="t('commentaryTwitterText')"
:rules="twitterRules"
:maxlength="TWITTER_MAX_LENGTH"
dense
class="commentary-panel__field"
@update:model-value="handleRightTwitterInput"
/>
<Transition name="commentary-panel__preview">
<div
v-if="rightHandlePreview"
class="commentary-panel__handle-preview"
>
{{ rightHandlePreview }}
</div>
</Transition>
</div>
</div>
</div>
@@ -89,6 +189,35 @@ const commentaryStore = useCommentaryStore();
gap: 2px;
}
/* Center controls column */
.commentary-panel__center-controls {
display: flex;
flex-direction: column;
align-items: center;
gap: 8px;
}
.commentary-panel__clear-btn {
color: rgba(255, 255, 255, 0.45);
transition: color 0.2s ease;
}
.commentary-panel__clear-btn:not(:disabled):hover {
color: rgba(255, 255, 255, 0.9);
}
/* Swap button */
.commentary-panel__swap-btn {
color: #fff;
opacity: 0.85;
}
.commentary-panel__swap-btn:hover {
opacity: 1;
text-shadow: 0 0 10px rgba(255, 255, 255, 0.45);
}
/* Fields */
.commentary-panel__field :deep(.q-field__control) {
min-height: 28px;
padding: 0;
@@ -112,14 +241,27 @@ const commentaryStore = useCommentaryStore();
color: rgba(255, 255, 255, 0.92);
}
.commentary-panel__swap-btn {
color: #fff;
opacity: 0.85;
/* Handle preview */
.commentary-panel__handle-preview {
margin-top: 4px;
font-size: 0.72rem;
color: rgba(255, 255, 255, 0.45);
letter-spacing: 0.02em;
padding-left: 2px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.commentary-panel__swap-btn:hover {
opacity: 1;
text-shadow: 0 0 10px rgba(255, 255, 255, 0.45);
.commentary-panel__preview-enter-active,
.commentary-panel__preview-leave-active {
transition: opacity 0.2s ease, transform 0.2s ease;
}
.commentary-panel__preview-enter-from,
.commentary-panel__preview-leave-to {
opacity: 0;
transform: translateY(-4px);
}
@media (max-width: 900px) {
@@ -127,8 +269,9 @@ const commentaryStore = useCommentaryStore();
grid-template-columns: 1fr;
}
.commentary-panel__swap-btn {
.commentary-panel__center-controls {
justify-self: center;
flex-direction: row;
}
}
</style>
@@ -0,0 +1,324 @@
<script setup lang="ts">
// src/dashboard/scoreboard/components/GamePackDownloadDialog.vue
// ─────────────────────────────────────────────────────────────────────────────
// Shown when the user clicks a game that is not yet installed.
// Displays size, character roster, and a download progress bar.
// ─────────────────────────────────────────────────────────────────────────────
import { computed, watch } from 'vue';
import { getPackLogoUrl } from '../../../shared/domain/packs/config';
import type { PackRegistryEntry } from '../../../shared/domain/packs/types';
import { usePackRegistry } from '../composables/usePackRegistry';
// ── Props / emits ─────────────────────────────────────────────────────────────
const props = defineProps<{
/** v-model visibility */
modelValue: boolean;
/** The registry entry for the game the user wants to download/update */
packEntry: PackRegistryEntry | null;
/** When true the dialog shows "update" language and calls updatePack instead of downloadPack */
isUpdate?: boolean;
/** Version info shown in update mode */
updateInfo?: { installedVersion: string; latestVersion: string };
}>();
const emit = defineEmits<{
'update:modelValue': [value: boolean];
/** Emitted after a successful download/update so the parent can switch to the game */
downloaded: [gameName: string];
}>();
// ── Pack registry ─────────────────────────────────────────────────────────────
const packRegistry = usePackRegistry();
// ── Computed ──────────────────────────────────────────────────────────────────
const downloadState = computed(() =>
props.packEntry ? packRegistry.getDownloadState(props.packEntry.id) : null,
);
const isDownloading = computed(() =>
downloadState.value?.status === 'downloading' ||
downloadState.value?.status === 'fetching-manifest',
);
const isDone = computed(() => downloadState.value?.status === 'done');
const isError = computed(() => downloadState.value?.status === 'error');
const progress = computed(() => downloadState.value?.progress ?? 0);
// Pre-install: show logo directly from Gitea (pack not on disk yet).
// Update mode: pack is installed, serve from local /packs/ route.
const logoSrc = computed(() => {
if (!props.packEntry) return '';
if (props.isUpdate) return packRegistry.getLocalLogoUrl(props.packEntry.id);
return getPackLogoUrl(props.packEntry.id);
});
// Close automatically once download completes and emit so parent sets the game
watch(isDone, (done) => {
if (done && props.packEntry) {
emit('downloaded', props.packEntry.name);
emit('update:modelValue', false);
}
});
// ── Actions ───────────────────────────────────────────────────────────────────
const startDownload = () => {
if (!props.packEntry) return;
if (props.isUpdate) {
packRegistry.updatePack(props.packEntry.id);
} else {
packRegistry.downloadPack(props.packEntry.id);
}
};
const close = () => emit('update:modelValue', false);
</script>
<template>
<QDialog
:model-value="modelValue"
persistent
@update:model-value="emit('update:modelValue', $event)"
>
<QCard
v-if="packEntry"
class="pack-download-dialog"
>
<!-- Header -->
<QCardSection class="pack-download-dialog__header">
<div class="pack-download-dialog__title-row">
<div>
<div class="text-h6 text-weight-bold">
{{ packEntry.name }}
</div>
<div class="text-caption text-grey-5">
<template v-if="isUpdate && updateInfo">
Bundled v{{ updateInfo.installedVersion }}
<span class="text-positive">v{{ updateInfo.latestVersion }}</span>
· {{ packEntry.characterCount }} personajes
</template>
<template v-else>
v{{ packEntry.version }} · {{ packEntry.characterCount }} personajes ·
{{ packRegistry.formatBytes(packEntry.totalSizeBytes) }}
</template>
</div>
</div>
<QBtn
v-if="!isDownloading"
flat
round
dense
icon="close"
@click="close"
/>
</div>
<!-- Banner: logo del juego con gradiente de fallback -->
<div
class="pack-download-dialog__banner"
:style="{
background: `linear-gradient(135deg, ${packEntry.palette.start}, ${packEntry.palette.end})`,
}"
>
<img
v-if="logoSrc"
:src="logoSrc"
class="pack-download-dialog__logo"
alt=""
@error="($event.target as HTMLImageElement).style.display = 'none'"
/>
<QIcon
:name="isUpdate ? 'upgrade' : 'sports_esports'"
size="40px"
color="white"
class="pack-download-dialog__banner-icon"
/>
</div>
<!-- Version info shown only in update mode -->
<div
v-if="isUpdate && updateInfo"
class="pack-download-dialog__version-badge"
>
<span class="text-grey-5">v{{ updateInfo.installedVersion }}</span>
<QIcon name="arrow_forward" size="14px" color="grey-5" />
<span class="text-positive text-weight-bold">v{{ updateInfo.latestVersion }}</span>
</div>
</QCardSection>
<QSeparator />
<!-- Progress / error -->
<QCardSection
v-if="isDownloading || isDone || isError"
class="pack-download-dialog__progress-section"
>
<div
v-if="isError"
class="pack-download-dialog__error"
>
<QIcon
name="error"
color="negative"
size="20px"
/>
<span>{{ downloadState?.error ?? 'Error desconocido' }}</span>
</div>
<template v-else>
<div class="pack-download-dialog__progress-label">
<span>{{ isDownloading ? 'Descargando…' : '¡Listo!' }}</span>
<span>{{ progress }}%</span>
</div>
<QLinearProgress
:value="progress / 100"
:color="isDone ? 'positive' : 'primary'"
rounded
size="8px"
/>
</template>
</QCardSection>
<!-- Character list -->
<QCardSection class="pack-download-dialog__char-section">
<div class="text-caption text-grey-5 q-mb-sm">
Personajes incluidos
</div>
<!-- We only have the count in the registry entry; the full list lives
in the manifest. Show a placeholder grid until the registry has
a characters array (future enhancement: include it in registry.json). -->
<div class="pack-download-dialog__char-count">
<QIcon
name="sports_martial_arts"
size="16px"
/>
{{ packEntry.characterCount }} personajes en este pack
</div>
</QCardSection>
<QSeparator />
<!-- Actions -->
<QCardActions
align="right"
class="q-pa-md"
>
<QBtn
v-if="!isDownloading"
flat
label="Cancelar"
color="grey-5"
@click="close"
/>
<QBtn
v-if="!isDownloading && !isDone"
unelevated
:label="isError ? 'Reintentar' : isUpdate ? 'Actualizar pack' : 'Descargar pack'"
:color="isUpdate ? 'positive' : 'primary'"
:icon="isUpdate ? 'upgrade' : 'download'"
@click="startDownload"
/>
<QBtn
v-if="isDownloading"
flat
:label="isUpdate ? 'Actualizando…' : 'Descargando…'"
:color="isUpdate ? 'positive' : 'primary'"
loading
disable
/>
</QCardActions>
</QCard>
</QDialog>
</template>
<style scoped>
.pack-download-dialog {
width: 420px;
max-width: 95vw;
border-radius: 12px;
overflow: hidden;
}
.pack-download-dialog__header {
padding-bottom: 0;
}
.pack-download-dialog__title-row {
display: flex;
align-items: flex-start;
justify-content: space-between;
margin-bottom: 14px;
}
.pack-download-dialog__banner {
position: relative;
height: 88px;
border-radius: 10px;
margin-bottom: 4px;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
.pack-download-dialog__logo {
position: absolute;
inset: 0;
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 10px;
}
.pack-download-dialog__banner-icon {
position: relative; /* above the logo */
opacity: 0.25;
}
.pack-download-dialog__progress-section {
padding-top: 12px;
padding-bottom: 12px;
}
.pack-download-dialog__progress-label {
display: flex;
justify-content: space-between;
font-size: 13px;
margin-bottom: 6px;
color: rgba(255, 255, 255, 0.75);
}
.pack-download-dialog__error {
display: flex;
align-items: center;
gap: 8px;
color: var(--q-negative);
font-size: 13px;
}
.pack-download-dialog__char-section {
padding-top: 10px;
padding-bottom: 10px;
}
.pack-download-dialog__char-count {
display: flex;
align-items: center;
gap: 6px;
font-size: 14px;
color: rgba(255, 255, 255, 0.85);
}
.pack-download-dialog__version-badge {
display: flex;
align-items: center;
gap: 6px;
font-size: 13px;
margin-top: 8px;
}
</style>
@@ -0,0 +1,549 @@
<script setup lang="ts">
import { computed, inject } from 'vue';
import { CHARACTER_GAME_KEY } from '../composables/useCharacterGame';
import { usePlayerSide } from '../composables/usePlayerSide';
import { t } from '../i18n';
import { useScoreboardStore } from '../../stores/scoreboard';
// ---------------------------------------------------------------------------
// Props
// ---------------------------------------------------------------------------
const props = defineProps<{
side: 'left' | 'right';
}>();
// ---------------------------------------------------------------------------
// Store & composables
// ---------------------------------------------------------------------------
const scoreboardStore = useScoreboardStore();
const player = usePlayerSide(props.side);
const {
leftCharacterOptions,
rightCharacterOptions,
leftCharacterInput,
rightCharacterInput,
leftCharacterImage,
rightCharacterImage,
onLeftCharacterFilter,
onRightCharacterFilter,
} = inject(CHARACTER_GAME_KEY)!;
// ---------------------------------------------------------------------------
// Side-specific derivations from the injected character game state
// ---------------------------------------------------------------------------
const isLeft = computed(() => props.side === 'left');
/**
* Character options for this side. Refs from the shared composable are
* accessed directly so Vue's reactivity tracks them correctly.
*/
const characterOptions = computed(() =>
isLeft.value ? leftCharacterOptions.value : rightCharacterOptions.value,
);
/**
* Two-way binding for QSelect's input-value (the display text).
* The setter writes back into the shared composable's ref so that watchers
* in useCharacterGame can update the cache correctly.
*/
const characterInputValue = computed({
get: () => (isLeft.value ? leftCharacterInput.value : rightCharacterInput.value),
set: (v) => {
if (isLeft.value) leftCharacterInput.value = v;
else rightCharacterInput.value = v;
},
});
const panelImage = computed(() =>
isLeft.value ? leftCharacterImage.value : rightCharacterImage.value,
);
const onCharacterFilter = computed(() =>
isLeft.value ? onLeftCharacterFilter : onRightCharacterFilter,
);
/**
* Two-way binding for the character value stored in the scoreboard.
*/
const character = computed({
get: () => (isLeft.value
? scoreboardStore.scoreboard.leftCharacter
: scoreboardStore.scoreboard.rightCharacter),
set: (v) => {
scoreboardStore.setSideCharacter(props.side, v);
},
});
// ---------------------------------------------------------------------------
// i18n helpers resolved at runtime so the side label is correct
// ---------------------------------------------------------------------------
const sideLabel = computed(() => t(isLeft.value ? 'scoreboardLeft' : 'scoreboardRight'));
const sideImageLabel = computed(() => t(isLeft.value ? 'scoreboardLeftImage' : 'scoreboardRightImage'));
</script>
<template>
<!--
Left layout: [image-column | controls]
Right layout: [controls | image-column]
The DOM order differs between sides intentionally so that the character
image always appears on the outer edge and the controls face the center.
CSS column widths are flipped via .scoreboard-preview__side--right.
-->
<div
class="scoreboard-preview__side"
:class="{ 'scoreboard-preview__side--right': !isLeft }"
>
<div class="scoreboard-preview__side-inner">
<!-- LEFT: image first, then controls -->
<template v-if="isLeft">
<!-- Character image + character selector -->
<div class="scoreboard-preview__image-column">
<div class="scoreboard-preview__image-wrap">
<img
v-if="panelImage"
:src="panelImage"
:alt="`${player.displayName.value || sideLabel} ${t('scoreboardPreview')}`"
class="scoreboard-preview__image"
>
<div
v-else
class="scoreboard-preview__empty"
>
{{ sideImageLabel }}
</div>
</div>
<QSelect
v-model="character"
v-model:input-value="characterInputValue"
:options="characterOptions"
option-value="value"
option-label="label"
emit-value
map-options
:label="t('scoreboardLabelCharacter')"
dense
use-input
input-debounce="0"
hide-selected
fill-input
clearable
class="scoreboard-preview__field scoreboard-preview__character-field"
:disable="!scoreboardStore.scoreboard.game"
@filter="onCharacterFilter"
>
<template #prepend>
<QIcon name="sports_martial_arts" />
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel class="scoreboard-preview__character-option">
{{ scope.opt.label }}
<span
v-if="scope.opt.dlc"
class="scoreboard-preview__dlc-badge"
>DLC</span>
</QItemLabel>
</QItemSection>
</QItem>
</template>
</QSelect>
</div>
<!-- Player / team / country controls -->
<div class="scoreboard-preview__controls">
<QSelect
v-model="player.playerId.value"
v-model:input-value="player.inputValue.value"
:options="player.playerOptions.value"
:label="t('scoreboardLabelPlayer')"
dense
emit-value
map-options
use-input
input-debounce="0"
hide-selected
fill-input
options-dense
class="scoreboard-preview__field"
@filter="player.onFilter"
@focus="player.onFocus"
@blur="player.onBlur"
@update:model-value="player.onSelect"
>
<template #prepend>
<QIcon name="person" />
</template>
<template #append>
<QBtn
v-if="player.showsNameSave.value"
flat
round
dense
icon="save"
color="primary"
@click.stop="player.onNameSave"
/>
</template>
</QSelect>
<QInput
v-model="player.teamOverride.value"
:label="t('scoreboardLabelTeam')"
dense
class="scoreboard-preview__field"
>
<template #prepend>
<QIcon name="groups" />
</template>
<template #append>
<QBtn
v-if="player.teamChanged.value"
flat
round
dense
icon="save"
color="primary"
@click.stop="player.saveTeamChange"
/>
</template>
</QInput>
<QSelect
v-model="player.countryOverride.value"
v-model:input-value="player.countryInput.value"
:options="player.filteredCountryOptions.value"
option-value="value"
option-label="label"
emit-value
map-options
use-input
input-debounce="0"
hide-selected
fill-input
clearable
:label="t('scoreboardLabelCountry')"
dense
class="scoreboard-preview__field"
@filter="player.onCountryFilter"
>
<template #prepend>
<QIcon name="flag" />
</template>
<template #append>
<QBtn
v-if="player.countryChanged.value"
flat
round
dense
icon="save"
color="primary"
@click.stop="player.saveCountryChange"
/>
</template>
</QSelect>
</div>
</template>
<!-- RIGHT: controls first, then image -->
<template v-else>
<!-- Player / team / country controls -->
<div class="scoreboard-preview__controls">
<QSelect
v-model="player.playerId.value"
v-model:input-value="player.inputValue.value"
:options="player.playerOptions.value"
:label="t('scoreboardLabelPlayer')"
dense
emit-value
map-options
use-input
input-debounce="0"
hide-selected
fill-input
options-dense
class="scoreboard-preview__field"
@filter="player.onFilter"
@focus="player.onFocus"
@blur="player.onBlur"
@update:model-value="player.onSelect"
>
<template #prepend>
<QIcon name="person" />
</template>
<template #append>
<QBtn
v-if="player.showsNameSave.value"
flat
round
dense
icon="save"
color="primary"
@click.stop="player.onNameSave"
/>
</template>
</QSelect>
<QInput
v-model="player.teamOverride.value"
:label="t('scoreboardLabelTeam')"
dense
class="scoreboard-preview__field"
>
<template #prepend>
<QIcon name="groups" />
</template>
<template #append>
<QBtn
v-if="player.teamChanged.value"
flat
round
dense
icon="save"
color="primary"
@click.stop="player.saveTeamChange"
/>
</template>
</QInput>
<QSelect
v-model="player.countryOverride.value"
v-model:input-value="player.countryInput.value"
:options="player.filteredCountryOptions.value"
option-value="value"
option-label="label"
emit-value
map-options
use-input
input-debounce="0"
hide-selected
fill-input
clearable
:label="t('scoreboardLabelCountry')"
dense
class="scoreboard-preview__field"
@filter="player.onCountryFilter"
>
<template #prepend>
<QIcon name="flag" />
</template>
<template #append>
<QBtn
v-if="player.countryChanged.value"
flat
round
dense
icon="save"
color="primary"
@click.stop="player.saveCountryChange"
/>
</template>
</QSelect>
</div>
<!-- Character image + character selector -->
<div class="scoreboard-preview__image-column">
<div class="scoreboard-preview__image-wrap">
<img
v-if="panelImage"
:src="panelImage"
:alt="`${player.displayName.value || sideLabel} ${t('scoreboardPreview')}`"
class="scoreboard-preview__image"
>
<div
v-else
class="scoreboard-preview__empty"
>
{{ sideImageLabel }}
</div>
</div>
<QSelect
v-model="character"
v-model:input-value="characterInputValue"
:options="characterOptions"
option-value="value"
option-label="label"
emit-value
map-options
:label="t('scoreboardLabelCharacter')"
dense
use-input
input-debounce="0"
hide-selected
fill-input
clearable
class="scoreboard-preview__field scoreboard-preview__character-field"
:disable="!scoreboardStore.scoreboard.game"
@filter="onCharacterFilter"
>
<template #prepend>
<QIcon name="sports_martial_arts" />
</template>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel class="scoreboard-preview__character-option">
{{ scope.opt.label }}
<span
v-if="scope.opt.dlc"
class="scoreboard-preview__dlc-badge"
>DLC</span>
</QItemLabel>
</QItemSection>
</QItem>
</template>
</QSelect>
</div>
</template>
</div>
</div>
</template>
<style scoped>
.scoreboard-preview__side {
display: flex;
align-items: center;
}
.scoreboard-preview__side-inner {
width: 100%;
display: grid;
grid-template-columns: minmax(220px, 320px) minmax(180px, 1fr);
align-items: center;
gap: 14px;
}
.scoreboard-preview__side--right {
text-align: right;
}
.scoreboard-preview__side--right .scoreboard-preview__side-inner {
grid-template-columns: minmax(180px, 1fr) minmax(220px, 320px);
}
.scoreboard-preview__image-column {
width: min(100%, 320px);
display: flex;
flex-direction: column;
gap: 8px;
}
.scoreboard-preview__side .scoreboard-preview__image-column {
justify-self: start;
}
.scoreboard-preview__side--right .scoreboard-preview__image-column {
justify-self: end;
}
.scoreboard-preview__image-wrap {
position: relative;
width: min(100%, 320px);
aspect-ratio: 4 / 4;
overflow: visible;
contain: layout;
}
.scoreboard-preview__image {
position: absolute;
inset: 0;
display: block;
width: 100%;
height: 100%;
object-fit: contain;
object-position: center;
transform: scale(1.5);
transform-origin: center center;
pointer-events: none;
}
.scoreboard-preview__empty {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
color: rgba(255, 255, 255, 0.65);
font-weight: 600;
}
.scoreboard-preview__controls {
width: min(100%, 260px);
justify-self: center;
display: flex;
flex-direction: column;
gap: 6px;
}
.scoreboard-preview__field {
margin: 0;
}
.scoreboard-preview__character-field {
margin-top: 2px;
}
.scoreboard-preview__field :deep(.q-field__control) {
min-height: 28px;
padding: 0;
background: transparent !important;
border-radius: 0;
}
.scoreboard-preview__field :deep(.q-field__control:before),
.scoreboard-preview__field :deep(.q-field__control:after) {
border: 0;
border-bottom: 1px solid rgba(255, 255, 255, 0.34);
}
.scoreboard-preview__field :deep(.q-field__native),
.scoreboard-preview__field :deep(.q-field__input),
.scoreboard-preview__field :deep(.q-field__label) {
color: rgba(255, 255, 255, 0.92);
}
.scoreboard-preview__character-option {
display: flex;
align-items: center;
gap: 6px;
}
.scoreboard-preview__dlc-badge {
display: inline-flex;
align-items: center;
padding: 1px 5px;
border-radius: 3px;
font-size: 9px;
font-weight: 700;
letter-spacing: 0.05em;
line-height: 14px;
background: rgba(139, 92, 246, 0.2);
color: #a78bfa;
border: 1px solid rgba(139, 92, 246, 0.45);
flex-shrink: 0;
}
@media (max-width: 900px) {
.scoreboard-preview__image-wrap {
width: min(100%, 280px);
}
.scoreboard-preview__side-inner {
grid-template-columns: 1fr;
align-items: flex-start;
justify-items: flex-start;
}
.scoreboard-preview__side--right {
text-align: left;
}
.scoreboard-preview__side--right .scoreboard-preview__side-inner {
grid-template-columns: 1fr;
}
}
</style>
@@ -0,0 +1,308 @@
<script setup lang="ts">
import { inject, onMounted, onUnmounted, ref } from 'vue';
import { CHARACTER_GAME_KEY } from '../composables/useCharacterGame';
import { usePackRegistry } from '../composables/usePackRegistry';
import { t } from '../i18n';
import { useScoreboardStore } from '../../stores/scoreboard';
import GamePackDownloadDialog from './GamePackDownloadDialog.vue';
const scoreboardStore = useScoreboardStore();
const packRegistry = usePackRegistry();
const {
gameInput,
fightingGameOptions,
onGameFilter,
handleGameSelect,
pendingDownloadEntry,
showDownloadDialog,
} = inject(CHARACTER_GAME_KEY)!;
// Refresca el catálogo al montar y luego cada 15 segundos automáticamente.
// Si Gitea no está disponible se usa la caché persistida del replicante.
onMounted(() => {
packRegistry.startRegistryRefresh();
});
onUnmounted(() => {
packRegistry.stopRegistryRefresh();
});
const adjustLeftScore = (delta: number) => {
scoreboardStore.adjustScore('left', delta);
};
const adjustRightScore = (delta: number) => {
scoreboardStore.adjustScore('right', delta);
};
/** Tras una descarga exitosa, activa el juego en el store. */
const onPackDownloaded = (gameName: string) => {
scoreboardStore.setGame(gameName);
};
// ── Estado del diálogo de actualización ───────────────────────────────────────
const pendingUpdateEntry = ref<import('../../../shared/domain/packs/types').PackRegistryEntry | null>(null);
const pendingUpdateInfo = ref<{ installedVersion: string; latestVersion: string } | undefined>(undefined);
const showUpdateDialog = ref(false);
const openUpdateDialog = (opt: import('../../../shared/domain/packs/types').GameSelectOption, event: Event) => {
event.stopPropagation(); // evitar que el QItem cambie la selección
pendingUpdateEntry.value = opt.registryEntry;
pendingUpdateInfo.value = opt.updateInfo;
showUpdateDialog.value = true;
};
</script>
<template>
<div class="scoreboard-preview__center">
<!--
v-model :model-value + @update:model-value para interceptar la
selección de juegos no instalados antes de escribir en el store.
-->
<QSelect
:model-value="scoreboardStore.scoreboard.game"
v-model:input-value="gameInput"
:options="fightingGameOptions"
:label="t('scoreboardLabelGame')"
dense
emit-value
map-options
use-input
input-debounce="0"
hide-selected
fill-input
class="scoreboard-preview__field scoreboard-preview__game-field"
@filter="onGameFilter"
@update:model-value="handleGameSelect"
>
<template #prepend>
<QIcon name="sports_esports" />
</template>
<!-- Slot personalizado: muestra iconos de descarga o actualización según el estado -->
<template #option="scope">
<QItem
v-bind="scope.itemProps"
:class="{ 'pack-option--unavailable': !scope.opt.available }"
>
<QItemSection>
<QItemLabel>{{ scope.opt.label }}</QItemLabel>
</QItemSection>
<!-- Icono de actualización disponible (pack instalado, versión nueva en repo) -->
<QItemSection
v-if="scope.opt.available && scope.opt.updateInfo"
side
>
<QBtn
flat
round
dense
size="xs"
icon="upgrade"
color="positive"
@click="openUpdateDialog(scope.opt, $event)"
>
<QTooltip>
Actualización disponible:
v{{ scope.opt.updateInfo.installedVersion }}
v{{ scope.opt.updateInfo.latestVersion }}
</QTooltip>
</QBtn>
</QItemSection>
<!-- Icono de descarga (pack no instalado) -->
<QItemSection
v-else-if="!scope.opt.available"
side
>
<QIcon
name="download"
size="16px"
color="grey-5"
>
<QTooltip>Pack no instalado haz clic para descargarlo</QTooltip>
</QIcon>
</QItemSection>
</QItem>
</template>
</QSelect>
<div class="scoreboard-preview__score-controls">
<div class="scoreboard-preview__score-side">
<QBtn
flat
dense
round
size="sm"
icon="add"
@click="adjustLeftScore(1)"
/>
<span class="scoreboard-preview__score-value">
{{ scoreboardStore.scoreboard.leftScore }}
</span>
<QBtn
flat
dense
round
size="sm"
icon="remove"
@click="adjustLeftScore(-1)"
/>
</div>
<span class="scoreboard-preview__dash">-</span>
<div class="scoreboard-preview__score-side">
<QBtn
flat
dense
round
size="sm"
icon="add"
@click="adjustRightScore(1)"
/>
<span class="scoreboard-preview__score-value">
{{ scoreboardStore.scoreboard.rightScore }}
</span>
<QBtn
flat
dense
round
size="sm"
icon="remove"
@click="adjustRightScore(-1)"
/>
</div>
</div>
<div class="scoreboard-preview__actions">
<QBtn
flat
dense
icon="swap_horiz"
class="scoreboard-preview__action-btn"
@click="scoreboardStore.swapPlayers"
/>
<QBtn
flat
dense
icon="restart_alt"
class="scoreboard-preview__action-btn"
@click="scoreboardStore.resetScores"
/>
</div>
</div>
<!-- Dialog de descarga se abre automáticamente al seleccionar un juego no instalado -->
<GamePackDownloadDialog
v-model="showDownloadDialog"
:pack-entry="pendingDownloadEntry"
@downloaded="onPackDownloaded"
/>
<!-- Dialog de actualización se abre al hacer clic en el icono de upgrade -->
<GamePackDownloadDialog
v-model="showUpdateDialog"
:pack-entry="pendingUpdateEntry"
:is-update="true"
:update-info="pendingUpdateInfo"
@downloaded="onPackDownloaded"
/>
</template>
<style scoped>
.scoreboard-preview__center {
display: flex;
flex-direction: column;
align-items: center;
align-self: stretch;
justify-content: flex-start;
padding-top: 2px;
gap: 10px;
}
.scoreboard-preview__game-field {
width: min(100%, 240px);
margin-bottom: 56px;
}
.scoreboard-preview__score-controls {
display: flex;
align-items: center;
justify-content: center;
gap: 18px;
}
.scoreboard-preview__score-side {
display: inline-flex;
flex-direction: column;
align-items: center;
gap: 4px;
}
.scoreboard-preview__score-value {
min-width: 64px;
text-align: center;
font-size: clamp(4rem, 7vw, 5.6rem);
font-weight: 800;
line-height: 1;
}
.scoreboard-preview__dash {
opacity: 0.7;
font-size: clamp(3rem, 5vw, 4rem);
font-weight: 700;
}
.scoreboard-preview__actions {
display: flex;
align-items: center;
gap: 10px;
}
.scoreboard-preview__action-btn {
color: #fff;
opacity: 0.85;
}
.scoreboard-preview__action-btn:hover {
opacity: 1;
text-shadow: 0 0 10px rgba(255, 255, 255, 0.45);
}
/* Shared field styles (used by QSelect inside this panel) */
.scoreboard-preview__field {
margin: 0;
}
.scoreboard-preview__field :deep(.q-field__control) {
min-height: 28px;
padding: 0;
background: transparent !important;
border-radius: 0;
}
.scoreboard-preview__field :deep(.q-field__control:before),
.scoreboard-preview__field :deep(.q-field__control:after) {
border: 0;
border-bottom: 1px solid rgba(255, 255, 255, 0.34);
}
.scoreboard-preview__field :deep(.q-field__native),
.scoreboard-preview__field :deep(.q-field__input),
.scoreboard-preview__field :deep(.q-field__label) {
color: rgba(255, 255, 255, 0.92);
}
/* Atenúa visualmente los juegos no instalados en el desplegable */
.pack-option--unavailable {
opacity: 0.6;
}
.pack-option--unavailable:hover {
opacity: 1;
}
</style>
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,281 @@
// src/dashboard/scoreboard/composables/useCharacterGame.ts
// ─────────────────────────────────────────────────────────────────────────────
// Manages game selection and character state for both PlayerSidePanels.
// Must be called ONCE in ScoreboardPanel and provided via CHARACTER_GAME_KEY.
//
// Changes from original:
// - fightingGameOptions is now driven by the pack registry (allGameOptions)
// rather than a static hardcoded list. It falls back to bundled names
// while the registry loads.
// - Game selection is intercepted: selecting an unavailable game triggers
// the download dialog instead of updating the store.
// - pendingDownloadEntry / showDownloadDialog are exposed for ScoreCenterPanel.
// ─────────────────────────────────────────────────────────────────────────────
import { computed, ref, watch, type InjectionKey, type Ref } from 'vue';
import type { FightingCharacterOption } from '../../../shared/domain/packs/characters';
import type { GameSelectOption, PackRegistryEntry } from '../../../shared/domain/packs/types';
import { useScoreboardStore } from '../../stores/scoreboard';
import { usePackRegistry } from './usePackRegistry';
// ── Types ─────────────────────────────────────────────────────────────────────
export type CharacterOption = FightingCharacterOption;
export type CharacterGameContext = ReturnType<typeof useCharacterGame>;
export const CHARACTER_GAME_KEY: InjectionKey<CharacterGameContext> = Symbol('characterGame');
// ── Composable ────────────────────────────────────────────────────────────────
export function useCharacterGame() {
const scoreboardStore = useScoreboardStore();
const packRegistry = usePackRegistry();
// ── Game selector state ───────────────────────────────────────────────────
const gameInput = ref('');
/**
* Game options surfaced to the QSelect.
* Populated from the pack registry when available; falls back to bundled games.
* GameSelectOption includes an `available` flag used to show the download icon.
*/
const fightingGameOptions = ref<GameSelectOption[]>([]);
// Keep fightingGameOptions in sync when the registry updates
watch(
packRegistry.allGameOptions,
(options) => {
fightingGameOptions.value = options;
},
);
// ── Download dialog state ─────────────────────────────────────────────────
/** Set when the user selects a game that isn't installed yet. */
const pendingDownloadEntry = ref<PackRegistryEntry | null>(null);
const showDownloadDialog = ref(false);
/**
* Intercepting setter for the game selector.
* If the selected game is not available, opens the download dialog instead
* of writing to the store.
*/
const handleGameSelect = (gameName: string) => {
if (!gameName) {
scoreboardStore.setGame('');
return;
}
if (!packRegistry.isGameAvailable(gameName)) {
const entry = fightingGameOptions.value.find((o) => o.value === gameName)?.registryEntry ?? null;
pendingDownloadEntry.value = entry;
showDownloadDialog.value = true;
// Do NOT update the store — the game isn't installed
return;
}
scoreboardStore.setGame(gameName);
};
// ── Character state ───────────────────────────────────────────────────────
const characterOptions = computed(() => {
return packRegistry.getCharactersByGame(scoreboardStore.scoreboard.game);
});
const leftCharacterOptions = ref<CharacterOption[]>([]);
const rightCharacterOptions = ref<CharacterOption[]>([]);
const leftCharacterInput = ref('');
const rightCharacterInput = ref('');
const charactersByGame = ref<Record<string, { leftCharacter: string; rightCharacter: string }>>({});
const leftCharacterImage = computed(() => {
const match = characterOptions.value.find(
(o) => o.value === scoreboardStore.scoreboard.leftCharacter,
);
return match?.image ?? '';
});
const rightCharacterImage = computed(() => {
const match = characterOptions.value.find(
(o) => o.value === scoreboardStore.scoreboard.rightCharacter,
);
return match?.image ?? '';
});
// ── Filter handlers ───────────────────────────────────────────────────────
const onGameFilter = (value: string, update: (fn: () => void) => void) => {
update(() => {
const needle = value.toLowerCase().trim();
fightingGameOptions.value = needle
? packRegistry.allGameOptions.value.filter((g) =>
g.label.toLowerCase().includes(needle),
)
: packRegistry.allGameOptions.value;
});
};
const makeCharacterFilter =
(target: Ref<CharacterOption[]>) =>
(value: string, update: (fn: () => void) => void) => {
update(() => {
const needle = value.toLowerCase().trim();
target.value = needle
? characterOptions.value.filter((c) => c.label.toLowerCase().includes(needle))
: characterOptions.value;
});
};
const onLeftCharacterFilter = makeCharacterFilter(leftCharacterOptions);
const onRightCharacterFilter = makeCharacterFilter(rightCharacterOptions);
// ── Watchers ──────────────────────────────────────────────────────────────
// Keep gameInput display value in sync with the store
watch(
() => scoreboardStore.scoreboard.game,
(value) => {
const match = fightingGameOptions.value.find((o) => o.value === value);
gameInput.value = match?.label ?? value;
},
{ immediate: true },
);
// Handle game change: persist previous characters, restore or apply defaults
watch(
() => scoreboardStore.scoreboard.game,
(newGame, previousGame) => {
if (previousGame) {
charactersByGame.value[previousGame] = {
leftCharacter: scoreboardStore.scoreboard.leftCharacter,
rightCharacter: scoreboardStore.scoreboard.rightCharacter,
};
}
const options = packRegistry.getCharactersByGame(newGame);
// If the game is set but has no options yet, the pack is still loading
// (installed pack whose manifest has not been loaded into the pack store yet).
// Bail out — the characterOptions watcher below will restore state
// once the pack becomes available.
if (newGame && options.length === 0) return;
leftCharacterOptions.value = options;
rightCharacterOptions.value = options;
const allowed = new Set(options.map((o) => o.value));
const saved = newGame ? charactersByGame.value[newGame] : undefined;
const { leftCharacter: curLeft, rightCharacter: curRight } = scoreboardStore.scoreboard;
let nextLeft = saved?.leftCharacter ?? curLeft;
let nextRight = saved?.rightCharacter ?? curRight;
if (!allowed.has(nextLeft)) nextLeft = '';
if (!allowed.has(nextRight)) nextRight = '';
if ((!nextLeft || !nextRight) && (!curLeft || !curRight)) {
const defaults = packRegistry.getDefaultCharactersByGame(newGame);
if (defaults) {
if (!nextLeft) nextLeft = allowed.has(defaults.leftCharacter) ? defaults.leftCharacter : '';
if (!nextRight) nextRight = allowed.has(defaults.rightCharacter) ? defaults.rightCharacter : '';
}
}
if (allowed.has(nextLeft)) {
scoreboardStore.setSideCharacter('left', nextLeft);
} else if (!allowed.has(scoreboardStore.scoreboard.leftCharacter)) {
scoreboardStore.setSideCharacter('left', '');
leftCharacterInput.value = '';
}
if (allowed.has(nextRight)) {
scoreboardStore.setSideCharacter('right', nextRight);
} else if (!allowed.has(scoreboardStore.scoreboard.rightCharacter)) {
scoreboardStore.setSideCharacter('right', '');
rightCharacterInput.value = '';
}
},
{ immediate: true },
);
watch(
() => scoreboardStore.scoreboard.leftCharacter,
(value) => {
const match = characterOptions.value.find((o) => o.value === value);
leftCharacterInput.value = match?.label ?? '';
const game = scoreboardStore.scoreboard.game;
if (game) {
charactersByGame.value[game] = {
leftCharacter: value,
rightCharacter: scoreboardStore.scoreboard.rightCharacter,
};
}
},
{ immediate: true },
);
watch(
() => scoreboardStore.scoreboard.rightCharacter,
(value) => {
const match = characterOptions.value.find((o) => o.value === value);
rightCharacterInput.value = match?.label ?? '';
const game = scoreboardStore.scoreboard.game;
if (game) {
charactersByGame.value[game] = {
leftCharacter: scoreboardStore.scoreboard.leftCharacter,
rightCharacter: value,
};
}
},
{ immediate: true },
);
// When an installed pack manifest becomes available, re-validate characters
// already present in the replicated scoreboard state.
watch(characterOptions, (options) => {
const game = scoreboardStore.scoreboard.game;
if (!game) return;
if (options.length === 0) return;
const allowed = new Set(options.map((o) => o.value));
leftCharacterOptions.value = options;
rightCharacterOptions.value = options;
const { leftCharacter, rightCharacter } = scoreboardStore.scoreboard;
if (leftCharacter && allowed.has(leftCharacter)) {
leftCharacterInput.value = options.find((o) => o.value === leftCharacter)?.label ?? '';
} else if (leftCharacter && !allowed.has(leftCharacter)) {
scoreboardStore.setSideCharacter('left', '');
leftCharacterInput.value = '';
}
if (rightCharacter && allowed.has(rightCharacter)) {
rightCharacterInput.value = options.find((o) => o.value === rightCharacter)?.label ?? '';
} else if (rightCharacter && !allowed.has(rightCharacter)) {
scoreboardStore.setSideCharacter('right', '');
rightCharacterInput.value = '';
}
});
// ── Return ────────────────────────────────────────────────────────────────
return {
// Game selector
gameInput,
fightingGameOptions,
onGameFilter,
handleGameSelect,
// Download dialog
pendingDownloadEntry,
showDownloadDialog,
// Character state
leftCharacterOptions,
rightCharacterOptions,
leftCharacterInput,
rightCharacterInput,
leftCharacterImage,
rightCharacterImage,
onLeftCharacterFilter,
onRightCharacterFilter,
};
}
@@ -0,0 +1,36 @@
import { computed, ref, watch } from 'vue';
import { getCountryLabel, getCountryOptions } from '../../../shared/domain/players/countries';
import { locale } from '../i18n';
/**
* Manages filtered country options and the display input value
* for a single side of the scoreboard.
*
* @param getOverride - Getter returning the current country code override
*/
export function useCountryFilter(getOverride: () => string) {
const countryOptions = computed(() => getCountryOptions(locale.value));
const countryInput = ref('');
const filteredOptions = ref(countryOptions.value);
// Keep filtered list in sync when locale changes
watch(countryOptions, (opts) => {
filteredOptions.value = opts;
});
// Keep display input in sync with the stored country code
watch(getOverride, (value) => {
countryInput.value = getCountryLabel(value, locale.value);
}, { immediate: true });
const onFilter = (value: string, update: (fn: () => void) => void) => {
update(() => {
const needle = value.toLowerCase().trim();
filteredOptions.value = needle
? countryOptions.value.filter((c) => c.label.toLowerCase().includes(needle))
: countryOptions.value;
});
};
return { countryInput, filteredOptions, onFilter };
}
@@ -0,0 +1,436 @@
import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
import { sendIntegrationMessage } from '../../services/integration-message-service';
// ─── Tipos ─────────────────────────────────────────────────────────────────────
export interface IntegrationTournament {
id: string | number;
name: string;
slug: string;
startAt: number | null;
endAt: number | null;
}
export interface IntegrationPlayer {
id: string;
gamertag: string;
name: string;
team: string;
country: string;
twitter: string;
}
export interface TemporaryPlayerMeta {
expiresAt: number;
tournamentSlug: string;
}
export type TemporaryPlayersMap = Record<string, TemporaryPlayerMeta>;
interface TournamentOption {
label: string;
value: string;
caption: string;
}
interface OAuthSessionResponse {
sessionId: string;
authUrl: string;
}
interface OAuthStatusResponse {
status: 'pending' | 'completed' | 'error' | 'expired';
token?: string;
error?: string;
}
export interface PlayersStore {
upsertPlayer: (id: string, data: Omit<IntegrationPlayer, 'id'>) => void;
removePlayer: (id: string) => void;
}
export interface UseIntegrationOptions {
/** Prefijo de los mensajes NodeCG, p.ej. 'startgg' | 'challonge' */
messagePrefix: string;
/** Nombre legible del proveedor para mensajes de error */
providerLabel: string;
/** Clave de localStorage para el token */
tokenStorageKey: string;
/** Clave de localStorage para los jugadores temporales */
tempPlayersStorageKey: string;
/** Segundos que duran los jugadores temporales si el torneo no tiene endAt */
tempFallbackDurationSeconds: number;
/** Mensaje de error personalizado cuando la API devuelve 401 */
on401Message?: string;
/** Store de jugadores */
playersStore: PlayersStore;
}
// ─── Composable ────────────────────────────────────────────────────────────────
export function useIntegration(options: UseIntegrationOptions) {
const {
messagePrefix,
providerLabel,
tokenStorageKey,
tempPlayersStorageKey,
tempFallbackDurationSeconds,
on401Message,
playersStore,
} = options;
// ── Token ───────────────────────────────────────────────────────────────────
const token = ref(localStorage.getItem(tokenStorageKey) ?? '');
const hasValidatedToken = ref(false);
watch(token, (value) => {
localStorage.setItem(tokenStorageKey, value);
hasValidatedToken.value = false;
if (!value.trim()) {
recentTournaments.value = [];
selectedTournamentSlug.value = '';
tournamentInput.value = '';
tournamentsError.value = '';
}
});
// ── Lista de torneos ────────────────────────────────────────────────────────
const recentTournaments = ref<IntegrationTournament[]>([]);
const loadingTournaments = ref(false);
const tournamentsError = ref('');
const selectedTournamentSlug = ref('');
const tournamentInput = ref('');
const tournamentOptions = computed<TournamentOption[]>(() =>
recentTournaments.value.map((t) => ({
label: t.name,
value: t.slug,
caption: t.slug,
})),
);
const filteredTournamentOptions = ref<TournamentOption[]>(tournamentOptions.value);
watch(tournamentOptions, (value) => {
filteredTournamentOptions.value = value;
if (
selectedTournamentSlug.value &&
!recentTournaments.value.some((t) => t.slug === selectedTournamentSlug.value)
) {
selectedTournamentSlug.value = '';
tournamentInput.value = '';
}
});
const filterTournaments = (value: string, update: (cb: () => void) => void) => {
update(() => {
const needle = value.toLowerCase().trim();
filteredTournamentOptions.value = needle
? tournamentOptions.value.filter(
(o) =>
o.label.toLowerCase().includes(needle) ||
o.caption.toLowerCase().includes(needle),
)
: tournamentOptions.value;
});
};
const selectedTournamentOption = computed<IntegrationTournament | null>(
() => recentTournaments.value.find((t) => t.slug === selectedTournamentSlug.value) ?? null,
);
const canImportSelectedTournament = computed(() => Boolean(selectedTournamentOption.value));
const hasTokenConfigured = computed(() => Boolean(token.value.trim()));
const loadRecentTournaments = async () => {
const currentToken = token.value.trim();
if (!currentToken) {
tournamentsError.value = `Add your ${providerLabel} token to load tournaments.`;
recentTournaments.value = [];
return;
}
tournamentsError.value = '';
loadingTournaments.value = true;
try {
const tournaments = await sendIntegrationMessage<IntegrationTournament[]>(
messagePrefix,
'fetchRecentTournaments',
{ token: currentToken },
);
hasValidatedToken.value = true;
recentTournaments.value = tournaments;
if (!tournaments.length) {
tournamentsError.value = 'There are no recent tournaments for this account.';
}
} catch (error) {
hasValidatedToken.value = false;
const message = error instanceof Error ? error.message : 'Could not load tournaments.';
tournamentsError.value =
on401Message && message.includes('401') ? on401Message : message;
recentTournaments.value = [];
} finally {
loadingTournaments.value = false;
}
};
// ── Importación de jugadores ────────────────────────────────────────────────
const players = ref<IntegrationPlayer[]>([]);
const selectedPlayerIds = ref<string[]>([]);
const importDialogOpen = ref(false);
const importDialogError = ref('');
const loadingPlayers = ref(false);
const importingTournament = ref<IntegrationTournament | null>(null);
const openImportDialog = async (tournament: IntegrationTournament): Promise<void> => {
importingTournament.value = tournament;
importDialogOpen.value = true;
importDialogError.value = '';
loadingPlayers.value = true;
selectedPlayerIds.value = [];
selectedTournamentSlug.value = tournament.slug;
tournamentInput.value = tournament.name;
players.value = [];
try {
const importedPlayers = await sendIntegrationMessage<IntegrationPlayer[]>(
messagePrefix,
'fetchTournamentPlayers',
{ token: token.value.trim(), slug: tournament.slug },
);
players.value = importedPlayers;
selectedPlayerIds.value = importedPlayers.map((p) => p.id);
} catch (error) {
importDialogError.value =
error instanceof Error ? error.message : 'Could not load players';
importDialogOpen.value = false;
} finally {
loadingPlayers.value = false;
}
};
const openSelectedTournamentImportDialog = () => {
if (selectedTournamentOption.value) {
void openImportDialog(selectedTournamentOption.value);
}
};
const toggleAllPlayers = () => {
selectedPlayerIds.value =
selectedPlayerIds.value.length === players.value.length
? []
: players.value.map((p) => p.id);
};
const importSelectedPlayers = () => {
const selected = players.value.filter((p) => selectedPlayerIds.value.includes(p.id));
const tournament = importingTournament.value;
const fallbackEndAt =
(tournament?.startAt ?? Math.floor(Date.now() / 1000)) + tempFallbackDurationSeconds;
const expiresAt = tournament?.endAt ?? fallbackEndAt;
const nextMeta = { ...temporaryPlayers.value };
for (const player of selected) {
playersStore.upsertPlayer(player.id, {
gamertag: player.gamertag,
name: player.name,
team: player.team,
country: player.country,
twitter: player.twitter,
});
if (tournament) {
nextMeta[player.id] = { expiresAt, tournamentSlug: tournament.slug };
}
}
temporaryPlayers.value = nextMeta;
persistTemporaryPlayers();
importDialogOpen.value = false;
};
// ── Jugadores temporales ────────────────────────────────────────────────────
const loadTemporaryPlayers = (): TemporaryPlayersMap => {
try {
const raw = localStorage.getItem(tempPlayersStorageKey);
if (!raw) return {};
const parsed = JSON.parse(raw) as unknown;
if (typeof parsed !== 'object' || parsed === null) return {};
const result: TemporaryPlayersMap = {};
Object.entries(parsed as Record<string, unknown>).forEach(([playerId, value]) => {
if (!playerId || typeof value !== 'object' || value === null) return;
const candidate = value as Record<string, unknown>;
const expiresAt = Number(candidate.expiresAt);
const tournamentSlug = String(candidate.tournamentSlug ?? '').trim();
if (!Number.isFinite(expiresAt) || expiresAt <= 0 || !tournamentSlug) return;
result[playerId] = { expiresAt, tournamentSlug };
});
return result;
} catch {
return {};
}
};
const temporaryPlayers = ref<TemporaryPlayersMap>({});
const persistTemporaryPlayers = () => {
localStorage.setItem(tempPlayersStorageKey, JSON.stringify(temporaryPlayers.value));
};
/**
* Elimina del store y del mapa los jugadores temporales cuyo expiresAt
* ha pasado. Se llama periódicamente en onMounted.
*/
const cleanupExpiredTemporaryPlayers = () => {
const now = Math.floor(Date.now() / 1000);
const expiredIds = Object.entries(temporaryPlayers.value)
.filter(([, meta]) => meta.expiresAt <= now)
.map(([id]) => id);
if (!expiredIds.length) return;
const nextMeta = { ...temporaryPlayers.value };
for (const id of expiredIds) {
playersStore.removePlayer(id);
delete nextMeta[id];
}
temporaryPlayers.value = nextMeta;
persistTemporaryPlayers();
};
// ── OAuth ───────────────────────────────────────────────────────────────────
const oauthLoading = ref(false);
const oauthSessionId = ref('');
let oauthPollingTimer: ReturnType<typeof setInterval> | null = null;
const stopPolling = () => {
if (oauthPollingTimer) {
clearInterval(oauthPollingTimer);
oauthPollingTimer = null;
}
};
const checkOAuthStatus = async () => {
if (!oauthSessionId.value) return;
try {
const status = await sendIntegrationMessage<OAuthStatusResponse>(
messagePrefix,
'getOAuthSessionStatus',
{ sessionId: oauthSessionId.value },
);
if (status.status === 'completed' && status.token) {
token.value = status.token;
oauthLoading.value = false;
stopPolling();
oauthSessionId.value = '';
tournamentsError.value = '';
await loadRecentTournaments();
return;
}
if (status.status === 'error' || status.status === 'expired') {
oauthLoading.value = false;
stopPolling();
oauthSessionId.value = '';
tournamentsError.value =
status.error ?? `Could not complete OAuth login with ${providerLabel}.`;
}
} catch (error) {
oauthLoading.value = false;
stopPolling();
oauthSessionId.value = '';
tournamentsError.value =
error instanceof Error ? error.message : 'Could not verify OAuth status.';
}
};
const connectWithOAuth = async () => {
oauthLoading.value = true;
tournamentsError.value = '';
stopPolling();
try {
const session = await sendIntegrationMessage<OAuthSessionResponse>(
messagePrefix,
'createOAuthSession',
{},
);
oauthSessionId.value = session.sessionId;
window.open(session.authUrl, '_blank', 'noopener,noreferrer');
oauthPollingTimer = setInterval(() => {
void checkOAuthStatus();
}, 1500);
} catch (error) {
oauthLoading.value = false;
tournamentsError.value =
error instanceof Error ? error.message : `Could not start OAuth with ${providerLabel}.`;
}
};
// ── Ciclo de vida ───────────────────────────────────────────────────────────
let cleanupTimer: ReturnType<typeof setInterval> | null = null;
onMounted(() => {
temporaryPlayers.value = loadTemporaryPlayers();
cleanupExpiredTemporaryPlayers();
cleanupTimer = setInterval(cleanupExpiredTemporaryPlayers, 60 * 1000);
if (token.value.trim()) {
void loadRecentTournaments();
}
});
onBeforeUnmount(() => {
stopPolling();
if (cleanupTimer) {
clearInterval(cleanupTimer);
cleanupTimer = null;
}
});
// ── Retorno como reactive para auto-unwrap en templates ─────────────────────
return reactive({
// Token
token,
hasTokenConfigured,
hasValidatedToken,
// Torneos
recentTournaments,
loadingTournaments,
tournamentsError,
selectedTournamentSlug,
tournamentInput,
tournamentOptions,
filteredTournamentOptions,
selectedTournamentOption,
canImportSelectedTournament,
filterTournaments,
loadRecentTournaments,
// Importación
players,
selectedPlayerIds,
importDialogOpen,
importDialogError,
loadingPlayers,
importingTournament,
openImportDialog,
openSelectedTournamentImportDialog,
importSelectedPlayers,
toggleAllPlayers,
// Jugadores temporales
temporaryPlayers,
// OAuth
oauthLoading,
connectWithOAuth,
});
}
export type IntegrationHandle = ReturnType<typeof useIntegration>;
@@ -0,0 +1,68 @@
import { storeToRefs } from 'pinia';
import type { InjectionKey, Ref } from 'vue';
import { usePacksStore } from '../../stores/packs';
import type { DefaultCharacterPair, FightingCharacterOption } from '../../../shared/domain/packs/characters';
import type {
GameSelectOption,
PackDownloadState,
PackRegistry,
PackUpdateInfo,
} from '../../../shared/domain/packs/types';
export interface PackRegistryContext {
registry: Ref<PackRegistry | null>;
installedPackIds: Ref<string[]>;
downloadStates: Ref<Record<string, PackDownloadState>>;
isGameAvailable: (gameName: string) => boolean;
getDownloadState: (packId: string) => PackDownloadState;
getCharactersByGame: (gameName: string) => FightingCharacterOption[];
getDefaultCharactersByGame: (gameName: string) => DefaultCharacterPair | undefined;
allGameOptions: Ref<GameSelectOption[]>;
fetchRegistry: () => void;
startRegistryRefresh: (intervalMs?: number) => void;
stopRegistryRefresh: () => void;
downloadPack: (packId: string) => void;
uninstallPack: (packId: string) => void;
updatePack: (packId: string) => void;
availableUpdates: Ref<Record<string, PackUpdateInfo>>;
updateCount: Ref<number>;
formatBytes: (bytes: number) => string;
getLocalLogoUrl: (packId: string) => string;
}
export const PACK_REGISTRY_KEY: InjectionKey<PackRegistryContext> = Symbol('packRegistry');
export function usePackRegistry(): PackRegistryContext {
const packsStore = usePacksStore();
packsStore.initialize();
const {
registry,
installedPackIds,
downloadStates,
availableUpdates,
allGameOptions,
updateCount,
} = storeToRefs(packsStore);
return {
registry,
installedPackIds,
downloadStates,
isGameAvailable: packsStore.isGameAvailable,
getDownloadState: packsStore.getDownloadState,
getCharactersByGame: packsStore.getCharactersByGame,
getDefaultCharactersByGame: packsStore.getDefaultCharactersByGame,
allGameOptions,
fetchRegistry: packsStore.fetchRegistry,
startRegistryRefresh: packsStore.startRegistryRefresh,
stopRegistryRefresh: packsStore.stopRegistryRefresh,
downloadPack: packsStore.downloadPack,
uninstallPack: packsStore.uninstallPack,
updatePack: packsStore.updatePack,
availableUpdates,
updateCount,
formatBytes: packsStore.formatBytes,
getLocalLogoUrl: packsStore.getLocalLogoUrl,
};
}
@@ -0,0 +1,315 @@
import { computed, ref, watch, watchEffect } from 'vue';
import { useScoreboardStore } from '../../stores/scoreboard';
import { usePlayersStore } from '../../stores/players';
import type { Schemas } from '../../../types';
import { createPlayerId, normalizePlayerName } from '../../../shared/domain/players/state';
import { t } from '../i18n';
import { useCountryFilter } from './useCountryFilter';
// ---------------------------------------------------------------------------
// Constants (exported so components can compare against them)
// ---------------------------------------------------------------------------
export const CUSTOM_LEFT_PLAYER_ID = '__custom_left_player__';
export const CUSTOM_RIGHT_PLAYER_ID = '__custom_right_player__';
// ---------------------------------------------------------------------------
// Pure helpers (no Vue reactivity)
// ---------------------------------------------------------------------------
/**
* Encapsulates all reactive state and handlers for one side of the scoreboard
* (left or right). Call once per side inside the corresponding component.
*/
export function usePlayerSide(side: 'left' | 'right') {
const scoreboardStore = useScoreboardStore();
const playersStore = usePlayersStore();
const isLeft = side === 'left';
const CUSTOM_ID = isLeft ? CUSTOM_LEFT_PLAYER_ID : CUSTOM_RIGHT_PLAYER_ID;
// ---------------------------------------------------------------------------
// Two-way computed bindings to the store (avoids left/right if-chains in
// the template and keeps mutation contained to the composable)
// ---------------------------------------------------------------------------
const playerId = computed({
get: () => (isLeft ? scoreboardStore.scoreboard.leftPlayerId : scoreboardStore.scoreboard.rightPlayerId),
set: (v) => {
scoreboardStore.setSidePlayerId(side, v);
},
});
const nameOverride = computed({
get: () => (isLeft ? scoreboardStore.scoreboard.leftNameOverride : scoreboardStore.scoreboard.rightNameOverride),
set: (v) => {
scoreboardStore.setSideNameOverride(side, v);
},
});
const teamOverride = computed({
get: () => (isLeft ? scoreboardStore.scoreboard.leftTeamOverride : scoreboardStore.scoreboard.rightTeamOverride),
set: (v) => {
scoreboardStore.setSideTeamOverride(side, v);
},
});
const countryOverride = computed({
get: () => (isLeft ? scoreboardStore.scoreboard.leftCountryOverride : scoreboardStore.scoreboard.rightCountryOverride),
set: (v) => {
scoreboardStore.setSideCountryOverride(side, v);
},
});
// ---------------------------------------------------------------------------
// UI state
// ---------------------------------------------------------------------------
const filter = ref('');
const inputValue = ref('');
const focused = ref(false);
// Country filter (delegated to sub-composable)
const {
countryInput,
filteredOptions: filteredCountryOptions,
onFilter: onCountryFilter,
} = useCountryFilter(() => countryOverride.value);
// ---------------------------------------------------------------------------
// Player options
// ---------------------------------------------------------------------------
const allPlayerOptions = computed(() => {
const base = [{ label: t('scoreboardUnassigned'), value: '' }];
const entries = Object.entries(playersStore.players) as [string, Schemas.Players[string]][];
const mapped = entries.map(([id, player]) => ({
value: id,
label: player.gamertag || id,
}));
return base.concat(mapped);
});
/**
* Player options filtered by the current search input.
* Prepends the custom player entry when the user has typed a new name.
*/
const playerOptions = computed(() => {
const needle = filter.value.toLowerCase();
const options = needle
? allPlayerOptions.value.filter((o) => o.label.toLowerCase().includes(needle))
: allPlayerOptions.value;
if (playerId.value === CUSTOM_ID && nameOverride.value.trim()) {
return [{ value: CUSTOM_ID, label: nameOverride.value }, ...options];
}
return options;
});
const selectedPlayer = computed(() => playersStore.players[playerId.value]);
const getPlayerLabel = (id: string): string => {
if (id === CUSTOM_ID) return nameOverride.value;
return allPlayerOptions.value.find((o) => o.value === id)?.label ?? '';
};
const playerExistsByGamertag = (name: string): boolean => {
const normalized = normalizePlayerName(name);
return Boolean(normalized)
&& Object.values(playersStore.players).some(
(p) => normalizePlayerName(p.gamertag || '') === normalized,
);
};
// ---------------------------------------------------------------------------
// Derived state
// ---------------------------------------------------------------------------
const displayName = computed(
() => nameOverride.value || getPlayerLabel(playerId.value),
);
/** True when the typed name is new and can be saved as a new player. */
const canSave = computed(
() => Boolean(nameOverride.value.trim()) && !playerExistsByGamertag(nameOverride.value),
);
const teamChanged = computed(() => {
const player = selectedPlayer.value;
if (!player) return false;
return player.team !== teamOverride.value;
});
const countryChanged = computed(() => {
const player = selectedPlayer.value;
if (!player) return false;
return player.country !== countryOverride.value;
});
// Parentheses required: || and ?? cannot be mixed without them (TS5076)
const pendingGamertag = computed(
() => (nameOverride.value.trim() || selectedPlayer.value?.gamertag) ?? '',
);
const nameChanged = computed(() => {
const player = selectedPlayer.value;
if (!player) return false;
return player.gamertag !== pendingGamertag.value;
});
/** True when the name has changed and the new name doesn't collide. */
const canSaveNameChange = computed(
() => nameChanged.value && !playerExistsByGamertag(pendingGamertag.value),
);
/** Whether the save icon should appear in the player name field. */
const showsNameSave = computed(() => canSave.value || canSaveNameChange.value);
// ---------------------------------------------------------------------------
// Actions
// ---------------------------------------------------------------------------
const startCustomPlayer = () => {
const wasCustom = playerId.value === CUSTOM_ID;
playerId.value = CUSTOM_ID;
if (!wasCustom) {
teamOverride.value = '';
countryOverride.value = '';
}
};
const applyPlayerData = (id: string) => {
const player = playersStore.players[id];
if (!player) return;
teamOverride.value = player.team ?? '';
countryOverride.value = player.country ?? '';
};
const onFilter = (val: string, update: (fn: () => void) => void) => {
update(() => {
filter.value = val;
if (!focused.value) return;
// If the field is cleared while a custom player is selected, restore the name
if (!val.trim() && playerId.value === CUSTOM_ID) {
inputValue.value = nameOverride.value;
return;
}
inputValue.value = val;
nameOverride.value = val;
if (val.trim()) startCustomPlayer();
});
};
const onFocus = () => {
focused.value = true;
inputValue.value = displayName.value;
};
const onBlur = () => {
focused.value = false;
filter.value = '';
inputValue.value = displayName.value;
};
const onSelect = (id: string) => {
if (!id || !playersStore.players[id]) return;
focused.value = false;
nameOverride.value = '';
filter.value = '';
inputValue.value = getPlayerLabel(id);
applyPlayerData(id);
};
/** Save the typed name as a brand-new player entry. */
const savePlayer = () => {
const gamertag = nameOverride.value.trim();
if (!gamertag || playerExistsByGamertag(gamertag)) return;
const id = createPlayerId(gamertag, playersStore.players);
playersStore.upsertPlayer(id, {
gamertag,
name: '',
team: teamOverride.value,
country: countryOverride.value,
twitter: '',
});
playerId.value = id;
nameOverride.value = '';
inputValue.value = gamertag;
};
/** Persist a gamertag rename on an existing player. */
const saveNameChange = () => {
const player = selectedPlayer.value;
if (!player || !canSaveNameChange.value) return;
playersStore.upsertPlayer(playerId.value, { ...player, gamertag: pendingGamertag.value });
nameOverride.value = '';
};
const saveTeamChange = () => {
const player = selectedPlayer.value;
if (!player) return;
playersStore.upsertPlayer(playerId.value, { ...player, team: teamOverride.value });
};
const saveCountryChange = () => {
const player = selectedPlayer.value;
if (!player) return;
playersStore.upsertPlayer(playerId.value, { ...player, country: countryOverride.value });
};
/** Dispatches to savePlayer or saveNameChange depending on context. */
const onNameSave = () => {
if (canSave.value) {
savePlayer();
return;
}
saveNameChange();
};
// ---------------------------------------------------------------------------
// Watchers
// ---------------------------------------------------------------------------
// Sync team/country fields when player selection changes
watch(playerId, (id) => applyPlayerData(id), { immediate: true });
// Keep the search input display value in sync unless the field is focused
watchEffect(() => {
if (!focused.value) {
inputValue.value = displayName.value;
}
});
// ---------------------------------------------------------------------------
// Public API
// ---------------------------------------------------------------------------
return {
// Store bindings (writable computed refs)
playerId,
nameOverride,
teamOverride,
countryOverride,
// UI state
inputValue,
countryInput,
filteredCountryOptions,
playerOptions,
// Derived state
displayName,
teamChanged,
countryChanged,
showsNameSave,
// Handlers
onFilter,
onFocus,
onBlur,
onSelect,
onNameSave,
saveTeamChange,
saveCountryChange,
onCountryFilter,
};
}
+133 -50
View File
@@ -6,7 +6,6 @@ type Translations = {
menuDashboard: string;
menuPlayers: string;
menuGraphics: string;
menuAssets: string;
menuSettings: string;
menuAbout: string;
settingsTitle: string;
@@ -25,6 +24,14 @@ type Translations = {
settingsShortcutRightDecrementHint: string;
settingsShortcutReset: string;
settingsShortcutRecordingHint: string;
settingsShortcutConflictWarning: string;
settingsShortcutStartRecording: string;
settingsShortcutStopRecording: string;
settingsShortcutResetSingle: string;
settingsIntegrationsTitle: string;
settingsIntegrationsDescription: string;
settingsDisconnect: string;
settingsNotConnected: string;
languageEnglish: string;
languageSpanish: string;
scoreboardUnassigned: string;
@@ -54,6 +61,8 @@ type Translations = {
aboutElectronNote: string;
aboutUnknownReleaseError: string;
aboutGitHubStatusError: string;
aboutChangelog: string;
aboutTechStackTitle: string;
graphicsTitle: string;
graphicsDescription: string;
graphicsNoConfigured: string;
@@ -62,14 +71,21 @@ type Translations = {
graphicsScoreboard: string;
graphicsCommentary: string;
graphicsSkinLabel: string;
graphicsCopied: string;
graphicsOpenBrowser: string;
commentaryTitle: string;
commentaryCommentator1: string;
commentaryCommentator2: string;
commentaryTwitterText: string;
commentaryTwitterMaxLength: string;
commentaryTwitterInvalidChars: string;
commentarySwap: string;
commentaryClear: string;
bracketTitle: string;
bracketStage: string;
bracketSide: string;
bracketCustomProgress: string;
bracketPreview: string;
playersLabelTeam: string;
playersLabelCountry: string;
playersLabelActions: string;
@@ -85,6 +101,8 @@ type Translations = {
playersSearchPlaceholder: string;
playersImport: string;
playersExport: string;
playersConnectInSettings: string;
playersConnectInSettingsSuffix: string;
};
const STORAGE_KEY = 'scoreko-dev.language';
@@ -94,31 +112,44 @@ const messages: Record<Locale, Translations> = {
menuDashboard: 'Dashboard',
menuPlayers: 'Players',
menuGraphics: 'Graphics',
menuAssets: 'Game Assets',
menuSettings: 'Settings',
menuAbout: 'About',
// ── Settings ────────────────────────────────────────────────────────────
settingsTitle: 'Settings',
settingsDescription: 'Dashboard and bundle configuration.',
settingsDescription: 'Dashboard and bundle settings.',
settingsLanguageLabel: 'Language',
settingsLanguageHint: 'Choose the dashboard language.',
settingsShortcutTitle: 'Keyboard shortcuts',
settingsShortcutDescription: 'Configure quick keys to update the score for each side.',
settingsShortcutDescription: 'Configure keyboard shortcuts to update each sides score.',
settingsShortcutLeftIncrementLabel: 'P1 score +1',
settingsShortcutLeftIncrementHint: 'Increases left player score by one.',
settingsShortcutLeftIncrementHint: 'Increases the left players score by one.',
settingsShortcutLeftDecrementLabel: 'P1 score -1',
settingsShortcutLeftDecrementHint: 'Decreases left player score by one.',
settingsShortcutLeftDecrementHint: 'Decreases the left players score by one.',
settingsShortcutRightIncrementLabel: 'P2 score +1',
settingsShortcutRightIncrementHint: 'Increases right player score by one.',
settingsShortcutRightIncrementHint: 'Increases the right players score by one.',
settingsShortcutRightDecrementLabel: 'P2 score -1',
settingsShortcutRightDecrementHint: 'Decreases right player score by one.',
settingsShortcutRightDecrementHint: 'Decreases the right players score by one.',
settingsShortcutReset: 'Reset shortcuts',
settingsShortcutRecordingHint: 'Press the desired shortcut now (example: Alt+1).',
settingsShortcutRecordingHint: 'Press the desired shortcut now (for example: Alt+1).',
settingsShortcutConflictWarning: 'This shortcut is already assigned to another action.',
settingsShortcutStartRecording: 'Start recording shortcut',
settingsShortcutStopRecording: 'Stop recording shortcut',
settingsShortcutResetSingle: 'Reset this shortcut',
settingsIntegrationsTitle: 'Integrations',
settingsIntegrationsDescription: 'Connect your tournament platform accounts to import players directly from brackets.',
settingsDisconnect: 'Disconnect',
settingsNotConnected: 'Not connected',
// ── Language ─────────────────────────────────────────────────────────────
languageEnglish: 'English',
languageSpanish: 'Spanish',
// ── Scoreboard ───────────────────────────────────────────────────────────
scoreboardUnassigned: '(Unassigned)',
scoreboardLeft: 'Left',
scoreboardRight: 'Right',
scoreboardPreview: 'preview',
scoreboardPreview: 'Preview',
scoreboardLeftImage: 'Left image',
scoreboardRightImage: 'Right image',
scoreboardLabelCharacter: 'Character',
@@ -126,11 +157,13 @@ const messages: Record<Locale, Translations> = {
scoreboardLabelTeam: 'Team',
scoreboardLabelCountry: 'Country',
scoreboardLabelGame: 'Game',
// ── About ────────────────────────────────────────────────────────────────
aboutTitle: 'About',
aboutVersion: 'Version',
aboutDescription: 'Dashboard for producing fighting game overlays using NodeCG, Vue, and Quasar.',
aboutFrameworkNodeCG: 'Framework NodeCG',
aboutCollaboratorsTitle: 'Collaborators and acknowledgments',
aboutDescription: 'Dashboard for producing fighting game overlays with NodeCG, Vue, and Quasar.',
aboutFrameworkNodeCG: 'NodeCG framework',
aboutCollaboratorsTitle: 'Contributors and acknowledgments',
aboutUpdateSystemTitle: 'Update system (GitHub Releases)',
aboutUpdateSystemDescription: 'This check fetches the latest release from the repository and compares it with the current version.',
aboutCheckUpdates: 'Check for updates',
@@ -139,32 +172,49 @@ const messages: Record<Locale, Translations> = {
aboutUpdateAvailable: 'A newer version is available.',
aboutUpToDate: 'Your version is up to date with the latest release.',
aboutViewRelease: 'View release',
aboutElectronNote: 'Note for Electron: this panel only implements detection and notification. For real automatic desktop updates, you need to integrate autoUpdater into Electron\'s main process and publish signed artifacts per platform.',
aboutElectronNote: 'Note for Electron: this panel only implements detection and notification. For real automatic desktop updates, you need to integrate autoUpdater into Electrons main process and publish signed artifacts per platform.',
aboutUnknownReleaseError: 'Unknown error while checking releases.',
aboutGitHubStatusError: 'GitHub responded with status',
aboutChangelog: 'Changelog',
aboutTechStackTitle: 'Tech stack',
// ── Graphics ─────────────────────────────────────────────────────────────
graphicsTitle: 'Graphics',
graphicsDescription: 'Bundle graphics controls and status.',
graphicsDescription: 'Controls and status for bundle graphics.',
graphicsNoConfigured: 'There are no graphics configured in this bundle.',
graphicsCopyUrl: 'Copy URL',
graphicsDragObs: 'Drag into OBS',
graphicsScoreboard: 'Scoreboard',
graphicsCommentary: 'Commentary',
graphicsSkinLabel: 'Skin',
commentaryTitle: 'Commentary',
graphicsCommentary: 'Commentators',
graphicsSkinLabel: 'Theme',
graphicsCopied: 'URL copied to clipboard',
graphicsOpenBrowser: 'Open in browser',
// ── Commentary ───────────────────────────────────────────────────────────
commentaryTitle: 'Commentators',
commentaryCommentator1: 'Commentator #1',
commentaryCommentator2: 'Commentator #2',
commentaryTwitterText: '@Twitter / Text',
commentaryTwitterText: 'Twitter / Text',
commentaryTwitterMaxLength: 'Twitter character limit exceeded',
commentaryTwitterInvalidChars: 'Invalid characters in Twitter text',
commentarySwap: 'Swap commentators',
commentaryClear: 'Clear commentators',
// ── Bracket ──────────────────────────────────────────────────────────────
bracketTitle: 'Bracket',
bracketStage: 'Stage',
bracketSide: 'Bracket side',
bracketCustomProgress: 'Custom progress',
bracketPreview: 'Preview',
// ── Players ──────────────────────────────────────────────────────────────
playersLabelTeam: 'Team',
playersLabelCountry: 'Country',
playersLabelActions: 'Actions',
playersStartggHelp: 'Connect via OAuth (recommended) or paste your personal token to load tournaments you created or administrate. If you see "Client authentication failed", verify your config uses the Client ID/Secret from a start.gg OAuth App.',
playersStartggHelp: 'Connect via OAuth (recommended) or paste your personal token to load tournaments you created or manage.',
playersConnectStartgg: 'Connect with start.gg',
playersConnected: 'Connected',
playersUsePersonalApi: 'Use personal API',
playersUsePersonalApi: 'Use personal token',
playersTournament: 'Tournament',
playersImportPlayers: 'Import players',
playersChallongeHelp: 'Connect with OAuth or paste your personal token to load your Challonge tournaments and import participants.',
@@ -173,32 +223,48 @@ const messages: Record<Locale, Translations> = {
playersSearchPlaceholder: 'Search...',
playersImport: 'Import',
playersExport: 'Export',
playersConnectInSettings: 'Connect your account in',
playersConnectInSettingsSuffix: 'to import players from tournaments.',
},
es: {
menuDashboard: 'Panel',
menuPlayers: 'Jugadores',
menuGraphics: 'Gráficos',
menuAssets: 'Assets de juego',
menuSettings: 'Configuración',
menuAbout: 'Acerca de',
// ── Settings ────────────────────────────────────────────────────────────
settingsTitle: 'Configuración',
settingsDescription: 'Configuración del dashboard y del bundle.',
settingsDescription: 'Configuración del panel y del bundle.',
settingsLanguageLabel: 'Idioma',
settingsLanguageHint: 'Selecciona el idioma del dashboard.',
settingsShortcutTitle: 'Atajos de teclado',
settingsShortcutDescription: 'Configura teclas rápidas para actualizar el score de cada lado.',
settingsShortcutLeftIncrementLabel: 'Score P1 +1',
settingsShortcutLeftIncrementHint: 'Incrementa en uno el score del jugador izquierdo.',
settingsShortcutLeftDecrementLabel: 'Score P1 -1',
settingsShortcutLeftDecrementHint: 'Reduce en uno el score del jugador izquierdo.',
settingsShortcutRightIncrementLabel: 'Score P2 +1',
settingsShortcutRightIncrementHint: 'Incrementa en uno el score del jugador derecho.',
settingsShortcutRightDecrementLabel: 'Score P2 -1',
settingsShortcutRightDecrementHint: 'Reduce en uno el score del jugador derecho.',
settingsShortcutDescription: 'Configura atajos para actualizar el marcador de cada lado.',
settingsShortcutLeftIncrementLabel: 'Marcador P1 +1',
settingsShortcutLeftIncrementHint: 'Incrementa en uno el marcador del jugador izquierdo.',
settingsShortcutLeftDecrementLabel: 'Marcador P1 -1',
settingsShortcutLeftDecrementHint: 'Reduce en uno el marcador del jugador izquierdo.',
settingsShortcutRightIncrementLabel: 'Marcador P2 +1',
settingsShortcutRightIncrementHint: 'Incrementa en uno el marcador del jugador derecho.',
settingsShortcutRightDecrementLabel: 'Marcador P2 -1',
settingsShortcutRightDecrementHint: 'Reduce en uno el marcador del jugador derecho.',
settingsShortcutReset: 'Restablecer atajos',
settingsShortcutRecordingHint: 'Pulsa ahora el atajo deseado (ejemplo: Alt+1).',
settingsShortcutConflictWarning: 'Este atajo ya está asignado a otra acción.',
settingsShortcutStartRecording: 'Iniciar grabación de atajo',
settingsShortcutStopRecording: 'Detener grabación de atajo',
settingsShortcutResetSingle: 'Restablecer este atajo',
settingsIntegrationsTitle: 'Integraciones',
settingsIntegrationsDescription: 'Conecta tus cuentas de plataformas de torneos para importar jugadores directamente desde los brackets.',
settingsDisconnect: 'Desconectar',
settingsNotConnected: 'No conectado',
// ── Language ─────────────────────────────────────────────────────────────
languageEnglish: 'Inglés',
languageSpanish: 'Castellano',
languageSpanish: 'Español',
// ── Scoreboard ───────────────────────────────────────────────────────────
scoreboardUnassigned: '(Sin asignar)',
scoreboardLeft: 'Izquierda',
scoreboardRight: 'Derecha',
@@ -210,42 +276,61 @@ const messages: Record<Locale, Translations> = {
scoreboardLabelTeam: 'Equipo',
scoreboardLabelCountry: 'País',
scoreboardLabelGame: 'Juego',
// ── About ────────────────────────────────────────────────────────────────
aboutTitle: 'Acerca de',
aboutVersion: 'Versión',
aboutDescription: 'Dashboard para producir overlays de juegos de lucha usando NodeCG, Vue y Quasar.',
aboutDescription: 'Panel para producir overlays de juegos de lucha usando NodeCG, Vue y Quasar.',
aboutFrameworkNodeCG: 'Framework NodeCG',
aboutCollaboratorsTitle: 'Colaboradores y agradecimientos',
aboutUpdateSystemTitle: 'Sistema de actualizaciones (GitHub Releases)',
aboutUpdateSystemDescription: 'Esta comprobación obtiene la última release del repositorio y la compara con la versión actual.',
aboutUpdateSystemDescription: 'Esta comprobación obtiene la última versión publicada del repositorio y la compara con la versión actual.',
aboutCheckUpdates: 'Buscar actualizaciones',
aboutLatestRelease: 'Última release',
aboutLatestRelease: 'Última versión',
aboutPublished: 'Publicado',
aboutUpdateAvailable: 'Hay una versión más nueva disponible.',
aboutUpToDate: 'Tu versión está actualizada con la última release.',
aboutViewRelease: 'Ver release',
aboutUpToDate: 'Tu versión está actualizada con la última versión.',
aboutViewRelease: 'Ver versión',
aboutElectronNote: 'Nota para Electron: este panel solo implementa detección y notificación. Para actualizaciones automáticas reales de escritorio, debes integrar autoUpdater en el proceso principal de Electron y publicar artefactos firmados por plataforma.',
aboutUnknownReleaseError: 'Error desconocido al consultar releases.',
aboutGitHubStatusError: 'GitHub respondió con estado',
aboutChangelog: 'Registro de cambios',
aboutTechStackTitle: 'Stack tecnológico',
// ── Graphics ─────────────────────────────────────────────────────────────
graphicsTitle: 'Gráficos',
graphicsDescription: 'Controles y estado de los gráficos del bundle.',
graphicsNoConfigured: 'No hay gráficos configurados en este bundle.',
graphicsCopyUrl: 'Copiar URL',
graphicsDragObs: 'Arrastrar a OBS',
graphicsScoreboard: 'Scoreboard',
graphicsCommentary: 'Comentario',
graphicsSkinLabel: 'Skin',
commentaryTitle: 'Comentario',
graphicsScoreboard: 'Marcador',
graphicsCommentary: 'Comentaristas',
graphicsSkinLabel: 'Tema',
graphicsCopied: 'URL copiada al portapapeles',
graphicsOpenBrowser: 'Abrir en el navegador',
// ── Commentary ───────────────────────────────────────────────────────────
commentaryTitle: 'Comentaristas',
commentaryCommentator1: 'Comentarista #1',
commentaryCommentator2: 'Comentarista #2',
commentaryTwitterText: '@Twitter / Texto',
bracketTitle: 'Bracket',
commentaryTwitterMaxLength: 'Se excedió el límite de caracteres de Twitter',
commentaryTwitterInvalidChars: 'Caracteres inválidos en el texto de Twitter',
commentarySwap: 'Intercambiar comentaristas',
commentaryClear: 'Limpiar comentaristas',
// ── Bracket ──────────────────────────────────────────────────────────────
bracketTitle: 'Llave',
bracketStage: 'Etapa',
bracketSide: 'Lado del bracket',
bracketSide: 'Lado de la llave',
bracketCustomProgress: 'Progreso personalizado',
bracketPreview: 'Vista previa',
// ── Players ──────────────────────────────────────────────────────────────
playersLabelTeam: 'Equipo',
playersLabelCountry: 'País',
playersLabelActions: 'Acciones',
playersStartggHelp: 'Conéctate por OAuth (recomendado) o pega tu token personal para cargar torneos que creaste o administras. Si ves "Client authentication failed", revisa que tu configuración use el Client ID/Secret de una app OAuth de start.gg.',
playersStartggHelp: 'Conéctate por OAuth (recomendado) o pega tu token personal para cargar torneos que creaste o administras.',
playersConnectStartgg: 'Conectar con start.gg',
playersConnected: 'Conectado',
playersUsePersonalApi: 'Usar API personal',
@@ -257,16 +342,15 @@ const messages: Record<Locale, Translations> = {
playersSearchPlaceholder: 'Buscar...',
playersImport: 'Importar',
playersExport: 'Exportar',
playersConnectInSettings: 'Conecta tu cuenta en',
playersConnectInSettingsSuffix: 'para importar jugadores desde torneos.',
},
};
const normalizeLocale = (value: unknown): Locale => (value === 'es' ? 'es' : 'en');
const getStoredLocale = (): Locale => {
if (typeof window === 'undefined') {
return 'en';
}
if (typeof window === 'undefined') return 'en';
return normalizeLocale(localStorage.getItem(STORAGE_KEY));
};
@@ -274,7 +358,6 @@ export const locale = ref<Locale>(getStoredLocale());
export const setLocale = (value: Locale) => {
locale.value = normalizeLocale(value);
if (typeof window !== 'undefined') {
localStorage.setItem(STORAGE_KEY, locale.value);
}
+310 -75
View File
@@ -1,68 +1,87 @@
<script setup lang="ts">
import { computed, onMounted, onUnmounted } from 'vue';
import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
import { t } from './i18n';
import { useScoreboardStore } from './stores/scoreboard';
import { isShortcutMatch, useShortcutSettingsStore } from './stores/shortcut-settings';
import { useScoreboardStore } from '../stores/scoreboard';
import { isShortcutMatch, useShortcutSettingsStore } from '../stores/shortcut-settings';
const menuItems = computed(() => [
// ── Sidebar collapse ──────────────────────────────────────────────────────────
const LS_KEY = 'sidebar_collapsed';
const isCollapsed = ref(localStorage.getItem(LS_KEY) === 'true');
const drawerWidth = computed(() => (isCollapsed.value ? 60 : 220));
watch(isCollapsed, (val) => localStorage.setItem(LS_KEY, String(val)));
const toggleCollapse = () => { isCollapsed.value = !isCollapsed.value; };
// ── Version ───────────────────────────────────────────────────────────────────
const appVersion = import.meta.env.PACKAGE_VERSION as string | undefined;
// ── Logo ──────────────────────────────────────────────────────────────────────
const logoUrl = new URL('./image.png', import.meta.url).href;
// ── Menu groups ───────────────────────────────────────────────────────────────
const mainItems = computed(() => [
{ label: t('menuDashboard'), to: '/', icon: 'dashboard' },
{ label: t('menuPlayers'), to: '/players', icon: 'groups' },
{ label: t('menuGraphics'), to: '/graphics', icon: 'collections' },
{ label: t('menuAssets'), to: '/game-assets', icon: 'sports_esports' },
]);
const configItems = computed(() => [
{ label: t('menuSettings'), to: '/settings', icon: 'settings' },
{ label: t('menuAbout'), to: '/about', icon: 'info' },
]);
const logoUrl = new URL('./image.png', import.meta.url).href;
// ── Online / Offline ──────────────────────────────────────────────────────────
const isOnline = ref(navigator.onLine);
const checkOnline = async () => {
try {
await fetch('https://www.google.com/favicon.ico', {
method: 'HEAD',
mode: 'no-cors',
cache: 'no-store',
});
isOnline.value = true;
} catch {
isOnline.value = false;
}
};
const onNetworkOnline = () => { isOnline.value = true; };
const onNetworkOffline = () => { isOnline.value = false; };
let pingInterval: ReturnType<typeof setInterval> | null = null;
// ── Keyboard shortcuts ────────────────────────────────────────────────────────
const scoreboardStore = useScoreboardStore();
const shortcutSettingsStore = useShortcutSettingsStore();
const isEditableTarget = (target: EventTarget | null): boolean => {
if (!(target instanceof HTMLElement)) {
return false;
}
return target.isContentEditable
|| ['INPUT', 'TEXTAREA', 'SELECT'].includes(target.tagName)
|| Boolean(target.closest('[contenteditable="true"]'));
if (!(target instanceof HTMLElement)) return false;
return (
target.isContentEditable ||
['INPUT', 'TEXTAREA', 'SELECT'].includes(target.tagName) ||
Boolean(target.closest('[contenteditable="true"]'))
);
};
const onShortcutPress = (event: KeyboardEvent) => {
if (isEditableTarget(event.target) || document.body.dataset.shortcutRecording === 'true') {
return;
}
if (isEditableTarget(event.target) || document.body.dataset.shortcutRecording === 'true') return;
const { shortcuts } = shortcutSettingsStore;
if (isShortcutMatch(event, shortcuts.leftIncrement)) {
scoreboardStore.leftScore += 1;
event.preventDefault();
return;
}
if (isShortcutMatch(event, shortcuts.leftDecrement)) {
scoreboardStore.leftScore = Math.max(0, scoreboardStore.leftScore - 1);
event.preventDefault();
return;
}
if (isShortcutMatch(event, shortcuts.rightIncrement)) {
scoreboardStore.rightScore += 1;
event.preventDefault();
return;
}
if (isShortcutMatch(event, shortcuts.rightDecrement)) {
scoreboardStore.rightScore = Math.max(0, scoreboardStore.rightScore - 1);
event.preventDefault();
}
if (isShortcutMatch(event, shortcuts.leftIncrement)) { scoreboardStore.leftScore += 1; event.preventDefault(); return; }
if (isShortcutMatch(event, shortcuts.leftDecrement)) { scoreboardStore.leftScore = Math.max(0, scoreboardStore.leftScore - 1); event.preventDefault(); return; }
if (isShortcutMatch(event, shortcuts.rightIncrement)) { scoreboardStore.rightScore += 1; event.preventDefault(); return; }
if (isShortcutMatch(event, shortcuts.rightDecrement)) { scoreboardStore.rightScore = Math.max(0, scoreboardStore.rightScore - 1); event.preventDefault(); }
};
onMounted(() => {
window.addEventListener('keydown', onShortcutPress);
window.addEventListener('online', onNetworkOnline);
window.addEventListener('offline', onNetworkOffline);
pingInterval = setInterval(checkOnline, 15_000);
});
onUnmounted(() => {
window.removeEventListener('keydown', onShortcutPress);
window.removeEventListener('online', onNetworkOnline);
window.removeEventListener('offline', onNetworkOffline);
if (pingInterval) clearInterval(pingInterval);
});
</script>
@@ -72,49 +91,117 @@ onUnmounted(() => {
show-if-above
side="left"
bordered
:width="220"
:width="drawerWidth"
class="sidebar-drawer"
>
<div class="sidebar-header q-pa-md">
<div class="row items-center no-wrap">
<img
:src="logoUrl"
alt="Logo"
class="sidebar-logo"
>
<div class="q-ml-sm">
<div class="text-subtitle1 text-weight-bold">
Scoreko-dev
<!-- Header -->
<div class="sidebar-header" :class="{ 'is-collapsed': isCollapsed }">
<img :src="logoUrl" alt="Logo" class="sidebar-logo">
<Transition name="slide-fade">
<div v-if="!isCollapsed" class="sidebar-title">
<span class="title-text">Scoreko-dev</span>
<span v-if="appVersion" class="title-version">v{{ appVersion }}</span>
</div>
<div class="text-caption">
<span class="by-label">by</span> <a
class="by-link"
href="https://github.com/Pandipipas"
target="_blank"
rel="noopener"
>Pandipipas</a>
</Transition>
<!-- Chevron siempre visible, arriba a la derecha -->
<QBtn
flat
round
dense
size="sm"
:icon="isCollapsed ? 'chevron_right' : 'chevron_left'"
class="collapse-btn"
@click="toggleCollapse"
/>
</div>
<QSeparator />
<!-- Sección MAIN -->
<div class="section-sep" :class="{ 'is-collapsed': isCollapsed }">
<span v-if="!isCollapsed" class="section-label">MAIN</span>
</div>
</div>
</div>
<QSeparator class="q-mb-sm" />
<QList>
<QList padding>
<QItem
v-for="item in menuItems"
v-for="item in mainItems"
:key="item.to"
clickable
:to="item.to"
exact
active-class="sidebar-item-active"
:class="{ 'nav-item-collapsed': isCollapsed }"
>
<QItemSection avatar>
<QIcon :name="item.icon" />
<QIcon :name="item.icon" size="sm" />
</QItemSection>
<QItemSection>
<QItemSection v-if="!isCollapsed">
<QItemLabel>{{ item.label }}</QItemLabel>
</QItemSection>
<QTooltip
v-if="isCollapsed"
anchor="center right"
self="center left"
:offset="[10, 0]"
>
{{ item.label }}
</QTooltip>
</QItem>
</QList>
<!-- Sección CONFIG -->
<div class="section-sep" :class="{ 'is-collapsed': isCollapsed }">
<span v-if="!isCollapsed" class="section-label">CONFIG</span>
</div>
<QList padding>
<QItem
v-for="item in configItems"
:key="item.to"
clickable
:to="item.to"
exact
active-class="sidebar-item-active"
:class="{ 'nav-item-collapsed': isCollapsed }"
>
<QItemSection avatar>
<QIcon :name="item.icon" size="sm" />
</QItemSection>
<QItemSection v-if="!isCollapsed">
<QItemLabel>{{ item.label }}</QItemLabel>
</QItemSection>
<QTooltip
v-if="isCollapsed"
anchor="center right"
self="center left"
:offset="[10, 0]"
>
{{ item.label }}
</QTooltip>
</QItem>
</QList>
<!-- Footer: Online / Offline -->
<div class="sidebar-footer" :class="{ 'is-collapsed': isCollapsed }">
<div class="online-row">
<span class="online-dot" :class="isOnline ? 'dot-online' : 'dot-offline'" />
<Transition name="slide-fade">
<span v-if="!isCollapsed" class="online-label">
{{ isOnline ? 'Online' : 'Offline' }}
</span>
</Transition>
<QTooltip
v-if="isCollapsed"
anchor="center right"
self="center left"
:offset="[10, 0]"
>
{{ isOnline ? 'Online' : 'Offline' }}
</QTooltip>
</div>
</div>
</QDrawer>
<QPageContainer>
@@ -124,28 +211,176 @@ onUnmounted(() => {
</template>
<style scoped>
/* ── Drawer shell ─────────────────────────────────────────────────────────── */
.sidebar-drawer :deep(.q-drawer__content) {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
}
/* ── Header ───────────────────────────────────────────────────────────────── */
.sidebar-header {
min-height: 72px;
display: flex;
align-items: center;
gap: 10px;
padding: 14px 12px 14px 14px;
min-height: 64px;
position: relative;
flex-shrink: 0;
transition: padding 0.25s ease;
}
.sidebar-header.is-collapsed {
flex-direction: column;
align-items: center;
justify-content: center;
gap: 6px;
padding: 10px 4px;
}
.sidebar-logo {
width: 40px;
height: 40px;
width: 36px;
height: 36px;
object-fit: contain;
flex-shrink: 0;
}
.by-label {
font-size: 0.75rem;
.sidebar-title {
display: flex;
flex-direction: column;
overflow: hidden;
flex: 1;
}
.title-text {
font-size: 0.875rem;
font-weight: 700;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.title-version {
font-family: 'JetBrains Mono', 'Fira Code', ui-monospace, monospace;
font-size: 0.65rem;
letter-spacing: 0.05em;
opacity: 0.45;
margin-top: 1px;
}
.by-link {
font-size: 0.75rem;
color: #f50a64;
text-decoration: none;
/* ── Collapse button ──────────────────────────────────────────────────────── */
.collapse-btn {
flex-shrink: 0;
opacity: 0.4;
transition: opacity 0.2s ease, transform 0.25s ease;
}
.collapse-btn:hover {
opacity: 1;
}
/* en modo expandido queda al extremo derecho */
.sidebar-header:not(.is-collapsed) .collapse-btn {
margin-left: auto;
}
.by-link:hover {
text-decoration: underline;
/* ── Section separators ───────────────────────────────────────────────────── */
.section-sep {
display: flex;
align-items: center;
padding: 10px 14px 2px;
min-height: 28px;
transition: padding 0.2s ease, min-height 0.2s ease;
}
.section-sep.is-collapsed {
padding: 6px 12px 2px;
min-height: 0;
}
.section-sep.is-collapsed::after {
content: '';
display: block;
width: 100%;
height: 1px;
background: currentColor;
opacity: 0.12;
}
.section-label {
font-family: 'JetBrains Mono', 'Fira Code', ui-monospace, monospace;
font-size: 0.62rem;
font-weight: 700;
letter-spacing: 0.14em;
text-transform: uppercase;
opacity: 0.38;
}
/* ── Nav items (collapsed centrado) ──────────────────────────────────────── */
.nav-item-collapsed {
justify-content: center;
padding-left: 0;
padding-right: 0;
}
.nav-item-collapsed :deep(.q-item__section--avatar) {
min-width: unset;
padding-right: 0;
}
/* ── Footer ───────────────────────────────────────────────────────────────── */
.sidebar-footer {
margin-top: auto;
padding: 10px 14px;
border-top: 1px solid rgba(128, 128, 128, 0.15);
flex-shrink: 0;
transition: padding 0.25s ease;
}
.sidebar-footer.is-collapsed {
padding: 10px 0;
display: flex;
justify-content: center;
}
.online-row {
display: flex;
align-items: center;
gap: 8px;
position: relative;
}
/* ── Online dot ───────────────────────────────────────────────────────────── */
.online-dot {
width: 8px;
height: 8px;
border-radius: 50%;
flex-shrink: 0;
display: inline-block;
}
.dot-online {
background: #22c55e;
animation: pulse-green 2s ease-in-out infinite;
}
.dot-offline {
background: #ef4444;
}
.online-label {
font-family: 'JetBrains Mono', 'Fira Code', ui-monospace, monospace;
font-size: 0.7rem;
letter-spacing: 0.04em;
opacity: 0.6;
white-space: nowrap;
}
/* ── Transitions ──────────────────────────────────────────────────────────── */
.slide-fade-enter-active,
.slide-fade-leave-active {
transition: opacity 0.2s ease, transform 0.2s ease;
}
.slide-fade-enter-from,
.slide-fade-leave-to {
opacity: 0;
transform: translateX(-6px);
}
/* ── Pulse animation ──────────────────────────────────────────────────────── */
@keyframes pulse-green {
0% { box-shadow: 0 0 0 0 rgba(34, 197, 94, 0.55); }
70% { box-shadow: 0 0 0 6px rgba(34, 197, 94, 0); }
100% { box-shadow: 0 0 0 0 rgba(34, 197, 94, 0); }
}
</style>
-2
View File
@@ -2,7 +2,6 @@ import { createRouter, createWebHashHistory } from 'vue-router';
import AboutView from './views/About.vue';
import DashboardView from './views/Dashboard.vue';
import GraphicsView from './views/Graphics.vue';
import GameAssetsView from './views/GameAssets.vue';
import PlayersView from './views/Players.vue';
import SettingsView from './views/Settings.vue';
@@ -12,7 +11,6 @@ const router = createRouter({
{ path: '/', name: 'dashboard', component: DashboardView },
{ path: '/players', name: 'players', component: PlayersView },
{ path: '/graphics', name: 'graphics', component: GraphicsView },
{ path: '/game-assets', name: 'game-assets', component: GameAssetsView },
{ path: '/settings', name: 'settings', component: SettingsView },
{ path: '/about', name: 'about', component: AboutView },
],
@@ -1,88 +0,0 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import { commentaryReplicant } from '../../../browser_shared/replicants';
import type { Schemas } from '../../../types';
import { syncStateWithReplicant } from './store-sync';
type Commentary = Schemas.Commentary;
const defaultCommentary: Commentary = {
leftCommentator: '',
leftCommentatorTwitter: '',
rightCommentator: '',
rightCommentatorTwitter: '',
};
const normalizeCommentary = (input: unknown): Commentary => {
const candidate = typeof input === 'object' && input !== null ? (input as Record<string, unknown>) : {};
return {
leftCommentator: typeof candidate.leftCommentator === 'string' ? candidate.leftCommentator : '',
leftCommentatorTwitter: typeof candidate.leftCommentatorTwitter === 'string' ? candidate.leftCommentatorTwitter : '',
rightCommentator: typeof candidate.rightCommentator === 'string' ? candidate.rightCommentator : '',
rightCommentatorTwitter: typeof candidate.rightCommentatorTwitter === 'string' ? candidate.rightCommentatorTwitter : '',
};
};
export const useCommentaryStore = defineStore('commentary', () => {
const commentary = ref<Commentary>({ ...defaultCommentary });
const replicant = commentaryReplicant;
syncStateWithReplicant(commentary, replicant, normalizeCommentary);
const leftCommentator = computed({
get: () => commentary.value.leftCommentator,
set: (value: string) => {
commentary.value = {
...commentary.value,
leftCommentator: value,
};
},
});
const leftCommentatorTwitter = computed({
get: () => commentary.value.leftCommentatorTwitter,
set: (value: string) => {
commentary.value = {
...commentary.value,
leftCommentatorTwitter: value,
};
},
});
const rightCommentator = computed({
get: () => commentary.value.rightCommentator,
set: (value: string) => {
commentary.value = {
...commentary.value,
rightCommentator: value,
};
},
});
const rightCommentatorTwitter = computed({
get: () => commentary.value.rightCommentatorTwitter,
set: (value: string) => {
commentary.value = {
...commentary.value,
rightCommentatorTwitter: value,
};
},
});
const swapCommentators = () => {
commentary.value = {
leftCommentator: commentary.value.rightCommentator,
leftCommentatorTwitter: commentary.value.rightCommentatorTwitter,
rightCommentator: commentary.value.leftCommentator,
rightCommentatorTwitter: commentary.value.leftCommentatorTwitter,
};
};
return {
commentary,
leftCommentator,
leftCommentatorTwitter,
rightCommentator,
rightCommentatorTwitter,
swapCommentators,
};
});
@@ -1,154 +0,0 @@
import { defineStore } from 'pinia';
import { ref } from 'vue';
type DownloadStatus = 'downloading' | 'completed' | 'error';
type ProgressPayload = {
title: string;
progress: number;
status: DownloadStatus;
};
type RemoteGame = {
title: string;
slug: string;
repoFolder: string;
logoFile: string;
};
const sendNodecgMessage = <TResponse>(messageName: string, payload?: unknown) => new Promise<TResponse>((resolve, reject) => {
nodecg.sendMessage(messageName, payload, (error: unknown, response: unknown) => {
if (error) {
reject(error instanceof Error ? error : new Error(String(error)));
return;
}
resolve(response as TResponse);
});
});
let progressListenerAttached = false;
export const useGameAssetsStore = defineStore('game-assets', () => {
const installedGames = ref<string[]>([]);
const availableGames = ref<RemoteGame[]>([]);
const characterNamesByGame = ref<Record<string, string[]>>({});
const loadingByTitle = ref<Record<string, boolean>>({});
const removingByTitle = ref<Record<string, boolean>>({});
const progressByTitle = ref<Record<string, number>>({});
const assetsBaseUrl = ref('http://localhost');
if (!progressListenerAttached) {
nodecg.listenFor('scoreko-assets:downloadProgress', (payload: unknown) => {
const message = payload as Partial<ProgressPayload>;
if (typeof message.title !== 'string') {
return;
}
if (typeof message.progress === 'number') {
progressByTitle.value = {
...progressByTitle.value,
[message.title]: message.progress,
};
}
if (message.status === 'completed' || message.status === 'error') {
loadingByTitle.value = {
...loadingByTitle.value,
[message.title]: false,
};
}
});
progressListenerAttached = true;
}
const refreshCharacterNamesByGame = async () => {
const response = await sendNodecgMessage<Record<string, string[]>>('scoreko-assets:listCharactersByGame');
characterNamesByGame.value = response;
return characterNamesByGame.value;
};
const refreshInstalledGames = async () => {
try {
const availableResponse = await sendNodecgMessage<RemoteGame[]>('scoreko-assets:listRemoteGames');
availableGames.value = Array.isArray(availableResponse) ? availableResponse : [];
} catch {
availableGames.value = [];
}
const response = await sendNodecgMessage<string[]>('scoreko-assets:listInstalled');
installedGames.value = Array.isArray(response) ? response : [];
const configResponse = await sendNodecgMessage<{ assetsBaseUrl?: string }>('scoreko-assets:getAssetsBaseUrl');
assetsBaseUrl.value = typeof configResponse?.assetsBaseUrl === 'string' && configResponse.assetsBaseUrl.trim()
? configResponse.assetsBaseUrl
: 'http://localhost';
await refreshCharacterNamesByGame();
return installedGames.value;
};
const downloadGame = async (slug: string) => {
loadingByTitle.value = {
...loadingByTitle.value,
[slug]: true,
};
progressByTitle.value = {
...progressByTitle.value,
[slug]: 0,
};
try {
const response = await sendNodecgMessage<{ installedGames: string[] }>('scoreko-assets:downloadGame', { slug });
installedGames.value = response.installedGames;
await refreshCharacterNamesByGame();
loadingByTitle.value = {
...loadingByTitle.value,
[slug]: false,
};
progressByTitle.value = {
...progressByTitle.value,
[slug]: 100,
};
return response;
} catch (error) {
loadingByTitle.value = {
...loadingByTitle.value,
[slug]: false,
};
throw error;
}
};
const removeGame = async (slug: string) => {
removingByTitle.value = {
...removingByTitle.value,
[slug]: true,
};
try {
const response = await sendNodecgMessage<{ installedGames: string[] }>('scoreko-assets:removeGame', { slug });
installedGames.value = response.installedGames;
await refreshCharacterNamesByGame();
return response;
} finally {
removingByTitle.value = {
...removingByTitle.value,
[slug]: false,
};
}
};
return {
installedGames,
availableGames,
characterNamesByGame,
loadingByTitle,
removingByTitle,
progressByTitle,
assetsBaseUrl,
refreshInstalledGames,
refreshCharacterNamesByGame,
downloadGame,
removeGame,
};
});
@@ -1,76 +0,0 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import { playersReplicant } from '../../../browser_shared/replicants';
import type { Schemas } from '../../../types';
import { readStorageSnapshot, syncStateWithReplicant } from './store-sync';
type PlayersMap = Schemas.Players;
type Player = PlayersMap[string];
const STORAGE_KEY = 'scoreko-dev.players';
const normalizePlayer = (input: unknown): Player => {
const candidate = typeof input === 'object' && input !== null ? (input as Record<string, unknown>) : {};
return {
gamertag: typeof candidate.gamertag === 'string' ? candidate.gamertag : '',
name: typeof candidate.name === 'string' ? candidate.name : '',
team: typeof candidate.team === 'string' ? candidate.team : '',
country: typeof candidate.country === 'string' ? candidate.country : '',
twitter: typeof candidate.twitter === 'string' ? candidate.twitter : '',
};
};
const normalizePlayers = (input: unknown): PlayersMap => {
if (typeof input !== 'object' || input === null) {
return {};
}
const result: PlayersMap = {};
Object.entries(input as Record<string, unknown>).forEach(([id, value]) => {
if (!id) {
return;
}
result[id] = normalizePlayer(value);
});
return result;
};
export const usePlayersStore = defineStore('players', () => {
const players = ref<PlayersMap>({});
const replicant = playersReplicant;
const storageSnapshot = readStorageSnapshot(STORAGE_KEY, normalizePlayers);
if (storageSnapshot) {
players.value = storageSnapshot;
}
syncStateWithReplicant(players, replicant, normalizePlayers, STORAGE_KEY);
const setPlayers = (value: PlayersMap) => {
players.value = normalizePlayers(value);
};
const upsertPlayer = (id: string, player: Player) => {
players.value = {
...players.value,
[id]: normalizePlayer(player),
};
};
const removePlayer = (id: string) => {
const next = { ...players.value };
delete next[id];
players.value = next;
};
const rows = computed(() => Object.entries(players.value).map(([id, player]) => ({
id,
...player,
})));
return {
players,
rows,
setPlayers,
upsertPlayer,
removePlayer,
};
});
@@ -1,116 +0,0 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import { scoreboardReplicant } from '../../../browser_shared/replicants';
import type { Schemas } from '../../../types';
import { readStorageSnapshot, syncStateWithReplicant } from './store-sync';
type Scoreboard = Schemas.Scoreboard;
const STORAGE_KEY = 'scoreko-dev.scoreboard';
const defaultScoreboard: Scoreboard = {
leftPlayerId: '',
rightPlayerId: '',
leftNameOverride: '',
rightNameOverride: '',
leftTeamOverride: '',
rightTeamOverride: '',
leftCountryOverride: '',
rightCountryOverride: '',
leftCharacter: '',
rightCharacter: '',
leftScore: 0,
rightScore: 0,
round: '',
game: '',
};
const normalizeScoreboard = (input: unknown): Scoreboard => {
const candidate = typeof input === 'object' && input !== null ? (input as Record<string, unknown>) : {};
return {
leftPlayerId: typeof candidate.leftPlayerId === 'string' ? candidate.leftPlayerId : '',
rightPlayerId: typeof candidate.rightPlayerId === 'string' ? candidate.rightPlayerId : '',
leftNameOverride: typeof candidate.leftNameOverride === 'string' ? candidate.leftNameOverride : '',
rightNameOverride: typeof candidate.rightNameOverride === 'string' ? candidate.rightNameOverride : '',
leftTeamOverride: typeof candidate.leftTeamOverride === 'string' ? candidate.leftTeamOverride : '',
rightTeamOverride: typeof candidate.rightTeamOverride === 'string' ? candidate.rightTeamOverride : '',
leftCountryOverride: typeof candidate.leftCountryOverride === 'string' ? candidate.leftCountryOverride : '',
rightCountryOverride: typeof candidate.rightCountryOverride === 'string' ? candidate.rightCountryOverride : '',
leftCharacter: typeof candidate.leftCharacter === 'string' ? candidate.leftCharacter : '',
rightCharacter: typeof candidate.rightCharacter === 'string' ? candidate.rightCharacter : '',
leftScore: typeof candidate.leftScore === 'number' ? Math.max(0, Math.floor(candidate.leftScore)) : 0,
rightScore: typeof candidate.rightScore === 'number' ? Math.max(0, Math.floor(candidate.rightScore)) : 0,
round: typeof candidate.round === 'string' ? candidate.round : '',
game: typeof candidate.game === 'string' ? candidate.game : '',
};
};
export const useScoreboardStore = defineStore('scoreboard', () => {
const scoreboard = ref<Scoreboard>({ ...defaultScoreboard });
const replicant = scoreboardReplicant;
const storageSnapshot = readStorageSnapshot(STORAGE_KEY, normalizeScoreboard);
if (storageSnapshot) {
scoreboard.value = storageSnapshot;
}
syncStateWithReplicant(scoreboard, replicant, normalizeScoreboard, STORAGE_KEY);
const setScoreboard = (value: Scoreboard) => {
scoreboard.value = normalizeScoreboard(value);
};
const swapPlayers = () => {
scoreboard.value = {
...scoreboard.value,
leftPlayerId: scoreboard.value.rightPlayerId,
rightPlayerId: scoreboard.value.leftPlayerId,
leftNameOverride: scoreboard.value.rightNameOverride,
rightNameOverride: scoreboard.value.leftNameOverride,
leftTeamOverride: scoreboard.value.rightTeamOverride,
rightTeamOverride: scoreboard.value.leftTeamOverride,
leftCountryOverride: scoreboard.value.rightCountryOverride,
rightCountryOverride: scoreboard.value.leftCountryOverride,
leftCharacter: scoreboard.value.rightCharacter,
rightCharacter: scoreboard.value.leftCharacter,
leftScore: scoreboard.value.rightScore,
rightScore: scoreboard.value.leftScore,
};
};
const resetScores = () => {
scoreboard.value = {
...scoreboard.value,
leftScore: 0,
rightScore: 0,
};
};
const leftScore = computed({
get: () => scoreboard.value.leftScore,
set: (value: number) => {
scoreboard.value = {
...scoreboard.value,
leftScore: Math.max(0, Math.floor(value)),
};
},
});
const rightScore = computed({
get: () => scoreboard.value.rightScore,
set: (value: number) => {
scoreboard.value = {
...scoreboard.value,
rightScore: Math.max(0, Math.floor(value)),
};
},
});
return {
scoreboard,
leftScore,
rightScore,
setScoreboard,
swapPlayers,
resetScores,
};
});
+156 -184
View File
@@ -1,163 +1,105 @@
<script setup lang="ts">
import { useHead } from '@unhead/vue';
import { computed, onMounted, ref } from 'vue';
import { t } from '../i18n';
defineOptions({ name: 'AboutView' });
useHead(() => ({ title: t('aboutTitle') }));
type ReleaseResponse = {
html_url: string;
name: string | null;
tag_name: string;
published_at: string;
};
const appName = 'Scoreko-dev';
const currentVersion = import.meta.env.PACKAGE_VERSION;
const updateRepoOwner = 'Pandipipas';
const updateRepoName = 'scoreko';
const checkingUpdates = ref(false);
const updateError = ref('');
const latestRelease = ref<ReleaseResponse | null>(null);
const repoUrl = 'https://github.com/Pandipipas/scoreko-dev';
const authorUrl = 'https://github.com/Pandipipas';
const collaborators = [
{
name: 'Pandipipas',
role: 'Development and maintenance of Scoreko-dev',
url: 'https://github.com/Pandipipas/scoreko-dev'
url: authorUrl,
icon: 'code',
},
{
name: 'Dan Shields',
role: 'nodecg-vue-composable helper',
url: 'https://github.com/Dan-Shields/nodecg-vue-composable'
url: 'https://github.com/Dan-Shields/nodecg-vue-composable',
icon: 'extension',
},
{
name: 'NodeCG',
role: 'Broadcast graphics framework',
url: 'https://github.com/nodecg/nodecg'
}
url: 'https://github.com/nodecg/nodecg',
icon: 'layers',
},
];
const releaseLabel = computed(() => {
if (!latestRelease.value) {
return '';
}
const techStack = [
{ label: 'Vue 3', icon: 'hub' },
{ label: 'Quasar', icon: 'style' },
{ label: 'TypeScript', icon: 'data_object' },
{ label: 'NodeCG', icon: 'layers' },
];
return latestRelease.value.name?.trim().length
? latestRelease.value.name
: latestRelease.value.tag_name;
});
const hasUpdate = computed(() => {
if (!latestRelease.value) {
return false;
}
return compareVersions(normalizeVersion(latestRelease.value.tag_name), normalizeVersion(currentVersion)) > 0;
});
const repoUrl = computed(() => `https://github.com/${updateRepoOwner}/${updateRepoName}`);
const releaseUrl = computed(() => latestRelease.value?.html_url ?? `${repoUrl.value}/releases`);
function normalizeVersion(version: string) {
return version.replace(/^v/i, '');
}
function compareVersions(a: string, b: string) {
const aParts = a.split('.').map((value) => Number(value));
const bParts = b.split('.').map((value) => Number(value));
const max = Math.max(aParts.length, bParts.length);
for (let index = 0; index < max; index += 1) {
const aPart = Number.isFinite(aParts[index]) ? aParts[index]! : 0;
const bPart = Number.isFinite(bParts[index]) ? bParts[index]! : 0;
if (aPart > bPart) {
return 1;
}
if (aPart < bPart) {
return -1;
}
}
return 0;
}
async function checkForUpdates() {
checkingUpdates.value = true;
updateError.value = '';
try {
const response = await fetch(
`https://api.github.com/repos/${encodeURIComponent(updateRepoOwner)}/${encodeURIComponent(updateRepoName)}/releases/latest`,
{
headers: {
Accept: 'application/vnd.github+json'
}
}
);
if (!response.ok) {
throw new Error(`${t('aboutGitHubStatusError')} ${response.status}.`);
}
latestRelease.value = await response.json() as ReleaseResponse;
} catch (error) {
latestRelease.value = null;
updateError.value = error instanceof Error ? error.message : t('aboutUnknownReleaseError');
} finally {
checkingUpdates.value = false;
}
}
onMounted(() => {
void checkForUpdates();
});
const currentYear = new Date().getFullYear();
</script>
<template>
<QPage class="q-pa-lg">
<div class="text-h4 q-mb-md">
<div class="q-mb-lg">
<div class="text-h5 text-weight-medium">
{{ t('aboutTitle') }}
</div>
</div>
<div class="row q-col-gutter-lg">
<div class="col-12 col-md-6">
<QCard
flat
bordered
class="about-card"
>
<QCardSection class="row items-center q-col-gutter-md">
<div class="col-auto">
<!-- App identity -->
<QCardSection class="q-pa-lg">
<div class="row items-center q-gutter-md">
<QImg
src="../image.png"
alt="Scoreko logo"
width="72px"
height="72px"
class="app-logo"
fit="contain"
/>
</div>
<div class="col">
<div class="text-h6">
<div>
<div class="text-h6 text-weight-bold">
{{ appName }}
</div>
<div class="text-caption text-grey-7">
{{ t('aboutVersion') }} {{ currentVersion }}
<div class="row items-center q-gutter-xs q-mt-xs">
<QBadge
outline
color="primary"
class="version-badge"
>
v{{ currentVersion }}
</QBadge>
<QBtn
:href="`${repoUrl}/releases`"
target="_blank"
rel="noopener noreferrer"
icon="history"
:label="t('aboutChangelog')"
color="grey-6"
flat
dense
no-caps
size="xs"
/>
</div>
</div>
</div>
</QCardSection>
<QSeparator />
<QCardSection>
<p class="q-mb-sm">
<!-- Description + framework -->
<QCardSection class="q-pa-lg">
<p class="text-body2 text-grey-7 q-mb-md">
{{ t('aboutDescription') }}
</p>
<div class="column q-gutter-sm">
<QBtn
href="https://github.com/nodecg/nodecg"
target="_blank"
@@ -166,19 +108,43 @@ onMounted(() => {
:label="t('aboutFrameworkNodeCG')"
color="primary"
flat
dense
no-caps
align="left"
/>
</QCardSection>
<QSeparator />
<!-- Tech stack -->
<QCardSection class="q-pa-lg">
<div class="text-overline text-grey-6 q-mb-sm">
{{ t('aboutTechStackTitle') }}
</div>
<div class="row q-gutter-xs">
<QChip
v-for="tech in techStack"
:key="tech.label"
:icon="tech.icon"
:label="tech.label"
color="primary"
text-color="white"
size="sm"
dense
/>
</div>
</QCardSection>
<QSeparator />
<QCardSection>
<div class="text-subtitle2 q-mb-sm">
<!-- Collaborators -->
<QCardSection class="q-pa-lg">
<div class="text-overline text-grey-6 q-mb-sm">
{{ t('aboutCollaboratorsTitle') }}
</div>
<QList dense>
<QList
dense
class="collaborators-list"
>
<QItem
v-for="person in collaborators"
:key="person.name"
@@ -186,95 +152,101 @@ onMounted(() => {
:href="person.url"
target="_blank"
rel="noopener noreferrer"
class="collaborator-item rounded-borders"
>
<QItemSection avatar>
<QIcon
:name="person.icon"
size="18px"
color="primary"
class="collaborator-icon"
/>
</QItemSection>
<QItemSection>
<QItemLabel>{{ person.name }}</QItemLabel>
<QItemLabel caption>
<QItemLabel class="text-weight-medium">
{{ person.name }}
</QItemLabel>
<QItemLabel
caption
class="text-grey-6"
>
{{ person.role }}
</QItemLabel>
</QItemSection>
<QItemSection side>
<QIcon
name="arrow_forward_ios"
size="12px"
color="grey-5"
/>
</QItemSection>
</QItem>
</QList>
</QCardSection>
</QCard>
</div>
<div class="col-12 col-md-6">
<QCard
flat
bordered
>
<QCardSection>
<div class="text-h6">
{{ t('aboutUpdateSystemTitle') }}
</div>
<div class="text-body2 text-grey-7 q-mt-xs">
{{ t('aboutUpdateSystemDescription') }}
</div>
</QCardSection>
<QSeparator />
<QCardSection class="q-gutter-md">
<!-- Footer -->
<QCardSection class="q-pa-md">
<div class="row items-center justify-between">
<span class="text-caption text-grey-5">
© {{ currentYear }} Pandipipas · MIT License
</span>
<QBtn
:label="t('aboutCheckUpdates')"
color="primary"
icon="sync"
:loading="checkingUpdates"
no-caps
@click="checkForUpdates"
/>
<QBanner
v-if="latestRelease"
rounded
class="bg-grey-2"
>
<template #avatar>
<QIcon
:name="hasUpdate ? 'system_update_alt' : 'check_circle'"
:color="hasUpdate ? 'warning' : 'positive'"
/>
</template>
<div class="text-subtitle2">
{{ t('aboutLatestRelease') }}: {{ releaseLabel }}
</div>
<div class="text-caption text-grey-7">
{{ t('aboutPublished') }}: {{ new Date(latestRelease.published_at).toLocaleString() }}
</div>
<div class="q-mt-sm">
{{ hasUpdate ? t('aboutUpdateAvailable') : t('aboutUpToDate') }}
</div>
<template #action>
<QBtn
flat
color="primary"
:label="t('aboutViewRelease')"
:href="releaseUrl"
:href="repoUrl"
target="_blank"
rel="noopener noreferrer"
icon="open_in_new"
label="GitHub"
color="grey-6"
flat
dense
no-caps
size="sm"
/>
</template>
</QBanner>
<QBanner
v-if="updateError"
rounded
class="bg-red-1 text-red-10"
>
{{ updateError }}
</QBanner>
<QBanner
rounded
class="bg-blue-1 text-blue-10"
>
{{ t('aboutElectronNote') }}
</QBanner>
</div>
</QCardSection>
</QCard>
</div>
</div>
</QPage>
</template>
<style scoped>
.about-card {
max-width: 520px;
}
.app-logo {
width: 56px;
height: 56px;
border-radius: 12px;
}
.version-badge {
font-size: 11px;
letter-spacing: 0.03em;
}
.collaborators-list {
margin: 0 -8px;
}
.collaborator-item {
border-radius: 8px;
transition: background 0.15s ease;
padding: 6px 8px;
text-decoration: none;
}
.collaborator-item:hover {
background: rgba(0, 0, 0, 0.04);
}
/* Dark mode hover fix */
.body--dark .collaborator-item:hover {
background: rgba(255, 255, 255, 0.06);
}
.collaborator-icon {
opacity: 0.8;
}
</style>
@@ -11,9 +11,10 @@ useHead({ title: 'Dashboard' });
<template>
<QPage class="q-pa-lg">
<div class="dashboard-panels q-mt-lg">
<div class="dashboard-panels">
<div class="dashboard-row dashboard-row--scoreboard">
<QCard
flat
bordered
class="dashboard-panel-card"
>
@@ -25,6 +26,7 @@ useHead({ title: 'Dashboard' });
<div class="dashboard-row dashboard-row--bottom">
<QCard
flat
bordered
class="dashboard-panel-card"
>
@@ -33,6 +35,7 @@ useHead({ title: 'Dashboard' });
</QCardSection>
</QCard>
<QCard
flat
bordered
class="dashboard-panel-card"
>
@@ -53,20 +56,12 @@ useHead({ title: 'Dashboard' });
gap: 24px;
}
.dashboard-row {
width: 100%;
}
.dashboard-row--bottom {
display: grid;
grid-template-columns: 1fr;
gap: 24px;
}
.dashboard-panel-card {
width: 100%;
}
.dashboard-panel-content {
padding-bottom: 16px;
}
@@ -1,292 +0,0 @@
<script setup lang="ts">
import { computed, onMounted, ref } from 'vue';
import { useGameAssetsStore } from '../stores/game-assets';
const gameAssetsStore = useGameAssetsStore();
const errorMessage = ref('');
const selectedGameSlug = ref<string | null>(null);
const search = ref('');
const getGameLogoUrl = (repoFolder: string, logoFile: string) => {
const cleanBaseUrl = gameAssetsStore.assetsBaseUrl.replace(/\/+$/, '');
const cleanRepoFolder = repoFolder.replace(/^\/+|\/+$/g, '');
const cleanLogoFile = logoFile.replace(/^\/+/, '');
return `${cleanBaseUrl}/games/${cleanRepoFolder}/${cleanLogoFile}`;
};
const normalizedSearch = computed(() => search.value.trim().toLowerCase());
const filteredGames = computed(() => {
if (!normalizedSearch.value) {
return gameAssetsStore.availableGames;
}
return gameAssetsStore.availableGames.filter((game) => game.title.toLowerCase().includes(normalizedSearch.value));
});
const selectedGame = computed(() => gameAssetsStore.availableGames.find((game) => game.slug === selectedGameSlug.value) ?? null);
const installedGameSet = computed(() => new Set(gameAssetsStore.installedGames));
const openGameDialog = (slug: string) => {
selectedGameSlug.value = slug;
};
const closeGameDialog = () => {
selectedGameSlug.value = null;
};
const downloadGameBySlug = async (slug: string) => {
errorMessage.value = '';
try {
await gameAssetsStore.downloadGame(slug);
} catch (error) {
errorMessage.value = error instanceof Error ? error.message : 'No se pudieron descargar los assets.';
}
};
const removeGameBySlug = async (slug: string) => {
errorMessage.value = '';
try {
await gameAssetsStore.removeGame(slug);
} catch (error) {
errorMessage.value = error instanceof Error ? error.message : 'No se pudieron borrar los assets.';
}
};
const onDownloadFromDialog = async () => {
if (!selectedGame.value) {
return;
}
const targetSlug = selectedGame.value.slug;
closeGameDialog();
await downloadGameBySlug(targetSlug);
};
onMounted(async () => {
try {
await gameAssetsStore.refreshInstalledGames();
} catch (error) {
errorMessage.value = error instanceof Error ? error.message : 'No se pudo cargar el estado de assets.';
}
});
</script>
<template>
<QPage class="q-pa-lg">
<div class="text-h5 text-weight-bold q-mb-sm">
Biblioteca de juegos
</div>
<p class="text-body2 q-mb-md">
Busca un juego, pulsa información para ver detalles o descarga directamente.
</p>
<QInput
v-model="search"
dense
outlined
clearable
label="Buscar juego"
class="q-mb-lg"
>
<template #prepend>
<QIcon name="search" />
</template>
</QInput>
<div class="game-grid">
<div
v-for="game in filteredGames"
:key="game.slug"
class="game-cell"
>
<div class="logo-tile">
<QImg
:src="getGameLogoUrl(game.repoFolder, game.logoFile)"
fit="contain"
height="74px"
/>
<div
v-if="gameAssetsStore.loadingByTitle[game.slug]"
class="download-overlay"
:style="{ '--progress-width': `${gameAssetsStore.progressByTitle[game.slug] ?? 0}%` }"
/>
<div class="tile-actions">
<QBtn
flat
round
size="md"
icon="info"
color="white"
@click="openGameDialog(game.slug)"
/>
<div class="row items-center no-wrap q-gutter-sm">
<QBtn
v-if="installedGameSet.has(game.slug)"
flat
round
size="md"
icon="check_circle"
color="positive"
disable
/>
<QBtn
v-else
flat
round
size="md"
:icon="gameAssetsStore.loadingByTitle[game.slug] ? 'autorenew' : 'download'"
:class="{ 'downloading-spin': gameAssetsStore.loadingByTitle[game.slug] }"
color="white"
:disable="gameAssetsStore.loadingByTitle[game.slug]"
@click="downloadGameBySlug(game.slug)"
/>
</div>
</div>
</div>
</div>
</div>
<QDialog
:model-value="Boolean(selectedGame)"
@update:model-value="(value) => { if (!value) closeGameDialog(); }"
>
<QCard
v-if="selectedGame"
class="q-pa-md"
style="min-width: 360px; max-width: 480px"
>
<QImg
:src="getGameLogoUrl(selectedGame.repoFolder, selectedGame.logoFile)"
fit="contain"
height="80px"
class="q-mb-md"
/>
<div class="text-h6 text-weight-bold q-mb-sm">
{{ selectedGame.title }}
</div>
<div class="text-body2 q-mb-sm">
Carpeta en servidor: <strong>{{ selectedGame.repoFolder }}</strong>.
</div>
<div class="row q-gutter-sm justify-end">
<QBtn
v-if="installedGameSet.has(selectedGame.slug)"
flat
color="negative"
icon="delete"
:loading="gameAssetsStore.removingByTitle[selectedGame.slug]"
label="Borrar assets"
@click="removeGameBySlug(selectedGame.slug); closeGameDialog()"
/>
<QBtn
color="primary"
icon="download"
:disable="installedGameSet.has(selectedGame.slug)"
:label="installedGameSet.has(selectedGame.slug) ? 'Descargado' : 'Descargar assets'"
@click="onDownloadFromDialog"
/>
</div>
</QCard>
</QDialog>
<QBanner
v-if="errorMessage"
dense
rounded
class="bg-red-2 text-red-10 q-mt-lg"
>
{{ errorMessage }}
</QBanner>
</QPage>
</template>
<style scoped>
.game-grid {
display: grid;
grid-template-columns: repeat(5, minmax(0, 1fr));
gap: 12px;
}
.game-cell {
min-width: 0;
}
.logo-tile {
position: relative;
min-height: 132px;
border: 1px solid #2f3b52;
border-radius: 10px;
padding: 10px;
overflow: hidden;
}
.download-overlay {
position: absolute;
top: 0;
left: 0;
bottom: 0;
width: var(--progress-width);
background:
repeating-linear-gradient(
-45deg,
rgba(13, 148, 136, 0.45) 0 12px,
rgba(13, 148, 136, 0.25) 12px 24px
);
background-size: 36px 36px;
animation: shade-slide 1s linear infinite;
pointer-events: none;
z-index: 1;
}
.tile-actions {
position: absolute;
left: 0;
right: 0;
bottom: 4px;
display: flex;
justify-content: center;
align-items: center;
gap: 26px;
z-index: 2;
}
.downloading-spin :deep(.q-icon) {
animation: icon-spin 1s linear infinite;
}
@keyframes shade-slide {
from {
background-position: 0 0;
}
to {
background-position: 36px 0;
}
}
@keyframes icon-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
@media (max-width: 1400px) {
.game-grid {
grid-template-columns: repeat(4, minmax(0, 1fr));
}
}
@media (max-width: 1100px) {
.game-grid {
grid-template-columns: repeat(3, minmax(0, 1fr));
}
}
</style>
+41 -23
View File
@@ -1,13 +1,12 @@
<script setup lang="ts">
import { useHead } from '@unhead/vue';
import { computed, ref, watch } from 'vue';
import { graphicsSettingsReplicant } from '../../../browser_shared/replicants';
import bundlePackage from '../../../../package.json';
import { useGraphicsSettingsStore } from '../../stores/graphics-settings';
import { t } from '../i18n';
defineOptions({ name: 'GraphicsView' });
import bundlePackage from '../../../../package.json';
type GraphicConfig = {
name?: string;
title?: string;
@@ -25,6 +24,7 @@ type GraphicCard = {
useHead(() => ({ title: t('graphicsTitle') }));
const graphicsSettingsStore = useGraphicsSettingsStore();
const graphics = computed<GraphicConfig[]>(() => bundlePackage.nodecg?.graphics ?? []);
const baseUrl = computed(() => {
@@ -61,7 +61,7 @@ const commentaryGraphic = computed(() =>
const selectedScoreboardSkin = ref<string>('');
watch(
[scoreboardGraphics, () => graphicsSettingsReplicant?.data?.scoreboardSkin],
[scoreboardGraphics, () => graphicsSettingsStore.settings.scoreboardSkin],
([availableSkins, replicatedSkin]) => {
if (availableSkins.length === 0) {
selectedScoreboardSkin.value = '';
@@ -88,18 +88,15 @@ watch(
watch(
selectedScoreboardSkin,
(value) => {
if (!value || !graphicsSettingsReplicant) {
if (!value) {
return;
}
if (graphicsSettingsReplicant.data?.scoreboardSkin === value) {
if (graphicsSettingsStore.settings.scoreboardSkin === value) {
return;
}
graphicsSettingsReplicant.data = {
scoreboardSkin: value,
};
graphicsSettingsReplicant.save();
graphicsSettingsStore.setScoreboardSkin(value);
},
{ immediate: true },
);
@@ -130,19 +127,29 @@ const cards = computed<GraphicCard[]>(() => {
return result;
});
const copyUrl = async (graphic: GraphicConfig) => {
const copiedCardId = ref<string | null>(null);
const copyUrl = async (graphic: GraphicConfig, cardId: string) => {
const url = buildGraphicUrl(graphic);
if (navigator.clipboard?.writeText) {
await navigator.clipboard.writeText(url);
return;
}
} else {
const input = document.createElement('input');
input.value = url;
document.body.appendChild(input);
input.select();
document.execCommand('copy');
document.body.removeChild(input);
}
copiedCardId.value = cardId;
setTimeout(() => {
copiedCardId.value = null;
}, 2000);
};
const openUrl = (graphic: GraphicConfig) => {
window.open(buildGraphicUrl(graphic), '_blank');
};
const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
@@ -165,16 +172,18 @@ const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
<template>
<QPage class="q-pa-lg">
<div class="text-h4 q-mb-md">
<div class="q-mb-lg">
<div class="text-h5 text-weight-medium">
{{ t('graphicsTitle') }}
</div>
<div class="text-body1 q-mb-lg">
<div class="text-body2 text-grey-7 q-mt-xs">
{{ t('graphicsDescription') }}
</div>
</div>
<div
v-if="cards.length === 0"
class="text-body2 text-grey-5"
class="text-body2 text-grey-6"
>
{{ t('graphicsNoConfigured') }}
</div>
@@ -194,7 +203,7 @@ const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
<div class="text-h6">
{{ card.label }}
</div>
<div class="text-caption text-grey-5">
<div class="text-caption text-grey-4">
{{ card.graphic.file }}
</div>
</div>
@@ -224,18 +233,27 @@ const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
<div class="row items-center q-gutter-sm">
<QBtn
color="primary"
icon="content_copy"
:label="t('graphicsCopyUrl')"
@click="copyUrl(card.graphic)"
:color="copiedCardId === card.id ? 'positive' : 'primary'"
:icon="copiedCardId === card.id ? 'check' : 'content_copy'"
no-caps
:label="copiedCardId === card.id ? t('graphicsCopied') : t('graphicsCopyUrl')"
@click="copyUrl(card.graphic, card.id)"
/>
<QBtn
color="secondary"
icon="open_with"
:label="t('graphicsDragObs')"
no-caps
draggable="true"
:label="t('graphicsDragObs')"
@dragstart="onDragStart($event, card.graphic)"
/>
<QBtn
color="grey-7"
icon="open_in_new"
no-caps
:label="t('graphicsOpenBrowser')"
@click="openUrl(card.graphic)"
/>
</div>
</QCardSection>
</QCard>
File diff suppressed because it is too large Load Diff
+386 -53
View File
@@ -1,16 +1,23 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, ref } from 'vue';
import { useHead } from '@unhead/vue';
import { useQuasar } from 'quasar';
import { computed, onBeforeUnmount, ref, watch } from 'vue';
import { useIntegration } from '../composables/useIntegration';
import type { Locale } from '../i18n';
import { locale, setLocale, t } from '../i18n';
import { usePlayersStore } from '../../stores/players';
import {
eventToShortcut,
type ShortcutAction,
useShortcutSettingsStore,
} from '../stores/shortcut-settings';
} from '../../stores/shortcut-settings';
defineOptions({ name: 'SettingsView' });
useHead(() => ({ title: t('settingsTitle') }));
// ─── Idioma ────────────────────────────────────────────────────────────────────
const languageOptions = computed(() => [
{ label: t('languageSpanish'), value: 'es' as const },
{ label: t('languageEnglish'), value: 'en' as const },
@@ -18,13 +25,14 @@ const languageOptions = computed(() => [
const selectedLanguage = computed<Locale>({
get: () => locale.value,
set: (value) => {
setLocale(value);
},
set: (value) => { setLocale(value); },
});
// ─── Atajos de teclado ─────────────────────────────────────────────────────────
const shortcutSettingsStore = useShortcutSettingsStore();
const recordingAction = ref<ShortcutAction | null>(null);
const shortcutsContainerRef = ref<HTMLElement | null>(null);
const shortcutFields = computed<{ action: ShortcutAction; label: string; hint: string }[]>(() => [
{ action: 'leftIncrement', label: t('settingsShortcutLeftIncrementLabel'), hint: t('settingsShortcutLeftIncrementHint') },
@@ -33,6 +41,20 @@ const shortcutFields = computed<{ action: ShortcutAction; label: string; hint: s
{ action: 'rightDecrement', label: t('settingsShortcutRightDecrementLabel'), hint: t('settingsShortcutRightDecrementHint') },
]);
const conflictingActions = computed(() => {
const seen = new Map<string, ShortcutAction>();
const conflicts = new Set<ShortcutAction>();
for (const [action, shortcut] of Object.entries(shortcutSettingsStore.shortcuts) as [ShortcutAction, string][]) {
if (seen.has(shortcut)) {
conflicts.add(action);
conflicts.add(seen.get(shortcut)!);
} else {
seen.set(shortcut, action);
}
}
return conflicts;
});
const stopRecording = () => {
recordingAction.value = null;
if (typeof document !== 'undefined') {
@@ -41,91 +63,281 @@ const stopRecording = () => {
};
const onRecordKeydown = (event: KeyboardEvent) => {
if (!recordingAction.value) {
return;
}
if (!recordingAction.value) return;
if (event.key === 'Escape') { event.preventDefault(); stopRecording(); return; }
const shortcut = eventToShortcut(event);
if (!shortcut) {
return;
}
if (!shortcut) return;
event.preventDefault();
shortcutSettingsStore.setShortcut(recordingAction.value, shortcut);
stopRecording();
};
const startRecording = (action: ShortcutAction) => {
if (recordingAction.value === action) {
const onDocumentMousedown = (event: MouseEvent) => {
if (recordingAction.value && shortcutsContainerRef.value && !shortcutsContainerRef.value.contains(event.target as Node)) {
stopRecording();
return;
}
};
const startRecording = (action: ShortcutAction) => {
if (recordingAction.value === action) { stopRecording(); return; }
recordingAction.value = action;
if (typeof document !== 'undefined') {
document.body.dataset.shortcutRecording = 'true';
}
if (typeof document !== 'undefined') document.body.dataset.shortcutRecording = 'true';
};
if (typeof window !== 'undefined') {
window.addEventListener('keydown', onRecordKeydown);
document.addEventListener('mousedown', onDocumentMousedown);
}
onBeforeUnmount(() => {
if (typeof window !== 'undefined') {
window.removeEventListener('keydown', onRecordKeydown);
document.removeEventListener('mousedown', onDocumentMousedown);
}
stopRecording();
});
useHead(() => ({ title: t('settingsTitle') }));
// ─── Integraciones ─────────────────────────────────────────────────────────────
const STARTGG_TOKEN_STORAGE_KEY = 'scoreko-dev.startgg-token';
const CHALLONGE_TOKEN_STORAGE_KEY = 'scoreko-dev.challonge-token';
const STARTGG_TEMP_PLAYERS_STORAGE_KEY = 'scoreko-dev.startgg-temp-players';
const CHALLONGE_TEMP_PLAYERS_STORAGE_KEY = 'scoreko-dev.challonge-temp-players';
const TEMP_FALLBACK_DURATION_SECONDS = 12 * 60 * 60;
const playersStore = usePlayersStore();
const $q = useQuasar();
const startgg = useIntegration({
messagePrefix: 'startgg',
providerLabel: 'start.gg',
tokenStorageKey: STARTGG_TOKEN_STORAGE_KEY,
tempPlayersStorageKey: STARTGG_TEMP_PLAYERS_STORAGE_KEY,
tempFallbackDurationSeconds: TEMP_FALLBACK_DURATION_SECONDS,
playersStore,
});
const challonge = useIntegration({
messagePrefix: 'challonge',
providerLabel: 'Challonge',
tokenStorageKey: CHALLONGE_TOKEN_STORAGE_KEY,
tempPlayersStorageKey: CHALLONGE_TEMP_PLAYERS_STORAGE_KEY,
tempFallbackDurationSeconds: TEMP_FALLBACK_DURATION_SECONDS,
on401Message:
'Challonge rejected the token (401 Unauthorized). Re-connect OAuth so it grants scopes (me, tournaments:read, participants:read) or paste a valid personal API token.',
playersStore,
});
// ─── Diálogos de token manual ──────────────────────────────────────────────────
const isStartggManualDialogOpen = ref(false);
const startggManualDraft = ref('');
const openStartggManualDialog = () => {
startggManualDraft.value = startgg.token;
isStartggManualDialogOpen.value = true;
};
const saveStartggManualToken = () => {
startgg.token = startggManualDraft.value.trim();
isStartggManualDialogOpen.value = false;
$q.notify({ type: 'positive', message: startgg.token ? 'start.gg token saved.' : 'start.gg token removed.' });
};
const isChallongeManualDialogOpen = ref(false);
const challongeManualDraft = ref('');
const openChallongeManualDialog = () => {
challongeManualDraft.value = challonge.token;
isChallongeManualDialogOpen.value = true;
};
const saveChallongeManualToken = () => {
challonge.token = challongeManualDraft.value.trim();
isChallongeManualDialogOpen.value = false;
$q.notify({ type: 'positive', message: challonge.token ? 'Challonge token saved.' : 'Challonge token removed.' });
};
// Label de estado de Challonge
const challongeConnectionLabel = computed(() =>
challonge.hasValidatedToken ? t('playersConnected') : 'Token set',
);
watch(() => startgg.importDialogError, (msg) => {
if (msg) $q.notify({ type: 'negative', message: msg });
});
watch(() => challonge.importDialogError, (msg) => {
if (msg) $q.notify({ type: 'negative', message: msg });
});
</script>
<template>
<QPage class="q-pa-lg">
<div class="text-h4 q-mb-md">
<div class="q-mb-lg">
<div class="text-h5 text-weight-medium">
{{ t('settingsTitle') }}
</div>
<div class="text-body1 q-mb-lg">
<div class="text-body2 text-grey-7 q-mt-xs">
{{ t('settingsDescription') }}
</div>
<QCard
flat
bordered
class="q-pa-md settings-card"
>
<QCardSection class="q-pa-none q-mb-lg">
<div class="text-subtitle1 q-mb-sm">
{{ t('settingsLanguageLabel') }}
</div>
<div class="column q-gutter-lg settings-layout">
<!-- Idioma -->
<QCard flat bordered class="settings-card">
<QCardSection class="q-pa-lg">
<div class="text-overline text-grey-6 q-mb-md">{{ t('settingsLanguageLabel') }}</div>
<QSelect
v-model="selectedLanguage"
emit-value
map-options
:label="t('settingsLanguageLabel')"
:options="languageOptions"
:label="t('settingsLanguageLabel')"
outlined
dense
style="max-width: 280px"
/>
<div class="text-caption text-grey-5 q-mt-sm">
<div class="text-caption text-grey-6 q-mt-sm">
{{ t('settingsLanguageHint') }}
</div>
</QCardSection>
</QCard>
<QSeparator class="q-mb-lg" />
<!-- Integraciones -->
<QCard flat bordered class="settings-card">
<QCardSection class="q-pa-lg">
<div class="text-overline text-grey-6 q-mb-xs">{{ t('settingsIntegrationsTitle') || 'Integrations' }}</div>
<div class="text-caption text-grey-6 q-mb-lg">
{{ t('settingsIntegrationsDescription') || 'Connect your tournament platform accounts to import players directly from brackets.' }}
</div>
<QCardSection class="q-pa-none">
<div class="row items-center justify-between q-mb-sm">
<div class="text-subtitle1">
<div class="column q-gutter-md">
<!-- start.gg -->
<div class="integration-row">
<div class="integration-row__logo">
<svg style="width: 28px; height: 28px;" viewBox="0 0 40 40" fill="none" aria-hidden="true">
<path d="M1.25 20h7.5A1.25 1.25 0 0 0 10 18.75v-7.5A1.25 1.25 0 0 1 11.25 10h27.5A1.25 1.25 0 0 0 40 8.75V1.25A1.25 1.25 0 0 0 38.75 0H10A10 10 0 0 0 0 10v8.75A1.25 1.25 0 0 0 1.25 20Z" fill="#3f80ff" />
<path d="M38.75 20h-7.5A1.25 1.25 0 0 0 30 21.25v7.5A1.25 1.25 0 0 1 28.75 30H1.25A1.25 1.25 0 0 0 0 31.25v7.5A1.25 1.25 0 0 0 1.25 40H30A10 10 0 0 0 40 30V21.25A1.25 1.25 0 0 0 38.75 20Z" fill="#ff2768" />
</svg>
</div>
<div class="integration-row__info">
<div class="text-body2 text-weight-medium">start.gg</div>
<div class="text-caption text-grey-6">{{ t('playersStartggHelp') }}</div>
</div>
<div class="integration-row__actions row q-gutter-sm items-center">
<QChip
v-if="startgg.hasTokenConfigured"
dense
:color="startgg.hasValidatedToken ? 'positive' : 'warning'"
text-color="white"
icon="check_circle"
>
{{ t('playersConnected') }}
</QChip>
<QBtn
v-if="!startgg.hasTokenConfigured"
color="primary"
icon="login"
no-caps
unelevated
:label="t('playersConnectStartgg')"
:loading="startgg.oauthLoading"
@click="startgg.connectWithOAuth"
/>
<QBtn
v-else
flat
color="negative"
icon="link_off"
no-caps
size="sm"
:label="t('settingsDisconnect') || 'Disconnect'"
@click="startggManualDraft = ''; startgg.token = ''; $q.notify({ type: 'info', message: 'start.gg disconnected.' })"
/>
<QBtn
outline
:color="startgg.hasTokenConfigured ? 'grey-5' : 'white'"
icon="vpn_key"
no-caps
size="sm"
:label="t('playersUsePersonalApi')"
@click="openStartggManualDialog"
/>
</div>
</div>
<QSeparator />
<!-- Challonge -->
<div class="integration-row">
<div class="integration-row__logo">
<img
src="https://challonge.com/favicon.ico"
alt="Challonge"
style="width: 28px; height: 28px; border-radius: 6px;"
>
</div>
<div class="integration-row__info">
<div class="text-body2 text-weight-medium">Challonge</div>
<div class="text-caption text-grey-6">{{ t('playersChallongeHelp') }}</div>
</div>
<div class="integration-row__actions row q-gutter-sm items-center">
<QChip
v-if="challonge.hasTokenConfigured"
dense
:color="challonge.hasValidatedToken ? 'positive' : 'warning'"
text-color="white"
icon="check_circle"
>
{{ challongeConnectionLabel }}
</QChip>
<QBtn
v-if="!challonge.hasTokenConfigured"
color="primary"
icon="login"
no-caps
unelevated
:label="t('playersConnectChallonge')"
:loading="challonge.oauthLoading"
@click="challonge.connectWithOAuth"
/>
<QBtn
v-else
flat
color="negative"
icon="link_off"
no-caps
size="sm"
:label="t('settingsDisconnect') || 'Disconnect'"
@click="challongeManualDraft = ''; challonge.token = ''; $q.notify({ type: 'info', message: 'Challonge disconnected.' })"
/>
<QBtn
outline
:color="challonge.hasTokenConfigured ? 'grey-5' : 'white'"
icon="vpn_key"
no-caps
size="sm"
:label="t('playersUsePersonalApi')"
@click="openChallongeManualDialog"
/>
</div>
</div>
</div>
</QCardSection>
</QCard>
<!-- Atajos de teclado -->
<QCard flat bordered class="settings-card">
<QCardSection class="q-pa-lg">
<div class="row items-center justify-between q-mb-xs">
<div class="text-overline text-grey-6">
{{ t('settingsShortcutTitle') }}
</div>
<QBtn
round
dense
flat
color="primary"
icon="restart_alt"
round dense flat color="primary" icon="restart_alt"
:aria-label="t('settingsShortcutReset')"
@click="shortcutSettingsStore.resetShortcuts"
>
@@ -133,40 +345,161 @@ useHead(() => ({ title: t('settingsTitle') }));
</QBtn>
</div>
<div class="text-caption text-grey-5 q-mb-md">
<div class="text-caption text-grey-6 q-mb-lg">
{{ t('settingsShortcutDescription') }}
</div>
<div class="column q-gutter-md">
<QBanner
v-if="conflictingActions.size > 0"
class="bg-warning text-white q-mb-md"
rounded dense
>
<template #avatar>
<QIcon name="warning" color="white" />
</template>
{{ t('settingsShortcutConflictWarning') }}
</QBanner>
<div ref="shortcutsContainerRef" class="column q-gutter-md">
<QInput
v-for="field in shortcutFields"
:key="field.action"
:model-value="shortcutSettingsStore.shortcuts[field.action]"
readonly
:hint="recordingAction === field.action ? t('settingsShortcutRecordingHint') : field.hint"
:color="
recordingAction === field.action
? 'negative'
: conflictingActions.has(field.action)
? 'warning'
: 'primary'
"
readonly outlined dense bottom-slots
:label="field.label"
>
<template #append>
<QBtn
flat
round
dense
flat round dense
:icon="recordingAction === field.action ? 'stop_circle' : 'keyboard'"
:color="recordingAction === field.action ? 'negative' : 'primary'"
:aria-label="recordingAction === field.action ? t('settingsShortcutStopRecording') : t('settingsShortcutStartRecording')"
@click="startRecording(field.action)"
/>
</template>
<template #hint>
{{ recordingAction === field.action ? t('settingsShortcutRecordingHint') : field.hint }}
<QBtn
flat round dense icon="restart_alt" color="grey-5"
:aria-label="t('settingsShortcutResetSingle')"
@click="shortcutSettingsStore.resetShortcut(field.action)"
>
<QTooltip>{{ t('settingsShortcutResetSingle') }}</QTooltip>
</QBtn>
</template>
</QInput>
</div>
</QCardSection>
</QCard>
</div>
<!-- Diálogo token personal start.gg -->
<QDialog v-model="isStartggManualDialogOpen">
<QCard class="settings-dialog">
<QCardSection>
<div class="text-h6">Personal start.gg API token</div>
</QCardSection>
<QSeparator />
<QCardSection>
<div class="text-body2 q-mb-sm">
If OAuth fails, you can create a personal token manually:
</div>
<ol class="q-pl-md q-mb-md settings-token-steps">
<li>Go to https://start.gg/admin/profile/developer</li>
<li>Sign in with your account</li>
<li>From the 3 access tokens, click <strong>Third Party</strong></li>
<li>Create a new one and fill the description with any name you want</li>
<li>Copy the generated token and paste it below</li>
</ol>
<QInput
v-model="startggManualDraft"
label="Paste your personal token"
dense outlined type="password"
/>
</QCardSection>
<QSeparator />
<QCardActions align="right">
<QBtn flat no-caps label="Cancel" color="secondary" @click="isStartggManualDialogOpen = false" />
<QBtn flat no-caps color="negative" label="Delete token" @click="startggManualDraft = ''; saveStartggManualToken()" />
<QBtn no-caps color="primary" label="Save token" @click="saveStartggManualToken" />
</QCardActions>
</QCard>
</QDialog>
<!-- Diálogo token personal Challonge -->
<QDialog v-model="isChallongeManualDialogOpen">
<QCard class="settings-dialog">
<QCardSection>
<div class="text-h6">Personal Challonge API token</div>
</QCardSection>
<QSeparator />
<QCardSection>
<div class="text-body2 q-mb-sm">
If OAuth fails, paste a personal Challonge API token.
</div>
<QInput
v-model="challongeManualDraft"
label="Paste your personal Challonge token"
dense outlined type="password"
/>
</QCardSection>
<QSeparator />
<QCardActions align="right">
<QBtn flat no-caps label="Cancel" color="secondary" @click="isChallongeManualDialogOpen = false" />
<QBtn flat no-caps color="negative" label="Delete token" @click="challongeManualDraft = ''; saveChallongeManualToken()" />
<QBtn no-caps color="primary" label="Save token" @click="saveChallongeManualToken" />
</QCardActions>
</QCard>
</QDialog>
</QPage>
</template>
<style scoped>
.settings-layout {
max-width: 680px;
}
.settings-card {
max-width: 720px;
width: 100%;
}
.settings-dialog {
min-width: 320px;
width: min(560px, 90vw);
}
.settings-token-steps {
line-height: 1.6;
}
/* Fila de integración: logo | info | acciones */
.integration-row {
display: flex;
align-items: center;
gap: 16px;
}
.integration-row__logo {
flex-shrink: 0;
width: 36px;
display: flex;
align-items: center;
justify-content: center;
}
.integration-row__info {
flex: 1 1 auto;
min-width: 0;
}
.integration-row__actions {
flex-shrink: 0;
}
</style>
@@ -0,0 +1,8 @@
import { sendNodecgMessage } from '../../nodecg/browser/messages';
export const sendIntegrationMessage = <T>(
messagePrefix: string,
action: string,
payload: unknown,
): Promise<T> =>
sendNodecgMessage<T>(`${messagePrefix}:${action}`, payload);
+79
View File
@@ -0,0 +1,79 @@
import { sendNodecgCommand, sendNodecgMessage } from '../../nodecg/browser/messages';
import { createPackBrowserReplicants } from '../../nodecg/browser/packReplicants';
import { messageNames } from '../../nodecg/messageNames';
import type {
PackDownloadState,
PackManifest,
PackRegistry,
PackUpdateInfo,
} from '../../shared/domain/packs/types';
export interface PackReplicantHandlers {
onRegistryChanged: (value: PackRegistry | null) => void;
onInstalledPacksChanged: (value: string[], previousValue: string[]) => void;
onDownloadStatesChanged: (value: Record<string, PackDownloadState>) => void;
onAvailableUpdatesChanged: (value: Record<string, PackUpdateInfo>) => void;
}
export interface PackService {
subscribe: (handlers: PackReplicantHandlers) => Promise<() => void>;
fetchRegistry: () => Promise<void>;
downloadPack: (packId: string) => Promise<void>;
uninstallPack: (packId: string) => Promise<void>;
updatePack: (packId: string) => Promise<void>;
readLocalManifest: (packId: string) => Promise<PackManifest>;
}
export const createPackService = (): PackService => {
const subscribe = async (handlers: PackReplicantHandlers): Promise<() => void> => {
const {
registryRep,
installedRep,
statesRep,
updatesRep,
waitUntilReady,
} = createPackBrowserReplicants();
await waitUntilReady();
handlers.onRegistryChanged(registryRep.value ?? null);
handlers.onInstalledPacksChanged(installedRep.value ?? [], []);
handlers.onDownloadStatesChanged(statesRep.value ?? {});
handlers.onAvailableUpdatesChanged(updatesRep.value ?? {});
const onRegistryChanged = (value: PackRegistry | null): void => {
handlers.onRegistryChanged(value ?? null);
};
const onInstalledPacksChanged = (value: string[], previousValue?: string[]): void => {
handlers.onInstalledPacksChanged(value ?? [], previousValue ?? []);
};
const onDownloadStatesChanged = (value: Record<string, PackDownloadState>): void => {
handlers.onDownloadStatesChanged(value ?? {});
};
const onAvailableUpdatesChanged = (value: Record<string, PackUpdateInfo>): void => {
handlers.onAvailableUpdatesChanged(value ?? {});
};
registryRep.on('change', onRegistryChanged);
installedRep.on('change', onInstalledPacksChanged);
statesRep.on('change', onDownloadStatesChanged);
updatesRep.on('change', onAvailableUpdatesChanged);
return () => {
registryRep.off('change', onRegistryChanged);
installedRep.off('change', onInstalledPacksChanged);
statesRep.off('change', onDownloadStatesChanged);
updatesRep.off('change', onAvailableUpdatesChanged);
};
};
return {
subscribe,
fetchRegistry: () => sendNodecgCommand(messageNames.packs.fetchRegistry),
downloadPack: (packId: string) => sendNodecgCommand(messageNames.packs.download, packId),
uninstallPack: (packId: string) => sendNodecgCommand(messageNames.packs.uninstall, packId),
updatePack: (packId: string) => sendNodecgCommand(messageNames.packs.update, packId),
readLocalManifest: (packId: string) =>
sendNodecgMessage<PackManifest>(messageNames.packs.readLocalManifest, packId),
};
};
@@ -1,4 +1,10 @@
import { ref, watch, type Ref } from 'vue';
import { commentaryReplicant, graphicsSettingsReplicant, playersReplicant, scoreboardReplicant } from '../../nodecg/browser/replicants';
import { normalizeCommentary } from '../../shared/domain/commentary';
import { normalizeGraphicsSettings } from '../../shared/domain/graphics';
import { normalizePlayers } from '../../shared/domain/players/state';
import { normalizeScoreboard } from '../../shared/domain/scoreboard';
import type { Schemas } from '../../types';
interface ReplicantLike<T> {
data: T | undefined;
@@ -36,7 +42,7 @@ export const writeStorageSnapshot = <T>(storageKey: string, value: T): void => {
}
};
export const syncStateWithReplicant = <T>(
const syncStateWithReplicant = <T>(
state: Ref<T>,
replicant: ReplicantLike<T> | undefined,
normalize: (input: unknown) => T,
@@ -44,24 +50,21 @@ export const syncStateWithReplicant = <T>(
): void => {
const isApplyingReplicant = ref(false);
const persistSnapshot = (value: T): void => {
if (!storageKey) {
return;
}
if (storageKey) {
writeStorageSnapshot(storageKey, value);
}
};
watch(
() => replicant?.data,
(value) => {
if (!value) {
if (value === undefined) {
return;
}
isApplyingReplicant.value = true;
state.value = normalize(value);
isApplyingReplicant.value = false;
persistSnapshot(state.value);
},
{ deep: true, immediate: true },
@@ -70,16 +73,32 @@ export const syncStateWithReplicant = <T>(
watch(
state,
(value) => {
persistSnapshot(value);
const normalized = normalize(value);
persistSnapshot(normalized);
if (isApplyingReplicant.value || !replicant) {
return;
}
// Replicants remain the source of truth for server/browser synchronization.
replicant.data = normalize(value);
replicant.data = normalized;
replicant.save();
},
{ deep: true, flush: 'sync' },
);
};
export const syncScoreboardState = (state: Ref<Schemas.Scoreboard>, storageKey: string): void => {
syncStateWithReplicant(state, scoreboardReplicant, normalizeScoreboard, storageKey);
};
export const syncPlayersState = (state: Ref<Schemas.Players>, storageKey: string): void => {
syncStateWithReplicant(state, playersReplicant, normalizePlayers, storageKey);
};
export const syncCommentaryState = (state: Ref<Schemas.Commentary>): void => {
syncStateWithReplicant(state, commentaryReplicant, normalizeCommentary);
};
export const syncGraphicsSettingsState = (state: Ref<Schemas.GraphicsSettings>): void => {
syncStateWithReplicant(state, graphicsSettingsReplicant, normalizeGraphicsSettings);
};
+77
View File
@@ -0,0 +1,77 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import {
defaultCommentary,
normalizeCommentary,
swapCommentary,
type Commentary,
} from '../../shared/domain/commentary';
import { syncCommentaryState } from '../services/replicant-state-service';
export const useCommentaryStore = defineStore('commentary', () => {
const commentary = ref<Commentary>({ ...defaultCommentary });
syncCommentaryState(commentary);
const setCommentary = (value: Commentary): void => {
commentary.value = normalizeCommentary(value);
};
const clearCommentary = (): void => {
commentary.value = { ...defaultCommentary };
};
const leftCommentator = computed({
get: () => commentary.value.leftCommentator,
set: (value: string) => {
commentary.value = {
...commentary.value,
leftCommentator: value,
};
},
});
const leftCommentatorTwitter = computed({
get: () => commentary.value.leftCommentatorTwitter,
set: (value: string) => {
commentary.value = {
...commentary.value,
leftCommentatorTwitter: value,
};
},
});
const rightCommentator = computed({
get: () => commentary.value.rightCommentator,
set: (value: string) => {
commentary.value = {
...commentary.value,
rightCommentator: value,
};
},
});
const rightCommentatorTwitter = computed({
get: () => commentary.value.rightCommentatorTwitter,
set: (value: string) => {
commentary.value = {
...commentary.value,
rightCommentatorTwitter: value,
};
},
});
const swapCommentators = (): void => {
commentary.value = swapCommentary(commentary.value);
};
return {
commentary,
leftCommentator,
leftCommentatorTwitter,
rightCommentator,
rightCommentatorTwitter,
setCommentary,
clearCommentary,
swapCommentators,
};
});
+31
View File
@@ -0,0 +1,31 @@
import { defineStore } from 'pinia';
import { ref } from 'vue';
import {
defaultGraphicsSettings,
normalizeGraphicsSettings,
type GraphicsSettings,
} from '../../shared/domain/graphics';
import { syncGraphicsSettingsState } from '../services/replicant-state-service';
export const useGraphicsSettingsStore = defineStore('graphics-settings', () => {
const settings = ref<GraphicsSettings>({ ...defaultGraphicsSettings });
syncGraphicsSettingsState(settings);
const setSettings = (value: GraphicsSettings): void => {
settings.value = normalizeGraphicsSettings(value);
};
const setScoreboardSkin = (scoreboardSkin: string): void => {
settings.value = normalizeGraphicsSettings({
...settings.value,
scoreboardSkin,
});
};
return {
settings,
setSettings,
setScoreboardSkin,
};
});
+218
View File
@@ -0,0 +1,218 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import { createPackService } from '../services/pack-service';
import {
buildCharactersByGame,
buildDefaultCharactersByGame,
type DefaultCharacterPair,
type FightingCharacterOption,
} from '../../shared/domain/packs/characters';
import type {
GameSelectOption,
PackDownloadState,
PackManifest,
PackRegistry,
PackUpdateInfo,
} from '../../shared/domain/packs/types';
const packService = createPackService();
const formatBytes = (bytes: number): string => {
if (bytes < 1024) {
return `${bytes} B`;
}
if (bytes < 1024 * 1024) {
return `${(bytes / 1024).toFixed(1)} KB`;
}
return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
};
const getLocalLogoUrl = (packId: string): string => `/packs/${packId}/logo.png`;
export const usePacksStore = defineStore('packs', () => {
const initialized = ref(false);
const registry = ref<PackRegistry | null>(null);
const installedPackIds = ref<string[]>([]);
const downloadStates = ref<Record<string, PackDownloadState>>({});
const availableUpdates = ref<Record<string, PackUpdateInfo>>({});
const installedManifests = ref<Record<string, PackManifest>>({});
const loadingManifestIds = new Set<string>();
let unsubscribe: (() => void) | null = null;
let registryRefreshTimer: ReturnType<typeof setInterval> | null = null;
const installedManifestList = computed(() =>
installedPackIds.value
.map((packId) => installedManifests.value[packId])
.filter((manifest): manifest is PackManifest => Boolean(manifest)),
);
const charactersByGame = computed(() => buildCharactersByGame(installedManifestList.value));
const defaultCharactersByGame = computed(() => buildDefaultCharactersByGame(installedManifestList.value));
const allGameOptions = computed<GameSelectOption[]>(() => {
if (!registry.value) {
return [];
}
return registry.value.packs.map((entry) => ({
label: entry.name,
value: entry.name,
available: installedPackIds.value.includes(entry.id),
registryEntry: entry,
updateInfo: availableUpdates.value[entry.id],
}));
});
const updateCount = computed(() => Object.keys(availableUpdates.value).length);
const loadInstalledManifest = (packId: string): void => {
if (installedManifests.value[packId] || loadingManifestIds.has(packId)) {
return;
}
loadingManifestIds.add(packId);
packService.readLocalManifest(packId)
.then((manifest) => {
installedManifests.value = {
...installedManifests.value,
[packId]: manifest,
};
})
.catch((error: unknown) => {
console.error(`[packs] Failed to load manifest for "${packId}":`, error);
})
.finally(() => {
loadingManifestIds.delete(packId);
});
};
const syncInstalledManifests = (nextPackIds: string[]): void => {
const nextSet = new Set(nextPackIds);
const nextManifests: Record<string, PackManifest> = {};
Object.entries(installedManifests.value).forEach(([packId, manifest]) => {
if (nextSet.has(packId)) {
nextManifests[packId] = manifest;
}
});
installedManifests.value = nextManifests;
nextPackIds.forEach(loadInstalledManifest);
};
const initialize = (): void => {
if (initialized.value) {
return;
}
initialized.value = true;
packService.subscribe({
onRegistryChanged: (value) => {
registry.value = value;
},
onInstalledPacksChanged: (value) => {
installedPackIds.value = [...value];
syncInstalledManifests(value);
},
onDownloadStatesChanged: (value) => {
downloadStates.value = { ...value };
},
onAvailableUpdatesChanged: (value) => {
availableUpdates.value = { ...value };
},
})
.then((dispose) => {
unsubscribe = dispose;
})
.catch((error: unknown) => {
initialized.value = false;
console.error('[packs] Failed to subscribe to pack replicants:', error);
});
};
const dispose = (): void => {
unsubscribe?.();
unsubscribe = null;
if (registryRefreshTimer) {
clearInterval(registryRefreshTimer);
registryRefreshTimer = null;
}
initialized.value = false;
};
const runCommand = (label: string, command: () => Promise<void>): void => {
command().catch((error: unknown) => {
console.error(`[packs] ${label} failed:`, error);
});
};
const fetchRegistry = (): void => {
runCommand('fetchRegistry', packService.fetchRegistry);
};
const startRegistryRefresh = (intervalMs = 15_000): void => {
fetchRegistry();
if (registryRefreshTimer) {
return;
}
registryRefreshTimer = setInterval(fetchRegistry, intervalMs);
};
const stopRegistryRefresh = (): void => {
if (!registryRefreshTimer) {
return;
}
clearInterval(registryRefreshTimer);
registryRefreshTimer = null;
};
const downloadPack = (packId: string): void => {
runCommand(`downloadPack "${packId}"`, () => packService.downloadPack(packId));
};
const uninstallPack = (packId: string): void => {
runCommand(`uninstallPack "${packId}"`, () => packService.uninstallPack(packId));
};
const updatePack = (packId: string): void => {
runCommand(`updatePack "${packId}"`, () => packService.updatePack(packId));
};
const isGameAvailable = (gameName: string): boolean => {
const entry = registry.value?.packs.find((pack) => pack.name === gameName);
return entry ? installedPackIds.value.includes(entry.id) : false;
};
const getDownloadState = (packId: string): PackDownloadState =>
downloadStates.value[packId] ?? { status: 'idle', progress: 0 };
const getCharactersByGame = (gameName: string): FightingCharacterOption[] =>
charactersByGame.value[gameName] ?? [];
const getDefaultCharactersByGame = (gameName: string): DefaultCharacterPair | undefined =>
defaultCharactersByGame.value[gameName];
return {
registry,
installedPackIds,
downloadStates,
availableUpdates,
installedManifests,
allGameOptions,
updateCount,
initialize,
dispose,
fetchRegistry,
startRegistryRefresh,
stopRegistryRefresh,
downloadPack,
uninstallPack,
updatePack,
isGameAvailable,
getDownloadState,
getCharactersByGame,
getDefaultCharactersByGame,
formatBytes,
getLocalLogoUrl,
};
});
+51
View File
@@ -0,0 +1,51 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import {
normalizePlayer,
normalizePlayers,
type Player,
type PlayersMap,
} from '../../shared/domain/players/state';
import { readStorageSnapshot, syncPlayersState } from '../services/replicant-state-service';
const STORAGE_KEY = 'scoreko-dev.players';
export const usePlayersStore = defineStore('players', () => {
const players = ref<PlayersMap>({});
const storageSnapshot = readStorageSnapshot(STORAGE_KEY, normalizePlayers);
if (storageSnapshot) {
players.value = storageSnapshot;
}
syncPlayersState(players, STORAGE_KEY);
const setPlayers = (value: PlayersMap): void => {
players.value = normalizePlayers(value);
};
const upsertPlayer = (id: string, player: Player): void => {
players.value = {
...players.value,
[id]: normalizePlayer(player),
};
};
const removePlayer = (id: string): void => {
const next = { ...players.value };
delete next[id];
players.value = next;
};
const rows = computed(() => Object.entries(players.value).map(([id, player]) => ({
id,
...player,
})));
return {
players,
rows,
setPlayers,
upsertPlayer,
removePlayer,
};
});
+120
View File
@@ -0,0 +1,120 @@
import { defineStore } from 'pinia';
import { computed, ref } from 'vue';
import {
adjustScoreboardScore,
defaultScoreboard,
normalizeScoreboard,
resetScoreboardScores,
setScoreboardScore,
swapScoreboardPlayers,
type Scoreboard,
type ScoreboardSide,
} from '../../shared/domain/scoreboard';
import { readStorageSnapshot, syncScoreboardState } from '../services/replicant-state-service';
const STORAGE_KEY = 'scoreko-dev.scoreboard';
export const useScoreboardStore = defineStore('scoreboard', () => {
const scoreboard = ref<Scoreboard>({ ...defaultScoreboard });
const storageSnapshot = readStorageSnapshot(STORAGE_KEY, normalizeScoreboard);
if (storageSnapshot) {
scoreboard.value = storageSnapshot;
}
syncScoreboardState(scoreboard, STORAGE_KEY);
const setScoreboard = (value: Scoreboard): void => {
scoreboard.value = normalizeScoreboard(value);
};
const setGame = (value: string): void => {
scoreboard.value = { ...scoreboard.value, game: value };
};
const setRound = (value: string): void => {
scoreboard.value = { ...scoreboard.value, round: value };
};
const setScore = (side: ScoreboardSide, value: number): void => {
scoreboard.value = setScoreboardScore(scoreboard.value, side, value);
};
const adjustScore = (side: ScoreboardSide, delta: number): void => {
scoreboard.value = adjustScoreboardScore(scoreboard.value, side, delta);
};
const setSidePlayerId = (side: ScoreboardSide, value: string): void => {
scoreboard.value = {
...scoreboard.value,
[side === 'left' ? 'leftPlayerId' : 'rightPlayerId']: value,
};
};
const setSideNameOverride = (side: ScoreboardSide, value: string): void => {
scoreboard.value = {
...scoreboard.value,
[side === 'left' ? 'leftNameOverride' : 'rightNameOverride']: value,
};
};
const setSideTeamOverride = (side: ScoreboardSide, value: string): void => {
scoreboard.value = {
...scoreboard.value,
[side === 'left' ? 'leftTeamOverride' : 'rightTeamOverride']: value,
};
};
const setSideCountryOverride = (side: ScoreboardSide, value: string): void => {
scoreboard.value = {
...scoreboard.value,
[side === 'left' ? 'leftCountryOverride' : 'rightCountryOverride']: value,
};
};
const setSideCharacter = (side: ScoreboardSide, value: string): void => {
scoreboard.value = {
...scoreboard.value,
[side === 'left' ? 'leftCharacter' : 'rightCharacter']: value,
};
};
const swapPlayers = (): void => {
scoreboard.value = swapScoreboardPlayers(scoreboard.value);
};
const resetScores = (): void => {
scoreboard.value = resetScoreboardScores(scoreboard.value);
};
const leftScore = computed({
get: () => scoreboard.value.leftScore,
set: (value: number) => {
setScore('left', value);
},
});
const rightScore = computed({
get: () => scoreboard.value.rightScore,
set: (value: number) => {
setScore('right', value);
},
});
return {
scoreboard,
leftScore,
rightScore,
setScoreboard,
setGame,
setRound,
setScore,
adjustScore,
setSidePlayerId,
setSideNameOverride,
setSideTeamOverride,
setSideCountryOverride,
setSideCharacter,
swapPlayers,
resetScores,
};
});
@@ -175,9 +175,15 @@ export const useShortcutSettingsStore = defineStore('shortcut-settings', () => {
persistSettings(shortcuts);
};
const resetShortcut = (action: ShortcutAction) => {
shortcuts[action] = defaultShortcuts[action];
persistSettings(shortcuts);
};
return {
shortcuts,
setShortcut,
resetShortcuts,
resetShortcut,
};
});
+262 -316
View File
@@ -1,6 +1,9 @@
import { createServer, type Server, type ServerResponse } from 'node:http';
import { randomUUID } from 'node:crypto';
import { nodecg } from './util/nodecg.js';
import { nodecg } from '../nodecg/extension/context.js';
import { listenForMessage } from '../nodecg/extension/messages.js';
import { messageNames } from '../nodecg/messageNames.js';
import { createOAuthServer, type OAuthConfig } from './util/oauth-server.js';
// ─── Constantes ────────────────────────────────────────────────────────────────
const CHALLONGE_API_BASE = 'https://api.challonge.com/v2.1';
const CHALLONGE_OAUTH_AUTHORIZE_ENDPOINT = 'https://api.challonge.com/oauth/authorize';
@@ -17,21 +20,17 @@ const CHALLONGE_OAUTH_SCOPES = [
const CHALLONGE_OAUTH_CALLBACK_PATH = '/challonge/callback';
const CHALLONGE_OAUTH_DEFAULT_PORT = 34921;
const CHALLONGE_OAUTH_SESSION_TTL_MS = 10 * 60 * 1000;
const RECENT_TOURNAMENTS_LIMIT = 20;
interface OAuthConfig {
clientId: string;
clientSecret: string;
callbackPort: number;
}
// ─── URL del proxy OAuth ───────────────────────────────────────────────────────
// Rellena esta constante con la URL de tu Cloudflare Worker tras el deploy.
// Formato: 'https://scoreko-oauth-proxy.TU-SUBDOMINIO.workers.dev'
//
// También puedes sobreescribirla en cfg/scoreko.json con "oauthProxyUrl"
// (útil para apuntar a un entorno de staging sin recompilar).
const OAUTH_PROXY_BASE_URL = 'https://scoreko-oauth-proxy.panver.workers.dev';
interface OAuthSession {
sessionId: string;
state: string;
expiresAt: number;
status: 'pending' | 'completed' | 'error' | 'expired';
token?: string;
error?: string;
}
// ─── Tipos ─────────────────────────────────────────────────────────────────────
interface OAuthTokenResponse {
access_token?: string;
@@ -57,157 +56,155 @@ interface ImportedPlayer {
twitter: string;
}
const oauthSessions = new Map<string, OAuthSession>();
let oauthCallbackServer: Server | null = null;
// ─── Modo OAuth ────────────────────────────────────────────────────────────────
//
// DEV: cfg/scoreko.json tiene challongeClientId + challongeClientSecret.
// El exchange se hace directamente contra Challonge.
//
// PROXY: No hay credenciales en la config local.
// El clientId se obtiene del Worker (es público, no secreto).
// El exchange lo hace el Worker, que guarda el clientSecret en sus env vars.
const getStringProp = (payload: unknown, key: string): string => {
if (typeof payload !== 'object' || payload === null || !(key in payload)) {
return '';
}
type OAuthMode =
| { type: 'dev'; clientId: string; clientSecret: string; callbackPort: number }
| { type: 'proxy'; proxyBaseUrl: string; callbackPort: number };
const value = (payload as Record<string, unknown>)[key];
return typeof value === 'string' ? value.trim() : String(value || '').trim();
};
const getNumberProp = (payload: Record<string, unknown>, keys: string[]): number | null => {
for (const key of keys) {
const raw = payload[key];
if (typeof raw === 'number' && Number.isFinite(raw)) {
return raw;
}
if (typeof raw === 'string') {
const parsed = Number(raw);
if (Number.isFinite(parsed)) {
return parsed;
}
}
}
return null;
};
const sendAck = (ack: unknown, error: string | null, response?: unknown) => {
if (typeof ack !== 'function') {
return;
}
ack(error, response);
};
const getOAuthConfig = (): OAuthConfig | null => {
const bundleConfig = nodecg.bundleConfig as unknown as Record<string, unknown>;
const clientId = String(bundleConfig.challongeClientId || '').trim();
const clientSecret = String(bundleConfig.challongeClientSecret || '').trim();
const getOAuthMode = (): OAuthMode => {
const bundleConfig = nodecg.bundleConfig as Record<string, unknown>;
const clientId = String(bundleConfig.challongeClientId ?? '').trim();
const clientSecret = String(bundleConfig.challongeClientSecret ?? '').trim();
const rawPort = Number(bundleConfig.challongeOAuthPort ?? CHALLONGE_OAUTH_DEFAULT_PORT);
const callbackPort = Number.isFinite(rawPort) && rawPort > 0 ? rawPort : CHALLONGE_OAUTH_DEFAULT_PORT;
const callbackPort =
Number.isFinite(rawPort) && rawPort > 0 ? rawPort : CHALLONGE_OAUTH_DEFAULT_PORT;
if (!clientId || !clientSecret) {
return null;
const proxyBaseUrl =
String(bundleConfig.oauthProxyUrl ?? '').trim() || OAUTH_PROXY_BASE_URL;
if (clientId && clientSecret) {
nodecg.log.info('[Challonge] OAuth: modo dev (credenciales locales)');
return { type: 'dev', clientId, clientSecret, callbackPort };
}
return {
clientId,
clientSecret,
callbackPort,
};
nodecg.log.info(`[Challonge] OAuth: modo proxy → ${proxyBaseUrl}`);
return { type: 'proxy', proxyBaseUrl, callbackPort };
};
const getCallbackUrl = (callbackPort: number) => `http://127.0.0.1:${callbackPort}${CHALLONGE_OAUTH_CALLBACK_PATH}`;
// ─── Exchange de token ─────────────────────────────────────────────────────────
const updateOAuthSession = (sessionId: string, update: Partial<OAuthSession>) => {
const session = oauthSessions.get(sessionId);
if (!session) {
return;
}
oauthSessions.set(sessionId, {
...session,
...update,
});
};
const cleanupExpiredOAuthSessions = () => {
const now = Date.now();
oauthSessions.forEach((session, sessionId) => {
if (session.expiresAt <= now && session.status === 'pending') {
updateOAuthSession(sessionId, { status: 'expired' });
}
});
};
const renderCallbackHtml = (title: string, message: string) => `<!doctype html>
<html lang="es">
<head>
<meta charset="utf-8" />
<title>${title}</title>
<style>
body { font-family: Arial, sans-serif; margin: 2rem; background: #121212; color: #fff; }
.box { max-width: 680px; padding: 1rem 1.2rem; border: 1px solid #444; border-radius: 8px; }
</style>
</head>
<body>
<div class="box">
<h2>${title}</h2>
<p>${message}</p>
<p>You can close this tab and return to Scoreko.</p>
</div>
</body>
</html>`;
const respondWithCallbackHtml = (res: ServerResponse, statusCode: number, title: string, message: string) => {
res.statusCode = statusCode;
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end(renderCallbackHtml(title, message));
};
const parseOAuthTokenPayload = async (response: Response): Promise<OAuthTokenResponse> => {
const rawBody = await response.text();
try {
return JSON.parse(rawBody) as OAuthTokenResponse;
} catch {
return { message: rawBody };
}
};
const exchangeOAuthCodeForToken = async (
/** Modo dev: exchange directo con Challonge usando credenciales locales */
const exchangeCodeDirectly = async (
code: string,
redirectUri: string,
oauthConfig: OAuthConfig,
clientId: string,
clientSecret: string,
): Promise<string> => {
const params = new URLSearchParams({
grant_type: 'authorization_code',
code,
client_id: oauthConfig.clientId,
client_secret: oauthConfig.clientSecret,
client_id: clientId,
client_secret: clientSecret,
redirect_uri: redirectUri,
});
const response = await fetch(CHALLONGE_OAUTH_TOKEN_ENDPOINT, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: params.toString(),
});
const payload = await parseOAuthTokenPayload(response);
if (!response.ok) {
throw new Error(payload.error_description || payload.error || payload.message || `OAuth token request failed (${response.status})`);
const rawBody = await response.text();
let payload: OAuthTokenResponse;
try {
payload = JSON.parse(rawBody) as OAuthTokenResponse;
} catch {
payload = { message: rawBody };
}
const token = String(payload.access_token || '').trim();
if (!response.ok) {
throw new Error(
payload.error_description ??
payload.error ??
payload.message ??
`OAuth token request failed (${response.status})`,
);
}
const token = String(payload.access_token ?? '').trim();
if (!token) {
throw new Error(payload.error_description || payload.error || payload.message || 'OAuth token response did not include an access token');
throw new Error(
payload.error_description ??
payload.error ??
payload.message ??
'OAuth token response did not include an access token',
);
}
return token;
};
const parseJsonResponse = async (response: Response): Promise<unknown> => {
/** Modo proxy: el Worker hace el exchange; el clientSecret nunca sale del Worker */
const exchangeCodeViaProxy = async (
code: string,
redirectUri: string,
proxyBaseUrl: string,
): Promise<string> => {
const response = await fetch(`${proxyBaseUrl}/oauth/challonge/token`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ code, redirectUri }),
});
const rawBody = await response.text();
if (!rawBody) {
return null;
let payload: { access_token?: string; error?: string };
try {
payload = JSON.parse(rawBody) as typeof payload;
} catch {
payload = { error: rawBody };
}
if (!response.ok) {
throw new Error(payload.error ?? `Proxy responded with ${response.status}`);
}
const token = String(payload.access_token ?? '').trim();
if (!token) throw new Error(payload.error ?? 'Proxy did not return a token');
return token;
};
/**
* Callback que recibe oauth-server.ts cuando llega el código de autorización.
* Delega al modo correcto; _config no se usa porque el modo ya está determinado.
*/
const exchangeOAuthCodeForToken = async (
code: string,
redirectUri: string,
_config: OAuthConfig,
): Promise<string> => {
void _config;
const mode = getOAuthMode();
if (mode.type === 'dev') {
return exchangeCodeDirectly(code, redirectUri, mode.clientId, mode.clientSecret);
}
return exchangeCodeViaProxy(code, redirectUri, mode.proxyBaseUrl);
};
// ─── Servidor OAuth ────────────────────────────────────────────────────────────
const oauthServer = createOAuthServer({
provider: 'Challonge',
callbackPath: CHALLONGE_OAUTH_CALLBACK_PATH,
authorizeEndpoint: CHALLONGE_OAUTH_AUTHORIZE_ENDPOINT,
scope: CHALLONGE_OAUTH_SCOPES,
sessionTtlMs: CHALLONGE_OAUTH_SESSION_TTL_MS,
exchangeToken: exchangeOAuthCodeForToken,
});
// ─── API de Challonge ──────────────────────────────────────────────────────────
type ChallongeErrorPayload = { errors?: { detail?: string }; error?: string } | null;
const parseJsonResponse = async (response: Response): Promise<unknown> => {
const rawBody = await response.text();
if (!rawBody) return null;
try {
return JSON.parse(rawBody) as unknown;
} catch {
@@ -218,6 +215,7 @@ const parseJsonResponse = async (response: Response): Promise<unknown> => {
const requestChallonge = async (path: string, token: string): Promise<unknown> => {
const requestUrl = `${CHALLONGE_API_BASE}${path}`;
// ── Intento v2 (OAuth Bearer) ─────────────────────────────────────────────
const v2Response = await fetch(requestUrl, {
headers: {
Accept: 'application/json',
@@ -226,14 +224,13 @@ const requestChallonge = async (path: string, token: string): Promise<unknown> =
Authorization: `Bearer ${token}`,
},
});
const v2Payload = await parseJsonResponse(v2Response);
if (v2Response.ok) {
return v2Payload;
}
// Fallback for personal API keys pasted manually (v1 auth style).
// ── Fallback v1 (API key personal pegada manualmente) ─────────────────────
if (v2Response.status === 401) {
const v1Response = await fetch(requestUrl, {
headers: {
@@ -243,46 +240,68 @@ const requestChallonge = async (path: string, token: string): Promise<unknown> =
Authorization: token,
},
});
const v1Payload = await parseJsonResponse(v1Response);
if (v1Response.ok) {
return v1Payload;
}
}
const maybeError = v2Payload as { errors?: { detail?: string }; error?: string } | null;
if (!v2Response.ok) {
const v1Error = v1Payload as ChallongeErrorPayload;
throw new Error(
maybeError?.errors?.detail || maybeError?.error || `Challonge responded with ${v2Response.status} ${v2Response.statusText}`.trim(),
v1Error?.errors?.detail ??
v1Error?.error ??
`Challonge responded with ${v1Response.status} ${v1Response.statusText}`.trim(),
);
}
return v2Payload;
// ── Otros errores v2 (4xx/5xx que no sean 401) ────────────────────────────
const v2Error = v2Payload as ChallongeErrorPayload;
throw new Error(
v2Error?.errors?.detail ??
v2Error?.error ??
`Challonge responded with ${v2Response.status} ${v2Response.statusText}`.trim(),
);
};
// ─── Parsers de respuesta ──────────────────────────────────────────────────────
const normalizeTournamentSlug = (value: string): string => {
const trimmed = value.trim();
if (!trimmed) {
return '';
if (!trimmed) return '';
return trimmed
.replace(/^https?:\/\/[^/]+\//i, '')
.replace(/^tournaments\//i, '')
.replace(/^\/+/, '');
};
const getNumberProp = (payload: Record<string, unknown>, keys: string[]): number | null => {
for (const key of keys) {
const raw = payload[key];
if (typeof raw === 'number' && Number.isFinite(raw)) return raw;
if (typeof raw === 'string') {
const parsed = Number(raw);
if (Number.isFinite(parsed)) return parsed;
}
return trimmed.replace(/^https?:\/\/[^/]+\//i, '').replace(/^tournaments\//i, '').replace(/^\/+/, '');
}
return null;
};
const parseRecentTournaments = (payload: unknown): RecentTournament[] => {
const rows: RecentTournament[] = [];
const push = (candidate: Record<string, unknown>) => {
const attributes = (typeof candidate.attributes === 'object' && candidate.attributes !== null)
const attributes =
typeof candidate.attributes === 'object' && candidate.attributes !== null
? (candidate.attributes as Record<string, unknown>)
: candidate;
const id = String(candidate.id || attributes.id || attributes.tournament_id || '').trim();
const name = String(attributes.name || attributes.full_name || '').trim();
const slug = normalizeTournamentSlug(String(attributes.url || attributes.slug || attributes.identifier || id));
const id = String(candidate.id ?? attributes.id ?? attributes.tournament_id ?? '').trim();
const name = String(attributes.name ?? attributes.full_name ?? '').trim();
const slug = normalizeTournamentSlug(
String(attributes.url ?? attributes.slug ?? attributes.identifier ?? id),
);
if (!id || !name || !slug) {
return;
}
if (!id || !name || !slug) return;
rows.push({
id,
@@ -294,26 +313,25 @@ const parseRecentTournaments = (payload: unknown): RecentTournament[] => {
};
if (Array.isArray(payload)) {
payload.forEach((row) => {
for (const row of payload) {
const wrapper = row as Record<string, unknown>;
const tournament = (typeof wrapper.tournament === 'object' && wrapper.tournament !== null)
const tournament =
typeof wrapper.tournament === 'object' && wrapper.tournament !== null
? (wrapper.tournament as Record<string, unknown>)
: wrapper;
push(tournament);
});
}
return rows;
}
if (typeof payload === 'object' && payload !== null) {
const root = payload as Record<string, unknown>;
const data = root.data;
const data = (payload as Record<string, unknown>).data;
if (Array.isArray(data)) {
data.forEach((row) => {
for (const row of data) {
if (typeof row === 'object' && row !== null) {
push(row as Record<string, unknown>);
}
});
return rows;
}
}
}
@@ -324,201 +342,137 @@ const parseImportedPlayers = (payload: unknown): ImportedPlayer[] => {
const map = new Map<string, ImportedPlayer>();
const push = (candidate: Record<string, unknown>) => {
const attributes = (typeof candidate.attributes === 'object' && candidate.attributes !== null)
const attributes =
typeof candidate.attributes === 'object' && candidate.attributes !== null
? (candidate.attributes as Record<string, unknown>)
: candidate;
const id = String(candidate.id || attributes.id || attributes.participant_id || '').trim();
const gamertag = String(
attributes.display_name
|| attributes.name
|| attributes.username
|| attributes.gamer_tag
|| '',
const id = String(
candidate.id ?? attributes.id ?? attributes.participant_id ?? '',
).trim();
if (!id || !gamertag) {
return;
}
const rawDisplayName = String(
attributes.display_name ??
attributes.name ??
attributes.username ??
attributes.gamer_tag ??
'',
).trim();
if (!id || !rawDisplayName) return;
const PIPE_PATTERN = /^(.+?)\s*\|\s*(.+)$/;
const pipeMatch = PIPE_PATTERN.exec(rawDisplayName);
const teamFromName = pipeMatch ? pipeMatch[1].trim() : '';
const gamertag = pipeMatch ? pipeMatch[2].trim() : rawDisplayName;
const team = String(attributes.team_name ?? '').trim() || teamFromName;
map.set(id, {
id,
gamertag,
name: gamertag,
team: String(attributes.group_player_ids || attributes.team_name || '').trim(),
name: '',
team,
country: '',
twitter: String(attributes.twitter_handle || attributes.twitter || '').trim(),
twitter: String(attributes.twitter_handle ?? attributes.twitter ?? '').trim(),
});
};
if (Array.isArray(payload)) {
payload.forEach((row) => {
for (const row of payload) {
const wrapper = row as Record<string, unknown>;
const participant = (typeof wrapper.participant === 'object' && wrapper.participant !== null)
const participant =
typeof wrapper.participant === 'object' && wrapper.participant !== null
? (wrapper.participant as Record<string, unknown>)
: wrapper;
push(participant);
});
}
return Array.from(map.values());
}
if (typeof payload === 'object' && payload !== null) {
const root = payload as Record<string, unknown>;
const data = root.data;
const data = (payload as Record<string, unknown>).data;
if (Array.isArray(data)) {
data.forEach((row) => {
for (const row of data) {
if (typeof row === 'object' && row !== null) {
push(row as Record<string, unknown>);
}
});
}
}
}
return Array.from(map.values());
};
const ensureOAuthCallbackServer = async (oauthConfig: OAuthConfig) => {
if (oauthCallbackServer) {
return;
}
// ─── Utilidades ────────────────────────────────────────────────────────────────
const callbackUrl = getCallbackUrl(oauthConfig.callbackPort);
const server = createServer((req, res) => {
if (!req.url) {
res.statusCode = 400;
res.end('Bad request');
return;
}
const requestUrl = new URL(req.url, callbackUrl);
if (requestUrl.pathname !== CHALLONGE_OAUTH_CALLBACK_PATH) {
res.statusCode = 404;
res.end('Not found');
return;
}
cleanupExpiredOAuthSessions();
const state = requestUrl.searchParams.get('state') || '';
const code = requestUrl.searchParams.get('code') || '';
const error = requestUrl.searchParams.get('error') || '';
const session = Array.from(oauthSessions.values()).find((candidate) => candidate.state === state);
if (!session) {
respondWithCallbackHtml(res, 400, 'Invalid OAuth', 'No active session was found for this authorization.');
return;
}
if (session.expiresAt <= Date.now()) {
updateOAuthSession(session.sessionId, { status: 'expired' });
respondWithCallbackHtml(res, 400, 'Session expired', 'The OAuth session expired. Start the process again from Scoreko.');
return;
}
if (error) {
updateOAuthSession(session.sessionId, { status: 'error', error });
respondWithCallbackHtml(res, 400, 'OAuth canceled', `Challonge returned this error: ${error}`);
return;
}
if (!code) {
updateOAuthSession(session.sessionId, {
status: 'error',
error: 'Missing authorization code',
});
respondWithCallbackHtml(res, 400, 'Incomplete OAuth', 'No authorization code was received.');
return;
}
void exchangeOAuthCodeForToken(code, callbackUrl, oauthConfig)
.then((token) => {
updateOAuthSession(session.sessionId, { status: 'completed', token, error: undefined });
})
.catch((exchangeError) => {
const message = exchangeError instanceof Error ? exchangeError.message : 'Failed to exchange authorization code';
updateOAuthSession(session.sessionId, { status: 'error', error: message });
});
respondWithCallbackHtml(res, 200, 'Authorization received', 'Your authorization was received. Finishing sign-in in the background...');
});
await new Promise<void>((resolve, reject) => {
server.once('error', reject);
server.listen(oauthConfig.callbackPort, '127.0.0.1', () => {
server.off('error', reject);
resolve();
});
});
oauthCallbackServer = server;
const getStringProp = (payload: unknown, key: string): string => {
if (typeof payload !== 'object' || payload === null || !(key in payload)) return '';
const value = (payload as Record<string, unknown>)[key];
return typeof value === 'string' ? value.trim() : String(value ?? '').trim();
};
nodecg.listenFor('challonge:createOAuthSession', async (_payload: unknown, ack) => {
const oauthConfig = getOAuthConfig();
if (!oauthConfig) {
sendAck(ack, 'OAuth is not configured in this installation (missing challongeClientId/challongeClientSecret). Use the Client ID and Client Secret from a Challonge OAuth app.');
const sendAck = (ack: unknown, error: string | null, response?: unknown) => {
if (typeof ack === 'function') ack(error, response);
};
// ─── Listeners de NodeCG ───────────────────────────────────────────────────────
listenForMessage(messageNames.integrations.challonge.createOAuthSession, async (_payload: unknown, ack) => {
const mode = getOAuthMode();
let serverConfig: OAuthConfig;
if (mode.type === 'dev') {
serverConfig = {
clientId: mode.clientId,
callbackPort: mode.callbackPort,
};
} else {
// Modo proxy: el clientId viene del Worker (es público, no secreto)
try {
const res = await fetch(`${mode.proxyBaseUrl}/oauth/challonge/client-id`);
if (!res.ok) throw new Error(`Proxy responded with ${res.status}`);
const data = await res.json() as { clientId?: string };
const clientId = String(data.clientId ?? '').trim();
if (!clientId) throw new Error('Proxy did not return a clientId');
serverConfig = { clientId, callbackPort: mode.callbackPort };
} catch (err) {
sendAck(
ack,
err instanceof Error ? err.message : 'Could not fetch OAuth config from proxy',
);
return;
}
}
try {
await ensureOAuthCallbackServer(oauthConfig);
} catch (serverError) {
const message = serverError instanceof Error ? serverError.message : 'Could not start the local OAuth callback';
sendAck(ack, message);
await oauthServer.ensureServer(serverConfig);
} catch (err) {
sendAck(ack, err instanceof Error ? err.message : 'Could not start the OAuth callback server');
return;
}
cleanupExpiredOAuthSessions();
const sessionId = randomUUID();
const state = randomUUID();
oauthSessions.set(sessionId, {
sessionId,
state,
expiresAt: Date.now() + CHALLONGE_OAUTH_SESSION_TTL_MS,
status: 'pending',
sendAck(ack, null, oauthServer.createSession(serverConfig));
});
const params = new URLSearchParams({
response_type: 'code',
client_id: oauthConfig.clientId,
redirect_uri: getCallbackUrl(oauthConfig.callbackPort),
scope: CHALLONGE_OAUTH_SCOPES,
state,
});
sendAck(ack, null, {
sessionId,
authUrl: `${CHALLONGE_OAUTH_AUTHORIZE_ENDPOINT}?${params.toString()}`,
});
});
nodecg.listenFor('challonge:getOAuthSessionStatus', (payload: unknown, ack) => {
cleanupExpiredOAuthSessions();
listenForMessage(messageNames.integrations.challonge.getOAuthSessionStatus, (payload: unknown, ack) => {
const sessionId = getStringProp(payload, 'sessionId');
if (!sessionId) {
sendAck(ack, 'Missing OAuth session id');
return;
}
const session = oauthSessions.get(sessionId);
if (!session) {
const status = oauthServer.getSessionStatus(sessionId);
if (!status) {
sendAck(ack, 'OAuth session not found');
return;
}
sendAck(ack, null, {
status: session.status,
token: session.status === 'completed' ? session.token : undefined,
error: session.status === 'error' ? session.error : undefined,
});
sendAck(ack, null, status);
});
nodecg.listenFor('challonge:fetchRecentTournaments', async (payload: unknown, ack) => {
listenForMessage(messageNames.integrations.challonge.fetchRecentTournaments, async (payload: unknown, ack) => {
const token = getStringProp(payload, 'token');
if (!token) {
sendAck(ack, 'Missing Challonge API token');
return;
@@ -528,35 +482,27 @@ nodecg.listenFor('challonge:fetchRecentTournaments', async (payload: unknown, ac
const raw = await requestChallonge('/tournaments.json', token);
const tournaments = parseRecentTournaments(raw)
.sort((a, b) => (b.startAt ?? 0) - (a.startAt ?? 0))
.slice(0, 20);
.slice(0, RECENT_TOURNAMENTS_LIMIT);
sendAck(ack, null, tournaments);
} catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while loading tournaments';
sendAck(ack, message);
sendAck(ack, error instanceof Error ? error.message : 'Unknown error while loading tournaments');
}
});
nodecg.listenFor('challonge:fetchTournamentPlayers', async (payload: unknown, ack) => {
listenForMessage(messageNames.integrations.challonge.fetchTournamentPlayers, async (payload: unknown, ack) => {
const token = getStringProp(payload, 'token');
const slug = normalizeTournamentSlug(getStringProp(payload, 'slug'));
if (!token) {
sendAck(ack, 'Missing Challonge API token');
return;
}
if (!slug) {
sendAck(ack, 'Missing tournament slug');
return;
}
if (!token) { sendAck(ack, 'Missing Challonge API token'); return; }
if (!slug) { sendAck(ack, 'Missing tournament slug'); return; }
try {
const raw = await requestChallonge(`/tournaments/${encodeURIComponent(slug)}/participants.json`, token);
const players = parseImportedPlayers(raw);
sendAck(ack, null, players);
const raw = await requestChallonge(
`/tournaments/${encodeURIComponent(slug)}/participants.json`,
token,
);
sendAck(ack, null, parseImportedPlayers(raw));
} catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while importing players';
sendAck(ack, message);
sendAck(ack, error instanceof Error ? error.message : 'Unknown error while importing players');
}
});
-15
View File
@@ -1,15 +0,0 @@
import type { ExampleType } from '../types/index.js';
import { nodecg } from './util/nodecg.js';
import { exampleReplicant } from './util/replicants.js';
// Example code:
// Log to show things are working.
nodecg.log.info('Extension code working!');
// Access this bundle's configuration with no type assertion needed.
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const configProperty = nodecg.bundleConfig.exampleProperty;
// Access/set a replicant (also see ./util/replicants).
exampleReplicant.value = { exampleProperty: `exampleString_Changed_${Date.now()}` };
// Accessing normal types.
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const exampleType: ExampleType = { exampleProperty: 'exampleString' };
-513
View File
@@ -1,513 +0,0 @@
import { mkdir, readFile, readdir, rename, rm, stat, writeFile } from 'node:fs/promises';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { nodecg } from './util/nodecg.js';
const CHARACTER_NAMES_FILE = 'fighting-characters.json';
const LOCAL_MANIFEST_FILE = 'manifest.json';
const GAME_TITLES_FILE = 'games.json';
const CACHED_GAME_TITLES_FILE = 'games-cache.json';
type RemoteGame = {
title: string;
slug: string;
repoFolder: string;
logoFile: string;
};
type AssetFileEntry = {
path: string;
size: number;
downloadUrl: string;
};
type HttpManifestEntry = string | {
path?: unknown;
size?: unknown;
url?: unknown;
};
type HttpGameTitleEntry = {
slug?: unknown;
title?: unknown;
};
type HttpGameTitlesFile = Record<string, unknown> | HttpGameTitleEntry[];
const extensionDir = path.dirname(fileURLToPath(import.meta.url));
const bundleRoot = path.resolve(extensionDir, '..');
const legacyAssetsRoot = path.join(bundleRoot, 'game-assets');
const assetsRoot = path.join(bundleRoot, 'db', `${nodecg.bundleName}-game-assets`);
let assetsStorageReady = false;
const ensureAssetsStorageReady = async () => {
if (assetsStorageReady) {
return;
}
await mkdir(path.dirname(assetsRoot), { recursive: true });
const [currentStats, legacyStats] = await Promise.all([
stat(assetsRoot).catch(() => null),
stat(legacyAssetsRoot).catch(() => null),
]);
if (!currentStats && legacyStats?.isDirectory()) {
await rename(legacyAssetsRoot, assetsRoot).catch(async () => {
await mkdir(assetsRoot, { recursive: true });
});
} else {
await mkdir(assetsRoot, { recursive: true });
}
assetsStorageReady = true;
};
void ensureAssetsStorageReady();
const assetsRouter = nodecg.Router();
assetsRouter.get('/*', async (req, res) => {
const wildcardParam = (req.params as Record<string, unknown>)['0']
?? (req.params as Record<string, unknown>)[''];
const requestedPath = Array.isArray(wildcardParam)
? String(wildcardParam[0] ?? '')
: typeof wildcardParam === 'string'
? wildcardParam
: '';
const normalizedPath = path.normalize(requestedPath).replace(/^(\.\.(?:[\\/]|$))+/, '');
const filePath = path.resolve(assetsRoot, normalizedPath);
if (!filePath.startsWith(assetsRoot)) {
res.status(400).send('Invalid asset path.');
return;
}
try {
const fileStats = await stat(filePath);
if (!fileStats.isFile()) {
res.status(404).send('Asset not found.');
return;
}
res.type(path.extname(filePath));
res.send(await readFile(filePath));
} catch {
res.status(404).send('Asset not found.');
}
});
nodecg.mount(`/bundles/${nodecg.bundleName}/game-assets`, assetsRouter);
const requestHeaders = {
'User-Agent': 'scoreko-dev-nodecg-bundle',
};
const getConfiguredAssetsBaseUrl = () => {
const configuredValue = nodecg.bundleConfig.assetsBaseUrl;
if (typeof configuredValue !== 'string') {
return 'http://localhost';
}
const trimmed = configuredValue.trim();
if (!trimmed) {
return 'http://localhost';
}
return trimmed.replace(/\/+$/, '');
};
const emitProgress = (title: string, progress: number, status: 'downloading' | 'completed' | 'error') => {
nodecg.sendMessage('scoreko-assets:downloadProgress', {
title,
progress: Math.max(0, Math.min(100, progress)),
status,
});
};
const fetchJson = async <T>(url: string): Promise<T> => {
const response = await fetch(url, { headers: requestHeaders });
if (!response.ok) {
throw new Error(`Error HTTP (${response.status}) al solicitar ${url}`);
}
return response.json() as Promise<T>;
};
const normalizeManifestEntry = (entry: HttpManifestEntry, gameTitle: string) => {
if (typeof entry === 'string') {
return {
path: entry,
size: 0,
explicitUrl: null,
};
}
if (typeof entry === 'object' && entry !== null && typeof entry.path === 'string') {
return {
path: entry.path,
size: typeof entry.size === 'number' ? entry.size : 0,
explicitUrl: typeof entry.url === 'string' ? entry.url : null,
};
}
throw new Error(`El ${LOCAL_MANIFEST_FILE} de ${gameTitle} contiene entradas inválidas.`);
};
const titleFromSlug = (slug: string) => slug
.split('-')
.filter(Boolean)
.map((segment) => segment[0].toUpperCase() + segment.slice(1))
.join(' ');
const parseGameTitlesMap = (payload: unknown): Map<string, string> => {
const map = new Map<string, string>();
if (Array.isArray(payload)) {
for (const entry of payload) {
const parsedEntry = entry as HttpGameTitleEntry;
if (
typeof entry === 'object'
&& entry !== null
&& typeof parsedEntry.slug === 'string'
&& typeof parsedEntry.title === 'string'
) {
const slug = parsedEntry.slug.trim();
const title = parsedEntry.title.trim();
if (slug && title) {
map.set(slug, title);
}
}
}
return map;
}
if (typeof payload === 'object' && payload !== null) {
for (const [slug, value] of Object.entries(payload)) {
if (typeof value !== 'string') {
continue;
}
const normalizedSlug = slug.trim();
const title = value.trim();
if (normalizedSlug && title) {
map.set(normalizedSlug, title);
}
}
}
return map;
};
const fetchCustomGameTitles = async (): Promise<Map<string, string>> => {
const baseUrl = getConfiguredAssetsBaseUrl();
const url = `${baseUrl}/games/${GAME_TITLES_FILE}`;
try {
const payload = await fetchJson<HttpGameTitlesFile>(url);
return parseGameTitlesMap(payload);
} catch {
return new Map<string, string>();
}
};
const loadCachedGameTitles = async (): Promise<Map<string, string>> => {
await ensureAssetsStorageReady();
const cachePath = path.join(assetsRoot, CACHED_GAME_TITLES_FILE);
try {
const raw = await readFile(cachePath, 'utf8');
const parsed = JSON.parse(raw) as unknown;
return parseGameTitlesMap(parsed);
} catch {
return new Map<string, string>();
}
};
const saveCachedGameTitles = async (titles: Map<string, string>) => {
await ensureAssetsStorageReady();
const cachePath = path.join(assetsRoot, CACHED_GAME_TITLES_FILE);
const payload = Object.fromEntries([...titles.entries()].sort((left, right) => left[0].localeCompare(right[0])));
await writeFile(cachePath, JSON.stringify(payload, null, 2));
};
const listRemoteGames = async (): Promise<RemoteGame[]> => {
const baseUrl = getConfiguredAssetsBaseUrl();
const gamesIndexUrl = `${baseUrl}/games/`;
const customTitles = await fetchCustomGameTitles();
const response = await fetch(gamesIndexUrl, { headers: requestHeaders });
if (!response.ok) {
throw new Error(`Error HTTP (${response.status}) al solicitar ${gamesIndexUrl}`);
}
const html = await response.text();
const hrefMatches = [...html.matchAll(/href=["']([^"']+)["']/gi)].map((match) => match[1]);
const slugs = hrefMatches
.map((href) => {
const withoutQuery = href.split('?')[0]?.split('#')[0] ?? '';
if (!withoutQuery.endsWith('/')) {
return null;
}
const decoded = decodeURIComponent(withoutQuery);
const trimmed = decoded.replace(/^\/+|\/+$/g, '');
if (!trimmed || trimmed.includes('/') || trimmed === '.' || trimmed === '..') {
return null;
}
return trimmed;
})
.filter((slug): slug is string => slug !== null);
const uniqueSlugs = [...new Set(slugs)].sort((left, right) => left.localeCompare(right));
return uniqueSlugs.map((slug) => ({
slug,
repoFolder: slug,
title: customTitles.get(slug) ?? titleFromSlug(slug),
logoFile: `${slug}.png`,
}));
};
const listHttpFiles = async (game: RemoteGame): Promise<AssetFileEntry[]> => {
const baseUrl = getConfiguredAssetsBaseUrl();
const manifestUrl = `${baseUrl}/games/${game.repoFolder}/${LOCAL_MANIFEST_FILE}`;
const entries = await fetchJson<HttpManifestEntry[]>(manifestUrl);
if (!Array.isArray(entries) || entries.length === 0) {
throw new Error(`No se encontraron archivos en ${manifestUrl}.`);
}
return entries.map((rawEntry) => {
const normalized = normalizeManifestEntry(rawEntry, game.title);
const cleanPath = normalized.path.replace(/^\/+/, '');
return {
path: `games/${game.repoFolder}/${cleanPath}`,
size: Math.max(0, normalized.size),
downloadUrl: normalized.explicitUrl ?? `${baseUrl}/games/${game.repoFolder}/${cleanPath}`,
};
});
};
const listInstalledGames = async () => {
await ensureAssetsStorageReady();
const entries = await readdir(assetsRoot, { withFileTypes: true }).catch(() => []);
return entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort((left, right) => left.localeCompare(right));
};
const listInstalledGamesAsRemote = async (): Promise<RemoteGame[]> => {
const installedGames = await listInstalledGames();
const cachedTitles = await loadCachedGameTitles();
return installedGames.map((slug) => ({
slug,
repoFolder: slug,
title: cachedTitles.get(slug) ?? titleFromSlug(slug),
logoFile: `${slug}.png`,
}));
};
const parseCharacterNames = (content: string, gameTitle: string) => {
const parsed = JSON.parse(content) as unknown;
const names = Array.isArray(parsed)
? parsed
: typeof parsed === 'object' && parsed !== null && Array.isArray((parsed as { characters?: unknown }).characters)
? (parsed as { characters: unknown[] }).characters
: null;
if (!names || names.some((name) => typeof name !== 'string')) {
throw new Error(`El archivo ${CHARACTER_NAMES_FILE} de ${gameTitle} no tiene un formato válido.`);
}
return names;
};
const listInstalledCharacterNamesByGame = async () => {
const installedGames = await listInstalledGames();
const charactersByGame = await Promise.all(installedGames.map(async (slug) => {
const sourcePath = path.join(assetsRoot, slug, CHARACTER_NAMES_FILE);
try {
const fileContent = await readFile(sourcePath, 'utf8');
const names = parseCharacterNames(fileContent, slug);
return [slug, names] as const;
} catch {
return [slug, []] as const;
}
}));
return Object.fromEntries(charactersByGame) as Record<string, string[]>;
};
const downloadGameAssets = async (gameSlug: string) => {
await ensureAssetsStorageReady();
const customTitles = await fetchCustomGameTitles();
const game: RemoteGame = {
slug: gameSlug,
repoFolder: gameSlug,
title: customTitles.get(gameSlug) ?? titleFromSlug(gameSlug),
logoFile: `${gameSlug}.png`,
};
emitProgress(game.slug, 0, 'downloading');
const files = await listHttpFiles(game);
if (!files.length) {
throw new Error(`No se encontraron archivos para ${game.title}.`);
}
const hasCharacterNamesFile = files.some((file) => file.path.endsWith(`/${CHARACTER_NAMES_FILE}`));
if (!hasCharacterNamesFile) {
throw new Error(`No se encontró ${CHARACTER_NAMES_FILE} para ${game.title}.`);
}
const totalBytes = files.reduce((acc, file) => acc + (file.size || 0), 0);
let downloadedBytes = 0;
const destinationFolder = path.join(assetsRoot, game.slug);
await rm(destinationFolder, { recursive: true, force: true });
for (const file of files) {
const relativePath = file.path.replace(`games/${game.repoFolder}/`, '');
const targetPath = path.join(destinationFolder, relativePath);
await mkdir(path.dirname(targetPath), { recursive: true });
const response = await fetch(file.downloadUrl, { headers: requestHeaders });
if (!response.ok) {
throw new Error(`No se pudo descargar ${file.path} (status ${response.status}).`);
}
const arrayBuffer = await response.arrayBuffer();
await writeFile(targetPath, Buffer.from(arrayBuffer));
downloadedBytes += file.size || 0;
const progress = totalBytes > 0 ? Math.round((downloadedBytes / totalBytes) * 100) : 100;
emitProgress(game.slug, progress, 'downloading');
}
emitProgress(game.slug, 100, 'completed');
return {
title: game.title,
slug: game.slug,
};
};
const removeGameAssets = async (gameSlug: string) => {
await ensureAssetsStorageReady();
const customTitles = await fetchCustomGameTitles();
const destinationFolder = path.join(assetsRoot, gameSlug);
await rm(destinationFolder, { recursive: true, force: true });
return {
title: customTitles.get(gameSlug) ?? titleFromSlug(gameSlug),
slug: gameSlug,
};
};
nodecg.listenFor('scoreko-assets:listRemoteGames', async (_payload: unknown, ack) => {
if (typeof ack !== 'function') {
return;
}
try {
const remoteGames = await listRemoteGames();
const titlesToCache = new Map<string, string>();
remoteGames.forEach((game) => {
titlesToCache.set(game.slug, game.title);
});
await saveCachedGameTitles(titlesToCache);
ack(null, remoteGames);
} catch (error) {
try {
const installedGames = await listInstalledGamesAsRemote();
if (installedGames.length > 0) {
ack(null, installedGames);
return;
}
} catch {
// noop
}
ack((error as Error).message);
}
});
nodecg.listenFor('scoreko-assets:listInstalled', async (_payload: unknown, ack) => {
if (typeof ack !== 'function') {
return;
}
try {
ack(null, await listInstalledGames());
} catch (error) {
ack((error as Error).message);
}
});
nodecg.listenFor('scoreko-assets:listCharactersByGame', async (_payload: unknown, ack) => {
if (typeof ack !== 'function') {
return;
}
try {
ack(null, await listInstalledCharacterNamesByGame());
} catch (error) {
ack((error as Error).message);
}
});
nodecg.listenFor('scoreko-assets:getAssetsBaseUrl', async (_payload: unknown, ack) => {
if (typeof ack !== 'function') {
return;
}
try {
ack(null, { assetsBaseUrl: getConfiguredAssetsBaseUrl() });
} catch (error) {
ack((error as Error).message);
}
});
nodecg.listenFor('scoreko-assets:downloadGame', async (payload: unknown, ack) => {
if (typeof ack !== 'function') {
return;
}
try {
const slug = typeof payload === 'object' && payload !== null ? (payload as { slug?: unknown }).slug : undefined;
if (typeof slug !== 'string') {
throw new Error('Slug de juego inválido.');
}
const downloaded = await downloadGameAssets(slug);
ack(null, {
downloaded,
installedGames: await listInstalledGames(),
});
} catch (error) {
if (typeof payload === 'object' && payload !== null && typeof (payload as { slug?: unknown }).slug === 'string') {
emitProgress((payload as { slug: string }).slug, 0, 'error');
}
ack((error as Error).message);
}
});
nodecg.listenFor('scoreko-assets:removeGame', async (payload: unknown, ack) => {
if (typeof ack !== 'function') {
return;
}
try {
const slug = typeof payload === 'object' && payload !== null ? (payload as { slug?: unknown }).slug : undefined;
if (typeof slug !== 'string') {
throw new Error('Slug de juego inválido.');
}
const removed = await removeGameAssets(slug);
ack(null, {
removed,
installedGames: await listInstalledGames(),
});
} catch (error) {
ack((error as Error).message);
}
});
+4 -5
View File
@@ -1,15 +1,14 @@
import type { NodeCGServerAPI } from '../types/index.js';
import { set } from './util/nodecg.js';
import { setNodecgContext } from '../nodecg/extension/context.js';
export default async (nodecg: NodeCGServerAPI) => {
/**
* Because of how top-level `import`s work, it helps to use `import`s here
* to force things to be loaded *after* the NodeCG context is set.
*/
set(nodecg); // set nodecg "context" before anything else
await import('./util/replicants.js'); // make sure replicants are set up
await import('./example.js');
setNodecgContext(nodecg); // set nodecg "context" before anything else
await import('./modules/replicants.js'); // make sure replicants are set up
await import('./startgg.js');
await import('./challonge.js');
await import('./game-assets.js');
await import('./pack-manager.js');
};
+9
View File
@@ -0,0 +1,9 @@
import {
commentaryReplicant,
playersReplicant,
scoreboardReplicant,
} from '../../nodecg/extension/replicants.js';
playersReplicant();
scoreboardReplicant();
commentaryReplicant();
+390
View File
@@ -0,0 +1,390 @@
// src/extension/pack-manager.ts
// ─────────────────────────────────────────────────────────────────────────────
// Módulo autocontenido: no importa nada de src/shared/ para respetar el
// rootDir del tsconfig de la extensión. Las constantes de Gitea y los tipos
// necesarios están definidos aquí directamente.
//
// Para activarlo, añade UNA línea en src/extension/index.ts:
// await import('./pack-manager.js');
// ─────────────────────────────────────────────────────────────────────────────
import * as fs from 'fs';
import type { IncomingMessage, ServerResponse } from 'http';
import * as path from 'path';
import { fileURLToPath } from 'url';
import { nodecg } from '../nodecg/extension/context.js';
import { listenForMessage, reply, type Acknowledgement } from '../nodecg/extension/messages.js';
import { createPackExtensionReplicants } from '../nodecg/extension/packReplicants.js';
import { messageNames } from '../nodecg/messageNames.js';
import type {
PackDownloadState,
PackManifest,
PackRegistry,
} from '../shared/domain/packs/types.js';
// ── Configuración de Gitea ────────────────────────────────────────────────────
// Edita estas constantes para apuntar a tu instancia.
const GITEA_BASE_URL = 'http://10.0.0.10:3002';
const GITEA_OWNER = 'Pandipipas';
const GITEA_REPO = 'fighting-game-packs';
const GITEA_BRANCH = 'main';
const rawUrl = (repoPath: string) =>
`${GITEA_BASE_URL}/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}/${repoPath}`;
const REGISTRY_URL = rawUrl('registry.json');
const getManifestUrl = (id: string) => rawUrl(`${id}/manifest.json`);
const getPackLogoUrl = (id: string) => rawUrl(`${id}/logo.png`);
const getCharacterImageRepoUrl = (id: string, slug: string, ext: string) =>
rawUrl(`${id}/characters/${slug}.${ext}`);
// ── Tipos locales ─────────────────────────────────────────────────────────────
// Replicamos la forma exacta del tipo Acknowledgement de NodeCG sin necesidad
// de importar @nodecg/types. HandledAcknowledgement NO es callable (es un objeto),
// UnhandledAcknowledgement SÍ lo es. El helper reply() comprueba cuál es antes de llamar.
// ── Constantes ────────────────────────────────────────────────────────────────
const IMAGE_EXTENSIONS = ['png', 'webp', 'jpg', 'jpeg', 'avif'] as const;
// Raíz del proyecto: 2 niveles por encima de extension/pack-manager.js
// Usamos import.meta.url porque nodecg.bundleDir no está disponible cuando
// NodeCG se usa como dependencia en lugar de servidor standalone.
const bundleDir = fileURLToPath(new URL('../', import.meta.url));
// ── Replicants ────────────────────────────────────────────────────────────────
const {
installedPacksRep,
packRegistryRep,
downloadStatesRep,
availableUpdatesRep,
} = createPackExtensionReplicants();
// ── Filesystem ────────────────────────────────────────────────────────────────
const packsDir = path.join(bundleDir, 'packs');
fs.mkdirSync(packsDir, { recursive: true });
nodecg.log.info(`[pack-manager] Packs directory: ${packsDir}`);
// Registrar el directorio de packs como ruta estática usando nodecg.mount().
// Las imágenes quedan accesibles en /packs/<packId>/characters/<slug>.png
// independientemente de cómo NodeCG configure el resto de rutas del bundle.
const packsMiddleware = (req: IncomingMessage, res: ServerResponse) => {
const urlPath = decodeURIComponent(req.url ?? '/');
const safe = path.normalize(urlPath).replace(/^(\.\.[/\\])+/, '');
const file = path.join(packsDir, safe);
// Security: only serve files inside packsDir
if (!file.startsWith(packsDir)) {
res.writeHead(403);
res.end();
return;
}
fs.stat(file, (statErr, stat) => {
if (statErr || !stat.isFile()) {
res.writeHead(404);
res.end();
return;
}
const mimeTypes: Record<string, string> = {
'.png': 'image/png',
'.jpg': 'image/jpeg',
'.jpeg': 'image/jpeg',
'.webp': 'image/webp',
'.avif': 'image/avif',
'.json': 'application/json',
};
const ext = path.extname(file).toLowerCase();
res.setHeader('Content-Type', mimeTypes[ext] ?? 'application/octet-stream');
res.setHeader('Cache-Control', 'public, max-age=3600');
fs.createReadStream(file).pipe(res);
});
};
// nodecg.mount registra el middleware en el servidor Express de NodeCG
(nodecg as unknown as { mount: (p: string, h: typeof packsMiddleware) => void })
.mount('/packs', packsMiddleware);
// Verificación de integridad al arrancar
const installedAtStart = installedPacksRep.value ?? [];
const verified = installedAtStart.filter((id) =>
fs.existsSync(path.join(packsDir, id, 'manifest.json')),
);
if (verified.length !== installedAtStart.length) {
nodecg.log.warn('[pack-manager] Algunos packs instalados no estaban en disco y se han eliminado del registro.');
installedPacksRep.value = verified;
}
// ── Helpers internos ──────────────────────────────────────────────────────────
const setDownloadState = (packId: string, patch: Partial<PackDownloadState>): void => {
const current = downloadStatesRep.value?.[packId] ?? { status: 'idle', progress: 0 };
downloadStatesRep.value = {
...downloadStatesRep.value,
[packId]: { ...current, ...patch },
};
};
const fetchBuffer = async (url: string): Promise<Buffer> => {
const response = await fetch(url);
if (!response.ok) throw new Error(`HTTP ${response.status}${url}`);
return Buffer.from(await response.arrayBuffer());
};
const trySaveImage = async (
destDir: string,
filename: string,
extensions: readonly string[],
buildUrl: (ext: string) => string,
): Promise<boolean> => {
for (const ext of extensions) {
try {
const buffer = await fetchBuffer(buildUrl(ext));
// Siempre guardamos como .png para que la URL del dashboard sea predecible.
// Los navegadores modernos identifican el formato por el contenido (magic bytes),
// no por la extensión, así que WebP/AVIF/JPEG se renderizan correctamente.
fs.writeFileSync(path.join(destDir, `${filename}.png`), buffer);
return true;
} catch { /* prueba siguiente extensión */ }
}
return false;
};
// ── Detección de actualizaciones ─────────────────────────────────────────────
// Compara la versión en el manifest.json local de cada pack instalado contra
// la versión en el registro de Gitea. Solo aplica a packs descargados (no bundled).
const checkForUpdates = (): void => {
const registry = packRegistryRep.value;
const installed = installedPacksRep.value ?? [];
if (!registry || installed.length === 0) {
availableUpdatesRep.value = {};
return;
}
const updates: Record<string, { installedVersion: string; latestVersion: string }> = {};
for (const packId of installed) {
const registryEntry = registry.packs.find((p) => p.id === packId);
if (!registryEntry) continue;
const manifestPath = path.join(packsDir, packId, 'manifest.json');
try {
const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8')) as PackManifest;
if (manifest.version !== registryEntry.version) {
updates[packId] = {
installedVersion: manifest.version,
latestVersion: registryEntry.version,
};
nodecg.log.info(
`[pack-manager] Actualización disponible para "${packId}": ${manifest.version}${registryEntry.version}`,
);
}
} catch {
// Manifest ilegible — ignorar este pack
}
}
availableUpdatesRep.value = updates;
};
// Comprobar al arrancar si ya hay un registro cacheado
checkForUpdates();
// ── Mensaje: fetchPackRegistry ────────────────────────────────────────────────
listenForMessage(messageNames.packs.fetchRegistry, async (_data: unknown, ack: Acknowledgement | undefined) => {
try {
const response = await fetch(REGISTRY_URL);
if (!response.ok) throw new Error(`HTTP ${response.status}`);
const registry = await response.json() as PackRegistry;
packRegistryRep.value = registry;
checkForUpdates(); // re-evaluar actualizaciones con el registro nuevo
reply(ack, null, registry);
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
nodecg.log.error(`[pack-manager] Error al obtener el registro: ${message}`);
reply(ack, new Error(message));
}
});
// ── Mensaje: downloadPack ─────────────────────────────────────────────────────
listenForMessage(messageNames.packs.download, async (packId: unknown, ack: Acknowledgement | undefined) => {
if (typeof packId !== 'string' || !packId) {
return reply(ack, new Error('downloadPack requiere un packId no vacío.'));
}
if (installedPacksRep.value?.includes(packId)) {
return reply(ack, null, { alreadyInstalled: true });
}
if (downloadStatesRep.value?.[packId]?.status === 'downloading') {
return reply(ack, new Error(`El pack "${packId}" ya se está descargando.`));
}
setDownloadState(packId, { status: 'fetching-manifest', progress: 0, error: undefined });
try {
const manifestRes = await fetch(getManifestUrl(packId));
if (!manifestRes.ok) throw new Error(`No se puede obtener el manifest: HTTP ${manifestRes.status}`);
const manifest = await manifestRes.json() as PackManifest;
const packDir = path.join(packsDir, packId);
const charsDir = path.join(packDir, 'characters');
fs.mkdirSync(charsDir, { recursive: true });
fs.writeFileSync(path.join(packDir, 'manifest.json'), JSON.stringify(manifest, null, 2));
setDownloadState(packId, { status: 'downloading', progress: 2 });
try {
const logoBuffer = await fetchBuffer(getPackLogoUrl(packId));
fs.writeFileSync(path.join(packDir, 'logo.png'), logoBuffer);
} catch {
nodecg.log.warn(`[pack-manager] No se encontró logo para "${packId}" — se omite.`);
}
const total = manifest.characters.length;
for (let i = 0; i < total; i++) {
const char = manifest.characters[i]!;
const saved = await trySaveImage(
charsDir,
char.slug,
IMAGE_EXTENSIONS,
(ext) => getCharacterImageRepoUrl(packId, char.slug, ext),
);
if (!saved) {
nodecg.log.warn(`[pack-manager] Sin imagen para "${packId}/${char.slug}" — se usará placeholder.`);
}
setDownloadState(packId, { progress: 5 + Math.round(((i + 1) / total) * 93) });
}
const current = installedPacksRep.value ?? [];
if (!current.includes(packId)) installedPacksRep.value = [...current, packId];
setDownloadState(packId, { status: 'done', progress: 100 });
reply(ack, null, { packId, characterCount: manifest.characters.length });
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
nodecg.log.error(`[pack-manager] Error al descargar "${packId}": ${message}`);
setDownloadState(packId, { status: 'error', error: message });
reply(ack, new Error(message));
}
});
// ── Mensaje: uninstallPack ────────────────────────────────────────────────────
listenForMessage(messageNames.packs.uninstall, (packId: unknown, ack: Acknowledgement | undefined) => {
if (typeof packId !== 'string' || !packId) {
return reply(ack, new Error('uninstallPack requiere un packId no vacío.'));
}
try {
fs.rmSync(path.join(packsDir, packId), { recursive: true, force: true });
installedPacksRep.value = (installedPacksRep.value ?? []).filter((id) => id !== packId);
const states = { ...downloadStatesRep.value };
delete states[packId];
downloadStatesRep.value = states;
const updates = { ...availableUpdatesRep.value };
delete updates[packId];
availableUpdatesRep.value = updates;
reply(ack, null);
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
nodecg.log.error(`[pack-manager] Error al desinstalar "${packId}": ${message}`);
reply(ack, new Error(message));
}
});
// ── Mensaje: updatePack ──────────────────────────────────────────────────────
// Dashboard → Extension: "Actualiza el pack <packId> a la última versión."
// Borra las imágenes antiguas y descarga las nuevas desde Gitea.
listenForMessage(messageNames.packs.update, async (packId: unknown, ack: Acknowledgement | undefined) => {
if (typeof packId !== 'string' || !packId) {
return reply(ack, new Error('updatePack requiere un packId no vacío.'));
}
if (!installedPacksRep.value?.includes(packId)) {
return reply(ack, new Error(`El pack "${packId}" no está instalado. Usa downloadPack primero.`));
}
if (downloadStatesRep.value?.[packId]?.status === 'downloading') {
return reply(ack, new Error(`El pack "${packId}" ya se está actualizando.`));
}
setDownloadState(packId, { status: 'fetching-manifest', progress: 0, error: undefined });
try {
// 1. Obtener nuevo manifest
const manifestRes = await fetch(getManifestUrl(packId));
if (!manifestRes.ok) throw new Error(`No se puede obtener el manifest: HTTP ${manifestRes.status}`);
const manifest = await manifestRes.json() as PackManifest;
const packDir = path.join(packsDir, packId);
const charsDir = path.join(packDir, 'characters');
// 2. Limpiar imágenes antiguas para evitar residuos de personajes renombrados
if (fs.existsSync(charsDir)) {
fs.rmSync(charsDir, { recursive: true, force: true });
}
fs.mkdirSync(charsDir, { recursive: true });
// 3. Guardar nuevo manifest en disco
fs.writeFileSync(path.join(packDir, 'manifest.json'), JSON.stringify(manifest, null, 2));
// 4. Logo
setDownloadState(packId, { status: 'downloading', progress: 2 });
try {
const logoBuffer = await fetchBuffer(getPackLogoUrl(packId));
fs.writeFileSync(path.join(packDir, 'logo.png'), logoBuffer);
} catch {
nodecg.log.warn(`[pack-manager] No se encontró logo para "${packId}" — se omite.`);
}
// 5. Imágenes de personajes
const total = manifest.characters.length;
for (let i = 0; i < total; i++) {
const char = manifest.characters[i]!;
const saved = await trySaveImage(
charsDir,
char.slug,
IMAGE_EXTENSIONS,
(ext) => getCharacterImageRepoUrl(packId, char.slug, ext),
);
if (!saved) {
nodecg.log.warn(`[pack-manager] Sin imagen para "${packId}/${char.slug}" — se usará placeholder.`);
}
setDownloadState(packId, { progress: 5 + Math.round(((i + 1) / total) * 93) });
}
// 6. Quitar de availableUpdates
const updates = { ...availableUpdatesRep.value };
delete updates[packId];
availableUpdatesRep.value = updates;
setDownloadState(packId, { status: 'done', progress: 100 });
nodecg.log.info(`[pack-manager] Pack "${packId}" actualizado a v${manifest.version}.`);
reply(ack, null, { packId, version: manifest.version });
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
nodecg.log.error(`[pack-manager] Error al actualizar "${packId}": ${message}`);
setDownloadState(packId, { status: 'error', error: message });
reply(ack, new Error(message));
}
});
// ── Mensaje: readLocalManifest ────────────────────────────────────────────────
listenForMessage(messageNames.packs.readLocalManifest, (packId: unknown, ack: Acknowledgement | undefined) => {
if (typeof packId !== 'string' || !packId) {
return reply(ack, new Error('readLocalManifest requiere un packId no vacío.'));
}
const manifestPath = path.join(packsDir, packId, 'manifest.json');
try {
const raw = fs.readFileSync(manifestPath, 'utf-8');
reply(ack, null, JSON.parse(raw) as PackManifest);
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
reply(ack, new Error(`No se puede leer el manifest de "${packId}": ${message}`));
}
});
+232 -322
View File
@@ -1,7 +1,10 @@
import { createServer, type Server, type ServerResponse } from 'node:http';
import { randomUUID } from 'node:crypto';
import { getData, type CountryRecord } from 'country-list';
import { nodecg } from './util/nodecg.js';
import { nodecg } from '../nodecg/extension/context.js';
import { listenForMessage } from '../nodecg/extension/messages.js';
import { messageNames } from '../nodecg/messageNames.js';
import { createOAuthServer, type OAuthConfig } from './util/oauth-server.js';
// ─── Constantes ────────────────────────────────────────────────────────────────
const STARTGG_ENDPOINT = 'https://api.start.gg/gql/alpha';
const STARTGG_OAUTH_AUTHORIZE_ENDPOINT = 'https://www.start.gg/api/-/rest/oauth/authorize';
@@ -17,6 +20,16 @@ const STARTGG_OAUTH_SESSION_TTL_MS = 10 * 60 * 1000;
const RECENT_TOURNAMENTS_LIMIT = 12;
const PARTICIPANTS_PAGE_SIZE = 120;
// ─── URL del proxy OAuth ───────────────────────────────────────────────────────
// Rellena esta constante con la URL de tu Cloudflare Worker tras el deploy.
// Formato: 'https://scoreko-oauth-proxy.TU-SUBDOMINIO.workers.dev'
//
// También puedes sobreescribirla en cfg/scoreko.json con "oauthProxyUrl"
// (útil para apuntar a un entorno de staging sin recompilar).
const OAUTH_PROXY_BASE_URL = 'https://scoreko-oauth-proxy.panver.workers.dev';
// ─── Tipos ─────────────────────────────────────────────────────────────────────
interface StartGGGraphQLResponse<T> {
data?: T;
errors?: Array<{ message?: string }>;
@@ -39,21 +52,6 @@ interface ImportedPlayer {
twitter: string;
}
interface OAuthConfig {
clientId: string;
clientSecret: string;
callbackPort: number;
}
interface OAuthSession {
sessionId: string;
state: string;
expiresAt: number;
status: 'pending' | 'completed' | 'error' | 'expired';
token?: string;
error?: string;
}
interface OAuthTokenResponse {
access_token?: string;
error?: string;
@@ -61,31 +59,163 @@ interface OAuthTokenResponse {
message?: string;
}
const oauthSessions = new Map<string, OAuthSession>();
let oauthCallbackServer: Server | null = null;
// ─── Modo OAuth ────────────────────────────────────────────────────────────────
//
// DEV: cfg/scoreko.json tiene startggClientId + startggClientSecret.
// El exchange se hace directamente contra start.gg.
//
// PROXY: No hay credenciales en la config local.
// El clientId se obtiene del Worker (es público, no secreto).
// El exchange lo hace el Worker, que guarda el clientSecret en sus env vars.
const getStringProp = (payload: unknown, key: string): string => {
if (typeof payload !== 'object' || payload === null || !(key in payload)) {
return '';
type OAuthMode =
| { type: 'dev'; clientId: string; clientSecret: string; callbackPort: number }
| { type: 'proxy'; proxyBaseUrl: string; callbackPort: number };
const getOAuthMode = (): OAuthMode => {
const bundleConfig = nodecg.bundleConfig as Record<string, unknown>;
const clientId = String(bundleConfig.startggClientId ?? '').trim();
const clientSecret = String(bundleConfig.startggClientSecret ?? '').trim();
const rawPort = Number(bundleConfig.startggOAuthPort ?? STARTGG_OAUTH_DEFAULT_PORT);
const callbackPort =
Number.isFinite(rawPort) && rawPort > 0 ? rawPort : STARTGG_OAUTH_DEFAULT_PORT;
// oauthProxyUrl en config permite apuntar a un proxy distinto sin recompilar
const proxyBaseUrl =
String(bundleConfig.oauthProxyUrl ?? '').trim() || OAUTH_PROXY_BASE_URL;
if (clientId && clientSecret) {
nodecg.log.info('[start.gg] OAuth: modo dev (credenciales locales)');
return { type: 'dev', clientId, clientSecret, callbackPort };
}
const value = (payload as Record<string, unknown>)[key];
return typeof value === 'string' ? value.trim() : String(value || '').trim();
nodecg.log.info(`[start.gg] OAuth: modo proxy → ${proxyBaseUrl}`);
return { type: 'proxy', proxyBaseUrl, callbackPort };
};
const updateOAuthSession = (sessionId: string, update: Partial<OAuthSession>) => {
const session = oauthSessions.get(sessionId);
if (!session) {
return;
}
// ─── Exchange de token ─────────────────────────────────────────────────────────
oauthSessions.set(sessionId, {
...session,
...update,
const parseOAuthTokenPayload = async (response: Response): Promise<OAuthTokenResponse> => {
const rawBody = await response.text();
try {
return JSON.parse(rawBody) as OAuthTokenResponse;
} catch {
return { message: rawBody };
}
};
/** Modo dev: exchange directo con start.gg usando credenciales locales */
const exchangeCodeDirectly = async (
code: string,
redirectUri: string,
clientId: string,
clientSecret: string,
): Promise<string> => {
const params = new URLSearchParams({
grant_type: 'authorization_code',
code,
client_id: clientId,
client_secret: clientSecret,
redirect_uri: redirectUri,
});
let lastError = 'Unknown OAuth token exchange error';
for (const tokenEndpoint of STARTGG_OAUTH_TOKEN_ENDPOINTS) {
const response = await fetch(tokenEndpoint, {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: params.toString(),
});
const payload = await parseOAuthTokenPayload(response);
if (response.ok) {
const token = String(payload.access_token ?? '').trim();
if (token) return token;
lastError =
payload.error_description ??
payload.error ??
payload.message ??
'OAuth token response did not include an access token';
continue;
}
lastError =
payload.error_description ??
payload.error ??
payload.message ??
`OAuth token request failed (${response.status})`;
if (response.status !== 404) break;
}
throw new Error(lastError);
};
const requestStartGG = async <T>(query: string, variables: Record<string, unknown>, token: string): Promise<T> => {
/** Modo proxy: el Worker hace el exchange; el clientSecret nunca sale del Worker */
const exchangeCodeViaProxy = async (
code: string,
redirectUri: string,
proxyBaseUrl: string,
): Promise<string> => {
const response = await fetch(`${proxyBaseUrl}/oauth/startgg/token`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ code, redirectUri }),
});
const rawBody = await response.text();
let payload: { access_token?: string; error?: string };
try {
payload = JSON.parse(rawBody) as typeof payload;
} catch {
payload = { error: rawBody };
}
if (!response.ok) {
throw new Error(payload.error ?? `Proxy responded with ${response.status}`);
}
const token = String(payload.access_token ?? '').trim();
if (!token) throw new Error(payload.error ?? 'Proxy did not return a token');
return token;
};
/**
* Callback que recibe oauth-server.ts cuando llega el código de autorización.
* Delega al modo correcto; _config no se usa porque el modo ya está determinado.
*/
const exchangeOAuthCodeForToken = async (
code: string,
redirectUri: string,
_config: OAuthConfig,
): Promise<string> => {
void _config;
const mode = getOAuthMode();
if (mode.type === 'dev') {
return exchangeCodeDirectly(code, redirectUri, mode.clientId, mode.clientSecret);
}
return exchangeCodeViaProxy(code, redirectUri, mode.proxyBaseUrl);
};
// ─── Servidor OAuth ────────────────────────────────────────────────────────────
const oauthServer = createOAuthServer({
provider: 'start.gg',
callbackPath: STARTGG_OAUTH_CALLBACK_PATH,
authorizeEndpoint: STARTGG_OAUTH_AUTHORIZE_ENDPOINT,
scope: STARTGG_OAUTH_SCOPES,
sessionTtlMs: STARTGG_OAUTH_SESSION_TTL_MS,
exchangeToken: exchangeOAuthCodeForToken,
});
// ─── GraphQL ───────────────────────────────────────────────────────────────────
const requestStartGG = async <T>(
query: string,
variables: Record<string, unknown>,
token: string,
): Promise<T> => {
const response = await fetch(STARTGG_ENDPOINT, {
method: 'POST',
headers: {
@@ -107,7 +237,7 @@ const requestStartGG = async <T>(query: string, variables: Record<string, unknow
}
if (payload.errors?.length) {
throw new Error(payload.errors[0]?.message || 'Unknown start.gg error');
throw new Error(payload.errors[0]?.message ?? 'Unknown start.gg error');
}
if (!payload.data) {
@@ -117,286 +247,92 @@ const requestStartGG = async <T>(query: string, variables: Record<string, unknow
return payload.data;
};
// ─── Resolución de países ──────────────────────────────────────────────────────
const countries = getData();
const countryByCode = new Set(countries.map((country: CountryRecord) => country.code.toUpperCase()));
const countryByName = new Map(countries.map((country: CountryRecord) => [country.name.toLowerCase(), country.code.toUpperCase()]));
const countryByCode = new Set(countries.map((c: CountryRecord) => c.code.toUpperCase()));
const countryByName = new Map(
countries.map((c: CountryRecord) => [c.name.toLowerCase(), c.code.toUpperCase()]),
);
const resolveCountryCodeFromStartGG = (country: string | null | undefined): string => {
const raw = (country || '').trim();
if (!raw) {
return '';
}
const raw = (country ?? '').trim();
if (!raw) return '';
const upper = raw.toUpperCase();
if (countryByCode.has(upper)) {
return upper;
}
if (countryByCode.has(upper)) return upper;
return countryByName.get(raw.toLowerCase()) ?? '';
};
// ─── Utilidades ────────────────────────────────────────────────────────────────
const getStringProp = (payload: unknown, key: string): string => {
if (typeof payload !== 'object' || payload === null || !(key in payload)) return '';
const value = (payload as Record<string, unknown>)[key];
return typeof value === 'string' ? value.trim() : String(value ?? '').trim();
};
const sendAck = (ack: unknown, error: string | null, response?: unknown) => {
if (typeof ack !== 'function') {
return;
}
ack(error, response);
if (typeof ack === 'function') ack(error, response);
};
const getOAuthConfig = (): OAuthConfig | null => {
const bundleConfig = nodecg.bundleConfig as unknown as Record<string, unknown>;
const clientId = String(bundleConfig.startggClientId || '').trim();
const clientSecret = String(bundleConfig.startggClientSecret || '').trim();
const rawPort = Number(bundleConfig.startggOAuthPort ?? STARTGG_OAUTH_DEFAULT_PORT);
const callbackPort = Number.isFinite(rawPort) && rawPort > 0 ? rawPort : STARTGG_OAUTH_DEFAULT_PORT;
// ─── Listeners de NodeCG ───────────────────────────────────────────────────────
if (!clientId || !clientSecret) {
return null;
}
listenForMessage(messageNames.integrations.startgg.createOAuthSession, async (_payload: unknown, ack) => {
const mode = getOAuthMode();
let serverConfig: OAuthConfig;
return {
clientId,
clientSecret,
callbackPort,
if (mode.type === 'dev') {
serverConfig = {
clientId: mode.clientId,
callbackPort: mode.callbackPort,
};
};
const getCallbackUrl = (callbackPort: number) => `http://127.0.0.1:${callbackPort}${STARTGG_OAUTH_CALLBACK_PATH}`;
const cleanupExpiredOAuthSessions = () => {
const now = Date.now();
oauthSessions.forEach((session, sessionId) => {
if (session.expiresAt <= now && session.status === 'pending') {
updateOAuthSession(sessionId, { status: 'expired' });
}
});
};
const respondWithCallbackHtml = (res: ServerResponse, statusCode: number, title: string, message: string) => {
res.statusCode = statusCode;
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end(renderCallbackHtml(title, message));
};
const renderCallbackHtml = (title: string, message: string) => `<!doctype html>
<html lang="es">
<head>
<meta charset="utf-8" />
<title>${title}</title>
<style>
body { font-family: Arial, sans-serif; margin: 2rem; background: #121212; color: #fff; }
.box { max-width: 680px; padding: 1rem 1.2rem; border: 1px solid #444; border-radius: 8px; }
.ok { color: #66bb6a; }
.ko { color: #ef5350; }
</style>
</head>
<body>
<div class="box">
<h2>${title}</h2>
<p>${message}</p>
<p>You can close this tab and return to Scoreko.</p>
</div>
</body>
</html>`;
const parseOAuthTokenPayload = async (response: Response): Promise<OAuthTokenResponse> => {
const rawBody = await response.text();
} else {
// Modo proxy: el clientId viene del Worker.
// Es público (va en la URL del navegador), pero no lo queremos en el repo.
try {
return JSON.parse(rawBody) as OAuthTokenResponse;
} catch {
return { message: rawBody };
}
};
const exchangeOAuthCodeForToken = async (
code: string,
redirectUri: string,
oauthConfig: OAuthConfig,
): Promise<string> => {
const params = new URLSearchParams({
grant_type: 'authorization_code',
code,
client_id: oauthConfig.clientId,
client_secret: oauthConfig.clientSecret,
redirect_uri: redirectUri,
});
let lastError = 'Unknown OAuth token exchange error';
for (const tokenEndpoint of STARTGG_OAUTH_TOKEN_ENDPOINTS) {
const response = await fetch(tokenEndpoint, {
method: 'POST',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
body: params.toString(),
});
const payload = await parseOAuthTokenPayload(response);
if (response.ok) {
const token = String(payload.access_token || '').trim();
if (token) {
return token;
}
lastError = payload.error_description || payload.error || payload.message || 'OAuth token response did not include an access token';
continue;
}
lastError = payload.error_description || payload.error || payload.message || `OAuth token request failed (${response.status})`;
if (response.status !== 404) {
break;
}
}
throw new Error(lastError);
};
const ensureOAuthCallbackServer = async (oauthConfig: OAuthConfig) => {
if (oauthCallbackServer) {
const res = await fetch(`${mode.proxyBaseUrl}/oauth/startgg/client-id`);
if (!res.ok) throw new Error(`Proxy responded with ${res.status}`);
const data = await res.json() as { clientId?: string };
const clientId = String(data.clientId ?? '').trim();
if (!clientId) throw new Error('Proxy did not return a clientId');
serverConfig = { clientId, callbackPort: mode.callbackPort };
} catch (err) {
sendAck(
ack,
err instanceof Error ? err.message : 'Could not fetch OAuth config from proxy',
);
return;
}
const callbackUrl = getCallbackUrl(oauthConfig.callbackPort);
const server = createServer((req, res) => {
if (!req.url) {
res.statusCode = 400;
res.end('Bad request');
return;
}
const requestUrl = new URL(req.url, callbackUrl);
if (requestUrl.pathname !== STARTGG_OAUTH_CALLBACK_PATH) {
res.statusCode = 404;
res.end('Not found');
return;
}
cleanupExpiredOAuthSessions();
const state = requestUrl.searchParams.get('state') || '';
const code = requestUrl.searchParams.get('code') || '';
const error = requestUrl.searchParams.get('error') || '';
const session = Array.from(oauthSessions.values()).find((candidate) => candidate.state === state);
if (!session) {
respondWithCallbackHtml(res, 400, 'Invalid OAuth', 'No active session was found for this authorization.');
return;
}
if (session.expiresAt <= Date.now()) {
updateOAuthSession(session.sessionId, { status: 'expired' });
respondWithCallbackHtml(res, 400, 'Session expired', 'The OAuth session expired. Start the process again from Scoreko.');
return;
}
if (error) {
updateOAuthSession(session.sessionId, { status: 'error', error });
respondWithCallbackHtml(res, 400, 'OAuth canceled', `start.gg returned this error: ${error}`);
return;
}
if (!code) {
updateOAuthSession(session.sessionId, {
status: 'error',
error: 'Missing authorization code',
});
respondWithCallbackHtml(res, 400, 'Incomplete OAuth', 'No authorization code was received.');
return;
}
void exchangeOAuthCodeForToken(code, callbackUrl, oauthConfig)
.then((token) => {
updateOAuthSession(session.sessionId, { status: 'completed', token, error: undefined });
})
.catch((exchangeError) => {
const message = exchangeError instanceof Error ? exchangeError.message : 'Failed to exchange authorization code';
updateOAuthSession(session.sessionId, { status: 'error', error: message });
});
respondWithCallbackHtml(res, 200, 'Authorization received', 'Your authorization was received. Finishing sign-in in the background...');
});
await new Promise<void>((resolve, reject) => {
server.once('error', reject);
server.listen(oauthConfig.callbackPort, '127.0.0.1', () => {
server.off('error', reject);
resolve();
});
});
oauthCallbackServer = server;
};
nodecg.listenFor('startgg:createOAuthSession', async (_payload: unknown, ack) => {
const oauthConfig = getOAuthConfig();
if (!oauthConfig) {
sendAck(ack, 'OAuth is not configured in this installation (missing startggClientId/startggClientSecret). Use the Client ID and Client Secret from a start.gg OAuth app.');
return;
}
try {
await ensureOAuthCallbackServer(oauthConfig);
} catch (serverError) {
const message = serverError instanceof Error ? serverError.message : 'Could not start the local OAuth callback';
sendAck(ack, message);
await oauthServer.ensureServer(serverConfig);
} catch (err) {
sendAck(ack, err instanceof Error ? err.message : 'Could not start the OAuth callback server');
return;
}
cleanupExpiredOAuthSessions();
const sessionId = randomUUID();
const state = randomUUID();
const session: OAuthSession = {
sessionId,
state,
expiresAt: Date.now() + STARTGG_OAUTH_SESSION_TTL_MS,
status: 'pending',
};
oauthSessions.set(sessionId, session);
const params = new URLSearchParams({
response_type: 'code',
client_id: oauthConfig.clientId,
redirect_uri: getCallbackUrl(oauthConfig.callbackPort),
scope: STARTGG_OAUTH_SCOPES,
state,
sendAck(ack, null, oauthServer.createSession(serverConfig));
});
sendAck(ack, null, {
sessionId,
authUrl: `${STARTGG_OAUTH_AUTHORIZE_ENDPOINT}?${params.toString()}`,
});
});
nodecg.listenFor('startgg:getOAuthSessionStatus', (payload: unknown, ack) => {
cleanupExpiredOAuthSessions();
listenForMessage(messageNames.integrations.startgg.getOAuthSessionStatus, (payload: unknown, ack) => {
const sessionId = getStringProp(payload, 'sessionId');
if (!sessionId) {
sendAck(ack, 'Missing OAuth session id');
return;
}
const session = oauthSessions.get(sessionId);
if (!session) {
const status = oauthServer.getSessionStatus(sessionId);
if (!status) {
sendAck(ack, 'OAuth session not found');
return;
}
sendAck(ack, null, {
status: session.status,
token: session.status === 'completed' ? session.token : undefined,
error: session.status === 'error' ? session.error : undefined,
});
sendAck(ack, null, status);
});
nodecg.listenFor('startgg:fetchRecentTournaments', async (payload: unknown, ack) => {
listenForMessage(messageNames.integrations.startgg.fetchRecentTournaments, async (payload: unknown, ack) => {
const token = getStringProp(payload, 'token');
if (!token) {
sendAck(ack, 'Missing start.gg API token');
return;
@@ -423,37 +359,24 @@ nodecg.listenFor('startgg:fetchRecentTournaments', async (payload: unknown, ack)
currentUser: { tournaments: { nodes: RecentTournament[] } } | null;
}>(query, { perPage: RECENT_TOURNAMENTS_LIMIT }, token);
const tournaments = data.currentUser?.tournaments.nodes
const tournaments =
data.currentUser?.tournaments.nodes
.filter((item) => item.slug)
.sort((a, b) => (b.startAt ?? 0) - (a.startAt ?? 0))
.map((item) => ({
id: item.id,
name: item.name,
slug: item.slug,
startAt: item.startAt,
endAt: item.endAt,
})) ?? [];
.map(({ id, name, slug, startAt, endAt }) => ({ id, name, slug, startAt, endAt })) ?? [];
sendAck(ack, null, tournaments);
} catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while loading tournaments';
sendAck(ack, message);
sendAck(ack, error instanceof Error ? error.message : 'Unknown error while loading tournaments');
}
});
nodecg.listenFor('startgg:fetchTournamentPlayers', async (payload: unknown, ack) => {
listenForMessage(messageNames.integrations.startgg.fetchTournamentPlayers, async (payload: unknown, ack) => {
const token = getStringProp(payload, 'token');
const slug = getStringProp(payload, 'slug');
if (!token) {
sendAck(ack, 'Missing start.gg API token');
return;
}
if (!slug) {
sendAck(ack, 'Missing tournament slug');
return;
}
if (!token) { sendAck(ack, 'Missing start.gg API token'); return; }
if (!slug) { sendAck(ack, 'Missing tournament slug'); return; }
const query = `
query TournamentParticipants($slug: String!, $page: Int!, $perPage: Int!) {
@@ -491,50 +414,37 @@ nodecg.listenFor('startgg:fetchTournamentPlayers', async (payload: unknown, ack)
id: number;
gamerTag: string | null;
prefix: string | null;
user: {
location: {
country: string | null;
} | null;
} | null;
user: { location: { country: string | null } | null } | null;
}>;
};
} | null;
}>(query, {
slug,
page: currentPage,
perPage: PARTICIPANTS_PAGE_SIZE,
}, token);
}>(query, { slug, page: currentPage, perPage: PARTICIPANTS_PAGE_SIZE }, token);
if (!data.tournament) {
throw new Error('Tournament not found');
}
if (!data.tournament) throw new Error('Tournament not found');
const apiTotalPages = Number(data.tournament.participants.pageInfo.totalPages);
totalPages = Number.isFinite(apiTotalPages) ? Math.max(apiTotalPages, 1) : 1;
data.tournament.participants.nodes.forEach((participant) => {
for (const participant of data.tournament.participants.nodes) {
const playerId = String(participant.id);
const gamertag = (participant.gamerTag || '').trim();
if (!gamertag) {
return;
}
const country = resolveCountryCodeFromStartGG(participant.user?.location?.country);
const gamertag = (participant.gamerTag ?? '').trim();
if (!gamertag) continue;
playersMap.set(playerId, {
id: playerId,
gamertag,
name: gamertag,
team: (participant.prefix || '').trim(),
country,
team: (participant.prefix ?? '').trim(),
country: resolveCountryCodeFromStartGG(participant.user?.location?.country),
twitter: '',
});
});
}
currentPage += 1;
}
sendAck(ack, null, Array.from(playersMap.values()));
} catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while importing players';
sendAck(ack, message);
sendAck(ack, error instanceof Error ? error.message : 'Unknown error while importing players');
}
});
-7
View File
@@ -1,7 +0,0 @@
import type { NodeCGServerAPI } from '../../types/index.js';
export let nodecg!: NodeCGServerAPI;
export function set(ctx: NodeCGServerAPI) {
nodecg = ctx;
}
+275
View File
@@ -0,0 +1,275 @@
import { createServer, type Server, type ServerResponse } from 'node:http';
import { randomUUID } from 'node:crypto';
// ─── Tipos públicos ────────────────────────────────────────────────────────────
export interface OAuthConfig {
clientId: string;
/** Solo necesario en modo dev (exchange directo con el proveedor).
* En modo proxy el exchange lo hace el Worker y no necesita el secret. */
clientSecret?: string;
callbackPort: number;
}
export interface OAuthSessionStatus {
status: 'pending' | 'completed' | 'error' | 'expired';
token?: string;
error?: string;
}
export interface CreateSessionResult {
sessionId: string;
authUrl: string;
}
export interface OAuthServerOptions {
/** Nombre legible del proveedor, usado en mensajes y HTML del callback */
provider: string;
/** Ruta del callback OAuth, p.ej. '/startgg/callback' */
callbackPath: string;
/** URL del endpoint de autorización del proveedor */
authorizeEndpoint: string;
/** Scopes separados por espacio */
scope: string;
/** Milisegundos antes de que una sesión pendiente expire */
sessionTtlMs: number;
/**
* Intercambia un código de autorización por un access token.
* Lanza un error si el intercambio falla.
*/
exchangeToken: (code: string, redirectUri: string, config: OAuthConfig) => Promise<string>;
}
export interface OAuthServerHandle {
/** Arranca el servidor de callback si aún no está corriendo */
ensureServer(config: OAuthConfig): Promise<void>;
/** Crea una nueva sesión OAuth y devuelve sessionId + URL de autorización */
createSession(config: OAuthConfig): CreateSessionResult;
/** Devuelve el estado actual de una sesión, o null si no existe */
getSessionStatus(sessionId: string): OAuthSessionStatus | null;
}
// ─── Tipos internos ────────────────────────────────────────────────────────────
interface OAuthSession {
sessionId: string;
state: string;
expiresAt: number;
status: 'pending' | 'completed' | 'error' | 'expired';
token?: string;
error?: string;
}
// ─── HTML de callback ──────────────────────────────────────────────────────────
const renderCallbackHtml = (title: string, message: string) => `<!doctype html>
<html lang="es">
<head>
<meta charset="utf-8" />
<title>${title}</title>
<style>
body { font-family: Arial, sans-serif; margin: 2rem; background: #121212; color: #fff; }
.box { max-width: 680px; padding: 1rem 1.2rem; border: 1px solid #444; border-radius: 8px; }
.ok { color: #66bb6a; }
.ko { color: #ef5350; }
</style>
</head>
<body>
<div class="box">
<h2>${title}</h2>
<p>${message}</p>
<p>You can close this tab and return to Scoreko.</p>
</div>
</body>
</html>`;
const respondWithCallbackHtml = (
res: ServerResponse,
statusCode: number,
title: string,
message: string,
) => {
res.statusCode = statusCode;
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end(renderCallbackHtml(title, message));
};
// ─── Factory principal ─────────────────────────────────────────────────────────
export const createOAuthServer = (options: OAuthServerOptions): OAuthServerHandle => {
const sessions = new Map<string, OAuthSession>();
let server: Server | null = null;
const getCallbackUrl = (port: number) =>
`http://127.0.0.1:${port}${options.callbackPath}`;
const updateSession = (sessionId: string, update: Partial<OAuthSession>) => {
const session = sessions.get(sessionId);
if (!session) return;
sessions.set(sessionId, { ...session, ...update });
};
/**
* Marca como expiradas las sesiones pendientes que han superado su TTL,
* y elimina del Map las sesiones ya terminadas (completed / error / expired)
* que también hayan superado su TTL.
*/
const cleanupSessions = () => {
const now = Date.now();
sessions.forEach((session, sessionId) => {
if (session.expiresAt > now) return;
if (session.status === 'pending') {
updateSession(sessionId, { status: 'expired' });
}
// Eliminar sesiones terminadas que ya hayan expirado para no crecer sin límite
if (session.status !== 'pending') {
sessions.delete(sessionId);
}
});
};
const ensureServer = async (config: OAuthConfig): Promise<void> => {
if (server) return;
const callbackUrl = getCallbackUrl(config.callbackPort);
const newServer = createServer((req, res) => {
if (!req.url) {
res.statusCode = 400;
res.end('Bad request');
return;
}
const requestUrl = new URL(req.url, callbackUrl);
if (requestUrl.pathname !== options.callbackPath) {
res.statusCode = 404;
res.end('Not found');
return;
}
cleanupSessions();
const state = requestUrl.searchParams.get('state') ?? '';
const code = requestUrl.searchParams.get('code') ?? '';
const error = requestUrl.searchParams.get('error') ?? '';
const session = Array.from(sessions.values()).find((s) => s.state === state);
if (!session) {
respondWithCallbackHtml(
res, 400,
'Invalid OAuth',
'No active session was found for this authorization.',
);
return;
}
if (session.expiresAt <= Date.now()) {
updateSession(session.sessionId, { status: 'expired' });
respondWithCallbackHtml(
res, 400,
'Session expired',
'The OAuth session expired. Start the process again from Scoreko.',
);
return;
}
if (error) {
updateSession(session.sessionId, { status: 'error', error });
respondWithCallbackHtml(
res, 400,
'OAuth canceled',
`${options.provider} returned this error: ${error}`,
);
return;
}
if (!code) {
updateSession(session.sessionId, { status: 'error', error: 'Missing authorization code' });
respondWithCallbackHtml(
res, 400,
'Incomplete OAuth',
'No authorization code was received.',
);
return;
}
void options
.exchangeToken(code, callbackUrl, config)
.then((token) => {
updateSession(session.sessionId, { status: 'completed', token, error: undefined });
})
.catch((err: unknown) => {
const message =
err instanceof Error ? err.message : 'Failed to exchange authorization code';
updateSession(session.sessionId, { status: 'error', error: message });
});
respondWithCallbackHtml(
res, 200,
'Authorization received',
'Your authorization was received. Finishing sign-in in the background...',
);
});
// Si el servidor sufre un error tras arrancar, resetear la referencia
// para que la próxima llamada a ensureServer() pueda reiniciarlo.
newServer.on('error', (err) => {
console.error(`[${options.provider}] OAuth callback server error:`, err);
server = null;
});
await new Promise<void>((resolve, reject) => {
newServer.once('error', reject);
newServer.listen(config.callbackPort, '127.0.0.1', () => {
newServer.off('error', reject);
resolve();
});
});
server = newServer;
};
const createSession = (config: OAuthConfig): CreateSessionResult => {
cleanupSessions();
const sessionId = randomUUID();
const state = randomUUID();
sessions.set(sessionId, {
sessionId,
state,
expiresAt: Date.now() + options.sessionTtlMs,
status: 'pending',
});
const params = new URLSearchParams({
response_type: 'code',
client_id: config.clientId,
redirect_uri: getCallbackUrl(config.callbackPort),
scope: options.scope,
state,
});
return {
sessionId,
authUrl: `${options.authorizeEndpoint}?${params.toString()}`,
};
};
const getSessionStatus = (sessionId: string): OAuthSessionStatus | null => {
cleanupSessions();
const session = sessions.get(sessionId);
if (!session) return null;
return {
status: session.status,
token: session.status === 'completed' ? session.token : undefined,
error: session.status === 'error' ? session.error : undefined,
};
};
return { ensureServer, createSession, getSessionStatus };
};
-31
View File
@@ -1,31 +0,0 @@
import type NodeCG from 'nodecg/types';
import type { Schemas } from '../../types/index.js';
import { nodecg } from './nodecg.js';
// Wrapper for replicants that have a default (based on schema).
function hasDefault<T>(name: string) {
return nodecg.Replicant<T>(name) as unknown as NodeCG.default.ServerReplicantWithSchemaDefault<T>;
}
// Wrapper for replicants that don't have a default (based on schema).
// eslint-disable-next-line @typescript-eslint/no-unused-vars
function hasNoDefault<T>(name: string) {
return nodecg.Replicant<T>(name) as NodeCG.default.ServerReplicant<T>;
}
/**
* This is where you can declare all of your replicants to import easily into other files,
* and to make sure they have any correct settings on startup.
*/
export const exampleReplicant = hasDefault<Schemas.ExampleReplicant>('exampleReplicant');
export const playersReplicant = hasDefault<Schemas.Players>('players');
export const scoreboardReplicant = hasDefault<Schemas.Scoreboard>('scoreboard');
export const commentaryReplicant = nodecg.Replicant<Schemas.Commentary>('commentary', {
defaultValue: {
leftCommentator: '',
leftCommentatorTwitter: '',
rightCommentator: '',
rightCommentatorTwitter: '',
},
persistent: false,
});
+2 -10
View File
@@ -1,19 +1,11 @@
<script setup lang="ts">
import { useHead } from '@unhead/vue';
import { computed } from 'vue';
import { commentaryReplicant } from '../../browser_shared/replicants';
import type { Schemas } from '../../types';
import { useCommentaryReplicatedState } from '../shared/services/replicated-state';
useHead({ title: 'Commentary' });
const defaultCommentary: Schemas.Commentary = {
leftCommentator: '',
leftCommentatorTwitter: '',
rightCommentator: '',
rightCommentatorTwitter: '',
};
const commentary = computed<Schemas.Commentary>(() => commentaryReplicant?.data ?? defaultCommentary);
const { commentary } = useCommentaryReplicatedState();
const leftCommentator = computed(() => commentary.value.leftCommentator || 'COMMENTATOR 1');
const rightCommentator = computed(() => commentary.value.rightCommentator || 'COMMENTATOR 2');
+7 -18
View File
@@ -1,21 +1,13 @@
<script setup lang="ts">
import { useHead } from '@unhead/vue';
import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue';
import { graphicsSettingsReplicant, playersReplicant, scoreboardReplicant } from '../../browser_shared/replicants';
import { resolveCountryCode } from '../../shared/countries';
import { getCharacterAssetUrl } from '../../shared/fighting-characters';
import type { Schemas } from '../../types';
import { useScoreboardReplicatedState } from '../shared/services/replicated-state';
import { resolveCountryCode } from '../../shared/domain/players/countries';
import { getCharactersByGame } from '../../shared/fighting-characters';
useHead({ title: 'Scoreboard 2XKO' });
const defaultScoreboard: Schemas.Scoreboard = {
leftPlayerId: '', rightPlayerId: '', leftNameOverride: '', rightNameOverride: '', leftTeamOverride: '', rightTeamOverride: '',
leftCountryOverride: '', rightCountryOverride: '', leftCharacter: '', rightCharacter: '', leftScore: 0, rightScore: 0, round: '', game: '',
};
const players = computed<Schemas.Players>(() => playersReplicant?.data ?? {});
const scoreboard = computed<Schemas.Scoreboard>(() => scoreboardReplicant?.data ?? defaultScoreboard);
const scoreboardSkin = computed(() => graphicsSettingsReplicant?.data?.scoreboardSkin ?? 'scoreboard-2xko/main.html');
const { players, scoreboard, scoreboardSkin } = useScoreboardReplicatedState('scoreboard-2xko/main.html');
watch(
scoreboardSkin,
@@ -35,12 +27,9 @@ const rightName = computed(() => scoreboard.value.rightNameOverride || players.v
const leftTeam = computed(() => scoreboard.value.leftTeamOverride);
const rightTeam = computed(() => scoreboard.value.rightTeamOverride);
const leftCharacterImage = computed(() => scoreboard.value.leftCharacter
? getCharacterAssetUrl('2XKO', scoreboard.value.leftCharacter)
: '');
const rightCharacterImage = computed(() => scoreboard.value.rightCharacter
? getCharacterAssetUrl('2XKO', scoreboard.value.rightCharacter)
: '');
const charMap = new Map(getCharactersByGame('2XKO').map((char) => [char.value, char.image]));
const leftCharacterImage = computed(() => charMap.get(scoreboard.value.leftCharacter) ?? '');
const rightCharacterImage = computed(() => charMap.get(scoreboard.value.rightCharacter) ?? '');
const flagModules = import.meta.glob('/node_modules/flag-icons/flags/4x3/*.svg', { import: 'default', query: '?url' }) as Record<string, () => Promise<string>>;
const flagUrlCache: Record<string, string> = {};
+3 -23
View File
@@ -1,32 +1,12 @@
<script setup lang="ts">
import { useHead } from '@unhead/vue';
import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
import { graphicsSettingsReplicant, playersReplicant, scoreboardReplicant } from '../../browser_shared/replicants';
import { resolveCountryCode } from '../../shared/countries';
import type { Schemas } from '../../types';
import { useScoreboardReplicatedState } from '../shared/services/replicated-state';
import { resolveCountryCode } from '../../shared/domain/players/countries';
useHead({ title: 'Scoreboard' });
const defaultScoreboard: Schemas.Scoreboard = {
leftPlayerId: '',
rightPlayerId: '',
leftNameOverride: '',
rightNameOverride: '',
leftTeamOverride: '',
rightTeamOverride: '',
leftCountryOverride: '',
rightCountryOverride: '',
leftCharacter: '',
rightCharacter: '',
leftScore: 0,
rightScore: 0,
round: '',
game: '',
};
const players = computed<Schemas.Players>(() => playersReplicant?.data ?? {});
const scoreboard = computed<Schemas.Scoreboard>(() => scoreboardReplicant?.data ?? defaultScoreboard);
const scoreboardSkin = computed(() => graphicsSettingsReplicant?.data?.scoreboardSkin ?? 'scoreboard/main.html');
const { players, scoreboard, scoreboardSkin } = useScoreboardReplicatedState('scoreboard/main.html');
watch(
scoreboardSkin,
@@ -0,0 +1,25 @@
import { computed } from 'vue';
import { commentaryReplicant, graphicsSettingsReplicant, playersReplicant, scoreboardReplicant } from '../../../nodecg/browser/replicants';
import { defaultCommentary } from '../../../shared/domain/commentary';
import { defaultScoreboard } from '../../../shared/domain/scoreboard';
import type { Schemas } from '../../../types';
export const useScoreboardReplicatedState = (defaultSkin: string) => {
const players = computed<Schemas.Players>(() => playersReplicant?.data ?? {});
const scoreboard = computed<Schemas.Scoreboard>(() => scoreboardReplicant?.data ?? defaultScoreboard);
const scoreboardSkin = computed(() => graphicsSettingsReplicant?.data?.scoreboardSkin ?? defaultSkin);
return {
players,
scoreboard,
scoreboardSkin,
};
};
export const useCommentaryReplicatedState = () => {
const commentary = computed<Schemas.Commentary>(() => commentaryReplicant?.data ?? defaultCommentary);
return {
commentary,
};
};
+13
View File
@@ -0,0 +1,13 @@
export const sendNodecgMessage = <T>(messageName: string, payload: unknown): Promise<T> =>
new Promise((resolve, reject) => {
nodecg.sendMessage(messageName, payload, (error: unknown, response: unknown) => {
if (error) {
reject(error instanceof Error ? error : new Error(String(error)));
return;
}
resolve(response as T);
});
});
export const sendNodecgCommand = (messageName: string, payload?: unknown): Promise<void> =>
sendNodecgMessage<void>(messageName, payload);
+52
View File
@@ -0,0 +1,52 @@
import { BUNDLE_NAME } from '../../shared/domain/packs/config';
import type {
PackDownloadState,
PackRegistry,
PackUpdateInfo,
} from '../../shared/domain/packs/types';
import { replicantNames } from '../replicantNames';
interface BrowserReplicant<T> {
value: T;
on(event: 'change', handler: (newVal: T, oldVal?: T) => void): void;
off(event: 'change', handler: (newVal: T, oldVal?: T) => void): void;
}
export interface PackBrowserReplicants {
registryRep: BrowserReplicant<PackRegistry | null>;
installedRep: BrowserReplicant<string[]>;
statesRep: BrowserReplicant<Record<string, PackDownloadState>>;
updatesRep: BrowserReplicant<Record<string, PackUpdateInfo>>;
waitUntilReady: () => Promise<void>;
}
export const createPackBrowserReplicants = (): PackBrowserReplicants => {
const registryRep = NodeCG.Replicant<PackRegistry | null>(
replicantNames.packRegistry,
BUNDLE_NAME,
{ defaultValue: null },
);
const installedRep = NodeCG.Replicant<string[]>(
replicantNames.installedPacks,
BUNDLE_NAME,
{ defaultValue: [] },
);
const statesRep = NodeCG.Replicant<Record<string, PackDownloadState>>(
replicantNames.downloadStates,
BUNDLE_NAME,
{ defaultValue: {} },
);
const updatesRep = NodeCG.Replicant<Record<string, PackUpdateInfo>>(
replicantNames.availableUpdates,
BUNDLE_NAME,
{ defaultValue: {} },
);
return {
registryRep,
installedRep,
statesRep,
updatesRep,
waitUntilReady: () => NodeCG.waitForReplicants(registryRep, installedRep, statesRep, updatesRep),
};
};
+24
View File
@@ -0,0 +1,24 @@
import { useReplicant } from 'nodecg-vue-composable';
import { BUNDLE_NAME } from '../../shared/domain/packs/config';
import type { Schemas } from '../../types';
import { replicantNames } from '../replicantNames';
export const playersReplicant = useReplicant<Schemas.Players>(
replicantNames.players,
BUNDLE_NAME,
);
export const scoreboardReplicant = useReplicant<Schemas.Scoreboard>(
replicantNames.scoreboard,
BUNDLE_NAME,
);
export const graphicsSettingsReplicant = useReplicant<Schemas.GraphicsSettings>(
replicantNames.graphicsSettings,
BUNDLE_NAME,
);
export const commentaryReplicant = useReplicant<Schemas.Commentary>(
replicantNames.commentary,
BUNDLE_NAME,
);
+26
View File
@@ -0,0 +1,26 @@
import type { NodeCGServerAPI } from '../../types/index.js';
let currentNodecg: NodeCGServerAPI | null = null;
export function setNodecgContext(ctx: NodeCGServerAPI): void {
currentNodecg = ctx;
}
export function getNodecgContext(): NodeCGServerAPI {
if (!currentNodecg) {
throw new Error('NodeCG context has not been initialized.');
}
return currentNodecg;
}
export const nodecgContext = {
get nodecg(): NodeCGServerAPI {
return getNodecgContext();
},
};
export const nodecg = new Proxy({} as NodeCGServerAPI, {
get(_target, prop: string | symbol) {
return getNodecgContext()[prop as keyof NodeCGServerAPI];
},
});
+26
View File
@@ -0,0 +1,26 @@
import { getNodecgContext } from './context.js';
type HandledAcknowledgement = { handled: true };
type UnhandledAcknowledgement = ((error?: Error | null, ...args: unknown[]) => void) & {
handled: false;
};
export type Acknowledgement = HandledAcknowledgement | UnhandledAcknowledgement;
export type NodecgMessageHandler = (
payload: unknown,
ack?: Acknowledgement,
) => void | Promise<void>;
export const reply = (
ack: Acknowledgement | undefined,
error: Error | null,
result?: unknown,
): void => {
if (ack && !ack.handled) {
ack(error ?? undefined, result);
}
};
export const listenForMessage = (messageName: string, handler: NodecgMessageHandler): void => {
getNodecgContext().listenFor(messageName, handler);
};
+36
View File
@@ -0,0 +1,36 @@
import type {
PackDownloadState,
PackRegistry,
PackUpdateInfo,
} from '../../shared/domain/packs/types.js';
import { replicantNames } from '../replicantNames.js';
import { getNodecgContext } from './context.js';
export const createPackExtensionReplicants = () => {
const nodecg = getNodecgContext();
return {
installedPacksRep: nodecg.Replicant<string[]>(replicantNames.installedPacks, {
defaultValue: [],
persistent: true,
}),
packRegistryRep: nodecg.Replicant<PackRegistry | null>(replicantNames.packRegistry, {
defaultValue: null,
persistent: true,
}),
downloadStatesRep: nodecg.Replicant<Record<string, PackDownloadState>>(
replicantNames.downloadStates,
{
defaultValue: {},
persistent: false,
},
),
availableUpdatesRep: nodecg.Replicant<Record<string, PackUpdateInfo>>(
replicantNames.availableUpdates,
{
defaultValue: {},
persistent: false,
},
),
};
};
+32
View File
@@ -0,0 +1,32 @@
import type NodeCG from 'nodecg/types';
import type { Schemas } from '../../types/index.js';
import { replicantNames } from '../replicantNames.js';
import { getNodecgContext } from './context.js';
type ServerReplicantWithDefault<T> = NodeCG.default.ServerReplicantWithSchemaDefault<T>;
type ServerReplicant<T> = NodeCG.default.ServerReplicant<T>;
export function getReplicantWithDefault<T>(name: string): ServerReplicantWithDefault<T> {
return getNodecgContext().Replicant<T>(name) as unknown as ServerReplicantWithDefault<T>;
}
export function getReplicant<T>(name: string): ServerReplicant<T> {
return getNodecgContext().Replicant<T>(name) as ServerReplicant<T>;
}
export const playersReplicant = (): ServerReplicantWithDefault<Schemas.Players> =>
getReplicantWithDefault<Schemas.Players>(replicantNames.players);
export const scoreboardReplicant = (): ServerReplicantWithDefault<Schemas.Scoreboard> =>
getReplicantWithDefault<Schemas.Scoreboard>(replicantNames.scoreboard);
export const commentaryReplicant = (): ServerReplicant<Schemas.Commentary> =>
getNodecgContext().Replicant<Schemas.Commentary>(replicantNames.commentary, {
defaultValue: {
leftCommentator: '',
leftCommentatorTwitter: '',
rightCommentator: '',
rightCommentatorTwitter: '',
},
persistent: false,
});
+28
View File
@@ -0,0 +1,28 @@
export const messageNames = {
packs: {
fetchRegistry: 'fetchPackRegistry',
download: 'downloadPack',
uninstall: 'uninstallPack',
update: 'updatePack',
readLocalManifest: 'readLocalManifest',
},
integrations: {
startgg: {
createOAuthSession: 'startgg:createOAuthSession',
getOAuthSessionStatus: 'startgg:getOAuthSessionStatus',
fetchRecentTournaments: 'startgg:fetchRecentTournaments',
fetchTournamentPlayers: 'startgg:fetchTournamentPlayers',
},
challonge: {
createOAuthSession: 'challonge:createOAuthSession',
getOAuthSessionStatus: 'challonge:getOAuthSessionStatus',
fetchRecentTournaments: 'challonge:fetchRecentTournaments',
fetchTournamentPlayers: 'challonge:fetchTournamentPlayers',
},
},
} as const;
export type MessageName =
| typeof messageNames.packs[keyof typeof messageNames.packs]
| typeof messageNames.integrations.startgg[keyof typeof messageNames.integrations.startgg]
| typeof messageNames.integrations.challonge[keyof typeof messageNames.integrations.challonge];
+12
View File
@@ -0,0 +1,12 @@
export const replicantNames = {
scoreboard: 'scoreboard',
players: 'players',
commentary: 'commentary',
graphicsSettings: 'graphicsSettings',
installedPacks: 'installedPacks',
packRegistry: 'packRegistry',
downloadStates: 'downloadStates',
availableUpdates: 'availableUpdates',
} as const;
export type ReplicantName = typeof replicantNames[keyof typeof replicantNames];
Binary file not shown.

After

Width:  |  Height:  |  Size: 471 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 780 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 506 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 456 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 500 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 322 KiB

+21
View File
@@ -0,0 +1,21 @@
# Character image catalog
Put custom character images here using this structure:
```text
src/shared/character-images/
street-fighter-6/
ryu.png
ken.png
tekken-8/
jin.png
```
Rules:
- Folder name = game slug (`toLowerCase`, replace non alphanumeric with `-`).
- Example: `Guilty Gear -Strive-` -> `guilty-gear-strive`
- File name = character slug with the same rule.
- Example: `Chun-Li` -> `chun-li`
- Supported extensions: `.png`, `.jpg`, `.jpeg`, `.webp`, `.avif`, `.svg`.
- If an image is missing, the dashboard shows a generated placeholder preview.
Binary file not shown.

After

Width:  |  Height:  |  Size: 409 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 456 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 465 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 447 KiB

Some files were not shown because too many files have changed in this diff Show More