29 Commits

Author SHA1 Message Date
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
201 changed files with 14023 additions and 16252 deletions
+10 -5
View File
@@ -23,17 +23,22 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 11.0.8
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 24
cache: npm cache: pnpm
- name: Install dependencies - name: Install dependencies
run: npm ci run: pnpm install --frozen-lockfile
- name: Lint - name: Lint
run: npm run lint run: pnpm run lint
- name: Build - name: Build
run: npm run build run: pnpm run build
+13 -4
View File
@@ -1,7 +1,7 @@
# Logs # Logs
logs logs
*.log *.log
npm-debug.log* pnpm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
lerna-debug.log* lerna-debug.log*
@@ -48,8 +48,11 @@ web_modules/
# TypeScript cache # TypeScript cache
*.tsbuildinfo *.tsbuildinfo
# Optional npm cache directory # Optional pnpm cache directory
.npm .pnpm-store
.corepack/
.npm-cache/
.node-gyp/
# Optional eslint cache # Optional eslint cache
.eslintcache .eslintcache
@@ -66,7 +69,7 @@ web_modules/
# Optional REPL history # Optional REPL history
.node_repl_history .node_repl_history
# Output of 'npm pack' # Output of 'pnpm pack'
*.tgz *.tgz
# Yarn Integrity file # Yarn Integrity file
@@ -134,3 +137,9 @@ dist
/extension/ /extension/
/graphics/ /graphics/
/shared/dist/ /shared/dist/
# Local runtime database
/db/
*.sqlite3
/scoreko-electron-dev/
/packs/
+6 -6
View File
@@ -14,12 +14,12 @@ NodeCG bundle for producing fighting game overlays.
## Scripts ## Scripts
- `npm run autofix`: automatically fixes lint errors. - `pnpm run autofix`: automatically fixes lint errors.
- `npm run build`: builds dashboard/graphics and extension. - `pnpm run build`: builds dashboard/graphics and extension.
- `npm run lint`: validates project linting. - `pnpm run lint`: validates project linting.
- `npm run schema-types`: generates types from schemas. - `pnpm run schema-types`: generates types from schemas.
- `npm run start`: starts NodeCG. - `pnpm run start`: starts NodeCG.
- `npm run watch`: development mode with watch. - `pnpm run watch`: development mode with watch.
## Version ## Version
+10 -16
View File
@@ -3,45 +3,39 @@
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
"properties": { "properties": {
"exampleProperty": { "oauthProxyUrl": {
"type": "string" "type": "string",
"description": "Sobreescribe la URL base del proxy OAuth (por defecto usa la constante del código). Útil para staging o desarrollo del proxy."
}, },
"startggClientId": { "startggClientId": {
"type": "string", "type": "string",
"default": "", "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)."
"description": "Client ID de tu OAuth app de start.gg"
}, },
"startggClientSecret": { "startggClientSecret": {
"type": "string", "type": "string",
"default": "", "description": "DEV ONLY: Client Secret de tu propia OAuth app de start.gg. NUNCA subas este valor a git."
"description": "Client Secret de tu OAuth app de start.gg"
}, },
"startggOAuthPort": { "startggOAuthPort": {
"type": "integer", "type": "integer",
"default": 34920, "default": 34920,
"minimum": 1, "minimum": 1,
"maximum": 65535, "maximum": 65535,
"description": "Puerto local para callback OAuth" "description": "Puerto local para el servidor de callback OAuth de start.gg."
}, },
"challongeClientId": { "challongeClientId": {
"type": "string", "type": "string",
"default": "", "description": "DEV ONLY: Client ID de tu propia OAuth app de Challonge. Si está presente junto a challongeClientSecret, activa el modo dev."
"description": "Client ID de tu OAuth app de Challonge"
}, },
"challongeClientSecret": { "challongeClientSecret": {
"type": "string", "type": "string",
"default": "", "description": "DEV ONLY: Client Secret de tu propia OAuth app de Challonge. NUNCA subas este valor a git."
"description": "Client Secret de tu OAuth app de Challonge"
}, },
"challongeOAuthPort": { "challongeOAuthPort": {
"type": "integer", "type": "integer",
"default": 34921, "default": 34921,
"minimum": 1, "minimum": 1,
"maximum": 65535, "maximum": 65535,
"description": "Puerto local para callback OAuth de Challonge" "description": "Puerto local para el servidor de callback OAuth de Challonge."
}
} }
},
"required": [
"exampleProperty"
]
} }
-12277
View File
File diff suppressed because it is too large Load Diff
+3 -2
View File
@@ -12,6 +12,7 @@
}, },
"license": "MIT", "license": "MIT",
"author": "Pandipipas", "author": "Pandipipas",
"packageManager": "pnpm@11.0.8",
"type": "module", "type": "module",
"scripts": { "scripts": {
"autofix": "eslint --fix", "autofix": "eslint --fix",
@@ -26,8 +27,8 @@
"@eslint/js": "^9.39.0", "@eslint/js": "^9.39.0",
"@quasar/extras": "^1.17.0", "@quasar/extras": "^1.17.0",
"@quasar/vite-plugin": "^1.10.0", "@quasar/vite-plugin": "^1.10.0",
"@tsconfig/node22": "^22.0.2", "@tsconfig/node24": "^24.0.0",
"@types/node": "^22.18.13", "@types/node": "^24.0.0",
"@unhead/vue": "^2.0.19", "@unhead/vue": "^2.0.19",
"@vitejs/plugin-vue": "^6.0.1", "@vitejs/plugin-vue": "^6.0.1",
"@vue/eslint-config-typescript": "^14.6.0", "@vue/eslint-config-typescript": "^14.6.0",
+8203
View File
File diff suppressed because it is too large Load Diff
+7
View File
@@ -0,0 +1,7 @@
allowBuilds:
'@parcel/watcher': true
'@vaadin/vaadin-usage-statistics': true
better-sqlite3: true
esbuild: true
msgpackr-extract: true
vue-demi: true
-38
View File
@@ -2,35 +2,6 @@
import { ref } from 'vue'; import { ref } from 'vue';
const loadQuotes = [ 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 // Tekken
"Complaining about Paul's damage", "Complaining about Paul's damage",
'Nerfing Gigas', 'Nerfing Gigas',
@@ -38,15 +9,6 @@ const loadQuotes = [
'Sidestepping your electric', 'Sidestepping your electric',
'Punishing hellsweep with 1,1,2', 'Punishing hellsweep with 1,1,2',
'Emailing Harada', '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); const randomIndex = Math.floor(Math.random() * loadQuotes.length);
@@ -1,10 +1,12 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref, watch } from 'vue'; import { computed, onMounted, ref, watch } from 'vue';
import { t } from '../i18n'; import { t } from '../i18n';
import { useScoreboardStore } from '../stores/scoreboard'; import { useScoreboardStore } from '../stores/scoreboard';
const scoreboardStore = useScoreboardStore(); const scoreboardStore = useScoreboardStore();
let customDeactivateTimer: ReturnType<typeof setTimeout> | null = null;
const stageOptions = [ const stageOptions = [
'pools', 'pools',
'top 128', 'top 128',
@@ -25,7 +27,7 @@ const stageOptions = [
const bracketSideOptions = [ const bracketSideOptions = [
{ label: 'None', value: '' }, { label: 'None', value: '' },
{ label: 'Winners', value: 'Winners' }, { label: 'Winners', value: 'Winners' },
{ label: 'Loosers', value: 'Loosers' }, { label: 'Losers', value: 'Losers' },
]; ];
const stage = ref(stageOptions[0]); const stage = ref(stageOptions[0]);
@@ -34,6 +36,14 @@ const customActive = ref(false);
const customText = ref(''); const customText = ref('');
const hasChanges = ref(false); 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 parseInitialRound = () => {
const round = scoreboardStore.scoreboard.round.trim(); const round = scoreboardStore.scoreboard.round.trim();
if (!round) { if (!round) {
@@ -90,8 +100,14 @@ watch(customActive, (value) => {
}); });
watch(customText, (value) => { watch(customText, (value) => {
if (customDeactivateTimer) {
clearTimeout(customDeactivateTimer);
}
if (!value.trim()) { if (!value.trim()) {
customDeactivateTimer = setTimeout(() => {
customActive.value = false; customActive.value = false;
customDeactivateTimer = null;
}, 600);
} }
}); });
@@ -112,6 +128,7 @@ onMounted(() => {
v-model="stage" v-model="stage"
:label="t('bracketStage')" :label="t('bracketStage')"
:options="stageOptions" :options="stageOptions"
:disable="customActive"
dense dense
class="bracket-panel__field" class="bracket-panel__field"
/> />
@@ -119,6 +136,7 @@ onMounted(() => {
v-model="bracketSide" v-model="bracketSide"
:label="t('bracketSide')" :label="t('bracketSide')"
:options="bracketSideOptions" :options="bracketSideOptions"
:disable="customActive"
dense dense
emit-value emit-value
map-options map-options
@@ -129,6 +147,7 @@ onMounted(() => {
v-model="customText" v-model="customText"
:label="t('bracketCustomProgress')" :label="t('bracketCustomProgress')"
dense dense
clearable
class="bracket-panel-custom-input bracket-panel__field" class="bracket-panel-custom-input bracket-panel__field"
/> />
<QToggle <QToggle
@@ -138,6 +157,17 @@ onMounted(() => {
class="bracket-panel-custom-toggle" class="bracket-panel-custom-toggle"
/> />
</div> </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>
</div> </div>
</template> </template>
@@ -183,4 +213,36 @@ onMounted(() => {
.bracket-panel__field :deep(.q-field__label) { .bracket-panel__field :deep(.q-field__label) {
color: rgba(255, 255, 255, 0.92); 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> </style>
@@ -1,8 +1,65 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from 'vue';
import { t } from '../i18n'; import { t } from '../i18n';
import { useCommentaryStore } from '../stores/commentary'; import { useCommentaryStore } from '../stores/commentary';
const commentaryStore = useCommentaryStore(); 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 stripAt(value: string): string {
return value.startsWith('@') ? value.slice(1) : value;
}
function handleLeftTwitterInput(value: string | number | null) {
commentaryStore.leftCommentatorTwitter = value ? stripAt(String(value)) : '';
}
function handleRightTwitterInput(value: string | number | null) {
commentaryStore.rightCommentatorTwitter = value ? stripAt(String(value)) : '';
}
// --- Clear ---
function clearAll() {
commentaryStore.leftCommentator = '';
commentaryStore.leftCommentatorTwitter = '';
commentaryStore.rightCommentator = '';
commentaryStore.rightCommentatorTwitter = '';
}
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> </script>
<template> <template>
@@ -14,7 +71,9 @@ const commentaryStore = useCommentaryStore();
</div> </div>
<div class="commentary-panel__layout"> <div class="commentary-panel__layout">
<!-- Commentator 1 -->
<div class="commentary-panel__commentator"> <div class="commentary-panel__commentator">
<QInput <QInput
v-model="commentaryStore.leftCommentator" v-model="commentaryStore.leftCommentator"
:label="t('commentaryCommentator1')" :label="t('commentaryCommentator1')"
@@ -27,13 +86,27 @@ const commentaryStore = useCommentaryStore();
</QInput> </QInput>
<QInput <QInput
v-model="commentaryStore.leftCommentatorTwitter" :model-value="commentaryStore.leftCommentatorTwitter"
:label="t('commentaryTwitterText')" :label="t('commentaryTwitterText')"
:rules="twitterRules"
:maxlength="TWITTER_MAX_LENGTH"
dense dense
class="commentary-panel__field" 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> </div>
<!-- Center controls -->
<div class="commentary-panel__center-controls">
<QBtn <QBtn
flat flat
dense dense
@@ -41,9 +114,30 @@ const commentaryStore = useCommentaryStore();
icon="swap_horiz" icon="swap_horiz"
class="commentary-panel__swap-btn" class="commentary-panel__swap-btn"
@click="commentaryStore.swapCommentators" @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"> <div class="commentary-panel__commentator">
<QInput <QInput
v-model="commentaryStore.rightCommentator" v-model="commentaryStore.rightCommentator"
:label="t('commentaryCommentator2')" :label="t('commentaryCommentator2')"
@@ -56,11 +150,23 @@ const commentaryStore = useCommentaryStore();
</QInput> </QInput>
<QInput <QInput
v-model="commentaryStore.rightCommentatorTwitter" :model-value="commentaryStore.rightCommentatorTwitter"
:label="t('commentaryTwitterText')" :label="t('commentaryTwitterText')"
:rules="twitterRules"
:maxlength="TWITTER_MAX_LENGTH"
dense dense
class="commentary-panel__field" 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> </div>
</div> </div>
@@ -89,6 +195,35 @@ const commentaryStore = useCommentaryStore();
gap: 2px; 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) { .commentary-panel__field :deep(.q-field__control) {
min-height: 28px; min-height: 28px;
padding: 0; padding: 0;
@@ -112,14 +247,27 @@ const commentaryStore = useCommentaryStore();
color: rgba(255, 255, 255, 0.92); color: rgba(255, 255, 255, 0.92);
} }
.commentary-panel__swap-btn { /* Handle preview */
color: #fff; .commentary-panel__handle-preview {
opacity: 0.85; 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 { .commentary-panel__preview-enter-active,
opacity: 1; .commentary-panel__preview-leave-active {
text-shadow: 0 0 10px rgba(255, 255, 255, 0.45); 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) { @media (max-width: 900px) {
@@ -127,8 +275,9 @@ const commentaryStore = useCommentaryStore();
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
.commentary-panel__swap-btn { .commentary-panel__center-controls {
justify-self: center; justify-self: center;
flex-direction: row;
} }
} }
</style> </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/pack-config';
import type { PackRegistryEntry } from '../../../shared/pack-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,550 @@
<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) => {
if (isLeft.value) scoreboardStore.scoreboard.leftCharacter = v;
else scoreboardStore.scoreboard.rightCharacter = 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,312 @@
<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.fetchRegistry();
});
const refreshInterval = setInterval(() => {
packRegistry.fetchRegistry();
}, 15_000);
onUnmounted(() => {
clearInterval(refreshInterval);
});
const adjustLeftScore = (delta: number) => {
scoreboardStore.leftScore = Math.max(0, scoreboardStore.leftScore + delta);
};
const adjustRightScore = (delta: number) => {
scoreboardStore.rightScore = Math.max(0, scoreboardStore.rightScore + delta);
};
/** Tras una descarga exitosa, activa el juego en el store. */
const onPackDownloaded = (gameName: string) => {
scoreboardStore.scoreboard.game = gameName;
};
// ── Estado del diálogo de actualización ───────────────────────────────────────
const pendingUpdateEntry = ref<import('../../../shared/pack-types').PackRegistryEntry | null>(null);
const pendingUpdateInfo = ref<{ installedVersion: string; latestVersion: string } | undefined>(undefined);
const showUpdateDialog = ref(false);
const openUpdateDialog = (opt: import('../../../shared/pack-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,287 @@
// 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 { getCharactersByGame, getDefaultCharactersByGame, installedPacksRevision } from '../../../shared/fighting-characters';
import type { GameSelectOption, PackRegistryEntry } from '../../../shared/pack-types';
import { useScoreboardStore } from '../stores/scoreboard';
import { usePackRegistry } from './usePackRegistry';
// ── Types ─────────────────────────────────────────────────────────────────────
export type CharacterOption = ReturnType<typeof getCharactersByGame>[number];
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.scoreboard.game = '';
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.scoreboard.game = gameName;
};
// ── Character state ───────────────────────────────────────────────────────
const characterOptions = computed(() => {
// Subscribing to installedPacksRevision forces Vue to re-evaluate this
// computed whenever a pack is registered/unregistered at runtime, even
// though scoreboardStore.scoreboard.game itself hasn't changed.
void installedPacksRevision.value;
return 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 = getCharactersByGame(newGame);
// If the game is set but has no options yet, the pack is still loading
// (installed pack whose registerInstalledPack() hasn't run yet).
// Bail out — the installedPacksRevision 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 = 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.scoreboard.leftCharacter = nextLeft;
} else if (!allowed.has(scoreboardStore.scoreboard.leftCharacter)) {
scoreboardStore.scoreboard.leftCharacter = '';
leftCharacterInput.value = '';
}
if (allowed.has(nextRight)) {
scoreboardStore.scoreboard.rightCharacter = nextRight;
} else if (!allowed.has(scoreboardStore.scoreboard.rightCharacter)) {
scoreboardStore.scoreboard.rightCharacter = '';
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 becomes available (e.g. after page refresh while
// the pack loads asynchronously), re-validate and restore the characters
// that are already in the store but couldn't be confirmed before.
watch(installedPacksRevision, () => {
const game = scoreboardStore.scoreboard.game;
if (!game) return;
const options = getCharactersByGame(game);
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.scoreboard.leftCharacter = '';
leftCharacterInput.value = '';
}
if (rightCharacter && allowed.has(rightCharacter)) {
rightCharacterInput.value = options.find((o) => o.value === rightCharacter)?.label ?? '';
} else if (rightCharacter && !allowed.has(rightCharacter)) {
scoreboardStore.scoreboard.rightCharacter = '';
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/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,444 @@
import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
// ─── 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;
}
// ─── Utilidad para mensajes NodeCG ─────────────────────────────────────────────
const sendNodeCGMessage = <T>(messageName: string, payload: unknown): Promise<T> =>
new Promise((resolve, reject) => {
nodecg.sendMessage(messageName, payload, (error: unknown, response: unknown) => {
if (error) {
reject(new Error(String(error)));
return;
}
resolve(response as T);
});
});
// ─── 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 sendNodeCGMessage<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 sendNodeCGMessage<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 sendNodeCGMessage<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 sendNodeCGMessage<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,266 @@
// src/dashboard/scoreboard/composables/usePackRegistry.ts
// ─────────────────────────────────────────────────────────────────────────────
// Singleton composable. The first caller sets up NodeCG replicant listeners;
// subsequent calls return the same reactive state. This avoids duplicate event
// listeners when multiple components call usePackRegistry().
// ─────────────────────────────────────────────────────────────────────────────
import { computed, ref, type ComputedRef, type InjectionKey } from 'vue';
import {
registerInstalledPack,
unregisterInstalledPack,
} from '../../../shared/fighting-characters';
import { BUNDLE_NAME } from '../../../shared/pack-config';
import type {
GameSelectOption,
PackDownloadState,
PackManifest,
PackRegistry
} from '../../../shared/pack-types';
// ── NodeCG global type declarations ──────────────────────────────────────────
// NodeCG injects these into the browser window via its bundle script.
declare const NodeCG: {
Replicant: <T>(
name: string,
bundleName: string,
opts?: { defaultValue?: T },
) => {
value: T;
on(event: 'change', handler: (newVal: T, oldVal?: T) => void): void;
off(event: string, handler: (...args: unknown[]) => void): void;
};
waitForReplicants: (...reps: unknown[]) => Promise<void>;
};
declare const nodecg: {
sendMessage(name: string, data?: unknown): void;
sendMessage(
name: string,
data: unknown,
cb: (err: Error | null, result?: unknown) => void,
): void;
};
// ── Module-level singleton state ──────────────────────────────────────────────
let initialized = false;
const registry = ref<PackRegistry | null>(null);
const installedPackIds = ref<string[]>([]);
const downloadStates = ref<Record<string, PackDownloadState>>({});
const availableUpdates = ref<Record<string, { installedVersion: string; latestVersion: string }>>({});
// Tracks which installed pack manifests have been loaded into fighting-characters.ts
const loadedManifestIds = new Set<string>();
// ── Helpers ───────────────────────────────────────────────────────────────────
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`;
};
/**
* Asks the NodeCG extension to read the local manifest.json for an installed
* pack and registers the characters in fighting-characters.ts.
*/
const loadInstalledManifest = (packId: string): void => {
if (loadedManifestIds.has(packId)) return;
nodecg.sendMessage('readLocalManifest', packId, (err, result) => {
if (err) {
console.error(`[usePackRegistry] Failed to load manifest for "${packId}":`, err);
return;
}
const manifest = result as PackManifest;
registerInstalledPack(manifest);
loadedManifestIds.add(packId);
});
};
// ── Replicant setup (runs once) ───────────────────────────────────────────────
const initReplicants = (): void => {
if (initialized) return;
initialized = true;
const registryRep = NodeCG.Replicant<PackRegistry | null>('packRegistry', BUNDLE_NAME, {
defaultValue: null,
});
const installedRep = NodeCG.Replicant<string[]>('installedPacks', BUNDLE_NAME, {
defaultValue: [],
});
const statesRep = NodeCG.Replicant<Record<string, PackDownloadState>>('downloadStates', BUNDLE_NAME, {
defaultValue: {},
});
const updatesRep = NodeCG.Replicant<Record<string, { installedVersion: string; latestVersion: string }>>('availableUpdates', BUNDLE_NAME, {
defaultValue: {},
});
NodeCG.waitForReplicants(registryRep, installedRep, statesRep, updatesRep).then(() => {
// Hydrate initial values
registry.value = registryRep.value;
installedPackIds.value = installedRep.value ?? [];
downloadStates.value = statesRep.value ?? {};
availableUpdates.value = updatesRep.value ?? {};
// Load manifests for all installed packs
for (const id of installedPackIds.value) {
loadInstalledManifest(id);
}
// Subscribe to changes
registryRep.on('change', (val) => {
registry.value = val;
});
installedRep.on('change', (newVal, oldVal) => {
const next = newVal ?? [];
const prev = oldVal ?? [];
installedPackIds.value = next;
// Load manifests for newly installed packs
const added = next.filter((id) => !prev.includes(id));
for (const id of added) {
loadInstalledManifest(id);
}
// Unregister packs that were removed
const removed = prev.filter((id) => !next.includes(id));
for (const id of removed) {
const gameName = getGameNameById(id);
unregisterInstalledPack(gameName);
loadedManifestIds.delete(id);
}
});
statesRep.on('change', (val) => {
downloadStates.value = val ?? {};
});
updatesRep.on('change', (val) => {
availableUpdates.value = val ?? {};
});
});
};
/**
* Given a pack ID (e.g. "street-fighter-6"), returns the matching game name
* from the current registry, or an empty string if the registry isn't loaded.
*/
const getGameNameById = (packId: string): string =>
registry.value?.packs.find((p) => p.id === packId)?.name ?? '';
// ── Public composable ─────────────────────────────────────────────────────────
export interface PackRegistryContext {
/** Full registry fetched from Gitea (null until first fetch). */
registry: typeof registry;
/** IDs of packs installed on disk (bundled packs are NOT in this list). */
installedPackIds: typeof installedPackIds;
/** Per-pack download state. */
downloadStates: typeof downloadStates;
/** Checks if a game is available (bundled OR installed). */
isGameAvailable: (gameName: string) => boolean;
/** Returns the download state for a pack, or a default idle state. */
getDownloadState: (packId: string) => PackDownloadState;
/** All games from the registry, enriched with availability info. */
allGameOptions: ReturnType<typeof buildAllGameOptions>;
/** Tells the extension to fetch the latest registry.json from Gitea. */
fetchRegistry: () => void;
/** Tells the extension to download and install a pack. */
downloadPack: (packId: string) => void;
/** Tells the extension to uninstall a pack and delete its files. */
uninstallPack: (packId: string) => void;
/** Tells the extension to download and apply an update for an installed pack. */
updatePack: (packId: string) => void;
/** Map of packId → version info for packs that have a newer version available. */
availableUpdates: typeof availableUpdates;
/** Total number of packs with available updates. */
updateCount: ComputedRef<number>;
/** Human-readable file size. */
formatBytes: typeof formatBytes;
/** Returns the URL for the pack's logo served by NodeCG (installed packs only). */
getLocalLogoUrl: (packId: string) => string;
}
export const PACK_REGISTRY_KEY: InjectionKey<PackRegistryContext> = Symbol('packRegistry');
const buildAllGameOptions = () =>
computed<GameSelectOption[]>(() => {
// Registry not loaded yet — return empty list
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],
}));
});
export function usePackRegistry(): PackRegistryContext {
initReplicants();
const allGameOptions = buildAllGameOptions();
const isGameAvailable = (gameName: string): boolean => {
const entry = registry.value?.packs.find((p) => p.name === gameName);
if (!entry) return false;
return installedPackIds.value.includes(entry.id);
};
const getDownloadState = (packId: string): PackDownloadState =>
downloadStates.value[packId] ?? { status: 'idle', progress: 0 };
const getLocalLogoUrl = (packId: string): string =>
`/packs/${packId}/logo.png`;
const fetchRegistry = (): void => {
nodecg.sendMessage('fetchPackRegistry', undefined, (err) => {
if (err) console.error('[usePackRegistry] fetchPackRegistry failed:', err);
});
};
const downloadPack = (packId: string): void => {
nodecg.sendMessage('downloadPack', packId, (err) => {
if (err) console.error(`[usePackRegistry] downloadPack "${packId}" failed:`, err);
});
};
const uninstallPack = (packId: string): void => {
nodecg.sendMessage('uninstallPack', packId, (err) => {
if (err) console.error(`[usePackRegistry] uninstallPack "${packId}" failed:`, err);
});
};
const updatePack = (packId: string): void => {
nodecg.sendMessage('updatePack', packId, (err) => {
if (err) console.error(`[usePackRegistry] updatePack "${packId}" failed:`, err);
});
};
const updateCount = computed(() => Object.keys(availableUpdates.value).length);
return {
registry,
installedPackIds,
downloadStates,
isGameAvailable,
getDownloadState,
allGameOptions,
fetchRegistry,
downloadPack,
uninstallPack,
updatePack,
availableUpdates,
updateCount,
formatBytes,
getLocalLogoUrl,
};
}
@@ -0,0 +1,346 @@
import { computed, ref, watch, watchEffect } from 'vue';
import { useScoreboardStore } from '../stores/scoreboard';
import { usePlayersStore } from '../stores/players';
import type { Schemas } from '../../../types';
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)
// ---------------------------------------------------------------------------
const normalizeName = (value: string) => value.trim().toLowerCase();
/**
* Generates a unique slug-based player ID that does not collide with
* existing player keys in the store.
*/
const createPlayerId = (name: string, players: Schemas.Players): string => {
const base = name
.trim()
.toLowerCase()
.normalize('NFD')
.replace(/[^\w\s-]/g, '')
.replace(/[\u0300-\u036f]/g, '')
.replace(/\s+/g, '-') || 'player';
let index = 1;
let candidate = base;
while (players[candidate]) {
index += 1;
candidate = `${base}-${index}`;
}
return candidate;
};
// ---------------------------------------------------------------------------
// Composable
// ---------------------------------------------------------------------------
/**
* 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) => {
if (isLeft) scoreboardStore.scoreboard.leftPlayerId = v;
else scoreboardStore.scoreboard.rightPlayerId = v;
},
});
const nameOverride = computed({
get: () => (isLeft ? scoreboardStore.scoreboard.leftNameOverride : scoreboardStore.scoreboard.rightNameOverride),
set: (v) => {
if (isLeft) scoreboardStore.scoreboard.leftNameOverride = v;
else scoreboardStore.scoreboard.rightNameOverride = v;
},
});
const teamOverride = computed({
get: () => (isLeft ? scoreboardStore.scoreboard.leftTeamOverride : scoreboardStore.scoreboard.rightTeamOverride),
set: (v) => {
if (isLeft) scoreboardStore.scoreboard.leftTeamOverride = v;
else scoreboardStore.scoreboard.rightTeamOverride = v;
},
});
const countryOverride = computed({
get: () => (isLeft ? scoreboardStore.scoreboard.leftCountryOverride : scoreboardStore.scoreboard.rightCountryOverride),
set: (v) => {
if (isLeft) scoreboardStore.scoreboard.leftCountryOverride = v;
else scoreboardStore.scoreboard.rightCountryOverride = 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 = normalizeName(name);
return Boolean(normalized)
&& Object.values(playersStore.players).some(
(p) => normalizeName(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 -47
View File
@@ -24,6 +24,14 @@ type Translations = {
settingsShortcutRightDecrementHint: string; settingsShortcutRightDecrementHint: string;
settingsShortcutReset: string; settingsShortcutReset: string;
settingsShortcutRecordingHint: string; settingsShortcutRecordingHint: string;
settingsShortcutConflictWarning: string;
settingsShortcutStartRecording: string;
settingsShortcutStopRecording: string;
settingsShortcutResetSingle: string;
settingsIntegrationsTitle: string;
settingsIntegrationsDescription: string;
settingsDisconnect: string;
settingsNotConnected: string;
languageEnglish: string; languageEnglish: string;
languageSpanish: string; languageSpanish: string;
scoreboardUnassigned: string; scoreboardUnassigned: string;
@@ -53,6 +61,8 @@ type Translations = {
aboutElectronNote: string; aboutElectronNote: string;
aboutUnknownReleaseError: string; aboutUnknownReleaseError: string;
aboutGitHubStatusError: string; aboutGitHubStatusError: string;
aboutChangelog: string;
aboutTechStackTitle: string;
graphicsTitle: string; graphicsTitle: string;
graphicsDescription: string; graphicsDescription: string;
graphicsNoConfigured: string; graphicsNoConfigured: string;
@@ -61,14 +71,21 @@ type Translations = {
graphicsScoreboard: string; graphicsScoreboard: string;
graphicsCommentary: string; graphicsCommentary: string;
graphicsSkinLabel: string; graphicsSkinLabel: string;
graphicsCopied: string;
graphicsOpenBrowser: string;
commentaryTitle: string; commentaryTitle: string;
commentaryCommentator1: string; commentaryCommentator1: string;
commentaryCommentator2: string; commentaryCommentator2: string;
commentaryTwitterText: string; commentaryTwitterText: string;
commentaryTwitterMaxLength: string;
commentaryTwitterInvalidChars: string;
commentarySwap: string;
commentaryClear: string;
bracketTitle: string; bracketTitle: string;
bracketStage: string; bracketStage: string;
bracketSide: string; bracketSide: string;
bracketCustomProgress: string; bracketCustomProgress: string;
bracketPreview: string;
playersLabelTeam: string; playersLabelTeam: string;
playersLabelCountry: string; playersLabelCountry: string;
playersLabelActions: string; playersLabelActions: string;
@@ -84,6 +101,8 @@ type Translations = {
playersSearchPlaceholder: string; playersSearchPlaceholder: string;
playersImport: string; playersImport: string;
playersExport: string; playersExport: string;
playersConnectInSettings: string;
playersConnectInSettingsSuffix: string;
}; };
const STORAGE_KEY = 'scoreko-dev.language'; const STORAGE_KEY = 'scoreko-dev.language';
@@ -95,28 +114,42 @@ const messages: Record<Locale, Translations> = {
menuGraphics: 'Graphics', menuGraphics: 'Graphics',
menuSettings: 'Settings', menuSettings: 'Settings',
menuAbout: 'About', menuAbout: 'About',
// ── Settings ────────────────────────────────────────────────────────────
settingsTitle: 'Settings', settingsTitle: 'Settings',
settingsDescription: 'Dashboard and bundle configuration.', settingsDescription: 'Dashboard and bundle settings.',
settingsLanguageLabel: 'Language', settingsLanguageLabel: 'Language',
settingsLanguageHint: 'Choose the dashboard language.', settingsLanguageHint: 'Choose the dashboard language.',
settingsShortcutTitle: 'Keyboard shortcuts', 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', settingsShortcutLeftIncrementLabel: 'P1 score +1',
settingsShortcutLeftIncrementHint: 'Increases left player score by one.', settingsShortcutLeftIncrementHint: 'Increases the left players score by one.',
settingsShortcutLeftDecrementLabel: 'P1 score -1', settingsShortcutLeftDecrementLabel: 'P1 score -1',
settingsShortcutLeftDecrementHint: 'Decreases left player score by one.', settingsShortcutLeftDecrementHint: 'Decreases the left players score by one.',
settingsShortcutRightIncrementLabel: 'P2 score +1', settingsShortcutRightIncrementLabel: 'P2 score +1',
settingsShortcutRightIncrementHint: 'Increases right player score by one.', settingsShortcutRightIncrementHint: 'Increases the right players score by one.',
settingsShortcutRightDecrementLabel: 'P2 score -1', settingsShortcutRightDecrementLabel: 'P2 score -1',
settingsShortcutRightDecrementHint: 'Decreases right player score by one.', settingsShortcutRightDecrementHint: 'Decreases the right players score by one.',
settingsShortcutReset: 'Reset shortcuts', 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', languageEnglish: 'English',
languageSpanish: 'Spanish', languageSpanish: 'Spanish',
// ── Scoreboard ───────────────────────────────────────────────────────────
scoreboardUnassigned: '(Unassigned)', scoreboardUnassigned: '(Unassigned)',
scoreboardLeft: 'Left', scoreboardLeft: 'Left',
scoreboardRight: 'Right', scoreboardRight: 'Right',
scoreboardPreview: 'preview', scoreboardPreview: 'Preview',
scoreboardLeftImage: 'Left image', scoreboardLeftImage: 'Left image',
scoreboardRightImage: 'Right image', scoreboardRightImage: 'Right image',
scoreboardLabelCharacter: 'Character', scoreboardLabelCharacter: 'Character',
@@ -124,11 +157,13 @@ const messages: Record<Locale, Translations> = {
scoreboardLabelTeam: 'Team', scoreboardLabelTeam: 'Team',
scoreboardLabelCountry: 'Country', scoreboardLabelCountry: 'Country',
scoreboardLabelGame: 'Game', scoreboardLabelGame: 'Game',
// ── About ────────────────────────────────────────────────────────────────
aboutTitle: 'About', aboutTitle: 'About',
aboutVersion: 'Version', aboutVersion: 'Version',
aboutDescription: 'Dashboard for producing fighting game overlays using NodeCG, Vue, and Quasar.', aboutDescription: 'Dashboard for producing fighting game overlays with NodeCG, Vue, and Quasar.',
aboutFrameworkNodeCG: 'Framework NodeCG', aboutFrameworkNodeCG: 'NodeCG framework',
aboutCollaboratorsTitle: 'Collaborators and acknowledgments', aboutCollaboratorsTitle: 'Contributors and acknowledgments',
aboutUpdateSystemTitle: 'Update system (GitHub Releases)', aboutUpdateSystemTitle: 'Update system (GitHub Releases)',
aboutUpdateSystemDescription: 'This check fetches the latest release from the repository and compares it with the current version.', aboutUpdateSystemDescription: 'This check fetches the latest release from the repository and compares it with the current version.',
aboutCheckUpdates: 'Check for updates', aboutCheckUpdates: 'Check for updates',
@@ -137,32 +172,49 @@ const messages: Record<Locale, Translations> = {
aboutUpdateAvailable: 'A newer version is available.', aboutUpdateAvailable: 'A newer version is available.',
aboutUpToDate: 'Your version is up to date with the latest release.', aboutUpToDate: 'Your version is up to date with the latest release.',
aboutViewRelease: 'View 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.', aboutUnknownReleaseError: 'Unknown error while checking releases.',
aboutGitHubStatusError: 'GitHub responded with status', aboutGitHubStatusError: 'GitHub responded with status',
aboutChangelog: 'Changelog',
aboutTechStackTitle: 'Tech stack',
// ── Graphics ─────────────────────────────────────────────────────────────
graphicsTitle: '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.', graphicsNoConfigured: 'There are no graphics configured in this bundle.',
graphicsCopyUrl: 'Copy URL', graphicsCopyUrl: 'Copy URL',
graphicsDragObs: 'Drag into OBS', graphicsDragObs: 'Drag into OBS',
graphicsScoreboard: 'Scoreboard', graphicsScoreboard: 'Scoreboard',
graphicsCommentary: 'Commentary', graphicsCommentary: 'Commentators',
graphicsSkinLabel: 'Skin', graphicsSkinLabel: 'Theme',
commentaryTitle: 'Commentary', graphicsCopied: 'URL copied to clipboard',
graphicsOpenBrowser: 'Open in browser',
// ── Commentary ───────────────────────────────────────────────────────────
commentaryTitle: 'Commentators',
commentaryCommentator1: 'Commentator #1', commentaryCommentator1: 'Commentator #1',
commentaryCommentator2: 'Commentator #2', 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', bracketTitle: 'Bracket',
bracketStage: 'Stage', bracketStage: 'Stage',
bracketSide: 'Bracket side', bracketSide: 'Bracket side',
bracketCustomProgress: 'Custom progress', bracketCustomProgress: 'Custom progress',
bracketPreview: 'Preview',
// ── Players ──────────────────────────────────────────────────────────────
playersLabelTeam: 'Team', playersLabelTeam: 'Team',
playersLabelCountry: 'Country', playersLabelCountry: 'Country',
playersLabelActions: 'Actions', 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', playersConnectStartgg: 'Connect with start.gg',
playersConnected: 'Connected', playersConnected: 'Connected',
playersUsePersonalApi: 'Use personal API', playersUsePersonalApi: 'Use personal token',
playersTournament: 'Tournament', playersTournament: 'Tournament',
playersImportPlayers: 'Import players', playersImportPlayers: 'Import players',
playersChallongeHelp: 'Connect with OAuth or paste your personal token to load your Challonge tournaments and import participants.', playersChallongeHelp: 'Connect with OAuth or paste your personal token to load your Challonge tournaments and import participants.',
@@ -171,31 +223,48 @@ const messages: Record<Locale, Translations> = {
playersSearchPlaceholder: 'Search...', playersSearchPlaceholder: 'Search...',
playersImport: 'Import', playersImport: 'Import',
playersExport: 'Export', playersExport: 'Export',
playersConnectInSettings: 'Connect your account in',
playersConnectInSettingsSuffix: 'to import players from tournaments.',
}, },
es: { es: {
menuDashboard: 'Panel', menuDashboard: 'Panel',
menuPlayers: 'Jugadores', menuPlayers: 'Jugadores',
menuGraphics: 'Gráficos', menuGraphics: 'Gráficos',
menuSettings: 'Configuración', menuSettings: 'Configuración',
menuAbout: 'Acerca de', menuAbout: 'Acerca de',
// ── Settings ────────────────────────────────────────────────────────────
settingsTitle: 'Configuración', settingsTitle: 'Configuración',
settingsDescription: 'Configuración del dashboard y del bundle.', settingsDescription: 'Configuración del panel y del bundle.',
settingsLanguageLabel: 'Idioma', settingsLanguageLabel: 'Idioma',
settingsLanguageHint: 'Selecciona el idioma del dashboard.', settingsLanguageHint: 'Selecciona el idioma del dashboard.',
settingsShortcutTitle: 'Atajos de teclado', settingsShortcutTitle: 'Atajos de teclado',
settingsShortcutDescription: 'Configura teclas rápidas para actualizar el score de cada lado.', settingsShortcutDescription: 'Configura atajos para actualizar el marcador de cada lado.',
settingsShortcutLeftIncrementLabel: 'Score P1 +1', settingsShortcutLeftIncrementLabel: 'Marcador P1 +1',
settingsShortcutLeftIncrementHint: 'Incrementa en uno el score del jugador izquierdo.', settingsShortcutLeftIncrementHint: 'Incrementa en uno el marcador del jugador izquierdo.',
settingsShortcutLeftDecrementLabel: 'Score P1 -1', settingsShortcutLeftDecrementLabel: 'Marcador P1 -1',
settingsShortcutLeftDecrementHint: 'Reduce en uno el score del jugador izquierdo.', settingsShortcutLeftDecrementHint: 'Reduce en uno el marcador del jugador izquierdo.',
settingsShortcutRightIncrementLabel: 'Score P2 +1', settingsShortcutRightIncrementLabel: 'Marcador P2 +1',
settingsShortcutRightIncrementHint: 'Incrementa en uno el score del jugador derecho.', settingsShortcutRightIncrementHint: 'Incrementa en uno el marcador del jugador derecho.',
settingsShortcutRightDecrementLabel: 'Score P2 -1', settingsShortcutRightDecrementLabel: 'Marcador P2 -1',
settingsShortcutRightDecrementHint: 'Reduce en uno el score del jugador derecho.', settingsShortcutRightDecrementHint: 'Reduce en uno el marcador del jugador derecho.',
settingsShortcutReset: 'Restablecer atajos', settingsShortcutReset: 'Restablecer atajos',
settingsShortcutRecordingHint: 'Pulsa ahora el atajo deseado (ejemplo: Alt+1).', 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', languageEnglish: 'Inglés',
languageSpanish: 'Castellano', languageSpanish: 'Español',
// ── Scoreboard ───────────────────────────────────────────────────────────
scoreboardUnassigned: '(Sin asignar)', scoreboardUnassigned: '(Sin asignar)',
scoreboardLeft: 'Izquierda', scoreboardLeft: 'Izquierda',
scoreboardRight: 'Derecha', scoreboardRight: 'Derecha',
@@ -207,42 +276,61 @@ const messages: Record<Locale, Translations> = {
scoreboardLabelTeam: 'Equipo', scoreboardLabelTeam: 'Equipo',
scoreboardLabelCountry: 'País', scoreboardLabelCountry: 'País',
scoreboardLabelGame: 'Juego', scoreboardLabelGame: 'Juego',
// ── About ────────────────────────────────────────────────────────────────
aboutTitle: 'Acerca de', aboutTitle: 'Acerca de',
aboutVersion: 'Versión', 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', aboutFrameworkNodeCG: 'Framework NodeCG',
aboutCollaboratorsTitle: 'Colaboradores y agradecimientos', aboutCollaboratorsTitle: 'Colaboradores y agradecimientos',
aboutUpdateSystemTitle: 'Sistema de actualizaciones (GitHub Releases)', 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', aboutCheckUpdates: 'Buscar actualizaciones',
aboutLatestRelease: 'Última release', aboutLatestRelease: 'Última versión',
aboutPublished: 'Publicado', aboutPublished: 'Publicado',
aboutUpdateAvailable: 'Hay una versión más nueva disponible.', aboutUpdateAvailable: 'Hay una versión más nueva disponible.',
aboutUpToDate: 'Tu versión está actualizada con la última release.', aboutUpToDate: 'Tu versión está actualizada con la última versión.',
aboutViewRelease: 'Ver release', 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.', 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.', aboutUnknownReleaseError: 'Error desconocido al consultar releases.',
aboutGitHubStatusError: 'GitHub respondió con estado', aboutGitHubStatusError: 'GitHub respondió con estado',
aboutChangelog: 'Registro de cambios',
aboutTechStackTitle: 'Stack tecnológico',
// ── Graphics ─────────────────────────────────────────────────────────────
graphicsTitle: 'Gráficos', graphicsTitle: 'Gráficos',
graphicsDescription: 'Controles y estado de los gráficos del bundle.', graphicsDescription: 'Controles y estado de los gráficos del bundle.',
graphicsNoConfigured: 'No hay gráficos configurados en este bundle.', graphicsNoConfigured: 'No hay gráficos configurados en este bundle.',
graphicsCopyUrl: 'Copiar URL', graphicsCopyUrl: 'Copiar URL',
graphicsDragObs: 'Arrastrar a OBS', graphicsDragObs: 'Arrastrar a OBS',
graphicsScoreboard: 'Scoreboard', graphicsScoreboard: 'Marcador',
graphicsCommentary: 'Comentario', graphicsCommentary: 'Comentaristas',
graphicsSkinLabel: 'Skin', graphicsSkinLabel: 'Tema',
commentaryTitle: 'Comentario', graphicsCopied: 'URL copiada al portapapeles',
graphicsOpenBrowser: 'Abrir en el navegador',
// ── Commentary ───────────────────────────────────────────────────────────
commentaryTitle: 'Comentaristas',
commentaryCommentator1: 'Comentarista #1', commentaryCommentator1: 'Comentarista #1',
commentaryCommentator2: 'Comentarista #2', commentaryCommentator2: 'Comentarista #2',
commentaryTwitterText: '@Twitter / Texto', 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', bracketStage: 'Etapa',
bracketSide: 'Lado del bracket', bracketSide: 'Lado de la llave',
bracketCustomProgress: 'Progreso personalizado', bracketCustomProgress: 'Progreso personalizado',
bracketPreview: 'Vista previa',
// ── Players ──────────────────────────────────────────────────────────────
playersLabelTeam: 'Equipo', playersLabelTeam: 'Equipo',
playersLabelCountry: 'País', playersLabelCountry: 'País',
playersLabelActions: 'Acciones', 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', playersConnectStartgg: 'Conectar con start.gg',
playersConnected: 'Conectado', playersConnected: 'Conectado',
playersUsePersonalApi: 'Usar API personal', playersUsePersonalApi: 'Usar API personal',
@@ -254,16 +342,15 @@ const messages: Record<Locale, Translations> = {
playersSearchPlaceholder: 'Buscar...', playersSearchPlaceholder: 'Buscar...',
playersImport: 'Importar', playersImport: 'Importar',
playersExport: 'Exportar', playersExport: 'Exportar',
playersConnectInSettings: 'Conecta tu cuenta en',
playersConnectInSettingsSuffix: 'para importar jugadores desde torneos.',
}, },
}; };
const normalizeLocale = (value: unknown): Locale => (value === 'es' ? 'es' : 'en'); const normalizeLocale = (value: unknown): Locale => (value === 'es' ? 'es' : 'en');
const getStoredLocale = (): Locale => { const getStoredLocale = (): Locale => {
if (typeof window === 'undefined') { if (typeof window === 'undefined') return 'en';
return 'en';
}
return normalizeLocale(localStorage.getItem(STORAGE_KEY)); return normalizeLocale(localStorage.getItem(STORAGE_KEY));
}; };
@@ -271,7 +358,6 @@ export const locale = ref<Locale>(getStoredLocale());
export const setLocale = (value: Locale) => { export const setLocale = (value: Locale) => {
locale.value = normalizeLocale(value); locale.value = normalizeLocale(value);
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
localStorage.setItem(STORAGE_KEY, locale.value); localStorage.setItem(STORAGE_KEY, locale.value);
} }
+308 -72
View File
@@ -1,67 +1,87 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, onMounted, onUnmounted } from 'vue'; import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
import { t } from './i18n'; import { t } from './i18n';
import { useScoreboardStore } from './stores/scoreboard'; import { useScoreboardStore } from './stores/scoreboard';
import { isShortcutMatch, useShortcutSettingsStore } from './stores/shortcut-settings'; 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('menuDashboard'), to: '/', icon: 'dashboard' },
{ label: t('menuPlayers'), to: '/players', icon: 'groups' }, { label: t('menuPlayers'), to: '/players', icon: 'groups' },
{ label: t('menuGraphics'), to: '/graphics', icon: 'collections' }, { label: t('menuGraphics'), to: '/graphics', icon: 'collections' },
]);
const configItems = computed(() => [
{ label: t('menuSettings'), to: '/settings', icon: 'settings' }, { label: t('menuSettings'), to: '/settings', icon: 'settings' },
{ label: t('menuAbout'), to: '/about', icon: 'info' }, { 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 scoreboardStore = useScoreboardStore();
const shortcutSettingsStore = useShortcutSettingsStore(); const shortcutSettingsStore = useShortcutSettingsStore();
const isEditableTarget = (target: EventTarget | null): boolean => { const isEditableTarget = (target: EventTarget | null): boolean => {
if (!(target instanceof HTMLElement)) { if (!(target instanceof HTMLElement)) return false;
return false; return (
} target.isContentEditable ||
['INPUT', 'TEXTAREA', 'SELECT'].includes(target.tagName) ||
return target.isContentEditable Boolean(target.closest('[contenteditable="true"]'))
|| ['INPUT', 'TEXTAREA', 'SELECT'].includes(target.tagName) );
|| Boolean(target.closest('[contenteditable="true"]'));
}; };
const onShortcutPress = (event: KeyboardEvent) => { const onShortcutPress = (event: KeyboardEvent) => {
if (isEditableTarget(event.target) || document.body.dataset.shortcutRecording === 'true') { if (isEditableTarget(event.target) || document.body.dataset.shortcutRecording === 'true') return;
return;
}
const { shortcuts } = shortcutSettingsStore; const { shortcuts } = shortcutSettingsStore;
if (isShortcutMatch(event, shortcuts.leftIncrement)) { if (isShortcutMatch(event, shortcuts.leftIncrement)) { scoreboardStore.leftScore += 1; event.preventDefault(); return; }
scoreboardStore.leftScore += 1; if (isShortcutMatch(event, shortcuts.leftDecrement)) { scoreboardStore.leftScore = Math.max(0, scoreboardStore.leftScore - 1); event.preventDefault(); return; }
event.preventDefault(); if (isShortcutMatch(event, shortcuts.rightIncrement)) { scoreboardStore.rightScore += 1; event.preventDefault(); return; }
return; if (isShortcutMatch(event, shortcuts.rightDecrement)) { scoreboardStore.rightScore = Math.max(0, scoreboardStore.rightScore - 1); event.preventDefault(); }
}
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(() => { onMounted(() => {
window.addEventListener('keydown', onShortcutPress); window.addEventListener('keydown', onShortcutPress);
window.addEventListener('online', onNetworkOnline);
window.addEventListener('offline', onNetworkOffline);
pingInterval = setInterval(checkOnline, 15_000);
}); });
onUnmounted(() => { onUnmounted(() => {
window.removeEventListener('keydown', onShortcutPress); window.removeEventListener('keydown', onShortcutPress);
window.removeEventListener('online', onNetworkOnline);
window.removeEventListener('offline', onNetworkOffline);
if (pingInterval) clearInterval(pingInterval);
}); });
</script> </script>
@@ -71,49 +91,117 @@ onUnmounted(() => {
show-if-above show-if-above
side="left" side="left"
bordered bordered
:width="220" :width="drawerWidth"
class="sidebar-drawer" class="sidebar-drawer"
> >
<div class="sidebar-header q-pa-md"> <!-- Header -->
<div class="row items-center no-wrap"> <div class="sidebar-header" :class="{ 'is-collapsed': isCollapsed }">
<img <img :src="logoUrl" alt="Logo" class="sidebar-logo">
:src="logoUrl"
alt="Logo" <Transition name="slide-fade">
class="sidebar-logo" <div v-if="!isCollapsed" class="sidebar-title">
> <span class="title-text">Scoreko-dev</span>
<div class="q-ml-sm"> <span v-if="appVersion" class="title-version">v{{ appVersion }}</span>
<div class="text-subtitle1 text-weight-bold">
Scoreko-dev
</div> </div>
<div class="text-caption"> </Transition>
<span class="by-label">by</span> <a
class="by-link" <!-- Chevron siempre visible, arriba a la derecha -->
href="https://github.com/Pandipipas" <QBtn
target="_blank" flat
rel="noopener" round
>Pandipipas</a> dense
size="sm"
:icon="isCollapsed ? 'chevron_right' : 'chevron_left'"
class="collapse-btn"
@click="toggleCollapse"
/>
</div> </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>
</div> <QList padding>
<QSeparator class="q-mb-sm" />
<QList>
<QItem <QItem
v-for="item in menuItems" v-for="item in mainItems"
:key="item.to" :key="item.to"
clickable clickable
:to="item.to" :to="item.to"
exact exact
active-class="sidebar-item-active" active-class="sidebar-item-active"
:class="{ 'nav-item-collapsed': isCollapsed }"
> >
<QItemSection avatar> <QItemSection avatar>
<QIcon :name="item.icon" /> <QIcon :name="item.icon" size="sm" />
</QItemSection> </QItemSection>
<QItemSection> <QItemSection v-if="!isCollapsed">
<QItemLabel>{{ item.label }}</QItemLabel> <QItemLabel>{{ item.label }}</QItemLabel>
</QItemSection> </QItemSection>
<QTooltip
v-if="isCollapsed"
anchor="center right"
self="center left"
:offset="[10, 0]"
>
{{ item.label }}
</QTooltip>
</QItem> </QItem>
</QList> </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> </QDrawer>
<QPageContainer> <QPageContainer>
@@ -123,28 +211,176 @@ onUnmounted(() => {
</template> </template>
<style scoped> <style scoped>
/* ── Drawer shell ─────────────────────────────────────────────────────────── */
.sidebar-drawer :deep(.q-drawer__content) {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
}
/* ── Header ───────────────────────────────────────────────────────────────── */
.sidebar-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 { .sidebar-logo {
width: 40px; width: 36px;
height: 40px; height: 36px;
object-fit: contain; object-fit: contain;
flex-shrink: 0;
} }
.by-label { .sidebar-title {
font-size: 0.75rem; 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 { /* ── Collapse button ──────────────────────────────────────────────────────── */
font-size: 0.75rem; .collapse-btn {
color: #f50a64; flex-shrink: 0;
text-decoration: none; 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 { /* ── Section separators ───────────────────────────────────────────────────── */
text-decoration: underline; .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> </style>
@@ -175,9 +175,15 @@ export const useShortcutSettingsStore = defineStore('shortcut-settings', () => {
persistSettings(shortcuts); persistSettings(shortcuts);
}; };
const resetShortcut = (action: ShortcutAction) => {
shortcuts[action] = defaultShortcuts[action];
persistSettings(shortcuts);
};
return { return {
shortcuts, shortcuts,
setShortcut, setShortcut,
resetShortcuts, resetShortcuts,
resetShortcut,
}; };
}); });
+156 -184
View File
@@ -1,163 +1,105 @@
<script setup lang="ts"> <script setup lang="ts">
import { useHead } from '@unhead/vue'; import { useHead } from '@unhead/vue';
import { computed, onMounted, ref } from 'vue';
import { t } from '../i18n'; import { t } from '../i18n';
defineOptions({ name: 'AboutView' }); defineOptions({ name: 'AboutView' });
useHead(() => ({ title: t('aboutTitle') })); useHead(() => ({ title: t('aboutTitle') }));
type ReleaseResponse = {
html_url: string;
name: string | null;
tag_name: string;
published_at: string;
};
const appName = 'Scoreko-dev'; const appName = 'Scoreko-dev';
const currentVersion = import.meta.env.PACKAGE_VERSION; const currentVersion = import.meta.env.PACKAGE_VERSION;
const updateRepoOwner = 'Pandipipas'; const repoUrl = 'https://github.com/Pandipipas/scoreko-dev';
const updateRepoName = 'scoreko'; const authorUrl = 'https://github.com/Pandipipas';
const checkingUpdates = ref(false);
const updateError = ref('');
const latestRelease = ref<ReleaseResponse | null>(null);
const collaborators = [ const collaborators = [
{ {
name: 'Pandipipas', name: 'Pandipipas',
role: 'Development and maintenance of Scoreko-dev', role: 'Development and maintenance of Scoreko-dev',
url: 'https://github.com/Pandipipas/scoreko-dev' url: authorUrl,
icon: 'code',
}, },
{ {
name: 'Dan Shields', name: 'Dan Shields',
role: 'nodecg-vue-composable helper', 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', name: 'NodeCG',
role: 'Broadcast graphics framework', role: 'Broadcast graphics framework',
url: 'https://github.com/nodecg/nodecg' url: 'https://github.com/nodecg/nodecg',
} icon: 'layers',
},
]; ];
const releaseLabel = computed(() => { const techStack = [
if (!latestRelease.value) { { label: 'Vue 3', icon: 'hub' },
return ''; { label: 'Quasar', icon: 'style' },
} { label: 'TypeScript', icon: 'data_object' },
{ label: 'NodeCG', icon: 'layers' },
];
return latestRelease.value.name?.trim().length const currentYear = new Date().getFullYear();
? 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();
});
</script> </script>
<template> <template>
<QPage class="q-pa-lg"> <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') }} {{ t('aboutTitle') }}
</div> </div>
</div>
<div class="row q-col-gutter-lg">
<div class="col-12 col-md-6">
<QCard <QCard
flat flat
bordered bordered
class="about-card"
> >
<QCardSection class="row items-center q-col-gutter-md"> <!-- App identity -->
<div class="col-auto"> <QCardSection class="q-pa-lg">
<div class="row items-center q-gutter-md">
<QImg <QImg
src="../image.png" src="../image.png"
alt="Scoreko logo" alt="Scoreko logo"
width="72px" class="app-logo"
height="72px"
fit="contain" fit="contain"
/> />
</div> <div>
<div class="col"> <div class="text-h6 text-weight-bold">
<div class="text-h6">
{{ appName }} {{ appName }}
</div> </div>
<div class="text-caption text-grey-7"> <div class="row items-center q-gutter-xs q-mt-xs">
{{ t('aboutVersion') }} {{ currentVersion }} <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>
</div> </div>
</QCardSection> </QCardSection>
<QSeparator /> <QSeparator />
<QCardSection> <!-- Description + framework -->
<p class="q-mb-sm"> <QCardSection class="q-pa-lg">
<p class="text-body2 text-grey-7 q-mb-md">
{{ t('aboutDescription') }} {{ t('aboutDescription') }}
</p> </p>
<div class="column q-gutter-sm">
<QBtn <QBtn
href="https://github.com/nodecg/nodecg" href="https://github.com/nodecg/nodecg"
target="_blank" target="_blank"
@@ -166,19 +108,43 @@ onMounted(() => {
:label="t('aboutFrameworkNodeCG')" :label="t('aboutFrameworkNodeCG')"
color="primary" color="primary"
flat flat
dense
no-caps 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> </div>
</QCardSection> </QCardSection>
<QSeparator /> <QSeparator />
<QCardSection> <!-- Collaborators -->
<div class="text-subtitle2 q-mb-sm"> <QCardSection class="q-pa-lg">
<div class="text-overline text-grey-6 q-mb-sm">
{{ t('aboutCollaboratorsTitle') }} {{ t('aboutCollaboratorsTitle') }}
</div> </div>
<QList dense> <QList
dense
class="collaborators-list"
>
<QItem <QItem
v-for="person in collaborators" v-for="person in collaborators"
:key="person.name" :key="person.name"
@@ -186,95 +152,101 @@ onMounted(() => {
:href="person.url" :href="person.url"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
class="collaborator-item rounded-borders"
> >
<QItemSection avatar>
<QIcon
:name="person.icon"
size="18px"
color="primary"
class="collaborator-icon"
/>
</QItemSection>
<QItemSection> <QItemSection>
<QItemLabel>{{ person.name }}</QItemLabel> <QItemLabel class="text-weight-medium">
<QItemLabel caption> {{ person.name }}
</QItemLabel>
<QItemLabel
caption
class="text-grey-6"
>
{{ person.role }} {{ person.role }}
</QItemLabel> </QItemLabel>
</QItemSection> </QItemSection>
<QItemSection side>
<QIcon
name="arrow_forward_ios"
size="12px"
color="grey-5"
/>
</QItemSection>
</QItem> </QItem>
</QList> </QList>
</QCardSection> </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 /> <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 <QBtn
:label="t('aboutCheckUpdates')" :href="repoUrl"
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"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
icon="open_in_new"
label="GitHub"
color="grey-6"
flat
dense
no-caps no-caps
size="sm"
/> />
</template> </div>
</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>
</QCardSection> </QCardSection>
</QCard> </QCard>
</div>
</div>
</QPage> </QPage>
</template> </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> <template>
<QPage class="q-pa-lg"> <QPage class="q-pa-lg">
<div class="dashboard-panels q-mt-lg"> <div class="dashboard-panels">
<div class="dashboard-row dashboard-row--scoreboard"> <div class="dashboard-row dashboard-row--scoreboard">
<QCard <QCard
flat
bordered bordered
class="dashboard-panel-card" class="dashboard-panel-card"
> >
@@ -25,6 +26,7 @@ useHead({ title: 'Dashboard' });
<div class="dashboard-row dashboard-row--bottom"> <div class="dashboard-row dashboard-row--bottom">
<QCard <QCard
flat
bordered bordered
class="dashboard-panel-card" class="dashboard-panel-card"
> >
@@ -33,6 +35,7 @@ useHead({ title: 'Dashboard' });
</QCardSection> </QCardSection>
</QCard> </QCard>
<QCard <QCard
flat
bordered bordered
class="dashboard-panel-card" class="dashboard-panel-card"
> >
@@ -53,20 +56,12 @@ useHead({ title: 'Dashboard' });
gap: 24px; gap: 24px;
} }
.dashboard-row {
width: 100%;
}
.dashboard-row--bottom { .dashboard-row--bottom {
display: grid; display: grid;
grid-template-columns: 1fr; grid-template-columns: 1fr;
gap: 24px; gap: 24px;
} }
.dashboard-panel-card {
width: 100%;
}
.dashboard-panel-content { .dashboard-panel-content {
padding-bottom: 16px; padding-bottom: 16px;
} }
+35 -15
View File
@@ -1,13 +1,12 @@
<script setup lang="ts"> <script setup lang="ts">
import { useHead } from '@unhead/vue'; import { useHead } from '@unhead/vue';
import { computed, ref, watch } from 'vue'; import { computed, ref, watch } from 'vue';
import bundlePackage from '../../../../package.json';
import { graphicsSettingsReplicant } from '../../../browser_shared/replicants'; import { graphicsSettingsReplicant } from '../../../browser_shared/replicants';
import { t } from '../i18n'; import { t } from '../i18n';
defineOptions({ name: 'GraphicsView' }); defineOptions({ name: 'GraphicsView' });
import bundlePackage from '../../../../package.json';
type GraphicConfig = { type GraphicConfig = {
name?: string; name?: string;
title?: string; title?: string;
@@ -130,19 +129,29 @@ const cards = computed<GraphicCard[]>(() => {
return result; return result;
}); });
const copyUrl = async (graphic: GraphicConfig) => { const copiedCardId = ref<string | null>(null);
const copyUrl = async (graphic: GraphicConfig, cardId: string) => {
const url = buildGraphicUrl(graphic); const url = buildGraphicUrl(graphic);
if (navigator.clipboard?.writeText) { if (navigator.clipboard?.writeText) {
await navigator.clipboard.writeText(url); await navigator.clipboard.writeText(url);
return; } else {
}
const input = document.createElement('input'); const input = document.createElement('input');
input.value = url; input.value = url;
document.body.appendChild(input); document.body.appendChild(input);
input.select(); input.select();
document.execCommand('copy'); document.execCommand('copy');
document.body.removeChild(input); 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) => { const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
@@ -165,16 +174,18 @@ const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
<template> <template>
<QPage class="q-pa-lg"> <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') }} {{ t('graphicsTitle') }}
</div> </div>
<div class="text-body1 q-mb-lg"> <div class="text-body2 text-grey-7 q-mt-xs">
{{ t('graphicsDescription') }} {{ t('graphicsDescription') }}
</div> </div>
</div>
<div <div
v-if="cards.length === 0" v-if="cards.length === 0"
class="text-body2 text-grey-5" class="text-body2 text-grey-6"
> >
{{ t('graphicsNoConfigured') }} {{ t('graphicsNoConfigured') }}
</div> </div>
@@ -194,7 +205,7 @@ const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
<div class="text-h6"> <div class="text-h6">
{{ card.label }} {{ card.label }}
</div> </div>
<div class="text-caption text-grey-5"> <div class="text-caption text-grey-4">
{{ card.graphic.file }} {{ card.graphic.file }}
</div> </div>
</div> </div>
@@ -224,18 +235,27 @@ const onDragStart = (event: DragEvent, graphic: GraphicConfig) => {
<div class="row items-center q-gutter-sm"> <div class="row items-center q-gutter-sm">
<QBtn <QBtn
color="primary" :color="copiedCardId === card.id ? 'positive' : 'primary'"
icon="content_copy" :icon="copiedCardId === card.id ? 'check' : 'content_copy'"
:label="t('graphicsCopyUrl')" no-caps
@click="copyUrl(card.graphic)" :label="copiedCardId === card.id ? t('graphicsCopied') : t('graphicsCopyUrl')"
@click="copyUrl(card.graphic, card.id)"
/> />
<QBtn <QBtn
color="secondary" color="secondary"
icon="open_with" icon="open_with"
:label="t('graphicsDragObs')" no-caps
draggable="true" draggable="true"
:label="t('graphicsDragObs')"
@dragstart="onDragStart($event, card.graphic)" @dragstart="onDragStart($event, card.graphic)"
/> />
<QBtn
color="grey-7"
icon="open_in_new"
no-caps
:label="t('graphicsOpenBrowser')"
@click="openUrl(card.graphic)"
/>
</div> </div>
</QCardSection> </QCardSection>
</QCard> </QCard>
File diff suppressed because it is too large Load Diff
+385 -52
View File
@@ -1,8 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, onBeforeUnmount, ref } from 'vue';
import { useHead } from '@unhead/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 type { Locale } from '../i18n';
import { locale, setLocale, t } from '../i18n'; import { locale, setLocale, t } from '../i18n';
import { usePlayersStore } from '../stores/players';
import { import {
eventToShortcut, eventToShortcut,
type ShortcutAction, type ShortcutAction,
@@ -11,6 +14,10 @@ import {
defineOptions({ name: 'SettingsView' }); defineOptions({ name: 'SettingsView' });
useHead(() => ({ title: t('settingsTitle') }));
// ─── Idioma ────────────────────────────────────────────────────────────────────
const languageOptions = computed(() => [ const languageOptions = computed(() => [
{ label: t('languageSpanish'), value: 'es' as const }, { label: t('languageSpanish'), value: 'es' as const },
{ label: t('languageEnglish'), value: 'en' as const }, { label: t('languageEnglish'), value: 'en' as const },
@@ -18,13 +25,14 @@ const languageOptions = computed(() => [
const selectedLanguage = computed<Locale>({ const selectedLanguage = computed<Locale>({
get: () => locale.value, get: () => locale.value,
set: (value) => { set: (value) => { setLocale(value); },
setLocale(value);
},
}); });
// ─── Atajos de teclado ─────────────────────────────────────────────────────────
const shortcutSettingsStore = useShortcutSettingsStore(); const shortcutSettingsStore = useShortcutSettingsStore();
const recordingAction = ref<ShortcutAction | null>(null); const recordingAction = ref<ShortcutAction | null>(null);
const shortcutsContainerRef = ref<HTMLElement | null>(null);
const shortcutFields = computed<{ action: ShortcutAction; label: string; hint: string }[]>(() => [ const shortcutFields = computed<{ action: ShortcutAction; label: string; hint: string }[]>(() => [
{ action: 'leftIncrement', label: t('settingsShortcutLeftIncrementLabel'), hint: t('settingsShortcutLeftIncrementHint') }, { 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') }, { 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 = () => { const stopRecording = () => {
recordingAction.value = null; recordingAction.value = null;
if (typeof document !== 'undefined') { if (typeof document !== 'undefined') {
@@ -41,91 +63,281 @@ const stopRecording = () => {
}; };
const onRecordKeydown = (event: KeyboardEvent) => { const onRecordKeydown = (event: KeyboardEvent) => {
if (!recordingAction.value) { if (!recordingAction.value) return;
return; if (event.key === 'Escape') { event.preventDefault(); stopRecording(); return; }
}
const shortcut = eventToShortcut(event); const shortcut = eventToShortcut(event);
if (!shortcut) { if (!shortcut) return;
return;
}
event.preventDefault(); event.preventDefault();
shortcutSettingsStore.setShortcut(recordingAction.value, shortcut); shortcutSettingsStore.setShortcut(recordingAction.value, shortcut);
stopRecording(); stopRecording();
}; };
const startRecording = (action: ShortcutAction) => { const onDocumentMousedown = (event: MouseEvent) => {
if (recordingAction.value === action) { if (recordingAction.value && shortcutsContainerRef.value && !shortcutsContainerRef.value.contains(event.target as Node)) {
stopRecording(); stopRecording();
return;
} }
};
const startRecording = (action: ShortcutAction) => {
if (recordingAction.value === action) { stopRecording(); return; }
recordingAction.value = action; recordingAction.value = action;
if (typeof document !== 'undefined') { if (typeof document !== 'undefined') document.body.dataset.shortcutRecording = 'true';
document.body.dataset.shortcutRecording = 'true';
}
}; };
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
window.addEventListener('keydown', onRecordKeydown); window.addEventListener('keydown', onRecordKeydown);
document.addEventListener('mousedown', onDocumentMousedown);
} }
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
window.removeEventListener('keydown', onRecordKeydown); window.removeEventListener('keydown', onRecordKeydown);
document.removeEventListener('mousedown', onDocumentMousedown);
} }
stopRecording(); 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> </script>
<template> <template>
<QPage class="q-pa-lg"> <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') }} {{ t('settingsTitle') }}
</div> </div>
<div class="text-body1 q-mb-lg"> <div class="text-body2 text-grey-7 q-mt-xs">
{{ t('settingsDescription') }} {{ t('settingsDescription') }}
</div> </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>
<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 <QSelect
v-model="selectedLanguage" v-model="selectedLanguage"
emit-value emit-value
map-options map-options
:label="t('settingsLanguageLabel')"
:options="languageOptions" :options="languageOptions"
:label="t('settingsLanguageLabel')"
outlined
dense
style="max-width: 280px"
/> />
<div class="text-caption text-grey-6 q-mt-sm">
<div class="text-caption text-grey-5 q-mt-sm">
{{ t('settingsLanguageHint') }} {{ t('settingsLanguageHint') }}
</div> </div>
</QCardSection> </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="column q-gutter-md">
<div class="row items-center justify-between q-mb-sm">
<div class="text-subtitle1"> <!-- 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') }} {{ t('settingsShortcutTitle') }}
</div> </div>
<QBtn <QBtn
round round dense flat color="primary" icon="restart_alt"
dense
flat
color="primary"
icon="restart_alt"
:aria-label="t('settingsShortcutReset')" :aria-label="t('settingsShortcutReset')"
@click="shortcutSettingsStore.resetShortcuts" @click="shortcutSettingsStore.resetShortcuts"
> >
@@ -133,40 +345,161 @@ useHead(() => ({ title: t('settingsTitle') }));
</QBtn> </QBtn>
</div> </div>
<div class="text-caption text-grey-5 q-mb-md"> <div class="text-caption text-grey-6 q-mb-lg">
{{ t('settingsShortcutDescription') }} {{ t('settingsShortcutDescription') }}
</div> </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 <QInput
v-for="field in shortcutFields" v-for="field in shortcutFields"
:key="field.action" :key="field.action"
:model-value="shortcutSettingsStore.shortcuts[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" :label="field.label"
> >
<template #append> <template #append>
<QBtn <QBtn
flat flat round dense
round
dense
:icon="recordingAction === field.action ? 'stop_circle' : 'keyboard'" :icon="recordingAction === field.action ? 'stop_circle' : 'keyboard'"
:color="recordingAction === field.action ? 'negative' : 'primary'" :color="recordingAction === field.action ? 'negative' : 'primary'"
:aria-label="recordingAction === field.action ? t('settingsShortcutStopRecording') : t('settingsShortcutStartRecording')"
@click="startRecording(field.action)" @click="startRecording(field.action)"
/> />
</template> <QBtn
<template #hint> flat round dense icon="restart_alt" color="grey-5"
{{ recordingAction === field.action ? t('settingsShortcutRecordingHint') : field.hint }} :aria-label="t('settingsShortcutResetSingle')"
@click="shortcutSettingsStore.resetShortcut(field.action)"
>
<QTooltip>{{ t('settingsShortcutResetSingle') }}</QTooltip>
</QBtn>
</template> </template>
</QInput> </QInput>
</div> </div>
</QCardSection> </QCardSection>
</QCard> </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> </QPage>
</template> </template>
<style scoped> <style scoped>
.settings-layout {
max-width: 680px;
}
.settings-card { .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> </style>
+254 -311
View File
@@ -1,6 +1,7 @@
import { createServer, type Server, type ServerResponse } from 'node:http';
import { randomUUID } from 'node:crypto';
import { nodecg } from './util/nodecg.js'; import { nodecg } from './util/nodecg.js';
import { createOAuthServer, type OAuthConfig } from './util/oauth-server.js';
// ─── Constantes ────────────────────────────────────────────────────────────────
const CHALLONGE_API_BASE = 'https://api.challonge.com/v2.1'; const CHALLONGE_API_BASE = 'https://api.challonge.com/v2.1';
const CHALLONGE_OAUTH_AUTHORIZE_ENDPOINT = 'https://api.challonge.com/oauth/authorize'; const CHALLONGE_OAUTH_AUTHORIZE_ENDPOINT = 'https://api.challonge.com/oauth/authorize';
@@ -17,21 +18,17 @@ const CHALLONGE_OAUTH_SCOPES = [
const CHALLONGE_OAUTH_CALLBACK_PATH = '/challonge/callback'; const CHALLONGE_OAUTH_CALLBACK_PATH = '/challonge/callback';
const CHALLONGE_OAUTH_DEFAULT_PORT = 34921; const CHALLONGE_OAUTH_DEFAULT_PORT = 34921;
const CHALLONGE_OAUTH_SESSION_TTL_MS = 10 * 60 * 1000; const CHALLONGE_OAUTH_SESSION_TTL_MS = 10 * 60 * 1000;
const RECENT_TOURNAMENTS_LIMIT = 20;
interface OAuthConfig { // ─── URL del proxy OAuth ───────────────────────────────────────────────────────
clientId: string; // Rellena esta constante con la URL de tu Cloudflare Worker tras el deploy.
clientSecret: string; // Formato: 'https://scoreko-oauth-proxy.TU-SUBDOMINIO.workers.dev'
callbackPort: number; //
} // 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 { // ─── Tipos ─────────────────────────────────────────────────────────────────────
sessionId: string;
state: string;
expiresAt: number;
status: 'pending' | 'completed' | 'error' | 'expired';
token?: string;
error?: string;
}
interface OAuthTokenResponse { interface OAuthTokenResponse {
access_token?: string; access_token?: string;
@@ -57,157 +54,154 @@ interface ImportedPlayer {
twitter: string; twitter: string;
} }
const oauthSessions = new Map<string, OAuthSession>(); // ─── Modo OAuth ────────────────────────────────────────────────────────────────
let oauthCallbackServer: Server | null = null; //
// 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 => { type OAuthMode =
if (typeof payload !== 'object' || payload === null || !(key in payload)) { | { type: 'dev'; clientId: string; clientSecret: string; callbackPort: number }
return ''; | { type: 'proxy'; proxyBaseUrl: string; callbackPort: number };
}
const value = (payload as Record<string, unknown>)[key]; const getOAuthMode = (): OAuthMode => {
return typeof value === 'string' ? value.trim() : String(value || '').trim(); const bundleConfig = nodecg.bundleConfig as Record<string, unknown>;
}; const clientId = String(bundleConfig.challongeClientId ?? '').trim();
const clientSecret = String(bundleConfig.challongeClientSecret ?? '').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 rawPort = Number(bundleConfig.challongeOAuthPort ?? CHALLONGE_OAUTH_DEFAULT_PORT); 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) { const proxyBaseUrl =
return null; 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 { nodecg.log.info(`[Challonge] OAuth: modo proxy → ${proxyBaseUrl}`);
clientId, return { type: 'proxy', proxyBaseUrl, callbackPort };
clientSecret,
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>) => { /** Modo dev: exchange directo con Challonge usando credenciales locales */
const session = oauthSessions.get(sessionId); const exchangeCodeDirectly = async (
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 (
code: string, code: string,
redirectUri: string, redirectUri: string,
oauthConfig: OAuthConfig, clientId: string,
clientSecret: string,
): Promise<string> => { ): Promise<string> => {
const params = new URLSearchParams({ const params = new URLSearchParams({
grant_type: 'authorization_code', grant_type: 'authorization_code',
code, code,
client_id: oauthConfig.clientId, client_id: clientId,
client_secret: oauthConfig.clientSecret, client_secret: clientSecret,
redirect_uri: redirectUri, redirect_uri: redirectUri,
}); });
const response = await fetch(CHALLONGE_OAUTH_TOKEN_ENDPOINT, { const response = await fetch(CHALLONGE_OAUTH_TOKEN_ENDPOINT, {
method: 'POST', method: 'POST',
headers: { headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
'Content-Type': 'application/x-www-form-urlencoded',
},
body: params.toString(), body: params.toString(),
}); });
const payload = await parseOAuthTokenPayload(response); const rawBody = await response.text();
let payload: OAuthTokenResponse;
if (!response.ok) { try {
throw new Error(payload.error_description || payload.error || payload.message || `OAuth token request failed (${response.status})`); 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) { 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; 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(); const rawBody = await response.text();
if (!rawBody) { let payload: { access_token?: string; error?: string };
return null; 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> => {
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 { try {
return JSON.parse(rawBody) as unknown; return JSON.parse(rawBody) as unknown;
} catch { } catch {
@@ -218,6 +212,7 @@ const parseJsonResponse = async (response: Response): Promise<unknown> => {
const requestChallonge = async (path: string, token: string): Promise<unknown> => { const requestChallonge = async (path: string, token: string): Promise<unknown> => {
const requestUrl = `${CHALLONGE_API_BASE}${path}`; const requestUrl = `${CHALLONGE_API_BASE}${path}`;
// ── Intento v2 (OAuth Bearer) ─────────────────────────────────────────────
const v2Response = await fetch(requestUrl, { const v2Response = await fetch(requestUrl, {
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@@ -226,14 +221,13 @@ const requestChallonge = async (path: string, token: string): Promise<unknown> =
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
}, },
}); });
const v2Payload = await parseJsonResponse(v2Response); const v2Payload = await parseJsonResponse(v2Response);
if (v2Response.ok) { if (v2Response.ok) {
return v2Payload; return v2Payload;
} }
// Fallback for personal API keys pasted manually (v1 auth style). // ── Fallback v1 (API key personal pegada manualmente) ─────────────────────
if (v2Response.status === 401) { if (v2Response.status === 401) {
const v1Response = await fetch(requestUrl, { const v1Response = await fetch(requestUrl, {
headers: { headers: {
@@ -243,46 +237,68 @@ const requestChallonge = async (path: string, token: string): Promise<unknown> =
Authorization: token, Authorization: token,
}, },
}); });
const v1Payload = await parseJsonResponse(v1Response); const v1Payload = await parseJsonResponse(v1Response);
if (v1Response.ok) { if (v1Response.ok) {
return v1Payload; return v1Payload;
} }
}
const maybeError = v2Payload as { errors?: { detail?: string }; error?: string } | null; const v1Error = v1Payload as ChallongeErrorPayload;
if (!v2Response.ok) {
throw new Error( 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 normalizeTournamentSlug = (value: string): string => {
const trimmed = value.trim(); const trimmed = value.trim();
if (!trimmed) { if (!trimmed) return '';
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 parseRecentTournaments = (payload: unknown): RecentTournament[] => {
const rows: RecentTournament[] = []; const rows: RecentTournament[] = [];
const push = (candidate: Record<string, unknown>) => { 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.attributes as Record<string, unknown>)
: candidate; : candidate;
const id = String(candidate.id || attributes.id || attributes.tournament_id || '').trim(); const id = String(candidate.id ?? attributes.id ?? attributes.tournament_id ?? '').trim();
const name = String(attributes.name || attributes.full_name || '').trim(); const name = String(attributes.name ?? attributes.full_name ?? '').trim();
const slug = normalizeTournamentSlug(String(attributes.url || attributes.slug || attributes.identifier || id)); const slug = normalizeTournamentSlug(
String(attributes.url ?? attributes.slug ?? attributes.identifier ?? id),
);
if (!id || !name || !slug) { if (!id || !name || !slug) return;
return;
}
rows.push({ rows.push({
id, id,
@@ -294,26 +310,25 @@ const parseRecentTournaments = (payload: unknown): RecentTournament[] => {
}; };
if (Array.isArray(payload)) { if (Array.isArray(payload)) {
payload.forEach((row) => { for (const row of payload) {
const wrapper = row as Record<string, unknown>; 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.tournament as Record<string, unknown>)
: wrapper; : wrapper;
push(tournament); push(tournament);
}); }
return rows; return rows;
} }
if (typeof payload === 'object' && payload !== null) { if (typeof payload === 'object' && payload !== null) {
const root = payload as Record<string, unknown>; const data = (payload as Record<string, unknown>).data;
const data = root.data;
if (Array.isArray(data)) { if (Array.isArray(data)) {
data.forEach((row) => { for (const row of data) {
if (typeof row === 'object' && row !== null) { if (typeof row === 'object' && row !== null) {
push(row as Record<string, unknown>); push(row as Record<string, unknown>);
} }
}); }
return rows;
} }
} }
@@ -324,201 +339,137 @@ const parseImportedPlayers = (payload: unknown): ImportedPlayer[] => {
const map = new Map<string, ImportedPlayer>(); const map = new Map<string, ImportedPlayer>();
const push = (candidate: Record<string, unknown>) => { 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.attributes as Record<string, unknown>)
: candidate; : candidate;
const id = String(candidate.id || attributes.id || attributes.participant_id || '').trim(); const id = String(
const gamertag = String( candidate.id ?? attributes.id ?? attributes.participant_id ?? '',
attributes.display_name
|| attributes.name
|| attributes.username
|| attributes.gamer_tag
|| '',
).trim(); ).trim();
if (!id || !gamertag) { const rawDisplayName = String(
return; 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, { map.set(id, {
id, id,
gamertag, gamertag,
name: gamertag, name: '',
team: String(attributes.group_player_ids || attributes.team_name || '').trim(), team,
country: '', country: '',
twitter: String(attributes.twitter_handle || attributes.twitter || '').trim(), twitter: String(attributes.twitter_handle ?? attributes.twitter ?? '').trim(),
}); });
}; };
if (Array.isArray(payload)) { if (Array.isArray(payload)) {
payload.forEach((row) => { for (const row of payload) {
const wrapper = row as Record<string, unknown>; 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.participant as Record<string, unknown>)
: wrapper; : wrapper;
push(participant); push(participant);
}); }
return Array.from(map.values()); return Array.from(map.values());
} }
if (typeof payload === 'object' && payload !== null) { if (typeof payload === 'object' && payload !== null) {
const root = payload as Record<string, unknown>; const data = (payload as Record<string, unknown>).data;
const data = root.data;
if (Array.isArray(data)) { if (Array.isArray(data)) {
data.forEach((row) => { for (const row of data) {
if (typeof row === 'object' && row !== null) { if (typeof row === 'object' && row !== null) {
push(row as Record<string, unknown>); push(row as Record<string, unknown>);
} }
}); }
} }
} }
return Array.from(map.values()); return Array.from(map.values());
}; };
const ensureOAuthCallbackServer = async (oauthConfig: OAuthConfig) => { // ─── Utilidades ────────────────────────────────────────────────────────────────
if (oauthCallbackServer) {
return;
}
const callbackUrl = getCallbackUrl(oauthConfig.callbackPort); const getStringProp = (payload: unknown, key: string): string => {
if (typeof payload !== 'object' || payload === null || !(key in payload)) return '';
const server = createServer((req, res) => { const value = (payload as Record<string, unknown>)[key];
if (!req.url) { return typeof value === 'string' ? value.trim() : String(value ?? '').trim();
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 sendAck = (ack: unknown, error: string | null, response?: unknown) => {
if (typeof ack === 'function') ack(error, response);
};
// ─── Listeners de NodeCG ───────────────────────────────────────────────────────
nodecg.listenFor('challonge:createOAuthSession', async (_payload: unknown, ack) => { nodecg.listenFor('challonge:createOAuthSession', async (_payload: unknown, ack) => {
const oauthConfig = getOAuthConfig(); const mode = getOAuthMode();
if (!oauthConfig) { let serverConfig: 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.');
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; return;
} }
}
try { try {
await ensureOAuthCallbackServer(oauthConfig); await oauthServer.ensureServer(serverConfig);
} catch (serverError) { } catch (err) {
const message = serverError instanceof Error ? serverError.message : 'Could not start the local OAuth callback'; sendAck(ack, err instanceof Error ? err.message : 'Could not start the OAuth callback server');
sendAck(ack, message);
return; return;
} }
cleanupExpiredOAuthSessions(); sendAck(ack, null, oauthServer.createSession(serverConfig));
const sessionId = randomUUID();
const state = randomUUID();
oauthSessions.set(sessionId, {
sessionId,
state,
expiresAt: Date.now() + CHALLONGE_OAUTH_SESSION_TTL_MS,
status: 'pending',
});
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) => { nodecg.listenFor('challonge:getOAuthSessionStatus', (payload: unknown, ack) => {
cleanupExpiredOAuthSessions();
const sessionId = getStringProp(payload, 'sessionId'); const sessionId = getStringProp(payload, 'sessionId');
if (!sessionId) { if (!sessionId) {
sendAck(ack, 'Missing OAuth session id'); sendAck(ack, 'Missing OAuth session id');
return; return;
} }
const session = oauthSessions.get(sessionId); const status = oauthServer.getSessionStatus(sessionId);
if (!session) { if (!status) {
sendAck(ack, 'OAuth session not found'); sendAck(ack, 'OAuth session not found');
return; return;
} }
sendAck(ack, null, { sendAck(ack, null, status);
status: session.status,
token: session.status === 'completed' ? session.token : undefined,
error: session.status === 'error' ? session.error : undefined,
});
}); });
nodecg.listenFor('challonge:fetchRecentTournaments', async (payload: unknown, ack) => { nodecg.listenFor('challonge:fetchRecentTournaments', async (payload: unknown, ack) => {
const token = getStringProp(payload, 'token'); const token = getStringProp(payload, 'token');
if (!token) { if (!token) {
sendAck(ack, 'Missing Challonge API token'); sendAck(ack, 'Missing Challonge API token');
return; return;
@@ -528,12 +479,10 @@ nodecg.listenFor('challonge:fetchRecentTournaments', async (payload: unknown, ac
const raw = await requestChallonge('/tournaments.json', token); const raw = await requestChallonge('/tournaments.json', token);
const tournaments = parseRecentTournaments(raw) const tournaments = parseRecentTournaments(raw)
.sort((a, b) => (b.startAt ?? 0) - (a.startAt ?? 0)) .sort((a, b) => (b.startAt ?? 0) - (a.startAt ?? 0))
.slice(0, 20); .slice(0, RECENT_TOURNAMENTS_LIMIT);
sendAck(ack, null, tournaments); sendAck(ack, null, tournaments);
} catch (error) { } catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while loading tournaments'; sendAck(ack, error instanceof Error ? error.message : 'Unknown error while loading tournaments');
sendAck(ack, message);
} }
}); });
@@ -541,22 +490,16 @@ nodecg.listenFor('challonge:fetchTournamentPlayers', async (payload: unknown, ac
const token = getStringProp(payload, 'token'); const token = getStringProp(payload, 'token');
const slug = normalizeTournamentSlug(getStringProp(payload, 'slug')); const slug = normalizeTournamentSlug(getStringProp(payload, 'slug'));
if (!token) { if (!token) { sendAck(ack, 'Missing Challonge API token'); return; }
sendAck(ack, 'Missing Challonge API token'); if (!slug) { sendAck(ack, 'Missing tournament slug'); return; }
return;
}
if (!slug) {
sendAck(ack, 'Missing tournament slug');
return;
}
try { try {
const raw = await requestChallonge(`/tournaments/${encodeURIComponent(slug)}/participants.json`, token); const raw = await requestChallonge(
const players = parseImportedPlayers(raw); `/tournaments/${encodeURIComponent(slug)}/participants.json`,
sendAck(ack, null, players); token,
);
sendAck(ack, null, parseImportedPlayers(raw));
} catch (error) { } catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while importing players'; sendAck(ack, error instanceof Error ? error.message : 'Unknown error while importing players');
sendAck(ack, message);
} }
}); });
+1
View File
@@ -11,4 +11,5 @@ export default async (nodecg: NodeCGServerAPI) => {
await import('./example.js'); await import('./example.js');
await import('./startgg.js'); await import('./startgg.js');
await import('./challonge.js'); await import('./challonge.js');
await import('./pack-manager.js');
}; };
+441
View File
@@ -0,0 +1,441 @@
// 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 './util/nodecg.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 ─────────────────────────────────────────────────────────────
interface PackCharacter {
name: string;
slug: string;
dlc?: boolean;
sizeBytes: number;
}
interface PackManifest {
id: string;
name: string;
version: string;
palette: { start: string; end: string };
defaultPair?: { left: string; right: string };
characters: PackCharacter[];
}
interface PackRegistry {
schemaVersion: number;
updatedAt: string;
packs: Array<{
id: string;
name: string;
version: string;
totalSizeBytes: number;
logoPath: string;
characterCount: number;
palette: { start: string; end: string };
bundled: boolean;
}>;
}
interface PackDownloadState {
status: 'idle' | 'fetching-manifest' | 'downloading' | 'done' | 'error';
progress: number;
error?: string;
}
// 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.
type HandledAcknowledgement = { handled: true };
type UnhandledAcknowledgement = ((error?: Error | null, ...args: unknown[]) => void) & { handled: false };
type Acknowledgement = HandledAcknowledgement | UnhandledAcknowledgement;
const reply = (ack: Acknowledgement | undefined, err: Error | null, result?: unknown): void => {
if (ack && !ack.handled) ack(err ?? undefined, result);
};
// ── 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 = nodecg.Replicant<string[]>('installedPacks', {
defaultValue: [],
persistent: true,
});
const packRegistryRep = nodecg.Replicant<PackRegistry | null>('packRegistry', {
defaultValue: null,
persistent: true,
});
const downloadStatesRep = nodecg.Replicant<Record<string, PackDownloadState>>('downloadStates', {
defaultValue: {},
persistent: false,
});
/** Packs instalados para los que hay una versión más nueva en el registro. */
const availableUpdatesRep = nodecg.Replicant<Record<string, { installedVersion: string; latestVersion: string }>>('availableUpdates', {
defaultValue: {},
persistent: false,
});
// ── 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 ────────────────────────────────────────────────
nodecg.listenFor('fetchPackRegistry', 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 ─────────────────────────────────────────────────────
nodecg.listenFor('downloadPack', 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 ────────────────────────────────────────────────────
nodecg.listenFor('uninstallPack', (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.
nodecg.listenFor('updatePack', 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 ────────────────────────────────────────────────
nodecg.listenFor('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}`));
}
});
+228 -321
View File
@@ -1,7 +1,8 @@
import { createServer, type Server, type ServerResponse } from 'node:http';
import { randomUUID } from 'node:crypto';
import { getData, type CountryRecord } from 'country-list'; import { getData, type CountryRecord } from 'country-list';
import { nodecg } from './util/nodecg.js'; import { nodecg } from './util/nodecg.js';
import { createOAuthServer, type OAuthConfig } from './util/oauth-server.js';
// ─── Constantes ────────────────────────────────────────────────────────────────
const STARTGG_ENDPOINT = 'https://api.start.gg/gql/alpha'; const STARTGG_ENDPOINT = 'https://api.start.gg/gql/alpha';
const STARTGG_OAUTH_AUTHORIZE_ENDPOINT = 'https://www.start.gg/api/-/rest/oauth/authorize'; const STARTGG_OAUTH_AUTHORIZE_ENDPOINT = 'https://www.start.gg/api/-/rest/oauth/authorize';
@@ -17,6 +18,16 @@ const STARTGG_OAUTH_SESSION_TTL_MS = 10 * 60 * 1000;
const RECENT_TOURNAMENTS_LIMIT = 12; const RECENT_TOURNAMENTS_LIMIT = 12;
const PARTICIPANTS_PAGE_SIZE = 120; 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> { interface StartGGGraphQLResponse<T> {
data?: T; data?: T;
errors?: Array<{ message?: string }>; errors?: Array<{ message?: string }>;
@@ -39,21 +50,6 @@ interface ImportedPlayer {
twitter: string; 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 { interface OAuthTokenResponse {
access_token?: string; access_token?: string;
error?: string; error?: string;
@@ -61,31 +57,162 @@ interface OAuthTokenResponse {
message?: string; message?: string;
} }
const oauthSessions = new Map<string, OAuthSession>(); // ─── Modo OAuth ────────────────────────────────────────────────────────────────
let oauthCallbackServer: Server | null = null; //
// 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 => { type OAuthMode =
if (typeof payload !== 'object' || payload === null || !(key in payload)) { | { type: 'dev'; clientId: string; clientSecret: string; callbackPort: number }
return ''; | { 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]; nodecg.log.info(`[start.gg] OAuth: modo proxy → ${proxyBaseUrl}`);
return typeof value === 'string' ? value.trim() : String(value || '').trim(); return { type: 'proxy', proxyBaseUrl, callbackPort };
}; };
const updateOAuthSession = (sessionId: string, update: Partial<OAuthSession>) => { // ─── Exchange de token ─────────────────────────────────────────────────────────
const session = oauthSessions.get(sessionId);
if (!session) {
return;
}
oauthSessions.set(sessionId, { const parseOAuthTokenPayload = async (response: Response): Promise<OAuthTokenResponse> => {
...session, const rawBody = await response.text();
...update, 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> => {
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, { const response = await fetch(STARTGG_ENDPOINT, {
method: 'POST', method: 'POST',
headers: { headers: {
@@ -107,7 +234,7 @@ const requestStartGG = async <T>(query: string, variables: Record<string, unknow
} }
if (payload.errors?.length) { 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) { if (!payload.data) {
@@ -117,286 +244,92 @@ const requestStartGG = async <T>(query: string, variables: Record<string, unknow
return payload.data; return payload.data;
}; };
// ─── Resolución de países ──────────────────────────────────────────────────────
const countries = getData(); const countries = getData();
const countryByCode = new Set(countries.map((country: CountryRecord) => country.code.toUpperCase())); const countryByCode = new Set(countries.map((c: CountryRecord) => c.code.toUpperCase()));
const countryByName = new Map(countries.map((country: CountryRecord) => [country.name.toLowerCase(), country.code.toUpperCase()])); const countryByName = new Map(
countries.map((c: CountryRecord) => [c.name.toLowerCase(), c.code.toUpperCase()]),
);
const resolveCountryCodeFromStartGG = (country: string | null | undefined): string => { const resolveCountryCodeFromStartGG = (country: string | null | undefined): string => {
const raw = (country || '').trim(); const raw = (country ?? '').trim();
if (!raw) { if (!raw) return '';
return '';
}
const upper = raw.toUpperCase(); const upper = raw.toUpperCase();
if (countryByCode.has(upper)) { if (countryByCode.has(upper)) return upper;
return upper;
}
return countryByName.get(raw.toLowerCase()) ?? ''; 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) => { const sendAck = (ack: unknown, error: string | null, response?: unknown) => {
if (typeof ack !== 'function') { if (typeof ack === 'function') ack(error, response);
return;
}
ack(error, response);
}; };
const getOAuthConfig = (): OAuthConfig | null => { // ─── Listeners de NodeCG ───────────────────────────────────────────────────────
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;
if (!clientId || !clientSecret) {
return null;
}
return {
clientId,
clientSecret,
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();
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) {
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) => { nodecg.listenFor('startgg:createOAuthSession', async (_payload: unknown, ack) => {
const oauthConfig = getOAuthConfig(); const mode = getOAuthMode();
if (!oauthConfig) { let serverConfig: 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.');
if (mode.type === 'dev') {
serverConfig = {
clientId: mode.clientId,
callbackPort: mode.callbackPort,
};
} 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 {
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; return;
} }
}
try { try {
await ensureOAuthCallbackServer(oauthConfig); await oauthServer.ensureServer(serverConfig);
} catch (serverError) { } catch (err) {
const message = serverError instanceof Error ? serverError.message : 'Could not start the local OAuth callback'; sendAck(ack, err instanceof Error ? err.message : 'Could not start the OAuth callback server');
sendAck(ack, message);
return; return;
} }
cleanupExpiredOAuthSessions(); sendAck(ack, null, oauthServer.createSession(serverConfig));
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, {
sessionId,
authUrl: `${STARTGG_OAUTH_AUTHORIZE_ENDPOINT}?${params.toString()}`,
});
}); });
nodecg.listenFor('startgg:getOAuthSessionStatus', (payload: unknown, ack) => { nodecg.listenFor('startgg:getOAuthSessionStatus', (payload: unknown, ack) => {
cleanupExpiredOAuthSessions();
const sessionId = getStringProp(payload, 'sessionId'); const sessionId = getStringProp(payload, 'sessionId');
if (!sessionId) { if (!sessionId) {
sendAck(ack, 'Missing OAuth session id'); sendAck(ack, 'Missing OAuth session id');
return; return;
} }
const session = oauthSessions.get(sessionId); const status = oauthServer.getSessionStatus(sessionId);
if (!session) { if (!status) {
sendAck(ack, 'OAuth session not found'); sendAck(ack, 'OAuth session not found');
return; return;
} }
sendAck(ack, null, { sendAck(ack, null, status);
status: session.status,
token: session.status === 'completed' ? session.token : undefined,
error: session.status === 'error' ? session.error : undefined,
});
}); });
nodecg.listenFor('startgg:fetchRecentTournaments', async (payload: unknown, ack) => { nodecg.listenFor('startgg:fetchRecentTournaments', async (payload: unknown, ack) => {
const token = getStringProp(payload, 'token'); const token = getStringProp(payload, 'token');
if (!token) { if (!token) {
sendAck(ack, 'Missing start.gg API token'); sendAck(ack, 'Missing start.gg API token');
return; return;
@@ -423,21 +356,15 @@ nodecg.listenFor('startgg:fetchRecentTournaments', async (payload: unknown, ack)
currentUser: { tournaments: { nodes: RecentTournament[] } } | null; currentUser: { tournaments: { nodes: RecentTournament[] } } | null;
}>(query, { perPage: RECENT_TOURNAMENTS_LIMIT }, token); }>(query, { perPage: RECENT_TOURNAMENTS_LIMIT }, token);
const tournaments = data.currentUser?.tournaments.nodes const tournaments =
data.currentUser?.tournaments.nodes
.filter((item) => item.slug) .filter((item) => item.slug)
.sort((a, b) => (b.startAt ?? 0) - (a.startAt ?? 0)) .sort((a, b) => (b.startAt ?? 0) - (a.startAt ?? 0))
.map((item) => ({ .map(({ id, name, slug, startAt, endAt }) => ({ id, name, slug, startAt, endAt })) ?? [];
id: item.id,
name: item.name,
slug: item.slug,
startAt: item.startAt,
endAt: item.endAt,
})) ?? [];
sendAck(ack, null, tournaments); sendAck(ack, null, tournaments);
} catch (error) { } catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while loading tournaments'; sendAck(ack, error instanceof Error ? error.message : 'Unknown error while loading tournaments');
sendAck(ack, message);
} }
}); });
@@ -445,15 +372,8 @@ nodecg.listenFor('startgg:fetchTournamentPlayers', async (payload: unknown, ack)
const token = getStringProp(payload, 'token'); const token = getStringProp(payload, 'token');
const slug = getStringProp(payload, 'slug'); const slug = getStringProp(payload, 'slug');
if (!token) { if (!token) { sendAck(ack, 'Missing start.gg API token'); return; }
sendAck(ack, 'Missing start.gg API token'); if (!slug) { sendAck(ack, 'Missing tournament slug'); return; }
return;
}
if (!slug) {
sendAck(ack, 'Missing tournament slug');
return;
}
const query = ` const query = `
query TournamentParticipants($slug: String!, $page: Int!, $perPage: Int!) { query TournamentParticipants($slug: String!, $page: Int!, $perPage: Int!) {
@@ -491,50 +411,37 @@ nodecg.listenFor('startgg:fetchTournamentPlayers', async (payload: unknown, ack)
id: number; id: number;
gamerTag: string | null; gamerTag: string | null;
prefix: string | null; prefix: string | null;
user: { user: { location: { country: string | null } | null } | null;
location: {
country: string | null;
} | null;
} | null;
}>; }>;
}; };
} | null; } | null;
}>(query, { }>(query, { slug, page: currentPage, perPage: PARTICIPANTS_PAGE_SIZE }, token);
slug,
page: currentPage,
perPage: PARTICIPANTS_PAGE_SIZE,
}, token);
if (!data.tournament) { if (!data.tournament) throw new Error('Tournament not found');
throw new Error('Tournament not found');
}
const apiTotalPages = Number(data.tournament.participants.pageInfo.totalPages); const apiTotalPages = Number(data.tournament.participants.pageInfo.totalPages);
totalPages = Number.isFinite(apiTotalPages) ? Math.max(apiTotalPages, 1) : 1; 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 playerId = String(participant.id);
const gamertag = (participant.gamerTag || '').trim(); const gamertag = (participant.gamerTag ?? '').trim();
if (!gamertag) { if (!gamertag) continue;
return;
}
const country = resolveCountryCodeFromStartGG(participant.user?.location?.country);
playersMap.set(playerId, { playersMap.set(playerId, {
id: playerId, id: playerId,
gamertag, gamertag,
name: gamertag, name: gamertag,
team: (participant.prefix || '').trim(), team: (participant.prefix ?? '').trim(),
country, country: resolveCountryCodeFromStartGG(participant.user?.location?.country),
twitter: '', twitter: '',
}); });
}); }
currentPage += 1; currentPage += 1;
} }
sendAck(ack, null, Array.from(playersMap.values())); sendAck(ack, null, Array.from(playersMap.values()));
} catch (error) { } catch (error) {
const message = error instanceof Error ? error.message : 'Unknown error while importing players'; sendAck(ack, error instanceof Error ? error.message : 'Unknown error while importing players');
sendAck(ack, message);
} }
}); });
+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 };
};
Binary file not shown.

After

Width:  |  Height:  |  Size: 448 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 435 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 300 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 594 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 493 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 679 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 480 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 828 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 515 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 605 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 402 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 776 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 368 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 515 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 416 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 716 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 804 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

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