@wahaha216/koishi-plugin-jmcomic 0.1.1 → 0.2.0

package/lib/abstract/JMClientAbstract.d.ts

@@ -1,5 +1,5 @@
 import crypto from "crypto";
-import { IJMUser } from "../types/JMClient";
+import { IJMSearchResult, IJMUser } from "../types/JMClient";
 import { JMPhotoAbstract } from "./JMPhotoAbstract";
 import { JMAlbumAbstract } from "./JMAlbumAbstract";
 export declare abstract class JMClientAbstract {
@@ -14,6 +14,12 @@ export declare abstract class JMClientAbstract {
      * @returns JM用户信息
      */
     abstract login(username: string, password: string): Promise<IJMUser>;
+    /**
+     * JM搜索
+     * @param keyword 关键词
+     * @returns JM搜索结果
+     */
+    abstract search(keyword: string): Promise<IJMSearchResult>;
     /**
      * 根据本子ID获取本子信息
      * @param id 本子ID

package/lib/entity/JMAppClient.d.ts

@@ -1,6 +1,6 @@
 import { Config } from "..";
 import { Logger, HTTP } from "koishi";
-import { IJMUser } from "../types/JMClient";
+import { IJMUser, IJMSearchResult } from "../types/JMClient";
 import { JMClientAbstract } from "../abstract/JMClientAbstract";
 import { JMAppPhoto } from "./JMAppPhoto";
 import { JMAppAlbum } from "./JMAppAlbum";
@@ -30,6 +30,7 @@ export declare class JMAppClient extends JMClientAbstract {
      * @returns 用户信息
      */
     login(username: string, password: string): Promise<IJMUser>;
+    search(keyword: string): Promise<IJMSearchResult>;
     getAlbumById(id: string): Promise<JMAppAlbum>;
     getPhotoById(id: string): Promise<JMAppPhoto>;
     downloadByAlbum(album: JMAppAlbum): Promise<void>;

package/lib/entity/JMHtmlClient.d.ts

@@ -1,7 +1,7 @@
 import { Config } from "..";
 import { Logger, HTTP } from "koishi";
 import { JMClientAbstract } from "../abstract/JMClientAbstract";
-import { IJMUser } from "../types/JMClient";
+import { IJMSearchResult, IJMUser } from "../types/JMClient";
 import { JMHtmlAlbum } from "./JMHtmlAlbum";
 import { JMHtmlPhoto } from "./JMHtmlPhoto";
 export declare class JMHtmlClient extends JMClientAbstract {
@@ -19,6 +19,7 @@ export declare class JMHtmlClient extends JMClientAbstract {
     private http;
     constructor(root: string, http: HTTP, config: Config, logger: Logger);
     login(username: string, password: string): Promise<IJMUser>;
+    search(keyword: string): Promise<IJMSearchResult>;
     getAlbumById(id: string): Promise<JMHtmlAlbum>;
     getPhotoById(id: string): Promise<JMHtmlPhoto>;
     downloadByAlbum(album: JMHtmlAlbum): 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: { 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: "调试模式，输出更多信息" }] };
+    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: "描述" } } } }, _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: { 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" }] };
+    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" } } } }, _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" }] };
   }
 });
 
@@ -791,6 +791,24 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     );
     return this.decodeBase64(res.data, timestamp);
   }
+  async search(keyword) {
+    if (this.config.debug) this.logger.info(`搜索本子: ${keyword}`);
+    const timestamp = this.getTimeStamp();
+    const { token, tokenparam } = this.getTokenAndTokenParam(timestamp);
+    const searchRes = await requestWithUrlSwitch(
+      "/search",
+      "POST",
+      {
+        params: { search_query: keyword },
+        headers: { token, tokenparam },
+        responseType: "json"
+      },
+      this.http,
+      this.config,
+      this.logger
+    );
+    return this.decodeBase64(searchRes.data, timestamp);
+  }
   async getAlbumById(id) {
     if (this.config.debug) this.logger.info(`获取本子(${id})信息`);
     const timestamp = this.getTimeStamp();
@@ -1123,7 +1141,7 @@ var createJmProcessor = /* @__PURE__ */ __name((processorConfig, http, config, l
     debug
   } = processorConfig;
   return async (payload) => {
-    const { id, session, messageId } = payload;
+    const { id, session, messageId, scope } = payload;
     try {
       const jmClient = new JMAppClient(root, http, config, logger);
       let filePath;
@@ -1229,13 +1247,13 @@ var createJmProcessor = /* @__PURE__ */ __name((processorConfig, http, config, l
       if (error instanceof AlbumNotExistError || error instanceof PhotoNotExistError) {
         await session.send([
           import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".notExistError"))
+          import_koishi.h.text(session.text(`${scope}.notExistError`))
           // 假设 .notExistError 可以通用
         ]);
       } else if (error instanceof MySqlError) {
         await session.send([
           import_koishi.h.quote(messageId),
-          import_koishi.h.text(session.text(".mysqlError"))
+          import_koishi.h.text(session.text(`${scope}.mysqlError`))
         ]);
       } else {
         await session.send([
@@ -1471,7 +1489,7 @@ async function apply(ctx, config) {
     config,
     logger
   );
-  const handleAlbumOrPhoto = /* @__PURE__ */ __name(async (session, id) => {
+  const handleAlbumOrPhoto = /* @__PURE__ */ __name(async (session, id, type) => {
     const messageId = session.messageId;
     if (!/^\d+$/.test(id)) {
       await session.send([
@@ -1481,10 +1499,11 @@ async function apply(ctx, config) {
       return;
     }
     const { task, pendingAhead, queuePosition } = queue.add({
-      type: "album",
+      type,
       id,
       session,
-      messageId
+      messageId,
+      scope: session.scope
     });
     const params = {
       id,
@@ -1503,10 +1522,10 @@ async function apply(ctx, config) {
     await session.send(msg);
   }, "handleAlbumOrPhoto");
   ctx.command("jm.album <albumId:string>").alias("本子").action(async ({ session, options }, albumId) => {
-    await handleAlbumOrPhoto(session, albumId);
+    await handleAlbumOrPhoto(session, albumId, "album");
   });
   ctx.command("jm.photo <photoId:string>").alias("本子章节").action(async ({ session }, photoId) => {
-    await handleAlbumOrPhoto(session, photoId);
+    await handleAlbumOrPhoto(session, photoId, "photo");
   });
   ctx.command("jm.album.info <albumId:string>").alias("本子信息").action(async ({ session, options }, albumId) => {
     const messageId = session.messageId;
@@ -1552,6 +1571,52 @@ async function apply(ctx, config) {
       }
     }
   });
+  ctx.command("jm.search <keyword:string>").alias("本子搜索").action(async ({ session, options }, keyword) => {
+    const messageId = session.messageId;
+    if (!keyword) {
+      await session.send([
+        import_koishi2.h.quote(messageId),
+        import_koishi2.h.text(session.text(".emptyKeywordError"))
+      ]);
+      return;
+    }
+    try {
+      const jmClient = new JMAppClient(root, ctx.http, config, logger);
+      const searchResult = await jmClient.search(keyword);
+      console.log(JSON.stringify(searchResult));
+      const contents = searchResult.content;
+      const fragment = [import_koishi2.h.quote(messageId)];
+      contents.forEach((content) => {
+        fragment.push(`${session.text(".id")}: ${content.id}
+`);
+        fragment.push(`${session.text(".name")}: ${content.name}
+`);
+        fragment.push(`${session.text(".author")}: ${content.author}
+`);
+        fragment.push(`${session.text(".category")}: ${content.category.title}
+`);
+        fragment.push(
+          `${session.text(".description")}: ${content.description}
+`
+        );
+      });
+      await session.send(fragment);
+    } catch (error) {
+      if (error instanceof AlbumNotExistError) {
+        await session.send([
+          import_koishi2.h.quote(messageId),
+          import_koishi2.h.text(session.text(".notExistError"))
+        ]);
+      } else if (error instanceof MySqlError) {
+        await session.send([
+          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();

package/lib/processors/jmProcessor.d.ts

@@ -5,6 +5,7 @@ export type JmTaskPayload = {
     id: string;
     session: Session;
     messageId: string;
+    scope: string;
 };
 interface ProcessorConfig {
     root: string;

package/package.json

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

package/readme.md

@@ -17,6 +17,14 @@ jm queue
 
 ## 更新日志
 
+<details>
+<summary>0.2.0</summary>
+
+1. 简易搜索功能
+2. 修复队列丢失i18n key的问题
+
+</details>
+
 <details>
 <summary>0.1.1</summary>