@wenyan-md/cli 1.0.10 → 2.0.0

package/dist/commands/publish.js

@@ -1,21 +1,25 @@
-import { publishToDraft } from "@wenyan-md/core/publish";
-import { prepareRenderContext, runCommandWrapper } from "./render.js";
+import { publishToWechatDraft } from "@wenyan-md/core/publish";
+import { AppError } from "../types.js";
+import { prepareRenderContext } from "./render.js";
 export async function publishCommand(inputContent, options) {
-    await runCommandWrapper(async () => {
-        const { gzhContent, absoluteDirPath } = await prepareRenderContext(inputContent, options);
-        if (!gzhContent.title)
-            throw new Error("Error: 未能找到文章标题");
-        if (!gzhContent.cover)
-            throw new Error("Error: 未能找到文章封面");
-        const data = await publishToDraft(gzhContent.title, gzhContent.content, gzhContent.cover, {
-            relativePath: absoluteDirPath,
-        });
-        if (data.media_id) {
-            console.log(`上传成功，media_id: ${data.media_id}`);
-        }
-        else {
-            console.error(`上传失败，\n${data}`);
-            process.exit(1);
-        }
+    const { gzhContent, absoluteDirPath } = await prepareRenderContext(inputContent, options);
+    if (!gzhContent.title)
+        throw new AppError("未能找到文章标题");
+    if (!gzhContent.cover)
+        throw new AppError("未能找到文章封面");
+    const data = await publishToWechatDraft({
+        title: gzhContent.title,
+        content: gzhContent.content,
+        cover: gzhContent.cover,
+        author: gzhContent.author,
+        source_url: gzhContent.source_url,
+    }, {
+        relativePath: absoluteDirPath,
     });
+    if (data.media_id) {
+        return data.media_id;
+    }
+    else {
+        throw new AppError(`上传失败，\n${data}`);
+    }
 }

package/dist/commands/render.js

@@ -1,25 +1,11 @@
 import { configStore, renderStyledContent } from "@wenyan-md/core/wrapper";
-import { getNormalizeFilePath, readStdin } from "../utils.js";
+import { getInputContent, getNormalizeFilePath } from "../utils.js";
 import fs from "node:fs/promises";
-import path from "node:path";
+import { AppError } from "../types.js";
 // --- 处理输入源、文件路径和主题 ---
 export async function prepareRenderContext(inputContent, options) {
-    const { file, theme, customTheme, highlight, macStyle, footnote } = options;
-    let absoluteDirPath = undefined;
-    // 1. 尝试从 Stdin 读取
-    if (!inputContent && !process.stdin.isTTY) {
-        inputContent = await readStdin();
-    }
-    // 2. 尝试从文件读取
-    if (!inputContent && file) {
-        const normalizePath = getNormalizeFilePath(file);
-        inputContent = await fs.readFile(normalizePath, "utf-8");
-        absoluteDirPath = path.dirname(normalizePath);
-    }
-    // 3. 校验输入
-    if (!inputContent) {
-        throw new Error("Error: missing input-content (no argument, no stdin, and no file).");
-    }
+    const { content, absoluteDirPath } = await getInputContent(inputContent, options);
+    const { theme, customTheme, highlight, macStyle, footnote } = options;
     let handledCustomTheme = customTheme;
     // 4. 当用户传入自定义主题路径时，优先级最高
     if (customTheme) {
@@ -31,10 +17,10 @@ export async function prepareRenderContext(inputContent, options) {
         handledCustomTheme = configStore.getThemeById(theme);
     }
     if (!handledCustomTheme && !theme) {
-        throw new Error(`Error: theme "${theme}" not found.`);
+        throw new AppError(`theme "${theme}" not found.`);
     }
     // 5. 执行核心渲染
-    const gzhContent = await renderStyledContent(inputContent, {
+    const gzhContent = await renderStyledContent(content, {
         themeId: theme,
         hlThemeId: highlight,
         isMacStyle: macStyle,
@@ -43,29 +29,3 @@ export async function prepareRenderContext(inputContent, options) {
     });
     return { gzhContent, absoluteDirPath };
 }
-// --- 统一的错误处理包装器 ---
-export async function runCommandWrapper(action) {
-    try {
-        await action();
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            if (error.message.startsWith("Error:")) {
-                console.error(error.message);
-            }
-            else {
-                console.error("An unexpected error occurred:", error.message);
-            }
-        }
-        else {
-            console.error("An unexpected error occurred:", error);
-        }
-        process.exit(1);
-    }
-}
-export async function renderCommand(inputContent, options) {
-    await runCommandWrapper(async () => {
-        const { gzhContent } = await prepareRenderContext(inputContent, options);
-        console.log(gzhContent.content);
-    });
-}

package/dist/commands/serve.js

@@ -0,0 +1,220 @@
+import express from "express";
+import { AppError } from "../types.js";
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import path from "node:path";
+import crypto from "node:crypto";
+import { configDir } from "@wenyan-md/core/wrapper";
+import multer from "multer";
+import { getNormalizeFilePath } from "../utils.js";
+import { publishToWechatDraft } from "@wenyan-md/core/publish";
+const UPLOAD_TTL_MS = 10 * 60 * 1000; // 10 minutes
+const UPLOAD_DIR = path.join(configDir, "uploads");
+export async function serveCommand(options) {
+    // 确保临时目录存在
+    if (!fs.existsSync(UPLOAD_DIR)) {
+        fs.mkdirSync(UPLOAD_DIR, { recursive: true });
+    }
+    // 服务启动时立即执行一次后台清理
+    cleanupOldUploads();
+    // 定期清理过期的上传文件
+    setInterval(cleanupOldUploads, UPLOAD_TTL_MS).unref();
+    const app = express();
+    const port = options.port || 3000;
+    const auth = createAuthHandler(options);
+    app.use(express.json({ limit: "10mb" }));
+    const storage = multer.diskStorage({
+        destination: (req, file, cb) => {
+            cb(null, UPLOAD_DIR);
+        },
+        filename: (req, file, cb) => {
+            const fileId = crypto.randomUUID();
+            const ext = file.originalname.split(".").pop() || "";
+            cb(null, ext ? `${fileId}.${ext}` : fileId);
+        },
+    });
+    const upload = multer({
+        storage,
+        limits: {
+            fileSize: 10 * 1024 * 1024, // 10MB
+        },
+        fileFilter: (req, file, cb) => {
+            const ext = file.originalname.split(".").pop()?.toLowerCase();
+            // 1. 定义允许的图片类型
+            const allowedImageTypes = ["image/jpeg", "image/png", "image/gif", "image/webp", "image/svg+xml"];
+            const allowedImageExts = ["jpg", "jpeg", "png", "gif", "webp", "svg"];
+            // 2. 分别判断文件大类
+            const isImage = allowedImageTypes.includes(file.mimetype) || (ext && allowedImageExts.includes(ext));
+            const isMarkdown = ext === "md" || file.mimetype === "text/markdown" || file.mimetype === "text/plain";
+            const isCss = ext === "css" || file.mimetype === "text/css";
+            const isJson = ext === "json" || file.mimetype === "application/json";
+            // 3. 综合放行逻辑
+            if (isImage || isMarkdown || isCss || isJson) {
+                cb(null, true);
+            }
+            else {
+                cb(new AppError("不支持的文件类型，仅支持图片、Markdown、CSS 和 JSON 文件"));
+            }
+        },
+    });
+    // 健康检查
+    app.get("/health", (_req, res) => {
+        res.json({ status: "ok", service: "wenyan-cli", version: options.version || "unknown" });
+    });
+    // 鉴权探针
+    app.get("/verify", auth, (_req, res) => {
+        res.json({ success: true, message: "Authorized" });
+    });
+    // 发布接口 - 读取 json 文件内容并发布
+    app.post("/publish", auth, async (req, res) => {
+        const body = req.body;
+        validateRequest(body);
+        // 根据 fileId 去找刚上传的 json 文件并读取内容
+        const files = await fsPromises.readdir(UPLOAD_DIR);
+        const matchedFile = files.find((f) => f === body.fileId);
+        if (!matchedFile) {
+            throw new AppError(`文件不存在或已过期，请重新上传 (ID: ${body.fileId})`);
+        }
+        // 简单的防呆校验，防止直接提交纯图片的 fileId 到发布接口
+        const ext = path.extname(matchedFile).toLowerCase();
+        if (ext !== ".json") {
+            throw new AppError("请提供 JSON 文件的 fileId，不能直接发布图片文件");
+        }
+        // 找到上传文件并提取文本内容
+        const filePath = path.join(UPLOAD_DIR, matchedFile);
+        const fileContent = await fsPromises.readFile(filePath, "utf-8");
+        const gzhContent = JSON.parse(fileContent);
+        // 公共的 asset:// 替换逻辑
+        const resolveAssetPath = (assetUrl) => {
+            const assetFileId = assetUrl.replace("asset://", "");
+            const matchedAsset = files.find((f) => f === assetFileId || path.parse(f).name === assetFileId);
+            return matchedAsset ? getNormalizeFilePath(path.join(UPLOAD_DIR, matchedAsset)) : assetUrl;
+        };
+        // 替换 HTML 内容里的 asset://
+        gzhContent.content = gzhContent.content.replace(/(<img\b[^>]*?\bsrc\s*=\s*["'])(asset:\/\/[^"']+)(["'])/gi, (_match, prefix, assetUrl, suffix) => prefix + resolveAssetPath(assetUrl) + suffix);
+        // 替换封面里的 asset://
+        if (gzhContent.cover && gzhContent.cover.startsWith("asset://")) {
+            gzhContent.cover = resolveAssetPath(gzhContent.cover);
+        }
+        const data = await publishToWechatDraft({
+            title: gzhContent.title,
+            content: gzhContent.content,
+            cover: gzhContent.cover,
+            author: gzhContent.author,
+            source_url: gzhContent.source_url,
+        });
+        if (data.media_id) {
+            res.json({
+                media_id: data.media_id,
+            });
+        }
+        else {
+            throw new AppError(`上传失败，\n${data}`);
+        }
+    });
+    // 上传接口
+    app.post("/upload", auth, upload.single("file"), async (req, res) => {
+        if (!req.file) {
+            throw new AppError("未找到上传的文件");
+        }
+        const newFilename = req.file.filename;
+        res.json({
+            success: true,
+            data: {
+                fileId: newFilename,
+                originalFilename: req.file.originalname,
+                mimetype: req.file.mimetype,
+                size: req.file.size,
+            },
+        });
+    });
+    app.use(errorHandler);
+    return new Promise((resolve, reject) => {
+        const server = app.listen(port, () => {
+            console.log(`文颜 Server 已启动，监听端口 ${port}`);
+            console.log(`健康检查：http://localhost:${port}/health`);
+            console.log(`鉴权探针：http://localhost:${port}/verify`);
+            console.log(`发布接口：POST http://localhost:${port}/publish`);
+            console.log(`上传接口：POST http://localhost:${port}/upload`);
+        });
+        server.on("error", (err) => {
+            if (err.code === "EADDRINUSE") {
+                console.error(`端口 ${port} 已被占用`);
+                reject(new Error(`端口 ${port} 已被占用`));
+            }
+            else {
+                reject(err);
+            }
+        });
+        process.on("SIGINT", () => {
+            console.log("\n正在关闭服务器...");
+            server.close(() => {
+                console.log("服务器已关闭");
+                resolve();
+            });
+        });
+        process.on("SIGTERM", () => {
+            server.close(() => resolve());
+        });
+    });
+}
+function errorHandler(error, _req, res, next) {
+    if (res.headersSent) {
+        return next(error);
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    // 修复：multer 抛出的文件限制错误（如超出大小），应判断为客户端 400 错误
+    const isAppError = error instanceof AppError;
+    const isMulterError = error.name === "MulterError";
+    const statusCode = isAppError || isMulterError ? 400 : 500;
+    if (statusCode === 500) {
+        console.error("[Server Error]:", error);
+    }
+    res.status(statusCode).json({
+        code: -1,
+        desc: message,
+    });
+}
+function createAuthHandler(config) {
+    return (req, res, next) => {
+        if (!config.apiKey) {
+            return next();
+        }
+        const clientApiKey = req.headers["x-api-key"];
+        if (clientApiKey === config.apiKey) {
+            next();
+        }
+        else {
+            res.status(401).json({
+                code: -1,
+                desc: "Unauthorized: Invalid API Key",
+            });
+        }
+    };
+}
+function validateRequest(req) {
+    if (!req.fileId) {
+        throw new AppError("缺少必要参数：fileId");
+    }
+}
+async function cleanupOldUploads() {
+    try {
+        const files = await fsPromises.readdir(UPLOAD_DIR);
+        const now = Date.now();
+        for (const file of files) {
+            const filePath = path.join(UPLOAD_DIR, file);
+            try {
+                const stats = await fsPromises.stat(filePath);
+                if (now - stats.mtimeMs > UPLOAD_TTL_MS) {
+                    await fsPromises.unlink(filePath);
+                }
+            }
+            catch (e) {
+                // 忽略单个文件处理错误
+            }
+        }
+    }
+    catch (e) {
+        console.error("Cleanup task error:", e);
+    }
+}

package/dist/commands/theme.js

@@ -2,49 +2,42 @@ import { getAllGzhThemes } from "@wenyan-md/core";
 import { getNormalizeFilePath } from "../utils.js";
 import fs from "node:fs/promises";
 import { configStore } from "@wenyan-md/core/wrapper";
-export async function themeCommand(options) {
-    const { list, add, name, path, rm } = options;
-    if (list) {
-        listThemes();
-        return;
-    }
-    if (add) {
-        await addTheme(name, path);
-        return;
-    }
-    if (rm) {
-        await removeTheme(rm);
-        return;
-    }
-}
-function listThemes() {
+import { AppError } from "../types.js";
+export function listThemes() {
     const themes = getAllGzhThemes();
-    console.log("\n内置主题：");
-    themes.forEach((theme) => console.log(`- ${theme.meta.id}: ${theme.meta.description}`));
+    const themeList = themes.map((theme) => {
+        return {
+            id: theme.meta.id,
+            name: theme.meta.name,
+            description: theme.meta.description,
+            isBuiltin: true,
+        };
+    });
     const customThemes = configStore.getThemes();
     if (customThemes.length > 0) {
-        console.log("\n自定义主题：");
         customThemes.forEach((theme) => {
-            console.log(`- ${theme.id}: ${theme.description ?? ""}`);
+            themeList.push({
+                id: theme.id,
+                name: theme.id,
+                description: theme.description,
+                isBuiltin: false,
+            });
         });
     }
-    console.log("");
+    return themeList;
 }
-async function addTheme(name, path) {
+export async function addTheme(name, path) {
     if (!name || !path) {
-        console.log("❌ 添加主题时必须提供名称(name)和路径(path)\n");
-        return;
+        throw new AppError("添加主题时必须提供名称(name)和路径(path)");
     }
     if (checkThemeExists(name) || checkCustomThemeExists(name)) {
-        console.log(`❌ 主题 "${name}" 已存在\n`);
-        return;
+        throw new AppError(`主题 "${name}" 已存在`);
     }
     if (path.startsWith("http")) {
-        console.log(`⏳ 正在从远程获取主题: ${path} ...`);
+        console.log(`正在从远程获取主题: ${path} ...`);
         const response = await fetch(path);
         if (!response.ok) {
-            console.log(`❌ 无法从远程获取主题: ${response.statusText}\n`);
-            return;
+            throw new AppError(`无法从远程获取主题: ${response.statusText}`);
         }
         const content = await response.text();
         configStore.addThemeToConfig(name, content);
@@ -54,19 +47,15 @@ async function addTheme(name, path) {
         const content = await fs.readFile(normalizePath, "utf-8");
         configStore.addThemeToConfig(name, content);
     }
-    console.log(`✅ 主题 "${name}" 已添加\n`);
 }
-async function removeTheme(name) {
+export async function removeTheme(name) {
     if (checkThemeExists(name)) {
-        console.log(`❌ 默认主题 "${name}" 不能删除\n`);
-        return;
+        throw new AppError(`默认主题 "${name}" 不能删除`);
     }
     if (!checkCustomThemeExists(name)) {
-        console.log(`❌ 自定义主题 "${name}" 不存在\n`);
-        return;
+        throw new AppError(`自定义主题 "${name}" 不存在`);
     }
     configStore.deleteThemeFromConfig(name);
-    console.log(`✅ 主题 "${name}" 已删除\n`);
 }
 function checkThemeExists(themeId) {
     const themes = getAllGzhThemes();

package/dist/index.js

@@ -1,43 +1,6 @@
-import { Command } from "commander";
-import { publishCommand } from "./commands/publish.js";
-import { renderCommand } from "./commands/render.js";
-import pkg from "../package.json" with { type: "json" };
-import { themeCommand } from "./commands/theme.js";
-export function createProgram(version = pkg.version) {
-    const program = new Command();
-    program
-        .name("wenyan")
-        .description("A CLI for WenYan Markdown Render.")
-        .version(version, "-v, --version", "output the current version")
-        .action(() => {
-        program.outputHelp();
-    });
-    const addCommonOptions = (cmd) => {
-        return cmd
-            .argument("[input-content]", "markdown content (string input)")
-            .option("-f, --file <path>", "read markdown content from local file")
-            .option("-t, --theme <theme-id>", "ID of the theme to use", "default")
-            .option("-h, --highlight <highlight-theme-id>", "ID of the code highlight theme to use", "solarized-light")
-            .option("-c, --custom-theme <path>", "path to custom theme CSS file")
-            .option("--mac-style", "display codeblock with mac style", true)
-            .option("--no-mac-style", "disable mac style")
-            .option("--footnote", "convert link to footnote", true)
-            .option("--no-footnote", "disable footnote");
-    };
-    const pubCmd = program
-        .command("publish")
-        .description("Render a markdown file to styled HTML and publish to wechat GZH");
-    addCommonOptions(pubCmd).action(publishCommand);
-    const renderCmd = program.command("render").description("Render a markdown file to styled HTML");
-    addCommonOptions(renderCmd).action(renderCommand);
-    program
-        .command("theme")
-        .description("Manage themes")
-        .option("-l, --list", "List all available themes")
-        .option("--add", "Add a new custom theme")
-        .option("--name <name>", "Name of the new custom theme")
-        .option("--path <path>", "Path to the new custom theme CSS file")
-        .option("--rm <name>", "Name of the custom theme to remove")
-        .action(themeCommand);
-    return program;
-}
+export * from "./utils.js";
+export * from "./types.js";
+export * from "./commands/client.js";
+export * from "./commands/publish.js";
+export * from "./commands/render.js";
+export * from "./commands/theme.js";

package/dist/types/commands/client.d.ts

@@ -0,0 +1,2 @@
+import { PublishOptions } from "../types.js";
+export declare function publishClient(inputContent: string | undefined, options: PublishOptions): Promise<string>;

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

@@ -1,2 +1,2 @@
 import { RenderOptions } from "../types.js";
-export declare function publishCommand(inputContent: string | undefined, options: RenderOptions): Promise<void>;
+export declare function publishCommand(inputContent: string | undefined, options: RenderOptions): Promise<string>;

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

@@ -1,7 +1,8 @@
+import { StyledContent } from "@wenyan-md/core/wrapper";
 import { RenderOptions } from "../types.js";
-export declare function prepareRenderContext(inputContent: string | undefined, options: RenderOptions): Promise<{
-    gzhContent: import("@wenyan-md/core/wrapper").StyledContent;
+interface RenderContext {
+    gzhContent: StyledContent;
     absoluteDirPath: string | undefined;
-}>;
-export declare function runCommandWrapper(action: () => Promise<void>): Promise<void>;
-export declare function renderCommand(inputContent: string | undefined, options: RenderOptions): Promise<void>;
+}
+export declare function prepareRenderContext(inputContent: string | undefined, options: RenderOptions): Promise<RenderContext>;
+export {};

package/dist/types/commands/serve.d.ts

@@ -0,0 +1,6 @@
+export interface ServeOptions {
+    port?: number;
+    version?: string;
+    apiKey?: string;
+}
+export declare function serveCommand(options: ServeOptions): Promise<void>;

package/dist/types/commands/theme.d.ts

@@ -1,2 +1,16 @@
-import { ThemeOptions } from "../types.js";
-export declare function themeCommand(options: ThemeOptions): Promise<void>;
+export interface ThemeOptions {
+    list?: boolean;
+    add?: boolean;
+    name?: string;
+    path?: string;
+    rm?: string;
+}
+export interface ThemeInfo {
+    id: string;
+    name: string;
+    description?: string;
+    isBuiltin: boolean;
+}
+export declare function listThemes(): ThemeInfo[];
+export declare function addTheme(name?: string, path?: string): Promise<void>;
+export declare function removeTheme(name: string): Promise<void>;

package/dist/types/index.d.ts

@@ -1,2 +1,6 @@
-import { Command } from "commander";
-export declare function createProgram(version?: string): Command;
+export * from "./utils.js";
+export * from "./types.js";
+export * from "./commands/client.js";
+export * from "./commands/publish.js";
+export * from "./commands/render.js";
+export * from "./commands/theme.js";

package/dist/types/types.d.ts

@@ -6,10 +6,12 @@ export interface RenderOptions {
     macStyle: boolean;
     footnote: boolean;
 }
-export interface ThemeOptions {
-    list?: boolean;
-    add?: boolean;
-    name?: string;
-    path?: string;
-    rm?: string;
+export interface PublishOptions extends RenderOptions {
+    server?: string;
+    apiKey?: string;
+    clientVersion?: string;
+}
+export declare class AppError extends Error {
+    message: string;
+    constructor(message: string);
 }

package/dist/types/utils.d.ts

@@ -1,2 +1,7 @@
+import { RenderOptions } from "./types.js";
 export declare function readStdin(): Promise<string>;
 export declare function getNormalizeFilePath(inputPath: string): string;
+export declare function getInputContent(inputContent: string | undefined, options: RenderOptions): Promise<{
+    content: string;
+    absoluteDirPath: string | undefined;
+}>;

package/dist/types.js

@@ -1 +1,8 @@
-export {};
+export class AppError extends Error {
+    message;
+    constructor(message) {
+        super(message);
+        this.message = message;
+        this.name = "AppError";
+    }
+}

package/dist/utils.js

@@ -1,4 +1,6 @@
 import path from "node:path";
+import { AppError } from "./types.js";
+import fs from "node:fs/promises";
 export async function readStdin() {
     return new Promise((resolve, reject) => {
         let data = "";
@@ -18,8 +20,8 @@ function normalizePath(p) {
 }
 export function getNormalizeFilePath(inputPath) {
     const isContainer = !!process.env.CONTAINERIZED;
-    if (isContainer) {
-        const hostFilePath = normalizePath(process.env.HOST_FILE_PATH || "");
+    const hostFilePath = normalizePath(process.env.HOST_FILE_PATH || "");
+    if (isContainer && hostFilePath) {
         const containerFilePath = normalizePath(process.env.CONTAINER_FILE_PATH || "/mnt/host-downloads");
         let relativePart = normalizePath(inputPath);
         if (relativePart.startsWith(hostFilePath)) {
@@ -34,3 +36,22 @@ export function getNormalizeFilePath(inputPath) {
         return path.resolve(inputPath);
     }
 }
+export async function getInputContent(inputContent, options) {
+    const { file } = options;
+    let absoluteDirPath = undefined;
+    // 1. 尝试从 Stdin 读取
+    if (!inputContent && !process.stdin.isTTY) {
+        inputContent = await readStdin();
+    }
+    // 2. 尝试从文件读取
+    if (!inputContent && file) {
+        const normalizePath = getNormalizeFilePath(file);
+        inputContent = await fs.readFile(normalizePath, "utf-8");
+        absoluteDirPath = path.dirname(normalizePath);
+    }
+    // 3. 校验输入
+    if (!inputContent) {
+        throw new AppError("missing input-content (no argument, no stdin, and no file).");
+    }
+    return { content: inputContent, absoluteDirPath };
+}