npm - @sjtdev/koishi-plugin-dota2tracker - Versions diffs - 2.0.1 → 2.0.3 - Mend

@sjtdev/koishi-plugin-dota2tracker 2.0.1 → 2.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/lib/index.js +64 -12
package/package.json +2 -6
package/template/match/match_1.ejs +2 -2
package/template/match/match_2+.ejs +2 -2
package/template/match/match_2.ejs +2 -2
package/template/player/player_1.ejs +2 -2
package/template/rank/rank_fun.ejs +2 -2
package/template/report/daily.ejs +2 -2

package/lib/index.js CHANGED Viewed

@@ -2168,7 +2168,6 @@ var DatabaseService = class extends import_koishi7.Service {
 var import_fs = __toESM(require("fs"));
 var import_koishi8 = require("koishi");
 var import_path = __toESM(require("path"));
-var import_p_queue = __toESM(require("p-queue"));
 // src/app/common/error.ts
 var import_util = require("util");
@@ -2218,13 +2217,16 @@ var StratzAPI = class extends import_koishi8.Service {
     super(ctx, "dota2tracker.stratz-api", true);
     this.pluginDir = pluginDir3;
     this.config = ctx.config;
-    this.queue = new import_p_queue.default({ concurrency: 1, interval: 200, intervalCap: 1 });
+    this.queue = new MiniQueue(ctx, { interval: 200 });
   }
   static {
     __name(this, "StratzAPI");
   }
   BASE_URL = "https://api.stratz.com/graphql";
   queue;
+  dispose() {
+    this.queue.dispose();
+  }
   async queryGetWeeklyMetaByPosition({ bracketIds }) {
     return this.query("GetWeeklyMetaByPosition", { bracketIds }, (data) => !!data.heroStats);
   }
@@ -2311,7 +2313,7 @@ var StratzAPI = class extends import_koishi8.Service {
       return result;
     }
   }
-  fetchData(query, isValid) {
+  async fetchData(query, isValid) {
     return this.queue.add(async () => {
       try {
         const result = await this.ctx.http.post(this.BASE_URL, JSON.stringify(query), {
@@ -2352,6 +2354,55 @@ var StratzAPI = class extends import_koishi8.Service {
     return import_fs.default.readFileSync(import_path.default.join(this.pluginDir, "queries", `${queryName}.graphql`), { encoding: "utf-8" }).replace(/[\r\n]+/g, " ");
   }
 };
+var MiniQueue = class {
+  // 新增一个停止标志
+  // 1. 构造函数接收 ctx
+  constructor(ctx, options) {
+    this.ctx = ctx;
+    this.interval = options.interval;
+  }
+  static {
+    __name(this, "MiniQueue");
+  }
+  queue = [];
+  isProcessing = false;
+  interval;
+  stopped = false;
+  add(task) {
+    if (this.stopped) {
+      return Promise.reject(new Error("Queue has been disposed."));
+    }
+    return new Promise((resolve, reject) => {
+      this.queue.push(async () => {
+        try {
+          const result = await task();
+          resolve(result);
+        } catch (error) {
+          reject(error);
+        }
+      });
+      this._process();
+    });
+  }
+  // 4. 新增 dispose 方法
+  dispose() {
+    this.stopped = true;
+    this.queue = [];
+  }
+  async _process() {
+    if (this.isProcessing || this.queue.length === 0 || this.stopped) {
+      return;
+    }
+    this.isProcessing = true;
+    const task = this.queue.shift();
+    if (task) {
+      await task();
+      await new Promise((resolve) => this.ctx.setTimeout(resolve, this.interval));
+    }
+    this.isProcessing = false;
+    this._process();
+  }
+};
 // src/app/data/valve.api.ts
 var import_koishi9 = require("koishi");
@@ -2430,7 +2481,7 @@ var ImageRenderer = class extends import_koishi10.Service {
       $t: /* @__PURE__ */ __name((key, params) => this.ctx.dota2tracker.i18n.$t(languageTag, key, params), "$t"),
       languageTag,
       Random: import_koishi10.Random,
-      fontFamily: this.config.templateFonts,
+      fontFamily: this.config.templateFonts.map((f) => `${f}`).join(", "),
       getImageUrl: this.getImageUrl.bind(this)
     };
     try {
@@ -2481,7 +2532,7 @@ var MessageBuilder = class extends import_koishi11.Service {
   }
   async buildHeroOfTheDayMessage(languageTag, heroRcmd, metaRcmd) {
     const $t = /* @__PURE__ */ __name((key, params) => this.ctx.dota2tracker.i18n.$t(languageTag, `commands.dota2tracker.hero-of-the-day.messages.${key}`, params), "$t");
-    let ejs2 = "<html><head><style>body{width:fit-content;height:fit-content;margin:0;padding:12px;}</style></head><body>";
+    let ejs2 = "<html><head><style>body{width:fit-content;height:fit-content;margin:0;padding:12px;font-family:<%-fontFamily%>;}</style></head><body>";
     if (heroRcmd.recommendationType !== "LIFETIME_NO_RECORD") {
       ejs2 += `<h3>${$t("title_recommendation")}</h3>`;
       ejs2 += `<p>${$t("recommendation_intro")}</p>`;
@@ -2493,13 +2544,13 @@ var MessageBuilder = class extends import_koishi11.Service {
       ejs2 += `<p>${$t("details.table_intro")}</p>`;
       ejs2 += `<div style="display: grid;grid-template-columns: repeat(6, auto);gap: 10px;text-align: center;align-items: center;">`;
       ejs2 += `<div style="display: contents">
-              <div style="text-align:left">${$t("details.table_headers.hero")}</div>
-              <div>${$t("details.table_headers.recent_wins")}</div>
-              <div>${$t("details.table_headers.lifetime_wins")}</div>
-              <div>${$t("details.table_headers.imp_bonus")}</div>
-              <div>${$t("details.table_headers.is_hot_streak")}</div>
-              <div>${$t("details.table_headers.total_score")}</div>
-            </div>`;
+                <div style="text-align:left">${$t("details.table_headers.hero")}</div>
+                <div>${$t("details.table_headers.recent_wins")}</div>
+                <div>${$t("details.table_headers.lifetime_wins")}</div>
+                <div>${$t("details.table_headers.imp_bonus")}</div>
+                <div>${$t("details.table_headers.is_hot_streak")}</div>
+                <div>${$t("details.table_headers.total_score")}</div>
+              </div>`;
       ejs2 += heroRcmd.recommendationPool.map(
         (hero) => `<div style="display: contents">
             <div style="text-align:left">${this.ctx.dota2tracker.i18n.getDisplayNameForHero(hero.heroId, languageTag, { forceOfficialName: true }) + (heroRcmd.recommendedHeroes.includes(hero.heroId) ? "*" : "")}</div>
@@ -2583,6 +2634,7 @@ var MessageBuilder = class extends import_koishi11.Service {
             padding: 16px;
             width: fit-content;
             background-color: #f7f7f7;
+            font-family:<%-fontFamily%>;
           }
           table {
             border-collapse: collapse;

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "koishi插件-追踪群友的DOTA2对局",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -29,8 +29,7 @@
   "dependencies": {
     "dotaconstants": "^9.5.0",
     "ejs": "^3.1.10",
-    "luxon": "^3.8.0-alpha.1",
-    "p-queue": "6"
+    "luxon": "^3.8.0-alpha.1"
   },
   "peerDependencies": {
     "koishi": "^4.18.9"
@@ -51,8 +50,5 @@
       "zh-CN",
       "en-US"
     ]
-  },
-  "devDependencies": {
-    "@types/html-minifier-terser": "^7"
   }
 }

package/template/match/match_1.ejs CHANGED Viewed

@@ -6,8 +6,8 @@
     <title>Document</title>
     <%- `<style>` %>
     <%- include(`./match_1/style.css`) %>
-    <% if (fontFamily && fontFamily.length > 0) { %>
-    <%- `body { font-family: ${fontFamily.map(f => `${f}`).join(", ")}; }` %>
+    <% if (fontFamily) { %>
+    <%- `body { font-family: ${fontFamily}; }` %>
     <% } %>
     <%- "</style>" %>
     <style>

package/template/match/match_2+.ejs CHANGED Viewed

@@ -8,8 +8,8 @@
     <%- "<style>" %>
       <%- include("./match_2/original.css") %>
       <%- include("./match_2+/extra.css") %>
-    <% if (fontFamily && fontFamily.length > 0) { %>
-    <%- `body { font-family: ${fontFamily.map(f => `${f}`).join(", ")}; }` %>
+    <% if (fontFamily) { %>
+    <%- `body { font-family: ${fontFamily}; }` %>
     <% } %>
     <%- "</style>" %>
   </head>

package/template/match/match_2.ejs CHANGED Viewed

@@ -7,8 +7,8 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" />
     <%- "<style>" %>
       <%- include("./match_2/original.css") %>
-    <% if (fontFamily && fontFamily.length > 0) { %>
-    <%- `body { font-family: ${fontFamily.map(f => `${f}`).join(", ")}; }` %>
+    <% if (fontFamily) { %>
+    <%- `body { font-family: ${fontFamily}; }` %>
     <% } %>
     <%- "</style>" %>
   </head>

package/template/player/player_1.ejs CHANGED Viewed

@@ -346,9 +346,9 @@
           }
         </style>
-        <% if (fontFamily && fontFamily.length > 0) { %>
+        <% if (fontFamily) { %>
         <%- "<style>" %>
-        <%- `body { font-family: ${fontFamily.map(f => `${f}`).join(", ")}; }` %>
+        <%- `body { font-family: ${fontFamily}; }` %>
         <%- "</style>" %>
         <% } %>
     </head>

package/template/rank/rank_fun.ejs CHANGED Viewed

@@ -82,9 +82,9 @@
             }
         </style>
-        <% if (fontFamily && fontFamily.length > 0) { %>
+        <% if (fontFamily) { %>
         <%- "<style>" %>
-        <%- `body { font-family: ${fontFamily.map(f => `${f}`).join(", ")}; }` %>
+        <%- `body { font-family: ${fontFamily}; }` %>
         <%- "</style>" %>
         <% } %>
     </head>

package/template/report/daily.ejs CHANGED Viewed

@@ -135,9 +135,9 @@
             }
         </style>
-        <% if (fontFamily && fontFamily.length > 0) { %>
+        <% if (fontFamily) { %>
         <%- "<style>" %>
-        <%- `body { font-family: ${fontFamily.map(f => `${f}`).join(", ")}; }` %>
+        <%- `body { font-family: ${fontFamily}; }` %>
         <%- "</style>" %>
         <% } %>
     </head>