@hieuzest/koishi-plugin-mahjongpub 0.2.1 → 0.2.3

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import { Context, Dict, Schema, Service } from 'koishi';
 import { ContestAdmin, TeamAdmin } from './api';
+import { ContestManager } from './manager';
 declare module 'koishi' {
     interface Context {
         mahjongpub: MahjongPub;
@@ -39,6 +40,7 @@ export declare namespace MahjongPub {
         endpoint: string;
         batchInterval: number;
         batchCount: number;
+        manager: ContestManager.Config;
     }
     const Config: Schema<Config>;
 }

package/lib/index.js

@@ -261,7 +261,8 @@ var MahjongPub = class _MahjongPub {
       params: {
         t: "admin",
         cid
-      }
+      },
+      responseType: "json"
     });
   }
   async getTeams(cid) {
@@ -269,7 +270,8 @@ var MahjongPub = class _MahjongPub {
       params: {
         t: "team",
         cid
-      }
+      },
+      responseType: "json"
     }).then((teams) => (0, import_koishi.mapValues)(teams, (team) => ({
       ...team,
       players: [...team.t_player?.split(/\s+/) ?? [], ...team.t_sub?.split(/\s+/) ?? []]
@@ -280,11 +282,14 @@ var MahjongPub = class _MahjongPub {
       params: {
         t: "class",
         cid
-      }
-    }).then((rounds) => rounds.map((round) => [round.rid, {
-      ...round,
-      tids: [round.tid1, round.tid2, round.tid3, round.tid4]
-    }])));
+      },
+      responseType: "json"
+    }).then((rounds) => {
+      return rounds.map((round) => [round.rid, {
+        ...round,
+        tids: [round.tid1, round.tid2, round.tid3, round.tid4]
+      }]);
+    }));
   }
   async getMatches(cid, round) {
     return await this.http.get(`${this.serverUri}/api/data.php`, {
@@ -292,7 +297,8 @@ var MahjongPub = class _MahjongPub {
         t: "c_data",
         cid,
         r: round
-      }
+      },
+      responseType: "json"
     });
   }
   async getAllMatches(cid) {
@@ -302,7 +308,8 @@ var MahjongPub = class _MahjongPub {
         t: "multi_log",
         cid,
         r: [...Array(contest.c_round).keys()].map((x) => x + 1).map((x) => x.toString()).join(",")
-      }
+      },
+      responseType: "json"
     });
   }
   static cacheOptions = {
@@ -340,7 +347,7 @@ var ContestExtra = class {
   subscribers;
   stopCls;
   async broadcast(msg) {
-    this.subscribers.forEach((channel) => this.ctx.sendMessage(channel, msg).catch(import_koishi2.noop));
+    this.subscribers.forEach((channel) => this.ctx.sendMessage(channel, msg).catch((e) => this.ctx.logger.debug(e)));
   }
 };
 var ContestManager = class {
@@ -348,8 +355,8 @@ var ContestManager = class {
     this.ctx = ctx;
     this.config = config;
     this.mahjongpub = MahjongPub.new(ctx);
-    ctx.command("contest.manager", { authority: 3 }).action(import_koishi2.noop);
-    ctx.command("contest.manager.init").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").action(async ({ session, options }) => {
+    ctx.command("mahjongpub.manager", { authority: 3 }).action(import_koishi2.noop);
+    ctx.command("mahjongpub.manager.init").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").action(async ({ session, options }) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
       if (!cid) return "Unauthorized.";
       this.extra[cid] ??= new ContestExtra(ctx);
@@ -357,7 +364,14 @@ var ContestManager = class {
       if (options.clear) this.extra[cid].stopCls.clear();
       return "Finished.";
     });
-    ctx.command("contest.manager.start [cls:number]").channelFields(["mahjongpub/bind-contest"]).action(async ({ session }, cls) => {
+    ctx.command("mahjongpub.manager.deinit").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").action(async ({ session, options }) => {
+      const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
+      if (!cid) return "Unauthorized.";
+      this.extra[cid] ??= new ContestExtra(ctx);
+      this.extra[cid].subscribers.delete(session.cid);
+      return "Finished.";
+    });
+    ctx.command("mahjongpub.manager.start [cls:number]").channelFields(["mahjongpub/bind-contest"]).action(async ({ session }, cls) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
       if (!cid) return "Unauthorized.";
       this.extra[cid] ??= new ContestExtra(ctx);
@@ -372,11 +386,11 @@ var ContestManager = class {
         for (const r of Object.values(rounds)) {
           if (r.round !== contest.c_round) continue;
           await this.startMatch(cid, r.t_class);
-          await (0, import_koishi2.sleep)(1e3);
+          await (0, import_koishi2.sleep)(config.startInterval);
         }
       }
     });
-    ctx.command("contest.manager.stop [cls:number]").channelFields(["mahjongpub/bind-contest"]).action(async ({ session }, cls) => {
+    ctx.command("mahjongpub.manager.stop [cls:number]").channelFields(["mahjongpub/bind-contest"]).action(async ({ session }, cls) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
       if (!cid) return "Unauthorized/";
       this.extra[cid] ??= new ContestExtra(ctx);
@@ -405,12 +419,12 @@ var ContestManager = class {
   static {
     __name(this, "ContestManager");
   }
-  static inject = ["server", "mahjong", "mahjong.database", "mahjongpub", "sendMessage"];
+  static inject = ["server", "mahjong", "mahjong.database", "mahjongpub", "sendMessage", "zx-dhs"];
   mahjongpub;
   extra = /* @__PURE__ */ Object.create(null);
-  async startMatch(cid, cls, timeout, tag) {
+  async _startMatch(cid, cls, timeout = 0, tag) {
     tag ||= `${cls}组`;
-    if (this.extra[cid]?.stopCls.has(cls)) {
+    if (!this.extra[cid] || this.extra[cid]?.stopCls.has(cls)) {
       this.ctx.logger.info(`try starting match ${cid}-${cls}, but stopped`);
       return;
     }
@@ -429,29 +443,49 @@ var ContestManager = class {
     }
     const rowi = lastRecord ? lastRecord.rowi + 1 : 0;
     const round = Object.values(rounds).find((x) => x.round === contest.c_round && x.t_class === cls);
-    const players = round.tids.map((tid) => teams[tid].players[rowi]);
+    const players = round.tids.map((tid) => teams[tid].players[Math.floor(rowi / 2)]);
+    if (!players.every((x) => x)) {
+      this.extra[cid]?.broadcast(`[${tag}] 失败： 名单未填写`);
+      return;
+    }
     try {
+      this.ctx.logger.info(`starting match ${cid}-${cls}, players ${players.map((x, i) => `${x} ${lastRecord ? lastRecord.results?.[i].num : 1e5}`).join(", ")}`);
       await this.ctx["zx-dhs"].startMatch(+round.code, players.map((x, i) => import_lobby.Player.fromPattern(x, lastRecord ? lastRecord.results?.[i].num : 1e5)));
       this.extra[cid]?.broadcast(`[${tag}] 成功：` + players.join("，"));
     } catch (e) {
-      if (e instanceof import_lobby.PlayerNotFoundError) {
-        this.extra[cid]?.broadcast(`[${tag}] ` + e.message + ` <timeout=${timeout}>`);
-        if (timeout < 600) this.ctx.setTimeout(() => this.startMatch(cid, cls, timeout + 30), 30 * 1e3);
+      if (e instanceof import_lobby.DHSError) {
+        this.extra[cid]?.broadcast(`[${tag}] 失败：` + e.message + ` (timeout=${timeout / import_koishi2.Time.second}s)`);
+        if (timeout < this.config.startMaxTimeout) {
+          this.ctx.setTimeout(() => this.startMatch(cid, cls, timeout + this.config.startTimeoutInterval), this.config.startTimeoutInterval);
+        }
       } else {
-        throw e;
+        this.ctx.logger.warn(`start match ${cid}-${cls} failed: ${e.message}`);
+        this.extra[cid]?.broadcast(`[${tag}] 失败：` + e.message);
       }
     }
   }
+  async startMatch(cid, cls, timeout = 0, tag) {
+    try {
+      return await this._startMatch(cid, cls, timeout, tag);
+    } catch (e) {
+      this.ctx.logger.warn(`start match ${cid}-${cls} internal failed: `, e);
+      this.extra[cid]?.broadcast(`[${tag}] 失败：内部错误`);
+    }
+  }
   async onMatchFinished(record) {
     this.extra[record.cid]?.broadcast(`对局完成：
 ` + record.results.map((x) => `${x.name} ${x.num}`).join("\n"));
-    await (0, import_koishi2.sleep)(2e3);
+    await (0, import_koishi2.sleep)(this.config.finishInterval);
     return this.startMatch(+record.cid, record.cls);
   }
 };
 ((ContestManager2) => {
   ContestManager2.Config = import_koishi2.Schema.object({
-    token: import_koishi2.Schema.string()
+    token: import_koishi2.Schema.string(),
+    startInterval: import_koishi2.Schema.number().default(import_koishi2.Time.second).description("比赛开始间隔"),
+    startTimeoutInterval: import_koishi2.Schema.number().default(import_koishi2.Time.second * 30).description("比赛开始重试间隔"),
+    startMaxTimeout: import_koishi2.Schema.number().default(import_koishi2.Time.second * 600).description("比赛开始最大重试间隔"),
+    finishInterval: import_koishi2.Schema.number().default(import_koishi2.Time.second * 10).description("比赛结束间隔")
   });
 })(ContestManager || (ContestManager = {}));
 
@@ -468,7 +502,7 @@ var MahjongPub2 = class extends import_koishi3.Service {
     super(ctx, "mahjongpub", true);
     this.ctx = ctx;
     this.config = config;
-    ctx.plugin(ContestManager);
+    ctx.plugin(ContestManager, config.manager);
     ctx.i18n.define("zh-CN", require_zh_CN());
     ctx.model.extend("user", {
       "mahjongpub/bind-team": "string",
@@ -840,7 +874,8 @@ var MahjongPub2 = class extends import_koishi3.Service {
     informNotbind: import_koishi3.Schema.boolean().default(false),
     endpoint: import_koishi3.Schema.string().default("https://cdn.r-mj.com/"),
     batchInterval: import_koishi3.Schema.natural().default(300),
-    batchCount: import_koishi3.Schema.natural().default(10)
+    batchCount: import_koishi3.Schema.natural().default(10),
+    manager: ContestManager.Config
   });
 })(MahjongPub2 || (MahjongPub2 = {}));
 var index_default = MahjongPub2;

package/lib/manager.d.ts

@@ -35,12 +35,17 @@ export declare class ContestManager {
     mahjongpub: MahjongPub;
     extra: Dict<ContestExtra>;
     constructor(ctx: Context, config: ContestManager.Config);
+    _startMatch(cid: number, cls: number, timeout?: number, tag?: string): Promise<void>;
     startMatch(cid: number, cls: number, timeout?: number, tag?: string): Promise<void>;
     onMatchFinished(record: MatchRecord): Promise<void>;
 }
 export declare namespace ContestManager {
     interface Config {
         token?: string;
+        startInterval: number;
+        startTimeoutInterval: number;
+        startMaxTimeout: number;
+        finishInterval: number;
     }
     const Config: Schema<Config>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hieuzest/koishi-plugin-mahjongpub",
   "description": "Mahjong.pub API",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [