@mgsoftwarebv/mg-dashboard-mcp 6.6.2 → 6.7.0

package/dist/index.js

@@ -18,7 +18,6 @@ import postgres from 'postgres';
 import { readFile, mkdtemp, writeFile, rm } from 'fs/promises';
 import { tmpdir } from 'os';
 import { once } from 'events';
-import https from 'https';
 import { lookup } from 'dns/promises';
 import { connect } from 'tls';
 import { HeadObjectCommand, S3Client, ListObjectsV2Command, DeleteObjectsCommand, DeleteObjectCommand, CreateMultipartUploadCommand, UploadPartCommand, CompleteMultipartUploadCommand, AbortMultipartUploadCommand, PutObjectCommand, GetObjectCommand, CopyObjectCommand } from '@aws-sdk/client-s3';
@@ -1593,33 +1592,49 @@ async function fetchViaSshProxy(options) {
       })
     ]);
     if (timer) clearTimeout(timer);
+    const requestPath = `${parsedUrl.pathname || "/"}${parsedUrl.search}`;
+    const headerLines = [`${method} ${requestPath} HTTP/1.1`];
+    if (!("Connection" in headers)) headers.Connection = "close";
+    for (const [k, v] of Object.entries(headers)) headerLines.push(`${k}: ${v}`);
+    headerLines.push("", "");
+    tlsSocket.write(headerLines.join("\r\n"));
+    if (body) tlsSocket.write(body);
     return await new Promise((resolve, reject) => {
-      const req = https.request(
-        {
-          createConnection: () => tlsSocket,
-          hostname: targetHost,
-          port: targetPort,
-          path: `${parsedUrl.pathname}${parsedUrl.search}`,
-          method,
-          headers,
-          agent: false
-        },
-        (res) => {
-          const chunks = [];
-          res.on("data", (chunk) => chunks.push(chunk));
-          res.on("end", () => {
-            resolve({
-              status: res.statusCode ?? 0,
-              statusText: res.statusMessage ?? "",
-              body: Buffer.concat(chunks).toString("utf8")
-            });
-          });
-          res.on("error", reject);
+      const chunks = [];
+      const onError = (err) => {
+        tlsSocket.removeAllListeners();
+        reject(err);
+      };
+      tlsSocket.on("data", (chunk) => chunks.push(chunk));
+      tlsSocket.on("end", () => {
+        const raw = Buffer.concat(chunks);
+        const headerEnd = raw.indexOf("\r\n\r\n");
+        if (headerEnd === -1) return reject(new Error("mijn.host response missing headers"));
+        const headerBlob = raw.slice(0, headerEnd).toString("utf8");
+        const [statusLine, ...headerLinesIn] = headerBlob.split("\r\n");
+        const statusMatch = statusLine?.match(/^HTTP\/\d\.\d (\d{3}) ?(.*)$/);
+        if (!statusMatch) return reject(new Error(`Invalid status line: ${statusLine}`));
+        const status = Number(statusMatch[1]);
+        const statusText = statusMatch[2] ?? "";
+        let bodyBuf = raw.slice(headerEnd + 4);
+        const transferEnc = headerLinesIn.find((l) => /^transfer-encoding:/i.test(l))?.split(":")[1]?.trim().toLowerCase();
+        if (transferEnc === "chunked") {
+          const decoded = [];
+          let i = 0;
+          while (i < bodyBuf.length) {
+            const lineEnd = bodyBuf.indexOf("\r\n", i);
+            if (lineEnd === -1) break;
+            const size = parseInt(bodyBuf.slice(i, lineEnd).toString("ascii"), 16);
+            if (!Number.isFinite(size) || size <= 0) break;
+            i = lineEnd + 2;
+            decoded.push(bodyBuf.slice(i, i + size));
+            i += size + 2;
+          }
+          bodyBuf = Buffer.concat(decoded);
         }
-      );
-      req.on("error", reject);
-      if (body) req.write(body);
-      req.end();
+        resolve({ status, statusText, body: bodyBuf.toString("utf8") });
+      });
+      tlsSocket.on("error", onError);
     });
   } finally {
     if (timer) clearTimeout(timer);
@@ -2274,7 +2289,7 @@ async function getServerConnection(serverIdOrName) {
   assertServerAccess(serverId);
   const rows = await db.execute(sql`
     SELECT hostname, port, username, password_encrypted, ssh_key_encrypted,
-           ssh_key_passphrase_encrypted, allowed_ssh_ips, os_type
+           ssh_key_passphrase_encrypted, os_type
     FROM ssh_server
     WHERE id = ${serverId}
     LIMIT 1
@@ -2295,7 +2310,7 @@ async function getServerConnection(serverIdOrName) {
     privateKey: data.ssh_key_encrypted ? decrypt(data.ssh_key_encrypted) : void 0,
     passphrase: data.ssh_key_passphrase_encrypted ? decrypt(data.ssh_key_passphrase_encrypted) : void 0
   };
-  const needsProxy = data.allowed_ssh_ips !== null && serverId !== SSH_PROXY_SERVER_ID;
+  const needsProxy = serverId !== SSH_PROXY_SERVER_ID;
   const proxy = needsProxy ? await getProxyConnection() : void 0;
   const os = data.os_type === "windows" ? "windows" : "linux";
   return { serverId, conn, proxy, os };
@@ -4034,7 +4049,7 @@ async function mijnhostFetch(path, options = {}) {
     "API-Key": key,
     "Accept": "application/json",
     "Content-Type": "application/json",
-    "User-Agent": "mg-dashboard-mcp/6.6.2",
+    "User-Agent": "mg-dashboard-mcp/6.6.3",
     ...options.headers || {}
   };
   const method = options.method ?? "GET";