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

package/dist/index.cjs

@@ -15,8 +15,8 @@ const index_js = require("@modelcontextprotocol/sdk/server/index.js");
 const types_js = require("@modelcontextprotocol/sdk/types.js");
 const ReactDOMServer = require("react-dom/server");
 const qrcode_react = require("qrcode.react");
-const zod = require("zod");
 const winston = require("winston");
+const zod = require("zod");
 const zodToJsonSchema$1 = require("zod-to-json-schema");
 const fs = require("fs");
 const fsPromises = require("fs/promises");
@@ -74950,6 +74950,21 @@ const CodeBlock = ({ inline, className, children, ...props }) => {
     }
   ) }) : /* @__PURE__ */ jsxRuntime.jsx("code", { ...props, className, children });
 };
+const imgRegex = /!\[(.*?)\]\((.*?)\)/g;
+const windowsPattern = /[a-zA-Z]:(?:\\|\/)[^\s"'`<>|?*]*(?:[\\/][^\s"'`<>|?*]*)*/g;
+const replaceMarkdown = (mdContent) => {
+  return mdContent.replaceAll(imgRegex, (m) => {
+    let match = imgRegex.exec(m);
+    let result = "";
+    if (match) {
+      const [, alt, src] = match;
+      if (windowsPattern.test(src)) {
+        result = `![${alt || ""}](${encodeURIComponent(src)})`;
+      }
+    }
+    return result || m;
+  });
+};
 const MarkdownRenderer = (props) => {
   const { markDownContent } = props;
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -74965,7 +74980,7 @@ const MarkdownRenderer = (props) => {
         ]
       ],
       components: { code: CodeBlock },
-      children: markDownContent || ""
+      children: replaceMarkdown(markDownContent || "")
     }
   );
 };
@@ -76821,6 +76836,37 @@ const renderFullHtml = (segment) => {
   `;
 };
 const getQrcodeUrl = () => process$1.env.QRCODE_URL || "https://reactjs.org/";
+const logger = winston.createLogger({
+  level: "info",
+  format: winston.format.json(),
+  defaultMeta: { service: "user-service" },
+  transports: [
+    //
+    // - Write all logs with importance level of `error` or higher to `error.log`
+    //   (i.e., error, fatal, but not other levels)
+    //
+    new winston.transports.File({
+      dirname: "logs",
+      filename: "office.loggererror.log",
+      level: "error"
+    }),
+    //
+    // - Write all logs with importance level of `info` or higher to `combined.log`
+    //   (i.e., fatal, error, warn, and info, but not trace)
+    //
+    new winston.transports.File({
+      dirname: "logs",
+      filename: "office.logercombined.log"
+    })
+  ]
+});
+if (process.env.NODE_ENV !== "production") {
+  logger.add(
+    new winston.transports.Console({
+      format: winston.format.simple()
+    })
+  );
+}
 async function generateBasePdf(data) {
   return [
     {
@@ -76851,6 +76897,7 @@ const renderCover = (data) => {
 };
 const renderSegment = (data) => {
   const html2 = ReactDOMServer.renderToString(/* @__PURE__ */ jsxRuntime.jsx(Segment, { data }));
+  logger.error(html2);
   return renderFullHtml(html2);
 };
 const renderEnd = (data) => {
@@ -76883,37 +76930,6 @@ const basePdfSchema = {
 zod.z.object({
   ...basePdfSchema
 });
-const logger = winston.createLogger({
-  level: "info",
-  format: winston.format.json(),
-  defaultMeta: { service: "user-service" },
-  transports: [
-    //
-    // - Write all logs with importance level of `error` or higher to `error.log`
-    //   (i.e., error, fatal, but not other levels)
-    //
-    new winston.transports.File({
-      dirname: "logs",
-      filename: "office.loggererror.log",
-      level: "error"
-    }),
-    //
-    // - Write all logs with importance level of `info` or higher to `combined.log`
-    //   (i.e., fatal, error, warn, and info, but not trace)
-    //
-    new winston.transports.File({
-      dirname: "logs",
-      filename: "office.logercombined.log"
-    })
-  ]
-});
-if (process.env.NODE_ENV !== "production") {
-  logger.add(
-    new winston.transports.Console({
-      format: winston.format.simple()
-    })
-  );
-}
 const zodToJsonSchema = (schema) => {
   return zodToJsonSchema$1.zodToJsonSchema(zod.z.object(schema), {
     rejectedAdditionalProperties: void 0,
@@ -77007,13 +77023,18 @@ const extractAllImageSrc = (html2) => {
       logger.info("extractAllImageSrc match[0]:" + match[0], match[1]);
       logger.info("extractAllImageSrc match[1]:" + match[1]);
     }
-    if (isLocalPath(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,
@@ -77031,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("");
         });
@@ -77044,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;
   });
@@ -77236,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.9",
+  "version": "0.0.11",
   "description": "办公agent辅助mcp工具",
   "main": "dist/index.cjs",
   "type": "module",