koishi-plugin-nmc-radar 1.3.2 → 1.4.0

package/lib/index.d.ts

@@ -6,9 +6,9 @@ export declare const inject: {
 };
 interface Product {
     url: string;
-    time: string;
+    slug: string;
 }
-type Resolver = (products: Product[], id: string, options: Dict) => Awaitable<h>;
+type Resolver = (products: Product[], options: Dict) => Awaitable<h>;
 declare const resolvers: Record<string, Resolver>;
 export interface Config {
     defaultResolver: keyof typeof resolvers;

package/lib/index.js

@@ -36,6 +36,7 @@ __export(src_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(src_exports);
+var import_node_buffer = require("node:buffer");
 var import_promises = require("node:fs/promises");
 var import_node_path = __toESM(require("node:path"));
 var import_jsdom = require("jsdom");
@@ -332,35 +333,53 @@ var Config = import_koishi.Schema.object({
   defaultResolver: import_koishi.Schema.union(Object.keys(resolvers)).default("img").description("默认输出类型。")
 });
 function apply(ctx, config) {
-  const command = ctx.command("radar <name:string>", "查看雷达图", { checkUnknown: true }).alias("雷达").option("reverse", "-R 反转顺序").option("count", "-n <count:number> 最大输出数量").option("type", "--type <type:string> 输出类型", { type: Object.keys(resolvers) }).option("type", "--img 输出图片", { value: "img" }).option("type", "--url 输出 URL", { value: "url" }).action(async ({ session, options = {} }, name2) => {
+  const command = ctx.command("radar <name:string>", "查看雷达图", { checkUnknown: true }).alias("雷达").option("name", "--name <name:string> 雷达站名称").option("count", "-n <count:number> 最大输出数量").option("reverse", "-R 反转顺序").option("type", "--type <type:string> 输出类型", { type: Object.keys(resolvers) }).option("type", "--img 输出图片", { value: "img" }).option("type", "--url 输出 URL", { value: "url" }).action(async ({ session, options = {} }, name2) => {
+    options.name ??= name2;
     if (!(name2 in radars_default))
       return void session?.send("雷达站不存在，可使用 radar.list 查看所有雷达站。");
-    const url = radars_default[name2];
+    const url = radars_default[options.name];
     const { window: { document } } = new import_jsdom.JSDOM(await ctx.http.get(url));
     const nodes = document.querySelectorAll("div[data-img]");
     options.type ??= config.defaultResolver;
     options.count ??= options.type === "img" ? 1 : void 0;
     const products = Array.from(nodes).slice(0, options.count).map((node) => ({
       url: node.dataset.img,
-      time: node.dataset.time
-      // MM/DD HH:mm
+      slug: node.dataset.time.replaceAll(/[/ :]/g, "")
     }));
     options.reverse || products.reverse();
-    return await resolvers[options.type](products, import_koishi.Random.id(), options);
+    return await resolvers[options.type](products, options);
   });
   ctx.inject(["ffmpeg"], async (ctx2) => {
-    command.option("type", "--gif 输出 GIF 动画", { value: "gif" }).option("fps", "--fps <fps:number> 帧率", { fallback: 10 });
-    resolvers.gif = async (products, id, options) => {
-      const baseDir = import_node_path.default.join(ctx2.baseDir, "temp", name, id);
-      await (0, import_promises.mkdir)(baseDir, { recursive: true });
-      await Promise.all(products.map(async ({ url }, i) => {
-        const response = await ctx2.http.get(url, { responseType: "stream" });
-        const filename = `${String(i + 1).padStart(3, "0")}.png`;
-        const filePath = import_node_path.default.join(baseDir, filename);
-        await (0, import_promises.writeFile)(filePath, response);
-      }));
-      const outputPath = import_node_path.default.join(baseDir, "..", `${id}.gif`);
-      await ctx2.ffmpeg.builder().input(import_node_path.default.join(baseDir, "%03d.png")).outputOption("-loop", "-1").outputOption("-r", options.fps).run("file", outputPath);
+    command.option("type", "--gif 输出 GIF 动画", { value: "gif" }).option("fps", "--fps <fps:number> 帧率", { fallback: 10 }).option("loop", "--loop <loop:number> 循环次数", { fallback: -1 });
+    resolvers.gif = async (products, options) => {
+      const baseDir = import_node_path.default.join(ctx2.baseDir, "cache", name, options.name);
+      const outputPath = import_node_path.default.join(baseDir, [
+        `${products[0].slug}+${products[products.length - 1].slug}`,
+        `-${options.fps}@${options.loop}.gif`
+      ].join(""));
+      try {
+        await (0, import_promises.access)(outputPath);
+      } catch {
+        await (0, import_promises.mkdir)(baseDir, { recursive: true });
+        const filePaths = await Promise.all(products.map(async ({ url, slug }) => {
+          const filePath = import_node_path.default.join(baseDir, `${slug}.png`);
+          try {
+            await (0, import_promises.access)(filePath);
+          } catch {
+            try {
+              const response = await ctx2.http.get(url, { responseType: "stream" });
+              await (0, import_promises.writeFile)(filePath, response);
+            } catch {
+              return void await (0, import_promises.unlink)(filePath);
+            }
+          }
+          return filePath;
+        }));
+        const buffer = [
+          ...filePaths.filter(Boolean).flatMap((filePath) => `file '${filePath.replaceAll("\\", "/")}'`)
+        ].join("\n");
+        await ctx2.ffmpeg.builder().input(import_node_buffer.Buffer.from(buffer)).inputOption("-f", "concat").inputOption("-safe", "0").inputOption("-protocol_whitelist", "file,fd").inputOption("-r", options.fps).outputOption("-loop", options.loop).run("file", outputPath);
+      }
       return import_koishi.h.img(`file://${outputPath}`);
     };
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-nmc-radar",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "气象台雷达图插件",
   "typings": "lib/index.d.ts",
   "license": "MIT",