@8btc/office-assistant-mcp 0.0.10 → 0.0.11

package/dist/index.cjs

@@ -74954,9 +74954,9 @@ const imgRegex = /!\[(.*?)\]\((.*?)\)/g;
 const windowsPattern = /[a-zA-Z]:(?:\\|\/)[^\s"'`<>|?*]*(?:[\\/][^\s"'`<>|?*]*)*/g;
 const replaceMarkdown = (mdContent) => {
   return mdContent.replaceAll(imgRegex, (m) => {
-    let match;
+    let match = imgRegex.exec(m);
     let result = "";
-    while ((match = imgRegex.exec(m)) !== null) {
+    if (match) {
       const [, alt, src] = match;
       if (windowsPattern.test(src)) {
         result = `![${alt || ""}](${encodeURIComponent(src)})`;
@@ -77023,13 +77023,18 @@ const extractAllImageSrc = (html2) => {
       logger.info("extractAllImageSrc match[0]:" + match[0], match[1]);
       logger.info("extractAllImageSrc match[1]:" + match[1]);
     }
-    if (isLocalPath(decodeURIComponent(match[1]))) {
-      srcs.push(match[1]);
+    const decodedSrc = decodeURIComponent(match[1]);
+    if (isLocalPath(decodedSrc)) {
+      srcs.push({
+        src: decodedSrc,
+        originSrc: match[1]
+      });
     }
   }
   return srcs;
 };
 const reg = /<img[^>]+>/gi;
+const regByGroup = /(<img[^>]*?)src=["'][^"']*["']([^>]*>)/gi;
 const createPage = async (page, item) => {
   const {
     tempFileName,
@@ -77047,12 +77052,15 @@ const createPage = async (page, item) => {
     </header>
   `;
   const localSrcs = extractAllImageSrc(html2);
-  logger.info("localSrcs:::" + localSrcs.join(","));
   const localFileInfoList = await Promise.all(
     localSrcs.map(
-      (src) => new Promise((resolve) => {
-        localImageToBase64(src).then((fileInfo) => {
-          resolve(fileInfo);
+      (srcInfo) => new Promise((resolve) => {
+        localImageToBase64(srcInfo.src).then((fileInfo) => {
+          resolve({
+            ...fileInfo,
+            // 原本没转换的地址
+            originSrc: srcInfo.originSrc
+          });
         }).catch(() => {
           resolve("");
         });
@@ -77060,14 +77068,11 @@ const createPage = async (page, item) => {
     )
   );
   const _html = html2.replaceAll(reg, (m) => {
-    const item2 = localFileInfoList.find(
-      (info) => m.indexOf(info?.src || "") !== -1
-    );
+    const item2 = localFileInfoList.find((info) => {
+      return m.indexOf(info?.originSrc || "") !== -1;
+    });
     if (item2) {
-      return m.replace(
-        /(<img[^>]*?)src=["'][^"']*["']([^>]*>)/gi,
-        `$1src="${item2.base64}"$2`
-      );
+      return m.replace(regByGroup, `$1src="${item2.base64}"$2`);
     }
     return m;
   });
@@ -77252,10 +77257,6 @@ const tool = {
 const toolHandler = async (args) => {
   try {
     logger.info(`start: ${(/* @__PURE__ */ new Date()).getTime()}`);
-    try {
-      logger.info(JSON.stringify(args));
-    } catch (e) {
-    }
     const generatedTemplates = await generateBasePdf(args);
     const pdfUrl = await generatePDF({
       list: generatedTemplates,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@8btc/office-assistant-mcp",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "办公agent辅助mcp工具",
   "main": "dist/index.cjs",
   "type": "module",