@trops/dash-core 0.1.79 → 0.1.81

package/dist/mcp/servers/{servers/google-drive.js → google-drive.js}

@@ -21,6 +21,10 @@ const { Server } = require("@modelcontextprotocol/sdk/server/index.js");
 const {
   StdioServerTransport,
 } = require("@modelcontextprotocol/sdk/server/stdio.js");
+const {
+  CallToolRequestSchema,
+  ListToolsRequestSchema,
+} = require("@modelcontextprotocol/sdk/types.js");
 const fs = require("fs");
 const https = require("https");
 const path = require("path");
@@ -149,33 +153,12 @@ if (process.argv[2] === "auth") {
       const { URL } = require("url");
       const { client_id, client_secret } = getClientCredentials();
 
-      const keysFile = JSON.parse(fs.readFileSync(oauthKeysPath, "utf8"));
-      const keyData = keysFile.installed || keysFile.web;
-      const redirectUri =
-        keyData.redirect_uris?.[0] || "http://localhost:3000/oauth2callback";
-
-      // Extract port from redirect URI
-      const redirectUrl = new URL(redirectUri);
-      const port = parseInt(redirectUrl.port, 10) || 3000;
-
       const scopes = ["https://www.googleapis.com/auth/drive.readonly"];
-
-      const authUrl =
-        `https://accounts.google.com/o/oauth2/v2/auth?` +
-        `client_id=${encodeURIComponent(client_id)}` +
-        `&redirect_uri=${encodeURIComponent(redirectUri)}` +
-        `&response_type=code` +
-        `&scope=${encodeURIComponent(scopes.join(" "))}` +
-        `&access_type=offline` +
-        `&prompt=consent`;
-
-      console.log(
-        `\nOpen this URL in your browser to authorize:\n\n${authUrl}\n`,
-      );
+      let redirectUri;
 
       // Start local server to catch the callback
       const server = http.createServer(async (req, res) => {
-        const reqUrl = new URL(req.url, `http://localhost:${port}`);
+        const reqUrl = new URL(req.url, redirectUri);
         const code = reqUrl.searchParams.get("code");
         if (!code) {
           res.writeHead(400);
@@ -251,8 +234,30 @@ if (process.argv[2] === "auth") {
         }
       });
 
-      server.listen(port, () => {
-        console.log(`Listening on port ${port} for OAuth callback...`);
+      server.on("error", (err) => {
+        console.error("OAuth server error:", err.message);
+        process.exit(1);
+      });
+
+      // Use ephemeral port (0) — OS assigns a free port
+      server.listen(0, () => {
+        const actualPort = server.address().port;
+        redirectUri = `http://localhost:${actualPort}`;
+
+        const authUrl =
+          `https://accounts.google.com/o/oauth2/v2/auth?` +
+          `client_id=${encodeURIComponent(client_id)}` +
+          `&redirect_uri=${encodeURIComponent(redirectUri)}` +
+          `&response_type=code` +
+          `&scope=${encodeURIComponent(scopes.join(" "))}` +
+          `&access_type=offline` +
+          `&prompt=consent`;
+
+        const { exec } = require("child_process");
+        exec(`open "${authUrl}"`);
+        console.log(
+          `\nOpening browser for authorization (port ${actualPort})...\n`,
+        );
       });
     } catch (err) {
       console.error("Auth error:", err.message);
@@ -267,7 +272,7 @@ if (process.argv[2] === "auth") {
       { capabilities: { tools: {} } },
     );
 
-    server.setRequestHandler({ method: "tools/list" }, async () => ({
+    server.setRequestHandler(ListToolsRequestSchema, async () => ({
       tools: [
         {
           name: "search",
@@ -286,7 +291,7 @@ if (process.argv[2] === "auth") {
       ],
     }));
 
-    server.setRequestHandler({ method: "tools/call" }, async (request) => {
+    server.setRequestHandler(CallToolRequestSchema, async (request) => {
       if (request.params.name !== "search") {
         return {
           content: [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@trops/dash-core",
-    "version": "0.1.79",
+    "version": "0.1.81",
     "description": "Core framework for Dash dashboard applications",
     "main": "dist/index.js",
     "module": "dist/index.esm.js",
@@ -19,7 +19,7 @@
     "scripts": {
         "build": "npm run build:renderer && npm run build:electron",
         "build:renderer": "rollup -c rollup.config.renderer.mjs",
-        "build:electron": "rollup -c rollup.config.electron.mjs && mkdir -p dist/mcp/servers && cp electron/mcp/mcpServerCatalog.json dist/mcp/ && cp -r electron/mcp/servers/ dist/mcp/servers/",
+        "build:electron": "rollup -c rollup.config.electron.mjs && mkdir -p dist/mcp && cp electron/mcp/mcpServerCatalog.json dist/mcp/ && rm -rf dist/mcp/servers && cp -r electron/mcp/servers dist/mcp/",
         "clean": "rm -rf dist",
         "prepublishOnly": "npm run clean && npm run build",
         "test:mcp": "node --test electron/controller/mcpController.test.js electron/mcp/mcpServerCatalog.test.js",