Merge branch 'master' into next

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Co-authored-by: Renovate Bot <renovate-bot@valverde.cloud>
Reviewed-on: #85

Dockerfile

@@ -1,5 +1,5 @@
-FROM oven/bun:1.3.14@sha256:e10577f0db68676a7024391c6e5cb4b879ebd17188ab750cf10024a6d700e5c4 AS bun
+FROM oven/bun:1.3.4@sha256:7608db4aeb44f1fe8169cc8ec7055376b3013557b106407ccf092b00e426407d AS bun
-FROM node:22.22.3-trixie-slim@sha256:02684a61c3e87ae3e9ec7ef98e312a6ec35483644e204e80fc053648c3e87d75
+FROM node:22.21.1-trixie-slim@sha256:98e1429d1a0b99378b4de43fa385f0746fd6276faf4feeb6104d91f6bad290f9
 COPY --from=bun /usr/local/bin/bun \
                 /usr/local/bin/bunx \
                 /usr/local/bin/
@@ -7,7 +7,7 @@ WORKDIR /app
 COPY ./ ./
 RUN bun install --frozen-lockfile && \
     bun lint:tsc && \
-    bun lint:biome && \
+    # bun lint:biome && \
     bun run build && \
     bun clean:cache && \
     bun clean:modules && \

compose.yml

@@ -11,7 +11,7 @@ x-env-base: &env-base
 services:
   server:
     <<: *service-base
-    image: oven/bun:1.3.14@sha256:e10577f0db68676a7024391c6e5cb4b879ebd17188ab750cf10024a6d700e5c4
+    image: oven/bun:1.3.4@sha256:7608db4aeb44f1fe8169cc8ec7055376b3013557b106407ccf092b00e426407d
     volumes:
       - *volume-app
     working_dir: /app/packages/server
@@ -22,7 +22,7 @@ services:
 
   cli:
     <<: *service-base
-    image: oven/bun:1.3.14@sha256:e10577f0db68676a7024391c6e5cb4b879ebd17188ab750cf10024a6d700e5c4
+    image: oven/bun:1.3.4@sha256:7608db4aeb44f1fe8169cc8ec7055376b3013557b106407ccf092b00e426407d
     volumes:
       - *volume-app
     working_dir: /app
@@ -35,7 +35,7 @@ services:
 
   webapp:
     <<: *service-base
-    image: node:22.22.3@sha256:e3ca095133ba41a0a73b009f19e4253f1a878e70bb9499f6a9d21b19d082bd91
+    image: node:22.21.1@sha256:4ad2c2b350ab49fb637ab40a269ffe207c61818bb7eb3a4ea122001a0c605e1f
     ports:
       - ${PORT:?PORT missing}:80
     volumes:
@@ -48,7 +48,7 @@ services:
 
   tempo:
     <<: *service-base
-    image: grafana/tempo:latest@sha256:5408df706752f99d06ea3d6bafb46629111db1102b917812529734ace54093c5
+    image: grafana/tempo:latest@sha256:cfe9b6a2e9730f3acb4437727a25e481554a7e00685c6170af73ac52c46c9707
     command: [-config.file=/etc/tempo.yaml]
     volumes:
       - ./telemetry/tempo.yaml:/etc/tempo.yaml
@@ -56,7 +56,7 @@ services:
     stop_signal: SIGKILL
 
   prometheus:
-    image: prom/prometheus:v3.11.3@sha256:e4254400b85610324913f0dc4acf92603d9984e7519414c5a12811aa6146acc3
+    image: prom/prometheus:v3.8.0@sha256:d936808bdea528155c0154a922cd42fd75716b8bb7ba302641350f9f3eaeba09
     command:
       - --config.file=/etc/prometheus.yaml
       - --web.enable-remote-write-receiver
@@ -65,7 +65,7 @@ services:
       - ./telemetry/prometheus.yaml:/etc/prometheus.yaml
 
   grafana:
-    image: grafana/grafana:latest@sha256:135f4b96b7a54f904415dc51e71a1cd945b1f8400772b2feac2df5112b43f4ed
+    image: grafana/grafana:latest@sha256:793c8719b0043ed885d1e75200a62d8adf63f0eae00f6f12b7a98eb7293a525c
     volumes:
       - ./telemetry/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
     environment:

packages/server/package.json

@@ -26,6 +26,7 @@
     "@opentelemetry/sdk-trace-node": "^2.1.0",
     "@opentelemetry/sdk-trace-web": "^2.1.0",
     "@website/common": "workspace:*",
+    "@website/webapp": "workspace:*",
     "effect": "^3.17.13"
   },
   "devDependencies": {

packages/webapp/src/routeTree.gen.ts

@@ -9,24 +9,24 @@
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
 import { Route as rootRouteImport } from './routes/__root'
-import { Route as PazismemodRouteImport } from './routes/pazismemod'
 import { Route as MainRouteImport } from './routes/_main'
-import { Route as PazismemodIndexRouteImport } from './routes/pazismemod.index'
+import { Route as PazismemodRouteRouteImport } from './routes/pazismemod/route'
+import { Route as PazismemodIndexRouteImport } from './routes/pazismemod/index'
 import { Route as MainIndexRouteImport } from './routes/_main.index'
 
-const PazismemodRoute = PazismemodRouteImport.update({
-  id: '/pazismemod',
-  path: '/pazismemod',
-  getParentRoute: () => rootRouteImport,
-} as any)
 const MainRoute = MainRouteImport.update({
   id: '/_main',
   getParentRoute: () => rootRouteImport,
 } as any)
+const PazismemodRouteRoute = PazismemodRouteRouteImport.update({
+  id: '/pazismemod',
+  path: '/pazismemod',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const PazismemodIndexRoute = PazismemodIndexRouteImport.update({
   id: '/',
   path: '/',
-  getParentRoute: () => PazismemodRoute,
+  getParentRoute: () => PazismemodRouteRoute,
 } as any)
 const MainIndexRoute = MainIndexRouteImport.update({
   id: '/',
@@ -35,7 +35,7 @@ const MainIndexRoute = MainIndexRouteImport.update({
 } as any)
 
 export interface FileRoutesByFullPath {
-  '/pazismemod': typeof PazismemodRouteWithChildren
+  '/pazismemod': typeof PazismemodRouteRouteWithChildren
   '/': typeof MainIndexRoute
   '/pazismemod/': typeof PazismemodIndexRoute
 }
@@ -45,8 +45,8 @@ export interface FileRoutesByTo {
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
+  '/pazismemod': typeof PazismemodRouteRouteWithChildren
   '/_main': typeof MainRouteWithChildren
-  '/pazismemod': typeof PazismemodRouteWithChildren
   '/_main/': typeof MainIndexRoute
   '/pazismemod/': typeof PazismemodIndexRoute
 }
@@ -55,28 +55,28 @@ export interface FileRouteTypes {
   fullPaths: '/pazismemod' | '/' | '/pazismemod/'
   fileRoutesByTo: FileRoutesByTo
   to: '/' | '/pazismemod'
-  id: '__root__' | '/_main' | '/pazismemod' | '/_main/' | '/pazismemod/'
+  id: '__root__' | '/pazismemod' | '/_main' | '/_main/' | '/pazismemod/'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
+  PazismemodRouteRoute: typeof PazismemodRouteRouteWithChildren
   MainRoute: typeof MainRouteWithChildren
-  PazismemodRoute: typeof PazismemodRouteWithChildren
 }
 
 declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
+    '/_main': {
+      id: '/_main'
+      path: ''
+      fullPath: '/'
+      preLoaderRoute: typeof MainRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/pazismemod': {
       id: '/pazismemod'
       path: '/pazismemod'
       fullPath: '/pazismemod'
-      preLoaderRoute: typeof PazismemodRouteImport
+      preLoaderRoute: typeof PazismemodRouteRouteImport
-      parentRoute: typeof rootRouteImport
-    }
-    '/_main': {
-      id: '/_main'
-      path: ''
-      fullPath: ''
-      preLoaderRoute: typeof MainRouteImport
       parentRoute: typeof rootRouteImport
     }
     '/pazismemod/': {
@@ -84,7 +84,7 @@ declare module '@tanstack/react-router' {
       path: '/'
       fullPath: '/pazismemod/'
       preLoaderRoute: typeof PazismemodIndexRouteImport
-      parentRoute: typeof PazismemodRoute
+      parentRoute: typeof PazismemodRouteRoute
     }
     '/_main/': {
       id: '/_main/'
@@ -96,6 +96,18 @@ declare module '@tanstack/react-router' {
   }
 }
 
+interface PazismemodRouteRouteChildren {
+  PazismemodIndexRoute: typeof PazismemodIndexRoute
+}
+
+const PazismemodRouteRouteChildren: PazismemodRouteRouteChildren = {
+  PazismemodIndexRoute: PazismemodIndexRoute,
+}
+
+const PazismemodRouteRouteWithChildren = PazismemodRouteRoute._addFileChildren(
+  PazismemodRouteRouteChildren,
+)
+
 interface MainRouteChildren {
   MainIndexRoute: typeof MainIndexRoute
 }
@@ -106,21 +118,9 @@ const MainRouteChildren: MainRouteChildren = {
 
 const MainRouteWithChildren = MainRoute._addFileChildren(MainRouteChildren)
 
-interface PazismemodRouteChildren {
-  PazismemodIndexRoute: typeof PazismemodIndexRoute
-}
-
-const PazismemodRouteChildren: PazismemodRouteChildren = {
-  PazismemodIndexRoute: PazismemodIndexRoute,
-}
-
-const PazismemodRouteWithChildren = PazismemodRoute._addFileChildren(
-  PazismemodRouteChildren,
-)
-
 const rootRouteChildren: RootRouteChildren = {
+  PazismemodRouteRoute: PazismemodRouteRouteWithChildren,
   MainRoute: MainRouteWithChildren,
-  PazismemodRoute: PazismemodRouteWithChildren,
 }
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)

packages/webapp/src/routes/_main.tsx

@@ -9,9 +9,22 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp
 
 
 export const Route = createFileRoute("/_main")({
-    component: SharedLayout,
+    component: WIPLayout,
 })
 
+function WIPLayout() {
+    return (
+        <div className="mx-auto w-[750px] max-w-full px-5 pt-28 pb-10 text-foreground">
+            <Card>
+                <CardContent>
+                    <Outlet />
+                </CardContent>
+            </Card>
+        </div>
+    )
+}
+
+// @ts-ignore
 function SharedLayout() {
     const { t, i18n } = useTranslation()
 

packages/webapp/src/routes/pazismemod.index.tsx

@@ -1,10 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router"
-
-
-export const Route = createFileRoute("/pazismemod/")({
-    component: RouteComponent,
-})
-
-function RouteComponent() {
-    return null
-}

packages/webapp/src/routes/pazismemod/index.css

@@ -0,0 +1,7 @@
+@font-face {
+  font-family: "Coolvetica";
+  src: url("/fonts/coolvetica_rg.otf") format("opentype");
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+}

packages/webapp/src/routes/pazismemod/index.tsx

@@ -0,0 +1,104 @@
+import { createFileRoute } from "@tanstack/react-router"
+import { useEffect, useRef } from "react"
+import "./index.css"
+import screen1 from "./screen1.png"
+import song from "./we_are_charlie_kirk.mp3"
+
+
+export const Route = createFileRoute("/pazismemod/")({
+    component: RouteComponent,
+})
+
+const SONG_START_TIME = 46
+
+function RouteComponent() {
+    const audioRef = useRef<HTMLAudioElement>(null)
+
+    useEffect(() => {
+        const audio = audioRef.current
+
+        if (!audio) {
+            return
+        }
+
+        const syncStartTime = () => {
+            if (Number.isFinite(audio.duration) && audio.duration > SONG_START_TIME) {
+                audio.currentTime = SONG_START_TIME
+            }
+        }
+
+        const loopFromOffset = async () => {
+            syncStartTime()
+
+            try {
+                await audio.play()
+            }
+            catch {
+                // Ignore autoplay failures. Some embedded browsers require user interaction.
+            }
+        }
+
+        const tryAutoplay = async () => {
+            syncStartTime()
+
+            try {
+                await audio.play()
+            }
+            catch {
+                // Ignore autoplay failures. Some embedded browsers require user interaction.
+            }
+        }
+
+        const gameDetails = (
+            _servername: string,
+            _serverurl: string,
+            _mapname: string,
+            _maxplayers: string,
+            _steamid: string,
+            _gamemode: string,
+            volume: number | string,
+        ) => {
+            const parsedVolume = Number(volume)
+
+            if (Number.isFinite(parsedVolume)) {
+                audio.volume = Math.min(1, Math.max(0, parsedVolume))
+            }
+        }
+
+        audio.addEventListener("loadedmetadata", syncStartTime)
+        audio.addEventListener("ended", loopFromOffset)
+        void tryAutoplay()
+        ;(window as Window & { GameDetails?: typeof gameDetails }).GameDetails = gameDetails
+
+        return () => {
+            audio.removeEventListener("loadedmetadata", syncStartTime)
+            audio.removeEventListener("ended", loopFromOffset)
+
+            if ((window as Window & { GameDetails?: typeof gameDetails }).GameDetails === gameDetails) {
+                delete (window as Window & { GameDetails?: typeof gameDetails }).GameDetails
+            }
+        }
+    }, [])
+
+    return (
+        <div className="relative h-screen w-screen overflow-hidden bg-black">
+            <audio ref={audioRef} src={song} preload="auto" hidden />
+
+            <img
+                src={screen1}
+                alt="Pazismemod screenshot"
+                className="h-full w-full object-contain"
+            />
+
+            <h1
+                className="absolute bottom-12 left-6 leading-none text-white"
+                style={{
+                    fontFamily: "\"Coolvetica\", sans-serif",
+                    fontSize: "92px",
+                }}
+            >
+                pazisme mod
+            </h1>
+        </div>
+    )
+}