@vicinitysoftware/mcp-sql 1.0.0 → 1.0.5

package/dist/index.js

@@ -2,32 +2,47 @@
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
-import * as sql from "mssql";
+import pkg from "mssql";
+const { ConnectionPool, NVarChar } = pkg;
 import * as fs from "fs";
 import * as path from "path";
 import * as url from "url";
 import * as dotenv from "dotenv";
 dotenv.config();
 // ── Database config ───────────────────────────────────────────────────────────
-const dbConfig = {
-    server: process.env.VICINITY_SQL_SERVER,
-    database: process.env.VICINITY_SQL_DATABASE,
-    user: process.env.VICINITY_SQL_USER,
-    password: process.env.VICINITY_SQL_PASSWORD,
-    port: parseInt(process.env.VICINITY_SQL_PORT || "1433"),
-    options: {
-        encrypt: process.env.VICINITY_SQL_ENCRYPT === "true",
-        trustServerCertificate: process.env.VICINITY_SQL_TRUST_SERVER_CERT !== "false",
-        connectTimeout: 15000,
-        requestTimeout: parseInt(process.env.VICINITY_SQL_TIMEOUT || "30000"),
-    },
-    pool: { max: 5, min: 0, idleTimeoutMillis: 30000 },
-};
+const useWindowsAuth = !process.env.VICINITY_SQL_USER && !process.env.VICINITY_SQL_PASSWORD;
+const dbConfig = useWindowsAuth
+    ? {
+        server: process.env.VICINITY_SQL_SERVER,
+        database: process.env.VICINITY_SQL_DATABASE,
+        options: {
+            trustedConnection: true,
+            trustServerCertificate: true,
+            connectTimeout: 15000,
+            requestTimeout: parseInt(process.env.VICINITY_SQL_TIMEOUT || "30000"),
+        },
+        pool: { max: 5, min: 0, idleTimeoutMillis: 30000 },
+    }
+    : {
+        server: process.env.VICINITY_SQL_SERVER,
+        database: process.env.VICINITY_SQL_DATABASE,
+        user: process.env.VICINITY_SQL_USER,
+        password: process.env.VICINITY_SQL_PASSWORD,
+        port: parseInt(process.env.VICINITY_SQL_PORT || "1433"),
+        options: {
+            encrypt: process.env.VICINITY_SQL_ENCRYPT === "true",
+            trustServerCertificate: process.env.VICINITY_SQL_TRUST_SERVER_CERT !== "false",
+            connectTimeout: 15000,
+            requestTimeout: parseInt(process.env.VICINITY_SQL_TIMEOUT || "30000"),
+        },
+        pool: { max: 5, min: 0, idleTimeoutMillis: 30000 },
+    };
 const MAX_ROWS = parseInt(process.env.VICINITY_SQL_MAX_ROWS || "500");
 let pool;
 async function getPool() {
     if (!pool) {
-        pool = await sql.connect(dbConfig);
+        pool = new ConnectionPool(dbConfig);
+        await pool.connect();
     }
     return pool;
 }
@@ -43,12 +58,12 @@ async function runQuery(querySql, maxRows = 100) {
     if (rows.length === 0)
         return "Query returned no results.";
     const columns = Object.keys(rows[0]);
-    const colWidths = columns.map(c => Math.max(c.length, ...rows.map(r => String(r[c] ?? "NULL").length)));
+    const colWidths = columns.map((c) => Math.max(c.length, ...rows.map((r) => String(r[c] ?? "NULL").length)));
     const fmt = (vals) => vals.map((v, i) => v.padEnd(colWidths[i])).join("  ");
     const lines = [
         fmt(columns),
-        colWidths.map(w => "-".repeat(w)).join("--"),
-        ...rows.map(r => fmt(columns.map(c => String(r[c] ?? "NULL")))),
+        colWidths.map((w) => "-".repeat(w)).join("--"),
+        ...rows.map((r) => fmt(columns.map((c) => String(r[c] ?? "NULL")))),
         `\n(${rows.length} rows${result.recordset.length > limit ? " — truncated" : ""})`,
     ];
     return lines.join("\n");
@@ -158,8 +173,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         else if (name === "describe_table") {
             const p = await getPool();
             const res = await p.request()
-                .input("table", sql.NVarChar, args?.table_name)
-                .input("schema", sql.NVarChar, args?.schema ?? "dbo")
+                .input("table", NVarChar, args?.table_name)
+                .input("schema", NVarChar, args?.schema ?? "dbo")
                 .query(`
           SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH
           FROM INFORMATION_SCHEMA.COLUMNS
@@ -170,7 +185,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 result = `Table '${args?.schema ?? "dbo"}.${args?.table_name}' not found.`;
             }
             else {
-                const lines = [`${"Column".padEnd(40)} ${"Type".padEnd(20)} ${"Nullable".padEnd(10)} MaxLen`, "-".repeat(80)];
+                const lines = [
+                    `${"Column".padEnd(40)} ${"Type".padEnd(20)} ${"Nullable".padEnd(10)} MaxLen`,
+                    "-".repeat(80),
+                ];
                 for (const r of res.recordset) {
                     lines.push(`${String(r.COLUMN_NAME).padEnd(40)} ${String(r.DATA_TYPE).padEnd(20)} ${String(r.IS_NULLABLE).padEnd(10)} ${r.CHARACTER_MAXIMUM_LENGTH ?? ""}`);
                 }
@@ -186,7 +204,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         return { content: [{ type: "text", text: result }] };
     }
     catch (err) {
-        return { content: [{ type: "text", text: `Error: ${err.message}` }], isError: true };
+        const message = err instanceof Error ? err.message : String(err);
+        return { content: [{ type: "text", text: `Error: ${message}` }], isError: true };
     }
 });
 // ── Start ─────────────────────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vicinitysoftware/mcp-sql",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "description": "MCP server for Vicinity Software SQL databases",
   "type": "module",
   "main": "dist/index.js",
@@ -12,7 +12,9 @@
     "resources/",
     "README.md"
   ],
-  "engines": { "node": ">=18.0.0" },
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build"
@@ -27,4 +29,4 @@
     "@types/node": "^20.0.0",
     "typescript": "^5.0.0"
   }
-}
+}