@imenam/simple-scraper 1.0.8 → 1.0.12

package/dist/gui.js

@@ -3,7 +3,16 @@ import bodyParser from 'body-parser';
 import path from 'path';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
-import { setupLogging, ProxyClient } from '@imenam/mcp-gui-interface';
+import { setupLogging, ProxyClient, IpcHub } from '@imenam/mcp-gui-interface';
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const ipc = new IpcHub(process);
+async function callMaster(type, data, timeoutMs = 5000) {
+    const resp = await ipc.request({ type, data }, timeoutMs);
+    if (resp.error)
+        throw new Error(resp.error);
+    return resp.data;
+}
+const SESSION_ID_RE = /^sess_[a-z0-9]{6}$/;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const rootDir = path.resolve(__dirname, '..');
 setupLogging({ processLabel: 'GUI', logDir: process.env.MCP_LOG_DIR });
@@ -11,6 +20,47 @@ if (!process.env.PROXY_URL) {
     process.stderr.write('[GUI] PROXY_URL non défini — arrêt.\n');
     process.exit(0);
 }
+const APP_PATH = process.env.PROXY_APP_PATH ?? '/simple-scraper-mcp';
+const APP_NAME = process.env.PROXY_APP_NAME ?? 'Simple Scraper MCP';
+// ─── Cycle de vie du process ─────────────────────────────────────────────────
+let proxyClient = null;
+/**
+ * Libère la route avant de mourir. Sans ça le proxy continue de router vers un
+ * port mort (502 opaques) jusqu'à ce que son health check finisse par nettoyer.
+ */
+async function cleanupProxy() {
+    if (proxyClient)
+        await proxyClient.unregister();
+    process.exit(0);
+}
+process.on('SIGTERM', () => void cleanupProxy());
+process.on('SIGINT', () => void cleanupProxy());
+// Le master peut disparaître sans nous tuer (crash, kill -9) : sans ce watchdog
+// la GUI reste orpheline et garde le port et la route du proxy.
+const parentPid = process.ppid;
+const parentCheckInterval = setInterval(() => {
+    try {
+        process.kill(parentPid, 0);
+    }
+    catch {
+        console.error(`[GUI] Master (PID ${parentPid}) disparu — arrêt.`);
+        clearInterval(parentCheckInterval);
+        void cleanupProxy();
+    }
+}, 2000);
+process.on('disconnect', () => {
+    console.error('[GUI] Canal IPC fermé par le master — arrêt.');
+    void cleanupProxy();
+});
+process.on('uncaughtException', (err) => {
+    console.error(`[GUI] Uncaught Exception: ${err.message}`);
+    console.error(err.stack ?? 'No stack trace');
+    process.exit(1);
+});
+process.on('unhandledRejection', (reason) => {
+    console.error(`[GUI] Unhandled Rejection: ${reason}`);
+    process.exit(1);
+});
 const getCookiesDir = () => process.env.COOKIES_DIR ?? null;
 const app = express();
 app.use(bodyParser.json());
@@ -59,6 +109,23 @@ app.post('/api/cookies', (req, res) => {
         res.status(500).json({ success: false, error: message });
     }
 });
+// ─── GET /api/cookies/:filename — lit le contenu d'un fichier ────────────────
+app.get('/api/cookies/:filename', (req, res) => {
+    const cookiesDir = getCookiesDir();
+    if (!cookiesDir) {
+        res.status(400).json({ success: false, error: 'COOKIES_DIR not configured' });
+        return;
+    }
+    const safeName = path.basename(req.params.filename);
+    try {
+        const content = fs.readFileSync(path.join(cookiesDir, safeName), 'utf-8');
+        res.json({ success: true, content });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ success: false, error: message });
+    }
+});
 // ─── DELETE /api/cookies/:filename — supprime un fichier ──────────────────────
 app.delete('/api/cookies/:filename', (req, res) => {
     const cookiesDir = getCookiesDir();
@@ -76,21 +143,61 @@ app.delete('/api/cookies/:filename', (req, res) => {
         res.status(500).json({ success: false, error: message });
     }
 });
+// ─── GET /api/sessions — liste les sessions actives ──────────────────────────
+app.get('/api/sessions', async (_req, res) => {
+    try {
+        const sessions = await callMaster('SESSION_LIST');
+        res.json({ success: true, sessions });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ success: false, error: message });
+    }
+});
+// ─── GET /api/sessions/:id/screenshot — capture JPEG de la session ───────────
+app.get('/api/sessions/:id/screenshot', async (req, res) => {
+    const { id } = req.params;
+    if (!SESSION_ID_RE.test(id)) {
+        res.status(400).json({ success: false, error: 'Invalid session ID' });
+        return;
+    }
+    try {
+        const data = await callMaster('SESSION_SCREENSHOT', { sessionId: id });
+        res.type('image/jpeg').send(Buffer.from(data.base64, 'base64'));
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        res.status(500).json({ success: false, error: message });
+    }
+});
 async function startServer() {
-    const proxyClient = new ProxyClient(process.env.PROXY_URL);
-    const result = await proxyClient.register({
-        path: process.env.PROXY_APP_PATH ?? '/simple-scraper-mcp',
-        name: process.env.PROXY_APP_NAME ?? 'Simple Scraper MCP',
-    });
+    const client = new ProxyClient(process.env.PROXY_URL);
+    const result = await client.register({ path: APP_PATH, name: APP_NAME });
+    // Une autre instance du serveur MCP sert déjà cette GUI. C'est le cas nominal
+    // quand le client redémarre le serveur : il lance le nouveau master avant de
+    // couper l'ancien, dont la GUI tient encore la route. Ce n'est pas un crash —
+    // on sort en 0 (sinon le launcher log "Giving up") sans toucher au proxy, dont
+    // la route appartient à l'autre instance.
+    if (result.error === 'HTTP 409') {
+        console.error('[GUI] Une autre instance sert déjà cette GUI — arrêt.');
+        ipc.send({
+            type: 'ALREADY_RUNNING',
+            data: { url: `${process.env.PROXY_URL}${APP_PATH}` },
+            timestamp: new Date().toISOString(),
+        });
+        process.exit(0);
+    }
     if (!result.success) {
-        process.stderr.write('[GUI] Enregistrement proxy échoué — arrêt.\n');
+        process.stderr.write(`[GUI] Enregistrement proxy échoué (${result.error}) — arrêt.\n`);
         process.exit(1);
     }
+    // À partir d'ici la route nous appartient : cleanupProxy peut la libérer.
+    proxyClient = client;
     const port = result.port;
     app.post('/api/stop', async (_req, res) => {
         console.error('POST /api/stop called');
         res.json({ success: true, message: 'Stopping...' });
-        await proxyClient.unregister();
+        await client.unregister();
         setTimeout(() => {
             if (process.send && process.connected) {
                 process.send({ type: 'STOP' });

package/dist/index.js

@@ -11,6 +11,7 @@ import { getBrowser, closeBrowser, getDefaultTimeout } from './browser.js';
 import { loadAllCookies } from './cookies.js';
 import { GuiLauncher } from '@imenam/mcp-gui-interface';
 import { createSession, getSession, closeSession, closeAllSessions, listSessions, getSessionLogs, clearSessionLogs } from './sessions.js';
+import { registerSessionRpc } from './session-rpc.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const rootDir = path.resolve(__dirname, '..');
 const envPath = path.join(rootDir, '.env');
@@ -19,8 +20,12 @@ setupLogging('MASTER');
 const launcher = new GuiLauncher({
     guiPath: path.join(__dirname, 'gui.js'),
     onMessage: (msg) => {
-        if (msg.type === 'STOP')
+        if (msg.type === 'STOP') {
             process.exit(0);
+        }
+        else if (msg.type === 'ALREADY_RUNNING') {
+            console.error(`[MASTER] GUI déjà servie par une autre instance : ${msg.data?.url ?? 'URL inconnue'}`);
+        }
     },
 });
 const server = new McpServer({
@@ -608,16 +613,21 @@ server.tool('screenshot', 'Take a screenshot of a page. Provide either session_i
         }
     }
 });
-async function main() {
+function launchGUI() {
     if (!process.env.PROXY_URL) {
         console.error('[MASTER] PROXY_URL non défini — GUI désactivée.');
+        return;
     }
-    else {
-        launcher.start();
-    }
+    launcher.start();
+    registerSessionRpc(launcher);
+}
+async function main() {
     const transport = new StdioServerTransport();
     await server.connect(transport);
     console.error('[MCP] Simple Scraper MCP server started');
+    // Après le connect, comme mcp-documentor : au redémarrage du serveur par le
+    // client, le master sortant a alors eu le temps de libérer la route.
+    launchGUI();
 }
 main().catch(async (err) => {
     console.error('[MCP] Fatal error:', err);

package/dist/session-rpc.js

@@ -0,0 +1,26 @@
+import { getSession, listSessions } from './sessions.js';
+export function registerSessionRpc(launcher) {
+    launcher.getIpcHub().onMessage(async (msg) => {
+        const reply = (data, error) => launcher.getIpcHub().send({
+            type: `${msg.type}_RESPONSE`,
+            correlationId: msg.correlationId,
+            data,
+            error,
+            timestamp: new Date().toISOString(),
+        });
+        try {
+            if (msg.type === 'SESSION_LIST') {
+                reply(listSessions());
+            }
+            else if (msg.type === 'SESSION_SCREENSHOT') {
+                const { sessionId } = msg.data;
+                const page = getSession(sessionId);
+                const buffer = await page.screenshot({ type: 'jpeg', quality: 60 });
+                reply({ base64: Buffer.from(buffer).toString('base64') });
+            }
+        }
+        catch (err) {
+            reply(undefined, err instanceof Error ? err.message : String(err));
+        }
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imenam/simple-scraper",
-  "version": "1.0.8",
+  "version": "1.0.12",
   "description": "MCP server for web scraping and JavaScript execution using Puppeteer",
   "type": "module",
   "main": "dist/index.js",
@@ -41,6 +41,7 @@
     "dotenv": "^17.3.1",
     "express": "^5.2.1",
     "puppeteer": "^24.40.0",
+    "react-router-dom": "^7.15.1",
     "zod": "^4.3.6"
   },
   "devDependencies": {