@hieuzest/koishi-plugin-mahjongpub 0.1.9 → 0.1.10

package/lib/api.d.ts

@@ -23,7 +23,7 @@ export declare class TeamAdmin implements Team {
     constructor(ctx: Context, pw: string, options: {
         endpoint: string;
     });
-    read(): Promise<void>;
+    read(force?: boolean): Promise<void>;
     write(): Promise<any>;
 }
 export declare class ContestAdmin {
@@ -38,5 +38,5 @@ export declare class ContestAdmin {
     constructor(ctx: Context, cid: string, pw: string, options: {
         endpoint: string;
     });
-    read(): Promise<void>;
+    read(force?: boolean): Promise<void>;
 }

package/lib/api.js

@@ -19,7 +19,9 @@ class TeamAdmin {
             endpoint: options.endpoint,
         });
     }
-    async read() {
+    async read(force = false) {
+        if (this.tid && !force)
+            return;
         const data = await this.http.get('/api/data.php', {
             responseType: 'json',
             params: {
@@ -68,7 +70,9 @@ class ContestAdmin {
             endpoint: options.endpoint,
         });
     }
-    async read() {
+    async read(force = false) {
+        if (this.teams && !force)
+            return;
         const payload = {
             posttype: 'login',
             cid: this.cid,

package/lib/index.d.ts

@@ -11,12 +11,20 @@ declare module 'koishi' {
         'mahjongpub/bind-contestpw': string;
     }
 }
+declare module '@koishijs/cache' {
+    interface Tables {
+        contests: ContestAdmin;
+        teams: TeamAdmin;
+    }
+}
 export declare class MahjongPub {
     private ctx;
     private config;
+    teams: Dict<TeamAdmin>;
+    contests: Dict<ContestAdmin>;
     constructor(ctx: Context, config: MahjongPub.Config);
-    getTeam(pw: string): TeamAdmin;
-    getContest(cid: string, pw: string): ContestAdmin;
+    getTeam(pw: string): Promise<TeamAdmin>;
+    getContest(cid: string, pw: string): Promise<ContestAdmin>;
 }
 export declare namespace MahjongPub {
     const inject: {

package/lib/index.js

@@ -12,6 +12,8 @@ function parsePlatform(target) {
 class MahjongPub {
     ctx;
     config;
+    teams = {};
+    contests = {};
     constructor(ctx, config) {
         this.ctx = ctx;
         this.config = config;
@@ -34,7 +36,7 @@ class MahjongPub {
             .action(async ({ session, options }, pw) => {
             if (pw?.length !== 20)
                 return;
-            const team = new api_1.TeamAdmin(ctx, pw, config);
+            const team = await this.getTeam(pw);
             try {
                 await team.read();
             }
@@ -93,13 +95,13 @@ class MahjongPub {
                 const [cid, cpw] = [session.channel['mahjongpub/bind-contest'], session.channel['mahjongpub/bind-contestpw']];
                 if (!cid || !cpw)
                     return session.text('.notbind');
-                const contest = new api_1.ContestAdmin(ctx, cid, cpw, config);
+                const contest = await this.getContest(cid, cpw);
                 await contest.read();
                 pw = (contest.teams[options.team] ?? Object.values(contest.teams).find(t => t.name === options.team))?.pw;
             }
             if (!pw)
                 return config.informNotbind ? session.text('.notbind') : '';
-            const team = new api_1.TeamAdmin(ctx, pw, config);
+            const team = await this.getTeam(pw);
             try {
                 await team.read();
                 return session.text('.output', team);
@@ -119,7 +121,7 @@ class MahjongPub {
                 : session.isDirect ? session.user['mahjongpub/bind-team'] : session.channel['mahjongpub/bind-team'] ?? session.user['mahjongpub/bind-team'];
             if (!pw)
                 return config.informNotbind ? session.text('.notbind') : '';
-            const team = new api_1.TeamAdmin(ctx, pw, config);
+            const team = await this.getTeam(pw);
             try {
                 await team.read();
                 if (!desc)
@@ -142,7 +144,7 @@ class MahjongPub {
                 : session.isDirect ? session.user['mahjongpub/bind-team'] : session.channel['mahjongpub/bind-team'] ?? session.user['mahjongpub/bind-team'];
             if (!pw)
                 return config.informNotbind ? session.text('.notbind') : '';
-            const team = new api_1.TeamAdmin(ctx, pw, config);
+            const team = await this.getTeam(pw);
             try {
                 await team.read();
                 if (!img)
@@ -159,19 +161,29 @@ class MahjongPub {
         ctx.command('mahjongpub.team.add <...users:string>')
             .alias('!添加', '！添加')
             .option('channel', '-c <channel:channel>')
-            .userFields(['mahjongpub/bind-team'])
-            .channelFields(['mahjongpub/bind-team'])
+            .option('team', '-t <team:string>')
+            .userFields(['mahjongpub/bind-team', 'mahjongpub/bind-teams'])
+            .channelFields(['mahjongpub/bind-team', 'mahjongpub/bind-contest', 'mahjongpub/bind-contestpw'])
             .action(async ({ session, options }, ...users) => {
-            const pw = options.channel ? (await session.getChannel(parsePlatform(options.channel)[1], ['mahjongpub/bind-team']))['mahjongpub/bind-team']
+            let pw = options.channel ? (await session.getChannel(parsePlatform(options.channel)[1], ['mahjongpub/bind-team']))['mahjongpub/bind-team']
                 : session.isDirect ? session.user['mahjongpub/bind-team'] : session.channel['mahjongpub/bind-team'] ?? session.user['mahjongpub/bind-team'];
+            if (options.team) {
+                const [cid, cpw] = [session.channel['mahjongpub/bind-contest'], session.channel['mahjongpub/bind-contestpw']];
+                if (!cid || !cpw)
+                    return session.text('.notbind');
+                const contest = await this.getContest(cid, cpw);
+                await contest.read();
+                pw = (contest.teams[options.team] ?? Object.values(contest.teams).find(t => t.name === options.team))?.pw;
+            }
             if (!pw)
                 return config.informNotbind ? session.text('.notbind') : '';
-            const team = new api_1.TeamAdmin(ctx, pw, config);
+            const team = await this.getTeam(pw);
             try {
                 await team.read();
                 team.players.push(...users);
-                await team.write();
-                return await team.write() ?? session.text('.success', team);
+                const msg = await team.write();
+                await team.read(true);
+                return msg + '\n' + session.text('.success', team);
             }
             catch (e) {
                 ctx.logger.warn(e);
@@ -181,19 +193,30 @@ class MahjongPub {
         ctx.command('mahjongpub.team.remove <...indices:natural>')
             .alias('!删除', '！删除')
             .option('channel', '-c <channel:channel>')
-            .userFields(['mahjongpub/bind-team'])
-            .channelFields(['mahjongpub/bind-team'])
+            .option('team', '-t <team:string>')
+            .userFields(['mahjongpub/bind-team', 'mahjongpub/bind-teams'])
+            .channelFields(['mahjongpub/bind-team', 'mahjongpub/bind-contest', 'mahjongpub/bind-contestpw'])
             .action(async ({ session, options }, ...indices) => {
-            const pw = options.channel ? (await session.getChannel(parsePlatform(options.channel)[1], ['mahjongpub/bind-team']))['mahjongpub/bind-team']
+            let pw = options.channel ? (await session.getChannel(parsePlatform(options.channel)[1], ['mahjongpub/bind-team']))['mahjongpub/bind-team']
                 : session.isDirect ? session.user['mahjongpub/bind-team'] : session.channel['mahjongpub/bind-team'] ?? session.user['mahjongpub/bind-team'];
+            if (options.team) {
+                const [cid, cpw] = [session.channel['mahjongpub/bind-contest'], session.channel['mahjongpub/bind-contestpw']];
+                if (!cid || !cpw)
+                    return session.text('.notbind');
+                const contest = await this.getContest(cid, cpw);
+                await contest.read();
+                pw = (contest.teams[options.team] ?? Object.values(contest.teams).find(t => t.name === options.team))?.pw;
+            }
             if (!pw)
                 return config.informNotbind ? session.text('.notbind') : '';
-            const team = new api_1.TeamAdmin(ctx, pw, config);
+            const team = await this.getTeam(pw);
             try {
                 await team.read();
                 team.players = team.players.filter((_, i) => !indices.includes(i + 1));
                 await team.write();
-                return await team.write() ?? session.text('.success', team);
+                const msg = await team.write();
+                await team.read(true);
+                return msg + '\n' + session.text('.success', team);
             }
             catch (e) {
                 ctx.logger.warn(e);
@@ -204,7 +227,7 @@ class MahjongPub {
             .alias('!交换', '！交换')
             .option('channel', '-c <channel:channel>')
             .option('team', '-t <team:string>')
-            .userFields(['mahjongpub/bind-team'])
+            .userFields(['mahjongpub/bind-team', 'mahjongpub/bind-teams'])
             .channelFields(['mahjongpub/bind-team', 'mahjongpub/bind-contest', 'mahjongpub/bind-contestpw'])
             .action(async ({ session, options }, ...indices) => {
             let pw = options.channel ? (await session.getChannel(parsePlatform(options.channel)[1], ['mahjongpub/bind-team']))['mahjongpub/bind-team']
@@ -213,7 +236,7 @@ class MahjongPub {
                 const [cid, cpw] = [session.channel['mahjongpub/bind-contest'], session.channel['mahjongpub/bind-contestpw']];
                 if (!cid || !cpw)
                     return session.text('.notbind');
-                const contest = new api_1.ContestAdmin(ctx, cid, cpw, config);
+                const contest = await this.getContest(cid, cpw);
                 await contest.read();
                 pw = (contest.teams[options.team] ?? Object.values(contest.teams).find(t => t.name === options.team))?.pw;
             }
@@ -221,7 +244,7 @@ class MahjongPub {
                 return config.informNotbind ? session.text('.notbind') : '';
             if (!indices.length || indices.length % 2 !== 0)
                 return session.text('.invalid');
-            const team = new api_1.TeamAdmin(ctx, pw, config);
+            const team = await this.getTeam(pw);
             try {
                 await team.read();
                 for (let i = 0; i < indices.length; i += 2) {
@@ -230,7 +253,7 @@ class MahjongPub {
                     team.players[indices[i + 1] - 1] = t;
                 }
                 const msg = await team.write();
-                await team.read();
+                await team.read(true);
                 return msg + '\n' + session.text('.success', team);
             }
             catch (e) {
@@ -238,12 +261,12 @@ class MahjongPub {
                 return session.text('.failed');
             }
         });
-        ctx.command('mahjongpub.contest.bind <cid:string> <pw:string>')
+        ctx.command('mahjongpub.contest.bind <cid:string> <cpw:string>')
             // .alias('!绑定', '！绑定')
             .option('channel', '-c <channel:channel>')
             .channelFields(['mahjongpub/bind-contest', 'mahjongpub/bind-contestpw'])
-            .action(async ({ session, options }, cid, pw) => {
-            const contest = new api_1.ContestAdmin(ctx, cid, pw, config);
+            .action(async ({ session, options }, cid, cpw) => {
+            const contest = await this.getContest(cid, cpw);
             try {
                 await contest.read();
             }
@@ -251,19 +274,39 @@ class MahjongPub {
                 ctx.logger.warn(e);
                 return session.text('.failed');
             }
-            if (options.channel)
-                ctx.database.setChannel(...parsePlatform(options.channel), { 'mahjongpub/bind-contest': cid, 'mahjongpub/bind-contestpw': pw });
+            if (options.channel) {
+                ctx.database.setChannel(...parsePlatform(options.channel), {
+                    'mahjongpub/bind-contest': cid,
+                    'mahjongpub/bind-contestpw': cpw,
+                });
+            }
             else {
                 session.channel['mahjongpub/bind-contest'] = cid;
-                session.channel['mahjongpub/bind-contestpw'] = pw;
+                session.channel['mahjongpub/bind-contestpw'] = cpw;
             }
             return session.text('.success', contest);
         });
     }
-    getTeam(pw) {
+    async getTeam(pw) {
+        // if (this.ctx.get('cache')) {
+        //   let res = await this.ctx.cache.get('teams', pw)
+        //   if (res) return res
+        //   res = new TeamAdmin(this.ctx, pw, this.config)
+        //   await this.ctx.cache.set('teams', pw, res, 1000 * 60)
+        //   return res
+        // }
         return new api_1.TeamAdmin(this.ctx, pw, this.config);
     }
-    getContest(cid, pw) {
+    async getContest(cid, pw) {
+        if (this.ctx.get('cache')) {
+            let res = await this.ctx.cache.get('contests', cid);
+            if (res)
+                return res;
+            res = new api_1.ContestAdmin(this.ctx, cid, pw, this.config);
+            await res.read();
+            await this.ctx.cache.set('contests', cid, res, 1000 * 600);
+            return res;
+        }
         return new api_1.ContestAdmin(this.ctx, cid, pw, this.config);
     }
 }
@@ -271,7 +314,7 @@ exports.MahjongPub = MahjongPub;
 (function (MahjongPub) {
     MahjongPub.inject = {
         required: ['database'],
-        optional: ['assets'],
+        optional: ['assets', 'cache'],
     };
     MahjongPub.Config = koishi_1.Schema.object({
         informNotbind: koishi_1.Schema.boolean().default(false),

package/lib/locales/zh-CN.json

@@ -1 +1 @@
-{"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":"成功"}},"mahjongpub.team.remove":{"description":"删除队员","messages":{"notbind":"未绑定","failed":"失败","success":"成功"}},"mahjongpub.team.swap":{"description":"交换队员","messages":{"notbind":"未绑定","failed":"失败","invalid":"参数错误","success":"- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n"}},"mahjongpub.contest.bind":{"description":"绑定比赛","messages":{"failed":"绑定失败","success":"成功： [{cid}] {name}"}}}}
+{"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":"参数错误","success":"- [{cid}:{tid}] {name}\n{players.map((p, i) => '' + (i+1) + ': ' + p).join('\\n')}\n"}},"mahjongpub.contest.bind":{"description":"绑定比赛","messages":{"failed":"绑定失败","success":"成功： [{cid}] {name}"}}}}

package/package.json

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