Merge pull request #358 from Secreto31126/emitters-fix

Emitters fix

Author: Secreto31126

src/emitters.ts

@@ -9,6 +9,7 @@ import type {
     PostData
 } from "./types";
 import type { WhatsAppAPI } from "./index";
+import type { MaybePromise } from "./utils";
 
 /**
  * Callback for "sent" event
@@ -74,7 +75,7 @@ export type OnSentArgs = {
  * @template Returns - The return type of the callback, defined by WhatsAppAPI generic parameter
  * @param args - The arguments object
  */
-export type OnMessage<Returns> = (args: OnMessageArgs) => Returns;
+export type OnMessage<Returns> = (args: OnMessageArgs) => MaybePromise<Returns>;
 
 /**
  * @public
@@ -131,7 +132,7 @@ export type OnMessageArgs = {
  * @template Returns - The return type of the callback, defined by WhatsAppAPI generic parameter
  * @param args - The arguments object
  */
-export type OnStatus<Returns> = (args: OnStatusArgs) => Returns;
+export type OnStatus<Returns> = (args: OnStatusArgs) => MaybePromise<Returns>;
 
 /**
  * @public

src/index.ts

@@ -267,7 +267,12 @@ export class WhatsAppAPI<EmittersReturnType = void> {
             Whatsapp: this
         };
 
-        this.on?.sent?.(args);
+        try {
+            await this.on?.sent?.(args);
+        } catch (error) {
+            // Eh... I don't like it nor hate it
+            console.error(error);
+        }
 
         return response ?? promise;
     }
@@ -799,7 +804,7 @@ export class WhatsAppAPI<EmittersReturnType = void> {
             };
 
             try {
-                return this.on?.message?.(args);
+                return await this.on?.message?.(args);
             } catch (error) {
                 throw 500;
             }
@@ -831,7 +836,7 @@ export class WhatsAppAPI<EmittersReturnType = void> {
             };
 
             try {
-                return this.on?.status?.(args);
+                return await this.on?.status?.(args);
             } catch (error) {
                 throw 500;
             }
@@ -991,10 +996,9 @@ export class WhatsAppAPI<EmittersReturnType = void> {
      * Offload a function to the next tick of the event loop
      *
      * @param f - The function to offload from the main thread
-     * @param a - The arguments to pass to the function
      */
-    static offload<A, F extends (...a: A[]) => unknown>(f: F, ...a: A[]) {
+    static offload(f: () => unknown) {
         // Thanks @RahulLanjewar93
-        Promise.resolve().then(() => f(...a));
+        Promise.resolve().then(f);
     }
 }

src/utils.ts

@@ -1,5 +1,7 @@
 export type AtLeastOne<T> = [T, ...T[]];
 
+export type MaybePromise<T> = T | Promise<T> | PromiseLike<T>;
+
 export function isInteger(n: unknown): n is number {
     return Number.isInteger(n);
 }