@hieuzest/koishi-plugin-mahjongpub 0.2.11 → 0.2.13

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import { Context, Dict, Schema, Service } from 'koishi';
 import { ContestAdmin, TeamAdmin } from './api';
 import { ContestManager } from './manager';
+import { MahjongPub as Contest } from './mahjongpub';
 declare module 'koishi' {
     interface Context {
         mahjongpub: MahjongPub;
@@ -26,6 +27,7 @@ export declare class MahjongPub extends Service {
     config: MahjongPub.Config;
     teams: Dict<TeamAdmin>;
     contests: Dict<ContestAdmin>;
+    contest: Contest;
     constructor(ctx: Context, config: MahjongPub.Config);
     getTeam(pw: string): Promise<TeamAdmin>;
     getContest(cid: string, pw: string): Promise<ContestAdmin>;

package/lib/index.js

@@ -242,6 +242,7 @@ var ContestAdmin = class {
 // src/manager.ts
 var import_koishi2 = require("koishi");
 var import_api = require("@hieuzest/koishi-plugin-majsoul-dhs/api");
+var import_api2 = require("@hieuzest/koishi-plugin-riichi-city/api");
 var import_lobby = require("@hieuzest/koishi-plugin-riichi-city/lobby");
 
 // src/mahjongpub.ts
@@ -321,7 +322,7 @@ var MahjongPub = class _MahjongPub {
       maxAge: 60
     },
     "getTeams": {
-      maxAge: 30
+      maxAge: 15
     },
     "getMatches": {
       maxAge: 120
@@ -350,15 +351,18 @@ var ContestExtra = class {
   type;
   round;
   lobby;
+  playerIndex;
   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()];
-  const index = roleSet.indexOf(roleList[rowi]);
+function getRowPlayer(contest, team, rowi, index) {
+  if ((0, import_koishi2.isNullable)(index)) {
+    const roleList = contest.t_type.split(/\s+/);
+    const roleSet = [...new Set(roleList).values()];
+    index = roleSet.indexOf(roleList[rowi]);
+  }
   return team.players[index]?.split("##", 1)[0];
 }
 __name(getRowPlayer, "getRowPlayer");
@@ -368,7 +372,7 @@ var ContestManager = class {
     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").option("type", "-t [type:string]").option("ver", "-v [ver:number]").option("round", "-r [round:number]").option("lobby", "-l [lobby:string]").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]").option("index", "-i [index:number]").action(async ({ session, options }) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
       if (!cid) return "Unauthorized.";
       this.extra[cid] ??= new ContestExtra(ctx);
@@ -378,6 +382,7 @@ var ContestManager = class {
       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;
+      if (!(0, import_koishi2.isNullable)(options.index)) this.extra[cid].playerIndex = options.index;
       return "Finished.";
     });
     ctx.command("mahjongpub.manager.deinit").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").action(async ({ session, options }) => {
@@ -387,14 +392,16 @@ var ContestManager = class {
       this.extra[cid].subscribers.delete(session.cid);
       return "Finished.";
     });
-    ctx.command("mahjongpub.manager.start [cls:number]").channelFields(["mahjongpub/bind-contest"]).option("force", "-f").action(async ({ session, options }, cls) => {
+    ctx.command("mahjongpub.manager.start [...cls:number]").channelFields(["mahjongpub/bind-contest"]).option("force", "-f").action(async ({ session, options }, ...clsz) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
       if (!cid) return "Unauthorized.";
       const cextra = this.extra[cid] ??= new ContestExtra(ctx);
       cextra.subscribers.add(session.cid);
-      if (cls) {
-        cextra.stopCls.delete(cls);
-        await this.startMatch(cid, cls);
+      if (clsz.length) {
+        for (const cls of clsz) {
+          cextra.stopCls.delete(cls);
+          await this.startMatch(cid, cls, 0, options.force);
+        }
       } else {
         cextra.stopCls.clear();
         const contest = await this.mahjongpub.getContest(cid);
@@ -406,12 +413,14 @@ var ContestManager = class {
         }
       }
     });
-    ctx.command("mahjongpub.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 }, ...clsz) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
-      if (!cid) return "Unauthorized/";
+      if (!cid) return "Unauthorized.";
       const cextra = this.extra[cid] ??= new ContestExtra(ctx);
-      if (cls) {
-        cextra.stopCls.add(cls);
+      if (clsz.length) {
+        for (const cls of clsz) {
+          cextra.stopCls.add(cls);
+        }
       } else {
         const contest = await this.mahjongpub.getContest(cid);
         const rounds = await this.mahjongpub.getRounds(cid);
@@ -473,31 +482,36 @@ var ContestManager = class {
       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));
+    const players = round.tids.map((tid) => getRowPlayer(contest, teams[tid], rowi, cextra.playerIndex));
     if (!players.every((x) => x)) {
       cextra.broadcast(`[${tag}] 失败： 名单未填写`);
       return;
     }
+    let failPatterns;
     try {
       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(", ")}`);
+        failPatterns = players.map((x, i) => `${x} ${lastRecord ? lastRecord.results?.[i].num : 1e5}`).join(", ");
+        this.ctx.logger.info(`starting ti match ${cid}-${cls}, players ${failPatterns}`);
         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(", ")}`);
+        failPatterns = players.join(", ");
+        this.ctx.logger.info(`starting ssb match ${cid}-${cls}, players ${failPatterns}`);
         await this.ctx["majsoul-dhs"].startMatch(+(cextra.lobby ?? round.code), players.map((x) => import_api.Player.fromPattern(x, 25e3)));
+      } else {
+        throw new Error(`unknown contest type: ${cextra.type}`);
       }
-      cextra.broadcast(`[${tag}] 成功：` + players.join("，"));
+      cextra.broadcast(`[${tag}] 成功：` + players.join(", "));
     } catch (e) {
-      if (e instanceof import_lobby.DHSError || e instanceof import_api.DHSError) {
+      if (e instanceof import_lobby.DHSError || e instanceof import_api2.RiichiCityError || 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(" ")}】`);
+          cextra.broadcast(`[${tag}] 失败：超过最大重试时间 【${failPatterns}】`);
         }
       } else {
         this.ctx.logger.warn(`start match ${cid}-${cls} failed: ${e.message}`);
@@ -553,6 +567,7 @@ var MahjongPub2 = class extends import_koishi3.Service {
     this.config = config;
     ctx.plugin(ContestManager, config.manager);
     ctx.i18n.define("zh-CN", require_zh_CN());
+    this.contest = MahjongPub.new(ctx);
     ctx.model.extend("user", {
       "mahjongpub/bind-team": "string",
       "mahjongpub/bind-teams": "json"
@@ -813,6 +828,31 @@ var MahjongPub2 = class extends import_koishi3.Service {
       }
     });
     if (ctx.get("mahjong.database")) {
+      ctx.command("mahjongpub.database.record.last <round:natural>", { authority: 3 }).option("rowi", "-i <rowi:integer>", { fallback: -1 }).option("ver", "-v <ver:integer>", { fallback: 0 }).channelFields(["mahjongpub/bind-contest"]).action(async ({ session, options }, round, cls) => {
+        const [cid] = [session.channel["mahjongpub/bind-contest"]];
+        try {
+          const cteams = await this.contest.getTeams(+cid);
+          const record = await ctx.mahjong.database.db("scoreboard").collection("matches").find({
+            cid,
+            round,
+            ver: options.ver,
+            ...options.rowi === -1 ? {} : { rowi: options.rowi }
+          }).sort({ cls: 1, rowi: -1 }).toArray();
+          if (!record.length) return session.text(".failed");
+          const filtered = [];
+          const seenCls = /* @__PURE__ */ new Set();
+          record.forEach((r) => {
+            if (!seenCls.has(r.cls)) {
+              filtered.push(r);
+              seenCls.add(r.cls);
+            }
+          });
+          return filtered.map((r) => `[${r.cls}-${r.rowi + 1}] ` + r.results.map((x, i) => `${cteams[r.tids[i]].t_name} ${x.num}`).join(" / ")).join("\n");
+        } catch (e) {
+          ctx.logger.warn(e);
+          return session.text(".failed");
+        }
+      });
       ctx.command("mahjongpub.database.record.get <round:natural> <cls:natural>", { authority: 3 }).option("rowi", "-i <rowi:integer>", { fallback: -1 }).option("ver", "-v <ver:integer>", { fallback: 0 }).channelFields(["mahjongpub/bind-contest"]).action(async ({ session, options }, round, cls) => {
         const [cid] = [session.channel["mahjongpub/bind-contest"]];
         try {
@@ -897,6 +937,7 @@ var MahjongPub2 = class extends import_koishi3.Service {
   }
   teams = {};
   contests = {};
+  contest;
   async getTeam(pw) {
     return new TeamAdmin(this.ctx, pw, this.config);
   }

package/lib/mahjongpub.d.ts

@@ -17,7 +17,7 @@ export declare class MahjongPub {
             readonly maxAge: 60;
         };
         readonly getTeams: {
-            readonly maxAge: 30;
+            readonly maxAge: 15;
         };
         readonly getMatches: {
             readonly maxAge: 120;

package/lib/manager.d.ts

@@ -28,6 +28,7 @@ declare class ContestExtra {
     type: 'ti' | 'ssb';
     round?: number;
     lobby?: string;
+    playerIndex?: number;
     ver: number;
     constructor(ctx: Context);
     broadcast(msg: string): Promise<void>;

package/package.json

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