@hieuzest/koishi-plugin-riichi-city 0.5.6 → 0.5.8

package/lib/index.js

@@ -38,18 +38,17 @@ var require_zh_CN = __commonJS({
 });
 
 // src/index.ts
-var index_exports = {};
-__export(index_exports, {
+var src_exports = {};
+__export(src_exports, {
   RiichiCity: () => RiichiCity,
-  default: () => index_default
+  default: () => src_default
 });
-module.exports = __toCommonJS(index_exports);
+module.exports = __toCommonJS(src_exports);
 var import_koishi3 = require("koishi");
 var import_api2 = require("./api");
 
 // src/dhs.ts
 var import_koishi = require("koishi");
-var import_koishi_utils = require("@hieuzest/koishi-utils");
 var import_lobby = require("./lobby");
 var RiichiCityDHS = class extends import_koishi.Service {
   constructor(ctx, config) {
@@ -236,13 +235,11 @@ ${config.extraHelp}`.trim();
         return "已开启通知";
       }
     });
-    ctx.guild().command("rc-dhs.start <args:text>").userFields(["authority"]).channelFields(["rc-dhs/bind"]).action(async ({ session }, args) => {
-      if (!args) return;
+    ctx.guild().command("rc-dhs.start <args:mjlist>").userFields(["authority"]).channelFields(["rc-dhs/bind"]).action(async ({ session }, argsList) => {
+      if (!argsList?.length) return;
       const contestId = session.channel["rc-dhs/bind"];
       if (!contestId) return;
       if (!this.checkPermission(session)) return;
-      args = import_koishi.h.unescape(args);
-      const argsList = (0, import_koishi_utils.splitBackslashEscapedArgs)(args);
       const players = [];
       const c = await this.getDHS(contestId);
       if (!c) return "大会室未找到";
@@ -502,7 +499,7 @@ var RiichiCity = class extends import_koishi3.Service {
     })
   ]);
 })(RiichiCity || (RiichiCity = {}));
-var index_default = RiichiCity;
+var src_default = RiichiCity;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RiichiCity

package/lib/lobby.d.ts

@@ -1,6 +1,7 @@
 import { Disposable, SessionError } from 'koishi';
 import { RiichiCityApi } from './api';
 import { LobbyDetails } from './types';
+import { Lock } from './utils';
 export declare class DHSError extends SessionError {
 }
 export declare class PlayerNotFoundError extends DHSError {
@@ -59,6 +60,7 @@ export declare class RiichiCityLobby {
     notify?: Disposable;
     notifyIdle: number;
     notifyCache?: string[];
+    lock: Lock;
     constructor(api: RiichiCityApi, id: number, extra: {
         adminAccountId: number;
     });

package/lib/lobby.js

@@ -32,6 +32,31 @@ __export(lobby_exports, {
 module.exports = __toCommonJS(lobby_exports);
 var import_koishi = require("koishi");
 var import_api = require("./api");
+
+// src/utils.ts
+function noop() {
+}
+__name(noop, "noop");
+var Lock = class {
+  static {
+    __name(this, "Lock");
+  }
+  tip;
+  constructor() {
+    this.tip = Promise.resolve(void 0);
+  }
+  async acquire() {
+    const oldTip = this.tip;
+    let resolver = noop;
+    const promise = new Promise((resolve) => {
+      resolver = resolve;
+    });
+    this.tip = oldTip.then(() => promise);
+    return oldTip.then(() => resolver);
+  }
+};
+
+// src/lobby.ts
 var BOT_NAME = "電腦";
 var DHSError = class extends import_koishi.SessionError {
   static {
@@ -136,6 +161,7 @@ var RiichiCityLobby = class {
   notify;
   notifyIdle = 0;
   notifyCache;
+  lock = new Lock();
   async init() {
     this.details = await this.api.enterLobby(this.id);
     this.classifyID = this.details.classifyID;
@@ -172,32 +198,37 @@ var RiichiCityLobby = class {
     return res.map((x) => new Paipu(this, x.roomID, x.players.map((p) => new Player(p.nickname, p.points, p.userId)), { paipuID: x.paiPuId }));
   }
   async startMatch(players, tag = "", randomPosition = true) {
-    const onlinePlayers = await this.listPlayers();
-    const notFound = [];
-    for (const player of players) {
-      if (player.accountId === null || player.accountId === void 0) {
-        if (player.nickname in onlinePlayers) {
-          player.accountId = onlinePlayers[player.nickname];
-        } else {
-          notFound.push(player.pattern);
+    const release = await this.lock.acquire();
+    try {
+      const onlinePlayers = await this.listPlayers();
+      const notFound = [];
+      for (const player of players) {
+        if (player.accountId === null || player.accountId === void 0) {
+          if (player.nickname in onlinePlayers) {
+            player.accountId = onlinePlayers[player.nickname];
+          } else {
+            notFound.push(player.pattern);
+          }
+        } else if (player.accountId) {
+          if (!Object.values(onlinePlayers).includes(player.accountId)) notFound.push(player.pattern);
         }
-      } else if (player.accountId) {
-        if (!Object.values(onlinePlayers).includes(player.accountId)) notFound.push(player.pattern);
       }
-    }
-    if (notFound.length) throw new PlayerNotFoundError(...notFound);
-    for (const player of players) {
-      if (player.accountId === 0) {
-        player.accountId = await this.api.addLobbyBot();
+      if (notFound.length) throw new PlayerNotFoundError(...notFound);
+      for (const player of players) {
+        if (player.accountId === 0) {
+          player.accountId = await this.api.addLobbyBot();
+        }
       }
+      if (randomPosition) players = import_koishi.Random.shuffle(players);
+      return await this.api.startMatch({
+        table_idx: 1,
+        usersID: players.map((p) => p.accountId),
+        initPoints: players.map((p) => p.point),
+        matchID: this.id
+      });
+    } finally {
+      release();
     }
-    if (randomPosition) players = import_koishi.Random.shuffle(players);
-    return await this.api.startMatch({
-      table_idx: 1,
-      usersID: players.map((p) => p.accountId),
-      initPoints: players.map((p) => p.point),
-      matchID: this.id
-    });
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/utils.d.ts

@@ -0,0 +1,13 @@
+export declare class Resolver<T> {
+    readonly promise: Promise<T>;
+    private resolver;
+    private rejecter;
+    constructor();
+    get resolve(): (result?: T | PromiseLike<T>) => void;
+    get reject(): (reason: any | PromiseLike<any>) => void;
+}
+export declare class Lock {
+    private tip;
+    constructor();
+    acquire(): Promise<() => void>;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hieuzest/koishi-plugin-riichi-city",
   "description": "",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -24,11 +24,9 @@
     "riichi-city"
   ],
   "peerDependencies": {
+    "@hieuzest/koishi-plugin-mahjong": "^3.0.0",
     "koishi": "^4.17.8"
   },
-  "dependencies": {
-    "@hieuzest/koishi-utils": "^1.0.0"
-  },
   "koishi": {
     "service": {
       "implements": [
@@ -40,5 +38,12 @@
       ]
     },
     "hidden": true
+  },
+  "devDependencies": {
+    "@hieuzest/koishi-buildtools": "^1.0.2",
+    "@hieuzest/koishi-plugin-mahjong": "^3.0.0",
+    "@koishijs/plugin-admin": "^2.0.0-beta.4",
+    "@koishijs/plugin-proxy-agent": "^0.3.3",
+    "koishi": "^4.18.9"
   }
 }