@wenyan-md/core 1.0.15 → 1.0.16

package/dist/publish.js

@@ -64,22 +64,44 @@ async function publishArticle(title, content, thumbMediaId, accessToken) {
   return await response.json();
 }
 function normalizePath(p) {
-  if (!p) return "";
-  let res = p.replace(/\\/g, "/");
-  if (res.endsWith("/")) {
-    res = res.slice(0, -1);
-  }
-  return res;
+  return p.replace(/\\/g, "/").replace(/\/+$/, "");
+}
+function isAbsolutePath(path2) {
+  if (!path2) return false;
+  const winAbsPattern = /^[a-zA-Z]:\//;
+  const linuxAbsPattern = /^\//;
+  return winAbsPattern.test(path2) || linuxAbsPattern.test(path2);
 }
 const RuntimeEnv = {
   isContainer: !!process.env.CONTAINERIZED,
   hostFilePath: normalizePath(process.env.HOST_FILE_PATH || ""),
   containerFilePath: normalizePath(process.env.CONTAINER_FILE_PATH || "/mnt/host-downloads"),
-  resolveLocalPath(inputPath) {
-    if (!this.isContainer || !this.hostFilePath) {
-      return path.resolve(inputPath);
+  resolveLocalPath(inputPath, relativeBase) {
+    if (!this.isContainer) {
+      if (relativeBase) {
+        return path.resolve(relativeBase, inputPath);
+      } else {
+        if (!path.isAbsolute(inputPath)) {
+          throw new Error(
+            `Invalid input: '${inputPath}'. When relativeBase is not provided, inputPath must be an absolute path.`
+          );
+        }
+        return path.normalize(inputPath);
+      }
+    }
+    let normalizedInput = normalizePath(inputPath);
+    relativeBase = normalizePath(relativeBase || "");
+    if (relativeBase) {
+      if (!isAbsolutePath(normalizedInput)) {
+        normalizedInput = relativeBase + (normalizedInput.startsWith("/") ? "" : "/") + normalizedInput;
+      }
+    } else {
+      if (!isAbsolutePath(normalizedInput)) {
+        throw new Error(
+          `Invalid input: '${inputPath}'. When relativeBase is not provided, inputPath must be an absolute path.`
+        );
+      }
     }
-    const normalizedInput = normalizePath(inputPath);
     if (normalizedInput.startsWith(this.hostFilePath)) {
       let relativePart = normalizedInput.slice(this.hostFilePath.length);
       if (relativePart && !relativePart.startsWith("/")) {
@@ -93,7 +115,7 @@ const RuntimeEnv = {
     return normalizedInput;
   }
 };
-async function uploadImage(imageUrl, accessToken, fileName) {
+async function uploadImage(imageUrl, accessToken, fileName, relativePath) {
   let fileData;
   let finalName;
   if (imageUrl.startsWith("http")) {
@@ -111,16 +133,15 @@ async function uploadImage(imageUrl, accessToken, fileName) {
     const contentType = response.headers.get("content-type") || "image/jpeg";
     fileData = new Blob([buffer], { type: contentType });
   } else {
-    const resolvedPath = RuntimeEnv.resolveLocalPath(imageUrl);
-    const safePath = path$1.resolve(resolvedPath);
-    const stats = await stat(safePath);
+    const resolvedPath = RuntimeEnv.resolveLocalPath(imageUrl, relativePath);
+    const stats = await stat(resolvedPath);
     if (stats.size === 0) {
-      throw new Error(`本地图片大小为0，无法上传: ${safePath}`);
+      throw new Error(`本地图片大小为0，无法上传: ${resolvedPath}`);
     }
     const fileNameFromLocal = path$1.basename(resolvedPath);
     const ext = path$1.extname(fileNameFromLocal);
     finalName = fileName ?? (ext === "" ? `${fileNameFromLocal}.jpg` : fileNameFromLocal);
-    fileData = await fileFromPath(safePath);
+    fileData = await fileFromPath(resolvedPath);
   }
   const data = await uploadMaterial("image", fileData, finalName, accessToken);
   if (data.errcode) {
@@ -128,7 +149,7 @@ async function uploadImage(imageUrl, accessToken, fileName) {
   }
   return data;
 }
-async function uploadImages(content, accessToken) {
+async function uploadImages(content, accessToken, relativePath) {
   if (!content.includes("<img")) {
     return { html: content, firstImageId: "" };
   }
@@ -139,7 +160,7 @@ async function uploadImages(content, accessToken) {
     const dataSrc = element.getAttribute("src");
     if (dataSrc) {
       if (!dataSrc.startsWith("https://mmbiz.qpic.cn")) {
-        const resp = await uploadImage(dataSrc, accessToken);
+        const resp = await uploadImage(dataSrc, accessToken, void 0, relativePath);
         element.setAttribute("src", resp.url);
         return resp.media_id;
       } else {
@@ -153,7 +174,7 @@ async function uploadImages(content, accessToken) {
   const updatedHtml = dom.serialize();
   return { html: updatedHtml, firstImageId };
 }
-async function publishToDraft(title, content, cover, appId, appSecret) {
+async function publishToDraft(title, content, cover, appId, appSecret, relativePath) {
   const accessToken = await fetchAccessToken(appId, appSecret);
   if (!accessToken.access_token) {
     if (accessToken.errcode) {
@@ -162,14 +183,14 @@ async function publishToDraft(title, content, cover, appId, appSecret) {
       throw new Error(`获取 Access Token 失败: ${accessToken}`);
     }
   }
-  const { html, firstImageId } = await uploadImages(content, accessToken.access_token);
+  const { html, firstImageId } = await uploadImages(content, accessToken.access_token, relativePath);
   let thumbMediaId = "";
   if (cover) {
-    const resp = await uploadImage(cover, accessToken.access_token, "cover.jpg");
+    const resp = await uploadImage(cover, accessToken.access_token, "cover.jpg", relativePath);
     thumbMediaId = resp.media_id;
   } else {
     if (firstImageId.startsWith("https://mmbiz.qpic.cn")) {
-      const resp = await uploadImage(firstImageId, accessToken.access_token, "cover.jpg");
+      const resp = await uploadImage(firstImageId, accessToken.access_token, "cover.jpg", relativePath);
       thumbMediaId = resp.media_id;
     } else {
       thumbMediaId = firstImageId;

package/dist/types/publish.d.ts

@@ -1 +1 @@
-export declare function publishToDraft(title: string, content: string, cover: string, appId?: string, appSecret?: string): Promise<any>;
+export declare function publishToDraft(title: string, content: string, cover: string, appId?: string, appSecret?: string, relativePath?: string): Promise<any>;

package/dist/types/runtimeEnv.d.ts

@@ -2,5 +2,5 @@ export declare const RuntimeEnv: {
     isContainer: boolean;
     hostFilePath: string;
     containerFilePath: string;
-    resolveLocalPath(inputPath: string): string;
+    resolveLocalPath(inputPath: string, relativeBase?: string): string;
 };

package/package.json

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