diff --git a/.gitignore b/.gitignore index ac351eb..6bd6fe3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules/ .test-state/ test-results/ +src/Compagnon/Web/ diff --git a/README.md b/README.md index d708a89..9ebe4fa 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ contexte ; une session disparue est signalée sans basculer sur une autre lectur Version testée : **Jellyfin Server 12.0.0**, Linux x64. Les autres versions ne sont pas déclarées compatibles. -1. Télécharger [le paquet 0.6.0](dist/compagnon-0.6.0-jellyfin-12.0.0.zip) - et sa [somme SHA-256](dist/compagnon-0.6.0-jellyfin-12.0.0.zip.sha256). +1. Télécharger [le paquet 0.7.0](dist/compagnon-0.7.0-jellyfin-12.0.0.zip) + et sa [somme SHA-256](dist/compagnon-0.7.0-jellyfin-12.0.0.zip.sha256). 2. Arrêter Jellyfin. Extraire le dossier `Compagnon` de l'archive dans le dossier `plugins` de ses données. Avec l'image Docker officielle et son volume `/config`, le résultat est `/config/plugins/Compagnon/Compagnon.dll`. @@ -102,12 +102,20 @@ nécessaires à Chromium/Playwright. Aucun de ces outils n'est requis pour insta le paquet fourni. ```sh -bash scripts/package.sh # compilation C# avec avertissements bloquants et archive +bash scripts/package.sh # construit l'interface (npm ci, Vite), compile C# avec avertissements bloquants et archive npm ci -npm run typecheck # JavaScript vérifié par TypeScript +npm run typecheck # sources TypeScript et Vue vérifiées par vue-tsc +npm run test:unit # modules purs de l'interface, testés avec node:test bash tests/run.sh # serveur jetable, installation du paquet et tests réels ``` +L'interface vit dans `web/` (Vue 3, Vite, TypeScript) ; `src/Compagnon/Web/` +est un dossier généré, ignoré par Git et embarqué dans le DLL sous des noms +fixes. Pour itérer sans empaqueter, `JELLYFIN_URL=http://127.0.0.1:8096 npm run dev` +sert l'interface sur `http://127.0.0.1:5173/` et relaie l'API à ce serveur +Jellyfin. La logique pure (estimation de position, historique, chevauchement de +l'aide, lecture des pistes) est dans `web/src/lib/` et testée sans navigateur. + `tests/run.sh` utilise un port local libre et supprime son propre conteneur en sortie. Il crée deux comptes ordinaires, un compte administrateur de préparation et une vidéo originale de deux minutes avec timecode, et active Quick Connect sur @@ -125,6 +133,8 @@ Le [rapport du lot #7](docs/validation/issue-7.md) consolide versions, protocole résultats et limites de la connexion par Quick Connect, de sa conservation entre les visites et de la déconnexion ; le détail ticket par ticket (#8 à #12) figure dans le [rapport du lot #8](docs/validation/issue-8.md). +Le [rapport de la réécriture de l'interface](docs/validation/issue-14.md) décrit +la migration Vue 3 + Vite et la parité prouvée par la suite existante. Pour relancer un seul scénario pendant le développement sur cette instance : diff --git a/dist/compagnon-0.7.0-jellyfin-12.0.0.zip b/dist/compagnon-0.7.0-jellyfin-12.0.0.zip new file mode 100644 index 0000000..999e0e5 Binary files /dev/null and b/dist/compagnon-0.7.0-jellyfin-12.0.0.zip differ diff --git a/dist/compagnon-0.7.0-jellyfin-12.0.0.zip.sha256 b/dist/compagnon-0.7.0-jellyfin-12.0.0.zip.sha256 new file mode 100644 index 0000000..d469f31 --- /dev/null +++ b/dist/compagnon-0.7.0-jellyfin-12.0.0.zip.sha256 @@ -0,0 +1 @@ +d7f980d9bb3d5c510986c0da03af1c4f8b90918b1a8988071f5556d8c58b5ac7 compagnon-0.7.0-jellyfin-12.0.0.zip diff --git a/docs/adr/0003-construire-l-interface-avec-vue-et-vite.md b/docs/adr/0003-construire-l-interface-avec-vue-et-vite.md new file mode 100644 index 0000000..94523db --- /dev/null +++ b/docs/adr/0003-construire-l-interface-avec-vue-et-vite.md @@ -0,0 +1,16 @@ +# Construire l'interface du compagnon avec Vue 3 et Vite + +L'interface actuelle (`Web/app.js`, ~600 lignes de manipulation directe du DOM) mêle l'estimation de position, la machine à états et le rendu, ce qui la rend difficile à faire évoluer, et son habillage date. Nous la réécrivons en Vue 3 (composants monofichiers à gabarits précompilés) assemblée par Vite en amont, en TypeScript, avec la logique délicate extraite dans des modules purs testés unitairement. La migration se fait en un seul lot et doit laisser le comportement et la structure observée par la suite de tests de bout en bout strictement inchangés ; la refonte visuelle viendra ensuite. L'ensemble reste embarqué dans le DLL sous des noms de fichiers fixes, sans CDN ni service externe, et compatible avec la CSP `script-src 'self'` : les gabarits sont donc compilés à la construction, jamais évalués à l'exécution. + +## Options considérées + +- **Svelte 5** : sortie plus petite et compilée, mais écosystème et outillage moins familiers ici ; la taille du bundle est sans enjeu sur un réseau local. +- **React / Preact** : aucun bénéfice pour une page unique, au prix d'un runtime plus lourd. +- **Gabarits Vue compilés au chargement** : exigent `unsafe-eval`, incompatible avec la CSP du plugin. +- **Migration progressive** : deux systèmes se partageraient le DOM d'une page unique ; la colle temporaire coûterait plus cher que la réécriture. +- **vue-router et Pinia** : refusés — une seule page sans navigation, un seul état partagé qui tient dans un module réactif. + +## Conséquences + +- Les sources de l'interface vivent dans `web/` (composants, magasin réactif et modules purs) ; `scripts/package.sh` exécute leur construction (`npm ci && npm run build`) avant la compilation C#, et `src/Compagnon/Web/` devient un dossier généré, ignoré par Git. +- `npm run typecheck` s'appuie désormais sur `vue-tsc` ; les modules purs sont couverts par des tests unitaires `node:test`. diff --git a/docs/validation/issue-14.md b/docs/validation/issue-14.md new file mode 100644 index 0000000..2603dc6 --- /dev/null +++ b/docs/validation/issue-14.md @@ -0,0 +1,74 @@ +# Validation de la réécriture de l'interface — Vue 3 + Vite + +## Protocole + +Paquet **0.7.0**, Jellyfin Server **12.0.0** (image figée dans `tests/run.sh`), +Jellyfin Web de cette image, Chromium **149.0.7827.55**, Playwright **1.61.1**, +Node.js **24.18.0**, Vue **3.5.24**, Vite **7.3.6**, TypeScript **5.9.3**. +Compagnon de **375 × 812 pixels**, hébergement sans préfixe puis suite complète +sous `/jellyfin`. + +```sh +npm run typecheck +npm run test:unit +bash tests/run.sh +``` + +Aucun test de la suite existante n'a été modifié : `history`, `bilingual`, +`quick-connect`, `recovery` et `installed` sont ceux du dépôt, seule la +référence à l'archive dans `tests/run.sh` suit la version 0.7.0. + +## Architecture livrée + +L'interface vit dans `web/` : composants monofichiers Vue assemblés par Vite, +écrits en TypeScript, sans router ni Pinia. La logique délicate est extraite +dans `web/src/lib/` — estimation de position, fraîcheur des observations, +sélection de l'historique, chevauchement de l'aide, validation et nettoyage des +pistes, lecture de la connexion conservée — et testée sans navigateur par +`node:test` avec des horloges injectées. Le magasin réactif (`web/src/store.ts`) +reste une transposition des flux de l'ancien `app.js` : mêmes gardes de +génération, mêmes bornes, mêmes messages. + +La construction produit des noms fixes (`index.html`, `app.js`, `style.css`) +dans `src/Compagnon/Web/`, dossier généré et ignoré par Git, embarqué tel quel +dans le DLL. `scripts/package.sh` construit l'interface puis compile C#. +L'index généré ne contient aucun script en ligne, compatible avec la CSP +`script-src 'self'` du contrôleur. Le bundle pèse 75,85 kB (29,65 kB compressés). + +## Résultats + +Exécution complète du **18 septembre 2026** : + +| Vérification | Résultat | +| --- | --- | +| `npm run typecheck` (`vue-tsc`) | 0 erreur | +| `npm run test:unit` | **21 tests sur 21** | +| `npm audit` | 0 vulnérabilité | +| Compilation C# Release | 0 erreur, 0 avertissement | +| `bash tests/run.sh` | **34 tests sur 34**, 131,4 s | + +Les contrôles installés passent avec et sans préfixe `/jellyfin`. La parité DOM +est vérifiée par la suite existante : identifiants et classes (`#status`, +`#details`, `#history .main-block`, `.help-block`, `#sessions`, `#tracks`, +`#help-tracks`), libellés accessibles, focus après approbation, à l'expiration +d'un code et à la déconnexion, options de pistes identiques entre les deux +sélecteurs. + +Les mesures de synchronisation contre le timecode incrusté restent dans les +objectifs : écart maximal **330 ms** en lecture stable à 1× (seuil 500 ms) et +recalage après déplacement de **789 ms** (seuil deux secondes), soit +`stablePass` et `seekPass` vrais. Les extractions SRT, WebVTT et ASS restent du +même ordre que le lot #5. + +## Limites + +- Aucun changement visuel : la refonte demandée reste un lot séparé (#15). Vite + minifie la feuille servie (748 octets au lieu de 907), règles identiques. +- La suite de tests de navigateur sert les fichiers générés depuis + `src/Compagnon/Web/` : exécuter un test sans `npm run build` préalable sert un + dossier vide. +- Le bundle d'interface est plus lourd que le script écrit à la main (75,85 kB + contre 26,9 kB) ; il est mis en cache par le navigateur et la page reste + publique, sans donnée supplémentaire exposée. +- Les navigateurs antérieurs à `AbortSignal.any` restent hors périmètre, comme + avant la réécriture. diff --git a/package-lock.json b/package-lock.json index b715ba8..0194182 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,531 @@ "name": "subtitle-compagnion", "devDependencies": { "@playwright/test": "1.61.1", - "typescript": "5.9.3" + "@types/node": "24.10.1", + "@vitejs/plugin-vue": "6.0.1", + "typescript": "5.9.3", + "vite": "7.3.6", + "vue": "3.5.24", + "vue-tsc": "3.1.4" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz", + "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.29.8" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/types": { + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz", + "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz", + "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz", + "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz", + "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz", + "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz", + "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz", + "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz", + "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz", + "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz", + "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz", + "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz", + "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz", + "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz", + "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz", + "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz", + "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz", + "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz", + "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz", + "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz", + "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz", + "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz", + "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz", + "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz", + "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz", + "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz", + "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz", + "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", + "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@napi-rs/lzma-linux-x64-gnu": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", + "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^22.20 || ^24.12 || >=25" } }, "node_modules/@playwright/test": { @@ -26,6 +550,692 @@ "node": ">=18" } }, + "node_modules/@rolldown/pluginutils": { + "version": "1.0.0-beta.29", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.29.tgz", + "integrity": "sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.63.3.tgz", + "integrity": "sha512-w3Jnvi1ocaVm/c7yVPpfB98XeSRBMyzp6njL5MVVbGyXjpmUkN+s6Hp4t0PqhGCCaI1ZHMKXt/w0lA1RCaLVcw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.63.3.tgz", + "integrity": "sha512-uI/ESiaIbbRYAEhzy8PCUWDp1hB0bjAqM06mW9flOoNO4Q8DQpeoREhBR5Hegfl+wpXiguyJv6XSPzEN7OxyHQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.63.3.tgz", + "integrity": "sha512-oxhrd1jmXLwWZ83eQYDXxuqRdkqkzrjR3JobKeuUyfdNZo11FuQIvqEOZhyIT7OBHxXoGslDDjN0cQcM6T0TqQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.63.3.tgz", + "integrity": "sha512-7/YiIMghVE8DrxKvNdorAaJVdriOFgOIpdStnPx8ppx5zfTwC3jBCSEAIzB7JD5404m65THl6H93UTTVUvypmg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.63.3.tgz", + "integrity": "sha512-GXFZRRoMAytaI5z6N3Zhfw0WL18Q0M8r95D5hlC4GqE/lGk8pbSJNUBoOWDfbm6dTciqHj2nU87tI5f6XhQiOg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.63.3.tgz", + "integrity": "sha512-77W+8X3ddYgPxUpB8nZFQs2Mq+wc4HVlcSRtApXLjYBcnPMkttrSnU8VwKQjeWYhMsITHFs5cWBQ8vz1Q+5RHQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.63.3.tgz", + "integrity": "sha512-FVkwK+iUC+mq+GipVK46rRVticfAPtvPUNlqlGXUDxdVk/UGjQiiiUVPUrEXdSpU2ufU0XxLGyTqDtBidDOVmg==", + "cpu": [ + "arm" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.63.3.tgz", + "integrity": "sha512-+aGU1t3398yQOVj1Bz8o3e+KtswxAPvO+mtxtNdfXYMkXIHu7XhhkCD7/DEH9q8tF8uhDnMWvfpUKI8y1sZJsg==", + "cpu": [ + "arm" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.63.3.tgz", + "integrity": "sha512-cR0kjpRXR2KJ2oQK8E2KTPtphs+b9hZ8IhTZubNryt/RsqgdOZBQ2Zq0q5UedtiIi0rs3jVhJh55RE1ZHUVGUA==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.63.3.tgz", + "integrity": "sha512-y1RYi4Q3/9ByVWSSt9kX2ustE0B7kFYbJ6zZdVZVyqopZs3yhCTwRfrjIX4vezUJInma/Gs6BOFDJg7yZmJ0IQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.63.3.tgz", + "integrity": "sha512-DNhEA5viIj3Z5bZLE4z4oV8N5ozWqDwyt7T6KG7VdLDJ0nW+rNOYlphBl4/3HQkK75qipPLsVOfStHHOwN9WSg==", + "cpu": [ + "loong64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.63.3.tgz", + "integrity": "sha512-17gQCqrIpXBX2Cmi9/TygnVOqGbzsba/iaqcYSL8FY7lNugg+7AiYNs5c5nKWD+NRQha36Sa0CqkJqH4XVHwnQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.63.3.tgz", + "integrity": "sha512-6LwVnZRIyINpdku/yOcI8Tm9YqLmhHK5emmlOOnW9tO0SYEm1FmKPcsSAGp0NBlqR2P04xaND4jvN6sTHqhq8A==", + "cpu": [ + "ppc64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.63.3.tgz", + "integrity": "sha512-xMUqkTXlEUtI/p5AAukMwBRr1enU3efsTeF+bskeFfk8t1C9rcC8sLREcZXmTfAXEbvRdJVSonVJez3TMlbR3w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.63.3.tgz", + "integrity": "sha512-S3E94co9F9WRRqEaUoQZ38K1gCz6KiM+nL7/3ijq7fDGF3OznjS5TasgYITlvl27GQKtu4lOAOsr5MFwkijvOA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.63.3.tgz", + "integrity": "sha512-1QtRDwG42x5BJI3s9mxu5rEjDnfbSnk20HQ9/ylTAYnSwYwxMVb+Vgu34wzzTQ7ogqBybebgQNUDAvZVQ38DbA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.63.3.tgz", + "integrity": "sha512-BQhejF6ZXOpxbngiNTP12GCGQeaDVL2QXGeBVViKIYzFHM5RKxTxwUMB1fr1BeNFphFMpnRqC5QSXFSa4z6UQw==", + "cpu": [ + "s390x" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.63.3.tgz", + "integrity": "sha512-SXagRwnI2Wlwlitllu59UK/nGVbD1CKPcNqDplHwIC4BqJcpXFjD32d1R/RbuISa95HdQrZM3/7v4bKiowFaLA==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.63.3.tgz", + "integrity": "sha512-2IPozoEALRCziGqE8O9KMK60PMu5TS1huv4fwoeCexj+WjmcwFtX9CTOVbfXCUqcELAubEwRFPYlzb/WvwY2HQ==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.63.3.tgz", + "integrity": "sha512-AoxqosUHT9IX54hFn2TiN6A7d6ZKTtE6pd2bqWtqkkNJ6HJGaU6FRouGX8L1O7R/ZwsnCnpQrHzb4pDEx+UHRQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.63.3.tgz", + "integrity": "sha512-d+CaftKgmkFBzCwezMqqy1d0QNNYugqLCMcYVQWBy5SS2YfeMP8Q8ripkgx9O8IyBXXLHrJ+aaCV4U96usv6Yg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.63.3.tgz", + "integrity": "sha512-xXlDF6nR1eOuXbdDy5Hl5fmtY7teUDevF/k0O7IPoZe4Tpmdv+lgdE5JRsnhQtt37ql9P0VF2kAN9a0OCZdo+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.63.3.tgz", + "integrity": "sha512-YtXAgLN+JP7Ay6qG3eWhc7IHMQPzLc8r3uvhAvlJIoCz/4Q32+Bl9Fmnywidh8v1GOIMmymjovfqY9ETAtysvA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.63.3.tgz", + "integrity": "sha512-WuWtSJRNo549vzcfZyEgfqb6zeSgn1F+UE5kQ+BCjzz0W4MGCjntUHkZVc1VRuAM7+ULaSyhiPxD1spyewFvkQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.63.3.tgz", + "integrity": "sha512-+lIKX7O0+IGe7WuhATaAMMeT7B76vfhXH/l9wLQL+nvyhbw2ohYCKIdWL56JfDu75CWt5oKRP4QFH/jkMtBquA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@types/estree": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "24.10.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz", + "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.16.0" + } + }, + "node_modules/@vitejs/plugin-vue": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.1.tgz", + "integrity": "sha512-+MaE752hU0wfPFJEUAIxqw18+20euHHdxVtMvbFcOEpjEyfqXH/5DCoTHiVJ0J29EhTJdoTkjEv5YBKU9dnoTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rolldown/pluginutils": "1.0.0-beta.29" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "peerDependencies": { + "vite": "^5.0.0 || ^6.0.0 || ^7.0.0", + "vue": "^3.2.25" + } + }, + "node_modules/@volar/language-core": { + "version": "2.4.23", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.23.tgz", + "integrity": "sha512-hEEd5ET/oSmBC6pi1j6NaNYRWoAiDhINbT8rmwtINugR39loROSlufGdYMF9TaKGfz+ViGs1Idi3mAhnuPcoGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/source-map": "2.4.23" + } + }, + "node_modules/@volar/source-map": { + "version": "2.4.23", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.23.tgz", + "integrity": "sha512-Z1Uc8IB57Lm6k7q6KIDu/p+JWtf3xsXJqAX/5r18hYOTpJyBn0KXUR8oTJ4WFYOcDzWC9n3IflGgHowx6U6z9Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@volar/typescript": { + "version": "2.4.23", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.23.tgz", + "integrity": "sha512-lAB5zJghWxVPqfcStmAP1ZqQacMpe90UrP5RJ3arDyrhy4aCUQqmxPPLB2PWDKugvylmO41ljK7vZ+t6INMTag==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.23", + "path-browserify": "^1.0.1", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/@vue/compiler-core": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz", + "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.28.5", + "@vue/shared": "3.5.24", + "entities": "^4.5.0", + "estree-walker": "^2.0.2", + "source-map-js": "^1.2.1" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz", + "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vue/compiler-core": "3.5.24", + "@vue/shared": "3.5.24" + } + }, + "node_modules/@vue/compiler-sfc": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz", + "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.28.5", + "@vue/compiler-core": "3.5.24", + "@vue/compiler-dom": "3.5.24", + "@vue/compiler-ssr": "3.5.24", + "@vue/shared": "3.5.24", + "estree-walker": "^2.0.2", + "magic-string": "^0.30.21", + "postcss": "^8.5.6", + "source-map-js": "^1.2.1" + } + }, + "node_modules/@vue/compiler-ssr": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz", + "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vue/compiler-dom": "3.5.24", + "@vue/shared": "3.5.24" + } + }, + "node_modules/@vue/language-core": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.1.4.tgz", + "integrity": "sha512-n/58wm8SkmoxMWkUNUH/PwoovWe4hmdyPJU2ouldr3EPi1MLoS7iDN46je8CsP95SnVBs2axInzRglPNKvqMcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.23", + "@vue/compiler-dom": "^3.5.0", + "@vue/shared": "^3.5.0", + "alien-signals": "^3.0.0", + "muggle-string": "^0.4.1", + "path-browserify": "^1.0.1", + "picomatch": "^4.0.2" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/reactivity": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz", + "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vue/shared": "3.5.24" + } + }, + "node_modules/@vue/runtime-core": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz", + "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vue/reactivity": "3.5.24", + "@vue/shared": "3.5.24" + } + }, + "node_modules/@vue/runtime-dom": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz", + "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vue/reactivity": "3.5.24", + "@vue/runtime-core": "3.5.24", + "@vue/shared": "3.5.24", + "csstype": "^3.1.3" + } + }, + "node_modules/@vue/server-renderer": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz", + "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vue/compiler-ssr": "3.5.24", + "@vue/shared": "3.5.24" + }, + "peerDependencies": { + "vue": "3.5.24" + } + }, + "node_modules/@vue/shared": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz", + "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==", + "dev": true, + "license": "MIT" + }, + "node_modules/alien-signals": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.2.1.tgz", + "integrity": "sha512-I8FjmltrfnDFoZedi5CG8DghVYNhzb/Ijluz7tCSJH0xpd0484Kowhbb1XDYOxfJpU1p5wnM2X54dA+IfGyD1g==", + "dev": true, + "license": "MIT" + }, + "node_modules/csstype": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/esbuild": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz", + "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.28.2", + "@esbuild/android-arm": "0.28.2", + "@esbuild/android-arm64": "0.28.2", + "@esbuild/android-x64": "0.28.2", + "@esbuild/darwin-arm64": "0.28.2", + "@esbuild/darwin-x64": "0.28.2", + "@esbuild/freebsd-arm64": "0.28.2", + "@esbuild/freebsd-x64": "0.28.2", + "@esbuild/linux-arm": "0.28.2", + "@esbuild/linux-arm64": "0.28.2", + "@esbuild/linux-ia32": "0.28.2", + "@esbuild/linux-loong64": "0.28.2", + "@esbuild/linux-mips64el": "0.28.2", + "@esbuild/linux-ppc64": "0.28.2", + "@esbuild/linux-riscv64": "0.28.2", + "@esbuild/linux-s390x": "0.28.2", + "@esbuild/linux-x64": "0.28.2", + "@esbuild/netbsd-arm64": "0.28.2", + "@esbuild/netbsd-x64": "0.28.2", + "@esbuild/openbsd-arm64": "0.28.2", + "@esbuild/openbsd-x64": "0.28.2", + "@esbuild/openharmony-arm64": "0.28.2", + "@esbuild/sunos-x64": "0.28.2", + "@esbuild/win32-arm64": "0.28.2", + "@esbuild/win32-ia32": "0.28.2", + "@esbuild/win32-x64": "0.28.2" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -41,6 +1251,69 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, + "node_modules/muggle-string": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz", + "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", + "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "dev": true, + "license": "MIT" + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/playwright": { "version": "1.61.1", "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.1.tgz", @@ -73,6 +1346,108 @@ "node": ">=18" } }, + "node_modules/postcss": { + "version": "8.5.28", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", + "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.18", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/rollup": { + "version": "4.63.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.63.3.tgz", + "integrity": "sha512-1i2XreiAoMMXuPGD6Msj2xWrMMkHojNRKivInxGQcg7/1KuPuYlfUutLyh4drnOxUTHX9cHI4wFoat8D/NKaBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.9" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@napi-rs/lzma-linux-x64-gnu": "1.5.1", + "@rollup/rollup-android-arm-eabi": "4.63.3", + "@rollup/rollup-android-arm64": "4.63.3", + "@rollup/rollup-darwin-arm64": "4.63.3", + "@rollup/rollup-darwin-x64": "4.63.3", + "@rollup/rollup-freebsd-arm64": "4.63.3", + "@rollup/rollup-freebsd-x64": "4.63.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.63.3", + "@rollup/rollup-linux-arm-musleabihf": "4.63.3", + "@rollup/rollup-linux-arm64-gnu": "4.63.3", + "@rollup/rollup-linux-arm64-musl": "4.63.3", + "@rollup/rollup-linux-loong64-gnu": "4.63.3", + "@rollup/rollup-linux-loong64-musl": "4.63.3", + "@rollup/rollup-linux-ppc64-gnu": "4.63.3", + "@rollup/rollup-linux-ppc64-musl": "4.63.3", + "@rollup/rollup-linux-riscv64-gnu": "4.63.3", + "@rollup/rollup-linux-riscv64-musl": "4.63.3", + "@rollup/rollup-linux-s390x-gnu": "4.63.3", + "@rollup/rollup-linux-x64-gnu": "4.63.3", + "@rollup/rollup-linux-x64-musl": "4.63.3", + "@rollup/rollup-openbsd-x64": "4.63.3", + "@rollup/rollup-openharmony-arm64": "4.63.3", + "@rollup/rollup-win32-arm64-msvc": "4.63.3", + "@rollup/rollup-win32-ia32-msvc": "4.63.3", + "@rollup/rollup-win32-x64-gnu": "4.63.3", + "@rollup/rollup-win32-x64-msvc": "4.63.3", + "fsevents": "~2.3.2" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, "node_modules/typescript": { "version": "5.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", @@ -86,6 +1461,149 @@ "engines": { "node": ">=14.17" } + }, + "node_modules/undici-types": { + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "dev": true, + "license": "MIT" + }, + "node_modules/vite": { + "version": "7.3.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz", + "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.27.0 || ^0.28.0", + "fdir": "^6.5.0", + "picomatch": "^4.0.3", + "postcss": "^8.5.6", + "rollup": "^4.43.0", + "tinyglobby": "^0.2.15" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^20.19.0 || >=22.12.0", + "jiti": ">=1.21.0", + "less": "^4.0.0", + "lightningcss": "^1.21.0", + "sass": "^1.70.0", + "sass-embedded": "^1.70.0", + "stylus": ">=0.54.8", + "sugarss": "^5.0.0", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/vite/node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/vscode-uri": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.2.0.tgz", + "integrity": "sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vue": { + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz", + "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vue/compiler-dom": "3.5.24", + "@vue/compiler-sfc": "3.5.24", + "@vue/runtime-dom": "3.5.24", + "@vue/server-renderer": "3.5.24", + "@vue/shared": "3.5.24" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/vue-tsc": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.1.4.tgz", + "integrity": "sha512-GsRJxttj4WkmXW/zDwYPGMJAN3np/4jTzoDFQTpTsI5Vg/JKMWamBwamlmLihgSVHO66y9P7GX+uoliYxeI4Hw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/typescript": "2.4.23", + "@vue/language-core": "3.1.4" + }, + "bin": { + "vue-tsc": "bin/vue-tsc.js" + }, + "peerDependencies": { + "typescript": ">=5.0.0" + } } } } diff --git a/package.json b/package.json index a09838f..1f4dd8f 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,19 @@ "private": true, "type": "module", "scripts": { - "typecheck": "tsc --allowJs --checkJs --noEmit --target es2022 --module nodenext --lib es2022,dom src/Compagnon/Web/app.js", + "build": "vite build --config web/vite.config.ts", + "dev": "vite --config web/vite.config.ts", + "typecheck": "vue-tsc --noEmit -p web/tsconfig.json", + "test:unit": "node --test web/src/lib/*.test.ts", "test": "node --test tests/*.test.mjs" }, "devDependencies": { "@playwright/test": "1.61.1", - "typescript": "5.9.3" + "@types/node": "24.10.1", + "@vitejs/plugin-vue": "6.0.1", + "typescript": "5.9.3", + "vite": "7.3.6", + "vue": "3.5.24", + "vue-tsc": "3.1.4" } } diff --git a/scripts/package.sh b/scripts/package.sh index 9a73450..f1995a8 100644 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -euo pipefail cd "$(dirname "$0")/.." +npm ci --ignore-scripts +npm run build docker run --rm --user "$(id -u):$(id -g)" \ -e DOTNET_CLI_HOME=/tmp/dotnet -e NUGET_PACKAGES=/tmp/nuget \ -v "$PWD:/work" -w /work \ @@ -11,7 +13,7 @@ from pathlib import Path from zipfile import ZipFile, ZIP_DEFLATED import hashlib -archive = Path('dist/compagnon-0.6.0-jellyfin-12.0.0.zip') +archive = Path('dist/compagnon-0.7.0-jellyfin-12.0.0.zip') archive.parent.mkdir(exist_ok=True) with ZipFile(archive, 'w', ZIP_DEFLATED) as package: package.write('src/Compagnon/bin/Release/net10.0/Compagnon.dll', 'Compagnon/Compagnon.dll') diff --git a/src/Compagnon/Compagnon.csproj b/src/Compagnon/Compagnon.csproj index a6fdc0e..1f7a3ed 100644 --- a/src/Compagnon/Compagnon.csproj +++ b/src/Compagnon/Compagnon.csproj @@ -4,7 +4,7 @@ enable enable true - 0.6.0 + 0.7.0 diff --git a/src/Compagnon/Web/app.js b/src/Compagnon/Web/app.js deleted file mode 100644 index 8d3c191..0000000 --- a/src/Compagnon/Web/app.js +++ /dev/null @@ -1,609 +0,0 @@ -/** @typedef {{Id: string, UserId: string, DeviceName?: string, NowPlayingItem?: {Id: string, Name?: string}, PlayState?: {MediaSourceId?: string, SubtitleStreamIndex?: number, PositionTicks?: number, IsPaused?: boolean}, LastPlaybackCheckIn?: string}} Session */ -/** @typedef {{Type: string, Index: number, DisplayTitle?: string, Language?: string, Codec?: string, IsExternal?: boolean, IsTextSubtitleStream?: boolean, IsForced?: boolean, IsHearingImpaired?: boolean}} MediaStream */ -/** @typedef {{Text: string, StartPositionTicks: number, EndPositionTicks: number}} SubtitleBlock */ -/** @typedef {{token: string, userId: string, deviceId: string}} SavedConnection */ -const connectPanel = /** @type {HTMLElement} */ (document.querySelector('#connect')); -const code = /** @type {HTMLElement} */ (document.querySelector('#code')); -const retryButton = /** @type {HTMLButtonElement} */ (document.querySelector('#retry')); -const following = /** @type {HTMLElement} */ (document.querySelector('#following')); -const status = /** @type {HTMLElement} */ (document.querySelector('#status')); -const select = /** @type {HTMLSelectElement} */ (document.querySelector('#sessions')); -const details = /** @type {HTMLElement} */ (document.querySelector('#details')); -const logout = /** @type {HTMLButtonElement} */ (document.querySelector('#logout')); -const tracks = /** @type {HTMLSelectElement} */ (document.querySelector('#tracks')); -const trackStatus = /** @type {HTMLElement} */ (document.querySelector('#track-status')); -const helpTracks = /** @type {HTMLSelectElement} */ (document.querySelector('#help-tracks')); -const helpStatus = /** @type {HTMLElement} */ (document.querySelector('#help-status')); -const history = /** @type {HTMLOListElement} */ (document.querySelector('#history')); -const base = new URL('../', location.href); -const savedKey = 'compagnon.connexion'; -const disabledNotice = 'Quick Connect est désactivé sur ce serveur. Activez-le dans le tableau de bord Jellyfin, onglet Général, puis réessayez.'; -// Bounds on the local estimate: beyond them the display is presented as -// uncertain and stops advancing until a fresh observation arrives. -const observationFreshnessMs = 2500; -const checkInFreshnessMs = 30000; -// Jellyfin ticks are 100 ns; ticker bounds are in milliseconds. -const ticksPerSecond = 10000000; -const ticksPerMs = 10000; -let deviceId = Array.from(crypto.getRandomValues(new Uint8Array(16)), byte => byte.toString(16).padStart(2, '0')).join(''); -let token = ''; -let userId = ''; -let selected = ''; -let generation = 0; -let timer = 0; -let quickGeneration = 0; -let quickTimer = 0; -/** @type {Session[]} */ -let sessions = []; -let context = ''; -let trackGeneration = 0; -let trackNotice = ''; -/** @type {SubtitleBlock[] | null} */ -let blocks = null; -let helpGeneration = 0; -/** @type {SubtitleBlock[] | null} */ -let helpBlocks = null; -// performance.now() marks on the local monotonic clock; Date.now() is only used -// against the server check-in timestamp. -let observedPerfAt = -Infinity; -let lastTickPerfAt = 0; -/** @type {number | null} */ -let lastRawTicks = null; -/** @type {number | null} */ -let lastEstimateTicks = null; -/** @type {{at: number, seeded: number}[]} */ -let seededWindow = []; -let positionContext = ''; -/** @type {HTMLElement | null} */ -let positionValue = null; -let historySignature = ''; -let resyncPending = false; -/** @type {AbortController | null} */ -let sessionController = null; - -class ApiError extends Error { - /** @param {number} status */ - constructor(status) { - super(status === 401 ? 'Accès refusé par le serveur.' : `Serveur indisponible ou requête refusée (${status}).`); - this.status = status; - } -} - -function clearTrack() { - trackGeneration++; - blocks = null; - historySignature = ''; - history.replaceChildren(); -} - -// Drops the anchors of the passage being tracked. The observation clock is -// kept: the last poll may already describe the new selection or context. -function resetSeeded() { - lastTickPerfAt = 0; - lastRawTicks = null; - lastEstimateTicks = null; - seededWindow = []; -} - -function resetEstimate() { - resetSeeded(); - observedPerfAt = -Infinity; - positionContext = ''; -} - -function resetSubtitles() { - clearTrack(); - helpGeneration++; - helpBlocks = null; - helpTracks.replaceChildren(new Option("Choisir une piste d'aide", '')); - helpTracks.disabled = true; - helpStatus.textContent = ''; - context = ''; - trackNotice = ''; - tracks.replaceChildren(new Option('Choisir une piste', '')); - tracks.disabled = true; - trackStatus.textContent = ''; -} - -/** @param {Session} session */ -function trackingFresh(session) { - if (performance.now() - observedPerfAt > observationFreshnessMs) return false; - // A paused session legitimately stops reporting; only a playing one is expected to check in. - if (session.PlayState?.IsPaused === true) return true; - const checkIn = Date.parse(session.LastPlaybackCheckIn ?? ''); - return !Number.isFinite(checkIn) || Date.now() - checkIn <= checkInFreshnessMs; -} - -/** - * Local estimate between Jellyfin observations. Jellyfin advances PositionTicks - * in whole-second steps from the last client check-in: subtracting the whole - * seconds already counted rebuilds the position reported at the check-in, to - * which the elapsed time is added once. The highest rebuilt position seen - * lately is kept so a late second tick never makes the display step backwards. - * A tick that stalls entirely is replaced by our own clock for a bounded time. - * @param {Session} session @returns {number | null} - */ -function estimateTicks(session) { - const raw = session.PlayState?.PositionTicks; - if (typeof raw !== 'number' || !Number.isFinite(raw) || raw < 0) return null; - const previousRaw = lastRawTicks; - if (raw !== previousRaw) lastTickPerfAt = performance.now(); - // A backward jump is a seek or a new report, not the same passage. - if (previousRaw !== null && raw < previousRaw - 1.5 * ticksPerSecond) seededWindow = []; - lastRawTicks = raw; - if (session.PlayState?.IsPaused !== false) return raw; - const sinceTick = performance.now() - lastTickPerfAt; - const stalled = lastTickPerfAt && sinceTick > 1100 ? raw + Math.min(sinceTick, observationFreshnessMs) * ticksPerMs : null; - const checkIn = Date.parse(session.LastPlaybackCheckIn ?? ''); - if (!Number.isFinite(checkIn)) return stalled ?? raw; - const elapsed = Math.max(0, Date.now() - checkIn); - const now = performance.now(); - seededWindow.push({ at: now, seeded: raw - Math.floor(elapsed / 1000) * ticksPerSecond }); - while (seededWindow.length && now - seededWindow[0].at > 1500) seededWindow.shift(); - const estimate = Math.max(...seededWindow.map(entry => entry.seeded)) + elapsed * ticksPerMs; - return stalled === null ? estimate : Math.max(estimate, stalled); -} - -/** @param {Session} session @returns {number | null} */ -function currentEstimate(session) { - if (!trackingFresh(session)) return null; - const estimate = estimateTicks(session); - if (estimate !== null) lastEstimateTicks = estimate; - return lastEstimateTicks; -} - -/** @param {number | null} ticks */ -function formatPosition(ticks) { - if (typeof ticks !== 'number' || !Number.isFinite(ticks) || ticks < 0) return 'Non communiquée'; - const seconds = ticks / ticksPerSecond; - return `${Math.floor(seconds / 60)}:${(seconds % 60).toFixed(3).padStart(6, '0')}`; -} - -/** @param {Session | undefined} session */ -function renderStatus(session) { - if (!session) return; - if (resyncPending) { - status.textContent = 'Reprise après suspension du navigateur — vérification de la session avant de reprendre l’affichage synchronisé.'; - return; - } - if (!trackingFresh(session)) { - const age = observedPerfAt === -Infinity ? null : Math.floor((performance.now() - observedPerfAt) / 1000); - status.textContent = `Suivi incertain — l’affichage reste figé faute d’observation récente${age === null ? '' : ` (${age} s)`} ; il reprendra après une remontée du serveur.`; - return; - } - status.textContent = 'Suivi actif — position estimée, recalée sur les remontées de Jellyfin ; pas une observation directe de l’écran.'; -} - -/** @param {number | null} [estimate] */ -function renderHistory(estimate = lastEstimateTicks) { - if (blocks === null) return; - const ticks = estimate ?? lastEstimateTicks; - const recent = typeof ticks === 'number' ? blocks.filter(b => b.StartPositionTicks <= ticks).slice(-5) : []; - const signature = `${trackGeneration}:${helpGeneration}:${recent.length}:${recent.length ? blocks.indexOf(recent[0]) : -1}`; - if (historySignature === signature) return; - historySignature = signature; - history.replaceChildren(); - if (typeof ticks !== 'number') { - trackStatus.textContent = `Position indisponible. ${trackNotice}`; - return; - } - for (const block of recent) { - const li = document.createElement('li'); - const main = document.createElement('div'); - main.className = 'main-block'; - main.textContent = block.Text; - li.append(main); - // At most five main blocks: a scan of the help track keeps the overlap rule explicit. - const associated = helpBlocks?.filter(b => - Math.max(b.StartPositionTicks, block.StartPositionTicks) < Math.min(b.EndPositionTicks, block.EndPositionTicks)); - if (associated?.length) { - for (const help of associated) { - const text = document.createElement('div'); - text.className = 'help-block'; - text.textContent = help.Text; - li.append(text); - } - } else { - const absent = document.createElement('div'); - absent.textContent = helpBlocks === null ? helpStatus.textContent : 'Aucune aide associée à ce bloc.'; - li.append(absent); - } - history.append(li); - } - trackStatus.textContent = `${recent.length ? 'Historique à la position estimée.' : 'Aucun bloc commencé à cette position.'} ${trackNotice}`; -} - -/** @param {Session} session @param {HTMLSelectElement} selector @returns {Promise} */ -async function readTrack(session, selector) { - const codec = selector.selectedOptions[0]?.dataset.codec; - const path = [session.NowPlayingItem?.Id || '', session.PlayState?.MediaSourceId || '', selector.value].map(encodeURIComponent); - // Cold extraction can outlast session polling; keep its timeout independent. - const result = await api(`Compagnon/Subtitles/${path.join('/')}`, { signal: AbortSignal.timeout(120000) }); - if (!Array.isArray(result?.TrackEvents) || !result.TrackEvents.every((/** @type {SubtitleBlock} */ b) => - b && typeof b.Text === 'string' && Number.isSafeInteger(b.StartPositionTicks) && b.StartPositionTicks >= 0 && - Number.isSafeInteger(b.EndPositionTicks) && b.EndPositionTicks >= b.StartPositionTicks)) throw new Error('Format de piste invalide.'); - if (codec === 'ass' || codec === 'ssa') { - // Jellyfin decodes ASS line breaks but retains override commands in JSON. - for (const block of result.TrackEvents) block.Text = block.Text.replace(/\{\\[^}]*\}/g, ''); - } - // Stable sort retains Jellyfin's event order for simultaneous blocks. - return result.TrackEvents.sort((/** @type {SubtitleBlock} */ a, /** @type {SubtitleBlock} */ b) => a.StartPositionTicks - b.StartPositionTicks); -} - -/** @param {Session} session */ -async function loadHelpTrack(session) { - const current = ++helpGeneration; - helpBlocks = null; - helpStatus.textContent = helpTracks.value ? "Chargement de la piste d'aide… Une première extraction peut prendre du temps." : "Aucune piste d'aide sélectionnée. Choisissez une piste dans la langue souhaitée si elle est disponible."; - renderHistory(); - if (!helpTracks.value) return; - try { - const result = await readTrack(session, helpTracks); - if (current !== helpGeneration) return; - helpBlocks = result; - helpStatus.textContent = result.length ? 'Aide associée par chevauchement temporel.' : "Piste d'aide vide : aucune aide disponible."; - } catch { - if (current !== helpGeneration) return; - helpStatus.textContent = "Piste d'aide inexploitable ou accès refusé. Choisissez une piste pour réessayer."; - } - historySignature = ''; - renderHistory(); -} - -/** @param {Session} session */ -async function loadTrack(session) { - clearTrack(); - if (!tracks.value) { - trackStatus.textContent = `Choisissez une piste principale. ${trackNotice}`; - return; - } - const current = trackGeneration; - trackStatus.textContent = `Chargement de la piste… Une première extraction peut prendre du temps. ${trackNotice}`; - try { - const result = await readTrack(session, tracks); - if (current !== trackGeneration) return; - blocks = result; - historySignature = ''; - renderHistory(); - } catch { - if (current === trackGeneration) trackStatus.textContent = `Piste inexploitable ou accès refusé. Choisissez une piste pour réessayer. ${trackNotice}`; - } -} - -/** @param {Session | undefined} session */ -async function updateSubtitles(session) { - const item = session?.NowPlayingItem?.Id; - const source = session?.PlayState?.MediaSourceId; - const next = session && item && source ? JSON.stringify([session.Id, item, source]) : ''; - if (!next) { - resetSubtitles(); - if (session) trackStatus.textContent = 'Source réellement lue non communiquée : pistes indisponibles.'; - return; - } - if (next === context) { renderHistory(); return; } - resetSubtitles(); - context = next; - const current = trackGeneration; - trackStatus.textContent = 'Chargement des pistes…'; - try { - const result = await api(`Items/${encodeURIComponent(item || '')}/PlaybackInfo`); - if (current !== trackGeneration) return; - const mediaSource = result.MediaSources?.find((/** @type {{Id: string}} */ s) => s.Id === source); - if (!mediaSource || !Array.isArray(mediaSource.MediaStreams)) throw new Error('Source indisponible.'); - const subtitles = /** @type {MediaStream[]} */ (mediaSource.MediaStreams).filter(s => s.Type === 'Subtitle'); - trackNotice = subtitles.some(s => !s.IsTextSubtitleStream) ? 'Pistes graphiques non prises en charge (sans OCR).' : ''; - const available = subtitles.filter(s => s.IsTextSubtitleStream && Number.isInteger(s.Index) && s.Index >= 0); - for (const selector of [tracks, helpTracks]) { - selector.append(...available.map(s => { - const option = new Option(`#${s.Index} — ${s.DisplayTitle || s.Language || 'Langue inconnue'} — ${s.Codec || 'texte'}${s.IsForced ? ' — forcés' : ''}${s.IsHearingImpaired ? ' — malentendants' : ''}`, String(s.Index)); - option.dataset.codec = s.Codec?.toLowerCase() || ''; - return option; - })); - selector.disabled = !available.length; - } - helpStatus.textContent = available.length ? "Aucune piste d'aide sélectionnée. Choisissez une piste dans la langue souhaitée si elle est disponible." : "Aucune piste d'aide texte disponible."; - if (!available.length) { - trackStatus.textContent = `Aucune piste texte disponible. ${trackNotice}`; - return; - } - const preferred = available.find(s => s.Index === session?.PlayState?.SubtitleStreamIndex); - tracks.value = preferred ? String(preferred.Index) : ''; - if (session) await loadTrack(session); - } catch { - if (current === trackGeneration) { - trackStatus.textContent = 'Pistes inaccessibles : source indisponible ou accès refusé.'; - helpStatus.textContent = "Pistes d'aide inaccessibles : source indisponible ou accès refusé."; - context = ''; // Retry discovery on the next successful session observation. - } - } -} - -/** @param {string} path @param {RequestInit} [options] */ -async function api(path, options = {}) { - const response = await fetch(new URL(path, base), { - ...options, - headers: { - 'Content-Type': 'application/json', - Authorization: `MediaBrowser Client="Compagnon", Device="Navigateur compagnon", DeviceId="${deviceId}", Version="0.6.0"${token ? `, Token="${token}"` : ''}`, - }, - cache: 'no-store', - signal: options.signal ?? AbortSignal.timeout(8000), - }); - if (!response.ok) throw new ApiError(response.status); - return response.status === 204 ? null : response.json(); -} - -function render() { - const options = sessions.map(s => [s.Id, `${s.DeviceName || 'Appareil inconnu'} — ${s.NowPlayingItem?.Name || 'Média inconnu'}`]); - if (selected && !sessions.some(s => s.Id === selected)) options.unshift([selected, 'Lecture suivie indisponible']); - options.unshift(['', 'Choisir une lecture']); - // Preserve the native select (and keyboard focus) between observations. - if (JSON.stringify(options) !== select.dataset.options) { - select.replaceChildren(...options.map(([id, label]) => new Option(label, id))); - select.dataset.options = JSON.stringify(options); - } - select.value = selected; - details.replaceChildren(); - positionValue = null; - const session = sessions.find(s => s.Id === selected); - // A new session, media or source starts a new passage: no anchor or history - // from the previous context may survive into its position estimate. - const nextPosition = session ? JSON.stringify([session.Id, session.NowPlayingItem?.Id, session.PlayState?.MediaSourceId]) : ''; - if (nextPosition !== positionContext) { - positionContext = nextPosition; - resetSeeded(); - } - void updateSubtitles(session); - if (!session) { - status.textContent = selected ? 'La lecture suivie est arrêtée ou sa session a disparu.' : sessions.length ? 'Choisissez une lecture à accompagner.' : 'Aucune lecture disponible pour ce compte.'; - return; - } - renderStatus(session); - const checkIn = session.LastPlaybackCheckIn ? Date.parse(session.LastPlaybackCheckIn) : NaN; - const fields = { - 'Appareil': session.DeviceName || 'Inconnu', - 'Session': session.Id, - 'Média': session.NowPlayingItem?.Name || 'Inconnu', - 'Source réellement lue': session.PlayState?.MediaSourceId || 'Non communiquée', - 'Position estimée': formatPosition(currentEstimate(session) ?? lastEstimateTicks), - 'État': session.PlayState?.IsPaused === true ? 'En pause' : session.PlayState?.IsPaused === false ? 'En lecture' : 'Non communiqué', - 'Dernière remontée du lecteur': Number.isFinite(checkIn) ? `Il y a ${Math.max(0, Math.floor((Date.now() - checkIn) / 1000))} s` : 'Non communiquée', - }; - for (const [name, value] of Object.entries(fields)) { - const dt = document.createElement('dt'); - const dd = document.createElement('dd'); - dt.textContent = name; - dd.textContent = value; - if (name === 'Position estimée') positionValue = dd; - details.append(dt, dd); - } - renderHistory(); -} - -async function poll() { - const current = generation; - clearTimeout(timer); - // Superseding an in-flight observation also covers a response that was - // computed before a suspension: only the newest request may touch the display. - sessionController?.abort(); - const controller = new AbortController(); - sessionController = controller; - try { - const result = /** @type {Session[]} */ (await api('Sessions', { - signal: AbortSignal.any([controller.signal, AbortSignal.timeout(8000)]), - })); - if (current !== generation || sessionController !== controller) return; - observedPerfAt = performance.now(); - resyncPending = false; - sessions = result.filter(s => s.UserId === userId && s.NowPlayingItem); - select.disabled = false; - if (!selected && sessions.length === 1) selected = sessions[0].Id; - render(); - } catch (error) { - if (current !== generation || sessionController !== controller) return; - if (error instanceof ApiError && error.status === 401) { - forgetConnection('Votre connexion enregistrée n’est plus acceptée. Autorisez à nouveau le compagnon.'); - return; - } - select.disabled = true; - sessions = []; - resetSubtitles(); - details.replaceChildren(); - status.textContent = `Suivi indisponible. ${error instanceof Error ? error.message : 'Réessayez.'}`; - } - if (current === generation && token) timer = window.setTimeout(poll, 1000); -} - -/** @returns {SavedConnection | null} */ -function readSavedConnection() { - try { - const saved = JSON.parse(localStorage.getItem(savedKey) ?? ''); - const valid = saved && ['token', 'userId', 'deviceId'].every(key => typeof saved[key] === 'string' && saved[key].trim() !== ''); - return valid ? { token: saved.token, userId: saved.userId, deviceId: saved.deviceId } : null; - } catch { - return null; - } -} - -function resetConnectPanel() { - connectPanel.hidden = true; - retryButton.hidden = true; - code.textContent = ''; -} - -/** @param {string} secret @param {number} current */ -async function waitForApproval(secret, current) { - try { - const state = await api(`QuickConnect/Connect?secret=${encodeURIComponent(secret)}`); - if (current !== quickGeneration) return; - if (state?.Authenticated !== true) { - quickTimer = window.setTimeout(() => { void waitForApproval(secret, current); }, 1000); - return; - } - const authenticated = await api('Users/AuthenticateWithQuickConnect', { method: 'POST', body: JSON.stringify({ Secret: secret }) }); - if (current !== quickGeneration) return; - if (typeof authenticated?.AccessToken !== 'string' || typeof authenticated?.User?.Id !== 'string') throw new Error('Réponse du serveur inattendue.'); - token = authenticated.AccessToken; - userId = authenticated.User.Id; - localStorage.setItem(savedKey, JSON.stringify({ token, userId, deviceId })); - await startFollowing(); - } catch (error) { - if (current !== quickGeneration) return; - if (error instanceof ApiError && error.status === 404) failConnect('Ce code a expiré. Générez un nouveau code.', 'Générer un nouveau code'); - else failUnexpected(error); - } -} - -/** @param {string} message */ -async function beginQuickConnect(message = 'Préparation de la connexion…') { - const current = ++quickGeneration; - generation++; - clearTimeout(timer); - clearTimeout(quickTimer); - resetConnectPanel(); - status.textContent = message; - try { - if (await api('QuickConnect/Enabled') !== true) { - if (current === quickGeneration) failConnect(disabledNotice, 'Réessayer'); - return; - } - const initiated = await api('QuickConnect/Initiate', { method: 'POST' }); - if (current !== quickGeneration) return; - if (typeof initiated?.Secret !== 'string' || typeof initiated?.Code !== 'string') throw new Error('Réponse du serveur inattendue.'); - connectPanel.hidden = false; - code.textContent = initiated.Code; - status.textContent = 'Approuvez ce code dans un client Jellyfin déjà connecté.'; - await waitForApproval(initiated.Secret, current); - } catch (error) { - if (current !== quickGeneration) return; - if (error instanceof ApiError && error.status === 401) failConnect(disabledNotice, 'Réessayer'); - else failUnexpected(error); - } -} - -/** @param {unknown} error */ -function failUnexpected(error) { - failConnect(`Connexion impossible. ${error instanceof Error ? error.message : 'Réessayez.'}`, 'Réessayer'); -} - -/** @param {string} message @param {string} label */ -function failConnect(message, label) { - resetConnectPanel(); - status.textContent = message; - retryButton.textContent = label; - retryButton.hidden = false; - retryButton.focus(); -} - -function resetSessionChooser() { - // Drop the forgotten account's options and the cache render() keeps for them. - select.replaceChildren(new Option('Choisir une lecture', '')); - delete select.dataset.options; - select.disabled = true; -} - -function clearConnection() { - sessionController?.abort(); - sessionController = null; - localStorage.removeItem(savedKey); - token = ''; - userId = ''; - selected = ''; - sessions = []; - details.replaceChildren(); - resetEstimate(); - resetSubtitles(); - resetSessionChooser(); - following.hidden = true; -} - -/** @param {string} message */ -function forgetConnection(message) { - clearConnection(); - void beginQuickConnect(message); -} - -async function startFollowing() { - const current = ++generation; - quickGeneration++; - clearTimeout(quickTimer); - resetConnectPanel(); - following.hidden = false; - select.disabled = true; - await poll(); - if (current === generation) select.focus(); -} - -// Called when the browser comes back to the foreground, the page is restored or -// the network returns: the previous display was computed before the gap and -// must not be presented as live until the chosen session is observed again. -function resumeTracking() { - if (!token || document.visibilityState !== 'visible') return; - resyncPending = true; - observedPerfAt = -Infinity; - renderStatus(sessions.find(s => s.Id === selected)); - clearTimeout(timer); - void poll(); -} - -select.addEventListener('change', () => { - selected = select.value; - resetSeeded(); - render(); -}); -tracks.addEventListener('change', () => { - const session = sessions.find(s => s.Id === selected); - if (session) void loadTrack(session); -}); -helpTracks.addEventListener('change', () => { - const session = sessions.find(s => s.Id === selected); - if (session) void loadHelpTrack(session); -}); -retryButton.addEventListener('click', () => { void beginQuickConnect(); }); -logout.addEventListener('click', async () => { - // Revoke the companion's own token; it is captured before the connection is forgotten. - const request = api('Sessions/Logout', { method: 'POST' }); - const current = ++quickGeneration; - generation++; - clearTimeout(timer); - clearTimeout(quickTimer); - clearConnection(); - resetConnectPanel(); - status.textContent = 'Déconnecté.'; - retryButton.textContent = 'Se connecter'; - retryButton.hidden = false; - retryButton.focus(); - try { await request; } catch { - // A revocation that fails after a newer attempt began must not overwrite it. - if (current === quickGeneration) status.textContent = 'Déconnecté de ce navigateur. Le serveur n’a pas confirmé la révocation du jeton.'; - } -}); - -document.addEventListener('visibilitychange', () => { if (document.visibilityState === 'visible') resumeTracking(); }); -window.addEventListener('pageshow', event => { if (event.persisted) resumeTracking(); }); -window.addEventListener('online', resumeTracking); -document.addEventListener('resume', resumeTracking); - -// A local tick keeps the display moving between observations. It stops as soon -// as the observation goes stale, so a loss of tracking is never hidden by -// unbounded extrapolation. The poll remains the only source of new observations. -window.setInterval(() => { - if (!token) return; - const session = sessions.find(s => s.Id === selected); - if (!session) return; - const ticks = currentEstimate(session); - renderStatus(session); - if (ticks === null) return; - if (positionValue) positionValue.textContent = formatPosition(ticks); - renderHistory(ticks); -}, 100); - -const saved = readSavedConnection(); -if (saved) { - token = saved.token; - userId = saved.userId; - deviceId = saved.deviceId; - void startFollowing(); -} else { - void beginQuickConnect(); -} diff --git a/src/Compagnon/Web/index.html b/src/Compagnon/Web/index.html deleted file mode 100644 index f28d0ab..0000000 --- a/src/Compagnon/Web/index.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - Compagnon de sous-titres - - - - -
-

Compagnon de sous-titres

-

Retrouvez votre lecture sur un second écran.

- -

Préparation de la connexion…

- - -
- - diff --git a/tests/run.sh b/tests/run.sh index c0e4e99..284b065 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -41,7 +41,7 @@ for format in srt vtt ass; do done node tests/setup.mjs mkdir -p .test-state/package -python3 -m zipfile -e dist/compagnon-0.6.0-jellyfin-12.0.0.zip .test-state/package +python3 -m zipfile -e dist/compagnon-0.7.0-jellyfin-12.0.0.zip .test-state/package docker cp .test-state/package/Compagnon "$container:/config/plugins/Compagnon" docker restart "$container" >/dev/null export JELLYFIN_URL="http://$(docker port "$container" 8096/tcp)" diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..7c017d6 --- /dev/null +++ b/web/index.html @@ -0,0 +1,12 @@ + + + + + + Compagnon de sous-titres + + + +
+ + diff --git a/web/src/App.vue b/web/src/App.vue new file mode 100644 index 0000000..2f2cee0 --- /dev/null +++ b/web/src/App.vue @@ -0,0 +1,47 @@ + + + diff --git a/web/src/api.ts b/web/src/api.ts new file mode 100644 index 0000000..cc4b420 --- /dev/null +++ b/web/src/api.ts @@ -0,0 +1,32 @@ +export const version = '0.7.0'; + +export class ApiError extends Error { + status: number; + + constructor(status: number) { + super(status === 401 ? 'Accès refusé par le serveur.' : `Serveur indisponible ou requête refusée (${status}).`); + this.status = status; + } +} + +export interface ApiIdentity { + getToken: () => string; + getDeviceId: () => string; +} + +export function createApi({ getToken, getDeviceId }: ApiIdentity) { + const base = new URL('../', location.href); + return async function api(path: string, options: RequestInit = {}): Promise { + const response = await fetch(new URL(path, base), { + ...options, + headers: { + 'Content-Type': 'application/json', + Authorization: `MediaBrowser Client="Compagnon", Device="Navigateur compagnon", DeviceId="${getDeviceId()}", Version="${version}"${getToken() ? `, Token="${getToken()}"` : ''}`, + }, + cache: 'no-store', + signal: options.signal ?? AbortSignal.timeout(8000), + }); + if (!response.ok) throw new ApiError(response.status); + return response.status === 204 ? null : response.json(); + }; +} diff --git a/web/src/lib/connection.test.ts b/web/src/lib/connection.test.ts new file mode 100644 index 0000000..3cfa216 --- /dev/null +++ b/web/src/lib/connection.test.ts @@ -0,0 +1,30 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { parseSavedConnection } from './connection.ts'; + +test('a saved connection is kept only when complete', () => { + const valid = JSON.stringify({ token: 'jeton', userId: 'alice', deviceId: 'appareil' }); + assert.deepEqual(parseSavedConnection(valid), { token: 'jeton', userId: 'alice', deviceId: 'appareil' }); + assert.deepEqual(parseSavedConnection(JSON.stringify({ token: 'jeton', userId: 'alice', deviceId: 'appareil', extra: 1 })), { + token: 'jeton', + userId: 'alice', + deviceId: 'appareil', + }); +}); + +test('unreadable or incomplete saved data is treated as no connection', () => { + for (const raw of [ + null, + '', + '{oops', + 'null', + '42', + JSON.stringify({ token: '', userId: 'alice', deviceId: 'appareil' }), + JSON.stringify({ token: ' ', userId: 'alice', deviceId: 'appareil' }), + JSON.stringify({ token: 42, userId: 'alice', deviceId: 'appareil' }), + JSON.stringify({ token: 'jeton' }), + JSON.stringify({ token: 'jeton', userId: 'alice' }), + ]) { + assert.equal(parseSavedConnection(raw), null, `expected no connection for ${raw}`); + } +}); diff --git a/web/src/lib/connection.ts b/web/src/lib/connection.ts new file mode 100644 index 0000000..009cd13 --- /dev/null +++ b/web/src/lib/connection.ts @@ -0,0 +1,14 @@ +import type { SavedConnection } from './types.ts'; + +export function parseSavedConnection(raw: string | null): SavedConnection | null { + try { + const saved = JSON.parse(raw ?? '') as Partial | null; + const keys: (keyof SavedConnection)[] = ['token', 'userId', 'deviceId']; + const valid = saved && keys.every(key => typeof saved[key] === 'string' && (saved[key] as string).trim() !== ''); + return valid + ? { token: saved.token as string, userId: saved.userId as string, deviceId: saved.deviceId as string } + : null; + } catch { + return null; + } +} diff --git a/web/src/lib/history.test.ts b/web/src/lib/history.test.ts new file mode 100644 index 0000000..d0ea2be --- /dev/null +++ b/web/src/lib/history.test.ts @@ -0,0 +1,35 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { associatedHelp, historySignature, recentBlocks } from './history.ts'; +import type { SubtitleBlock } from './types.ts'; + +const block = (start: number, end: number, text: string): SubtitleBlock => + ({ StartPositionTicks: start, EndPositionTicks: end, Text: text }); + +test('the history keeps the last five blocks started at or before the position', () => { + const blocks = [1, 2, 3, 4, 4, 6, 9].map((second, index) => block(second * 100, second * 100 + 50, `Bloc ${index + 1}`)); + assert.deepEqual(recentBlocks(blocks, 650).map(b => b.Text), ['Bloc 2', 'Bloc 3', 'Bloc 4', 'Bloc 5', 'Bloc 6']); + assert.deepEqual(recentBlocks(blocks, 400).map(b => b.Text), ['Bloc 1', 'Bloc 2', 'Bloc 3', 'Bloc 4', 'Bloc 5']); + assert.deepEqual(recentBlocks(blocks, 350).map(b => b.Text), ['Bloc 1', 'Bloc 2', 'Bloc 3']); + assert.deepEqual(recentBlocks(blocks, 0), []); + assert.deepEqual(recentBlocks(blocks, null), []); +}); + +test('help is associated on a positive temporal overlap only', () => { + const main = [block(10, 20, 'One'), block(20, 30, 'Two'), block(30, 40, 'Three')]; + const help = [block(15, 25, 'Shared'), block(30, 35, 'First'), block(35, 40, 'Second'), block(45, 45, 'Zero duration')]; + assert.deepEqual(associatedHelp(help, main[0])?.map(b => b.Text), ['Shared']); + assert.deepEqual(associatedHelp(help, main[1])?.map(b => b.Text), ['Shared']); + assert.deepEqual(associatedHelp(help, main[2])?.map(b => b.Text), ['First', 'Second']); + assert.deepEqual(associatedHelp(help, block(45, 46, 'X'))?.map(b => b.Text), []); + assert.equal(associatedHelp(null, main[0]), null); + // Adjacent frontiers do not count. + assert.deepEqual(associatedHelp([block(0, 10, 'Before')], main[0]), []); +}); + +test('the history signature ignores position moves inside the same recent set', () => { + const blocks = [1, 2, 3].map(second => block(second * 100, second * 100 + 50, `Bloc ${second}`)); + assert.equal(historySignature(1, 1, blocks, recentBlocks(blocks, 250)), '1:1:2:0'); + assert.equal(historySignature(1, 1, blocks, recentBlocks(blocks, 260)), '1:1:2:0'); + assert.equal(historySignature(2, 1, blocks, recentBlocks(blocks, 260)), '2:1:2:0'); +}); diff --git a/web/src/lib/history.ts b/web/src/lib/history.ts new file mode 100644 index 0000000..9f298df --- /dev/null +++ b/web/src/lib/history.ts @@ -0,0 +1,24 @@ +import type { SubtitleBlock } from './types.ts'; + +export function recentBlocks(blocks: SubtitleBlock[], ticks: number | null): SubtitleBlock[] { + if (typeof ticks !== 'number') return []; + return blocks.filter(block => block.StartPositionTicks <= ticks).slice(-5); +} + +export function associatedHelp( + helpBlocks: SubtitleBlock[] | null, + block: SubtitleBlock, +): SubtitleBlock[] | null { + return helpBlocks?.filter(help => + Math.max(help.StartPositionTicks, block.StartPositionTicks) < Math.min(help.EndPositionTicks, block.EndPositionTicks), + ) ?? null; +} + +export function historySignature( + trackGeneration: number, + helpGeneration: number, + blocks: SubtitleBlock[], + recent: SubtitleBlock[], +): string { + return `${trackGeneration}:${helpGeneration}:${recent.length}:${recent.length ? blocks.indexOf(recent[0]) : -1}`; +} diff --git a/web/src/lib/session.test.ts b/web/src/lib/session.test.ts new file mode 100644 index 0000000..ded70ab --- /dev/null +++ b/web/src/lib/session.test.ts @@ -0,0 +1,52 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { followableSessions, sessionDetails, sessionOptions } from './session.ts'; +import type { Session } from './types.ts'; + +const at = Date.parse('2026-01-01T00:00:10.000Z'); + +const alice: Session = { + Id: 'session-a', + UserId: 'alice', + DeviceName: 'Salon', + NowPlayingItem: { Id: 'film', Name: 'Film' }, + PlayState: { MediaSourceId: 'source', IsPaused: false }, + LastPlaybackCheckIn: '2026-01-01T00:00:00.000Z', +}; +const bob: Session = { Id: 'session-b', UserId: 'bob', NowPlayingItem: { Id: 'other' } }; +const idle: Session = { Id: 'session-c', UserId: 'alice' }; + +test('only the connected account’s playing sessions are followed', () => { + assert.deepEqual(followableSessions([alice, bob, idle], 'alice').map(s => s.Id), ['session-a']); +}); + +test('session options always start with the chooser and keep a disappeared selection', () => { + assert.deepEqual(sessionOptions([alice], ''), [ + { value: '', label: 'Choisir une lecture' }, + { value: 'session-a', label: 'Salon — Film' }, + ]); + assert.deepEqual(sessionOptions([alice], 'session-a')[0], { value: '', label: 'Choisir une lecture' }); + assert.deepEqual(sessionOptions([alice], 'gone')[0], { value: '', label: 'Choisir une lecture' }); + assert.deepEqual(sessionOptions([alice], 'gone')[1], { value: 'gone', label: 'Lecture suivie indisponible' }); + assert.deepEqual(sessionOptions([bob], 'gone')[2], { value: 'session-b', label: 'Appareil inconnu — Média inconnu' }); +}); + +test('session details expose the position as a dynamic field and format the check-in age', () => { + const fields = sessionDetails(alice, at); + assert.deepEqual(fields.map(f => f.name), [ + 'Appareil', 'Session', 'Média', 'Source réellement lue', 'Position estimée', + 'État', 'Dernière remontée du lecteur', + ]); + assert.equal(fields[4].value, null); + assert.equal(fields[5].value, 'En lecture'); + assert.equal(fields[6].value, 'Il y a 10 s'); + const paused = { ...alice, PlayState: { ...alice.PlayState, IsPaused: true } }; + assert.equal(sessionDetails(paused, at)[5].value, 'En pause'); + const stale = { ...alice, LastPlaybackCheckIn: undefined, DeviceName: undefined, NowPlayingItem: undefined, PlayState: {} }; + const staleFields = sessionDetails(stale, at); + assert.equal(staleFields[0].value, 'Inconnu'); + assert.equal(staleFields[2].value, 'Inconnu'); + assert.equal(staleFields[3].value, 'Non communiquée'); + assert.equal(staleFields[5].value, 'Non communiqué'); + assert.equal(staleFields[6].value, 'Non communiquée'); +}); diff --git a/web/src/lib/session.ts b/web/src/lib/session.ts new file mode 100644 index 0000000..ae185f5 --- /dev/null +++ b/web/src/lib/session.ts @@ -0,0 +1,50 @@ +import type { Session } from './types.ts'; + +export function followableSessions(sessions: Session[], userId: string): Session[] { + return sessions.filter(session => session.UserId === userId && session.NowPlayingItem); +} + +export interface SessionOption { + value: string; + label: string; +} + +export function sessionOptions(sessions: Session[], selected: string): SessionOption[] { + const options = sessions.map(session => ({ + value: session.Id, + label: `${session.DeviceName || 'Appareil inconnu'} — ${session.NowPlayingItem?.Name || 'Média inconnu'}`, + })); + if (selected && !sessions.some(session => session.Id === selected)) { + options.unshift({ value: selected, label: 'Lecture suivie indisponible' }); + } + options.unshift({ value: '', label: 'Choisir une lecture' }); + return options; +} + +export interface DetailField { + name: string; + value: string | null; +} + +export function sessionDetails(session: Session, nowMs: number): DetailField[] { + const checkIn = session.LastPlaybackCheckIn ? Date.parse(session.LastPlaybackCheckIn) : NaN; + return [ + { name: 'Appareil', value: session.DeviceName || 'Inconnu' }, + { name: 'Session', value: session.Id }, + { name: 'Média', value: session.NowPlayingItem?.Name || 'Inconnu' }, + { name: 'Source réellement lue', value: session.PlayState?.MediaSourceId || 'Non communiquée' }, + { name: 'Position estimée', value: null }, + { + name: 'État', + value: session.PlayState?.IsPaused === true ? 'En pause' + : session.PlayState?.IsPaused === false ? 'En lecture' + : 'Non communiqué', + }, + { + name: 'Dernière remontée du lecteur', + value: Number.isFinite(checkIn) + ? `Il y a ${Math.max(0, Math.floor((nowMs - checkIn) / 1000))} s` + : 'Non communiquée', + }, + ]; +} diff --git a/web/src/lib/subtitles.test.ts b/web/src/lib/subtitles.test.ts new file mode 100644 index 0000000..5ccc88f --- /dev/null +++ b/web/src/lib/subtitles.test.ts @@ -0,0 +1,68 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { availableSubtitles, graphicalNotice, normalizeTrack, streamOption } from './subtitles.ts'; +import type { MediaStream } from './types.ts'; + +const stream = (overrides: Partial): MediaStream => ({ Type: 'Subtitle', Index: 0, ...overrides }); + +test('an invalid track payload is refused', () => { + const invalid = [ + null, + {}, + { TrackEvents: 'nope' }, + { TrackEvents: [{ Text: 'x' }] }, + { TrackEvents: [{ Text: 'x', StartPositionTicks: -1, EndPositionTicks: 1 }] }, + { TrackEvents: [{ Text: 'x', StartPositionTicks: 2, EndPositionTicks: 1 }] }, + { TrackEvents: [{ Text: 'x', StartPositionTicks: 0.5, EndPositionTicks: 1 }] }, + ]; + for (const payload of invalid) { + assert.throws(() => normalizeTrack(payload, 'srt'), /Format de piste invalide/); + } + assert.deepEqual(normalizeTrack({ TrackEvents: [] }, 'srt'), []); +}); + +test('ASS override commands are removed without touching other codecs', () => { + const ass = { TrackEvents: [{ Text: '{\\pos(10,20)}Bonjour{\\fad(1,2)}', StartPositionTicks: 0, EndPositionTicks: 1 }] }; + assert.deepEqual(normalizeTrack(ass, 'ass').map(b => b.Text), ['Bonjour']); + const srt = { TrackEvents: [{ Text: '{\\pos(10,20)}Bonjour', StartPositionTicks: 0, EndPositionTicks: 1 }] }; + assert.deepEqual(normalizeTrack(srt, 'srt').map(b => b.Text), ['{\\pos(10,20)}Bonjour']); +}); + +test('blocks are sorted by start while simultaneous events keep Jellyfin order', () => { + const payload = { TrackEvents: [ + { Text: 'late', StartPositionTicks: 20, EndPositionTicks: 30 }, + { Text: 'first simultaneous', StartPositionTicks: 10, EndPositionTicks: 15 }, + { Text: 'second simultaneous', StartPositionTicks: 10, EndPositionTicks: 12 }, + ] }; + assert.deepEqual(normalizeTrack(payload, 'srt').map(b => b.Text), ['first simultaneous', 'second simultaneous', 'late']); +}); + +test('only text subtitle streams with a usable index are offered', () => { + const subtitles = [ + stream({ Index: 4, IsTextSubtitleStream: true, Language: 'eng' }), + stream({ Index: -1, IsTextSubtitleStream: true }), + stream({ Index: 8, IsTextSubtitleStream: false }), + stream({ Index: 7, IsTextSubtitleStream: true, IsForced: true }), + ]; + assert.deepEqual(availableSubtitles(subtitles).map(s => s.Index), [4, 7]); + assert.equal(graphicalNotice(subtitles), 'Pistes graphiques non prises en charge (sans OCR).'); + assert.equal(graphicalNotice([subtitles[0]]), ''); +}); + +test('stream options carry the label, codec and stable value used by the selectors', () => { + assert.deepEqual(streamOption(stream({ Index: 4, DisplayTitle: 'Français', Codec: 'ASS', IsForced: true, IsHearingImpaired: true })), { + value: '4', + label: '#4 — Français — ASS — forcés — malentendants', + codec: 'ass', + }); + assert.deepEqual(streamOption(stream({ Index: 7 })), { + value: '7', + label: '#7 — Langue inconnue — texte', + codec: '', + }); + assert.deepEqual(streamOption(stream({ Index: 7, Language: 'fre', Codec: 'subrip' })), { + value: '7', + label: '#7 — fre — subrip', + codec: 'subrip', + }); +}); diff --git a/web/src/lib/subtitles.ts b/web/src/lib/subtitles.ts new file mode 100644 index 0000000..dfadcfd --- /dev/null +++ b/web/src/lib/subtitles.ts @@ -0,0 +1,36 @@ +import type { MediaStream, StreamOption, SubtitleBlock } from './types.ts'; + +export function graphicalNotice(subtitles: MediaStream[]): string { + return subtitles.some(stream => !stream.IsTextSubtitleStream) + ? 'Pistes graphiques non prises en charge (sans OCR).' + : ''; +} + +export function availableSubtitles(subtitles: MediaStream[]): MediaStream[] { + return subtitles.filter(stream => + stream.IsTextSubtitleStream && Number.isInteger(stream.Index) && stream.Index >= 0, + ); +} + +export function streamOption(stream: MediaStream): StreamOption { + const label = `#${stream.Index} — ${stream.DisplayTitle || stream.Language || 'Langue inconnue'} — ${stream.Codec || 'texte'}` + + `${stream.IsForced ? ' — forcés' : ''}${stream.IsHearingImpaired ? ' — malentendants' : ''}`; + return { value: String(stream.Index), label, codec: stream.Codec?.toLowerCase() || '' }; +} + +export function normalizeTrack(result: unknown, codec: string): SubtitleBlock[] { + const events = (result as { TrackEvents?: unknown } | null)?.TrackEvents; + if (!Array.isArray(events) || !events.every((block: unknown) => { + const candidate = block as Partial | null; + return Boolean(candidate) && typeof candidate!.Text === 'string' && + Number.isSafeInteger(candidate!.StartPositionTicks) && candidate!.StartPositionTicks! >= 0 && + Number.isSafeInteger(candidate!.EndPositionTicks) && candidate!.EndPositionTicks! >= candidate!.StartPositionTicks!; + })) throw new Error('Format de piste invalide.'); + const blocks = events as SubtitleBlock[]; + if (codec === 'ass' || codec === 'ssa') { + // Jellyfin decodes ASS line breaks but retains override commands in JSON. + for (const block of blocks) block.Text = block.Text.replace(/\{\\[^}]*\}/g, ''); + } + // Stable sort retains Jellyfin's event order for simultaneous blocks. + return blocks.sort((a, b) => a.StartPositionTicks - b.StartPositionTicks); +} diff --git a/web/src/lib/ticks.test.ts b/web/src/lib/ticks.test.ts new file mode 100644 index 0000000..12b44ef --- /dev/null +++ b/web/src/lib/ticks.test.ts @@ -0,0 +1,132 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { createPositionEstimator, formatPosition, ticksPerSecond } from './ticks.ts'; +import type { Session } from './types.ts'; + +function fakeClocks() { + // performance.now() is never zero at page load; starting above zero keeps the + // tick anchor truthy, as it is in the browser. + let mono = 1000; + let wall = 0; + return { + now: () => mono, + wallNow: () => wall, + advance(ms: number) { + mono += ms; + wall += ms; + }, + }; +} + +function playingSession(positionSeconds: number): Session { + return { + Id: 'session', + UserId: 'alice', + PlayState: { MediaSourceId: 'source', IsPaused: false, PositionTicks: positionSeconds * ticksPerSecond }, + LastPlaybackCheckIn: new Date(0).toISOString(), + }; +} + +const seconds = (ticks: number | null) => (ticks === null ? null : ticks / ticksPerSecond); + +test('the local estimate advances between observations without drifting', () => { + const clocks = fakeClocks(); + const estimator = createPositionEstimator(clocks.now, clocks.wallNow); + const session = playingSession(100); + estimator.observe(); + assert.ok(Math.abs((seconds(estimator.currentEstimate(session)) ?? 0) - 100) < 0.001); + clocks.advance(600); + const estimate = estimator.currentEstimate(session); + assert.ok(Math.abs((seconds(estimate) ?? 0) - 100.6) < 0.01, `expected 100.6 s, got ${seconds(estimate)}`); +}); + +test('a fresh observation replaces the previous estimate and stale ones stop the display', () => { + const clocks = fakeClocks(); + const estimator = createPositionEstimator(clocks.now, clocks.wallNow); + const session = playingSession(100); + estimator.observe(); + estimator.currentEstimate(session); + clocks.advance(2000); + assert.ok(Math.abs((seconds(estimator.currentEstimate(session)) ?? 0) - 102) < 0.01); + clocks.advance(600); + assert.equal(estimator.currentEstimate(session), null, 'beyond the freshness bound the estimate must be refused'); + assert.ok(Math.abs((seconds(estimator.lastEstimateTicks) ?? 0) - 102) < 0.01, 'the frozen estimate stays readable'); +}); + +test('a late server tick never steps the estimate backwards', () => { + const clocks = fakeClocks(); + const estimator = createPositionEstimator(clocks.now, clocks.wallNow); + const session = playingSession(100); + estimator.observe(); + let previous: number | null = null; + for (let i = 0; i < 10; i++) { + const elapsed = clocks.wallNow(); + // Jellyfin schedules each whole-second increment 300 ms late under load. + session.PlayState!.PositionTicks = 100 * ticksPerSecond + + (elapsed >= 300 ? Math.floor((elapsed - 300) / 1000) + 1 : 0) * ticksPerSecond; + const estimate = seconds(estimator.currentEstimate(session)); + assert.notEqual(estimate, null); + if (previous !== null) assert.ok(estimate! >= previous - 0.001, `estimate stepped back: ${previous} -> ${estimate}`); + const truth = 100 + elapsed / 1000; + assert.ok(Math.abs(estimate! - truth) < 1.01, `estimate ${estimate} out of bounds near ${truth}`); + previous = estimate; + clocks.advance(200); + } +}); + +test('a backward jump is treated as a new passage, not an anchor', () => { + const clocks = fakeClocks(); + const estimator = createPositionEstimator(clocks.now, clocks.wallNow); + const session = playingSession(200); + estimator.observe(); + estimator.currentEstimate(session); + clocks.advance(1000); + assert.ok((seconds(estimator.currentEstimate(session)) ?? 0) >= 200); + session.PlayState!.PositionTicks = 50 * ticksPerSecond; + const estimate = estimator.currentEstimate(session); + assert.ok((seconds(estimate) ?? 0) < 55, `a backward seek must restart from 50 s, got ${seconds(estimate)}`); +}); + +test('a stalled tick falls back to the local clock for a bounded time only', () => { + const clocks = fakeClocks(); + const estimator = createPositionEstimator(clocks.now, clocks.wallNow); + const session = playingSession(100); + estimator.observe(); + estimator.currentEstimate(session); + clocks.advance(1300); + const stalled = seconds(estimator.currentEstimate(session)); + assert.ok(Math.abs(stalled! - 101.3) < 0.01, `expected the bounded local fallback, got ${stalled}`); + clocks.advance(1300); + assert.equal(estimator.currentEstimate(session), null, 'the fallback must not outlive the freshness bound'); +}); + +test('a paused session reports its raw position without extrapolation', () => { + const clocks = fakeClocks(); + const estimator = createPositionEstimator(clocks.now, clocks.wallNow); + const session = playingSession(100); + session.PlayState!.IsPaused = true; + estimator.observe(); + clocks.advance(1000); + assert.equal(estimator.currentEstimate(session), 100 * ticksPerSecond); +}); + +test('a context change drops the anchors of the previous passage', () => { + const clocks = fakeClocks(); + const estimator = createPositionEstimator(clocks.now, clocks.wallNow); + const session = playingSession(200); + estimator.observe(); + clocks.advance(1000); + estimator.currentEstimate(session); + estimator.noteContext('new-source'); + session.PlayState!.PositionTicks = 10 * ticksPerSecond; + session.LastPlaybackCheckIn = new Date(clocks.wallNow()).toISOString(); + const estimate = seconds(estimator.currentEstimate(session)); + assert.ok(Math.abs(estimate! - 10) < 0.01, `the estimate must come from the new context, got ${estimate}`); +}); + +test('positions are formatted as m:ss.mmm', () => { + assert.equal(formatPosition(0), '0:00.000'); + assert.equal(formatPosition(65.4321 * ticksPerSecond), '1:05.432'); + assert.equal(formatPosition(null), 'Non communiquée'); + assert.equal(formatPosition(-1), 'Non communiquée'); +}); diff --git a/web/src/lib/ticks.ts b/web/src/lib/ticks.ts new file mode 100644 index 0000000..b02f8df --- /dev/null +++ b/web/src/lib/ticks.ts @@ -0,0 +1,121 @@ +import type { Session } from './types.ts'; + +export const observationFreshnessMs = 2500; +export const checkInFreshnessMs = 30000; +// Jellyfin ticks are 100 ns; ticker bounds are in milliseconds. +export const ticksPerSecond = 10000000; +export const ticksPerMs = 10000; + +export type Clock = () => number; + +export function createPositionEstimator( + now: Clock = () => performance.now(), + wallNow: Clock = () => Date.now(), +) { + let observedPerfAt = -Infinity; + let lastTickPerfAt = 0; + let lastRawTicks: number | null = null; + let lastEstimateTicks: number | null = null; + let seededWindow: { at: number; seeded: number }[] = []; + let positionContext = ''; + + // Drops the anchors of the passage being tracked. The observation clock is + // kept: the last poll may already describe the new selection or context. + function resetSeeded() { + lastTickPerfAt = 0; + lastRawTicks = null; + lastEstimateTicks = null; + seededWindow = []; + } + + function resetEstimate() { + resetSeeded(); + observedPerfAt = -Infinity; + positionContext = ''; + } + + // A changed session, media or source starts a new passage: no anchor or + // history from the previous context may survive into its position estimate. + function noteContext(next: string) { + if (next !== positionContext) { + positionContext = next; + resetSeeded(); + } + } + + function observe() { + observedPerfAt = now(); + } + + function forgetObservation() { + observedPerfAt = -Infinity; + } + + function trackingFresh(session: Session) { + if (now() - observedPerfAt > observationFreshnessMs) return false; + // A paused session legitimately stops reporting; only a playing one is expected to check in. + if (session.PlayState?.IsPaused === true) return true; + const checkIn = Date.parse(session.LastPlaybackCheckIn ?? ''); + return !Number.isFinite(checkIn) || wallNow() - checkIn <= checkInFreshnessMs; + } + + // Local estimate between Jellyfin observations. Jellyfin advances PositionTicks + // in whole-second steps from the last client check-in: subtracting the whole + // seconds already counted rebuilds the position reported at the check-in, to + // which the elapsed time is added once. The highest rebuilt position seen + // lately is kept so a late second tick never makes the display step backwards. + // A tick that stalls entirely is replaced by our own clock for a bounded time. + function estimateTicks(session: Session): number | null { + const raw = session.PlayState?.PositionTicks; + if (typeof raw !== 'number' || !Number.isFinite(raw) || raw < 0) return null; + const previousRaw = lastRawTicks; + if (raw !== previousRaw) lastTickPerfAt = now(); + // A backward jump is a seek or a new report, not the same passage. + if (previousRaw !== null && raw < previousRaw - 1.5 * ticksPerSecond) seededWindow = []; + lastRawTicks = raw; + if (session.PlayState?.IsPaused !== false) return raw; + const sinceTick = now() - lastTickPerfAt; + const stalled = lastTickPerfAt && sinceTick > 1100 + ? raw + Math.min(sinceTick, observationFreshnessMs) * ticksPerMs + : null; + const checkIn = Date.parse(session.LastPlaybackCheckIn ?? ''); + if (!Number.isFinite(checkIn)) return stalled ?? raw; + const elapsed = Math.max(0, wallNow() - checkIn); + const clockNow = now(); + seededWindow.push({ at: clockNow, seeded: raw - Math.floor(elapsed / 1000) * ticksPerSecond }); + while (seededWindow.length && clockNow - seededWindow[0].at > 1500) seededWindow.shift(); + const estimate = Math.max(...seededWindow.map(entry => entry.seeded)) + elapsed * ticksPerMs; + return stalled === null ? estimate : Math.max(estimate, stalled); + } + + function currentEstimate(session: Session): number | null { + if (!trackingFresh(session)) return null; + const estimate = estimateTicks(session); + if (estimate !== null) lastEstimateTicks = estimate; + return lastEstimateTicks; + } + + return { + resetSeeded, + resetEstimate, + noteContext, + observe, + forgetObservation, + trackingFresh, + currentEstimate, + get observedPerfAt() { + return observedPerfAt; + }, + get lastEstimateTicks() { + return lastEstimateTicks; + }, + }; +} + +export type PositionEstimator = ReturnType; + +export function formatPosition(ticks: number | null): string { + if (typeof ticks !== 'number' || !Number.isFinite(ticks) || ticks < 0) return 'Non communiquée'; + const seconds = ticks / ticksPerSecond; + return `${Math.floor(seconds / 60)}:${(seconds % 60).toFixed(3).padStart(6, '0')}`; +} diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts new file mode 100644 index 0000000..345977d --- /dev/null +++ b/web/src/lib/types.ts @@ -0,0 +1,43 @@ +export interface Session { + Id: string; + UserId: string; + DeviceName?: string; + NowPlayingItem?: { Id: string; Name?: string }; + PlayState?: { + MediaSourceId?: string; + SubtitleStreamIndex?: number; + PositionTicks?: number; + IsPaused?: boolean; + }; + LastPlaybackCheckIn?: string; +} + +export interface MediaStream { + Type: string; + Index: number; + DisplayTitle?: string; + Language?: string; + Codec?: string; + IsExternal?: boolean; + IsTextSubtitleStream?: boolean; + IsForced?: boolean; + IsHearingImpaired?: boolean; +} + +export interface SubtitleBlock { + Text: string; + StartPositionTicks: number; + EndPositionTicks: number; +} + +export interface SavedConnection { + token: string; + userId: string; + deviceId: string; +} + +export interface StreamOption { + value: string; + label: string; + codec: string; +} diff --git a/web/src/main.ts b/web/src/main.ts new file mode 100644 index 0000000..8dd6bc1 --- /dev/null +++ b/web/src/main.ts @@ -0,0 +1,5 @@ +import { createApp } from 'vue'; +import App from './App.vue'; +import './style.css'; + +createApp(App).mount('#app'); diff --git a/web/src/store.ts b/web/src/store.ts new file mode 100644 index 0000000..2bbab6c --- /dev/null +++ b/web/src/store.ts @@ -0,0 +1,499 @@ +import { computed, nextTick, reactive } from 'vue'; +import { ApiError, createApi } from './api.ts'; +import { parseSavedConnection } from './lib/connection.ts'; +import { associatedHelp, historySignature, recentBlocks } from './lib/history.ts'; +import { followableSessions, sessionDetails, sessionOptions } from './lib/session.ts'; +import { availableSubtitles, graphicalNotice, normalizeTrack, streamOption } from './lib/subtitles.ts'; +import { createPositionEstimator, formatPosition } from './lib/ticks.ts'; +import type { DetailField, SessionOption } from './lib/session.ts'; +import type { MediaStream, Session, StreamOption, SubtitleBlock } from './lib/types.ts'; + +const savedKey = 'compagnon.connexion'; +const disabledNotice = 'Quick Connect est désactivé sur ce serveur. Activez-le dans le tableau de bord Jellyfin, onglet Général, puis réessayez.'; + +export interface HistoryEntry { + main: string; + helps: string[]; + absent: string | null; +} + +const trackPlaceholder = (): StreamOption => ({ value: '', label: 'Choisir une piste', codec: '' }); +const helpPlaceholder = (): StreamOption => ({ value: '', label: "Choisir une piste d'aide", codec: '' }); + +export const ui = reactive({ + connectHidden: true, + code: '', + retryHidden: true, + retryLabel: 'Réessayer', + followingHidden: true, + status: 'Préparation de la connexion…', + selectDisabled: true, + selected: '', + sessionOptions: [{ value: '', label: 'Choisir une lecture' }] as SessionOption[], + details: [] as DetailField[], + trackOptions: [trackPlaceholder()] as StreamOption[], + helpOptions: [helpPlaceholder()] as StreamOption[], + tracksValue: '', + helpTracksValue: '', + tracksDisabled: true, + helpTracksDisabled: true, + trackStatus: '', + helpStatus: '', + history: [] as HistoryEntry[], + displayTicks: null as number | null, +}); + +export const detailsView = computed(() => ui.details.map(field => + field.name === 'Position estimée' ? { name: field.name, value: formatPosition(ui.displayTicks) } : field, +)); + +function randomDeviceId() { + return Array.from(crypto.getRandomValues(new Uint8Array(16)), byte => byte.toString(16).padStart(2, '0')).join(''); +} + +let deviceId = randomDeviceId(); +let token = ''; +let userId = ''; +let generation = 0; +let timer = 0; +let quickGeneration = 0; +let quickTimer = 0; +let sessions: Session[] = []; +let context = ''; +let trackGeneration = 0; +let trackNotice = ''; +let blocks: SubtitleBlock[] | null = null; +let helpGeneration = 0; +let helpBlocks: SubtitleBlock[] | null = null; +let historySignatureValue = ''; +let resyncPending = false; +let sessionController: AbortController | null = null; + +const estimator = createPositionEstimator(); +const api = createApi({ getToken: () => token, getDeviceId: () => deviceId }); + +let selectElement: HTMLSelectElement | null = null; +let retryElement: HTMLButtonElement | null = null; + +function focusSelect() { + void nextTick(() => selectElement?.focus()); +} + +function focusRetry() { + void nextTick(() => retryElement?.focus()); +} + +function codecOf(options: StreamOption[], value: string) { + return options.find(option => option.value === value)?.codec ?? ''; +} + +function clearTrack() { + trackGeneration++; + blocks = null; + historySignatureValue = ''; + ui.history = []; +} + +function resetSubtitles() { + clearTrack(); + helpGeneration++; + helpBlocks = null; + ui.helpOptions = [helpPlaceholder()]; + ui.helpTracksValue = ''; + ui.helpTracksDisabled = true; + ui.helpStatus = ''; + context = ''; + trackNotice = ''; + ui.trackOptions = [trackPlaceholder()]; + ui.tracksValue = ''; + ui.tracksDisabled = true; + ui.trackStatus = ''; +} + +function renderHistory(estimate: number | null = ui.displayTicks) { + if (blocks === null) return; + const ticks = estimate ?? ui.displayTicks; + const recent = recentBlocks(blocks, ticks); + const signature = historySignature(trackGeneration, helpGeneration, blocks, recent); + if (historySignatureValue === signature) return; + historySignatureValue = signature; + if (typeof ticks !== 'number') { + ui.history = []; + ui.trackStatus = `Position indisponible. ${trackNotice}`; + return; + } + const entries: HistoryEntry[] = []; + for (const block of recent) { + const associated = associatedHelp(helpBlocks, block); + const helps = associated?.map(help => help.Text) ?? []; + const absent = helps.length ? null : helpBlocks === null ? ui.helpStatus : 'Aucune aide associée à ce bloc.'; + entries.push({ main: block.Text, helps, absent }); + } + ui.history = entries; + ui.trackStatus = `${recent.length ? 'Historique à la position estimée.' : 'Aucun bloc commencé à cette position.'} ${trackNotice}`; +} + +async function readTrack(session: Session, value: string, codec: string): Promise { + const path = [session.NowPlayingItem?.Id || '', session.PlayState?.MediaSourceId || '', value].map(encodeURIComponent); + // Cold extraction can outlast session polling; keep its timeout independent. + const result = await api(`Compagnon/Subtitles/${path.join('/')}`, { signal: AbortSignal.timeout(120000) }); + return normalizeTrack(result, codec); +} + +async function loadHelpTrack(session: Session) { + const current = ++helpGeneration; + helpBlocks = null; + ui.helpStatus = ui.helpTracksValue + ? "Chargement de la piste d'aide… Une première extraction peut prendre du temps." + : "Aucune piste d'aide sélectionnée. Choisissez une piste dans la langue souhaitée si elle est disponible."; + renderHistory(); + if (!ui.helpTracksValue) return; + try { + const result = await readTrack(session, ui.helpTracksValue, codecOf(ui.helpOptions, ui.helpTracksValue)); + if (current !== helpGeneration) return; + helpBlocks = result; + ui.helpStatus = result.length ? 'Aide associée par chevauchement temporel.' : "Piste d'aide vide : aucune aide disponible."; + } catch { + if (current !== helpGeneration) return; + ui.helpStatus = "Piste d'aide inexploitable ou accès refusé. Choisissez une piste pour réessayer."; + } + historySignatureValue = ''; + renderHistory(); +} + +async function loadTrack(session: Session) { + clearTrack(); + if (!ui.tracksValue) { + ui.trackStatus = `Choisissez une piste principale. ${trackNotice}`; + return; + } + const current = trackGeneration; + ui.trackStatus = `Chargement de la piste… Une première extraction peut prendre du temps. ${trackNotice}`; + try { + const result = await readTrack(session, ui.tracksValue, codecOf(ui.trackOptions, ui.tracksValue)); + if (current !== trackGeneration) return; + blocks = result; + historySignatureValue = ''; + renderHistory(); + } catch { + if (current === trackGeneration) { + ui.trackStatus = `Piste inexploitable ou accès refusé. Choisissez une piste pour réessayer. ${trackNotice}`; + } + } +} + +async function updateSubtitles(session: Session | undefined) { + const item = session?.NowPlayingItem?.Id; + const source = session?.PlayState?.MediaSourceId; + if (!session || !item || !source) { + resetSubtitles(); + if (session) ui.trackStatus = 'Source réellement lue non communiquée : pistes indisponibles.'; + return; + } + const next = JSON.stringify([session.Id, item, source]); + if (next === context) { + renderHistory(); + return; + } + resetSubtitles(); + context = next; + const current = trackGeneration; + ui.trackStatus = 'Chargement des pistes…'; + try { + const result = await api(`Items/${encodeURIComponent(item || '')}/PlaybackInfo`); + if (current !== trackGeneration) return; + const mediaSource = result.MediaSources?.find((candidate: { Id: string }) => candidate.Id === source); + if (!mediaSource || !Array.isArray(mediaSource.MediaStreams)) throw new Error('Source indisponible.'); + const subtitles = (mediaSource.MediaStreams as MediaStream[]).filter(stream => stream.Type === 'Subtitle'); + trackNotice = graphicalNotice(subtitles); + const available = availableSubtitles(subtitles); + ui.tracksValue = ''; + ui.helpTracksValue = ''; + ui.trackOptions = [trackPlaceholder(), ...available.map(streamOption)]; + ui.helpOptions = [helpPlaceholder(), ...available.map(streamOption)]; + ui.tracksDisabled = !available.length; + ui.helpTracksDisabled = !available.length; + ui.helpStatus = available.length + ? "Aucune piste d'aide sélectionnée. Choisissez une piste dans la langue souhaitée si elle est disponible." + : "Aucune piste d'aide texte disponible."; + if (!available.length) { + ui.trackStatus = `Aucune piste texte disponible. ${trackNotice}`; + return; + } + const preferred = available.find(stream => stream.Index === session?.PlayState?.SubtitleStreamIndex); + ui.tracksValue = preferred ? String(preferred.Index) : ''; + await loadTrack(session); + } catch { + if (current === trackGeneration) { + ui.trackStatus = 'Pistes inaccessibles : source indisponible ou accès refusé.'; + ui.helpStatus = "Pistes d'aide inaccessibles : source indisponible ou accès refusé."; + context = ''; // Retry discovery on the next successful session observation. + } + } +} + +function renderStatus(session: Session | undefined) { + if (!session) return; + if (resyncPending) { + ui.status = 'Reprise après suspension du navigateur — vérification de la session avant de reprendre l’affichage synchronisé.'; + return; + } + if (!estimator.trackingFresh(session)) { + const observed = estimator.observedPerfAt; + const age = observed === -Infinity ? null : Math.floor((performance.now() - observed) / 1000); + ui.status = `Suivi incertain — l’affichage reste figé faute d’observation récente${age === null ? '' : ` (${age} s)`} ; il reprendra après une remontée du serveur.`; + return; + } + ui.status = 'Suivi actif — position estimée, recalée sur les remontées de Jellyfin ; pas une observation directe de l’écran.'; +} + +function render() { + ui.sessionOptions = sessionOptions(sessions, ui.selected); + ui.details = []; + const session = sessions.find(candidate => candidate.Id === ui.selected); + // A new session, media or source starts a new passage: no anchor or history + // from the previous context may survive into its position estimate. + estimator.noteContext(session ? JSON.stringify([session.Id, session.NowPlayingItem?.Id, session.PlayState?.MediaSourceId]) : ''); + void updateSubtitles(session); + if (!session) { + ui.status = ui.selected + ? 'La lecture suivie est arrêtée ou sa session a disparu.' + : sessions.length ? 'Choisissez une lecture à accompagner.' : 'Aucune lecture disponible pour ce compte.'; + return; + } + renderStatus(session); + ui.displayTicks = estimator.currentEstimate(session) ?? estimator.lastEstimateTicks; + ui.details = sessionDetails(session, Date.now()); + renderHistory(); +} + +async function poll() { + const current = generation; + clearTimeout(timer); + // Superseding an in-flight observation also covers a response that was + // computed before a suspension: only the newest request may touch the display. + sessionController?.abort(); + const controller = new AbortController(); + sessionController = controller; + try { + const result = await api('Sessions', { + signal: AbortSignal.any([controller.signal, AbortSignal.timeout(8000)]), + }) as Session[]; + if (current !== generation || sessionController !== controller) return; + estimator.observe(); + resyncPending = false; + sessions = followableSessions(result, userId); + ui.selectDisabled = false; + if (!ui.selected && sessions.length === 1) ui.selected = sessions[0].Id; + render(); + } catch (error) { + if (current !== generation || sessionController !== controller) return; + if (error instanceof ApiError && error.status === 401) { + forgetConnection('Votre connexion enregistrée n’est plus acceptée. Autorisez à nouveau le compagnon.'); + return; + } + ui.selectDisabled = true; + sessions = []; + resetSubtitles(); + ui.details = []; + ui.status = `Suivi indisponible. ${error instanceof Error ? error.message : 'Réessayez.'}`; + } + if (current === generation && token) timer = window.setTimeout(poll, 1000); +} + +function resetConnectPanel() { + ui.connectHidden = true; + ui.retryHidden = true; + ui.code = ''; +} + +async function waitForApproval(secret: string, current: number) { + try { + const state = await api(`QuickConnect/Connect?secret=${encodeURIComponent(secret)}`); + if (current !== quickGeneration) return; + if (state?.Authenticated !== true) { + quickTimer = window.setTimeout(() => { void waitForApproval(secret, current); }, 1000); + return; + } + const authenticated = await api('Users/AuthenticateWithQuickConnect', { method: 'POST', body: JSON.stringify({ Secret: secret }) }); + if (current !== quickGeneration) return; + if (typeof authenticated?.AccessToken !== 'string' || typeof authenticated?.User?.Id !== 'string') throw new Error('Réponse du serveur inattendue.'); + token = authenticated.AccessToken; + userId = authenticated.User.Id; + localStorage.setItem(savedKey, JSON.stringify({ token, userId, deviceId })); + await startFollowing(); + } catch (error) { + if (current !== quickGeneration) return; + if (error instanceof ApiError && error.status === 404) { + failConnect('Ce code a expiré. Générez un nouveau code.', 'Générer un nouveau code'); + } else { + failUnexpected(error); + } + } +} + +async function beginQuickConnect(message = 'Préparation de la connexion…') { + const current = ++quickGeneration; + generation++; + clearTimeout(timer); + clearTimeout(quickTimer); + resetConnectPanel(); + ui.status = message; + try { + if (await api('QuickConnect/Enabled') !== true) { + if (current === quickGeneration) failConnect(disabledNotice, 'Réessayer'); + return; + } + const initiated = await api('QuickConnect/Initiate', { method: 'POST' }); + if (current !== quickGeneration) return; + if (typeof initiated?.Secret !== 'string' || typeof initiated?.Code !== 'string') throw new Error('Réponse du serveur inattendue.'); + ui.connectHidden = false; + ui.code = initiated.Code; + ui.status = 'Approuvez ce code dans un client Jellyfin déjà connecté.'; + await waitForApproval(initiated.Secret, current); + } catch (error) { + if (current !== quickGeneration) return; + if (error instanceof ApiError && error.status === 401) failConnect(disabledNotice, 'Réessayer'); + else failUnexpected(error); + } +} + +function failUnexpected(error: unknown) { + failConnect(`Connexion impossible. ${error instanceof Error ? error.message : 'Réessayez.'}`, 'Réessayer'); +} + +function failConnect(message: string, label: string) { + resetConnectPanel(); + ui.status = message; + ui.retryLabel = label; + ui.retryHidden = false; + focusRetry(); +} + +function clearConnection() { + sessionController?.abort(); + sessionController = null; + localStorage.removeItem(savedKey); + token = ''; + userId = ''; + ui.selected = ''; + sessions = []; + ui.details = []; + estimator.resetEstimate(); + resetSubtitles(); + ui.sessionOptions = [{ value: '', label: 'Choisir une lecture' }]; + ui.selectDisabled = true; + ui.followingHidden = true; +} + +function forgetConnection(message: string) { + clearConnection(); + void beginQuickConnect(message); +} + +async function startFollowing() { + const current = ++generation; + quickGeneration++; + clearTimeout(quickTimer); + resetConnectPanel(); + ui.followingHidden = false; + ui.selectDisabled = true; + await poll(); + if (current === generation) focusSelect(); +} + +// Called when the browser comes back to the foreground, the page is restored or +// the network returns: the previous display was computed before the gap and +// must not be presented as live until the chosen session is observed again. +function resumeTracking() { + if (!token || document.visibilityState !== 'visible') return; + resyncPending = true; + estimator.forgetObservation(); + renderStatus(sessions.find(candidate => candidate.Id === ui.selected)); + clearTimeout(timer); + void poll(); +} + +// A local tick keeps the display moving between observations. It stops as soon +// as the observation goes stale, so a loss of tracking is never hidden by +// unbounded extrapolation. The poll remains the only source of new observations. +function tick() { + if (!token) return; + const session = sessions.find(candidate => candidate.Id === ui.selected); + if (!session) return; + const ticks = estimator.currentEstimate(session); + renderStatus(session); + if (ticks === null) return; + ui.displayTicks = ticks; + renderHistory(ticks); +} + +export function selectSession(event: Event) { + ui.selected = (event.target as HTMLSelectElement).value; + estimator.resetSeeded(); + render(); +} + +export function changeTrack(event: Event) { + ui.tracksValue = (event.target as HTMLSelectElement).value; + const session = sessions.find(candidate => candidate.Id === ui.selected); + if (session) void loadTrack(session); +} + +export function changeHelpTrack(event: Event) { + ui.helpTracksValue = (event.target as HTMLSelectElement).value; + const session = sessions.find(candidate => candidate.Id === ui.selected); + if (session) void loadHelpTrack(session); +} + +export function retry() { + void beginQuickConnect(); +} + +export async function logout() { + // Revoke the companion's own token; it is captured before the connection is forgotten. + const request = api('Sessions/Logout', { method: 'POST' }); + const current = ++quickGeneration; + generation++; + clearTimeout(timer); + clearTimeout(quickTimer); + clearConnection(); + resetConnectPanel(); + ui.status = 'Déconnecté.'; + ui.retryLabel = 'Se connecter'; + ui.retryHidden = false; + focusRetry(); + try { + await request; + } catch { + // A revocation that fails after a newer attempt began must not overwrite it. + if (current === quickGeneration) ui.status = 'Déconnecté de ce navigateur. Le serveur n’a pas confirmé la révocation du jeton.'; + } +} + +function onVisibilityChange() { + if (document.visibilityState === 'visible') resumeTracking(); +} + +function onPageShow(event: PageTransitionEvent) { + if (event.persisted) resumeTracking(); +} + +export function startCompanion(targets: { select: HTMLSelectElement | null; retry: HTMLButtonElement | null }) { + selectElement = targets.select; + retryElement = targets.retry; + document.addEventListener('visibilitychange', onVisibilityChange); + window.addEventListener('pageshow', onPageShow); + window.addEventListener('online', resumeTracking); + document.addEventListener('resume', resumeTracking as EventListener); + window.setInterval(tick, 100); + const saved = parseSavedConnection(localStorage.getItem(savedKey)); + if (saved) { + token = saved.token; + userId = saved.userId; + deviceId = saved.deviceId; + void startFollowing(); + } else { + void beginQuickConnect(); + } +} diff --git a/src/Compagnon/Web/style.css b/web/src/style.css similarity index 100% rename from src/Compagnon/Web/style.css rename to web/src/style.css diff --git a/web/tsconfig.json b/web/tsconfig.json new file mode 100644 index 0000000..3768219 --- /dev/null +++ b/web/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "target": "ES2022", + "module": "ESNext", + "moduleResolution": "bundler", + "lib": ["ES2022", "DOM", "DOM.Iterable"], + "types": ["node", "vite/client"], + "strict": true, + "noEmit": true, + "allowImportingTsExtensions": true, + "verbatimModuleSyntax": true, + "isolatedModules": true, + "skipLibCheck": true, + "useDefineForClassFields": true + }, + "include": ["src/**/*.ts", "src/**/*.vue", "vite.config.ts"] +} diff --git a/web/vite.config.ts b/web/vite.config.ts new file mode 100644 index 0000000..6f42822 --- /dev/null +++ b/web/vite.config.ts @@ -0,0 +1,38 @@ +import { fileURLToPath } from 'node:url'; +import { defineConfig } from 'vite'; +import vue from '@vitejs/plugin-vue'; + +// The plugin serves fixed asset names under /Compagnon/; keep the build output +// stable so the controller whitelist stays trivial and the tests can serve it. +// Development only: serve the interface with Vite and forward Jellyfin's API +// to a running server, so `npm run dev` needs no plugin packaging loop. +const jellyfin = process.env.JELLYFIN_URL ?? 'http://127.0.0.1:8096'; + +export default defineConfig({ + root: fileURLToPath(new URL('.', import.meta.url)), + base: './', + plugins: [vue()], + server: { + proxy: Object.fromEntries( + ['/Sessions', '/Items', '/QuickConnect', '/Users', '/Compagnon/Subtitles'] + .map(path => [path, { target: jellyfin, changeOrigin: true }]), + ), + }, + build: { + outDir: fileURLToPath(new URL('../src/Compagnon/Web', import.meta.url)), + emptyOutDir: true, + // The controller's CSP allows 'self' only: never emit an inline script. + modulePreload: { polyfill: false }, + rollupOptions: { + output: { + entryFileNames: 'app.js', + chunkFileNames: 'app.js', + // Only the stylesheet may take the fixed name the controller serves; + // any other asset keeps its own name and fails loudly instead of + // silently overwriting it. + assetFileNames: assetInfo => + assetInfo.names?.some(name => name.endsWith('.css')) ? 'style.css' : '[name][extname]', + }, + }, + }, +});