@wahaha216/koishi-plugin-jmcomic 0.0.4 → 0.0.6

package/lib/error/albumNotExist.error.d.ts

@@ -0,0 +1,3 @@
+export declare class AlbumNotExistError extends Error {
+    constructor(message?: string);
+}

package/lib/error/photoNotExist.error.d.ts

@@ -0,0 +1,3 @@
+export declare class PhotoNotExistError extends Error {
+    constructor(message?: string);
+}

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 114514", messages: { empty: "JMID 不能为空", formatError: "JMID 格式错误", notFound: "找不到该车牌", pleaseWait: "正在获取，请等待亿会" } } }, _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: { 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: "调试模式，输出更多信息" }] };
   }
 });
 
 // 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 114514", messages: { empty: "JM ID cannot be empty", formatError: "JM ID format error", notFound: "The JM ID cannot be found", pleaseWait: "Getting it, please wait" } } }, _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: { 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" }] };
   }
 });
 
@@ -702,6 +702,30 @@ __name(archiverImage, "archiverImage");
 var import_path2 = require("path");
 var import_sharp2 = __toESM(require("sharp"));
 var import_muhammara = require("muhammara");
+
+// src/error/albumNotExist.error.ts
+var AlbumNotExistError = class extends Error {
+  static {
+    __name(this, "AlbumNotExistError");
+  }
+  constructor(message) {
+    super(message);
+    this.name = "AlbumNotExistError";
+  }
+};
+
+// src/error/photoNotExist.error.ts
+var PhotoNotExistError = class extends Error {
+  static {
+    __name(this, "PhotoNotExistError");
+  }
+  constructor(message) {
+    super(message);
+    this.name = "PhotoNotExistError";
+  }
+};
+
+// src/entity/JMAppClient.ts
 var JMAppClient = class _JMAppClient extends JMClientAbstract {
   static {
     __name(this, "JMAppClient");
@@ -748,6 +772,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       responseType: "json"
     });
     const album_json = this.decodeBase64(res.data, timestamp);
+    if (!album_json.name) throw new AlbumNotExistError();
     const album = JMAppAlbum.fromJson(album_json);
     const series = album.getSeries();
     const photos = [];
@@ -773,6 +798,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       responseType: "json"
     });
     const photo_json = this.decodeBase64(res.data, timestamp);
+    if (!photo_json.name) throw new PhotoNotExistError();
     const photo = JMAppPhoto.fromJson(photo_json);
     const images = photo.getImages();
     const image_ids = images.map((image) => image.split(".")[0]);
@@ -794,9 +820,11 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     let path = `${this.root}/${type}/${id}/origin`;
     if (debug) {
       logger.info(`开始下载: ${id}`);
-      logger.info(`单章节: ${single ? "是" : "否"}`);
-      logger.info(`子章节: ${albumId ? "是" : "否"}`);
-      logger.info(`本子ID：${albumId}`);
+      if (type === "album") {
+        logger.info(`单章节: ${single ? "是" : "否"}`);
+        logger.info(`子章节: ${albumId ? "是" : "否"}`);
+        logger.info(`本子ID: ${albumId}`);
+      }
     }
     if (type === "album") {
       if (single) {
@@ -1171,13 +1199,16 @@ async function apply(ctx, config) {
         if (!config.cache) (0, import_promises3.rm)(fileDir, { recursive: true });
       }
     } catch (error) {
-      if (error instanceof Error) {
-        if (error.message.includes("Could not connect to mysql")) {
-          await session.send([
-            import_koishi.h.quote(messageId),
-            import_koishi.h.text("已尝试所有可能，但是JM坏掉了")
-          ]);
-        }
+      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);
       }
@@ -1223,13 +1254,16 @@ async function apply(ctx, config) {
       }
       if (!config.cache) (0, import_promises3.rm)(dir, { recursive: true });
     } catch (error) {
-      if (error instanceof Error) {
-        if (error.message.includes("Could not connect to mysql")) {
-          await session.send([
-            import_koishi.h.quote(messageId),
-            import_koishi.h.text("已尝试所有可能，但是JM坏掉了")
-          ]);
-        }
+      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);
       }
@@ -1264,13 +1298,16 @@ async function apply(ctx, config) {
         import_koishi.h.text(`观看数：${album.getTotalViews()}`)
       ]);
     } catch (error) {
-      if (error instanceof Error) {
-        if (error.message.includes("Could not connect to mysql")) {
-          await session.send([
-            import_koishi.h.quote(messageId),
-            import_koishi.h.text("已尝试所有可能，但是JM坏掉了")
-          ]);
-        }
+      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);
       }

package/package.json

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

package/readme.md

@@ -16,6 +16,16 @@ jm photo xxxxxx
 
 ## 更新日志
 
+<details>
+<summary>0.0.6</summary>
+添加了一些错误提示
+</details>
+
+<details>
+<summary>0.0.5</summary>
+修改使用示例
+</details>
+
 <details>
 <summary>0.0.4</summary>
 1.文件名移除前后空格