koishi-plugin-w-ygo 0.0.2 → 0.0.3

package/lib/apis.d.ts

@@ -1,4 +1,4 @@
-export declare namespace APIs {
+export declare namespace API {
     const ygocdb: (query: {
         search: string;
     }) => string;
@@ -65,7 +65,6 @@ export declare namespace APIs {
         amount: number;
         type: string;
     };
-    const showMdmObtain: (obtain: MdmObtain) => string;
     type MdmCard = {
         _id: string;
         gameId: string | number;

package/lib/index.d.ts

@@ -1,6 +1,9 @@
 import { Context, Schema } from 'koishi';
 export declare const name = "w-ygo";
 export interface Config {
+    retry: number;
+    mdmDefault: boolean;
+    showExpiredPacks: boolean;
 }
 export declare const Config: Schema<Config>;
-export declare function apply(ctx: Context): void;
+export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -28,11 +28,11 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 
 // src/apis.ts
-var APIs;
-((APIs2) => {
-  APIs2.ygocdb = /* @__PURE__ */ __name((query) => `https://ygocdb.com/api/v0/?search=${encodeURIComponent(query.search)}`, "ygocdb");
-  APIs2.mdmcards = /* @__PURE__ */ __name((query) => `https://www.masterduelmeta.com/api/v1/cards?search=${encodeURIComponent(query.name)}`, "mdmcards");
-  APIs2.showMdmBanStatus = /* @__PURE__ */ __name((banStatus) => {
+var API;
+((API2) => {
+  API2.ygocdb = /* @__PURE__ */ __name((query) => `https://ygocdb.com/api/v0/?search=${encodeURIComponent(query.search)}`, "ygocdb");
+  API2.mdmcards = /* @__PURE__ */ __name((query) => `https://www.masterduelmeta.com/api/v1/cards?search=${encodeURIComponent(query.name)}`, "mdmcards");
+  API2.showMdmBanStatus = /* @__PURE__ */ __name((banStatus) => {
     if (!banStatus) return "无";
     switch (banStatus) {
       case "Limited 2":
@@ -43,25 +43,33 @@ var APIs;
         return "禁止";
     }
   }, "showMdmBanStatus");
-  APIs2.showMdmObtain = /* @__PURE__ */ __name((obtain) => {
-    const expired = obtain.source.expires && new Date(obtain.source.expires) > /* @__PURE__ */ new Date();
-    return `${obtain.source.name}${expired ? "" : " (过期) "}`;
-  }, "showMdmObtain");
-  APIs2.momobako = /* @__PURE__ */ __name((query) => `https://cdn.233.momobako.com/ygopro/pics/${query.id}.jpg`, "momobako");
-})(APIs || (APIs = {}));
+  API2.momobako = /* @__PURE__ */ __name((query) => `https://cdn.233.momobako.com/ygopro/pics/${query.id}.jpg`, "momobako");
+})(API || (API = {}));
 
 // src/index.tsx
 var import_jsx_runtime = require("@satorijs/element/jsx-runtime");
 var name = "w-ygo";
-var Config = import_koishi.Schema.object({});
-function apply(ctx) {
-  ctx.command("ygo <search:text>", "通过 ygocdb.com 搜索游戏王卡片").option("mdm", "-m 从 Master Duel Meta 获取额外信息（会消耗更多时间）", { fallback: true }).action(async ({ session, options }, search) => {
-    const { result: cards } = await ctx.http.get(APIs.ygocdb({ search }));
+var Config = import_koishi.Schema.object({
+  retry: import_koishi.Schema.number().default(3).description("API 请求失败时的重试次数"),
+  mdmDefault: import_koishi.Schema.boolean().default(false).description("是否默认启用 Master Duel Meta 信息"),
+  showExpiredPacks: import_koishi.Schema.boolean().default(false).description("是否显示过期的 MD 卡包")
+});
+function apply(ctx, config) {
+  const get = /* @__PURE__ */ __name(async (url, { retry = config.retry } = {}) => {
+    try {
+      return await ctx.http.get(url);
+    } catch (error) {
+      if (retry > 0) return get(url, { retry: retry - 1 });
+      throw error;
+    }
+  }, "get");
+  ctx.command("ygo <search:text>", "通过 ygocdb.com 搜索游戏王卡片").option("mdm", "-m 从 Master Duel Meta 获取额外信息（会消耗更多时间）", { fallback: config.mdmDefault }).option("mdm", "-M", { value: false }).action(async ({ session, options }, search) => {
+    const { result: cards } = await get(API.ygocdb({ search }));
     if (!cards.length) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: "未找到相关卡片" });
     const [card] = cards;
     let mdminfo = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: "从 MDM 获取信息失败" });
     if (options.mdm) {
-      const mdmcards = await ctx.http.get(APIs.mdmcards({ name: card.en_name }));
+      const mdmcards = await get(API.mdmcards({ name: card.en_name }));
       const gameId = String(card.cid);
       const mdmcard = mdmcards.find((it) => String(it.gameId) === gameId);
       if (mdmcard) {
@@ -72,26 +80,29 @@ function apply(ctx) {
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { children: [
             "[MD 禁限] ",
-            APIs.showMdmBanStatus(mdmcard.banStatus)
+            API.showMdmBanStatus(mdmcard.banStatus)
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { children: [
             "[OCG 禁限] ",
-            APIs.showMdmBanStatus(mdmcard.ocgBanStatus)
+            API.showMdmBanStatus(mdmcard.ocgBanStatus)
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { children: [
             "[TCG 禁限] ",
-            APIs.showMdmBanStatus(mdmcard.tcgBanStatus)
+            API.showMdmBanStatus(mdmcard.tcgBanStatus)
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { children: [
             "[MD 卡包] ",
-            mdmcard.obtain.map(APIs.showMdmObtain).join(", ") || "无"
+            mdmcard.obtain.map((it) => {
+              const expired = !!it.source.expires && new Date(it.source.expires) < /* @__PURE__ */ new Date();
+              return { ...it, expired };
+            }).filter((it) => !it.expired || config.showExpiredPacks).sort((i1, i2) => +i1.expired - +i2.expired).map((obtain) => `${obtain.source.name}${obtain.expired ? " (过期)" : ""}`).join(", ") || "无"
           ] })
         ] });
       }
     }
     session.send(/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("message", { forward: true, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("message", { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: APIs.momobako({ id: card.id }), alt: card.en_name }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("img", { src: API.momobako({ id: card.id }), alt: card.en_name }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("p", { children: [
           "[MD 卡名] ",
           card.md_name || "无"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-w-ygo",
   "description": "WillBot: YuGiOh function",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [