@wahaha216/koishi-plugin-jmcomic 0.0.2 → 0.0.4

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import { Context, HTTP, Logger, Schema } from "koishi";
 export declare const name = "jmcomic";
 export interface Config {
     sendMethod?: "zip" | "pdf";
+    fileMethod?: "buffer" | "file";
     retryCount?: number;
     password?: string;
     fileName?: 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: "发送方式", 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 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: "调试模式，输出更多信息" }] };
   }
 });
 
 // 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", 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 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" }] };
   }
 });
 
@@ -251,7 +251,7 @@ async function deleteFewDaysAgoFolders(path, days) {
 }
 __name(deleteFewDaysAgoFolders, "deleteFewDaysAgoFolders");
 function formatFileName(originName, name2, id, index) {
-  return originName.replaceAll("{{name}}", name2).replaceAll("{{id}}", id).replaceAll("{{index}}", index ? `${index}` : "");
+  return originName.replaceAll("{{name}}", name2).replaceAll("{{id}}", id).replaceAll("{{index}}", index ? `${index}` : "").trim();
 }
 __name(formatFileName, "formatFileName");
 
@@ -1035,9 +1035,9 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
 var name = "jmcomic";
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
-    // url: Schema.string().required().default("18comic-mygo.vip"),
     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}}")
   }),
@@ -1097,7 +1097,7 @@ async function apply(ctx, config) {
     const photoPath = (0, import_path3.join)(ctx.baseDir, "data", "jmcomic", "photo");
     await deleteFewDaysAgoFolders(photoPath, config.keepDays);
   }, "scheduleFn");
-  if (ctx.cron) {
+  if (config.autoDelete && ctx.cron) {
     ctx.cron(config.cron, scheduleFn);
   }
   if (config.autoDelete && config.deleteInStart) scheduleFn();
@@ -1131,18 +1131,23 @@ async function apply(ctx, config) {
         filePath = await jmClient.albumToPdf(album, config.password);
       }
       if (typeof filePath === "string") {
-        const buffer = await (0, import_promises3.readFile)(filePath);
         const { fileName, ext, dir } = getFileInfo(filePath);
         const name2 = formatFileName(config.fileName, fileName, albumId);
         if (debug) logger.info(`文件名：${name2}.${ext}`);
-        await session.send([
-          import_koishi.h.file(buffer, ext, { title: `${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 buffer = await (0, import_promises3.readFile)(p);
           const { fileName, ext, dir } = getFileInfo(p);
           const name2 = formatFileName(
             config.fileName,
@@ -1151,9 +1156,16 @@ async function apply(ctx, config) {
             index + 1
           );
           if (debug) logger.info(`文件名：${name2}.${ext}`);
-          await session.send([
-            import_koishi.h.file(buffer, ext, { title: `${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 });
@@ -1196,14 +1208,19 @@ async function apply(ctx, config) {
       } else {
         filePath = await jmClient.photoToPdf(photo, photoName);
       }
-      const buffer = await (0, import_promises3.readFile)(filePath);
       const { fileName, ext, dir } = getFileInfo(filePath);
       const name2 = formatFileName(config.fileName, fileName, photoId);
-      if (debug) logger.info(`文件名：${filePath}`);
       if (debug) logger.info(`文件名：${name2}.${ext}`);
-      await session.send([
-        import_koishi.h.file(buffer, ext, { title: `${name2} (${photoId}).${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 Error) {

package/package.json

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

package/readme.md

@@ -16,6 +16,19 @@ jm photo xxxxxx
 
 ## 更新日志
 
+<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