@mostajs/setup 1.4.4 → 1.4.6

package/dist/api/upload-jar.route.js

@@ -12,10 +12,129 @@ export function createUploadJarHandlers() {
     async function GET() {
         try {
             const { listJarFiles, getJdbcDialectStatus } = await import('@mostajs/orm');
+            // Scan active bridges: BridgeManager bridges + PID files + port probing
+            const bridges = [];
+            // 1. Check BridgeManager known bridges
+            try {
+                const { BridgeManager } = await import('@mostajs/orm');
+                const manager = BridgeManager.getInstance();
+                for (const b of manager.list()) {
+                    bridges.push({ port: b.port, pid: b.pid, status: 'active', jdbcUrl: b.jdbcUrl });
+                }
+            }
+            catch { /* ignore */ }
+            // 2. Scan PID files for orphan bridges
+            try {
+                const { existsSync, readdirSync, readFileSync } = await import('fs');
+                const { join } = await import('path');
+                const jarDir = process.env.MOSTA_JAR_DIR || join(process.cwd(), 'jar_files');
+                if (existsSync(jarDir)) {
+                    const pidFiles = readdirSync(jarDir).filter((f) => f.startsWith('.bridge-') && f.endsWith('.pid'));
+                    for (const file of pidFiles) {
+                        const portMatch = file.match(/\.bridge-(\d+)\.pid/);
+                        if (!portMatch)
+                            continue;
+                        const port = parseInt(portMatch[1]);
+                        // Skip if already known from BridgeManager
+                        if (bridges.some(b => b.port === port))
+                            continue;
+                        const pidStr = readFileSync(join(jarDir, file), 'utf-8').trim();
+                        const pid = parseInt(pidStr);
+                        if (isNaN(pid))
+                            continue;
+                        // Check if process is alive
+                        let alive = false;
+                        try {
+                            process.kill(pid, 0);
+                            alive = true;
+                        }
+                        catch { /* dead */ }
+                        if (alive) {
+                            // Probe health
+                            let jdbcUrl;
+                            try {
+                                const res = await fetch(`http://localhost:${port}/health`, { signal: AbortSignal.timeout(1000) });
+                                if (res.ok) {
+                                    const h = await res.json();
+                                    jdbcUrl = h.jdbcUrl;
+                                }
+                            }
+                            catch { /* not responding */ }
+                            bridges.push({ port, pid, status: jdbcUrl ? 'active' : 'orphan', jdbcUrl });
+                        }
+                    }
+                }
+            }
+            catch { /* ignore */ }
+            // 3. Probe common bridge ports for unknown bridges (no PID file)
+            const basePort = parseInt(process.env.MOSTA_BRIDGE_PORT_BASE || '8765');
+            for (let port = basePort; port < basePort + 5; port++) {
+                if (bridges.some(b => b.port === port))
+                    continue;
+                try {
+                    const res = await fetch(`http://localhost:${port}/health`, { signal: AbortSignal.timeout(500) });
+                    if (res.ok) {
+                        const h = await res.json();
+                        bridges.push({ port, pid: 0, status: 'active', jdbcUrl: h.jdbcUrl });
+                    }
+                }
+                catch { /* not a bridge */ }
+            }
+            // Check HSQLDB server status
+            let hsqldbServer = null;
+            try {
+                const { existsSync, readdirSync, readFileSync } = await import('fs');
+                const { join } = await import('path');
+                const jarDir = process.env.MOSTA_JAR_DIR || join(process.cwd(), 'jar_files');
+                if (existsSync(jarDir)) {
+                    const serverPidFiles = readdirSync(jarDir).filter((f) => f.startsWith('.hsqldb-server-') && f.endsWith('.pid'));
+                    for (const file of serverPidFiles) {
+                        const portMatch = file.match(/\.hsqldb-server-(\d+)\.pid/);
+                        if (!portMatch)
+                            continue;
+                        const port = parseInt(portMatch[1]);
+                        const pidStr = readFileSync(join(jarDir, file), 'utf-8').trim();
+                        const pid = parseInt(pidStr);
+                        let alive = false;
+                        if (pid > 0) {
+                            try {
+                                process.kill(pid, 0);
+                                alive = true;
+                            }
+                            catch { /* dead */ }
+                        }
+                        if (alive) {
+                            hsqldbServer = { running: true, port, pid };
+                        }
+                        else {
+                            // Clean stale PID file
+                            try {
+                                (await import('fs')).unlinkSync(join(jarDir, file));
+                            }
+                            catch { /* ignore */ }
+                        }
+                    }
+                }
+                // Also check port 9001 if no PID file found
+                if (!hsqldbServer) {
+                    const { execSync } = await import('child_process');
+                    try {
+                        const out = execSync('fuser 9001/tcp 2>/dev/null', { encoding: 'utf-8' }).trim();
+                        if (out) {
+                            const pid = parseInt(out);
+                            hsqldbServer = { running: true, port: 9001, pid: isNaN(pid) ? 0 : pid };
+                        }
+                    }
+                    catch { /* not running */ }
+                }
+            }
+            catch { /* ignore */ }
             return Response.json({
                 ok: true,
                 jars: listJarFiles(),
                 dialects: getJdbcDialectStatus(),
+                bridges,
+                hsqldbServer,
             });
         }
         catch (err) {
@@ -70,34 +189,163 @@ export function createUploadJarHandlers() {
         }
     }
     /**
-     * PATCH — Start or stop the JDBC bridge.
-     * Start: { action: 'start', dialect: string, host: string, port: number, name: string, user?: string, password?: string }
-     * Stop:  { action: 'stop', port: number }
-     * Returns: { ok: true, port: number } or { ok: false, error: string }
+     * PATCH — Manage JDBC bridge and HSQLDB server.
+     * start-server: { action: 'start-server', dialect, name, host?, port? }
+     * stop-server:  { action: 'stop-server', port? }
+     * start:        { action: 'start', dialect, host, port, name, user?, password? }
+     * stop:         { action: 'stop', port, pid? }
      */
     async function PATCH(req) {
         try {
             const body = await req.json();
             const { action } = body;
+            // ── Start HSQLDB server ──
+            if (action === 'start-server') {
+                const { dialect, name, host, port: sgbdPort } = body;
+                if (dialect !== 'hsqldb') {
+                    return Response.json({ ok: false, error: 'start-server supporte uniquement hsqldb' }, { status: 400 });
+                }
+                const actualPort = sgbdPort || 9001;
+                // Check if already running
+                try {
+                    const check = await fetch(`http://${host || 'localhost'}:${actualPort}`, { signal: AbortSignal.timeout(500) });
+                    void check;
+                    return Response.json({ ok: true, message: `Serveur HSQLDB deja en marche sur le port ${actualPort}`, port: actualPort, alreadyRunning: true });
+                }
+                catch { /* not running — proceed */ }
+                // Find JAR
+                const { JdbcNormalizer } = await import('@mostajs/orm');
+                const jarPath = JdbcNormalizer.findJar('hsqldb');
+                if (!jarPath) {
+                    return Response.json({ ok: false, error: 'JAR HSQLDB non trouve. Uploadez hsqldb*.jar d\'abord.' });
+                }
+                // Launch server
+                const { spawn: spawnChild } = await import('child_process');
+                const { join } = await import('path');
+                const { writeFileSync, existsSync, mkdirSync } = await import('fs');
+                const dataDir = join(process.cwd(), 'data');
+                if (!existsSync(dataDir))
+                    mkdirSync(dataDir, { recursive: true });
+                const dbAlias = name || 'mydb';
+                const serverProc = spawnChild('java', [
+                    '-cp', jarPath,
+                    'org.hsqldb.server.Server',
+                    '--database.0', `file:${join(dataDir, dbAlias)}`,
+                    '--dbname.0', dbAlias,
+                    '--port', String(actualPort),
+                ], {
+                    stdio: ['ignore', 'pipe', 'pipe'],
+                    detached: true,
+                });
+                serverProc.unref();
+                const serverPid = serverProc.pid || 0;
+                // Save PID file for cleanup
+                const jarDir = process.env.MOSTA_JAR_DIR || join(process.cwd(), 'jar_files');
+                if (existsSync(jarDir)) {
+                    writeFileSync(join(jarDir, `.hsqldb-server-${actualPort}.pid`), String(serverPid));
+                }
+                // Log stderr
+                serverProc.stderr?.on('data', (data) => {
+                    const msg = data.toString().trim();
+                    if (msg)
+                        console.error(`[HSQLDB:server] ${msg}`);
+                });
+                // Wait for server to be ready
+                const startTime = Date.now();
+                let serverReady = false;
+                while (Date.now() - startTime < 8000) {
+                    try {
+                        await new Promise(r => setTimeout(r, 500));
+                        const sock = await fetch(`http://localhost:${actualPort}`, { signal: AbortSignal.timeout(500) });
+                        void sock;
+                        serverReady = true;
+                        break;
+                    }
+                    catch {
+                        // HSQLDB server doesn't speak HTTP, but we can check if the port is listening
+                        // Try a TCP connection test via the bridge health check pattern
+                    }
+                }
+                // Alternative: check if process is still alive and port is open
+                if (!serverReady) {
+                    try {
+                        process.kill(serverPid, 0); // check alive
+                        // Port might be open but not HTTP — that's fine for HSQLDB
+                        serverReady = true;
+                    }
+                    catch { /* process died */ }
+                }
+                if (!serverReady) {
+                    return Response.json({ ok: false, error: 'Le serveur HSQLDB n\'a pas demarre dans le delai imparti' });
+                }
+                return Response.json({ ok: true, port: actualPort, pid: serverPid, message: `Serveur HSQLDB lance (port ${actualPort}, PID ${serverPid}, alias: ${dbAlias})` });
+            }
+            // ── Stop HSQLDB server ──
+            if (action === 'stop-server') {
+                const sgbdPort = body.port || 9001;
+                try {
+                    const { execSync } = await import('child_process');
+                    const { existsSync, unlinkSync, readFileSync } = await import('fs');
+                    const { join } = await import('path');
+                    const jarDir = process.env.MOSTA_JAR_DIR || join(process.cwd(), 'jar_files');
+                    // Kill by PID file
+                    const pidFile = join(jarDir, `.hsqldb-server-${sgbdPort}.pid`);
+                    if (existsSync(pidFile)) {
+                        const pid = parseInt(readFileSync(pidFile, 'utf-8').trim());
+                        if (pid > 0) {
+                            try {
+                                process.kill(pid, 'SIGKILL');
+                            }
+                            catch { /* dead */ }
+                        }
+                        unlinkSync(pidFile);
+                    }
+                    // Also kill anything on the port
+                    try {
+                        execSync(`fuser -k ${sgbdPort}/tcp 2>/dev/null`, { stdio: 'ignore' });
+                    }
+                    catch { /* already free */ }
+                    return Response.json({ ok: true, message: `Serveur HSQLDB arrete (port ${sgbdPort})` });
+                }
+                catch (err) {
+                    return Response.json({ ok: false, error: err instanceof Error ? err.message : 'Erreur' });
+                }
+            }
             if (action === 'stop') {
                 const bridgePort = body.port || 8765;
-                // Kill bridge on the given port
+                const bridgePid = body.pid || 0;
                 try {
+                    // 1. Try BridgeManager
                     const { BridgeManager } = await import('@mostajs/orm');
                     const manager = BridgeManager.getInstance();
                     const bridges = manager.list();
                     const bridge = bridges.find((b) => b.port === bridgePort);
                     if (bridge) {
                         await manager.stop(bridge.key);
-                        return Response.json({ ok: true, message: `Bridge arrete sur le port ${bridgePort}` });
                     }
-                    // Fallback: kill process on port
+                    // 2. Kill by PID if provided
+                    if (bridgePid > 0) {
+                        try {
+                            process.kill(bridgePid, 'SIGKILL');
+                        }
+                        catch { /* already dead */ }
+                    }
+                    // 3. Fallback: kill process on port
                     const { execSync } = await import('child_process');
                     try {
                         execSync(`fuser -k ${bridgePort}/tcp 2>/dev/null`, { stdio: 'ignore' });
                     }
                     catch { /* port may already be free */ }
-                    return Response.json({ ok: true, message: `Port ${bridgePort} libere` });
+                    // 4. Clean PID file
+                    try {
+                        const { existsSync, unlinkSync } = await import('fs');
+                        const { join } = await import('path');
+                        const pidFile = join(process.env.MOSTA_JAR_DIR || join(process.cwd(), 'jar_files'), `.bridge-${bridgePort}.pid`);
+                        if (existsSync(pidFile))
+                            unlinkSync(pidFile);
+                    }
+                    catch { /* non-critical */ }
+                    return Response.json({ ok: true, message: `Bridge arrete (port ${bridgePort})` });
                 }
                 catch (err) {
                     const msg = err instanceof Error ? err.message : 'Erreur';

package/dist/components/SetupWizard.js

@@ -215,24 +215,36 @@ async function fetchRetry(url, init, retries = 3, delay = 2000) {
     }
     return fetch(url, init);
 }
-// ── JAR Upload Sub-component ─────────────────────────────────
 function JarUploadInline({ dialect, jarEndpoint, dbConfig }) {
     const [uploading, setUploading] = useState(false);
-    const [bridgeLoading, setBridgeLoading] = useState(false);
+    const [loading, setLoading] = useState(null); // tracks which action is loading
     const [bridgePort, setBridgePort] = useState(null);
     const [message, setMessage] = useState(null);
     const [jarStatus, setJarStatus] = useState(null);
-    useEffect(() => {
+    const [bridges, setBridges] = useState([]);
+    const [serverInfo, setServerInfo] = useState(null);
+    const loadStatus = useCallback(() => {
         fetch(jarEndpoint)
             .then(r => r.json())
             .then(data => {
             if (data.ok) {
                 const s = data.dialects?.find((d) => d.dialect === dialect);
                 setJarStatus(s || { hasJar: false, jarFile: null });
+                setBridges(data.bridges || []);
+                if (data.hsqldbServer)
+                    setServerInfo(data.hsqldbServer);
+                else
+                    setServerInfo(null);
+                const active = (data.bridges || []).find((b) => b.status === 'active');
+                if (active)
+                    setBridgePort(active.port);
+                else
+                    setBridgePort(null);
             }
         })
             .catch(() => { });
     }, [dialect, jarEndpoint]);
+    useEffect(() => { loadStatus(); }, [loadStatus]);
     const handleUpload = async (e) => {
         const file = e.target.files?.[0];
         if (!file || !file.name.endsWith('.jar'))
@@ -260,57 +272,42 @@ function JarUploadInline({ dialect, jarEndpoint, dbConfig }) {
             e.target.value = '';
         }
     };
-    const handleStartBridge = async () => {
-        setBridgeLoading(true);
-        setMessage(null);
-        try {
-            const res = await fetch(jarEndpoint, {
-                method: 'PATCH',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ action: 'start', dialect, ...dbConfig }),
-            });
-            const result = await res.json();
-            if (result.ok) {
-                setBridgePort(result.port || 8765);
-                setMessage({ ok: true, text: `Bridge JDBC lance sur le port ${result.port || 8765}` });
-            }
-            else {
-                setMessage({ ok: false, text: result.error || 'Echec lancement du bridge' });
-            }
-        }
-        catch {
-            setMessage({ ok: false, text: 'Erreur reseau' });
-        }
-        finally {
-            setBridgeLoading(false);
-        }
-    };
-    const handleStopBridge = async () => {
-        setBridgeLoading(true);
+    const patchAction = async (payload, actionLabel) => {
+        setLoading(actionLabel);
         setMessage(null);
         try {
             const res = await fetch(jarEndpoint, {
                 method: 'PATCH',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ action: 'stop', port: bridgePort || 8765 }),
+                body: JSON.stringify(payload),
             });
             const result = await res.json();
             if (result.ok) {
-                setBridgePort(null);
-                setMessage({ ok: true, text: result.message || 'Bridge arrete' });
+                setMessage({ ok: true, text: result.message || actionLabel + ' OK' });
+                if (result.port && payload.action === 'start')
+                    setBridgePort(result.port);
+                if (payload.action === 'stop')
+                    setBridgePort(null);
             }
             else {
-                setMessage({ ok: false, text: result.error || 'Echec arret du bridge' });
+                setMessage({ ok: false, text: result.error || 'Echec ' + actionLabel });
             }
+            loadStatus();
         }
         catch {
             setMessage({ ok: false, text: 'Erreur reseau' });
         }
         finally {
-            setBridgeLoading(false);
+            setLoading(null);
         }
     };
-    return (_jsxs("div", { style: S.jarBox, children: [_jsxs("div", { style: S.flex(8), children: [_jsx("span", { style: S.jarTitle, children: "Driver JDBC" }), jarStatus?.hasJar ? (_jsx("span", { style: { ...S.badge('installed'), marginLeft: 0 }, children: jarStatus.jarFile })) : (_jsx("span", { style: { fontSize: 12, color: '#6b7280' }, children: "Aucun JAR installe" })), bridgePort && (_jsxs("span", { style: { fontSize: 11, color: '#059669', fontWeight: 600 }, children: ["Bridge actif port ", bridgePort] }))] }), _jsxs("div", { style: { ...S.flex(8), marginTop: 8, flexWrap: 'wrap' }, children: [_jsxs("label", { style: { ...S.btn('primary', uploading), cursor: uploading ? 'wait' : 'pointer', fontSize: 12, padding: '6px 12px' }, children: [uploading ? 'Upload...' : 'Uploader un .jar', _jsx("input", { type: "file", accept: ".jar", onChange: handleUpload, disabled: uploading, style: { display: 'none' } })] }), jarStatus?.hasJar && !bridgePort && (_jsx("button", { style: { ...S.btn('primary', bridgeLoading), fontSize: 12, padding: '6px 12px', backgroundColor: bridgeLoading ? '#6b7280' : '#059669' }, onClick: handleStartBridge, disabled: bridgeLoading, children: bridgeLoading ? 'Lancement...' : 'Lancer le bridge' })), bridgePort && (_jsx("button", { style: { ...S.btn('primary', bridgeLoading), fontSize: 12, padding: '6px 12px', backgroundColor: bridgeLoading ? '#6b7280' : '#dc2626' }, onClick: handleStopBridge, disabled: bridgeLoading, children: bridgeLoading ? 'Arret...' : 'Arreter le bridge' })), _jsx("span", { style: { fontSize: 11, color: '#9ca3af' }, children: "Ex: hsqldb*.jar, ojdbc*.jar, db2jcc*.jar" })] }), message && (_jsx("p", { style: { fontSize: 12, color: message.ok ? '#059669' : '#dc2626', marginTop: 8 }, children: message.text }))] }));
+    const isHsqldb = dialect === 'hsqldb';
+    const btnSmall = (color, disabled) => ({
+        ...S.btn('primary', disabled), fontSize: 12, padding: '6px 14px',
+        backgroundColor: disabled ? '#9ca3af' : color, cursor: disabled ? 'not-allowed' : 'pointer',
+        borderRadius: 6, border: 'none', color: '#fff', fontWeight: 600,
+    });
+    return (_jsxs("div", { style: S.jarBox, children: [_jsxs("div", { style: S.flex(8), children: [_jsx("span", { style: S.jarTitle, children: "Driver JDBC" }), jarStatus?.hasJar ? (_jsx("span", { style: { ...S.badge('installed'), marginLeft: 0 }, children: jarStatus.jarFile })) : (_jsx("span", { style: { fontSize: 12, color: '#6b7280' }, children: "Aucun JAR installe" }))] }), _jsxs("div", { style: { marginTop: 8 }, children: [_jsxs("label", { style: { ...S.btn('primary', uploading), cursor: uploading ? 'wait' : 'pointer', fontSize: 12, padding: '6px 12px' }, children: [uploading ? 'Upload...' : 'Uploader un .jar', _jsx("input", { type: "file", accept: ".jar", onChange: handleUpload, disabled: uploading, style: { display: 'none' } })] }), _jsx("span", { style: { fontSize: 11, color: '#9ca3af', marginLeft: 8 }, children: "Ex: hsqldb*.jar, ojdbc*.jar" })] }), isHsqldb && jarStatus?.hasJar && (_jsxs("div", { style: { marginTop: 10, padding: '10px 12px', backgroundColor: '#fef9c3', borderRadius: 6, border: '1px solid #fde68a' }, children: [_jsxs("div", { style: { fontSize: 12, fontWeight: 600, color: '#92400e', marginBottom: 6 }, children: ["Serveur HSQLDB", serverInfo?.running && (_jsxs("span", { style: { fontWeight: 400, color: '#059669', marginLeft: 8 }, children: ["En marche (port ", serverInfo.port, serverInfo.pid > 0 ? `, PID ${serverInfo.pid}` : '', ")"] })), !serverInfo?.running && (_jsx("span", { style: { fontWeight: 400, color: '#dc2626', marginLeft: 8 }, children: "Arrete" }))] }), _jsxs("div", { style: { display: 'flex', gap: 8 }, children: [_jsx("button", { style: btnSmall('#059669', loading === 'start-server' || serverInfo?.running), onClick: () => patchAction({ action: 'start-server', dialect, name: dbConfig.name, host: dbConfig.host, port: dbConfig.port }, 'start-server'), disabled: loading === 'start-server' || !!serverInfo?.running, children: loading === 'start-server' ? 'Demarrage...' : 'Demarrer le serveur' }), _jsx("button", { style: btnSmall('#dc2626', loading === 'stop-server' || !serverInfo?.running), onClick: () => patchAction({ action: 'stop-server', port: serverInfo?.port || dbConfig.port || 9001 }, 'stop-server'), disabled: loading === 'stop-server' || !serverInfo?.running, children: loading === 'stop-server' ? 'Arret...' : 'Arreter le serveur' })] })] })), jarStatus?.hasJar && (_jsxs("div", { style: { marginTop: 10, padding: '10px 12px', backgroundColor: '#f0fdf4', borderRadius: 6, border: '1px solid #bbf7d0' }, children: [_jsxs("div", { style: { fontSize: 12, fontWeight: 600, color: '#166534', marginBottom: 6 }, children: ["Bridge JDBC", bridgePort && _jsxs("span", { style: { fontWeight: 400, marginLeft: 8 }, children: ["Actif port ", bridgePort] }), !bridgePort && bridges.length === 0 && _jsx("span", { style: { fontWeight: 400, color: '#6b7280', marginLeft: 8 }, children: "Inactif" })] }), _jsx("div", { style: { display: 'flex', gap: 8, marginBottom: bridges.length > 0 ? 8 : 0 }, children: _jsx("button", { style: btnSmall('#059669', loading === 'start-bridge' || bridges.length > 0), onClick: () => patchAction({ action: 'start', dialect, ...dbConfig }, 'start-bridge'), disabled: loading === 'start-bridge' || bridges.length > 0, children: loading === 'start-bridge' ? 'Lancement...' : 'Lancer le bridge' }) }), bridges.map(b => (_jsxs("div", { style: { display: 'flex', alignItems: 'center', gap: 8, padding: '4px 0', fontSize: 12 }, children: [_jsx("span", { style: { width: 8, height: 8, borderRadius: '50%', backgroundColor: b.status === 'active' ? '#22c55e' : '#f59e0b', flexShrink: 0 } }), _jsxs("span", { style: { color: '#374151', fontFamily: 'monospace', fontSize: 11 }, children: [":", b.port, " ", b.pid > 0 ? `(PID ${b.pid})` : '', " ", b.jdbcUrl ? `— ${b.jdbcUrl}` : ''] }), _jsx("button", { style: { ...btnSmall('#dc2626', loading === `kill-${b.port}`), fontSize: 11, padding: '2px 8px', marginLeft: 'auto' }, onClick: () => patchAction({ action: 'stop', port: b.port, pid: b.pid }, `kill-${b.port}`), disabled: loading === `kill-${b.port}`, children: loading === `kill-${b.port}` ? '...' : 'Kill' })] }, b.port)))] })), message && (_jsx("p", { style: { fontSize: 12, color: message.ok ? '#059669' : '#dc2626', marginTop: 8 }, children: message.text }))] }));
 }
 // ── Main Component ───────────────────────────────────────────
 export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNamePrefix = 'mydb', persistState = true, }) {
@@ -537,7 +534,7 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
                                         const isSelected = selectedModules.includes(mod.key);
                                         const isDetected = detectedModules.includes(mod.key);
                                         return (_jsxs("div", { style: S.moduleCard(isSelected, !!mod.required), onClick: () => toggleModule(mod.key), children: [_jsxs("div", { style: S.moduleHeader, children: [_jsxs("div", { style: S.moduleLeft, children: [_jsx("span", { style: { fontSize: 20 }, children: mod.icon }), _jsx("span", { style: S.moduleName, children: mod.label })] }), _jsxs("div", { style: S.moduleBadges, children: [mod.discovered && _jsx("span", { style: S.badge('new'), children: "Nouveau" }), isDetected && _jsx("span", { style: S.badge('installed'), children: t('setup.modules.installed') }), mod.required && _jsx("span", { style: S.badge('required'), children: t('setup.modules.required') }), _jsx("input", { type: "checkbox", checked: isSelected, disabled: mod.required, readOnly: true, style: S.checkbox })] })] }), _jsx("div", { style: S.moduleDesc, children: mod.description }), mod.dependsOn?.length ? (_jsxs("div", { style: { fontSize: 11, color: '#9ca3af', marginTop: 4 }, children: ["Depend de : ", mod.dependsOn.join(', ')] })) : null] }, mod.key));
-                                    }) }), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'dialect' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDCBE" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.dialect.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.dialect.description') })] })] }), _jsx("div", { style: S.grid3, children: DIALECT_INFO.map(d => (_jsxs("div", { style: S.dialectCard(dialect === d.key, !!d.premium), onClick: () => !d.premium && selectDialect(d.key), title: d.premium ? `${d.name} — disponible en version Premium` : d.name, children: [_jsx("div", { style: S.dialectIcon, children: d.icon }), _jsx("div", { style: S.dialectName, children: d.name }), d.premium && (_jsx("span", { style: { ...S.badge('premium'), marginLeft: 0, marginTop: 4 }, children: "Premium" }))] }, d.key))) }), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary'), onClick: goNext, children: [t('setup.next'), " \u2192"] })] })] })), step === 'database' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDDC4\uFE0F" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.database.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.database.description') })] })] }), dialect === 'sqlite' ? (_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.name') }), _jsx("input", { style: S.input, value: dbConfig.name, onChange: e => { setDbConfig({ ...dbConfig, name: e.target.value }); setDbTestResult(null); }, placeholder: dbNamePrefix }), _jsxs("p", { style: { fontSize: 11, color: '#9ca3af', marginTop: 4 }, children: [t('setup.database.sqliteInfo'), " ", _jsxs("code", { style: { fontFamily: 'monospace', backgroundColor: '#f3f4f6', padding: '1px 4px', borderRadius: 3 }, children: ["./data/", dbConfig.name, ".db"] })] })] })) : dialect === 'spanner' ? (_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.spannerPath') }), _jsx("input", { style: S.input, value: dbConfig.name, onChange: e => { setDbConfig({ ...dbConfig, name: e.target.value }); setDbTestResult(null); }, placeholder: "my-project/my-instance/mydb" }), _jsx("p", { style: { fontSize: 11, color: '#9ca3af', marginTop: 4 }, children: t('setup.database.spannerInfo') })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.host') }), _jsx("input", { style: S.input, value: dbConfig.host, onChange: e => { setDbConfig({ ...dbConfig, host: e.target.value }); setDbTestResult(null); } })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.port') }), _jsx("input", { style: S.input, type: "number", value: dbConfig.port, onChange: e => { setDbConfig({ ...dbConfig, port: parseInt(e.target.value) || 0 }); setDbTestResult(null); } })] })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.name') }), _jsx("input", { style: S.input, value: dbConfig.name, onChange: e => { setDbConfig({ ...dbConfig, name: e.target.value }); setDbTestResult(null); } })] }), dialect !== 'hsqldb' && (_jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.user') }), _jsx("input", { style: S.input, value: dbConfig.user, onChange: e => { setDbConfig({ ...dbConfig, user: e.target.value }); setDbTestResult(null); } })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.password') }), _jsx("input", { style: S.input, type: "password", value: dbConfig.password, onChange: e => { setDbConfig({ ...dbConfig, password: e.target.value }); setDbTestResult(null); } })] })] }))] })), dialect !== 'mongodb' && dialect !== 'sqlite' && (_jsxs("div", { style: { ...S.alert('warning'), marginTop: 12 }, children: [t('setup.database.driverHint'), ' ', _jsx("code", { style: { fontFamily: 'monospace', backgroundColor: '#fef3c7', padding: '1px 4px', borderRadius: 3 }, children: DRIVER_HINTS[dialect] })] })), JDBC_DIALECTS.includes(dialect) && (_jsx(JarUploadInline, { dialect: dialect, jarEndpoint: ep.uploadJar, dbConfig: dbConfig })), dialect !== 'sqlite' && dialect !== 'spanner' && (_jsxs("div", { style: { ...S.checkRow, marginTop: 12, padding: '10px 14px', backgroundColor: '#fffbeb', border: '1px solid #fde68a', borderRadius: 8 }, children: [_jsx("input", { type: "checkbox", style: S.checkbox, checked: createIfNotExists, onChange: e => setCreateIfNotExists(e.target.checked) }), _jsxs("div", { children: [_jsx("div", { style: { fontSize: 13, fontWeight: 500 }, children: t('setup.database.createIfNotExists') }), _jsx("div", { style: { fontSize: 12, color: '#92400e' }, children: t('setup.database.createIfNotExistsDesc') })] })] })), dialect !== 'sqlite' && dialect !== 'spanner' && (_jsxs("div", { style: { ...S.flex(16), marginTop: 16 }, children: [_jsxs("button", { style: S.btn('outline', dbTesting), onClick: testDb, disabled: dbTesting, children: [dbTesting ? '⏳ ' : '🗄️ ', dbTesting ? t('setup.database.testing') : t('setup.database.test')] }), dbTestResult && (_jsx("span", { style: { fontSize: 13, color: dbTestResult.ok ? '#059669' : '#dc2626' }, children: dbTestResult.ok
+                                    }) }), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'dialect' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDCBE" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.dialect.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.dialect.description') })] })] }), _jsx("div", { style: S.grid3, children: DIALECT_INFO.map(d => (_jsxs("div", { style: S.dialectCard(dialect === d.key, !!d.premium), onClick: () => !d.premium && selectDialect(d.key), title: d.premium ? `${d.name} — disponible en version Premium` : d.name, children: [_jsx("div", { style: S.dialectIcon, children: d.icon }), _jsx("div", { style: S.dialectName, children: d.name }), d.premium && (_jsx("span", { style: { ...S.badge('premium'), marginLeft: 0, marginTop: 4 }, children: "Premium" }))] }, d.key))) }), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary'), onClick: goNext, children: [t('setup.next'), " \u2192"] })] })] })), step === 'database' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDDC4\uFE0F" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.database.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.database.description') })] })] }), dialect === 'sqlite' ? (_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.name') }), _jsx("input", { style: S.input, value: dbConfig.name, onChange: e => { setDbConfig({ ...dbConfig, name: e.target.value }); setDbTestResult(null); }, placeholder: dbNamePrefix }), _jsxs("p", { style: { fontSize: 11, color: '#9ca3af', marginTop: 4 }, children: [t('setup.database.sqliteInfo'), " ", _jsxs("code", { style: { fontFamily: 'monospace', backgroundColor: '#f3f4f6', padding: '1px 4px', borderRadius: 3 }, children: ["./data/", dbConfig.name, ".db"] })] })] })) : dialect === 'spanner' ? (_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.spannerPath') }), _jsx("input", { style: S.input, value: dbConfig.name, onChange: e => { setDbConfig({ ...dbConfig, name: e.target.value }); setDbTestResult(null); }, placeholder: "my-project/my-instance/mydb" }), _jsx("p", { style: { fontSize: 11, color: '#9ca3af', marginTop: 4 }, children: t('setup.database.spannerInfo') })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.host') }), _jsx("input", { style: S.input, value: dbConfig.host, onChange: e => { setDbConfig({ ...dbConfig, host: e.target.value }); setDbTestResult(null); } })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.port') }), _jsx("input", { style: S.input, type: "number", value: dbConfig.port, onChange: e => { setDbConfig({ ...dbConfig, port: parseInt(e.target.value) || 0 }); setDbTestResult(null); } })] })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.name') }), _jsx("input", { style: S.input, value: dbConfig.name, onChange: e => { setDbConfig({ ...dbConfig, name: e.target.value }); setDbTestResult(null); } })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.user') }), _jsx("input", { style: S.input, value: dbConfig.user, onChange: e => { setDbConfig({ ...dbConfig, user: e.target.value }); setDbTestResult(null); }, placeholder: dialect === 'hsqldb' ? 'SA' : '' })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.database.password') }), _jsx("input", { style: S.input, type: "password", value: dbConfig.password, onChange: e => { setDbConfig({ ...dbConfig, password: e.target.value }); setDbTestResult(null); } })] })] })] })), dialect === 'hsqldb' && (_jsxs("div", { style: { ...S.alert('warning'), marginTop: 12, fontSize: 12 }, children: [_jsx("strong", { children: "Prerequis :" }), " Le serveur HSQLDB doit etre lance avant le bridge.", _jsx("br", {}), _jsxs("code", { style: { fontFamily: 'monospace', backgroundColor: '#fef3c7', padding: '2px 6px', borderRadius: 3, display: 'inline-block', marginTop: 4, fontSize: 11 }, children: ["java -cp hsqldb*.jar org.hsqldb.server.Server --database.0 file:./data/", dbConfig.name, " --dbname.0 ", dbConfig.name] })] })), dialect !== 'mongodb' && dialect !== 'sqlite' && (_jsxs("div", { style: { ...S.alert('warning'), marginTop: 12 }, children: [t('setup.database.driverHint'), ' ', _jsx("code", { style: { fontFamily: 'monospace', backgroundColor: '#fef3c7', padding: '1px 4px', borderRadius: 3 }, children: DRIVER_HINTS[dialect] })] })), JDBC_DIALECTS.includes(dialect) && (_jsx(JarUploadInline, { dialect: dialect, jarEndpoint: ep.uploadJar, dbConfig: dbConfig })), dialect !== 'sqlite' && dialect !== 'spanner' && (_jsxs("div", { style: { ...S.checkRow, marginTop: 12, padding: '10px 14px', backgroundColor: '#fffbeb', border: '1px solid #fde68a', borderRadius: 8 }, children: [_jsx("input", { type: "checkbox", style: S.checkbox, checked: createIfNotExists, onChange: e => setCreateIfNotExists(e.target.checked) }), _jsxs("div", { children: [_jsx("div", { style: { fontSize: 13, fontWeight: 500 }, children: t('setup.database.createIfNotExists') }), _jsx("div", { style: { fontSize: 12, color: '#92400e' }, children: t('setup.database.createIfNotExistsDesc') })] })] })), dialect !== 'sqlite' && dialect !== 'spanner' && (_jsxs("div", { style: { ...S.flex(16), marginTop: 16 }, children: [_jsxs("button", { style: S.btn('outline', dbTesting), onClick: testDb, disabled: dbTesting, children: [dbTesting ? '⏳ ' : '🗄️ ', dbTesting ? t('setup.database.testing') : t('setup.database.test')] }), dbTestResult && (_jsx("span", { style: { fontSize: 13, color: dbTestResult.ok ? '#059669' : '#dc2626' }, children: dbTestResult.ok
                                                 ? `✅ ${t('setup.database.success')}${dbTestResult.dbVersion ? ` (v${dbTestResult.dbVersion})` : ''}`
                                                 : `❌ ${t('setup.database.error')}: ${dbTestResult.error}` }))] })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'admin' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDC64" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.admin.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.admin.description') })] })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.firstName') }), _jsx("input", { style: S.input, value: adminConfig.firstName, onChange: e => setAdminConfig({ ...adminConfig, firstName: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.lastName') }), _jsx("input", { style: S.input, value: adminConfig.lastName, onChange: e => setAdminConfig({ ...adminConfig, lastName: e.target.value }) })] })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.email') }), _jsx("input", { style: S.input, type: "email", value: adminConfig.email, onChange: e => setAdminConfig({ ...adminConfig, email: e.target.value }), placeholder: "admin@example.com" })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.password') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.password, onChange: e => setAdminConfig({ ...adminConfig, password: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.confirmPassword') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.confirmPassword, onChange: e => setAdminConfig({ ...adminConfig, confirmPassword: e.target.value }) })] })] }), adminConfig.password && adminConfig.confirmPassword && adminConfig.password !== adminConfig.confirmPassword && (_jsx("p", { style: { fontSize: 13, color: '#dc2626' }, children: t('setup.admin.passwordMismatch') })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'summary' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\u2699\uFE0F" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.summary.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.summary.description') })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.dbConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsx("span", { style: { fontFamily: 'monospace' }, children: dbSummaryLabel() }), dialect !== 'sqlite' && dbConfig.user && _jsxs("span", { style: { display: 'block', marginTop: 4 }, children: ["Utilisateur: ", dbConfig.user] })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.adminConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsxs("div", { children: [adminConfig.firstName, " ", adminConfig.lastName] }), _jsx("div", { children: adminConfig.email })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.modules.title') }), _jsx("div", { style: S.flexWrap, children: selectedModules.map(key => {
                                                 const mod = availableModules.find(m => m.key === key);

package/dist/lib/compose-uri.js

@@ -28,6 +28,8 @@ export function composeDbUri(dialect, config) {
         case 'hana':
             return `hana://${eu}:${ep}@${host}:${port}`;
         case 'hsqldb':
+            if (user)
+                return `hsqldb:hsql://${eu}:${ep}@${host}:${port}/${name}`;
             return `hsqldb:hsql://${host}:${port}/${name}`;
         case 'spanner':
             return `spanner://projects/${name}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/setup",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Reusable setup wizard module — multi-dialect DB configuration, .env.local writer, seed runner",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",