@scorehub/mcp-server 0.2.7 → 0.2.8

package/dist/index.js

@@ -43,6 +43,53 @@ const TOKEN_STORE_KEY = endpointTokenKey(SCOREHUB_BASE_URL);
 const CLIENT_ID = "scorehub-mcp";
 // Proactively refresh token every 4 hours to prevent expiry during long sessions
 const TOKEN_KEEPALIVE_INTERVAL = 4 * 60 * 60 * 1000;
+function isRemoteToolErrorType(value) {
+    return value === "oauth_invalid"
+        || value === "shop_auth_invalid"
+        || value === "rate_limited"
+        || value === "quota_exhausted"
+        || value === "invalid_input"
+        || value === "permission_denied"
+        || value === "upstream_error";
+}
+function parseRemoteToolEnvelope(text) {
+    try {
+        const parsed = JSON.parse(text);
+        if (parsed.ok === true && Object.prototype.hasOwnProperty.call(parsed, "data")) {
+            return { ok: true, data: parsed.data };
+        }
+        if (parsed.ok === false
+            && isRemoteToolErrorType(parsed.error_type)
+            && typeof parsed.user_message === "string"
+            && typeof parsed.retryable === "boolean") {
+            return {
+                ok: false,
+                error_type: parsed.error_type,
+                user_message: parsed.user_message,
+                retryable: parsed.retryable,
+                ...(Object.prototype.hasOwnProperty.call(parsed, "upstream") ? { upstream: parsed.upstream } : {}),
+            };
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+function extractRemoteTextContent(content) {
+    if (!Array.isArray(content)) {
+        return [];
+    }
+    return content.flatMap((item) => {
+        if (item
+            && typeof item === "object"
+            && item.type === "text"
+            && typeof item.text === "string") {
+            return [item.text];
+        }
+        return [];
+    });
+}
 // ── Remote Tool Proxy (MCP Streamable HTTP) ─────────────────
 async function fetchRemoteTools(token) {
     try {
@@ -74,7 +121,15 @@ async function callRemoteTool(name, args, token) {
     try {
         await client.connect(transport);
         const result = await client.callTool({ name, arguments: args });
-        return JSON.stringify(result.content, null, 2);
+        const textBlocks = extractRemoteTextContent(result.content);
+        const rawText = textBlocks.length > 0
+            ? textBlocks.join("\n\n")
+            : JSON.stringify(result.content, null, 2);
+        const envelope = textBlocks
+            .map((text) => parseRemoteToolEnvelope(text))
+            .find((candidate) => candidate !== null)
+            ?? parseRemoteToolEnvelope(rawText);
+        return { rawText, envelope };
     }
     finally {
         await client.close();
@@ -277,8 +332,20 @@ server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
                 };
             }
             try {
-                const result = await callRemoteTool(name, args, tokenResult.access_token);
-                if (result.includes("ScoreHub OAuth 授权已过期或无效")) {
+                const remoteResult = await callRemoteTool(name, args, tokenResult.access_token);
+                if (remoteResult.envelope?.ok === false && remoteResult.envelope.error_type === "oauth_invalid") {
+                    (0, auth_js_1.clearTokens)(TOKEN_STORE_KEY);
+                    const authUrl = generateAuthUrl();
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: `⚠️ 授权已失效，已清除本地缓存。请调用 "authorize" 工具重新登录 ScoreHub。\n授权地址: ${authUrl}`,
+                            },
+                        ],
+                    };
+                }
+                if (remoteResult.rawText.includes("ScoreHub OAuth 授权已过期或无效")) {
                     (0, auth_js_1.clearTokens)(TOKEN_STORE_KEY);
                     const authUrl = generateAuthUrl();
                     return {
@@ -290,7 +357,7 @@ server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
                         ],
                     };
                 }
-                return { content: [{ type: "text", text: result }] };
+                return { content: [{ type: "text", text: remoteResult.rawText }] };
             }
             catch (e) {
                 return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scorehub/mcp-server",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "ScoreHub local MCP proxy — OAuth login, token caching, and tool forwarding to remote MCP endpoint",
   "main": "dist/index.js",
   "bin": {