feat: cmdBus.on support async

dockfries · Sep 25, 2022 · 24f86f3 · 24f86f3
1 parent 7472930
commit 24f86f3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omp-node-lib",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Better with omp-node-ts",
   "main": "dist/bundle.js",
   "types": "dist/bundle.d.ts",

diff --git a/src/controllers/command/index.ts b/src/controllers/command/index.ts
@@ -24,14 +24,16 @@ export class CmdBus {
     CmdBus.eventList.splice(idx, 1);
   }
 
-  static emit<T extends BasePlayer>(
+  static async emit<T extends BasePlayer>(
     player: T,
     userEventName: TEventName,
     userEventArgs: Array<string>
-  ): boolean {
+  ): Promise<boolean> {
     const idx: number = CmdBus.findEventIdxByName(userEventName);
     if (idx > -1) {
-      const result = CmdBus.eventList[idx].fn.apply(player, userEventArgs);
+      let result = CmdBus.eventList[idx].fn.apply(player, userEventArgs);
+      if (result instanceof Promise) result = await result;
+      if (result === undefined || result === null) return false;
       if (typeof result === "number") return Boolean(result);
       return result;
     }

diff --git a/src/controllers/player/playerEvent.ts b/src/controllers/player/playerEvent.ts
@@ -163,11 +163,10 @@ export abstract class BasePlayerEvent<
         Use eventBus to observe and subscribe to level 1 instructions, 
         support string and array pass, array used for alias.
       */
-      const exist: boolean = CmdBus.emit(
-        p,
-        regCmdtext[0],
-        regCmdtext.splice(1)
-      );
+      let exist = false;
+      (async () => {
+        exist = await CmdBus.emit(p, regCmdtext[0], regCmdtext.splice(1));
+      })();
       if (exist) return 1;
       // The command %s you entered does not exist
       return this.onCommandError(p, regCmdtext.join(" "), ICmdErrInfo.notExist);

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -13,7 +13,7 @@ export type TEventName = string | string[];
 export type TEventFunc = <T extends BasePlayer>(
   this: T,
   ...args: string[]
-) => boolean | number;
+) => boolean | number | void | Promise<boolean | number | void>;
 
 export type TLocales = Record<string | number, ILocale>;