@wahaha216/koishi-plugin-jmcomic 0.2.6 → 0.2.8

package/lib/abstract/JMBlogAbstract.d.ts

@@ -0,0 +1,21 @@
+import { IJMBlogInfo, IJMBlogRelatedBlog, IJMBlogRelatedComics } from "../types/JMClient";
+export declare abstract class JMBlogAbstract {
+    /**
+     * 文库信息
+     */
+    protected info: IJMBlogInfo;
+    /**
+     * 关联的本子
+     */
+    protected related_comics: IJMBlogRelatedComics[];
+    /**
+     * 相关文库
+     */
+    protected related_blogs: IJMBlogRelatedBlog[];
+    get Info(): IJMBlogInfo;
+    set Info(value: IJMBlogInfo);
+    get RelatedComics(): IJMBlogRelatedComics[];
+    set RelatedComics(value: IJMBlogRelatedComics[]);
+    get RelatedBlogs(): IJMBlogRelatedBlog[];
+    set RelatedBlogs(value: IJMBlogRelatedBlog[]);
+}

package/lib/entity/JMAppBlog.d.ts

@@ -0,0 +1,6 @@
+import { JMBlogAbstract } from "../abstract/JMBlogAbstract";
+import { IJMBlog } from "../types/JMClient";
+export declare class JMAppBlog extends JMBlogAbstract {
+    constructor(json: IJMBlog);
+    static fromJson(json: IJMBlog): JMAppBlog;
+}

package/lib/entity/JMAppClient.d.ts

@@ -5,6 +5,8 @@ import { JMClientAbstract } from "../abstract/JMClientAbstract";
 import { JMAppPhoto } from "./JMAppPhoto";
 import { JMAppAlbum } from "./JMAppAlbum";
 import { JMPhotoAbstract } from "../abstract/JMPhotoAbstract";
+import { JMAppBlog } from "./JMAppBlog";
+import Puppeteer from "koishi-plugin-puppeteer";
 export declare class JMAppClient extends JMClientAbstract {
     static APP_VERSION: string;
     static APP_TOKEN_SECRET: string;
@@ -22,7 +24,8 @@ export declare class JMAppClient extends JMClientAbstract {
      * koishi http
      */
     private http;
-    constructor(root: string, http: HTTP, config: Config, logger: Logger);
+    private puppeteer;
+    constructor(root: string, http: HTTP, config: Config, logger: Logger, puppeteer: Puppeteer);
     /**
      * 登录，未完成
      * @param username 用户名
@@ -33,6 +36,7 @@ export declare class JMAppClient extends JMClientAbstract {
     search(keyword: string): Promise<IJMSearchResult>;
     getAlbumById(id: string): Promise<JMAppAlbum>;
     getPhotoById(id: string): Promise<JMAppPhoto>;
+    getBlogById(id: string): Promise<JMAppBlog>;
     downloadByAlbum(album: JMAppAlbum): Promise<void>;
     downloadByPhoto(photo: JMAppPhoto, type?: "photo" | "album", albumId?: string, single?: boolean): Promise<void>;
     downloadFirstImageByAlbum(album: JMAppAlbum): Promise<string>;
@@ -40,8 +44,11 @@ export declare class JMAppClient extends JMClientAbstract {
     decodeByPhoto(photo: JMPhotoAbstract, type?: "photo" | "album", albumId?: string, single?: boolean): Promise<void>;
     albumToPdf(album: JMAppAlbum, password?: string): Promise<string | string[]>;
     photoToPdf(photo: JMAppPhoto, pdfName: string, type?: "photo" | "album", albumId?: string, single?: boolean, password?: string): Promise<string>;
+    blogToPdf(blog: JMAppBlog, password?: string): Promise<string>;
+    private writeBlogPdf;
     albumToZip(album: JMAppAlbum, password?: string, level?: number): Promise<string>;
     photoToZip(photo: JMPhotoAbstract, zipName: string, password?: string, level?: number): Promise<string>;
+    blogToZip(blog: JMAppBlog, password?: string, level?: number): Promise<string>;
     /**
      * 获取时间戳
      * @returns 时间戳

package/lib/index.js

@@ -33,14 +33,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.yml
 var require_zh_CN = __commonJS({
   "src/locales/zh-CN.yml"(exports2, module2) {
-    module2.exports = { commands: { jm: { description: "下载JM漫画，无需python！", examples: "jm album 本子数字ID\njm album info 本子数字ID\njm photo 本子章节数字ID", album: { examples: "jm album 数字ID", messages: { addedToQueue: "已将 {id} 添加到处理队列，请稍候。", queueFirst: "已将 {id} 添加到处理队列，即将开始处理", queuePosition: "已将 {id} 添加到处理队列\n前面还有 {ahead} 个任务等待或正在处理", queueProcessing: "已将 {id} 添加到处理队列\n当前任务状态：{status}", notExistError: "找不到该ID对应的本子", mysqlError: "已尝试所有备用地址，但是JM坏掉了" }, info: { examples: "jm album info 本子数字ID", messages: { notExistError: "找不到该ID对应的本子", mysqlError: "已尝试所有备用地址，但是JM坏掉了" } } }, photo: { examples: "jm photo 本子章节数字ID", messages: { addedToQueue: "已将 {id} 添加到处理队列，请稍候。", queueFirst: "已将 {id} 添加到处理队列，即将开始处理", queuePosition: "已将 {id} 添加到处理队列\n前面还有 {ahead} 个任务等待或正在处理", queueProcessing: "已将 {id} 添加到处理队列\n当前任务状态：{status}", notExistError: "找不到该ID对应的章节", mysqlError: "已尝试所有备用地址，但是JM坏掉了" } }, queue: { examples: "jm queue", messages: { emptyQueue: "当前没有正在处理或者等待处理的任务", msgFormat: "ID: {id}, 类型: {type}, 状态: {status}\n", task: { pending: "等待中...", processing: "处理中...", failed: "发生未知错误", completed: "已完成", unknown: "未定义状态" }, type: { album: "本子", photo: "章节" } } }, search: { example: "jm search <关键词>", messages: { emptyKeywordError: "请输入搜索关键词", id: "JMID", name: "名称", author: "作者", category: "分类", description: "描述", pagination: "共 {total} 条, 当前第 {page} 页, 每页 {pageSize} 条" } } } }, _config: [{ $desc: "基础设置", sendMethod: "发送方式", fileMethod: "文件获取方式<br>`buffer`: 读取成buffer后发送给bot实现端<br>`file`: 以`file:///` 本地路径形式发送，如docker环境，请在bot实现端同时映射/koishi目录", password: "密码，留空则不加密", fileName: "文件名定义<br>`{{name}}`：标题<br>`{{id}}`：章节或者本子ID<br>`{{index}}`：多章节本子自动填充`1` 、 `2`" }, { level: "压缩级别，0~9，0为仅存储" }, { listeningJMId: "监听 `JM ID` 关键词，当出现JMxxxxx的关键词时，发送第一张图片" }, { $desc: "限制相关设置", retryCount: "重试次数限制", concurrentDownloadLimit: "同时下载数量限制", concurrentDecodeLimit: "同时解密数量限制", concurrentQueueLimit: "同时处理数量限制" }, { $desc: "缓存设置", cache: "缓存文件" }, { autoDelete: "自动删除缓存，**依赖cron服务**" }, { cron: "5位cron表达式", deleteInStart: "启动时检测", keepDays: "缓存保留时间（天）" }, { $desc: "开发者选项", debug: "调试模式，输出更多信息" }] };
+    module2.exports = { commands: { jm: { description: "下载JM漫画，无需python！", examples: "jm album 本子数字ID\njm album info 本子数字ID\njm photo 本子章节数字ID", album: { examples: "jm album 数字ID", messages: { addedToQueue: "已将 {id} 添加到处理队列，请稍候。", queueFirst: "已将 {id} 添加到处理队列，即将开始处理", queuePosition: "已将 {id} 添加到处理队列\n前面还有 {ahead} 个任务等待或正在处理", queueProcessing: "已将 {id} 添加到处理队列\n当前任务状态：{status}", notExistError: "找不到该ID对应的本子", mysqlError: "已尝试所有备用地址，但是JM坏掉了" }, info: { examples: "jm album info 本子数字ID", messages: { notExistError: "找不到该ID对应的本子", mysqlError: "已尝试所有备用地址，但是JM坏掉了" } } }, photo: { examples: "jm photo 本子章节数字ID", messages: { addedToQueue: "已将 {id} 添加到处理队列，请稍候。", queueFirst: "已将 {id} 添加到处理队列，即将开始处理", queuePosition: "已将 {id} 添加到处理队列\n前面还有 {ahead} 个任务等待或正在处理", queueProcessing: "已将 {id} 添加到处理队列\n当前任务状态：{status}", notExistError: "找不到该ID对应的章节", mysqlError: "已尝试所有备用地址，但是JM坏掉了" } }, queue: { examples: "jm queue", messages: { emptyQueue: "当前没有正在处理或者等待处理的任务", msgFormat: "ID: {id}, 类型: {type}, 状态: {status}\n", task: { pending: "等待中...", processing: "处理中...", failed: "发生未知错误", completed: "已完成", unknown: "未定义状态" }, type: { album: "本子", photo: "章节" } } }, blog: { examples: "jm album 数字ID", messages: { addedToQueue: "已将 {id} 添加到处理队列，请稍候。", queueFirst: "已将 {id} 添加到处理队列，即将开始处理", queuePosition: "已将 {id} 添加到处理队列\n前面还有 {ahead} 个任务等待或正在处理", queueProcessing: "已将 {id} 添加到处理队列\n当前任务状态：{status}", notExistError: "找不到该ID对应的本子", mysqlError: "已尝试所有备用地址，但是JM坏掉了" } }, search: { example: "jm search <关键词>", messages: { emptyKeywordError: "请输入搜索关键词", id: "JMID", name: "名称", author: "作者", category: "分类", description: "描述", pagination: "共 {total} 条, 当前第 {page} 页, 每页 {pageSize} 条" } } } }, _config: [{ $desc: "基础设置", sendMethod: "发送方式", fileMethod: "文件获取方式<br>`buffer`: 读取成buffer后发送给bot实现端<br>`file`: 以`file:///` 本地路径形式发送，如docker环境，请在bot实现端同时映射/koishi目录", password: "密码，留空则不加密", fileName: "文件名定义<br>`{{name}}`：标题<br>`{{id}}`：章节或者本子ID<br>`{{index}}`：多章节本子自动填充`1` 、 `2`" }, { level: "压缩级别，0~9，0为仅存储" }, { listeningJMId: "监听 `JM ID` 关键词，当出现JMxxxxx的关键词时，发送第一张图片" }, { $desc: "限制相关设置", retryCount: "重试次数限制", concurrentDownloadLimit: "同时下载数量限制", concurrentDecodeLimit: "同时解密数量限制", concurrentQueueLimit: "同时处理数量限制" }, { $desc: "缓存设置", cache: "缓存文件" }, { autoDelete: "自动删除缓存，**依赖cron服务**" }, { cron: "5位cron表达式", deleteInStart: "启动时检测", keepDays: "缓存保留时间（天）" }, { $desc: "开发者选项", debug: "调试模式，输出更多信息" }] };
   }
 });
 
 // src/locales/en-US.yml
 var require_en_US = __commonJS({
   "src/locales/en-US.yml"(exports2, module2) {
-    module2.exports = { commands: { jm: { description: "Download JM comics without python!", examples: "jm album albumID\njm album info albumID\njm photo photoID", album: { examples: "jm album albumID", messages: { addedToQueue: "Album {id} has been added to the processing queue. Please wait.", queueFirst: "Added {id} to the processing queue, starting shortly.", queuePosition: "Added {id} to the processing queue.\nThere are {ahead} tasks ahead or currently processing.", queueProcessing: "Added {id} to the processing queue.\nCurrent task status: {status}", notExistError: "albumID not found", mysqlError: "All alternate addresses have been tried. But no response." }, info: { examples: "jm album info albumID", messages: { notExistError: "albumID not found", mysqlError: "All alternate addresses have been tried. But no response." } } }, photo: { examples: "jm photo photoID", messages: { addedToQueue: "Photo {id} has been added to the processing queue. Please wait.", queueFirst: "Added {id} to the processing queue, starting shortly.", queuePosition: "Added {id} to the processing queue.\nThere are {ahead} tasks ahead or currently processing.", queueProcessing: "Added {id} to the processing queue.\nCurrent task status: {status}", notExistError: "photoID not found", mysqlError: "All alternate addresses have been tried. But no response." } }, queue: { examples: "jm queue", messages: { emptyQueue: "There are currently no tasks being processed or waiting.", msgFormat: "ID: {id}, type: {type}, status: {status}\n", task: { Pending: "Pending...", Processing: "Processing...", failed: "Failed (Unknown Error)", completed: "Completed", unknown: "Unknown Status" }, type: { album: "Album", photo: "Photo" } } }, search: { example: "jm search <keyword>", messages: { emptyKeywordError: "Please enter search keywords", id: "JMID", name: "name", author: "author", category: "category", description: "description", pagination: "Total {total}, current {page} page, each page {pageSize}" } } } }, _config: [{ $desc: "Basic settings", sendMethod: "Send method", fileMethod: "File acquisition method<br>`buffer`: Read as buffer and send it to the bot implementation.<br>`file`: Send it in the local path of `file:///`. For example, if in the docker environment, please map the `/koishi` directory at the bot implementation.", password: "Password, leave blank without encryption", fileName: "File name definition<br>`{{name}}`: Title<br>`{{id}}`: Chapter or Book ID<br>`{{index}}`: Multi-chapter book auto-filling `_1` `_2`" }, { level: "Compression level, 0~9, 0 is only stores" }, { listeningJMId: "Monitors for the `JM ID` keyword. When the 'JMxxxxx' keyword is detected, the first image will be sent." }, { $desc: "Limit settings", retryCount: "Retry limit", concurrentDownloadLimit: "Concurrent Download Limit", concurrentDecodeLimit: "Concurrent Decode Limit", concurrentQueueLimit: "Concurrent Queue Limit" }, { $desc: "Cache settings", cache: "Cache files" }, { autoDelete: "Automatically delete cache, **need cron services**" }, { cron: "5-bit cron expression", deleteInStart: "Detection on startup", keepDays: "Cache retention time (days)" }, { $desc: "Developer Options", debug: "Debug mode, output more information" }] };
+    module2.exports = { commands: { jm: { description: "Download JM comics without python!", examples: "jm album albumID\njm album info albumID\njm photo photoID", album: { examples: "jm album albumID", messages: { addedToQueue: "Album {id} has been added to the processing queue. Please wait.", queueFirst: "Added {id} to the processing queue, starting shortly.", queuePosition: "Added {id} to the processing queue.\nThere are {ahead} tasks ahead or currently processing.", queueProcessing: "Added {id} to the processing queue.\nCurrent task status: {status}", notExistError: "albumID not found", mysqlError: "All alternate addresses have been tried. But no response." }, info: { examples: "jm album info albumID", messages: { notExistError: "albumID not found", mysqlError: "All alternate addresses have been tried. But no response." } } }, photo: { examples: "jm photo photoID", messages: { addedToQueue: "Photo {id} has been added to the processing queue. Please wait.", queueFirst: "Added {id} to the processing queue, starting shortly.", queuePosition: "Added {id} to the processing queue.\nThere are {ahead} tasks ahead or currently processing.", queueProcessing: "Added {id} to the processing queue.\nCurrent task status: {status}", notExistError: "photoID not found", mysqlError: "All alternate addresses have been tried. But no response." } }, queue: { examples: "jm queue", messages: { emptyQueue: "There are currently no tasks being processed or waiting.", msgFormat: "ID: {id}, type: {type}, status: {status}\n", task: { Pending: "Pending...", Processing: "Processing...", failed: "Failed (Unknown Error)", completed: "Completed", unknown: "Unknown Status" }, type: { album: "Album", photo: "Photo" } } }, search: { example: "jm search <keyword>", messages: { emptyKeywordError: "Please enter search keywords", id: "JMID", name: "name", author: "author", category: "category", description: "description", pagination: "Total {total}, current {page} page, each page {pageSize}" } }, blog: { examples: "jm blog blogID", messages: { addedToQueue: "Blog {id} has been added to the processing queue. Please wait.", queueFirst: "Added {id} to the processing queue, starting shortly.", queuePosition: "Added {id} to the processing queue.\nThere are {ahead} tasks ahead or currently processing.", queueProcessing: "Added {id} to the processing queue.\nCurrent task status: {status}", notExistError: "blogID not found", mysqlError: "All alternate addresses have been tried. But no response." } } } }, _config: [{ $desc: "Basic settings", sendMethod: "Send method", fileMethod: "File acquisition method<br>`buffer`: Read as buffer and send it to the bot implementation.<br>`file`: Send it in the local path of `file:///`. For example, if in the docker environment, please map the `/koishi` directory at the bot implementation.", password: "Password, leave blank without encryption", fileName: "File name definition<br>`{{name}}`: Title<br>`{{id}}`: Chapter or Book ID<br>`{{index}}`: Multi-chapter book auto-filling `_1` `_2`" }, { level: "Compression level, 0~9, 0 is only stores" }, { listeningJMId: "Monitors for the `JM ID` keyword. When the 'JMxxxxx' keyword is detected, the first image will be sent." }, { $desc: "Limit settings", retryCount: "Retry limit", concurrentDownloadLimit: "Concurrent Download Limit", concurrentDecodeLimit: "Concurrent Decode Limit", concurrentQueueLimit: "Concurrent Queue Limit" }, { $desc: "Cache settings", cache: "Cache files" }, { autoDelete: "Automatically delete cache, **need cron services**" }, { cron: "5-bit cron expression", deleteInStart: "Detection on startup", keepDays: "Cache retention time (days)" }, { $desc: "Developer Options", debug: "Debug mode, output more information" }] };
   }
 });
 
@@ -54,7 +54,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi2 = require("koishi");
-var import_path3 = require("path");
+var import_path4 = require("path");
 
 // src/utils/Utils.ts
 var import_fs = require("fs");
@@ -65,10 +65,10 @@ var JM_SCRAMBLE_ID = /var scramble_id = (\d+);/;
 
 // src/utils/Const.ts
 var JM_CLIENT_URL_LIST = [
-  "www.cdnmhwscc.vip",
-  "www.cdnblackmyth.club",
-  "www.cdnmhws.cc",
-  "www.cdnuc.vip"
+  "www.cdnaspa.vip",
+  "www.cdnaspa.club",
+  "www.cdnplaystation6.vip",
+  "www.cdnplaystation6.cc"
 ];
 var JM_IMAGE_URL_LIST = [
   "cdn-msp.jmapiproxy1.cc",
@@ -657,6 +657,7 @@ var import_fs2 = __toESM(require("fs"));
 var import_sharp = __toESM(require("sharp"));
 var import_archiver = __toESM(require("archiver"));
 var import_archiver_zip_encrypted = __toESM(require("archiver-zip-encrypted"));
+var import_path2 = require("path");
 async function decodeImage(imageBuffer, num, path) {
   if (num > 0) {
     const metadata = await (0, import_sharp.default)(Buffer.from(imageBuffer)).metadata();
@@ -725,9 +726,28 @@ async function archiverImage(directorys, outputPath, password, level = 9) {
   await archive.finalize();
 }
 __name(archiverImage, "archiverImage");
+async function archiverFile(path, outputPath, password, level = 9) {
+  if (!import_archiver.default.isRegisteredFormat("zip-encrypted")) {
+    import_archiver.default.registerFormat("zip-encrypted", import_archiver_zip_encrypted.default);
+  }
+  const output = import_fs2.default.createWriteStream(outputPath);
+  const options = {
+    zlib: { level }
+    // 压缩级别
+  };
+  if (password) {
+    options["encryptionMethod"] = "aes256";
+    options["password"] = password;
+  }
+  const archive = import_archiver.default.create(password ? "zip-encrypted" : "zip", options);
+  archive.pipe(output);
+  archive.file(path, { name: (0, import_path2.basename)(path) });
+  await archive.finalize();
+}
+__name(archiverFile, "archiverFile");
 
 // src/entity/JMAppClient.ts
-var import_path2 = require("path");
+var import_path3 = require("path");
 var import_sharp2 = __toESM(require("sharp"));
 var import_muhammara = require("muhammara");
 
@@ -753,6 +773,64 @@ var PhotoNotExistError = class extends Error {
   }
 };
 
+// src/abstract/JMBlogAbstract.ts
+var JMBlogAbstract = class {
+  static {
+    __name(this, "JMBlogAbstract");
+  }
+  /**
+   * 文库信息
+   */
+  info;
+  /**
+   * 关联的本子
+   */
+  related_comics;
+  /**
+   * 相关文库
+   */
+  related_blogs;
+  // --- Info 的 Getter 和 Setter ---
+  get Info() {
+    return this.info;
+  }
+  set Info(value) {
+    this.info = value;
+  }
+  // --- RelatedComics 的 Getter 和 Setter ---
+  get RelatedComics() {
+    return this.related_comics;
+  }
+  set RelatedComics(value) {
+    this.related_comics = value;
+  }
+  // --- RelatedBlogs 的 Getter 和 Setter ---
+  get RelatedBlogs() {
+    return this.related_blogs;
+  }
+  set RelatedBlogs(value) {
+    this.related_blogs = value;
+  }
+};
+
+// src/entity/JMAppBlog.ts
+var JMAppBlog = class _JMAppBlog extends JMBlogAbstract {
+  static {
+    __name(this, "JMAppBlog");
+  }
+  constructor(json) {
+    super();
+    for (const key in json) {
+      if (Object.prototype.hasOwnProperty.call(this, key)) {
+        this[key] = json[key];
+      }
+    }
+  }
+  static fromJson(json) {
+    return new _JMAppBlog(json);
+  }
+};
+
 // src/entity/JMAppClient.ts
 var JMAppClient = class _JMAppClient extends JMClientAbstract {
   static {
@@ -774,11 +852,13 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
    * koishi http
    */
   http;
-  constructor(root, http, config, logger) {
+  puppeteer;
+  constructor(root, http, config, logger, puppeteer) {
     super(root);
     this.config = config;
     this.logger = logger;
     this.http = http;
+    this.puppeteer = puppeteer;
   }
   /**
    * 登录，未完成
@@ -853,6 +933,8 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       const photo = await this.getPhotoById(id);
       photos.push(photo);
     }
+    if (this.config.debug)
+      this.logger.info(`本子 ${id} 章节数：${photos.length}`);
     album.setPhotos(photos);
     return album;
   }
@@ -880,6 +962,26 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     photo.setImageNames(image_ids);
     return photo;
   }
+  async getBlogById(id) {
+    if (this.config.debug) this.logger.info(`获取文库(${id})信息`);
+    const timestamp = this.getTimeStamp();
+    const { token, tokenparam } = this.getTokenAndTokenParam(timestamp);
+    const res = await requestWithUrlSwitch(
+      "/blog",
+      "POST",
+      {
+        params: { id },
+        headers: { token, tokenparam },
+        responseType: "json"
+      },
+      this.http,
+      this.config,
+      this.logger
+    );
+    const blog_json = this.decodeBase64(res.data, timestamp);
+    if (!blog_json?.info?.title) throw new AlbumNotExistError();
+    return JMAppBlog.fromJson(blog_json);
+  }
   async downloadByAlbum(album) {
     const id = album.getId();
     const path = `${this.root}/album/${id}`;
@@ -1054,11 +1156,11 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     const id = photo.getId();
     pdfName = sanitizeFileName(pdfName);
     if (this.config.debug) this.logger.info(`开始生成PDF ${pdfName}.pdf`);
-    let path = (0, import_path2.join)(this.root, type, `${id}`);
+    let path = (0, import_path3.join)(this.root, type, `${id}`);
     if (type === "album") {
-      path = (0, import_path2.join)(this.root, type, `${albumId}`);
+      path = (0, import_path3.join)(this.root, type, `${albumId}`);
     }
-    const pdfPath = (0, import_path2.join)(path, `${pdfName}.pdf`);
+    const pdfPath = (0, import_path3.join)(path, `${pdfName}.pdf`);
     let pdfDoc;
     try {
       pdfDoc = new import_muhammara.Recipe("new", pdfPath, {
@@ -1067,17 +1169,17 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     } catch (error) {
       throw new Error(error);
     }
-    const tempPath = (0, import_path2.join)(path, `temp_${id}`);
+    const tempPath = (0, import_path3.join)(path, `temp_${id}`);
     await (0, import_promises2.mkdir)(tempPath);
     for (const image of images) {
-      let imagePath = (0, import_path2.join)(path, "decoded", image);
+      let imagePath = (0, import_path3.join)(path, "decoded", image);
       if (type === "album" && !single) {
-        imagePath = (0, import_path2.join)(path, "decoded", `${id}`, image);
+        imagePath = (0, import_path3.join)(path, "decoded", `${id}`, image);
       }
       const buffer = await (0, import_promises2.readFile)(imagePath);
-      const ext = (0, import_path2.extname)(imagePath);
+      const ext = (0, import_path3.extname)(imagePath);
       const jpgName = image.replace(ext, ".jpg");
-      const jpgPath = (0, import_path2.join)(tempPath, jpgName);
+      const jpgPath = (0, import_path3.join)(tempPath, jpgName);
       const sharpInstance = (0, import_sharp2.default)(buffer);
       await sharpInstance.jpeg().toFile(jpgPath);
       const metadata = await sharpInstance.metadata();
@@ -1101,24 +1203,81 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     }
     return pdfPath;
   }
+  async blogToPdf(blog, password) {
+    const pdfName = sanitizeFileName(blog.Info.title);
+    if (this.config.debug) this.logger.info(`开始生成PDF ${pdfName}.pdf`);
+    const path = (0, import_path3.join)(this.root, "blog", `${blog.Info.id}`);
+    await (0, import_promises2.mkdir)(path, { recursive: true });
+    const pdfPath = (0, import_path3.join)(path, `${pdfName}.pdf`);
+    const pdfTempPath = (0, import_path3.join)(path, `temp.pdf`);
+    await this.writeBlogPdf(blog, pdfTempPath);
+    try {
+      const recipe = new import_muhammara.Recipe(pdfTempPath, pdfPath);
+      if (password) {
+        recipe.encrypt({
+          userPassword: password,
+          ownerPassword: password,
+          userProtectionFlag: 4
+        });
+      }
+      recipe.endPDF(() => {
+        if (this.config.debug) this.logger.info(`PDF ${pdfName}.pdf 生成完成`);
+      });
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      await (0, import_promises2.rm)(pdfTempPath, { recursive: true, force: true });
+    }
+    return pdfPath;
+  }
+  async writeBlogPdf(blog, pdfPath) {
+    const context = await this.puppeteer.browser.createBrowserContext();
+    const page = await context.newPage();
+    await page.setViewport({
+      width: 0,
+      height: 0,
+      deviceScaleFactor: 1
+    });
+    await page.evaluate((title) => {
+      document.title = title;
+    }, blog.Info.title);
+    await page.setContent(blog.Info.content, {
+      waitUntil: "networkidle0",
+      timeout: 60 * 1e3
+    });
+    const pdfBuffer = await page.pdf({
+      format: "A4",
+      printBackground: true,
+      // 确保背景颜色和图片被打印
+      margin: {
+        top: "25mm",
+        right: "25mm",
+        bottom: "25mm",
+        left: "25mm"
+      }
+    });
+    await (0, import_promises2.writeFile)(pdfPath, pdfBuffer);
+    context.close();
+    page.close();
+  }
   async albumToZip(album, password, level = 6) {
     const id = album.getId();
     const series = album.getSeries();
     const zipName = sanitizeFileName(album.getName());
     if (this.config.debug) this.logger.info(`开始生成ZIP ${zipName}.zip`);
-    const path = (0, import_path2.join)(this.root, "album", `${id}`);
+    const path = (0, import_path3.join)(this.root, "album", `${id}`);
     const directorys = [];
     if (series.length > 1) {
       for (const s of series) {
         directorys.push({
-          directory: (0, import_path2.join)(path, "decoded", s.id),
+          directory: (0, import_path3.join)(path, "decoded", s.id),
           destpath: `第${s.sort}章`
         });
       }
     } else {
-      directorys.push({ directory: (0, import_path2.join)(path, "decoded"), destpath: false });
+      directorys.push({ directory: (0, import_path3.join)(path, "decoded"), destpath: false });
     }
-    const zipPath = (0, import_path2.join)(path, `${zipName}.zip`);
+    const zipPath = (0, import_path3.join)(path, `${zipName}.zip`);
     await archiverImage(directorys, zipPath, password, level);
     if (this.config.debug) this.logger.info(`ZIP ${zipName}.zip 生成完成`);
     return zipPath;
@@ -1127,10 +1286,10 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     const id = photo.getId();
     zipName = sanitizeFileName(zipName);
     if (this.config.debug) this.logger.info(`开始生成ZIP ${zipName}.zip`);
-    const path = (0, import_path2.join)(this.root, "photo", `${id}`);
-    const zipPath = (0, import_path2.join)(path, `${zipName}.zip`);
+    const path = (0, import_path3.join)(this.root, "photo", `${id}`);
+    const zipPath = (0, import_path3.join)(path, `${zipName}.zip`);
     await archiverImage(
-      [{ directory: (0, import_path2.join)(path, "decoded"), destpath: false }],
+      [{ directory: (0, import_path3.join)(path, "decoded"), destpath: false }],
       zipPath,
       password,
       level
@@ -1138,6 +1297,18 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     if (this.config.debug) this.logger.info(`ZIP ${zipName}.zip 生成完成`);
     return zipPath;
   }
+  async blogToZip(blog, password, level = 6) {
+    const zipName = sanitizeFileName(blog.Info.title);
+    if (this.config.debug) this.logger.info(`开始生成ZIP ${zipName}.zip`);
+    const path = (0, import_path3.join)(this.root, "blog", `${blog.Info.id}`);
+    await (0, import_promises2.mkdir)(path, { recursive: true });
+    const pdfPath = (0, import_path3.join)(path, `${zipName}.pdf`);
+    const zipPath = (0, import_path3.join)(path, `${zipName}.zip`);
+    await this.writeBlogPdf(blog, pdfPath);
+    await archiverFile(pdfPath, zipPath, password, level);
+    if (this.config.debug) this.logger.info(`ZIP ${zipName}.zip 生成完成`);
+    return zipPath;
+  }
   /**
    * 获取时间戳
    * @returns 时间戳
@@ -1201,7 +1372,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
 // src/processors/jmProcessor.ts
 var import_koishi = require("koishi");
 var import_promises3 = require("node:fs/promises");
-var createJmProcessor = /* @__PURE__ */ __name((processorConfig, http, config, logger) => {
+var createJmProcessor = /* @__PURE__ */ __name((processorConfig, http, config, logger, puppeteer) => {
   const {
     root,
     sendMethod,
@@ -1215,51 +1386,47 @@ var createJmProcessor = /* @__PURE__ */ __name((processorConfig, http, config, l
   return async (payload) => {
     const { id, session, messageId, scope } = payload;
     try {
-      const jmClient = new JMAppClient(root, http, config, logger);
+      const jmClient = new JMAppClient(root, http, config, logger, puppeteer);
       let filePath;
-      let name2;
-      let ext;
-      let dir = "";
-      if (payload.type === "album") {
-        const album = await jmClient.getAlbumById(id);
-        await jmClient.downloadByAlbum(album);
-        if (sendMethod === "zip") {
-          filePath = await jmClient.albumToZip(album, password, level);
-        } else {
-          filePath = await jmClient.albumToPdf(album, password);
+      switch (payload.type) {
+        case "album": {
+          const album = await jmClient.getAlbumById(id);
+          await jmClient.downloadByAlbum(album);
+          if (sendMethod === "zip") {
+            filePath = await jmClient.albumToZip(album, password, level);
+          } else {
+            filePath = await jmClient.albumToPdf(album, password);
+          }
+          break;
         }
-        if (typeof filePath === "string") {
-          const fileInfo = getFileInfo(filePath);
-          name2 = formatFileName(fileName, fileInfo.fileName, id);
-          ext = fileInfo.ext;
-          dir = fileInfo.dir;
-        } else {
-          const firstPath = filePath[0];
-          const fileInfo = getFileInfo(firstPath);
-          name2 = formatFileName(fileName, fileInfo.fileName, id);
-          ext = fileInfo.ext;
-          dir = fileInfo.dir;
+        case "photo": {
+          const photo = await jmClient.getPhotoById(id);
+          await jmClient.downloadByPhoto(photo);
+          const photoName = photo.getName();
+          if (sendMethod === "zip") {
+            filePath = await jmClient.photoToZip(
+              photo,
+              photoName,
+              password,
+              level
+            );
+          } else {
+            filePath = await jmClient.photoToPdf(photo, photoName);
+          }
+          break;
         }
-      } else if (payload.type === "photo") {
-        const photo = await jmClient.getPhotoById(id);
-        await jmClient.downloadByPhoto(photo);
-        const photoName = photo.getName();
-        if (sendMethod === "zip") {
-          filePath = await jmClient.photoToZip(
-            photo,
-            photoName,
-            password,
-            level
-          );
-        } else {
-          filePath = await jmClient.photoToPdf(photo, photoName);
+        case "blog": {
+          const blog = await jmClient.getBlogById(id);
+          if (sendMethod === "zip") {
+            filePath = await jmClient.blogToZip(blog, password, level);
+          } else {
+            filePath = await jmClient.blogToPdf(blog, password);
+          }
+          return;
         }
-        const fileInfo = getFileInfo(filePath);
-        name2 = formatFileName(fileName, fileInfo.fileName, id);
-        ext = fileInfo.ext;
-        dir = fileInfo.dir;
-      } else {
-        throw new Error(`未知任务类型: ${payload.type}`);
+        // 理论上不会走到这里，但为了类型安全和健壮性，可以抛出错误
+        default:
+          throw new Error(`未知任务类型: ${payload.type}`);
       }
       if (typeof filePath === "string") {
         const {
@@ -1519,18 +1686,18 @@ var Config = import_koishi2.Schema.intersect([
   "en-US": require_en_US()._config
 });
 var inject = {
-  required: ["http"],
+  required: ["http", "puppeteer"],
   optional: ["notifier", "cron"]
 };
 async function apply(ctx, config) {
   ctx.i18n.define("en-US", require_en_US());
   ctx.i18n.define("zh-CN", require_zh_CN());
   const logger = ctx.logger("jmcomic");
-  const root = (0, import_path3.join)(ctx.baseDir, "data", "jmcomic");
+  const root = (0, import_path4.join)(ctx.baseDir, "data", "jmcomic");
   const scheduleFn = /* @__PURE__ */ __name(async () => {
-    const albumPath = (0, import_path3.join)(ctx.baseDir, "data", "jmcomic", "album");
+    const albumPath = (0, import_path4.join)(ctx.baseDir, "data", "jmcomic", "album");
     await deleteFewDaysAgoFolders(albumPath, config.keepDays);
-    const photoPath = (0, import_path3.join)(ctx.baseDir, "data", "jmcomic", "photo");
+    const photoPath = (0, import_path4.join)(ctx.baseDir, "data", "jmcomic", "photo");
     await deleteFewDaysAgoFolders(photoPath, config.keepDays);
   }, "scheduleFn");
   if (config.autoDelete && ctx.cron) {
@@ -1557,7 +1724,8 @@ async function apply(ctx, config) {
     processorConfig,
     ctx.http,
     config,
-    logger
+    logger,
+    ctx.puppeteer
   );
   const queue = new Queue(
     jmProcessor,
@@ -1603,6 +1771,38 @@ async function apply(ctx, config) {
   ctx.command("jm.photo <photoId:string>").alias("本子章节").action(async ({ session }, photoId) => {
     await handleAlbumOrPhoto(session, photoId, "photo");
   });
+  ctx.command("jm.blog <blogId:string>").alias("JM文库").action(async ({ session }, blogId) => {
+    const messageId = session.messageId;
+    if (!/^\d+$/.test(blogId)) {
+      await session.send([
+        import_koishi2.h.quote(messageId),
+        import_koishi2.h.text("输入的ID不合法，请检查")
+      ]);
+      return;
+    }
+    const { task, pendingAhead, queuePosition } = queue.add({
+      type: "blog",
+      id: blogId,
+      session,
+      messageId,
+      scope: session.scope
+    });
+    const params = {
+      id: blogId,
+      ahead: pendingAhead,
+      pos: queuePosition,
+      status: task.status
+    };
+    const msg = [import_koishi2.h.quote(messageId)];
+    if (pendingAhead === 0 && queuePosition === 1) {
+      msg.push(import_koishi2.h.text(session.text(".queueFirst", params)));
+    } else if (pendingAhead > 0) {
+      msg.push(import_koishi2.h.text(session.text(".queuePosition", params)));
+    } else {
+      msg.push(import_koishi2.h.text(session.text(".queueProcessing", params)));
+    }
+    await session.send(msg);
+  });
   ctx.command("jm.album.info <albumId:string>").alias("本子信息").action(async ({ session, options }, albumId) => {
     const messageId = session.messageId;
     if (!/^\d+$/.test(albumId)) {
@@ -1613,7 +1813,13 @@ async function apply(ctx, config) {
       return;
     }
     try {
-      const jmClient = new JMAppClient(root, ctx.http, config, logger);
+      const jmClient = new JMAppClient(
+        root,
+        ctx.http,
+        config,
+        logger,
+        ctx.puppeteer
+      );
       const album = await jmClient.getAlbumById(albumId);
       await session.send([
         import_koishi2.h.quote(messageId),
@@ -1657,7 +1863,13 @@ async function apply(ctx, config) {
       return;
     }
     try {
-      const jmClient = new JMAppClient(root, ctx.http, config, logger);
+      const jmClient = new JMAppClient(
+        root,
+        ctx.http,
+        config,
+        logger,
+        ctx.puppeteer
+      );
       const searchResult = await jmClient.search(keyword);
       const contents = searchResult.content;
       const fragment = [import_koishi2.h.quote(messageId)];
@@ -1746,7 +1958,13 @@ async function apply(ctx, config) {
       const numbers = text.match(regexp);
       if (!numbers?.length) return;
       const id = numbers[0];
-      const jmClient = new JMAppClient(root, ctx.http, config, logger);
+      const jmClient = new JMAppClient(
+        root,
+        ctx.http,
+        config,
+        logger,
+        ctx.puppeteer
+      );
       const album = await jmClient.getAlbumById(id.replace(/JM/i, ""));
       const imagePath = await jmClient.downloadFirstImageByAlbum(album);
       const messageId = session.messageId;

package/lib/processors/jmProcessor.d.ts

@@ -1,7 +1,8 @@
 import { Config } from "..";
 import { Logger, Session, HTTP } from "koishi";
+import Puppeteer from "koishi-plugin-puppeteer";
 export type JmTaskPayload = {
-    type: "album" | "photo";
+    type: "album" | "photo" | "blog";
     id: string;
     session: Session;
     messageId: string;
@@ -17,5 +18,5 @@ interface ProcessorConfig {
     cache: boolean;
     debug: boolean;
 }
-export declare const createJmProcessor: (processorConfig: ProcessorConfig, http: HTTP, config: Config, logger: Logger) => (payload: JmTaskPayload) => Promise<void>;
+export declare const createJmProcessor: (processorConfig: ProcessorConfig, http: HTTP, config: Config, logger: Logger, puppeteer: Puppeteer) => (payload: JmTaskPayload) => Promise<void>;
 export {};

package/lib/utils/Image.d.ts

@@ -1,6 +1,6 @@
 import { Directorys } from "../types";
-export declare function decodeImage(imageBuffer: Buffer | ArrayBuffer, num: number, path: string): Promise<void>;
-export declare function saveImage(imageBuffer: Buffer | ArrayBuffer, path: string): Promise<void>;
+export declare function decodeImage(imageBuffer: Buffer, num: number, path: string): Promise<void>;
+export declare function saveImage(imageBuffer: Buffer, path: string): Promise<void>;
 /**
  * 将目录压缩成 ZIP 文件，并可选附带密码
  * @param directory 要压缩的目录路径
@@ -9,3 +9,4 @@ export declare function saveImage(imageBuffer: Buffer | ArrayBuffer, path: strin
  * @param level 压缩级别，范围 0-9，默认 9
  */
 export declare function archiverImage(directorys: Directorys[], outputPath: string, password?: string, level?: number): Promise<void>;
+export declare function archiverFile(path: string, outputPath: string, password?: string, level?: number): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wahaha216/koishi-plugin-jmcomic",
   "description": "下载JM本子，无需python。支持pdf、zip加密。",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -10,6 +10,7 @@
 jm album xxxxxx
 jm album info xxxxxx
 jm photo xxxxxx
+jm blog xxxx
 jm queue
 ```
 
@@ -17,6 +18,22 @@ jm queue
 
 ## 更新日志
 
+<details>
+<summary>0.2.8</summary>
+
+1.解析时添加章节数日志
+
+2.替换最新的客户端域名
+
+</details>
+
+<details>
+<summary>0.2.7</summary>
+
+支持 JM 文库
+
+</details>
+
 <details>
 <summary>0.2.6</summary>
 
@@ -35,6 +52,7 @@ jm queue
 <summary>0.2.4</summary>
 
 1. 调整 debug 日志
+
 2. 修正文化名返回值
 
 </details>
@@ -43,6 +61,7 @@ jm queue
 <summary>0.2.3</summary>
 
 1. 将手动路径拼接替换为 join
+
 2. 健壮文件名序列化，尝试修复部分文件名导致无法创建文件
 
 </details>
@@ -58,6 +77,7 @@ jm queue
 <summary>0.2.1</summary>
 
 1. 搜索分页限制
+
 2. 搜索结果分割空行
 
 </details>
@@ -66,6 +86,7 @@ jm queue
 <summary>0.2.0</summary>
 
 1. 简易搜索功能
+
 2. 修复队列丢失 i18n key 的问题
 
 </details>
@@ -74,6 +95,7 @@ jm queue
 <summary>0.1.1</summary>
 
 1. 添加队列时返回队列信息
+
 2. 提取代码
 
 </details>
@@ -82,43 +104,59 @@ jm queue
 <summary>0.1.0</summary>
 
 1. 队列系统
+
 2. 下载并发与解密并发限制
+
 3. 修改配置页面顺序、分类
+
 4. 不再直接暴露变量，改为逐级传递
+
 5. 统一暴露 Error 类
+
 6. 添加域名切换条件
 
 </details>
 
 <details>
 <summary>0.0.6</summary>
+
 添加了一些错误提示
+
 </details>
 
 <details>
 <summary>0.0.5</summary>
+
 修改使用示例
+
 </details>
 
 <details>
 <summary>0.0.4</summary>
 
 1. 文件名移除前后空格
+
 2. 新增文件发送配置，用于配置文件是以 buffer 读取后发送还是以本地地址的形式发送。docker 中使用 file 形式需要在 bot 实现端同时映射/koishi 目录
 
 </details>
 
 <details>
 <summary>0.0.3</summary>
+
 忘了给自动删除做判断
+
 </details>
 
 <details>
 <summary>0.0.2</summary>
+
 依赖从peerDependencies移动到dependencies
+
 </details>
 
 <details>
 <summary>0.0.1</summary>
+
 初版
+
 </details>