@hieuzest/koishi-plugin-mahjongpub 0.2.4 → 0.2.5

package/lib/index.js

@@ -371,7 +371,7 @@ var ContestManager = class {
       this.extra[cid].subscribers.delete(session.cid);
       return "Finished.";
     });
-    ctx.command("mahjongpub.manager.start [cls:number]").channelFields(["mahjongpub/bind-contest"]).action(async ({ session }, cls) => {
+    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);
@@ -385,7 +385,7 @@ var ContestManager = class {
         const rounds = await this.mahjongpub.getRounds(cid);
         for (const r of Object.values(rounds)) {
           if (r.round !== contest.c_round) continue;
-          await this.startMatch(cid, r.t_class);
+          await this.startMatch(cid, r.t_class, 0, options.force);
           await (0, import_koishi2.sleep)(config.startInterval);
         }
       }
@@ -422,8 +422,8 @@ var ContestManager = class {
   static inject = ["server", "mahjong", "mahjong.database", "mahjongpub", "sendMessage", "zx-dhs"];
   mahjongpub;
   extra = /* @__PURE__ */ Object.create(null);
-  async _startMatch(cid, cls, timeout = 0, tag) {
-    tag ||= `${cls}组`;
+  async _startMatch(cid, cls, timeout = 0, force = false) {
+    const tag = `${cls}组`;
     if (!this.extra[cid] || this.extra[cid]?.stopCls.has(cls)) {
       this.ctx.logger.info(`try starting match ${cid}-${cls}, but stopped`);
       return;
@@ -438,7 +438,15 @@ var ContestManager = class {
       cls
     }).sort({ rowi: -1 }).limit(1).toArray();
     if (lastRecord && !lastRecord._finished) {
-      this.extra[cid]?.broadcast(`[${tag}] 发现进行中的比赛，已忽略`);
+      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}] 发现进行中的比赛，已忽略`);
+        return;
+      }
+    }
+    if (lastRecord && lastRecord.results?.some((x) => x.num < 0) && !this.config.allowNegativeScore) {
       return;
     }
     const rowi = lastRecord ? lastRecord.rowi + 1 : 0;
@@ -464,12 +472,16 @@ var ContestManager = class {
       }
     }
   }
-  async startMatch(cid, cls, timeout = 0, tag) {
+  async startMatch(cid, cls, timeout = 0, force = false) {
+    const tag = `${cls}组`;
     try {
-      return await this._startMatch(cid, cls, timeout, tag);
+      return await this._startMatch(cid, cls, timeout, force);
     } catch (e) {
       this.ctx.logger.warn(`start match ${cid}-${cls} internal failed: `, e);
       this.extra[cid]?.broadcast(`[${tag}] 失败：内部错误`);
+      if (timeout < this.config.startMaxTimeout) {
+        this.ctx.setTimeout(() => this.startMatch(cid, cls, timeout + this.config.startTimeoutInterval, force), this.config.startTimeoutInterval);
+      }
     }
   }
   async onMatchFinished(record) {
@@ -488,7 +500,8 @@ var ContestManager = class {
     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("比赛结束间隔")
+    finishInterval: import_koishi2.Schema.number().default(import_koishi2.Time.second * 10).description("比赛结束间隔"),
+    allowNegativeScore: import_koishi2.Schema.boolean().default(false).description("允许负分")
   });
 })(ContestManager || (ContestManager = {}));
 

package/lib/manager.d.ts

@@ -35,8 +35,8 @@ 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>;
+    _startMatch(cid: number, cls: number, timeout?: number, force?: boolean): Promise<void>;
+    startMatch(cid: number, cls: number, timeout?: number, force?: boolean): Promise<void>;
     onMatchFinished(record: MatchRecord): Promise<void>;
 }
 export declare namespace ContestManager {
@@ -46,6 +46,7 @@ export declare namespace ContestManager {
         startTimeoutInterval: number;
         startMaxTimeout: number;
         finishInterval: number;
+        allowNegativeScore: boolean;
     }
     const Config: Schema<Config>;
 }

package/package.json

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