@wenyan-md/core 3.0.1 → 3.0.3

package/dist/core.js

@@ -29,8 +29,8 @@ function stringToMap(str) {
   return map;
 }
 function replaceCSSVariables(css) {
-  const variablePattern = /--([a-zA-Z0-9\-]+):\s*([^;()]*\((?:[^()]*|\([^()]*\))*\)[^;()]*|[^;]+);/g;
-  const varPattern = /var\(--([a-zA-Z0-9\-]+)\)/g;
+  const variablePattern = /--([a-zA-Z0-9-]+):\s*([^;()]*\((?:[^()]*|\([^()]*\))*\)[^;()]*|[^;]+);/g;
+  const varPattern = /var\(--([a-zA-Z0-9-]+)\)/g;
   const cssVariables = {};
   let match;
   while ((match = variablePattern.exec(css)) !== null) {
@@ -48,7 +48,7 @@ function replaceCSSVariables(css) {
     if (resolved.has(value)) return value;
     resolved.add(value);
     let resolvedValue = value;
-    const innerVarPattern = /var\(--([a-zA-Z0-9\-]+)\)/g;
+    const innerVarPattern = /var\(--([a-zA-Z0-9-]+)\)/g;
     resolvedValue = resolvedValue.replace(innerVarPattern, (match2, varName) => {
       if (variables[varName]) {
         return resolveVariable(variables[varName], variables, resolved);
@@ -61,7 +61,7 @@ function replaceCSSVariables(css) {
     const resolvedValue = resolveVariable(cssVariables[key], cssVariables);
     cssVariables[key] = resolvedValue;
   }
-  let modifiedCSS = css.replace(varPattern, (match2, varName) => {
+  const modifiedCSS = css.replace(varPattern, (match2, varName) => {
     if (cssVariables[varName]) {
       return cssVariables[varName];
     }
@@ -285,7 +285,7 @@ function createCssApplier(css) {
           targets.forEach((el) => {
             declarations.forEach((decl) => {
               if (decl.type !== "Declaration") return;
-              let value = csstree.generate(decl.value);
+              const value = csstree.generate(decl.value);
               const property = decl.property;
               const priority = decl.important ? "important" : "";
               el.style.setProperty(property, value, priority);
@@ -347,8 +347,8 @@ function buildPseudoElement(originalResults, document) {
   for (const [k, v] of beforeResults) {
     if (v.includes("url(")) {
       const svgMatch = v.match(/data:image\/svg\+xml;utf8,(.*<\/svg>)/);
-      const base64SvgMatch = v.match(/data:image\/svg\+xml;base64,([^"'\)]*)["']?\)/);
-      const httpMatch = v.match(/(?:"|')?(https?[^"'\)]*)(?:"|')?\)/);
+      const base64SvgMatch = v.match(/data:image\/svg\+xml;base64,([^"')]*)["']?\)/);
+      const httpMatch = v.match(/(?:"|')?(https?[^"')]*)(?:"|')?\)/);
       if (svgMatch) {
         const svgCode = decodeURIComponent(svgMatch[1]);
         section.innerHTML = svgCode;
@@ -587,6 +587,8 @@ function wechatPostRender(element) {
     }
     li.appendChild(section);
   });
+  element.style.color = "rgb(0, 0, 0)";
+  element.style.caretColor = "rgb(0, 0, 0)";
 }
 const themeModifier = createCssModifier({});
 function renderTheme(wenyanElement, themeCss) {

package/dist/publish.js

@@ -62,6 +62,7 @@ class UploadCacheStore {
   cache = {};
   adapter;
   initPromise;
+  _saveQueue = Promise.resolve();
   constructor(adapter) {
     this.adapter = adapter;
     this.initPromise = this.load();
@@ -73,12 +74,13 @@ class UploadCacheStore {
       throw new Error(`无法加载上传缓存: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
-  async save() {
-    try {
+  save() {
+    this._saveQueue = this._saveQueue.then(async () => {
       await this.adapter.saveCache(this.cache);
-    } catch (error) {
-      throw new Error(`无法保存上传缓存: ${error instanceof Error ? error.message : String(error)}`);
-    }
+    }).catch((err) => {
+      console.error(err);
+    });
+    return this._saveQueue;
   }
   async waitForInit() {
     await this.initPromise;
@@ -154,6 +156,14 @@ class WechatPublisher {
   async publishToDraft(accessToken, options) {
     return await this.publishArticle(accessToken, options);
   }
+  async clearCache() {
+    if (this.tokenStore) {
+      await this.tokenStore.clear();
+    }
+    if (this.uploadCacheStore) {
+      await this.uploadCacheStore.clear();
+    }
+  }
 }
 export {
   TokenStore,

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

@@ -31,3 +31,4 @@ export * from "./platform/medium.js";
 export * from "./platform/zhihu.js";
 export * from "./platform/toutiao.js";
 export { addFootnotes } from "./renderer/footnotesRender.js";
+export type WenyanCoreInstance = Awaited<ReturnType<typeof createWenyanCore>>;

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

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

package/dist/types/publish.d.ts

@@ -19,6 +19,7 @@ export declare class WechatPublisher {
     getAccessTokenWithCache(appId: string, appSecret: string): Promise<string>;
     uploadImage(file: Blob, filename: string, accessToken: string): Promise<WechatUploadResponse>;
     publishToDraft(accessToken: string, options: WechatPublishOptions): Promise<WechatPublishResponse>;
+    clearCache(): Promise<void>;
 }
 export * from "./tokenStore.js";
 export * from "./uploadCacheStore.js";

package/dist/types/uploadCacheStore.d.ts

@@ -16,6 +16,7 @@ export declare class UploadCacheStore {
     private cache;
     private adapter;
     private initPromise;
+    private _saveQueue;
     constructor(adapter: UploadCacheStorageAdapter);
     private load;
     private save;

package/dist/wrapper.js

@@ -1,11 +1,13 @@
 import path from "node:path";
-import { Readable } from "node:stream";
-import { FormData, File } from "formdata-node";
-import { FormDataEncoder } from "form-data-encoder";
+import http from "node:http";
+import https from "node:https";
 import { JSDOM } from "jsdom";
 import fs, { stat } from "node:fs/promises";
 import crypto from "node:crypto";
 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 { createWenyanCore, getAllGzhThemes } from "./core.js";
@@ -107,6 +109,72 @@ const RuntimeEnv = {
     return normalizedInput;
   }
 };
+async function chunkedUpload(serverUrl, headers, fileBuffer, filename, mimeType) {
+  const url = new URL(`${serverUrl}/upload`);
+  const boundary = "----FormBoundary" + Math.random().toString(36).substring(2);
+  const headerPart = `--${boundary}\r
+Content-Disposition: form-data; name="file"; filename="${filename}"\r
+Content-Type: ${mimeType}\r
+\r
+`;
+  const footerPart = `\r
+--${boundary}--\r
+`;
+  const headerBuf = Buffer.from(headerPart, "utf-8");
+  const footerBuf = Buffer.from(footerPart, "utf-8");
+  return new Promise((resolve, reject) => {
+    const requestModule = url.protocol === "https:" ? https : http;
+    const defaultPort = url.protocol === "https:" ? 443 : 80;
+    const req = requestModule.request(
+      {
+        hostname: url.hostname,
+        port: url.port || defaultPort,
+        path: url.pathname,
+        method: "POST",
+        headers: {
+          "Content-Type": `multipart/form-data; boundary=${boundary}`,
+          "Transfer-Encoding": "chunked",
+          ...headers
+        }
+      },
+      (res) => {
+        let body = "";
+        res.on("data", (chunk) => body += chunk);
+        res.on("end", () => {
+          if (res.statusCode && (res.statusCode < 200 || res.statusCode >= 300)) {
+            reject(new Error(`Server returned status ${res.statusCode}: ${body}`));
+            return;
+          }
+          try {
+            resolve(JSON.parse(body));
+          } catch (_e) {
+            reject(new Error(`Invalid server response: ${body}`));
+          }
+        });
+      }
+    );
+    req.on("error", reject);
+    req.write(headerBuf);
+    const CHUNK = 65536;
+    let offset = 0;
+    function writeNext() {
+      if (offset >= fileBuffer.length) {
+        req.write(footerBuf);
+        req.end();
+        return;
+      }
+      const end = Math.min(offset + CHUNK, fileBuffer.length);
+      if (req.write(fileBuffer.subarray(offset, end))) {
+        offset = end;
+        writeNext();
+      } else {
+        offset = end;
+        req.once("drain", writeNext);
+      }
+    }
+    writeNext();
+  });
+}
 function getServerUrl(options) {
   let serverUrl = options.server || "http://localhost:3000";
   serverUrl = serverUrl.replace(/\/$/, "");
@@ -156,21 +224,10 @@ async function verifyAuth(serverUrl, headers) {
 }
 async function uploadStyledContent(gzhContent, serverUrl, headers) {
   const mdFilename = "publish_target.json";
-  const mdForm = new FormData();
-  mdForm.append(
-    "file",
-    new File([Buffer.from(JSON.stringify(gzhContent), "utf-8")], mdFilename, { type: "application/json" })
-  );
-  const mdEncoder = new FormDataEncoder(mdForm);
-  const mdUploadRes = await fetch(`${serverUrl}/upload`, {
-    method: "POST",
-    headers: { ...headers, ...mdEncoder.headers },
-    body: Readable.from(mdEncoder),
-    duplex: "half"
-  });
-  const mdUploadData = await mdUploadRes.json();
-  if (!mdUploadRes.ok || !mdUploadData.success) {
-    throw new Error(`Upload Document Failed: ${mdUploadData.error || mdUploadData.desc || mdUploadRes.statusText}`);
+  const fileBuffer = Buffer.from(JSON.stringify(gzhContent), "utf-8");
+  const mdUploadData = await chunkedUpload(serverUrl, headers, fileBuffer, mdFilename, "application/json");
+  if (!mdUploadData.success) {
+    throw new Error(`Upload Document Failed: ${mdUploadData.error || mdUploadData.desc}`);
   }
   const mdFileId = mdUploadData.data.fileId;
   return mdFileId;
@@ -224,17 +281,8 @@ async function uploadLocalImage(originalUrl, serverUrl, headers, relativePath) {
     ".svg": "image/svg+xml"
   };
   const type = mimeTypes[ext] || "application/octet-stream";
-  const form = new FormData();
-  form.append("file", new File([fileBuffer], filename, { type }));
-  const encoder = new FormDataEncoder(form);
-  const uploadRes = await fetch(`${serverUrl}/upload`, {
-    method: "POST",
-    headers: { ...headers, ...encoder.headers },
-    body: Readable.from(encoder),
-    duplex: "half"
-  });
-  const uploadData = await uploadRes.json();
-  if (uploadRes.ok && uploadData.success) {
+  const uploadData = await chunkedUpload(serverUrl, headers, fileBuffer, filename, type);
+  if (uploadData.success) {
     return `asset://${uploadData.data.fileId}`;
   } else {
     console.error(`[Client] Warning: Failed to upload ${filename}: ${uploadData.error || uploadData.desc}`);
@@ -469,7 +517,7 @@ async function publishToWechatDraft(articleOptions, publishOptions = {}) {
   }
   const accessToken = await wechatPublisher.getAccessTokenWithCache(appIdFinal, appSecretFinal);
   const { html, firstImageId } = await uploadImages(content, accessToken, relativePath);
-  let thumbMediaId = "";
+  let thumbMediaId;
   if (cover) {
     const cachedThumbMediaId = mediaIdMapping.get(cover);
     if (cachedThumbMediaId) {
@@ -681,5 +729,6 @@ export {
   renderStyledContent,
   renderWithTheme,
   safeReadJson,
-  safeWriteJson
+  safeWriteJson,
+  wechatPublisher
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Core library for Wenyan markdown rendering & publishing",
   "author": "Lei <caol64@gmail.com> (https://github.com/caol64)",
   "license": "Apache-2.0",
@@ -48,10 +48,14 @@
     }
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
     "@types/css-tree": "^2.3.11",
     "@types/jsdom": "^27.0.0",
     "@types/node": "^24.3.0",
+    "eslint": "^10.1.0",
+    "globals": "^17.4.0",
     "typescript": "^5.9.2",
+    "typescript-eslint": "^8.58.0",
     "vite": "^7.1.4",
     "vitest": "^3.2.4"
   },
@@ -80,12 +84,10 @@
     }
   },
   "scripts": {
-    "check": "tsc --noEmit",
+    "typecheck": "tsc --noEmit",
     "build": "vite build && tsc",
-    "test": "pnpm build && vitest",
-    "test:wrapper": "vitest run tests/wrapper.test.ts",
-    "test:publish": "vitest run tests/publish.test.ts",
-    "test:realPublish": "vitest run tests/realPublish.test.ts",
-    "test:runtimeEnv": "vitest run tests/runtimeEnv.test.ts"
+    "lint": "eslint . --fix",
+    "test": "vitest run",
+    "test:watch": "vitest"
   }
 }