@abtnode/blocklet-services 1.16.52-beta-20250916-025146-35d976f4 → 1.16.52-beta-20250917-070942-7ee57044

package/api/routes/mcp.js

@@ -4,13 +4,27 @@ const get = require('lodash/get');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const { checkPublicAccess } = require('@blocklet/meta/lib/util');
 // eslint-disable-next-line import/no-unresolved
-const { StreamableHTTPServerTransport } = require('@blocklet/mcp/server/streamableHttp.js');
+const { StreamableHTTPServerTransport } = require('@modelcontextprotocol/sdk/server/streamableHttp.js');
+// eslint-disable-next-line import/no-unresolved
+const { Client } = require('@modelcontextprotocol/sdk/client/index.js');
+// eslint-disable-next-line import/no-unresolved
+const { StreamableHTTPClientTransport } = require('@modelcontextprotocol/sdk/client/streamableHttp.js');
+const { z } = require('zod');
+const flatten = require('lodash/flatten');
+const { version } = require('../../package.json');
 
 const { initMcpServer } = require('../services/mcp/server');
 const logger = require('../libs/logger')('mcp:server:routes');
 
 const isMCPSupported = (b) => get(b.meta, 'capabilities.mcp', false);
 
+// Zod schema for MCP tools request validation
+const mcpToolsRequestSchema = z.object({
+  name: z.string().min(1, 'Tool name is required'),
+  componentDid: z.string().min(1, 'Component DID is required'),
+  input: z.any(),
+});
+
 const transport = new StreamableHTTPServerTransport({
   sessionIdGenerator: undefined, // set to undefined for stateless servers
 });
@@ -130,5 +144,225 @@ module.exports = {
         }
       }
     });
+
+    server.get(
+      joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/mcp/tools'),
+      /**
+       * @see https://team.arcblock.io/comment/discussions/aPYG3ocSGNIhFHFr5wFcquZx#53f1867b-3439-43c8-b63c-bf53fffcfe8c
+       * @param {import('express').Request} req
+       * @param {import('express').Response} res
+       * @returns
+       */
+      async (req, res) => {
+        if (!req.user) {
+          return res.status(401).json({ error: 'Unauthorized' });
+        }
+        const blocklet = await req.getBlocklet();
+        const info = getBlockletInfo(blocklet);
+        const mapServers = blocklet.children
+          .map((x) => {
+            if (isMCPSupported(x)) {
+              return {
+                name: x.meta.title,
+                description: x.meta.description,
+                componentDid: x.meta.did,
+                appPid: blocklet.appPid,
+                endpoint: joinURL(info.appUrl, x.mountPoint, '/mcp'),
+              };
+            }
+
+            return null;
+          })
+          .filter(Boolean);
+
+        const toolMartixs = await Promise.all(
+          mapServers.map(async (x) => {
+            const client = new Client({
+              name: 'blocklet-service-mcp-client',
+              version,
+            });
+            const currentTransport = new StreamableHTTPClientTransport(new URL(x.endpoint), {
+              requestInit: {
+                headers: {
+                  Cookie: req.headers.cookie,
+                },
+              },
+            });
+            await client.connect(currentTransport);
+            const { tools } = await client.listTools().catch((error) => {
+              console.error('error listing tools', error);
+              return { tools: [] };
+            });
+
+            return tools.map((tool) => ({
+              ...tool,
+              appPid: x.appPid,
+              componentDid: x.componentDid,
+            }));
+          })
+        );
+        const tools = flatten(toolMartixs);
+
+        return res.send(tools);
+      }
+    );
+
+    server.get(
+      joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/mcp/tools.js'),
+      /**
+       *
+       * @see https://team.arcblock.io/comment/discussions/aPYG3ocSGNIhFHFr5wFcquZx#53f1867b-3439-43c8-b63c-bf53fffcfe8c
+       * @param {import('express').Request} req
+       * @param {import('express').Response} res
+       * @returns
+       */
+      async (req, res) => {
+        const blocklet = await req.getBlocklet();
+        const info = getBlockletInfo(blocklet);
+        const toolsApiUrl = joinURL(info.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/mcp/tools');
+
+        // 定义为 js
+        res.type('js');
+
+        // @note: 这么做的好处是，未登录到登录成功之后，页面没有刷新也能很快地注册 tools
+        return res.send(`
+function getCookiesAsObject() {
+  const cookieStr = document.cookie;
+  if (!cookieStr.trim()) {
+    return {};
+  }
+
+  const cookies = {};
+  const cookiePairs = cookieStr.split('; ');
+
+  cookiePairs.forEach(pair => {
+    const eqIndex = pair.indexOf('=');
+    if (eqIndex === -1) {
+      return;
+    }
+
+    const key = pair.substring(0, eqIndex);
+    const value = pair.substring(eqIndex + 1);
+    const decodedKey = decodeURIComponent(key);
+    const decodedValue = decodeURIComponent(value);
+    cookies[decodedKey] = decodedValue;
+  });
+
+  return cookies;
+}
+  
+async function registerTools() {
+  try {
+    const cookies = getCookiesAsObject();
+    if (cookies.login_token) {
+      // 发送 GET 请求获取工具列表，携带 cookie
+      const response = await fetch('${toolsApiUrl}', {
+        method: 'GET',
+        credentials: 'include', // 自动携带 cookie
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      });
+      
+      if (response.ok) {
+        const tools = await response.json();
+        dsBridge.call("arc__registerTools", tools);
+        console.info("registerTools success");
+      } else {
+        console.error("Failed to fetch tools:", response.status, response.statusText);
+        dsBridge.call("arc__registerTools", []);
+      }
+    } else {
+      dsBridge.call("arc__registerTools", []);
+    }
+  } catch (error) {
+    console.error("registerTools", error);
+    dsBridge.call("arc__registerTools", []);
+  }
+}
+
+let lastLoginToken = null;
+async function watchCookieChanges() {
+  const cookies = getCookiesAsObject();
+  const currentLoginToken = cookies.login_token || null;
+  
+  if (currentLoginToken !== lastLoginToken) {
+    lastLoginToken = currentLoginToken;
+    await registerTools();
+  }
+}
+
+registerTools();
+
+const cookies = getCookiesAsObject();
+lastLoginToken = cookies.login_token || null;
+setInterval(watchCookieChanges, 1000);
+      `);
+      }
+    );
+
+    server.post(
+      joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/mcp/tools'),
+      /**
+       * @see https://team.arcblock.io/comment/discussions/aPYG3ocSGNIhFHFr5wFcquZx#53f1867b-3439-43c8-b63c-bf53fffcfe8c
+       * @param {import('express').Request} req
+       * @param {import('express').Response} res
+       *
+       */
+      async (req, res) => {
+        if (!req.user) {
+          return res.status(401).json({ error: 'Unauthorized' });
+        }
+
+        // Validate request body with Zod
+        let name;
+        let componentDid;
+        let input;
+        try {
+          const validatedData = await mcpToolsRequestSchema.parseAsync(req.body);
+          ({ name, componentDid, input } = validatedData);
+        } catch (error) {
+          console.error(error);
+          if (error instanceof z.ZodError) {
+            return res.status(400).json({
+              error: error.errors.map((e) => ({
+                field: e.path.join('.'),
+                message: e.message,
+              })),
+            });
+          }
+          return res.status(400).json({ error: error.message });
+        }
+
+        const blocklet = await req.getBlocklet();
+        const info = getBlockletInfo(blocklet);
+        const mountPoint = blocklet.children.find((x) => {
+          return x.meta.did === componentDid && isMCPSupported(x);
+        })?.mountPoint;
+        if (!mountPoint) {
+          return res.status(404).json({ error: `Component not found by ${componentDid}` });
+        }
+
+        const endpoint = joinURL(info.appUrl, mountPoint, '/mcp');
+        const client = new Client({
+          name: 'blocklet-service-proxy',
+          version,
+        });
+        const currentTransport = new StreamableHTTPClientTransport(new URL(endpoint), {
+          requestInit: {
+            headers: {
+              Cookie: req.headers.cookie,
+            },
+          },
+        });
+        await client.connect(currentTransport);
+        const output = await client.callTool({
+          name,
+          arguments: input,
+        });
+
+        return res.send(output);
+      }
+    );
   },
 };

package/api/routes/oauth/server.js

@@ -1,10 +1,10 @@
 /* eslint-disable import/no-unresolved */
 const { joinURL } = require('ufo');
 const { OAUTH_ENDPOINTS, OAUTH_CLIENT_SECRET_TTL, WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
-const { authorizationHandler } = require('@blocklet/mcp/server/auth/handlers/authorize.js');
-const { tokenHandler } = require('@blocklet/mcp/server/auth/handlers/token.js');
-const { revocationHandler } = require('@blocklet/mcp/server/auth/handlers/revoke.js');
-const { clientRegistrationHandler } = require('@blocklet/mcp/server/auth/handlers/register.js');
+const { authorizationHandler } = require('@modelcontextprotocol/sdk/server/auth/handlers/authorize.js');
+const { tokenHandler } = require('@modelcontextprotocol/sdk/server/auth/handlers/token.js');
+const { revocationHandler } = require('@modelcontextprotocol/sdk/server/auth/handlers/revoke.js');
+const { clientRegistrationHandler } = require('@modelcontextprotocol/sdk/server/auth/handlers/register.js');
 
 const { createBlockletOAuthServerProvider } = require('../../services/oauth/server');
 const { redirectWithoutCache, getRedirectUrl } = require('../../util');

package/api/services/mcp/server.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-unresolved
-const { McpServer } = require('@blocklet/mcp/server/mcp.js');
+const { McpServer } = require('@modelcontextprotocol/sdk/server/mcp.js');
 const path = require('path');
 const { initDbhubServer } = require('@blocklet/dbhub');
 const logger = require('../../libs/logger')('mcp:server');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20250916-025146-35d976f4",
+  "version": "1.16.52-beta-20250917-070942-7ee57044",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -34,17 +34,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/auth": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/connect-storage": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/constant": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/core": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/cron": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/db-cache": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/logger": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/models": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/router-templates": "1.16.52-beta-20250916-025146-35d976f4",
-    "@abtnode/util": "1.16.52-beta-20250916-025146-35d976f4",
+    "@abtnode/analytics": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/auth": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/connect-storage": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/constant": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/core": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/cron": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/db-cache": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/logger": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/models": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/router-templates": "1.16.52-beta-20250917-070942-7ee57044",
+    "@abtnode/util": "1.16.52-beta-20250917-070942-7ee57044",
     "@arcblock/did": "1.24.0",
     "@arcblock/did-connect-js": "1.24.0",
     "@arcblock/did-ext": "1.24.0",
@@ -54,19 +54,18 @@
     "@arcblock/jwt": "1.24.0",
     "@arcblock/validator": "1.24.0",
     "@arcblock/ws": "1.24.0",
-    "@blocklet/constant": "1.16.52-beta-20250916-025146-35d976f4",
+    "@blocklet/constant": "1.16.52-beta-20250917-070942-7ee57044",
     "@blocklet/dbhub": "^0.2.9",
-    "@blocklet/env": "1.16.52-beta-20250916-025146-35d976f4",
+    "@blocklet/env": "1.16.52-beta-20250917-070942-7ee57044",
     "@blocklet/error": "^0.2.5",
     "@blocklet/form-builder": "^0.1.12",
     "@blocklet/form-collector": "^0.1.8",
-    "@blocklet/images": "1.16.52-beta-20250916-025146-35d976f4",
-    "@blocklet/js-sdk": "1.16.52-beta-20250916-025146-35d976f4",
-    "@blocklet/mcp": "^1.10.2",
-    "@blocklet/meta": "1.16.52-beta-20250916-025146-35d976f4",
-    "@blocklet/rate-limit": "1.16.52-beta-20250916-025146-35d976f4",
-    "@blocklet/sdk": "1.16.52-beta-20250916-025146-35d976f4",
-    "@blocklet/server-js": "1.16.52-beta-20250916-025146-35d976f4",
+    "@blocklet/images": "1.16.52-beta-20250917-070942-7ee57044",
+    "@blocklet/js-sdk": "1.16.52-beta-20250917-070942-7ee57044",
+    "@blocklet/meta": "1.16.52-beta-20250917-070942-7ee57044",
+    "@blocklet/rate-limit": "1.16.52-beta-20250917-070942-7ee57044",
+    "@blocklet/sdk": "1.16.52-beta-20250917-070942-7ee57044",
+    "@blocklet/server-js": "1.16.52-beta-20250917-070942-7ee57044",
     "@blocklet/theme": "^3.1.40",
     "@blocklet/theme-builder": "0.4.6",
     "@blocklet/uploader-server": "^0.2.10",
@@ -76,6 +75,7 @@
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify-icons/tabler": "^1.2.95",
     "@iconify/react": "^5.2.1",
+    "@modelcontextprotocol/sdk": "^1.18.0",
     "@ocap/client": "1.24.0",
     "@ocap/util": "1.24.0",
     "@react-email/components": "^0.0.34",
@@ -125,7 +125,7 @@
     "whatwg-url": "14.0.0"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.16.52-beta-20250916-025146-35d976f4",
+    "@abtnode/ux": "1.16.52-beta-20250917-070942-7ee57044",
     "@arcblock/bridge": "^3.1.40",
     "@arcblock/did-connect-react": "^3.1.40",
     "@arcblock/icons": "^3.1.40",
@@ -135,7 +135,7 @@
     "@blocklet/did-space-react": "^1.1.23",
     "@blocklet/launcher-layout": "^3.1.40",
     "@blocklet/payment-react": "^1.20.8",
-    "@blocklet/tracker": "1.16.52-beta-20250916-025146-35d976f4",
+    "@blocklet/tracker": "1.16.52-beta-20250917-070942-7ee57044",
     "@blocklet/ui-react": "^3.1.40",
     "@blocklet/uploader": "^0.2.10",
     "@emotion/react": "^11.14.0",
@@ -215,5 +215,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "a1a95bbc637d8954abcb3b2d675037ec309ad7e3"
+  "gitHead": "ac4ec647df35a480b28351b3bca6d3e59c64fff1"
 }