dingtalk-wiki 1.2.15 → 1.2.16

package/index.js

@@ -213,7 +213,28 @@ async function rebuildSearchIndex() {
               const blocks = await dingtalk.docRequest('GET', `/v1.0/doc/suites/documents/${childId}/blocks`);
               const blockData = blocks.result?.data || [];
               content = blockData.map(b => extractBlockText(b)).join('\n\n');
-            } catch (e) { /* content unavailable */ }
+            } catch (e) { /* content unavailable via blocks */ }
+
+            // Fallback: 存储 v1.0 下载 API（对上传的 .md 等文件有效）
+            if (!content && child.spaceId) {
+              try {
+                const token = await dingtalk.getAccessToken();
+                const dlRes = await axios({
+                  method: 'POST',
+                  url: `${DINGTALK_API_V2}/v1.0/storage/spaces/${child.spaceId}/dentries/${child.dentryId}/downloadInfos/query`,
+                  headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
+                  params: { unionId: await dingtalk.getCurrentUserUnionId() || '' },
+                  data: {}
+                });
+                const data = dlRes.data;
+                const downloadUrl = data.downloadInfo?.resourceUrl || data.resourceUrl || data.downloadUrl || data.url;
+                const downloadHeaders = data.downloadInfo?.headers || data.headers || {};
+                if (downloadUrl) {
+                  const contentRes = await axios({ method: 'GET', url: downloadUrl, headers: downloadHeaders, responseType: 'text' });
+                  content = contentRes.data;
+                }
+              } catch (e) { /* storage v1.0 unavailable */ }
+            }
 
             if (!content) {
               try {
@@ -1633,60 +1654,43 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           }
         }
 
-        // Step 10: 存储 API - 文件下载（.md 文件内容 = 文件下载）
+        // Step 10: 存储 API v1.0 - 文件下载（.md 文件内容 = 文件下载）
         if (foundSpaceId) {
-          // 方式1: storage/spaces/files/{dentryUuid}
-          for (const path of [
-            `/v2.0/storage/spaces/files/${input}/downloadInfos/query`,
-            `/v2.0/storage/spaces/files/${foundDentry.dentryId}/downloadInfos/query`,
-          ]) {
-            try {
-              const dlRes = await axios({
-                method: 'POST',
-                url: `${DINGTALK_API_V2}${path}`,
-                headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
-                params: { operatorId: opId },
-                data: {}
-              });
-              steps.push({
-                step: `存储下载 (POST ${path})`,
-                result: '成功',
-                raw: dlRes.data
-              });
-            } catch (e) {
-              steps.push({
-                step: `存储下载 (POST ${path})`,
-                result: '失败',
-                raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-              });
-            }
-          }
-          // 方式2: storage/spaces/download 的 GET 变体
-          for (const path of [
-            `/v2.0/storage/spaces/files/${input}/downloadInfo`,
-            `/v2.0/storage/spaces/${foundSpaceId}/files/${input}/downloadInfos/query`,
-            `/v2.0/storage/spaces/${foundSpaceId}/files/${foundDentry.dentryId}/downloadInfos/query`,
-          ]) {
-            try {
-              const dlRes = await axios({
-                method: 'POST',
-                url: `${DINGTALK_API_V2}${path}`,
-                headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
-                params: { operatorId: opId },
-                data: {}
-              });
-              steps.push({
-                step: `存储下载 (POST ${path})`,
-                result: '成功',
-                raw: dlRes.data
-              });
-            } catch (e) {
-              steps.push({
-                step: `存储下载 (POST ${path})`,
-                result: '失败',
-                raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
-              });
+          try {
+            const dlRes = await axios({
+              method: 'POST',
+              url: `${DINGTALK_API_V2}/v1.0/storage/spaces/${foundSpaceId}/dentries/${foundDentry.dentryId}/downloadInfos/query`,
+              headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
+              params: { unionId: opId },
+              data: {}
+            });
+            const data = dlRes.data;
+            steps.push({
+              step: '存储 v1.0 获取下载链接 (POST /v1.0/storage/spaces/{sid}/dentries/{did}/downloadInfos/query)',
+              result: '成功',
+              raw: data
+            });
+            // 如果有下载链接，尝试下载内容
+            const downloadUrl = data.downloadInfo?.resourceUrl || data.resourceUrl || data.downloadUrl || data.url;
+            const downloadHeaders = data.downloadInfo?.headers || data.headers || {};
+            if (downloadUrl) {
+              try {
+                const contentRes = await axios({ method: 'GET', url: downloadUrl, headers: downloadHeaders, responseType: 'text' });
+                steps.push({
+                  step: '文件内容下载',
+                  result: `成功 (${contentRes.data.length} 字符)`,
+                  raw: contentRes.data.slice(0, 1000) + (contentRes.data.length > 1000 ? '\n...(截断)' : '')
+                });
+              } catch (dlErr) {
+                steps.push({ step: '文件内容下载', result: '失败', raw: dlErr.message });
+              }
             }
+          } catch (e) {
+            steps.push({
+              step: '存储 v1.0 获取下载链接',
+              result: '失败',
+              raw: { message: e.response?.data?.message || e.message, code: e.response?.data?.code || '(无)', status: e.response?.status || '(无)' }
+            });
           }
         }
 
@@ -1701,21 +1705,30 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           }
           lines.push('');
         });
+        const isAdoc = foundDentry?.name?.endsWith('.adoc') || input.length > 20;
         lines.push('💡 诊断结论:');
         lines.push(`   输入 ID: ${input}`);
         lines.push(`   操作者: ${opId}`);
         lines.push('');
-        lines.push('   1️⃣ wiki/nodes API → ✅ 成功。节点存在，但无 document.docKey');
-        lines.push('   2️⃣ blocks API → ❌ "doc key is illegal"');
-        lines.push('   3️⃣ overwriteContent → ❌ 同上错误');
+        if (foundDentry) {
+          lines.push(`   文档名: ${foundDentry.name}`);
+          lines.push(`   类型推断: ${foundDentry.name?.endsWith('.adoc') ? '✅ .adoc 在线文档（可读写）' : foundDentry.name?.match(/\.(md|docx|xlsx|txt|xmind|mark|markdown)$/i) ? '❌ 导入的文档（非原生. adoc，内容 API 不支持）' : '⚠️ 未知类型'}`);
+        }
+        lines.push('');
+        lines.push('   1️⃣ wiki/nodes API → ✅ 成功。节点存在');
+        lines.push(`   2️⃣ blocks API → ${foundDentry?.name?.endsWith('.adoc') ? '✅ 应对 .adoc 在线文档有效' : '❌ "doc key is illegal"（非 .adoc 文档无 docKey）'}`);
+        lines.push(`   3️⃣ overwriteContent → ${foundDentry?.name?.endsWith('.adoc') ? '✅ 应对 .adoc 在线文档有效' : '❌ 同上错误'}`);
         lines.push('   4️⃣ doc metadata → ❌ 404（该端点不存在）');
         lines.push('');
-        lines.push('📌 DocContent API (GET /v2.0/doc/dentries/{uuid}/contents) ✅ 接受 dentryUuid');
-        lines.push('   上次失败原因: 503 ServiceUnavailable（临时服务器问题）');
-        if (effectiveWsId) {
-          lines.push(`   此文档 workspaceId: ${effectiveWsId}`);
-        }
-        lines.push('📌 请重新运行此工具，已加自动重试逻辑');
+        lines.push('📌 关键区别：');
+        lines.push('   - 知识库"导入为在线文档" → 转为 .adoc → 有 docKey → blocks API 可读写');
+        lines.push('   - "上传文件" → 保持原格式 → 无 docKey → blocks API 不可用');
+        lines.push('   - create_wiki_doc 创建的是 .adoc 在线文档 → blocks API 可读写');
+        lines.push('');
+        lines.push('📌 存储 v1.0 下载 API (POST /v1.0/storage/spaces/{sid}/dentries/{did}/downloadInfos/query)');
+        lines.push('   使用 unionId 参数，可获取上传文件的下载链接');
+        lines.push('📌 DocContent API (GET /v2.0/doc/dentries/{uuid}/contents) 此前 503');
+        lines.push('📌 请重新运行此工具测试以上 API');
 
         return { content: [{ type: 'text', text: lines.join('\n') }] };
       }
@@ -2085,9 +2098,74 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           };
         } catch (blocksErr) {
           const isDocKeyIllegal = blocksErr.message.includes('doc key is illegal');
+
+          // Fallback: 尝试存储 v1.0 下载 API（对上传的 .md 等文件有效）
+          if (isDocKeyIllegal && workspaceId) {
+            try {
+              const token = await dingtalk.getAccessToken();
+              const opId = await dingtalk.resolveOperatorId(operator_id || null);
+
+              // BFS 遍历查找 dentry
+              const queue = [''];
+              const visited = new Set();
+              let foundDentry = null;
+              let foundSpaceId = null;
+              while (queue.length > 0 && !foundDentry) {
+                const parentId = queue.shift();
+                if (visited.has(parentId)) continue;
+                visited.add(parentId);
+                try {
+                  const dirParams = { operatorId: opId, maxResults: 500 };
+                  if (parentId) dirParams.dentryId = parentId;
+                  const dirRes = await axios({
+                    method: 'GET',
+                    url: `${DINGTALK_API_V2}/v2.0/doc/spaces/${workspaceId}/directories`,
+                    headers: { 'x-acs-dingtalk-access-token': token },
+                    params: dirParams
+                  });
+                  const children = dirRes.data?.children || [];
+                  for (const child of children) {
+                    if (child.dentryUuid === realDocKey || child.dentryId === realDocKey || child.id === realDocKey) {
+                      foundDentry = child;
+                      foundSpaceId = child.spaceId;
+                      break;
+                    }
+                    if (child.hasChildren && child.dentryId && !visited.has(child.dentryId)) {
+                      queue.push(child.dentryId);
+                    }
+                  }
+                } catch (e) { /* skip */ }
+              }
+
+              if (foundDentry && foundSpaceId) {
+                const dlRes = await axios({
+                  method: 'POST',
+                  url: `${DINGTALK_API_V2}/v1.0/storage/spaces/${foundSpaceId}/dentries/${foundDentry.dentryId}/downloadInfos/query`,
+                  headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
+                  params: { unionId: opId },
+                  data: {}
+                });
+                const data = dlRes.data;
+                const downloadUrl = data.downloadInfo?.resourceUrl || data.resourceUrl || data.downloadUrl || data.url;
+                const downloadHeaders = data.downloadInfo?.headers || data.headers || {};
+                if (downloadUrl) {
+                  const contentRes = await axios({ method: 'GET', url: downloadUrl, headers: downloadHeaders, responseType: 'text' });
+                  return {
+                    content: [{ type: 'text', text: contentRes.data }]
+                  };
+                }
+              }
+            } catch (fallbackErr) {
+              console.error(`[钉钉MCP] 存储 v1.0 fallback 失败: ${fallbackErr.message}`);
+            }
+          }
+
           let hint = '';
           if (isDocKeyIllegal) {
-            hint = `\n\n原因: 此文档的 dentryUuid 在 Doc Suite API 中无关联 docKey。blocks/overwriteContent\n仅对通过 create_wiki_doc 创建的文档有效。对于知识库中已有文档，钉钉未提供公\n开 REST API 读取内容。可通过 DingTalk 官方 MCP 服务器读取（get_document_content）。`;
+            hint = `\n\n原因: 此文档不是 .adoc 在线文档，blocks API 无法读取。`;
+            if (workspaceId) {
+              hint += `\n已尝试存储 v1.0 下载 API 但仍失败。`;
+            }
           }
           return {
             content: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dingtalk-wiki",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "description": "DingTalk Wiki / Docs read-write MCP server that fills the gap left by DingTalk official MCP.",
   "main": "index.js",
   "bin": {