@mostajs/setup 1.4.4 → 1.4.5

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

@@ -12,10 +12,79 @@ 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 */ }
+            }
             return Response.json({
                 ok: true,
                 jars: listJarFiles(),
                 dialects: getJdbcDialectStatus(),
+                bridges,
             });
         }
         catch (err) {
@@ -81,23 +150,39 @@ export function createUploadJarHandlers() {
             const { action } = body;
             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,31 @@ 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 [bridgePort, setBridgePort] = useState(null);
     const [message, setMessage] = useState(null);
     const [jarStatus, setJarStatus] = useState(null);
-    useEffect(() => {
+    const [bridges, setBridges] = useState([]);
+    const [killingPort, setKillingPort] = 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 a bridge is active, track its port
+                const active = (data.bridges || []).find((b) => b.status === 'active');
+                if (active)
+                    setBridgePort(active.port);
             }
         })
             .catch(() => { });
     }, [dialect, jarEndpoint]);
+    useEffect(() => { loadStatus(); }, [loadStatus]);
     const handleUpload = async (e) => {
         const file = e.target.files?.[0];
         if (!file || !file.name.endsWith('.jar'))
@@ -273,6 +280,7 @@ function JarUploadInline({ dialect, jarEndpoint, dbConfig }) {
             if (result.ok) {
                 setBridgePort(result.port || 8765);
                 setMessage({ ok: true, text: `Bridge JDBC lance sur le port ${result.port || 8765}` });
+                loadStatus();
             }
             else {
                 setMessage({ ok: false, text: result.error || 'Echec lancement du bridge' });
@@ -285,19 +293,21 @@ function JarUploadInline({ dialect, jarEndpoint, dbConfig }) {
             setBridgeLoading(false);
         }
     };
-    const handleStopBridge = async () => {
-        setBridgeLoading(true);
+    const handleStopBridge = async (port, pid) => {
+        setKillingPort(port);
         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({ action: 'stop', port, pid }),
             });
             const result = await res.json();
             if (result.ok) {
-                setBridgePort(null);
+                if (bridgePort === port)
+                    setBridgePort(null);
                 setMessage({ ok: true, text: result.message || 'Bridge arrete' });
+                loadStatus();
             }
             else {
                 setMessage({ ok: false, text: result.error || 'Echec arret du bridge' });
@@ -307,10 +317,13 @@ function JarUploadInline({ dialect, jarEndpoint, dbConfig }) {
             setMessage({ ok: false, text: 'Erreur reseau' });
         }
         finally {
-            setBridgeLoading(false);
+            setKillingPort(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 }))] }));
+    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 && bridges.length === 0 && (_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' })), _jsx("span", { style: { fontSize: 11, color: '#9ca3af' }, children: "Ex: hsqldb*.jar, ojdbc*.jar, db2jcc*.jar" })] }), bridges.length > 0 && (_jsxs("div", { style: { marginTop: 8, padding: '8px 10px', backgroundColor: '#f0fdf4', borderRadius: 6, border: '1px solid #bbf7d0' }, children: [_jsx("div", { style: { fontSize: 11, fontWeight: 600, color: '#166534', marginBottom: 4 }, children: "Bridges actifs" }), 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: {
+                                    ...S.btn('primary', killingPort === b.port), fontSize: 11, padding: '2px 8px',
+                                    backgroundColor: killingPort === b.port ? '#6b7280' : '#dc2626', marginLeft: 'auto',
+                                }, onClick: () => handleStopBridge(b.port, b.pid), disabled: killingPort === b.port, children: killingPort === b.port ? '...' : 'Kill' })] }, b.port))), bridges.length === 0 || bridges.some(b => b.status === 'active') ? null : (_jsx("button", { style: { ...S.btn('primary', bridgeLoading), fontSize: 12, padding: '6px 12px', backgroundColor: '#059669', marginTop: 6 }, onClick: handleStartBridge, disabled: bridgeLoading, children: bridgeLoading ? 'Lancement...' : 'Lancer le bridge' }))] })), 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, }) {

package/package.json

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