@occam-scaly/mcp-server 0.1.17 → 0.1.19

package/dist/index.js

@@ -10,6 +10,32 @@ const client_js_1 = require("./client.js");
 const audit_js_1 = require("./audit.js");
 const index_js_2 = require("./tools/index.js");
 const index_js_3 = require("./resources/index.js");
+function parseGlobalToolTimeoutMs() {
+    const raw = process.env.SCALY_MCP_TIMEOUT_MS;
+    if (!raw)
+        return null;
+    const n = Number(raw);
+    if (!Number.isFinite(n) || n <= 0)
+        return null;
+    return Math.max(1000, Math.floor(n));
+}
+async function withTimeout(promise, timeoutMs) {
+    let timer = null;
+    const timeout = new Promise((_, reject) => {
+        timer = setTimeout(() => {
+            const err = new Error(`Tool call exceeded SCALY_MCP_TIMEOUT_MS=${timeoutMs}ms`);
+            err.code = 'SCALY_MCP_TIMEOUT';
+            reject(err);
+        }, timeoutMs);
+    });
+    try {
+        return await Promise.race([promise, timeout]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
+}
 async function main() {
     // Load configuration
     const config = (0, config_js_1.loadConfig)();
@@ -83,7 +109,10 @@ async function main() {
             // Validate input
             const validatedInput = tool.inputSchema.parse(args || {});
             // Execute tool
-            const result = await tool.handler(validatedInput);
+            const globalTimeoutMs = parseGlobalToolTimeoutMs();
+            const result = globalTimeoutMs
+                ? await withTimeout(tool.handler(validatedInput), globalTimeoutMs)
+                : await tool.handler(validatedInput);
             const meta = {
                 request_id,
                 duration_ms: Date.now() - startedAt
@@ -106,6 +135,27 @@ async function main() {
             };
         }
         catch (err) {
+            if (err?.code === 'SCALY_MCP_TIMEOUT') {
+                const meta = {
+                    request_id,
+                    duration_ms: Date.now() - startedAt
+                };
+                const envelope = {
+                    success: false,
+                    error: {
+                        code: 'TIMEOUT',
+                        message: err.message,
+                        retriable: true
+                    },
+                    meta
+                };
+                return {
+                    content: [
+                        { type: 'text', text: JSON.stringify(envelope) }
+                    ],
+                    isError: true
+                };
+            }
             // Handle validation errors
             if (err.name === 'ZodError') {
                 const issues = Array.isArray(err.errors)

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/tools/db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/tools/db.ts"],"names":[],"mappings":"AAaA,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAqd3D,eAAO,MAAM,OAAO,EAAE,cAAc,EA4ZnC,CAAC"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/tools/db.ts"],"names":[],"mappings":"AAaA,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAmhB3D,eAAO,MAAM,OAAO,EAAE,cAAc,EAggBnC,CAAC"}

package/dist/tools/db.js

@@ -17,6 +17,51 @@ const client_js_1 = require("../client.js");
 const jwt_js_1 = require("../utils/jwt.js");
 const paths_js_1 = require("../utils/paths.js");
 const index_js_1 = require("./index.js");
+const addonQueueTails = new Map();
+async function withAddonQueue(addonId, fn) {
+    const requestedAt = Date.now();
+    const tail = addonQueueTails.get(addonId) || Promise.resolve();
+    let release = () => { };
+    const gate = new Promise((resolve) => {
+        release = resolve;
+    });
+    const nextTail = tail.then(() => gate);
+    addonQueueTails.set(addonId, nextTail);
+    try {
+        await tail;
+        const queuedMs = Date.now() - requestedAt;
+        return await fn(queuedMs);
+    }
+    finally {
+        try {
+            release();
+        }
+        catch { }
+        if (addonQueueTails.get(addonId) === nextTail) {
+            addonQueueTails.delete(addonId);
+        }
+    }
+}
+function sleep(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+}
+function isLikelyTransientDbError(err) {
+    const msg = String(err?.message || err || '').toLowerCase();
+    const code = String(err?.code || '').toLowerCase();
+    if (code.includes('etimedout') || code.includes('timeout'))
+        return true;
+    if (msg.includes('timed out'))
+        return true;
+    if (msg.includes('timeout'))
+        return true;
+    if (msg.includes('connection terminated'))
+        return true;
+    if (msg.includes('server closed the connection'))
+        return true;
+    if (msg.includes('socket hang up'))
+        return true;
+    return false;
+}
 function deriveDomainFromApiUrl(apiUrl) {
     const host = new URL(apiUrl).host;
     return host.replace(/^api-/, '').replace(/^api\./, '');
@@ -311,10 +356,12 @@ async function withTunnelPort({ bearer, apiUrl, fn }) {
     }
 }
 async function withTunnel({ bearer, apiUrl, connectInfo, fn }) {
+    const tunnelStartedAt = Date.now();
     return await withTunnelPort({
         bearer,
         apiUrl,
         fn: async (port) => {
+            const tunnelMs = Date.now() - tunnelStartedAt;
             const client = new pg_1.Client({
                 host: '127.0.0.1',
                 port,
@@ -324,8 +371,20 @@ async function withTunnel({ bearer, apiUrl, connectInfo, fn }) {
                 ssl: { rejectUnauthorized: false }
             });
             try {
+                const connectStartedAt = Date.now();
                 await client.connect();
-                return await fn(client);
+                const connectMs = Date.now() - connectStartedAt;
+                const queryStartedAt = Date.now();
+                const data = await fn(client);
+                const queryMs = Date.now() - queryStartedAt;
+                return {
+                    data,
+                    timing_ms: {
+                        tunnel_ms: tunnelMs,
+                        connect_ms: connectMs,
+                        query_ms: queryMs
+                    }
+                };
             }
             finally {
                 try {
@@ -452,33 +511,61 @@ exports.dbTools = [
                         retriable: false
                     });
                 }
-                const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
-                const result = await withTunnel({
-                    bearer: cfg.oidcToken,
-                    apiUrl: cfg.apiUrl,
-                    connectInfo: {
-                        username: proxy.username,
-                        token: proxy.token,
-                        database: proxy.database
-                    },
-                    fn: async (client) => {
-                        const timeout = Math.max(1000, Math.min(60_000, input.timeout_ms));
-                        await client.query(`SET statement_timeout TO ${timeout}`);
-                        return await client.query(input.sql, input.params || []);
+                const bearer = cfg.oidcToken;
+                return await withAddonQueue(input.addon_id, async (queued_ms) => {
+                    const proxyStartedAt = Date.now();
+                    const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
+                    const proxy_ms = Date.now() - proxyStartedAt;
+                    const runOnce = async () => {
+                        return await withTunnel({
+                            bearer,
+                            apiUrl: cfg.apiUrl,
+                            connectInfo: {
+                                username: proxy.username,
+                                token: proxy.token,
+                                database: proxy.database
+                            },
+                            fn: async (client) => {
+                                const timeout = Math.max(1000, Math.min(60_000, input.timeout_ms));
+                                await client.query(`SET statement_timeout TO ${timeout}`);
+                                return await client.query(input.sql, input.params || []);
+                            }
+                        });
+                    };
+                    let attempt = 1;
+                    let result;
+                    try {
+                        result = await runOnce();
                     }
-                });
-                const columns = result.fields.map((f) => f.name);
-                const shaped = shapeRowsWithLimits(result.rows, input.max_rows, input.max_bytes);
-                return (0, index_js_1.ok)({
-                    addon_id: input.addon_id,
-                    columns,
-                    rows: shaped.rows,
-                    row_count_returned: shaped.rows.length,
-                    row_count_reported: result.rowCount ?? null,
-                    truncated: shaped.truncated,
-                    max_rows: input.max_rows,
-                    max_bytes: input.max_bytes,
-                    bytes_returned: shaped.bytes_returned
+                    catch (err) {
+                        if (isLikelyTransientDbError(err)) {
+                            attempt = 2;
+                            await sleep(200 + Math.floor(Math.random() * 300));
+                            result = await runOnce();
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
+                    const columns = result.data.fields.map((f) => f.name);
+                    const shaped = shapeRowsWithLimits(result.data.rows, input.max_rows, input.max_bytes);
+                    return (0, index_js_1.ok)({
+                        addon_id: input.addon_id,
+                        columns,
+                        rows: shaped.rows,
+                        row_count_returned: shaped.rows.length,
+                        row_count_reported: result.data.rowCount ?? null,
+                        truncated: shaped.truncated,
+                        max_rows: input.max_rows,
+                        max_bytes: input.max_bytes,
+                        bytes_returned: shaped.bytes_returned,
+                        timing_ms: {
+                            queued_ms,
+                            proxy_ms,
+                            ...result.timing_ms
+                        },
+                        attempts: attempt
+                    });
                 });
             }
             catch (err) {
@@ -544,26 +631,36 @@ exports.dbTools = [
                         retriable: false
                     });
                 }
-                const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
-                const execResult = await withTunnel({
-                    bearer: cfg.oidcToken,
-                    apiUrl: cfg.apiUrl,
-                    connectInfo: {
-                        username: proxy.username,
-                        token: proxy.token,
-                        database: proxy.database
-                    },
-                    fn: async (client) => {
-                        const timeout = Math.max(1000, Math.min(60_000, input.timeout_ms));
-                        await client.query(`SET statement_timeout TO ${timeout}`);
-                        return await client.query(input.sql, input.params || []);
-                    }
-                });
-                return (0, index_js_1.ok)({
-                    preview: false,
-                    addon_id: input.addon_id,
-                    row_count: execResult.rowCount ?? null,
-                    command: execResult.command ?? null
+                const bearer = cfg.oidcToken;
+                return await withAddonQueue(input.addon_id, async (queued_ms) => {
+                    const proxyStartedAt = Date.now();
+                    const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
+                    const proxy_ms = Date.now() - proxyStartedAt;
+                    const execResult = await withTunnel({
+                        bearer,
+                        apiUrl: cfg.apiUrl,
+                        connectInfo: {
+                            username: proxy.username,
+                            token: proxy.token,
+                            database: proxy.database
+                        },
+                        fn: async (client) => {
+                            const timeout = Math.max(1000, Math.min(60_000, input.timeout_ms));
+                            await client.query(`SET statement_timeout TO ${timeout}`);
+                            return await client.query(input.sql, input.params || []);
+                        }
+                    });
+                    return (0, index_js_1.ok)({
+                        preview: false,
+                        addon_id: input.addon_id,
+                        row_count: execResult.data.rowCount ?? null,
+                        command: execResult.data.command ?? null,
+                        timing_ms: {
+                            queued_ms,
+                            proxy_ms,
+                            ...execResult.timing_ms
+                        }
+                    });
                 });
             }
             catch (err) {
@@ -663,28 +760,38 @@ exports.dbTools = [
                         retriable: false
                     });
                 }
-                const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
-                const res = await withTunnel({
-                    bearer: cfg.oidcToken,
-                    apiUrl: cfg.apiUrl,
-                    connectInfo: {
-                        username: proxy.username,
-                        token: proxy.token,
-                        database: proxy.database
-                    },
-                    fn: async (client) => {
-                        const timeout = Math.max(1000, Math.min(300_000, input.timeout_ms));
-                        await client.query(`SET statement_timeout TO ${timeout}`);
-                        return await client.query(sql);
-                    }
-                });
-                return (0, index_js_1.ok)({
-                    preview: false,
-                    addon_id: input.addon_id,
-                    migration_path: rel,
-                    command: res.command ?? null,
-                    row_count: res.rowCount ?? null,
-                    bytes: Buffer.byteLength(sql, 'utf8')
+                const bearer = cfg.oidcToken;
+                return await withAddonQueue(input.addon_id, async (queued_ms) => {
+                    const proxyStartedAt = Date.now();
+                    const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
+                    const proxy_ms = Date.now() - proxyStartedAt;
+                    const res = await withTunnel({
+                        bearer,
+                        apiUrl: cfg.apiUrl,
+                        connectInfo: {
+                            username: proxy.username,
+                            token: proxy.token,
+                            database: proxy.database
+                        },
+                        fn: async (client) => {
+                            const timeout = Math.max(1000, Math.min(300_000, input.timeout_ms));
+                            await client.query(`SET statement_timeout TO ${timeout}`);
+                            return await client.query(sql);
+                        }
+                    });
+                    return (0, index_js_1.ok)({
+                        preview: false,
+                        addon_id: input.addon_id,
+                        migration_path: rel,
+                        command: res.data.command ?? null,
+                        row_count: res.data.rowCount ?? null,
+                        bytes: Buffer.byteLength(sql, 'utf8'),
+                        timing_ms: {
+                            queued_ms,
+                            proxy_ms,
+                            ...res.timing_ms
+                        }
+                    });
                 });
             }
             catch (err) {
@@ -725,47 +832,64 @@ exports.dbTools = [
                         retriable: false
                     });
                 }
-                const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
-                const timeout = Math.max(1000, Math.min(300_000, input.timeout_ms));
-                const env = {
-                    ...process.env,
-                    PGPASSWORD: proxy.token,
-                    PGSSLMODE: 'require',
-                    PGCONNECT_TIMEOUT: String(Math.ceil(timeout / 1000))
-                };
-                const res = await withTunnelPort({
-                    bearer: cfg.oidcToken,
-                    apiUrl: cfg.apiUrl,
-                    fn: (port) => (0, node_child_process_1.spawnSync)('pg_dump', [
-                        '--schema-only',
-                        '--no-owner',
-                        '--no-privileges',
-                        '-h',
-                        '127.0.0.1',
-                        '-p',
-                        String(port),
-                        '-U',
-                        proxy.username,
-                        '-d',
-                        proxy.database
-                    ], { encoding: 'utf8', env })
-                });
-                if (res.status !== 0) {
-                    const msg = res.error?.message ||
-                        res.stderr ||
-                        'pg_dump failed (is it installed and on PATH?)';
-                    return (0, index_js_1.fail)({
-                        code: 'NOT_SUPPORTED',
-                        message: msg,
-                        retriable: false
+                const bearer = cfg.oidcToken;
+                return await withAddonQueue(input.addon_id, async (queued_ms) => {
+                    const proxyStartedAt = Date.now();
+                    const proxy = await mintDbProxyInfo(input.addon_id, input.ttl_minutes);
+                    const proxy_ms = Date.now() - proxyStartedAt;
+                    const timeout = Math.max(1000, Math.min(300_000, input.timeout_ms));
+                    const env = {
+                        ...process.env,
+                        PGPASSWORD: proxy.token,
+                        PGSSLMODE: 'require',
+                        PGCONNECT_TIMEOUT: String(Math.ceil(timeout / 1000))
+                    };
+                    const tunnelStartedAt = Date.now();
+                    const res = await withTunnelPort({
+                        bearer,
+                        apiUrl: cfg.apiUrl,
+                        fn: (port) => {
+                            const tunnel_ms = Date.now() - tunnelStartedAt;
+                            const dumpStartedAt = Date.now();
+                            const out = (0, node_child_process_1.spawnSync)('pg_dump', [
+                                '--schema-only',
+                                '--no-owner',
+                                '--no-privileges',
+                                '-h',
+                                '127.0.0.1',
+                                '-p',
+                                String(port),
+                                '-U',
+                                proxy.username,
+                                '-d',
+                                proxy.database
+                            ], { encoding: 'utf8', env });
+                            const dump_ms = Date.now() - dumpStartedAt;
+                            return { out, timing_ms: { tunnel_ms, dump_ms } };
+                        }
+                    });
+                    if (res.out.status !== 0) {
+                        const msg = res.out.error?.message ||
+                            res.out.stderr ||
+                            'pg_dump failed (is it installed and on PATH?)';
+                        return (0, index_js_1.fail)({
+                            code: 'NOT_SUPPORTED',
+                            message: msg,
+                            retriable: false
+                        });
+                    }
+                    node_fs_1.default.mkdirSync(node_path_1.default.dirname(abs), { recursive: true });
+                    node_fs_1.default.writeFileSync(abs, res.out.stdout, 'utf8');
+                    return (0, index_js_1.ok)({
+                        addon_id: input.addon_id,
+                        output_path: rel,
+                        bytes_written: Buffer.byteLength(res.out.stdout, 'utf8'),
+                        timing_ms: {
+                            queued_ms,
+                            proxy_ms,
+                            ...res.timing_ms
+                        }
                     });
-                }
-                node_fs_1.default.mkdirSync(node_path_1.default.dirname(abs), { recursive: true });
-                node_fs_1.default.writeFileSync(abs, res.stdout, 'utf8');
-                return (0, index_js_1.ok)({
-                    addon_id: input.addon_id,
-                    output_path: rel,
-                    bytes_written: Buffer.byteLength(res.stdout, 'utf8')
                 });
             }
             catch (err) {