@hieuzest/koishi-plugin-mahjongpub 0.1.20 → 0.2.0

package/lib/api.d.ts

@@ -1,8 +1,8 @@
 import { Context, Dict, Quester } from 'koishi';
 export interface Team {
     pw?: string;
-    tid: string;
-    cid?: string;
+    tid: number;
+    cid?: number;
     name: string;
     players: string[];
     qq?: string[];
@@ -12,8 +12,8 @@ export declare class TeamAdmin implements Team {
     options: {
         endpoint: string;
     };
-    tid: string;
-    cid: string;
+    tid: number;
+    cid: number;
     name: string;
     description: string;
     players: string[];
@@ -28,16 +28,16 @@ export declare class TeamAdmin implements Team {
 }
 declare namespace TeamAdmin {
     interface Payload {
-        tid: string;
+        tid: number;
         t_name: string;
         t_player?: string;
         t_sub?: string;
         t_pw: string;
         t_join_time?: string;
         t_join_ip?: string;
-        t_type?: string;
+        t_type?: number;
         t_ps?: string;
-        cid: string;
+        cid: number;
         qq?: string;
         ls_ip?: string;
         ls_time?: string;
@@ -45,19 +45,22 @@ declare namespace TeamAdmin {
     }
 }
 export declare class ContestAdmin {
-    cid: string;
+    cid: number;
     pw: string;
     options: {
         endpoint: string;
     };
     name: string;
     teams: Dict<Team>;
+    round: number;
     http: Quester;
     raw?: ContestAdmin.Payload;
-    constructor(ctx: Context, cid: string, pw: string, options: {
+    constructor(ctx: Context, cid: number, pw: string, options: {
         endpoint: string;
     });
     read(force?: boolean): Promise<void>;
+    getRounds(): Promise<Record<number, Record<number, Contest.Round>>>;
+    getRecords(round: number): Promise<Contest.Records>;
     getRoundRecord(round: number, cls: number): Promise<ContestAdmin.MatchRoundRecord>;
     updateRoundRecord(record: ContestAdmin.MatchRoundRecord): Promise<string>;
 }
@@ -67,13 +70,13 @@ declare namespace ContestAdmin {
             c_name: string;
             c_gonggao: string;
             c_pad: string;
-            c_round: string;
-            c_s_po: string;
-            c_sub_t: string;
-            cid: string;
-            r_type: string;
-            t_max: string;
-            t_sub: string;
+            c_round: number;
+            c_s_po: number;
+            c_sub_t: number;
+            cid: number;
+            r_type: number;
+            t_max: number;
+            t_sub: number;
             t_type: string;
         };
         c_team: TeamAdmin.Payload[];
@@ -88,10 +91,85 @@ declare namespace ContestAdmin {
         logurl: string;
     }
     interface MatchRoundRecord {
-        cid: string;
+        cid: number;
         cls: number;
         rnd: number;
         matches: MatchRecord[];
     }
+    interface RoundPayload {
+        clsmark: string;
+        code: string;
+        rid: number;
+        round: number;
+        t_class: number;
+        tid1: number;
+        tid2: number;
+        tid3: number;
+        tid4: number;
+    }
+    interface Round {
+        rid: number;
+        round: number;
+        cls: number;
+        code: string;
+        tids: number[];
+    }
+}
+declare namespace Contest {
+    interface RoundPayload {
+        clsmark: string;
+        code: string;
+        rid: number;
+        round: number;
+        t_class: number;
+        tid1: number;
+        tid2: number;
+        tid3: number;
+        tid4: number;
+    }
+    interface Round {
+        rid: number;
+        round: number;
+        cls: number;
+        code: string;
+        tids: number[];
+    }
+    interface MatchPayload {
+        inx: number;
+        cid: number;
+        rowi: number;
+        name1: string;
+        num1: number;
+        name2: string;
+        num2: number;
+        name3: string;
+        num3: number;
+        name4: string;
+        num4: number;
+        url: string;
+        pint1: number;
+        pint2: number;
+        pint3: number;
+        pint4: number;
+        rid: number;
+        round: number;
+        i_time: string;
+    }
+    interface Match {
+        inx: number;
+        cid: number;
+        rowi: number;
+        players: {
+            name: string;
+            num: number;
+            point: number;
+        }[];
+        url: string;
+        rid: number;
+        round: number;
+        time: string;
+    }
+    type RecordsPayload = Record<number, MatchPayload[]>;
+    type Records = Record<number, Match[]>;
 }
 export {};

package/lib/index.d.ts

@@ -1,6 +1,9 @@
-import { Context, Dict, Schema } from 'koishi';
+import { Context, Dict, Schema, Service } from 'koishi';
 import { ContestAdmin, TeamAdmin } from './api';
 declare module 'koishi' {
+    interface Context {
+        mahjongpub: MahjongPub;
+    }
     interface User {
         'mahjongpub/bind-team': string;
         'mahjongpub/bind-teams': Dict<string>;
@@ -17,9 +20,9 @@ declare module '@koishijs/cache' {
         teams: TeamAdmin;
     }
 }
-export declare class MahjongPub {
-    private ctx;
-    private config;
+export declare class MahjongPub extends Service {
+    protected ctx: Context;
+    config: MahjongPub.Config;
     teams: Dict<TeamAdmin>;
     contests: Dict<ContestAdmin>;
     constructor(ctx: Context, config: MahjongPub.Config);

package/lib/index.js

@@ -23,7 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.yml
 var require_zh_CN = __commonJS({
   "src/locales/zh-CN.yml"(exports2, module2) {
-    module2.exports = { commands: { "mahjongpub.team.bind": { description: "绑定队伍", messages: { failed: "绑定失败", success: "成功： [{cid}:{tid}] {name}" } }, "mahjongpub.team.unbind": { description: "解除绑定", messages: { notbind: "未绑定", success: "成功" } }, "mahjongpub.team.password": { description: "查看密码", messages: { notbind: "未绑定", output: "密码： {0}" } }, "mahjongpub.team.stats": { description: "查看队伍信息", messages: { notbind: "未绑定", failed: "失败", output: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.team.desc": { description: "队伍简介", messages: { notbind: "未绑定", failed: "失败", output: "- [{cid}:{tid}] {name}\n{description}\n" } }, "mahjongpub.team.logo": { description: "队伍头像", messages: { notbind: "未绑定", failed: "失败" } }, "mahjongpub.team.add": { description: "添加队员", messages: { notbind: "未绑定", failed: "失败", success: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.team.remove": { description: "删除队员", messages: { notbind: "未绑定", failed: "失败", success: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.team.swap": { description: "交换队员", messages: { notbind: "未绑定", failed: "失败", invalid: "参数错误", "wide-range": "范围过大", success: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.contest.bind": { description: "绑定比赛", messages: { failed: "绑定失败", success: "成功： [{cid}] {name}" } }, "mahjongpub.contest.record.get": { description: "查询比赛记录", messages: { failed: "查询失败" } }, "mahjongpub.contest.record.update": { description: "修改比赛记录", messages: { failed: "修改失败" } }, "mahjongpub.database.record.get": { description: "查询比赛记录", messages: { failed: "查询失败" } }, "mahjongpub.database.record.update": { description: "修改比赛记录", messages: { success: "修改成功", failed: "修改失败", unmodified: "未修改" } } } };
+    module2.exports = { commands: { "mahjongpub.team.bind": { description: "绑定队伍", messages: { failed: "绑定失败", success: "成功： [{cid}:{tid}] {name}" } }, "mahjongpub.team.unbind": { description: "解除绑定", messages: { notbind: "未绑定", success: "成功" } }, "mahjongpub.team.password": { description: "查看密码", messages: { notbind: "未绑定", output: "密码： {0}" } }, "mahjongpub.team.stats": { description: "查看队伍信息", messages: { notbind: "未绑定", failed: "失败", output: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.team.desc": { description: "队伍简介", messages: { notbind: "未绑定", failed: "失败", output: "- [{cid}:{tid}] {name}\n{description}\n" } }, "mahjongpub.team.logo": { description: "队伍头像", messages: { notbind: "未绑定", failed: "失败" } }, "mahjongpub.team.add": { description: "添加队员", messages: { notbind: "未绑定", failed: "失败", success: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.team.remove": { description: "删除队员", messages: { notbind: "未绑定", failed: "失败", success: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.team.swap": { description: "交换队员", messages: { notbind: "未绑定", failed: "失败", invalid: "参数错误", "wide-range": "范围过大", success: "- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n" } }, "mahjongpub.contest.bind": { description: "绑定比赛", messages: { failed: "绑定失败", success: "成功： [{cid}] {name}" } }, "mahjongpub.contest.password": { description: "查看密码", messages: { failed: "未绑定", success: "[{0}] {1}\n" } }, "mahjongpub.contest.record.get": { description: "查询比赛记录", messages: { failed: "查询失败" } }, "mahjongpub.contest.record.update": { description: "修改比赛记录", messages: { failed: "修改失败" } }, "mahjongpub.database.record.get": { description: "查询比赛记录", messages: { failed: "查询失败" } }, "mahjongpub.database.record.update": { description: "修改比赛记录", messages: { success: "修改成功", failed: "修改失败", unmodified: "未修改" } } } };
   }
 });
 
@@ -395,6 +395,11 @@ var MahjongPub = class {
       }
       return session.text(".success", contest);
     });
+    ctx.command("mahjongpub.contest.password", { authority: 4 }).option("channel", "-c <channel:channel>").channelFields(["mahjongpub/bind-contest", "mahjongpub/bind-contestpw"]).action(async ({ session }) => {
+      const [cid, cpw] = [session.channel["mahjongpub/bind-contest"], session.channel["mahjongpub/bind-contestpw"]];
+      if (cid) return session.text(".success", [cid, cpw]);
+      else return session.text(".failed");
+    });
     ctx.command("mahjongpub.contest.record.get <round:natural> <cls:natural>", { authority: 3 }).option("rowi", "-i <rowi:integer>").channelFields(["mahjongpub/bind-contest", "mahjongpub/bind-contestpw"]).action(async ({ session, options }, round, cls) => {
       const [cid, cpw] = [session.channel["mahjongpub/bind-contest"], session.channel["mahjongpub/bind-contestpw"]];
       const contest = await this.getContest(cid, cpw);
@@ -402,11 +407,13 @@ var MahjongPub = class {
         const record = await contest.getRoundRecord(round, cls);
         if ((0, import_koishi.isNullable)(options.rowi)) {
           return record.matches.map((match, i) => `[${i}] ` + match.players.map((x) => `${x.name} ${x.point}`).join(" / ")).join("\n");
-        } else {
+        } else if (record.matches.at(options.rowi ?? -1)) {
           return [
             `[${options.rowi === -1 ? record.matches.length - 1 : options.rowi}]`,
             record.matches.at(options.rowi ?? -1).players.map((x) => `${x.name} ${x.point}`).join(" / ")
           ].join(" ");
+        } else {
+          return session.text(".failed");
         }
       } catch (e) {
         ctx.logger.warn(e);
@@ -439,7 +446,7 @@ var MahjongPub = class {
             round,
             ver: options.ver,
             ...options.rowi === -1 ? {} : { rowi: options.rowi }
-          }).sort({ rowi: -1 }).toArray();
+          }).sort({ rowi: 1 }).toArray();
           if (!record.length) return session.text(".failed");
           return record.map((r) => `[${r.rowi}] ` + r.results.map((x) => `${x.name} ${x.num}`).join(" / ")).join("\n");
         } catch (e) {

package/lib/mahjongpub.d.ts

@@ -0,0 +1,87 @@
+import { Context, Dict } from 'koishi';
+export declare class MahjongPub {
+    ctx: Context;
+    private serverUri;
+    private http;
+    constructor(ctx: Context);
+    getContest(cid: number): Promise<MahjongPub.Contest>;
+    getTeams(cid: number): Promise<Dict<MahjongPub.Team>>;
+    getRounds(cid: number): Promise<Dict<MahjongPub.Round>>;
+    getMatches(cid: number, round: number): Promise<Dict<MahjongPub.Match[]>>;
+    getAllMatches(cid: number): Promise<Dict<MahjongPub.Match[]>>;
+    static cacheOptions: {
+        readonly getContest: {
+            readonly maxAge: 120;
+        };
+        readonly getRounds: {
+            readonly maxAge: 60;
+        };
+        readonly getTeams: {
+            readonly maxAge: 30;
+        };
+        readonly getMatches: {
+            readonly maxAge: 120;
+        };
+        readonly getAllMatches: {
+            readonly maxAge: 300;
+        };
+    };
+    static new(ctx: Context): import("@hieuzest/cachetools").CachedClass<MahjongPub, "getContest" | "getRounds" | "getTeams" | "getMatches" | "getAllMatches", "_">;
+}
+export declare namespace MahjongPub {
+    export interface Team {
+        tid: number;
+        cid: string;
+        t_name: string;
+        t_ps: string;
+        t_player?: string;
+        t_sub?: string;
+        img: string;
+        t_type: number;
+        players: string[];
+    }
+    export interface Contest {
+        cid: number;
+        c_name: string;
+        c_round: number;
+        c_gonggao: string;
+        c_pad: string;
+        t_type: string;
+    }
+    export interface Round {
+        rid: number;
+        round: number;
+        t_class: number;
+        code: string;
+        tid1: number;
+        tid2: number;
+        tid3: number;
+        tid4: number;
+        tids: number[];
+    }
+    export interface MatchBrief {
+        inx: number;
+        cid: number;
+        rid: number;
+        round: number;
+        rowi: number;
+        i_time: string;
+        url: string;
+    }
+    type Stringiable = string | number;
+    type Suffixed<K, P extends Stringiable> = K extends string ? `${K}${P}` : never;
+    type SuffixRemoved<PK, P extends Stringiable> = PK extends Suffixed<infer K, P> ? K : '';
+    type SuffixedValue<T extends object, PK extends string, P extends Stringiable> = T extends {
+        [K in SuffixRemoved<PK, P>]: infer TValue;
+    } ? TValue : never;
+    type SuffixedObject<T extends object, P extends Stringiable> = {
+        [K in Suffixed<keyof T, P>]: SuffixedValue<T, K, P>;
+    };
+    interface MatchPlayerTemplate {
+        name: string;
+        num: number;
+    }
+    type MatchPlayer<P extends Stringiable> = SuffixedObject<MatchPlayerTemplate, P>;
+    export type Match = MatchBrief & MatchPlayer<1> & MatchPlayer<2> & MatchPlayer<3> & MatchPlayer<4>;
+    export {};
+}

package/lib/manager.d.ts

@@ -0,0 +1,47 @@
+import { Context, Dict, Schema } from 'koishi';
+import { MahjongPub } from './mahjongpub';
+interface PlayerResult {
+    name: string;
+    num: number;
+    pint: number;
+}
+interface MatchRecord {
+    _id: string;
+    inx?: string;
+    cid: string;
+    rid: string;
+    round: number;
+    rowi: number;
+    time?: string;
+    url?: string;
+    cls: number;
+    tids: number[];
+    players: string[];
+    ver?: number;
+    _finished?: boolean;
+    results?: PlayerResult[];
+}
+declare class ContestExtra {
+    ctx: Context;
+    subscribers: Set<string>;
+    stopCls: Set<number>;
+    constructor(ctx: Context);
+    broadcast(msg: string): Promise<void>;
+}
+export declare class ContestManager {
+    protected ctx: Context;
+    config: ContestManager.Config;
+    static inject: string[];
+    mahjongpub: MahjongPub;
+    extra: Dict<ContestExtra>;
+    constructor(ctx: Context, config: ContestManager.Config);
+    startMatch(cid: number, cls: number, timeout?: number, tag?: string): Promise<void>;
+    onMatchFinished(record: MatchRecord): Promise<void>;
+}
+export declare namespace ContestManager {
+    interface Config {
+        token?: string;
+    }
+    const Config: Schema<Config>;
+}
+export {};

package/package.json

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