Arboretum server is running, but this package was built without the web UI.
\n\n', + ); + console.log('copy-web: ARBORETUM_PACK_NO_WEB=1 — wrote placeholder public/index.html'); + process.exit(0); + } + console.error(`copy-web: ${webDist} not found — run npm run build -w @arboretum/web first`); + process.exit(1); +} + +rmSync(publicDir, { recursive: true, force: true }); +cpSync(webDist, publicDir, { recursive: true }); +console.log(`copy-web: copied ${webDist} -> ${publicDir}`); diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts index bc9deb3..4d5fc18 100644 --- a/packages/server/src/app.ts +++ b/packages/server/src/app.ts @@ -73,7 +73,11 @@ export function buildApp(config: Config, db: Db, serverVersion: string): AppBund registerAuthRoutes(app, auth, limiter, serverVersion); registerSessionRoutes(app, manager); - registerWsGateway(app, manager, serverVersion); + // La route websocket doit être déclarée APRÈS le chargement du plugin (contexte + // encapsulé) — sinon le handler reçoit la signature REST (request, reply). + void app.register(async (scoped) => { + registerWsGateway(scoped, manager, serverVersion); + }); // SPA buildée embarquée dans le paquet npm (public/) — absente en dev (vite dev sert le front) const publicDir = join(dirname(fileURLToPath(import.meta.url)), '..', 'public'); diff --git a/packages/server/src/auth/service.ts b/packages/server/src/auth/service.ts index dfc2d07..197c030 100644 --- a/packages/server/src/auth/service.ts +++ b/packages/server/src/auth/service.ts @@ -69,7 +69,9 @@ export class AuthService { const expected = this.sign(payload); if (sig.length !== expected.length || !timingSafeEqual(Buffer.from(sig), Buffer.from(expected))) return null; const [tokenId, expiresStr] = payload.split('.'); - if (!tokenId || !expiresStr || Number(expiresStr) < Date.now()) return null; + if (!tokenId || !expiresStr) return null; + const expires = Number(expiresStr); + if (!Number.isFinite(expires) || expires < Date.now()) return null; const row = this.db .prepare('SELECT id, label FROM auth_tokens WHERE id = ? AND revoked_at IS NULL') .get(tokenId) as { id: string; label: string } | undefined; diff --git a/packages/server/src/core/pty-manager.ts b/packages/server/src/core/pty-manager.ts index 806dfec..5631782 100644 --- a/packages/server/src/core/pty-manager.ts +++ b/packages/server/src/core/pty-manager.ts @@ -244,14 +244,13 @@ export class PtyManager extends EventEmitter{{ createError }}
+ +{{ store.loadError }}
++ {{ t('common.loading') }} +
+{{ t('sessions.empty') }}
+ +{{ s.cwd }}
+