@wenyan-md/core 3.0.3 → 3.0.5

package/dist/core.js

@@ -524,9 +524,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);
     }
@@ -1087,7 +1087,7 @@ function transformUl(ulElement) {
 function tableToAsciiArt(table) {
   const rowsElements = Array.from(table.querySelectorAll("tr"));
   const rows = rowsElements.map(
-    (tr) => Array.from(tr.querySelectorAll("th, td")).map((td) => td.innerText.trim())
+    (tr) => Array.from(tr.querySelectorAll("th, td")).map((td) => (td?.textContent || "").trim())
   );
   if (rows.length === 0) return "";
   const columnWidths = rows[0].map(

package/dist/publish.js

@@ -107,6 +107,57 @@ class UploadCacheStore {
     return this.adapter.calcHash(buffer);
   }
 }
+const defaultCredential = {};
+class CredentialStore {
+  credential = { ...defaultCredential };
+  adapter;
+  initPromise;
+  constructor(adapter) {
+    this.adapter = adapter;
+    this.initPromise = this.load();
+  }
+  async load() {
+    try {
+      const loadedData = await this.adapter.loadCredential();
+      if (loadedData) {
+        this.credential = loadedData;
+      }
+    } catch (error) {
+      throw new Error(`无法加载凭据: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  async save() {
+    try {
+      await this.adapter.saveCredential(this.credential);
+    } catch (error) {
+      throw new Error(`无法保存凭据: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  async _getWechatCredential() {
+    await this.initPromise;
+    return this.credential.wechat ?? {};
+  }
+  async getWechatCredential(appId) {
+    const wechat = await this._getWechatCredential();
+    if (!wechat) return null;
+    const appSecret = wechat[appId];
+    if (!appSecret) return null;
+    return { appId, appSecret };
+  }
+  async saveWechatCredential(appId, appSecret) {
+    await this.initPromise;
+    this.credential.wechat ??= {};
+    this.credential.wechat[appId] = appSecret;
+    await this.save();
+  }
+  async deleteWechatCredential(appId) {
+    await this.initPromise;
+    if (this.credential.wechat) {
+      delete this.credential.wechat[appId];
+      await this.save();
+    }
+  }
+}
 class WechatPublisher {
   tokenStore;
   uploadCacheStore;
@@ -134,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,
@@ -149,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;
   }
@@ -166,8 +219,10 @@ class WechatPublisher {
   }
 }
 export {
+  CredentialStore,
   TokenStore,
   UploadCacheStore,
   WechatPublisher,
+  defaultCredential,
   defaultTokenCache
 };

package/dist/types/credentialStore.d.ts

@@ -0,0 +1,24 @@
+export interface WenyanCredential {
+    wechat?: Record<string, string>;
+}
+export declare const defaultCredential: WenyanCredential;
+export interface CredentialStorageAdapter {
+    loadCredential(): Promise<WenyanCredential | null>;
+    saveCredential(credential: WenyanCredential): Promise<void>;
+    clearCredential(): Promise<void>;
+}
+export declare class CredentialStore {
+    private credential;
+    private adapter;
+    private initPromise;
+    constructor(adapter: CredentialStorageAdapter);
+    private load;
+    private save;
+    private _getWechatCredential;
+    getWechatCredential(appId: string): Promise<{
+        appId: string;
+        appSecret: string;
+    } | null>;
+    saveWechatCredential(appId: string, appSecret: string): Promise<void>;
+    deleteWechatCredential(appId: string): Promise<void>;
+}

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

@@ -7,7 +7,6 @@ export interface ThemeConfigOptions {
     description?: string;
     path: string;
 }
-export declare const configDir: string;
 export declare const configPath: string;
 declare class ConfigStore {
     private config;

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

@@ -0,0 +1,7 @@
+import { CredentialStorageAdapter, WenyanCredential } from "../credentialStore.js";
+export declare const credentialPath: string;
+export declare class NodeCredentialStorageAdapter implements CredentialStorageAdapter {
+    loadCredential(): Promise<WenyanCredential | null>;
+    saveCredential(credential: WenyanCredential): Promise<void>;
+    clearCredential(): Promise<void>;
+}

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

@@ -1,6 +1,8 @@
 import { WechatPublishResponse } from "../wechat.js";
 import { ArticleOptions, WechatPublisher } from "../publish.js";
+import { CredentialStore } from "../credentialStore.js";
 export declare const wechatPublisher: WechatPublisher;
+export declare const credentialStore: CredentialStore;
 interface PublishOptions {
     appId?: string;
     appSecret?: string;

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

@@ -7,8 +7,9 @@ export interface RenderOptions {
     footnote: boolean;
 }
 export interface PublishOptions extends RenderOptions {
+    appId?: string;
 }
-export interface ClientPublishOptions extends RenderOptions {
+export interface ClientPublishOptions extends PublishOptions {
     server?: string;
     apiKey?: string;
     clientVersion?: string;

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

@@ -1,4 +1,5 @@
 import crypto from "node:crypto";
+export declare const configDir: string;
 export declare function readFileContent(filePath: string): Promise<string>;
 export declare function readBinaryFile(filePath: string): Promise<Buffer>;
 export declare function safeReadJson<T>(file: string, fallback: T): Promise<T>;

package/dist/types/publish.d.ts

@@ -17,9 +17,10 @@ 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>;
 }
 export * from "./tokenStore.js";
 export * from "./uploadCacheStore.js";
+export * from "./credentialStore.js";

package/dist/wrapper.js

@@ -4,13 +4,22 @@ import https from "node:https";
 import { JSDOM } from "jsdom";
 import fs, { stat } from "node:fs/promises";
 import crypto from "node:crypto";
+import os from "node:os";
 import { fileFromPath } from "formdata-node/file-from-path";
 import { FormDataEncoder } from "form-data-encoder";
 import { FormData } from "formdata-node";
 import { Readable } from "node:stream";
-import os from "node:os";
-import { defaultTokenCache, WechatPublisher } from "./publish.js";
+import { defaultTokenCache, defaultCredential, WechatPublisher, CredentialStore } from "./publish.js";
 import { createWenyanCore, getAllGzhThemes } from "./core.js";
+const configDir = (() => {
+  if (process.env.XDG_CONFIG_HOME) {
+    return path.join(process.env.XDG_CONFIG_HOME, "wenyan-md");
+  }
+  if (process.env.APPDATA) {
+    return path.join(process.env.APPDATA, "wenyan-md");
+  }
+  return path.join(os.homedir(), ".config", "wenyan-md");
+})();
 async function readFileContent(filePath) {
   return await fs.readFile(filePath, "utf-8");
 }
@@ -233,7 +242,7 @@ async function uploadStyledContent(gzhContent, serverUrl, headers) {
   return mdFileId;
 }
 async function requestServerPublish(mdFileId, serverUrl, headers, options) {
-  const { theme, customTheme, highlight, macStyle, footnote } = options;
+  const { theme, customTheme, highlight, macStyle, footnote, appId } = options;
   const publishRes = await fetch(`${serverUrl}/publish`, {
     method: "POST",
     headers: {
@@ -246,7 +255,8 @@ async function requestServerPublish(mdFileId, serverUrl, headers, options) {
       highlight,
       customTheme,
       macStyle,
-      footnote
+      footnote,
+      appId
     })
   });
   const publishData = await publishRes.json();
@@ -330,80 +340,6 @@ const nodeHttpAdapter = {
     };
   }
 };
-const defaultConfig = {};
-const configDir = process.env.APPDATA ? path.join(process.env.APPDATA, "wenyan-md") : path.join(os.homedir(), ".config", "wenyan-md");
-const configPath = path.join(configDir, "config.json");
-class ConfigStore {
-  config = { ...defaultConfig };
-  initPromise;
-  constructor() {
-    this.initPromise = this.load();
-  }
-  async load() {
-    await ensureDir(configDir);
-    this.config = await safeReadJson(configPath, defaultConfig);
-  }
-  async save() {
-    try {
-      await ensureDir(configDir);
-      await safeWriteJson(configPath, this.config);
-    } catch (error) {
-      throw new Error(`无法保存配置文件: ${error instanceof Error ? error.message : String(error)}`);
-    }
-  }
-  async getConfig() {
-    await this.initPromise;
-    return this.config;
-  }
-  async getThemes() {
-    await this.initPromise;
-    return Object.values(this.config.themes ?? {});
-  }
-  async getThemeById(themeId) {
-    await this.initPromise;
-    const themeOption = this.config.themes?.[themeId];
-    if (!themeOption) return void 0;
-    const absoluteFilePath = path.join(configDir, themeOption.path);
-    try {
-      return await fs.readFile(absoluteFilePath, "utf-8");
-    } catch {
-      return void 0;
-    }
-  }
-  async addThemeToConfig(name, content) {
-    await this.initPromise;
-    const savedPath = await this.addThemeFile(name, content);
-    this.config.themes ??= {};
-    this.config.themes[name] = {
-      id: name,
-      name,
-      path: savedPath
-    };
-    await this.save();
-  }
-  async addThemeFile(themeId, themeContent) {
-    const filePath = `themes/${themeId}.css`;
-    const absoluteFilePath = path.join(configDir, filePath);
-    await ensureDir(path.dirname(absoluteFilePath));
-    await fs.writeFile(absoluteFilePath, themeContent, "utf-8");
-    return filePath;
-  }
-  async deleteThemeFromConfig(themeId) {
-    await this.initPromise;
-    const theme = this.config.themes?.[themeId];
-    if (!theme) return;
-    await this.deleteThemeFile(theme.path);
-    delete this.config.themes[themeId];
-    await this.save();
-  }
-  async deleteThemeFile(filePath) {
-    try {
-      await fs.unlink(path.join(configDir, filePath));
-    } catch {
-    }
-  }
-}
-const configStore = new ConfigStore();
 const tokenPath = path.join(configDir, "token.json");
 class NodeTokenStorageAdapter {
   async loadToken() {
@@ -447,9 +383,28 @@ class NodeUploadCacheAdapter {
     return crypto.createHash("md5").update(Buffer.from(buffer)).digest("hex");
   }
 }
+const credentialPath = path.join(configDir, "credential.json");
+class NodeCredentialStorageAdapter {
+  async loadCredential() {
+    await ensureDir(configDir);
+    return await safeReadJson(credentialPath, defaultCredential);
+  }
+  async saveCredential(credential) {
+    await ensureDir(configDir);
+    await safeWriteJson(credentialPath, credential);
+  }
+  async clearCredential() {
+    throw new Error("Method not implemented.");
+  }
+}
 const mediaIdMapping = /* @__PURE__ */ new Map();
-const wechatPublisher = new WechatPublisher(nodeHttpAdapter, new NodeTokenStorageAdapter(), new NodeUploadCacheAdapter());
-async function uploadImage(imageUrl, accessToken, fileName, relativePath) {
+const wechatPublisher = new WechatPublisher(
+  nodeHttpAdapter,
+  new NodeTokenStorageAdapter(),
+  new NodeUploadCacheAdapter()
+);
+const credentialStore = new CredentialStore(new NodeCredentialStorageAdapter());
+async function uploadImage(imageUrl, accessToken, fileName, relativePath, appId) {
   let fileData;
   let finalName;
   if (imageUrl.startsWith("http")) {
@@ -478,11 +433,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: "" };
   }
@@ -493,7 +448,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 {
@@ -510,20 +465,16 @@ async function uploadImages(content, accessToken, relativePath) {
 async function publishToWechatDraft(articleOptions, publishOptions = {}) {
   const { title, content, cover, author, source_url } = articleOptions;
   const { appId, appSecret, relativePath } = publishOptions;
-  const appIdFinal = appId ?? process.env.WECHAT_APP_ID;
-  const appSecretFinal = appSecret ?? process.env.WECHAT_APP_SECRET;
-  if (!appIdFinal || !appSecretFinal) {
-    throw new Error("请通过参数或环境变量 WECHAT_APP_ID / WECHAT_APP_SECRET 提供公众号凭据");
-  }
+  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 {
@@ -532,7 +483,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 {
@@ -557,6 +508,97 @@ async function publishToWechatDraft(articleOptions, publishOptions = {}) {
 async function publishToDraft(title, content, cover = "", options = {}) {
   return publishToWechatDraft({ title, content, cover }, options);
 }
+async function getAppIdAndSecret(appId, appSecret) {
+  if (appId && appSecret) {
+    return { appId, appSecret };
+  }
+  const envAppId = process.env.WECHAT_APP_ID;
+  const envAppSecret = process.env.WECHAT_APP_SECRET;
+  if (envAppId && envAppSecret && (envAppId === appId || !appId)) {
+    return { appId: envAppId, appSecret: envAppSecret };
+  }
+  if (!appId) {
+    throw new Error("未提供 AppID：请通过参数、环境变量或配置文件指定。");
+  }
+  const credential = await credentialStore.getWechatCredential(appId);
+  if (credential?.appId && credential?.appSecret) {
+    return { appId: credential.appId, appSecret: credential.appSecret };
+  }
+  throw new Error(`未能找到 AppID 为 "${appId}" 的公众号凭据，请检查配置文件。`);
+}
+const defaultConfig = {};
+const configPath = path.join(configDir, "config.json");
+class ConfigStore {
+  config = { ...defaultConfig };
+  initPromise;
+  constructor() {
+    this.initPromise = this.load();
+  }
+  async load() {
+    await ensureDir(configDir);
+    this.config = await safeReadJson(configPath, defaultConfig);
+  }
+  async save() {
+    try {
+      await ensureDir(configDir);
+      await safeWriteJson(configPath, this.config);
+    } catch (error) {
+      throw new Error(`无法保存配置文件: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  async getConfig() {
+    await this.initPromise;
+    return this.config;
+  }
+  async getThemes() {
+    await this.initPromise;
+    return Object.values(this.config.themes ?? {});
+  }
+  async getThemeById(themeId) {
+    await this.initPromise;
+    const themeOption = this.config.themes?.[themeId];
+    if (!themeOption) return void 0;
+    const absoluteFilePath = path.join(configDir, themeOption.path);
+    try {
+      return await fs.readFile(absoluteFilePath, "utf-8");
+    } catch {
+      return void 0;
+    }
+  }
+  async addThemeToConfig(name, content) {
+    await this.initPromise;
+    const savedPath = await this.addThemeFile(name, content);
+    this.config.themes ??= {};
+    this.config.themes[name] = {
+      id: name,
+      name,
+      path: savedPath
+    };
+    await this.save();
+  }
+  async addThemeFile(themeId, themeContent) {
+    const filePath = `themes/${themeId}.css`;
+    const absoluteFilePath = path.join(configDir, filePath);
+    await ensureDir(path.dirname(absoluteFilePath));
+    await fs.writeFile(absoluteFilePath, themeContent, "utf-8");
+    return filePath;
+  }
+  async deleteThemeFromConfig(themeId) {
+    await this.initPromise;
+    const theme = this.config.themes?.[themeId];
+    if (!theme) return;
+    await this.deleteThemeFile(theme.path);
+    delete this.config.themes[themeId];
+    await this.save();
+  }
+  async deleteThemeFile(filePath) {
+    try {
+      await fs.unlink(path.join(configDir, filePath));
+    } catch {
+    }
+  }
+}
+const configStore = new ConfigStore();
 const wenyanCoreInstance = await createWenyanCore();
 async function renderWithTheme(markdownContent, options) {
   if (!markdownContent) {
@@ -683,6 +725,7 @@ async function renderAndPublish(inputContent, options, getInputContent) {
       source_url: gzhContent.source_url
     },
     {
+      appId: options.appId,
       relativePath: absoluteDirPath
     }
   );
@@ -710,6 +753,7 @@ export {
   configDir,
   configPath,
   configStore,
+  credentialStore,
   ensureDir,
   getGzhContent,
   getNormalizeFilePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Core library for Wenyan markdown rendering & publishing",
   "author": "Lei <caol64@gmail.com> (https://github.com/caol64)",
   "license": "Apache-2.0",
@@ -60,7 +60,7 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
-    "css-tree": "^3.1.0",
+    "css-tree": "^3.2.1",
     "front-matter": "^4.0.2",
     "highlight.js": "11.10.0",
     "marked": "^15.0.12",
@@ -83,6 +83,9 @@
       "optional": true
     }
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "scripts": {
     "typecheck": "tsc --noEmit",
     "build": "vite build && tsc",