@wenyan-md/core 3.0.4 → 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);
     }

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/publish.d.ts

@@ -17,7 +17,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/wrapper.js

@@ -404,7 +404,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 +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: "" };
   }
@@ -448,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 {
@@ -467,14 +467,14 @@ async function publishToWechatDraft(articleOptions, publishOptions = {}) {
   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 +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 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenyan-md/core",
-  "version": "3.0.4",
+  "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",