@hieuzest/koishi-plugin-mahjongpub 0.2.8 → 0.2.10

package/lib/index.js

@@ -241,6 +241,7 @@ var ContestAdmin = class {
 
 // src/manager.ts
 var import_koishi2 = require("koishi");
+var import_api = require("@hieuzest/koishi-plugin-majsoul-dhs/api");
 var import_lobby = require("@hieuzest/koishi-plugin-riichi-city/lobby");
 
 // src/mahjongpub.ts
@@ -346,22 +347,37 @@ var ContestExtra = class {
   }
   subscribers;
   stopCls;
+  type;
+  round;
+  lobby;
+  ver = 0;
   async broadcast(msg) {
     this.subscribers.forEach((channel) => this.ctx.sendMessage(channel, msg).catch((e) => this.ctx.logger.debug(e)));
   }
 };
+function getRowPlayer(contest, team, rowi) {
+  const roleList = contest.t_type.split(/\s+/);
+  const roleSet = new Set(roleList).values().toArray();
+  const index = roleSet.indexOf(roleList[rowi]);
+  return team.players[index]?.split("##", 1)[0];
+}
+__name(getRowPlayer, "getRowPlayer");
 var ContestManager = class {
   constructor(ctx, config) {
     this.ctx = ctx;
     this.config = config;
     this.mahjongpub = MahjongPub.new(ctx);
     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 }) => {
+    ctx.command("mahjongpub.manager.init").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").option("type", "-t [type:string]").option("ver", "-v [ver:number]").option("round", "-r [round:number]").option("lobby", "-l [lobby:string]").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.add(session.cid);
       if (options.clear) this.extra[cid].stopCls.clear();
+      if (options.type) this.extra[cid].type = options.type;
+      if (!(0, import_koishi2.isNullable)(options.ver)) this.extra[cid].ver = options.ver;
+      if (!(0, import_koishi2.isNullable)(options.round)) this.extra[cid].round = options.round;
+      if (!(0, import_koishi2.isNullable)(options.lobby)) this.extra[cid].lobby = options.lobby;
       return "Finished.";
     });
     ctx.command("mahjongpub.manager.deinit").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").action(async ({ session, options }) => {
@@ -374,17 +390,17 @@ var ContestManager = class {
     ctx.command("mahjongpub.manager.start [cls:number]").channelFields(["mahjongpub/bind-contest"]).option("force", "-f").action(async ({ session, options }, cls) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
       if (!cid) return "Unauthorized.";
-      this.extra[cid] ??= new ContestExtra(ctx);
-      this.extra[cid].subscribers.add(session.cid);
+      const cextra = this.extra[cid] ??= new ContestExtra(ctx);
+      cextra.subscribers.add(session.cid);
       if (cls) {
-        this.extra[cid].stopCls.delete(cls);
+        cextra.stopCls.delete(cls);
         await this.startMatch(cid, cls);
       } else {
-        this.extra[cid].stopCls.clear();
+        cextra.stopCls.clear();
         const contest = await this.mahjongpub.getContest(cid);
         const rounds = await this.mahjongpub.getRounds(cid);
         for (const r of Object.values(rounds)) {
-          if (r.round !== contest.c_round) continue;
+          if (r.round !== (cextra.round ?? contest.c_round)) continue;
           await this.startMatch(cid, r.t_class, 0, options.force);
           await (0, import_koishi2.sleep)(config.startInterval);
         }
@@ -393,15 +409,15 @@ var ContestManager = class {
     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);
+      const cextra = this.extra[cid] ??= new ContestExtra(ctx);
       if (cls) {
-        this.extra[cid].stopCls.add(cls);
+        cextra.stopCls.add(cls);
       } else {
         const contest = await this.mahjongpub.getContest(cid);
         const rounds = await this.mahjongpub.getRounds(cid);
         for (const r of Object.values(rounds)) {
-          if (r.round !== contest.c_round) continue;
-          this.extra[cid].stopCls.add(r.t_class);
+          if (r.round !== (cextra.round ?? contest.c_round)) continue;
+          cextra.stopCls.add(r.t_class);
         }
       }
       return "Finished.";
@@ -419,12 +435,13 @@ var ContestManager = class {
   static {
     __name(this, "ContestManager");
   }
-  static inject = ["server", "mahjong", "mahjong.database", "mahjongpub", "sendMessage", "zx-dhs"];
+  static inject = ["server", "mahjong", "mahjong.database", "mahjongpub", "sendMessage", "zx-dhs", "majsoul-dhs"];
   mahjongpub;
   extra = /* @__PURE__ */ Object.create(null);
   async _startMatch(cid, cls, timeout = 0, force = false) {
+    const cextra = this.extra[cid];
     const tag = `${cls}组`;
-    if (!this.extra[cid] || this.extra[cid]?.stopCls.has(cls)) {
+    if (!cextra || cextra.stopCls.has(cls)) {
       this.ctx.logger.info(`try starting match ${cid}-${cls}, but stopped`);
       return;
     }
@@ -434,41 +451,57 @@ var ContestManager = class {
     const teams = await this.mahjongpub.getTeams(cid);
     const [lastRecord] = await this.ctx.mahjong.database.db("scoreboard").collection("matches").find({
       cid: `${cid}`,
-      round: +contest.c_round,
-      cls
+      round: cextra.round ?? +contest.c_round,
+      cls,
+      ver: cextra.ver
     }).sort({ rowi: -1 }).limit(1).toArray();
     if (lastRecord && !lastRecord._finished) {
       if (force) {
         await this.ctx.mahjong.database.db("scoreboard").collection("matches").deleteOne({ _id: lastRecord._id });
         this.ctx.setTimeout(() => this.startMatch(cid, cls, timeout), 0);
       } else {
-        this.extra[cid]?.broadcast(`[${tag}] 发现进行中的比赛，已忽略`);
+        cextra.broadcast(`[${tag}] 发现进行中的比赛，已忽略`);
         return;
       }
     }
-    if (lastRecord && lastRecord.results?.some((x) => x.num < 0) && !this.config.allowNegativeScore) {
+    if (cextra.type === "ti" && lastRecord && lastRecord.results?.some((x) => x.num < 0) && !this.config.allowNegativeScore) {
       return;
     }
     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[Math.floor(rowi / 2)]).map((x) => x?.split("##", 1)[0]);
+    if (rowi >= contest.t_type.split(/\s+/).filter((x) => x).length) {
+      cextra.broadcast(`[${tag}] 已经全部完成`);
+      return;
+    }
+    const round = Object.values(rounds).find((x) => x.round === (cextra.round ?? contest.c_round) && x.t_class === cls);
+    const players = round.tids.map((tid) => getRowPlayer(contest, teams[tid], rowi));
     if (!players.every((x) => x)) {
-      this.extra[cid]?.broadcast(`[${tag}] 失败： 名单未填写`);
+      cextra.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("，"));
+      if (cextra.type === "ti") {
+        this.ctx.logger.info(`starting ti match ${cid}-${cls}, players ${players.map((x, i) => `${x} ${lastRecord ? lastRecord.results?.[i].num : 1e5}`).join(", ")}`);
+        await this.ctx["zx-dhs"].startMatch(
+          +(cextra.lobby ?? round.code),
+          players.map((x, i) => import_lobby.Player.fromPattern(x, lastRecord ? lastRecord.results?.[i].num : 1e5))
+        );
+      } else if (cextra.type === "ssb") {
+        this.ctx.logger.info(`starting ssb match ${cid}-${cls}, players ${players.join(", ")}`);
+        await this.ctx["majsoul-dhs"].startMatch(+(cextra.lobby ?? round.code), players.map((x) => import_api.Player.fromPattern(x, 25e3)));
+      }
+      cextra.broadcast(`[${tag}] 成功：` + players.join("，"));
     } catch (e) {
-      if (e instanceof import_lobby.DHSError) {
-        this.extra[cid]?.broadcast(`[${tag}] 失败：` + e.message + ` (timeout=${timeout / import_koishi2.Time.second}s)`);
+      if (e instanceof import_lobby.DHSError || e instanceof import_api.DHSError) {
+        cextra.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 {
+          this.ctx.logger.warn(`start match ${cid}-${cls} exceed max retires`);
+          cextra.broadcast(`[${tag}] 失败：超过最大重试时间 【${players.join(" ")}】`);
         }
       } else {
         this.ctx.logger.warn(`start match ${cid}-${cls} failed: ${e.message}`);
-        this.extra[cid]?.broadcast(`[${tag}] 失败：` + e.message);
+        cextra.broadcast(`[${tag}] 失败：` + e.message);
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hieuzest/koishi-plugin-mahjongpub",
   "description": "Mahjong.pub API",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -16,6 +16,7 @@
   ],
   "peerDependencies": {
     "@hieuzest/koishi-plugin-riichi-city": "^0.5.2",
+    "@hieuzest/koishi-plugin-majsoul-dhs": "^2.5.0",
     "koishi": "^4.17.1"
   },
   "dependencies": {