push-wvlyutrvykvk #5

Merged
eric merged 3 commits from push-wvlyutrvykvk into main 2025-09-08 18:09:54 +02:00
26 changed files with 6607 additions and 17 deletions
Showing only changes of commit fa6ed6ae34 - Show all commits

View File

@@ -1,12 +1,23 @@
APP_NAME=pmomusic
build:
# Build Go app
build: web
go build -o bin/$(APP_NAME) ./cmd/$(APP_NAME)
# Build web frontend
web:
@ echo Building the Web app
@ cd pmoapp/web && npm install && npm run build
@ echo Web app built
# Run Go app
run:
go run ./cmd/$(APP_NAME)
# Clean Go binary and web build
clean:
rm -rf bin/
rm -rf web/dist
all: build
# Build everything
all: build

103
doc/webapp.md Normal file
View File

@@ -0,0 +1,103 @@
Oui exactement, tu peux clairement séparer ton **backend Go** (PMO logger, serveur UPnP, etc.) de la **web app** dans un nouveau package, par exemple `pmoapp`, et lembarquer via `embed`. Cest dailleurs la meilleure pratique si tu envisages une **application web complète et évolutive**, avec plusieurs pages, routes, et fonctionnalités.
Voici comment je te conseille de procéder et pourquoi :
---
## **1⃣ Création du package web indépendant**
```bash
mkdir pmoapp
cd pmoapp
npm create vite@latest web
```
* **Nom du projet** : `web`
* **Framework** : React (on garde ton choix initial, populaire et bien documenté pour des interfaces complexes)
### **Pourquoi React** :
* Large écosystème (bibliothèques UI, state management, routing)
* Réactivité naturelle pour les flux temps réel (comme SSE)
* Compatible avec TypeScript, ce qui est pratique si ton projet Go devient complexe et que tu veux des typings fiables.
### **Choix du langage**
Les options que tu as :
| Option | Avantages | Quand la choisir |
| --------------------------- | ------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
| **TypeScript** (recommandé) | Typage statique, moins derreurs runtime, meilleur pour projet long terme | Quand tu commences un projet sérieux et que tu veux scalabilité et sécurité |
| TypeScript + SWC | SWC compile plus vite que Vite/TS, utile pour gros projets | Si tu vises build ultra-rapide et dev rapide |
| JavaScript | Simple, pas de compilation typée | Pour prototypage rapide ou projet temporaire |
| JavaScript + SWC | JS mais compilation rapide | Peu utilisé, peu dintérêt si tu ne fais pas du JS lourd |
**✅ Recommandation : TypeScript classique**
* Tu as un projet qui va évoluer et peut devenir complexe
* Les types aident à maintenir la cohérence avec le backend Go (ex : typage des logs, props des composants, etc.)
* Tu nas pas besoin de SWC pour linstant, Vite est déjà très rapide pour dev et build
---
## **2⃣ Ajouter un build statique pour embed**
Dans ton Go package `pmoapp`, crée un fichier `web.go` :
```go
package pmoapp
import (
"embed"
"io/fs"
"net/http"
)
//go:embed web/dist/*
var AppRoot embed.FS
// Expose static files
func Handler(mux *http.ServeMux) {
fsys, _ := fs.Sub(AppRoot, "web/dist")
mux.Handle("/app/", http.StripPrefix("/app/", http.FileServer(http.FS(fsys))))
mux.HandleFunc("/app", func(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, "web/dist/index.html")
})
}
```
**Pourquoi :**
* `/app` → sert lentrée de lapplication (`index.html`)
* `/app/` → sert tous les assets statiques générés par Vite (`dist/`)
* Avec `embed.FS`, ton build React est complètement **embarqué dans le binaire Go**, tu nas pas besoin de Node en production.
---
## **3⃣ Workflow futur**
1. Développer le frontend dans `pmoapp/web` avec React/TypeScript.
2. À chaque modification :
```bash
cd pmoapp/web
npm run build
```
3. Ton backend Go peut **réutiliser la même variable `AppRoot`** pour servir les pages.
Tu pourras ensuite :
* Ajouter des routes React (`react-router-dom`)
* Ajouter des pages dynamiques
* Utiliser des composants pour logs, dashboard, configuration, etc.
---
Si tu veux, je peux te préparer **larborescence complète recommandée pour ton projet Go + React**, avec :
* `pmolog` pour le logger SSE
* `pmoapp` pour la web app React
* Embedding automatique du build Vite dans le binaire Go
Veuxtu que je fasse ça?

35
pmoapp/web.go Normal file
View File

@@ -0,0 +1,35 @@
package pmoapp
import (
"embed"
"io/fs"
"net/http"
)
//go:embed web/dist/*
var AppRoot embed.FS
func Handler(mux *http.ServeMux) {
fsys, _ := fs.Sub(AppRoot, "web/dist")
// /app → page principale
mux.Handle("/app/", http.StripPrefix("/app/", http.FileServer(http.FS(fsys))))
mux.HandleFunc("/app", func(w http.ResponseWriter, r *http.Request) {
index, _ := fs.ReadFile(fsys, "index.html")
w.Header().Set("Content-Type", "text/html; charset=utf-8")
w.Write(index)
})
// /log → interface log (React)
mux.Handle("/log/", http.StripPrefix("/log/", http.FileServer(http.FS(fsys))))
mux.HandleFunc("/log", func(w http.ResponseWriter, r *http.Request) {
index, _ := fs.ReadFile(fsys, "index.html")
w.Header().Set("Content-Type", "text/html; charset=utf-8")
w.Write(index)
})
// / → redirect vers /app
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/app", http.StatusFound)
})
}

24
pmoapp/web/.gitignore vendored Normal file
View File

@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

69
pmoapp/web/README.md Normal file
View File

@@ -0,0 +1,69 @@
# React + TypeScript + Vite
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
Currently, two official plugins are available:
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
## Expanding the ESLint configuration
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
```js
export default tseslint.config([
globalIgnores(['dist']),
{
files: ['**/*.{ts,tsx}'],
extends: [
// Other configs...
// Remove tseslint.configs.recommended and replace with this
...tseslint.configs.recommendedTypeChecked,
// Alternatively, use this for stricter rules
...tseslint.configs.strictTypeChecked,
// Optionally, add this for stylistic rules
...tseslint.configs.stylisticTypeChecked,
// Other configs...
],
languageOptions: {
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
tsconfigRootDir: import.meta.dirname,
},
// other options...
},
},
])
```
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
```js
// eslint.config.js
import reactX from 'eslint-plugin-react-x'
import reactDom from 'eslint-plugin-react-dom'
export default tseslint.config([
globalIgnores(['dist']),
{
files: ['**/*.{ts,tsx}'],
extends: [
// Other configs...
// Enable lint rules for React
reactX.configs['recommended-typescript'],
// Enable lint rules for React DOM
reactDom.configs.recommended,
],
languageOptions: {
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
tsconfigRootDir: import.meta.dirname,
},
// other options...
},
},
])
```

View File

@@ -0,0 +1,23 @@
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
import tseslint from 'typescript-eslint'
import { globalIgnores } from 'eslint/config'
export default tseslint.config([
globalIgnores(['dist']),
{
files: ['**/*.{ts,tsx}'],
extends: [
js.configs.recommended,
tseslint.configs.recommended,
reactHooks.configs['recommended-latest'],
reactRefresh.configs.vite,
],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
},
},
])

11
pmoapp/web/index.html Normal file
View File

@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>PMO Log</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

5869
pmoapp/web/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

40
pmoapp/web/package.json Normal file
View File

@@ -0,0 +1,40 @@
{
"name": "web",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview"
},
"dependencies": {
"@types/react-syntax-highlighter": "^15.5.13",
"he": "^1.2.0",
"react": "^19.1.1",
"react-dom": "^19.1.1",
"react-markdown": "^10.1.0",
"react-syntax-highlighter": "^15.6.6",
"rehype-raw": "^7.0.0"
},
"devDependencies": {
"@eslint/js": "^9.33.0",
"@tailwindcss/postcss": "^4.1.13",
"@tailwindcss/typography": "^0.5.16",
"@types/he": "^1.2.3",
"@types/react": "^19.1.10",
"@types/react-dom": "^19.1.7",
"@vitejs/plugin-react": "^5.0.0",
"autoprefixer": "^10.4.21",
"eslint": "^9.33.0",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.20",
"globals": "^16.3.0",
"postcss": "^8.5.6",
"tailwindcss": "^4.1.13",
"typescript": "~5.8.3",
"typescript-eslint": "^8.39.1",
"vite": "^7.1.2"
}
}

View File

@@ -0,0 +1,6 @@
export default {
plugins: {
"@tailwindcss/postcss": {},
// autoprefixer est inclus par défaut dans v4, donc souvent optionnel
},
}

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

123
pmoapp/web/src/App.css Normal file
View File

@@ -0,0 +1,123 @@
/* App.css ou index.css */
@import "tailwindcss";
@tailwind base;
@tailwind components;
@tailwind utilities;
/* Styles custom */
.log-container {
@apply p-4 space-y-2 min-h-screen;
}
.log-entry {
@apply rounded-lg p-2 font-mono shadow-md;
}
.log-entry.info { @apply bg-gray-800 text-green-400; }
.log-entry.warning { @apply bg-gray-800 text-yellow-400; }
.log-entry.error { @apply bg-gray-800 text-red-400; }
.log-entry.debug { @apply bg-gray-800 text-purple-400; }
/* Styles pour le thème sombre */
.dark .log-entry {
background: linear-gradient(90deg, rgba(30, 30, 30, 0.5), transparent);
border-left: 4px solid;
}
.dark .log-entry.error {
border-color: #f87171;
background: linear-gradient(90deg, rgba(248, 113, 113, 0.1), transparent);
}
.dark .log-entry.warning {
border-color: #fbbf24;
background: linear-gradient(90deg, rgba(251, 191, 36, 0.1), transparent);
}
.dark .log-entry.info {
border-color: #60a5fa;
background: linear-gradient(90deg, rgba(96, 165, 250, 0.1), transparent);
}
.dark .log-entry.debug {
border-color: #a78bfa;
background: linear-gradient(90deg, rgba(167, 139, 250, 0.1), transparent);
}
/* Styles pour le thème clair */
.light .log-entry {
background: linear-gradient(90deg, rgba(240, 240, 240, 0.5), transparent);
border-left: 4px solid;
}
.light .log-entry.error {
border-color: #dc2626;
background: linear-gradient(90deg, rgba(220, 38, 38, 0.1), transparent);
}
.light .log-entry.warning {
border-color: #d97706;
background: linear-gradient(90deg, rgba(217, 119, 6, 0.1), transparent);
}
.light .log-entry.info {
border-color: #2563eb;
background: linear-gradient(90deg, rgba(37, 99, 235, 0.1), transparent);
}
.light .log-entry.debug {
border-color: #7c3aed;
background: linear-gradient(90deg, rgba(124, 58, 237, 0.1), transparent);
}
/* Animation pour les nouveaux logs */
@keyframes highlight {
0% { opacity: 0.5; }
100% { opacity: 1; }
}
.log-entry:first-child {
animation: highlight 0.5s ease;
}
/* Styles pour la barre de défilement */
.log-container::-webkit-scrollbar {
width: 8px;
}
.log-container::-webkit-scrollbar-track {
background: transparent;
}
.log-container::-webkit-scrollbar-thumb {
background: rgba(156, 163, 175, 0.5);
border-radius: 4px;
}
.log-container::-webkit-scrollbar-thumb:hover {
background: rgba(156, 163, 175, 0.7);
}
.dark .log-container::-webkit-scrollbar-thumb {
background: rgba(75, 85, 99, 0.5);
}
.dark .log-container::-webkit-scrollbar-thumb:hover {
background: rgba(75, 85, 99, 0.7);
}
/* Amélioration de l'apparence des détails */
details summary::-webkit-details-marker {
display: none;
}
details summary {
list-style: none;
transition: color 0.2s ease;
}
details[open] summary {
margin-bottom: 0.5rem;
}

53
pmoapp/web/src/App.tsx Normal file
View File

@@ -0,0 +1,53 @@
// App.tsx
import { useEffect, useState } from "react";
import { Logs, type LogEntry } from "./Logs";
import "./App.css";
export default function App() {
const [theme, setTheme] = useState<"light" | "dark">("dark");
const [logs, setLogs] = useState<LogEntry[]>([]);
const toggleTheme = () =>
setTheme((prev) => (prev === "dark" ? "light" : "dark"));
// Fonction pour transformer le SSE en LogEntry
const mapSSEToLogEntry = (sseData: any, index: number): LogEntry => ({
id: sseData.time || `log-${index}`,
level: sseData.level || "info",
message: sseData.content || "",
});
useEffect(() => {
const evtSource = new EventSource("/log-sse");
let idx = 0;
evtSource.addEventListener("message", (e: MessageEvent) => {
try {
const data = JSON.parse(e.data);
const newLog = mapSSEToLogEntry(data, idx++);
setLogs((prev) => [...prev, newLog]);
} catch (err) {
console.error("Erreur parsing SSE:", err);
}
});
return () => {
evtSource.close();
};
}, []);
return (
<div className={theme}>
<header className="flex items-center justify-between p-4 bg-neutral-800">
<h1 className="text-xl font-bold">Mon Logger</h1>
<button
className="px-4 py-2 bg-blue-600 rounded hover:bg-blue-500"
onClick={toggleTheme}
>
Theme: {theme}
</button>
</header>
<Logs logs={logs} theme={theme} />
</div>
);
}

64
pmoapp/web/src/Logs.tsx Normal file
View File

@@ -0,0 +1,64 @@
// Logs.tsx
import ReactMarkdown from "react-markdown";
import rehypeRaw from "rehype-raw";
export type LogEntry = {
id: string;
level: "info" | "warn" | "error" | "debug";
message: string;
};
type LogsProps = {
logs: LogEntry[];
theme: "light" | "dark";
};
export function Logs({ logs, theme }: LogsProps) {
const levelClass = (level: LogEntry["level"]) => {
switch (level) {
case "info":
return "info";
case "warn":
return "warning";
case "error":
return "error";
case "debug":
return "debug";
default:
return "info";
}
};
const decodeMessage = (msg: string) => {
const txt = document.createElement("textarea");
txt.innerHTML = msg;
return txt.value;
};
return (
<div className={`log-container ${theme}`}>
{logs.map((log) => (
<div key={log.id} className={`log-entry ${levelClass(log.level)}`}>
<ReactMarkdown
rehypePlugins={[rehypeRaw]}
children={decodeMessage(log.message)}
components={{
code({ node, className, children, ...props }) {
return (
<code
className={`bg-gray-700 text-white px-1 py-0.5 rounded ${
className || ""
}`}
{...props}
>
{children}
</code>
);
},
}}
/>
</div>
))}
</div>
);
}

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

20
pmoapp/web/src/custom.d.ts vendored Normal file
View File

@@ -0,0 +1,20 @@
// Déclare les modules CSS pour que TypeScript les accepte
declare module '*.css'
// Déclare les fichiers SVG pour que TypeScript les accepte
declare module '*.svg' {
const content: string
export default content
}
// Déclare les fichiers PNG, JPG si tu en utilises
declare module '*.png'
declare module '*.jpg'
declare module '*.jpeg'
declare module '*.gif'
// Déclare les fichiers JSON si nécessaire
declare module '*.json' {
const value: any
export default value
}

68
pmoapp/web/src/index.css Normal file
View File

@@ -0,0 +1,68 @@
:root {
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
line-height: 1.5;
font-weight: 400;
color-scheme: light dark;
color: rgba(255, 255, 255, 0.87);
background-color: #242424;
font-synthesis: none;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
a {
font-weight: 500;
color: #646cff;
text-decoration: inherit;
}
a:hover {
color: #535bf2;
}
body {
margin: 0;
display: flex;
place-items: center;
min-width: 320px;
min-height: 100vh;
}
h1 {
font-size: 3.2em;
line-height: 1.1;
}
button {
border-radius: 8px;
border: 1px solid transparent;
padding: 0.6em 1.2em;
font-size: 1em;
font-weight: 500;
font-family: inherit;
background-color: #1a1a1a;
cursor: pointer;
transition: border-color 0.25s;
}
button:hover {
border-color: #646cff;
}
button:focus,
button:focus-visible {
outline: 4px auto -webkit-focus-ring-color;
}
@media (prefers-color-scheme: light) {
:root {
color: #213547;
background-color: #ffffff;
}
a:hover {
color: #747bff;
}
button {
background-color: #f9f9f9;
}
}

10
pmoapp/web/src/main.tsx Normal file
View File

@@ -0,0 +1,10 @@
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App";
import "./index.css";
ReactDOM.createRoot(document.getElementById("root")!).render(
<React.StrictMode>
<App />
</React.StrictMode>
);

1
pmoapp/web/src/vite-env.d.ts vendored Normal file
View File

@@ -0,0 +1 @@
/// <reference types="vite/client" />

View File

@@ -0,0 +1,5 @@
module.exports = {
content: ["./src/**/*.{js,ts,jsx,tsx}"],
theme: { extend: {} },
plugins: [require("@tailwindcss/typography")],
};

View File

@@ -0,0 +1,27 @@
{
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
"target": "ES2022",
"useDefineForClassFields": true,
"lib": ["ES2022", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"verbatimModuleSyntax": true,
"moduleDetection": "force",
"noEmit": true,
"jsx": "react-jsx",
/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"erasableSyntaxOnly": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
"include": ["src"]
}

7
pmoapp/web/tsconfig.json Normal file
View File

@@ -0,0 +1,7 @@
{
"files": [],
"references": [
{ "path": "./tsconfig.app.json" },
{ "path": "./tsconfig.node.json" }
]
}

View File

@@ -0,0 +1,25 @@
{
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
"target": "ES2023",
"lib": ["ES2023"],
"module": "ESNext",
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"verbatimModuleSyntax": true,
"moduleDetection": "force",
"noEmit": true,
/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"erasableSyntaxOnly": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
"include": ["vite.config.ts"]
}

View File

@@ -0,0 +1,7 @@
import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
export default defineConfig({
base: "/log/",
plugins: [react()],
});

View File

@@ -3,7 +3,6 @@ package pmolog
import (
"container/ring"
"context"
_ "embed"
"encoding/json"
"fmt"
"net/http"
@@ -14,9 +13,6 @@ import (
"github.com/sirupsen/logrus"
)
//go:embed index.html
var indexHTML string
const (
bufferSize = 1000
clientChanSize = 50
@@ -175,15 +171,6 @@ func sseHandler(w http.ResponseWriter, r *http.Request) {
}
}
// ---------- Handlers ----------
func indexHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/html; charset=utf-8")
w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
fmt.Fprint(w, indexHTML)
}
// LoggerWeb installe les routes et arrête le broker quand ctx est annulé.
func LoggerWeb(ctx context.Context, mux *http.ServeMux) {
logrus.SetFormatter(&logrus.TextFormatter{
@@ -192,7 +179,6 @@ func LoggerWeb(ctx context.Context, mux *http.ServeMux) {
})
logrus.AddHook(SSELogHook{})
mux.HandleFunc("/log", indexHandler)
mux.HandleFunc("/log-sse", sseHandler)
// Goroutine d'arrêt

View File

@@ -14,6 +14,7 @@ import (
log "github.com/sirupsen/logrus"
"gargoton.petite-maison-orange.fr/eric/pmomusic/netutils"
"gargoton.petite-maison-orange.fr/eric/pmomusic/pmoapp"
"gargoton.petite-maison-orange.fr/eric/pmomusic/pmolog"
"gargoton.petite-maison-orange.fr/eric/pmomusic/ssdp"
)
@@ -78,7 +79,7 @@ func (s *Server) Start() error {
s.mu.RLock()
mux.HandleFunc("/", s.ServeDebugIndex)
pmoapp.Handler(mux)
s.httpSrv = &http.Server{
Addr: fmt.Sprintf(":%d", s.HTTPPort),