@wahaha216/koishi-plugin-jmcomic 0.0.6 → 0.1.1

package/lib/entity/JMAppClient.d.ts

@@ -1,3 +1,5 @@
+import { Config } from "..";
+import { Logger, HTTP } from "koishi";
 import { IJMUser } from "../types/JMClient";
 import { JMClientAbstract } from "../abstract/JMClientAbstract";
 import { JMAppPhoto } from "./JMAppPhoto";
@@ -8,7 +10,19 @@ export declare class JMAppClient extends JMClientAbstract {
     static APP_TOKEN_SECRET: string;
     static APP_TOKEN_SECRET_2: string;
     static APP_DATA_SECRET: string;
-    constructor(root: string);
+    /**
+     * koishi 配置项
+     */
+    private config;
+    /**
+     * koishi 日志
+     */
+    private logger;
+    /**
+     * koishi http
+     */
+    private http;
+    constructor(root: string, http: HTTP, config: Config, logger: Logger);
     /**
      * 登录，未完成
      * @param username 用户名

package/lib/entity/JMHtmlClient.d.ts

@@ -1,9 +1,23 @@
+import { Config } from "..";
+import { Logger, HTTP } from "koishi";
 import { JMClientAbstract } from "../abstract/JMClientAbstract";
 import { IJMUser } from "../types/JMClient";
 import { JMHtmlAlbum } from "./JMHtmlAlbum";
 import { JMHtmlPhoto } from "./JMHtmlPhoto";
 export declare class JMHtmlClient extends JMClientAbstract {
-    constructor(root: string);
+    /**
+     * koishi 配置项
+     */
+    private config;
+    /**
+     * koishi 日志
+     */
+    private logger;
+    /**
+     * koishi http
+     */
+    private http;
+    constructor(root: string, http: HTTP, config: Config, logger: Logger);
     login(username: string, password: string): Promise<IJMUser>;
     getAlbumById(id: string): Promise<JMHtmlAlbum>;
     getPhotoById(id: string): Promise<JMHtmlPhoto>;

package/lib/error/index.d.ts

@@ -0,0 +1,6 @@
+import { AlbumNotExistError } from "../error/albumNotExist.error";
+import { PhotoNotExistError } from "../error/photoNotExist.error";
+import { MySqlError } from "../error/mysql.error";
+import { EmptyBufferError } from "../error/emptybuffer.error";
+import { OverRetryError } from "../error/overRetry.error";
+export { AlbumNotExistError, PhotoNotExistError, MySqlError, EmptyBufferError, OverRetryError, };

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { Context, HTTP, Logger, Schema } from "koishi";
+import { Context, Schema } from "koishi";
 export declare const name = "jmcomic";
 export interface Config {
     sendMethod?: "zip" | "pdf";
@@ -6,6 +6,9 @@ export interface Config {
     retryCount?: number;
     password?: string;
     fileName?: string;
+    concurrentDownloadLimit?: number;
+    concurrentDecodeLimit?: number;
+    concurrentQueueLimit?: number;
     level?: number;
     cache?: boolean;
     autoDelete?: boolean;
@@ -19,8 +22,4 @@ export declare const inject: {
     required: string[];
     optional: string[];
 };
-export declare let http: HTTP;
-export declare let logger: Logger;
-export declare let retryCount: number;
-export declare let debug: boolean;
 export declare function apply(ctx: Context, config: Config): Promise<void>;

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: { notExistError: "找不到该ID对应的本子", mysqlError: "已尝试所有备用地址，但是JM坏掉了" }, info: { examples: "jm album info 本子数字ID", messages: { notExistError: "找不到该ID对应的本子", mysqlError: "已尝试所有备用地址，但是JM坏掉了" } } }, photo: { examples: "jm photo 本子章节数字ID", messages: { notExistError: "找不到该ID对应的章节", mysqlError: "已尝试所有备用地址，但是JM坏掉了" } } } }, _config: [{ $desc: "基础设置", url: "JM域名", sendMethod: "发送方式", fileMethod: "文件获取方式<br>`buffer`: 读取成buffer后发送给bot实现端<br>`file`: 以`file:///` 本地路径形式发送，如docker环境，请在bot实现端同时映射/koishi目录", retryCount: "重试次数限制", password: "密码，留空则不加密", fileName: "文件名定义<br>`{{name}}`：标题<br>`{{id}}`：章节或者本子ID<br>`{{index}}`：多章节本子自动填充`1` 、 `2`" }, { level: "压缩级别，0~9，0为仅存储" }, { $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: "章节" } } } } }, _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为仅存储" }, { $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: { 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: { notExistError: "photoID not found", mysqlError: "All alternate addresses have been tried. But no response." } } } }, _config: [{ $desc: "Basic settings", url: "JM domain name", 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.", retryCount: "Retry limit", 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" }, { $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" } } } } }, _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.", retryCount: "Retry limit", 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`" }, { $desc: "Limit settings", retryCount: "Retry limit", concurrentDownloadLimit: "Concurrent Download Limit", concurrentDecodeLimit: "Concurrent Decode Limit", concurrentQueueLimit: "Concurrent Queue Limit" }, { level: "Compression level, 0~9, 0 is only stores" }, { $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" }] };
   }
 });
 
@@ -49,17 +49,12 @@ var src_exports = {};
 __export(src_exports, {
   Config: () => Config,
   apply: () => apply,
-  debug: () => debug,
-  http: () => http,
   inject: () => inject,
-  logger: () => logger,
-  name: () => name,
-  retryCount: () => retryCount
+  name: () => name
 });
 module.exports = __toCommonJS(src_exports);
-var import_koishi = require("koishi");
+var import_koishi2 = require("koishi");
 var import_path3 = require("path");
-var import_promises3 = require("fs/promises");
 
 // src/utils/Utils.ts
 var import_fs = require("fs");
@@ -169,7 +164,7 @@ async function limitPromiseAll(promises, limit) {
   return results;
 }
 __name(limitPromiseAll, "limitPromiseAll");
-async function requestWithRetry(url, method, config = {}, retryIndex = 0) {
+async function requestWithRetry(url, method, config = {}, http, pluginsConfig, logger, retryIndex = 0) {
   try {
     const res = await http(method, url, config);
     if (typeof res.data === "string" && res.data.includes("Could not connect to mysql")) {
@@ -179,18 +174,26 @@ async function requestWithRetry(url, method, config = {}, retryIndex = 0) {
   } catch (error) {
     if (error instanceof MySqlError) {
       throw new MySqlError();
-    } else if (retryIndex < retryCount) {
+    } else if (retryIndex < pluginsConfig.retryCount) {
       logger.info(
-        `${url} 请求失败，正在重试... ${retryIndex + 1}/${retryCount}`
+        `${url} 请求失败，正在重试... ${retryIndex + 1}/${pluginsConfig.retryCount}`
+      );
+      return await requestWithRetry(
+        url,
+        method,
+        config,
+        http,
+        pluginsConfig,
+        logger,
+        retryIndex + 1
       );
-      return await requestWithRetry(url, method, config, retryIndex + 1);
     } else {
       throw new OverRetryError(`请求失败，超过最大重试次数: ${url}`);
     }
   }
 }
 __name(requestWithRetry, "requestWithRetry");
-async function requestWithUrlSwitch(url, method, config = {}, type = "CLIENT", urlIndex = 0) {
+async function requestWithUrlSwitch(url, method, config = {}, http, pluginsConfig, logger, type = "CLIENT", urlIndex = 0) {
   const list = type === "CLIENT" ? JM_CLIENT_URL_LIST : JM_IMAGE_URL_LIST;
   const urlCount = list.length;
   const url_bak = url;
@@ -199,7 +202,14 @@ async function requestWithUrlSwitch(url, method, config = {}, type = "CLIENT", u
   }
   try {
     if (urlIndex < urlCount) {
-      const res = await requestWithRetry(url, method, config);
+      const res = await requestWithRetry(
+        url,
+        method,
+        config,
+        http,
+        pluginsConfig,
+        logger
+      );
       if (res instanceof ArrayBuffer && res.byteLength === 0) {
         throw new EmptyBufferError();
       }
@@ -210,12 +220,16 @@ async function requestWithUrlSwitch(url, method, config = {}, type = "CLIENT", u
   } catch (error) {
     const isMysqlError = error instanceof MySqlError;
     const isEmptyBuffer = error instanceof EmptyBufferError;
-    if (isMysqlError || isEmptyBuffer) {
+    const isOverRetryError = error instanceof OverRetryError;
+    if (isMysqlError || isEmptyBuffer || isOverRetryError) {
       logger.info(`请求失败，尝试切换域名... ${urlIndex + 1}/${urlCount}`);
       return await requestWithUrlSwitch(
         url_bak,
         method,
         config,
+        http,
+        pluginsConfig,
+        logger,
         type,
         urlIndex + 1
       );
@@ -734,8 +748,23 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
   static APP_TOKEN_SECRET = "18comicAPP";
   static APP_TOKEN_SECRET_2 = "18comicAPPContent";
   static APP_DATA_SECRET = "185Hcomic3PAPP7R";
-  constructor(root) {
+  /**
+   * koishi 配置项
+   */
+  config;
+  /**
+   * koishi 日志
+   */
+  logger;
+  /**
+   * koishi http
+   */
+  http;
+  constructor(root, http, config, logger) {
     super(root);
+    this.config = config;
+    this.logger = logger;
+    this.http = http;
   }
   /**
    * 登录，未完成
@@ -755,7 +784,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     const formData = new import_form_data.default();
     formData.append("username", username);
     formData.append("password", password);
-    const res = await http.post(
+    const res = await this.http.post(
       "https://www.cdnmhws.cc/login",
       formData,
       { headers, responseType: "json" }
@@ -763,14 +792,21 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     return this.decodeBase64(res.data, timestamp);
   }
   async getAlbumById(id) {
-    if (debug) logger.info(`获取本子(${id})信息`);
+    if (this.config.debug) this.logger.info(`获取本子(${id})信息`);
     const timestamp = this.getTimeStamp();
     const { token, tokenparam } = this.getTokenAndTokenParam(timestamp);
-    const res = await requestWithUrlSwitch("/album", "POST", {
-      params: { id },
-      headers: { token, tokenparam },
-      responseType: "json"
-    });
+    const res = await requestWithUrlSwitch(
+      "/album",
+      "POST",
+      {
+        params: { id },
+        headers: { token, tokenparam },
+        responseType: "json"
+      },
+      this.http,
+      this.config,
+      this.logger
+    );
     const album_json = this.decodeBase64(res.data, timestamp);
     if (!album_json.name) throw new AlbumNotExistError();
     const album = JMAppAlbum.fromJson(album_json);
@@ -789,14 +825,21 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     return album;
   }
   async getPhotoById(id) {
-    if (debug) logger.info(`获取章节(${id})信息`);
+    if (this.config.debug) this.logger.info(`获取章节(${id})信息`);
     const timestamp = this.getTimeStamp();
     const { token, tokenparam } = this.getTokenAndTokenParam(timestamp);
-    const res = await requestWithUrlSwitch("/chapter", "POST", {
-      params: { id },
-      headers: { token, tokenparam },
-      responseType: "json"
-    });
+    const res = await requestWithUrlSwitch(
+      "/chapter",
+      "POST",
+      {
+        params: { id },
+        headers: { token, tokenparam },
+        responseType: "json"
+      },
+      this.http,
+      this.config,
+      this.logger
+    );
     const photo_json = this.decodeBase64(res.data, timestamp);
     if (!photo_json.name) throw new PhotoNotExistError();
     const photo = JMAppPhoto.fromJson(photo_json);
@@ -818,12 +861,12 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     const images = photo.getImages();
     const id = photo.getId();
     let path = `${this.root}/${type}/${id}/origin`;
-    if (debug) {
-      logger.info(`开始下载: ${id}`);
+    if (this.config.debug) {
+      this.logger.info(`开始下载: ${id}`);
       if (type === "album") {
-        logger.info(`单章节: ${single ? "是" : "否"}`);
-        logger.info(`子章节: ${albumId ? "是" : "否"}`);
-        logger.info(`本子ID: ${albumId}`);
+        this.logger.info(`单章节: ${single ? "是" : "否"}`);
+        this.logger.info(`子章节: ${albumId ? "是" : "否"}`);
+        this.logger.info(`本子ID: ${albumId}`);
       }
     }
     if (type === "album") {
@@ -833,7 +876,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
         path = `${this.root}/${type}/${albumId}/origin/${id}`;
       }
     }
-    if (debug) logger.info(`存储目录：${path}`);
+    if (this.config.debug) this.logger.info(`存储目录：${path}`);
     await (0, import_promises2.mkdir)(path, { recursive: true });
     await limitPromiseAll(
       images.filter((image) => {
@@ -843,18 +886,21 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
         return !fileExists || !fileSize;
       }).map((image) => async () => {
         const url = `/media/photos/${id}/${image}`;
-        if (debug) logger.info(`下载图片：${url}`);
+        if (this.config.debug) this.logger.info(`下载图片：${url}`);
         const res = await requestWithUrlSwitch(
           url,
           "GET",
           { responseType: "arraybuffer" },
+          this.http,
+          this.config,
+          this.logger,
           "IMAGE"
         );
         await saveImage(res, `${path}/${image}`);
       }),
-      5
+      this.config.concurrentDownloadLimit
     );
-    if (debug) logger.info(`${id} 下载完成，开始解密图片`);
+    if (this.config.debug) this.logger.info(`${id} 下载完成，开始解密图片`);
     await this.decodeByPhoto(photo, type, albumId, single);
   }
   async decodeByPhoto(photo, type = "photo", albumId = "", single = false) {
@@ -879,14 +925,14 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
         return !fileExists || !fileSize;
       }).map((image, index) => async () => {
         const imagePath = `${path}/${image}`;
-        if (debug) logger.info(`解密图片：${imagePath}`);
+        if (this.config.debug) this.logger.info(`解密图片：${imagePath}`);
         const decodedImagePath = `${decodedPath}/${image}`;
         const imageBuffer = await (0, import_promises2.readFile)(imagePath);
         await decodeImage(imageBuffer, splitNumbers[index], decodedImagePath);
       }),
-      10
+      this.config.concurrentDecodeLimit
     );
-    logger.info(`${id} 解密完成`);
+    this.logger.info(`${id} 解密完成`);
   }
   async albumToPdf(album, password) {
     const id = album.getId();
@@ -920,7 +966,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
   async photoToPdf(photo, pdfName, type = "photo", albumId = "", single = false, password) {
     const images = photo.getImages();
     const id = photo.getId();
-    if (debug) logger.info(`开始生成PDF ${pdfName}.pdf`);
+    if (this.config.debug) this.logger.info(`开始生成PDF ${pdfName}.pdf`);
     pdfName = sanitizeFileName(pdfName);
     let path = (0, import_path2.join)(this.root, type, `${id}`);
     if (type === "album") {
@@ -960,7 +1006,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     }
     try {
       pdfDoc.endPDF(() => {
-        if (debug) logger.info(`PDF ${pdfName}.pdf 生成完成`);
+        if (this.config.debug) this.logger.info(`PDF ${pdfName}.pdf 生成完成`);
       });
     } catch (error) {
       throw new Error(error);
@@ -986,7 +1032,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       directorys.push({ directory: `${path}/decoded`, destpath: false });
     }
     await archiverImage(directorys, `${path}/${zipName}.zip`, password, level);
-    if (debug) logger.info(`ZIP ${zipName}.zip 生成完成`);
+    if (this.config.debug) this.logger.info(`ZIP ${zipName}.zip 生成完成`);
     return `${path}/${zipName}.zip`;
   }
   async photoToZip(photo, zipName, password, level = 6) {
@@ -999,7 +1045,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       password,
       level
     );
-    if (debug) logger.info(`ZIP ${zipName}.zip 生成完成`);
+    if (this.config.debug) this.logger.info(`ZIP ${zipName}.zip 生成完成`);
     return `${path}/${zipName}.zip`;
   }
   /**
@@ -1023,7 +1069,10 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     const html = await requestWithUrlSwitch(
       "/chapter_view_template",
       "POST",
-      { params: { id }, headers: { token, tokenparam }, responseType: "text" }
+      { params: { id }, headers: { token, tokenparam }, responseType: "text" },
+      this.http,
+      this.config,
+      this.logger
     );
     return parseInt(html.match(JM_SCRAMBLE_ID)[1]);
   }
@@ -1059,45 +1108,317 @@ 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) => {
+  const {
+    root,
+    sendMethod,
+    password,
+    level,
+    fileName,
+    fileMethod,
+    cache,
+    debug
+  } = processorConfig;
+  return async (payload) => {
+    const { id, session, messageId } = payload;
+    try {
+      const jmClient = new JMAppClient(root, http, config, logger);
+      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);
+        }
+        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;
+        }
+      } 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);
+        }
+        const fileInfo = getFileInfo(filePath);
+        name2 = formatFileName(fileName, fileInfo.fileName, id);
+        ext = fileInfo.ext;
+        dir = fileInfo.dir;
+      } else {
+        throw new Error(`未知任务类型: ${payload.type}`);
+      }
+      if (typeof filePath === "string") {
+        const {
+          fileName: baseFileName,
+          ext: fileExt,
+          dir: fileDir
+        } = getFileInfo(filePath);
+        const finalName = formatFileName(fileName, baseFileName, id);
+        if (debug) logger.info(`文件名：${finalName}.${fileExt}`);
+        if (fileMethod === "buffer") {
+          const buffer = await (0, import_promises3.readFile)(filePath);
+          await session.send([
+            import_koishi.h.file(buffer, fileExt, { title: `${finalName}.${fileExt}` })
+          ]);
+        } else {
+          await session.send([
+            import_koishi.h.file(`file:///${filePath}`, { title: `${finalName}.${fileExt}` })
+          ]);
+        }
+        if (!cache) (0, import_promises3.rm)(fileDir, { recursive: true });
+      } else {
+        let currentFileDir = "";
+        for (const [index, p] of filePath.entries()) {
+          const {
+            fileName: baseFileName,
+            ext: fileExt,
+            dir: fileDir
+          } = getFileInfo(p);
+          const finalName = formatFileName(
+            fileName,
+            baseFileName,
+            id,
+            index + 1
+          );
+          if (debug) logger.info(`文件名：${finalName}.${fileExt}`);
+          if (fileMethod === "buffer") {
+            const buffer = await (0, import_promises3.readFile)(p);
+            await session.send([
+              import_koishi.h.file(buffer, fileExt, { title: `${finalName}.${fileExt}` })
+            ]);
+          } else {
+            await session.send([
+              import_koishi.h.file(`file:///${p}`, { title: `${finalName}.${fileExt}` })
+            ]);
+          }
+          currentFileDir = fileDir;
+        }
+        if (!cache) {
+          if (currentFileDir) {
+            (0, import_promises3.rm)(currentFileDir, { recursive: true });
+          } else {
+            logger.warn(`无法删除目录，fileDir 未定义。任务 ID: ${id}`);
+          }
+        }
+      }
+    } catch (error) {
+      if (error instanceof AlbumNotExistError || error instanceof PhotoNotExistError) {
+        await session.send([
+          import_koishi.h.quote(messageId),
+          import_koishi.h.text(session.text(".notExistError"))
+          // 假设 .notExistError 可以通用
+        ]);
+      } else if (error instanceof MySqlError) {
+        await session.send([
+          import_koishi.h.quote(messageId),
+          import_koishi.h.text(session.text(".mysqlError"))
+        ]);
+      } else {
+        await session.send([
+          import_koishi.h.quote(messageId),
+          import_koishi.h.text(`处理 ID 为 ${id} 的本子/章节时发生错误`)
+        ]);
+        throw error;
+      }
+    }
+  };
+}, "createJmProcessor");
+
+// src/utils/Queue.ts
+var import_crypto4 = require("crypto");
+var Queue = class {
+  static {
+    __name(this, "Queue");
+  }
+  tasks = [];
+  processor;
+  concurrency;
+  activeTasks = 0;
+  /**
+   * koishi 配置项
+   */
+  config;
+  /**
+   * koishi 日志
+   */
+  logger;
+  constructor(processor, options = {}, config, logger) {
+    this.config = config;
+    this.logger = logger;
+    this.processor = processor;
+    this.concurrency = options.concurrency || 1;
+  }
+  /**
+   * 向队列添加一个新任务
+   */
+  add(payload) {
+    const task = {
+      id: (0, import_crypto4.randomUUID)(),
+      payload,
+      status: "pending",
+      createdAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    this.tasks.push(task);
+    if (this.config.debug)
+      this.logger.info(
+        `[任务添加] 任务ID: ${payload} 类型: ${payload.type} ID: ${payload.id}`
+      );
+    const { pendingAhead, queuePosition } = this.getTaskQueuePosition(task.id);
+    setTimeout(() => this._processQueue(), 0);
+    return { task, pendingAhead, queuePosition };
+  }
+  /**
+   * 获取任务状态
+   */
+  getTask(id) {
+    return this.tasks.find((t) => t.id === id);
+  }
+  /**
+   * 获取所有任务的只读列表
+   */
+  getAllTasks() {
+    return this.tasks;
+  }
+  /**
+   * 获取指定任务在队列中的位置信息
+   * @param taskId 任务ID
+   * @returns {pendingAhead: number, queuePosition: number}
+   * pendingAhead: 在此任务之前有多少个待处理任务
+   * queuePosition: 此任务在所有待处理任务中的位置（从1开始）
+   */
+  getTaskQueuePosition(taskId) {
+    let pendingAhead = 0;
+    let queuePosition = 0;
+    let found = false;
+    for (let i = 0; i < this.tasks.length; i++) {
+      const currentTask = this.tasks[i];
+      if (currentTask.id === taskId) {
+        found = true;
+        if (currentTask.status === "pending" || currentTask.status === "processing") {
+          queuePosition = pendingAhead + 1;
+        }
+        break;
+      }
+      if (currentTask.status === "pending" || currentTask.status === "processing") {
+        pendingAhead++;
+      }
+    }
+    if (!found) {
+      return { pendingAhead: -1, queuePosition: -1 };
+    }
+    return { pendingAhead, queuePosition };
+  }
+  /**
+   * 检查并处理队列中的任务
+   */
+  _processQueue() {
+    while (this.activeTasks < this.concurrency) {
+      const task = this.tasks.find((t) => t.status === "pending");
+      if (!task) break;
+      this.activeTasks++;
+      task.status = "processing";
+      if (this.config.debug)
+        this.logger.info(
+          `[任务开始] 任务ID: ${task.id} 类型: ${task.payload.type} ID: ${task.payload.id}`
+        );
+      this._runTask(task);
+    }
+  }
+  /**
+   * 执行单个任务
+   */
+  async _runTask(task) {
+    try {
+      await this.processor(task.payload);
+      task.status = "completed";
+      if (this.config.debug)
+        this.logger.info(
+          `[任务成功] 任务ID: ${task.id} 类型: ${task.payload.type} ID: ${task.payload.id}`
+        );
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      if (this.config.debug)
+        this.logger.error(
+          `[任务失败] 任务ID: ${task.id} 类型: ${task.payload.type} ID: ${task.payload.id}, 错误: ${errorMessage}`
+        );
+      task.status = "failed";
+      task.error = errorMessage;
+    } finally {
+      task.processedAt = (/* @__PURE__ */ new Date()).toISOString();
+      this.activeTasks--;
+      this._processQueue();
+    }
+  }
+};
+
 // src/index.ts
 var name = "jmcomic";
-var Config = import_koishi.Schema.intersect([
-  import_koishi.Schema.object({
-    retryCount: import_koishi.Schema.number().min(1).max(5).default(5),
-    sendMethod: import_koishi.Schema.union(["zip", "pdf"]).default("pdf"),
-    fileMethod: import_koishi.Schema.union(["buffer", "file"]).default("buffer"),
-    password: import_koishi.Schema.string(),
-    fileName: import_koishi.Schema.string().default("{{name}} ({{id}})_{{index}}")
+var Config = import_koishi2.Schema.intersect([
+  import_koishi2.Schema.object({
+    fileMethod: import_koishi2.Schema.union(["buffer", "file"]).default("buffer"),
+    password: import_koishi2.Schema.string(),
+    fileName: import_koishi2.Schema.string().default("{{name}} ({{id}})_{{index}}"),
+    sendMethod: import_koishi2.Schema.union(["zip", "pdf"]).default("pdf")
   }),
-  import_koishi.Schema.union([
-    import_koishi.Schema.object({
-      sendMethod: import_koishi.Schema.const("zip").required(),
-      level: import_koishi.Schema.number().min(0).max(9).default(6).role("slider")
+  import_koishi2.Schema.union([
+    import_koishi2.Schema.object({
+      sendMethod: import_koishi2.Schema.const("zip").required(),
+      level: import_koishi2.Schema.number().min(0).max(9).default(6).role("slider")
     }),
-    import_koishi.Schema.object({})
+    import_koishi2.Schema.object({})
   ]),
-  import_koishi.Schema.object({
-    cache: import_koishi.Schema.boolean().default(false)
+  import_koishi2.Schema.object({
+    retryCount: import_koishi2.Schema.number().min(1).max(5).default(5),
+    concurrentDownloadLimit: import_koishi2.Schema.number().min(0).max(20).default(10),
+    concurrentDecodeLimit: import_koishi2.Schema.number().min(0).max(20).default(5),
+    concurrentQueueLimit: import_koishi2.Schema.number().min(0).max(10).default(1)
+  }),
+  import_koishi2.Schema.object({
+    cache: import_koishi2.Schema.boolean().default(false)
   }),
-  import_koishi.Schema.union([
-    import_koishi.Schema.object({
-      cache: import_koishi.Schema.const(true).required(),
-      autoDelete: import_koishi.Schema.boolean().default(false)
+  import_koishi2.Schema.union([
+    import_koishi2.Schema.object({
+      cache: import_koishi2.Schema.const(true).required(),
+      autoDelete: import_koishi2.Schema.boolean().default(false)
     }),
-    import_koishi.Schema.object({})
+    import_koishi2.Schema.object({})
   ]),
-  import_koishi.Schema.union([
-    import_koishi.Schema.object({
-      cache: import_koishi.Schema.const(true).required(),
-      autoDelete: import_koishi.Schema.const(true).required(),
-      cron: import_koishi.Schema.string().default("0 0 * * *"),
-      deleteInStart: import_koishi.Schema.boolean().default(false),
-      keepDays: import_koishi.Schema.number().min(1).default(7)
+  import_koishi2.Schema.union([
+    import_koishi2.Schema.object({
+      cache: import_koishi2.Schema.const(true).required(),
+      autoDelete: import_koishi2.Schema.const(true).required(),
+      cron: import_koishi2.Schema.string().default("0 0 * * *"),
+      deleteInStart: import_koishi2.Schema.boolean().default(false),
+      keepDays: import_koishi2.Schema.number().min(1).default(7)
     }),
-    import_koishi.Schema.object({})
+    import_koishi2.Schema.object({})
   ]),
-  import_koishi.Schema.object({
-    debug: import_koishi.Schema.boolean().default(false)
+  import_koishi2.Schema.object({
+    debug: import_koishi2.Schema.boolean().default(false)
   })
 ]).i18n({
   "zh-CN": require_zh_CN()._config,
@@ -1107,17 +1428,10 @@ var inject = {
   required: ["http"],
   optional: ["notifier", "cron"]
 };
-var http;
-var logger;
-var retryCount;
-var debug;
 async function apply(ctx, config) {
-  http = ctx.http;
-  retryCount = config.retryCount;
-  debug = config.debug;
   ctx.i18n.define("en-US", require_en_US());
   ctx.i18n.define("zh-CN", require_zh_CN());
-  logger = ctx.logger("jmcomic");
+  const logger = ctx.logger("jmcomic");
   const root = (0, import_path3.join)(ctx.baseDir, "data", "jmcomic");
   const scheduleFn = /* @__PURE__ */ __name(async () => {
     const albumPath = (0, import_path3.join)(ctx.baseDir, "data", "jmcomic", "album");
@@ -1135,194 +1449,148 @@ async function apply(ctx, config) {
       content: "据JMComic-Crawler-Python源码可知JM图片还有gif形式，目前尚未支持"
     });
   }
-  ctx.command("jm.album <albumId:string>").alias("本子").action(async ({ session, options }, albumId) => {
+  const processorConfig = {
+    root,
+    sendMethod: config.sendMethod,
+    password: config.password,
+    level: config.level,
+    fileName: config.fileName,
+    fileMethod: config.fileMethod,
+    cache: config.cache,
+    debug: config.debug || false
+  };
+  const jmProcessor = createJmProcessor(
+    processorConfig,
+    ctx.http,
+    config,
+    logger
+  );
+  const queue = new Queue(
+    jmProcessor,
+    { concurrency: config.concurrentQueueLimit || 1 },
+    config,
+    logger
+  );
+  const handleAlbumOrPhoto = /* @__PURE__ */ __name(async (session, id) => {
     const messageId = session.messageId;
-    if (!/^\d+$/.test(albumId)) {
+    if (!/^\d+$/.test(id)) {
       await session.send([
-        import_koishi.h.quote(messageId),
-        import_koishi.h.text("输入的ID不合法，请检查")
+        import_koishi2.h.quote(messageId),
+        import_koishi2.h.text("输入的ID不合法，请检查")
       ]);
       return;
     }
-    try {
-      const jmClient = new JMAppClient(root);
-      const album = await jmClient.getAlbumById(albumId);
-      await jmClient.downloadByAlbum(album);
-      let filePath;
-      if (config.sendMethod === "zip") {
-        filePath = await jmClient.albumToZip(
-          album,
-          config.password,
-          config.level
-        );
-      } else {
-        filePath = await jmClient.albumToPdf(album, config.password);
-      }
-      if (typeof filePath === "string") {
-        const { fileName, ext, dir } = getFileInfo(filePath);
-        const name2 = formatFileName(config.fileName, fileName, albumId);
-        if (debug) logger.info(`文件名：${name2}.${ext}`);
-        if (config.fileMethod === "buffer") {
-          const buffer = await (0, import_promises3.readFile)(filePath);
-          await session.send([
-            import_koishi.h.file(buffer, ext, { title: `${name2}.${ext}` })
-          ]);
-        } else {
-          await session.send([
-            import_koishi.h.file(`file:///${filePath}`, { title: `${name2}.${ext}` })
-          ]);
-        }
-        if (!config.cache) (0, import_promises3.rm)(dir, { recursive: true });
-      } else {
-        let fileDir;
-        for (const [index, p] of filePath.entries()) {
-          const { fileName, ext, dir } = getFileInfo(p);
-          const name2 = formatFileName(
-            config.fileName,
-            fileName,
-            albumId,
-            index + 1
-          );
-          if (debug) logger.info(`文件名：${name2}.${ext}`);
-          if (config.fileMethod === "buffer") {
-            const buffer = await (0, import_promises3.readFile)(p);
-            await session.send([
-              import_koishi.h.file(buffer, ext, { title: `${name2}.${ext}` })
-            ]);
-          } else {
-            await session.send([
-              import_koishi.h.file(`file:///${p}`, { title: `${name2}.${ext}` })
-            ]);
-          }
-          fileDir = dir;
-        }
-        if (!config.cache) (0, import_promises3.rm)(fileDir, { recursive: true });
-      }
-    } catch (error) {
-      if (error instanceof AlbumNotExistError) {
-        await session.send([
-          import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".notExistError"))
-        ]);
-      } else if (error instanceof MySqlError) {
-        await session.send([
-          import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".mysqlError"))
-        ]);
-      } else {
-        throw new Error(error);
-      }
+    const { task, pendingAhead, queuePosition } = queue.add({
+      type: "album",
+      id,
+      session,
+      messageId
+    });
+    const params = {
+      id,
+      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);
+  }, "handleAlbumOrPhoto");
+  ctx.command("jm.album <albumId:string>").alias("本子").action(async ({ session, options }, albumId) => {
+    await handleAlbumOrPhoto(session, albumId);
   });
   ctx.command("jm.photo <photoId:string>").alias("本子章节").action(async ({ session }, photoId) => {
-    const messageId = session.messageId;
-    if (!/^\d+$/.test(photoId)) {
-      await session.send([
-        import_koishi.h.quote(messageId),
-        import_koishi.h.text("输入的ID不合法，请检查")
-      ]);
-      return;
-    }
-    try {
-      const jmClient = new JMAppClient(root);
-      const photo = await jmClient.getPhotoById(photoId);
-      await jmClient.downloadByPhoto(photo);
-      const photoName = photo.getName();
-      let filePath;
-      if (config.sendMethod === "zip") {
-        filePath = await jmClient.photoToZip(
-          photo,
-          photoName,
-          config.password,
-          config.level
-        );
-      } else {
-        filePath = await jmClient.photoToPdf(photo, photoName);
-      }
-      const { fileName, ext, dir } = getFileInfo(filePath);
-      const name2 = formatFileName(config.fileName, fileName, photoId);
-      if (debug) logger.info(`文件名：${name2}.${ext}`);
-      if (config.fileMethod === "buffer") {
-        const buffer = await (0, import_promises3.readFile)(filePath);
-        await session.send([
-          import_koishi.h.file(buffer, ext, { title: `${name2} (${photoId}).${ext}` })
-        ]);
-      } else {
-        await session.send([
-          import_koishi.h.file(`file:///${filePath}`, { title: `${name2}.${ext}` })
-        ]);
-      }
-      if (!config.cache) (0, import_promises3.rm)(dir, { recursive: true });
-    } catch (error) {
-      if (error instanceof PhotoNotExistError) {
-        await session.send([
-          import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".notExistError"))
-        ]);
-      } else if (error instanceof MySqlError) {
-        await session.send([
-          import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".mysqlError"))
-        ]);
-      } else {
-        throw new Error(error);
-      }
-    }
+    await handleAlbumOrPhoto(session, photoId);
   });
   ctx.command("jm.album.info <albumId:string>").alias("本子信息").action(async ({ session, options }, albumId) => {
     const messageId = session.messageId;
     if (!/^\d+$/.test(albumId)) {
       await session.send([
-        import_koishi.h.quote(messageId),
-        import_koishi.h.text("输入的ID不合法，请检查")
+        import_koishi2.h.quote(messageId),
+        import_koishi2.h.text("输入的ID不合法，请检查")
       ]);
       return;
     }
     try {
-      const jmClient = new JMAppClient(root);
+      const jmClient = new JMAppClient(root, ctx.http, config, logger);
       const album = await jmClient.getAlbumById(albumId);
       await session.send([
-        import_koishi.h.quote(messageId),
-        import_koishi.h.text(`ID：${album.getId()}
+        import_koishi2.h.quote(messageId),
+        import_koishi2.h.text(`ID：${album.getId()}
 `),
-        import_koishi.h.text(`名称：${album.getName()}
+        import_koishi2.h.text(`名称：${album.getName()}
 `),
-        import_koishi.h.text(`章节数：${album.getPhotos().length}
+        import_koishi2.h.text(`章节数：${album.getPhotos().length}
 `),
-        import_koishi.h.text(`作者：${album.getAuthors()?.join("、") ?? ""}
+        import_koishi2.h.text(`作者：${album.getAuthors()?.join("、") ?? ""}
 `),
-        import_koishi.h.text(`登场人物：${album.getActors()?.join("、") ?? ""}
+        import_koishi2.h.text(`登场人物：${album.getActors()?.join("、") ?? ""}
 `),
-        import_koishi.h.text(`点赞数：${album.getLikes()}
+        import_koishi2.h.text(`点赞数：${album.getLikes()}
 `),
-        import_koishi.h.text(`观看数：${album.getTotalViews()}`)
+        import_koishi2.h.text(`观看数：${album.getTotalViews()}`)
       ]);
     } catch (error) {
       if (error instanceof AlbumNotExistError) {
         await session.send([
-          import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".notExistError"))
+          import_koishi2.h.quote(messageId),
+          import_koishi2.h.text(session.text(".notExistError"))
         ]);
       } else if (error instanceof MySqlError) {
         await session.send([
-          import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".mysqlError"))
+          import_koishi2.h.quote(messageId),
+          import_koishi2.h.text(session.text(".mysqlError"))
         ]);
       } else {
         throw new Error(error);
       }
     }
   });
+  ctx.command("jm.queue").alias("本子队列").action(async ({ session, options }) => {
+    const messageId = session.messageId;
+    const allTasks = queue.getAllTasks();
+    const pendingOrProcessingTasks = allTasks.filter(
+      (task) => task.status !== "completed"
+    );
+    if (pendingOrProcessingTasks.length === 0) {
+      await session.send([
+        import_koishi2.h.quote(messageId),
+        import_koishi2.h.text(session.text(".emptyQueue"))
+      ]);
+      return;
+    }
+    const statusMap = {
+      pending: session.text(".task.pending"),
+      processing: session.text(".task.processing"),
+      failed: session.text(".task.failed")
+    };
+    const typeMap = {
+      album: session.text(".type.album"),
+      photo: session.text(".type.photo")
+    };
+    const taskInfos = pendingOrProcessingTasks.map((task) => {
+      return import_koishi2.h.text(
+        session.text(".msgFormat", {
+          id: task.payload.id,
+          type: typeMap[task.payload.type],
+          status: statusMap[task.status]
+        })
+      );
+    });
+    await session.send([import_koishi2.h.quote(messageId), ...taskInfos]);
+  });
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,
   apply,
-  debug,
-  http,
   inject,
-  logger,
-  name,
-  retryCount
+  name
 });

package/lib/processors/jmProcessor.d.ts

@@ -0,0 +1,20 @@
+import { Config } from "..";
+import { Logger, Session, HTTP } from "koishi";
+export type JmTaskPayload = {
+    type: "album" | "photo";
+    id: string;
+    session: Session;
+    messageId: string;
+};
+interface ProcessorConfig {
+    root: string;
+    sendMethod: "zip" | "pdf";
+    password?: string;
+    level?: number;
+    fileName: string;
+    fileMethod: "buffer" | "file";
+    cache: boolean;
+    debug: boolean;
+}
+export declare const createJmProcessor: (processorConfig: ProcessorConfig, http: HTTP, config: Config, logger: Logger) => (payload: JmTaskPayload) => Promise<void>;
+export {};

package/lib/utils/Queue.d.ts

@@ -0,0 +1,75 @@
+import { Config } from "..";
+import { Logger } from "koishi";
+import { JmTaskPayload } from "../processors/jmProcessor";
+/**
+ * 任务可能的状态
+ * pending: 等待处理
+ * processing: 正在处理
+ * completed: 处理完成
+ * failed: 处理失败
+ */
+type TaskStatus = "pending" | "processing" | "completed" | "failed";
+interface Task {
+    id: string;
+    payload: JmTaskPayload;
+    status: TaskStatus;
+    createdAt: string;
+    processedAt?: string;
+    error?: string;
+}
+type TaskProcessor = (payload: JmTaskPayload) => Promise<void>;
+interface QueueOptions {
+    concurrency?: number;
+}
+interface AddTaskResult {
+    task: Task;
+    pendingAhead: number;
+    queuePosition: number;
+}
+export declare class Queue {
+    private tasks;
+    private processor;
+    private readonly concurrency;
+    private activeTasks;
+    /**
+     * koishi 配置项
+     */
+    private config;
+    /**
+     * koishi 日志
+     */
+    private logger;
+    constructor(processor: TaskProcessor, options: QueueOptions, config: Config, logger: Logger);
+    /**
+     * 向队列添加一个新任务
+     */
+    add(payload: JmTaskPayload): AddTaskResult;
+    /**
+     * 获取任务状态
+     */
+    getTask(id: string): Task | undefined;
+    /**
+     * 获取所有任务的只读列表
+     */
+    getAllTasks(): Readonly<Task[]>;
+    /**
+     * 获取指定任务在队列中的位置信息
+     * @param taskId 任务ID
+     * @returns {pendingAhead: number, queuePosition: number}
+     * pendingAhead: 在此任务之前有多少个待处理任务
+     * queuePosition: 此任务在所有待处理任务中的位置（从1开始）
+     */
+    getTaskQueuePosition(taskId: string): {
+        pendingAhead: number;
+        queuePosition: number;
+    };
+    /**
+     * 检查并处理队列中的任务
+     */
+    private _processQueue;
+    /**
+     * 执行单个任务
+     */
+    private _runTask;
+}
+export {};

package/lib/utils/Utils.d.ts

@@ -1,4 +1,5 @@
-import { HTTP } from "koishi";
+import { Config } from "..";
+import { HTTP, Logger } from "koishi";
 import { IJMResponse } from "../types/JMClient";
 /**
  * 文件是否存在
@@ -22,7 +23,7 @@ export declare function sanitizeFileName(fileName: string): string;
  * 从github获取最新的JM域名
  * @returns 域名列表
  */
-export declare function getDomainFromGithub(): Promise<any[]>;
+export declare function getDomainFromGithub(http: HTTP): Promise<any[]>;
 /**
  * 限制Promise并发
  * @param promises Promise方法列表
@@ -38,7 +39,7 @@ export declare function limitPromiseAll<T>(promises: (() => Promise<T>)[], limit
  * @param retryIndex 尝试次数
  * @returns 请求结果
  */
-export declare function requestWithRetry<T = IJMResponse>(url: string, method: "GET" | "POST", config?: HTTP.RequestConfig, retryIndex?: number): Promise<T>;
+export declare function requestWithRetry<T = IJMResponse>(url: string, method: "GET" | "POST", config: HTTP.RequestConfig, http: HTTP, pluginsConfig: Config, logger: Logger, retryIndex?: number): Promise<T>;
 /**
  * 依次使用定义的地址尝试进行请求，遇到特定错误尝试切换下一个
  * @param url 请求地址
@@ -47,7 +48,7 @@ export declare function requestWithRetry<T = IJMResponse>(url: string, method: "
  * @param urlIndex 地址下标，默认从0开始尝试
  * @returns 请求结果
  */
-export declare function requestWithUrlSwitch<T = IJMResponse>(url: string, method: "GET" | "POST", config?: HTTP.RequestConfig, type?: "IMAGE" | "CLIENT", urlIndex?: number): Promise<T>;
+export declare function requestWithUrlSwitch<T = IJMResponse>(url: string, method: "GET" | "POST", config: HTTP.RequestConfig, http: HTTP, pluginsConfig: Config, logger: Logger, type?: "IMAGE" | "CLIENT", urlIndex?: number): Promise<T>;
 /**
  * 获取文件名和扩展名
  * @param filePath 文件路径

package/package.json

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

package/readme.md

@@ -10,12 +10,33 @@
 jm album xxxxxx
 jm album info xxxxxx
 jm photo xxxxxx
+jm queue
 ```
 
 可在配置中配置是发送 PDF 还是 ZIP 压缩包，支持加密。
 
 ## 更新日志
 
+<details>
+<summary>0.1.1</summary>
+
+1. 添加队列时返回队列信息
+2. 提取代码
+
+</details>
+
+<details>
+<summary>0.1.0</summary>
+
+1. 队列系统
+2. 下载并发与解密并发限制
+3. 修改配置页面顺序、分类
+4. 不再直接暴露变量，改为逐级传递
+5. 统一暴露Error类
+6. 添加域名切换条件
+
+</details>
+
 <details>
 <summary>0.0.6</summary>
 添加了一些错误提示
@@ -28,9 +49,9 @@ jm photo xxxxxx
 
 <details>
 <summary>0.0.4</summary>
-1.文件名移除前后空格
 
-2.新增文件发送配置，用于配置文件是以 buffer 读取后发送还是以本地地址的形式发送。docker 中使用 file 形式需要在 bot 实现端同时映射/koishi 目录
+1. 文件名移除前后空格
+2. 新增文件发送配置，用于配置文件是以 buffer 读取后发送还是以本地地址的形式发送。docker 中使用 file 形式需要在 bot 实现端同时映射/koishi 目录
 
 </details>