@wenyan-md/core 3.0.4 → 3.0.6

package/dist/core.js

@@ -194,9 +194,9 @@ function renderListStyleFootnotes(footnotes) {
 }
 async function handleFrontMatter(markdown) {
   const { attributes, body } = fm(markdown);
-  const result = { body: body || "" };
+  const result = { content: body || "" };
   let head = "";
-  const { title, description, cover, author, source_url } = attributes;
+  const { title, description, cover, author, source_url, need_open_comment, only_fans_can_comment, image_list } = attributes;
   if (title) {
     result.title = title;
   }
@@ -208,7 +208,7 @@ async function handleFrontMatter(markdown) {
     result.cover = cover;
   }
   if (head) {
-    result.body = head + result.body;
+    result.content = head + result.content;
   }
   if (author) {
     result.author = author;
@@ -216,6 +216,15 @@ async function handleFrontMatter(markdown) {
   if (source_url) {
     result.source_url = source_url;
   }
+  if (need_open_comment !== void 0) {
+    result.need_open_comment = need_open_comment;
+  }
+  if (only_fans_can_comment !== void 0) {
+    result.only_fans_can_comment = only_fans_can_comment;
+  }
+  if (image_list) {
+    result.image_list = image_list;
+  }
   return result;
 }
 const parseOptions = {
@@ -524,9 +533,9 @@ function createMathJaxParser(options = {}) {
     fontCache: options.fontCache ?? "none"
   });
   function addContainer(math, doc) {
+    const container = math.typesetRoot;
     const tag = math.display ? "section" : "span";
     const cls = math.display ? "block-equation" : "inline-equation";
-    const container = math.typesetRoot;
     if (math.math) {
       doc.adaptor.setAttribute(container, "math", math.math);
     }

package/dist/publish.js

@@ -185,12 +185,13 @@ class WechatPublisher {
     await this.tokenStore.setToken(appId, result.access_token, result.expires_in);
     return result.access_token;
   }
-  async uploadImage(file, filename, accessToken) {
+  async uploadImage(file, filename, accessToken, appId) {
     let hash;
     if (this.uploadCacheStore) {
       const arrayBuffer = await file.arrayBuffer();
       hash = await this.uploadCacheStore.calcHash(arrayBuffer);
-      const cached = await this.uploadCacheStore.get(hash);
+      const cacheKey = appId ? `${hash}:${appId}` : hash;
+      const cached = await this.uploadCacheStore.get(cacheKey);
       if (cached) {
         return {
           media_id: cached.media_id,
@@ -200,7 +201,8 @@ class WechatPublisher {
     }
     const data = await this.uploadMaterial("image", file, filename, accessToken);
     if (this.uploadCacheStore && hash) {
-      await this.uploadCacheStore.set(hash, data.media_id, data.url);
+      const cacheKey = appId ? `${hash}:${appId}` : hash;
+      await this.uploadCacheStore.set(cacheKey, data.media_id, data.url);
     }
     return data;
   }

package/dist/types/core/index.d.ts

@@ -1,4 +1,4 @@
-import { FrontMatterResult } from "./parser/frontMatterParser.js";
+import { StyledContent } from "../node/types.js";
 export interface WenyanOptions {
     isConvertMathJax?: boolean;
     isWechat?: boolean;
@@ -12,7 +12,7 @@ export interface ApplyStylesOptions {
     isAddFootnote?: boolean;
 }
 export declare function createWenyanCore(options?: WenyanOptions): Promise<{
-    handleFrontMatter(markdown: string): Promise<FrontMatterResult>;
+    handleFrontMatter(markdown: string): Promise<StyledContent>;
     renderMarkdown(markdown: string): Promise<string>;
     applyStylesWithTheme(wenyanElement: HTMLElement, options?: ApplyStylesOptions): Promise<string>;
     applyStylesWithResolvedCss(wenyanElement: HTMLElement, options: {

package/dist/types/core/parser/frontMatterParser.d.ts

@@ -1,9 +1,12 @@
 export interface FrontMatterResult {
-    body: string;
+    content: string;
     title?: string;
-    cover?: string;
     description?: string;
+    cover?: string;
     author?: string;
     source_url?: string;
+    need_open_comment?: boolean;
+    only_fans_can_comment?: boolean;
+    image_list?: string[];
 }
 export declare function handleFrontMatter(markdown: string): Promise<FrontMatterResult>;

package/dist/types/node/clientPublish.d.ts

@@ -13,3 +13,4 @@ export declare function uploadStyledContent(gzhContent: StyledContent, serverUrl
 export declare function requestServerPublish(mdFileId: string, serverUrl: string, headers: Record<string, string>, options: ClientPublishOptions): Promise<string>;
 export declare function uploadLocalImages(content: string, serverUrl: string, headers: Record<string, string>, relativePath?: string): Promise<string>;
 export declare function uploadCover(serverUrl: string, headers: Record<string, string>, cover?: string, relativePath?: string): Promise<string | undefined>;
+export declare function uploadImageList(serverUrl: string, headers: Record<string, string>, imageList?: string[], relativePath?: string): Promise<string[]>;

package/dist/types/node/publish.d.ts

@@ -1,5 +1,5 @@
-import { WechatPublishResponse } from "../wechat.js";
-import { ArticleOptions, WechatPublisher } from "../publish.js";
+import type { WechatPublishResponse } from "../wechat.js";
+import { ArticleOptions, ImageTextArticleOptions, WechatPublisher } from "../publish.js";
 import { CredentialStore } from "../credentialStore.js";
 export declare const wechatPublisher: WechatPublisher;
 export declare const credentialStore: CredentialStore;
@@ -9,5 +9,9 @@ interface PublishOptions {
     relativePath?: string;
 }
 export declare function publishToWechatDraft(articleOptions: ArticleOptions, publishOptions?: PublishOptions): Promise<WechatPublishResponse>;
+/**
+ * @deprecated use publishToWechatDraft instead
+ */
 export declare function publishToDraft(title: string, content: string, cover?: string, options?: PublishOptions): Promise<WechatPublishResponse>;
+export declare function publishImageTextToWechatDraft(articleOptions: ImageTextArticleOptions, publishOptions?: PublishOptions): Promise<WechatPublishResponse>;
 export {};

package/dist/types/node/render.d.ts

@@ -1,5 +1,4 @@
 import { ApplyStylesOptions } from "../core/index.js";
-import { GetInputContentFn, RenderContext, RenderOptions, StyledContent } from "./types.js";
-export declare function renderWithTheme(markdownContent: string, options: RenderOptions): Promise<StyledContent>;
-export declare function renderStyledContent(content: string, options?: ApplyStylesOptions): Promise<StyledContent>;
+import { GetInputContentFn, RenderContext, RenderOptions } from "./types.js";
+export declare function renderStyledContent(content: string, options?: ApplyStylesOptions): Promise<string>;
 export declare function prepareRenderContext(inputContent: string | undefined, options: RenderOptions, getInputContent: GetInputContentFn): Promise<RenderContext>;

package/dist/types/node/types.d.ts

@@ -21,10 +21,13 @@ export interface RenderContext {
 export interface StyledContent {
     content: string;
     title?: string;
-    cover?: string;
     description?: string;
+    cover?: string;
     author?: string;
     source_url?: string;
+    need_open_comment?: boolean;
+    only_fans_can_comment?: boolean;
+    image_list?: string[];
 }
 export type GetInputContentFn = (inputContent?: string, filePath?: string) => Promise<{
     content: string;

package/dist/types/node/wrapper.d.ts

@@ -1,5 +1,4 @@
-import { ClientPublishOptions, GetInputContentFn, PublishOptions, StyledContent } from "./types.js";
-export declare function getGzhContent(content: string, themeId: string, hlThemeId: string, isMacStyle?: boolean, isAddFootnote?: boolean): Promise<StyledContent>;
+import { ClientPublishOptions, GetInputContentFn, PublishOptions } from "./types.js";
 export declare function renderAndPublish(inputContent: string | undefined, options: PublishOptions, getInputContent: GetInputContentFn): Promise<string>;
 export declare function renderAndPublishToServer(inputContent: string | undefined, options: ClientPublishOptions, getInputContent: GetInputContentFn): Promise<string>;
 export * from "./configStore.js";

package/dist/types/publish.d.ts

@@ -8,6 +8,11 @@ export interface ArticleOptions {
     cover?: string;
     author?: string;
     source_url?: string;
+    need_open_comment?: boolean;
+    only_fans_can_comment?: boolean;
+}
+export interface ImageTextArticleOptions extends ArticleOptions {
+    images: string[];
 }
 export declare class WechatPublisher {
     private tokenStore;
@@ -17,7 +22,7 @@ export declare class WechatPublisher {
     private fetchAccessToken;
     constructor(httpAdapter: HttpAdapter, tokenStoreAdapter?: TokenStorageAdapter, uploadCacheStoreAdapter?: UploadCacheStorageAdapter);
     getAccessTokenWithCache(appId: string, appSecret: string): Promise<string>;
-    uploadImage(file: Blob, filename: string, accessToken: string): Promise<WechatUploadResponse>;
+    uploadImage(file: Blob, filename: string, accessToken: string, appId?: string): Promise<WechatUploadResponse>;
     publishToDraft(accessToken: string, options: WechatPublishOptions): Promise<WechatPublishResponse>;
     clearCache(): Promise<void>;
 }

package/dist/types/wechat.d.ts

@@ -1,10 +1,28 @@
 import type { HttpAdapter } from "./http.js";
+export interface ImageCropPercent {
+    ratio: string;
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+}
+export interface ImageListItem {
+    image_media_id: string;
+    crop_percent_list?: ImageCropPercent[];
+}
+export interface ImageInfo {
+    image_list: ImageListItem[];
+}
 export interface WechatPublishOptions {
     title: string;
     author?: string;
     content: string;
     thumb_media_id: string;
     content_source_url?: string;
+    article_type?: "news" | "newspic";
+    image_info?: ImageInfo;
+    need_open_comment?: 0 | 1;
+    only_fans_can_comment?: 0 | 1;
 }
 export interface WechatErrorResponse {
     errcode: number;

package/dist/wrapper.js

@@ -327,6 +327,19 @@ async function uploadCover(serverUrl, headers, cover, relativePath) {
   }
   return cover;
 }
+async function uploadImageList(serverUrl, headers, imageList, relativePath) {
+  if (imageList && imageList.length > 0) {
+    const uploadPromises = imageList.map(async (image) => {
+      if (needUpload(image)) {
+        const newImageUrl = await uploadLocalImage(image, serverUrl, headers, relativePath);
+        return newImageUrl || image;
+      }
+      return image;
+    });
+    return await Promise.all(uploadPromises);
+  }
+  return imageList || [];
+}
 const nodeHttpAdapter = {
   fetch,
   createMultipart(field, file, filename) {
@@ -404,7 +417,7 @@ const wechatPublisher = new WechatPublisher(
   new NodeUploadCacheAdapter()
 );
 const credentialStore = new CredentialStore(new NodeCredentialStorageAdapter());
-async function uploadImage(imageUrl, accessToken, fileName, relativePath) {
+async function uploadImage(imageUrl, accessToken, fileName, relativePath, appId) {
   let fileData;
   let finalName;
   if (imageUrl.startsWith("http")) {
@@ -433,11 +446,11 @@ async function uploadImage(imageUrl, accessToken, fileName, relativePath) {
     const fileFromPathResult = await fileFromPath(resolvedPath);
     fileData = new Blob([await fileFromPathResult.arrayBuffer()], { type: fileFromPathResult.type });
   }
-  const data = await wechatPublisher.uploadImage(fileData, finalName, accessToken);
+  const data = await wechatPublisher.uploadImage(fileData, finalName, accessToken, appId);
   mediaIdMapping.set(data.url, data.media_id);
   return data;
 }
-async function uploadImages(content, accessToken, relativePath) {
+async function uploadImages(content, accessToken, relativePath, appId) {
   if (!content.includes("<img")) {
     return { html: content, firstImageId: "" };
   }
@@ -448,7 +461,7 @@ async function uploadImages(content, accessToken, relativePath) {
     const dataSrc = element.getAttribute("src");
     if (dataSrc) {
       if (!dataSrc.startsWith("https://mmbiz.qpic.cn")) {
-        const resp = await uploadImage(dataSrc, accessToken, void 0, relativePath);
+        const resp = await uploadImage(dataSrc, accessToken, void 0, relativePath, appId);
         element.setAttribute("src", resp.url);
         return resp.media_id;
       } else {
@@ -463,18 +476,18 @@ async function uploadImages(content, accessToken, relativePath) {
   return { html: updatedHtml, firstImageId };
 }
 async function publishToWechatDraft(articleOptions, publishOptions = {}) {
-  const { title, content, cover, author, source_url } = articleOptions;
+  const { title, content, cover, author, source_url, need_open_comment, only_fans_can_comment } = articleOptions;
   const { appId, appSecret, relativePath } = publishOptions;
   const { appId: appIdFinal, appSecret: appSecretFinal } = await getAppIdAndSecret(appId, appSecret);
   const accessToken = await wechatPublisher.getAccessTokenWithCache(appIdFinal, appSecretFinal);
-  const { html, firstImageId } = await uploadImages(content, accessToken, relativePath);
+  const { html, firstImageId } = await uploadImages(content, accessToken, relativePath, appIdFinal);
   let thumbMediaId;
   if (cover) {
     const cachedThumbMediaId = mediaIdMapping.get(cover);
     if (cachedThumbMediaId) {
       thumbMediaId = cachedThumbMediaId;
     } else {
-      const resp = await uploadImage(cover, accessToken, "cover.jpg", relativePath);
+      const resp = await uploadImage(cover, accessToken, "cover.jpg", relativePath, appIdFinal);
       thumbMediaId = resp.media_id;
     }
   } else {
@@ -483,7 +496,7 @@ async function publishToWechatDraft(articleOptions, publishOptions = {}) {
       if (cachedThumbMediaId) {
         thumbMediaId = cachedThumbMediaId;
       } else {
-        const resp = await uploadImage(firstImageId, accessToken, "cover.jpg", relativePath);
+        const resp = await uploadImage(firstImageId, accessToken, "cover.jpg", relativePath, appIdFinal);
         thumbMediaId = resp.media_id;
       }
     } else {
@@ -498,7 +511,9 @@ async function publishToWechatDraft(articleOptions, publishOptions = {}) {
     content: html,
     thumb_media_id: thumbMediaId,
     author,
-    content_source_url: source_url
+    content_source_url: source_url,
+    need_open_comment: need_open_comment ? 1 : 0,
+    only_fans_can_comment: only_fans_can_comment ? 1 : 0
   });
   if (data.media_id) {
     return data;
@@ -526,6 +541,52 @@ async function getAppIdAndSecret(appId, appSecret) {
   }
   throw new Error(`未能找到 AppID 为 "${appId}" 的公众号凭据，请检查配置文件。`);
 }
+async function publishImageTextToWechatDraft(articleOptions, publishOptions = {}) {
+  const { title, content, images, cover, author, need_open_comment, only_fans_can_comment } = articleOptions;
+  const { appId, appSecret, relativePath } = publishOptions;
+  const { appId: appIdFinal, appSecret: appSecretFinal } = await getAppIdAndSecret(appId, appSecret);
+  if (!images || images.length === 0) {
+    throw new Error("图片消息至少需要一张图片");
+  }
+  const accessToken = await wechatPublisher.getAccessTokenWithCache(appIdFinal, appSecretFinal);
+  const imageInfoList = [];
+  for (const img of images) {
+    const resp = await uploadImage(img, accessToken, void 0, relativePath);
+    imageInfoList.push({ image_media_id: resp.media_id });
+  }
+  let thumbMediaId = "";
+  if (cover) {
+    const cachedThumbMediaId = mediaIdMapping.get(cover);
+    if (cachedThumbMediaId) {
+      thumbMediaId = cachedThumbMediaId;
+    } else {
+      const resp = await uploadImage(cover, accessToken, "cover.jpg", relativePath);
+      thumbMediaId = resp.media_id;
+    }
+  } else {
+    thumbMediaId = imageInfoList[0].image_media_id;
+  }
+  if (!thumbMediaId) {
+    throw new Error("未能获取封面图的 media_id");
+  }
+  const data = await wechatPublisher.publishToDraft(
+    accessToken,
+    {
+      title,
+      content,
+      thumb_media_id: thumbMediaId,
+      author,
+      article_type: "newspic",
+      image_info: { image_list: imageInfoList },
+      need_open_comment: need_open_comment ? 1 : 0,
+      only_fans_can_comment: only_fans_can_comment ? 1 : 0
+    }
+  );
+  if (data.media_id) {
+    return data;
+  }
+  throw new Error(`上传图片消息到公众号草稿失败: ${JSON.stringify(data)}`);
+}
 const defaultConfig = {};
 const configPath = path.join(configDir, "config.json");
 class ConfigStore {
@@ -625,25 +686,22 @@ async function renderWithTheme(markdownContent, options) {
   return gzhContent;
 }
 async function renderStyledContent(content, options = {}) {
-  const preHandlerContent = await wenyanCoreInstance.handleFrontMatter(content);
-  const html = await wenyanCoreInstance.renderMarkdown(preHandlerContent.body);
+  const html = await wenyanCoreInstance.renderMarkdown(content);
   const dom = new JSDOM(`<body><section id="wenyan">${html}</section></body>`);
   const document = dom.window.document;
   const wenyan = document.getElementById("wenyan");
   const result = await wenyanCoreInstance.applyStylesWithTheme(wenyan, options);
-  return {
-    content: result,
-    title: preHandlerContent.title,
-    cover: preHandlerContent.cover,
-    description: preHandlerContent.description,
-    author: preHandlerContent.author,
-    source_url: preHandlerContent.source_url
-  };
+  return result;
 }
 async function prepareRenderContext(inputContent, options, getInputContent) {
   const { content, absoluteDirPath } = await getInputContent(inputContent, options.file);
-  const gzhContent = await renderWithTheme(content, options);
-  return { gzhContent, absoluteDirPath };
+  const preHandlerContent = await wenyanCoreInstance.handleFrontMatter(content);
+  if (preHandlerContent.image_list && preHandlerContent.image_list.length > 0) {
+    return { gzhContent: preHandlerContent, absoluteDirPath };
+  }
+  const styledContent = await renderWithTheme(preHandlerContent.content, options);
+  preHandlerContent.content = styledContent;
+  return { gzhContent: preHandlerContent, absoluteDirPath };
 }
 async function listThemes() {
   const themes = getAllGzhThemes();
@@ -705,30 +763,34 @@ async function checkCustomThemeExists(themeId) {
   const customThemes = await configStore.getThemes();
   return customThemes.some((theme) => theme.id === themeId);
 }
-async function getGzhContent(content, themeId, hlThemeId, isMacStyle = true, isAddFootnote = true) {
-  return await renderStyledContent(content, {
-    themeId,
-    hlThemeId,
-    isMacStyle,
-    isAddFootnote
-  });
-}
 async function renderAndPublish(inputContent, options, getInputContent) {
   const { gzhContent, absoluteDirPath } = await prepareRenderContext(inputContent, options, getInputContent);
   if (!gzhContent.title) throw new Error("未能找到文章标题");
-  const data = await publishToWechatDraft(
-    {
-      title: gzhContent.title,
-      content: gzhContent.content,
-      cover: gzhContent.cover,
-      author: gzhContent.author,
-      source_url: gzhContent.source_url
-    },
-    {
-      appId: options.appId,
-      relativePath: absoluteDirPath
-    }
-  );
+  let data;
+  if (gzhContent.image_list && gzhContent.image_list.length > 0) {
+    data = await publishImageTextToWechatDraft(
+      {
+        ...gzhContent,
+        title: gzhContent.title,
+        images: gzhContent.image_list
+      },
+      {
+        appId: options.appId,
+        relativePath: absoluteDirPath
+      }
+    );
+  } else {
+    data = await publishToWechatDraft(
+      {
+        ...gzhContent,
+        title: gzhContent.title
+      },
+      {
+        appId: options.appId,
+        relativePath: absoluteDirPath
+      }
+    );
+  }
   if (data.media_id) {
     return data.media_id;
   } else {
@@ -743,7 +805,11 @@ async function renderAndPublishToServer(inputContent, options, getInputContent)
   await verifyAuth(serverUrl, headers);
   const { gzhContent, absoluteDirPath } = await prepareRenderContext(inputContent, options, getInputContent);
   if (!gzhContent.title) throw new Error("未能找到文章标题");
-  gzhContent.content = await uploadLocalImages(gzhContent.content, serverUrl, headers, absoluteDirPath);
+  if (gzhContent.image_list && gzhContent.image_list.length > 0) {
+    gzhContent.image_list = await uploadImageList(serverUrl, headers, gzhContent.image_list, absoluteDirPath);
+  } else {
+    gzhContent.content = await uploadLocalImages(gzhContent.content, serverUrl, headers, absoluteDirPath);
+  }
   gzhContent.cover = await uploadCover(serverUrl, headers, gzhContent.cover, absoluteDirPath);
   const mdFileId = await uploadStyledContent(gzhContent, serverUrl, headers);
   return await requestServerPublish(mdFileId, serverUrl, headers, options);
@@ -755,7 +821,6 @@ export {
   configStore,
   credentialStore,
   ensureDir,
-  getGzhContent,
   getNormalizeFilePath,
   isAbsolutePath,
   listThemes,
@@ -763,6 +828,7 @@ export {
   md5FromFile,
   normalizePath,
   prepareRenderContext,
+  publishImageTextToWechatDraft,
   publishToDraft,
   publishToWechatDraft,
   readBinaryFile,
@@ -771,7 +837,6 @@ export {
   renderAndPublish,
   renderAndPublishToServer,
   renderStyledContent,
-  renderWithTheme,
   safeReadJson,
   safeWriteJson,
   wechatPublisher

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Core library for Wenyan markdown rendering & publishing",
   "author": "Lei <caol64@gmail.com> (https://github.com/caol64)",
   "license": "Apache-2.0",