waitmessage add skipMessageId

erictik · Jul 7, 2023 · a939132 · a939132
1 parent 5f65be0
commit a939132
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/example/customzoom.ts b/example/customzoom.ts
@@ -63,7 +63,11 @@ async function main() {
   console.log("Custom Zoom", zoomout2x);
   client.Close();
 }
-main().catch((err) => {
-  console.error(err);
-  process.exit(1);
-});
+main()
+  .then(() => {
+    console.log("done");
+  })
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
diff --git a/example/imagine.ts b/example/imagine.ts
@@ -13,6 +13,7 @@ async function main() {
     ChannelId: <string>process.env.CHANNEL_ID,
     SalaiToken: <string>process.env.SALAI_TOKEN,
     Debug: true,
+    Ws: false,
   });
 
   const msg = await client.Imagine(

diff --git a/src/discord.ws.ts b/src/discord.ws.ts
@@ -27,6 +27,7 @@ export class WsMessage {
   private event: Array<{ event: string; callback: (message: any) => void }> =
     [];
   private waitMjEvents: Map<string, WaitMjEvent> = new Map();
+  private skipMessageId: string[] = [];
   private reconnectTime: boolean[] = [];
   private heartbeatInterval = 0;
   public UserId = "";
@@ -470,7 +471,12 @@ export class WsMessage {
     this.waitMjEvents.set(nonce, { nonce });
     this.event.push({ event: nonce, callback: once });
   }
-
+  private removeSkipMessageId(messageId: string) {
+    const index = this.skipMessageId.findIndex((id) => id !== messageId);
+    if (index !== -1) {
+      this.skipMessageId.splice(index, 1);
+    }
+  }
   private removeWaitMjEvent(nonce: string) {
     this.waitMjEvents.delete(nonce);
   }
@@ -489,13 +495,16 @@ export class WsMessage {
     nonce,
     prompt,
     onmodal,
+    messageId,
     loading,
   }: {
     nonce: string;
     prompt?: string;
+    messageId?: string;
     onmodal?: OnModal;
     loading?: LoadingHandler;
   }) {
+    if (messageId) this.skipMessageId.push(messageId);
     return new Promise<MJMessage | null>((resolve, reject) => {
       const handleImageMessage = ({ message, error }: MJEmit) => {
         if (error) {
@@ -505,6 +514,7 @@ export class WsMessage {
         }
         if (message && message.progress === "done") {
           this.removeWaitMjEvent(nonce);
+          messageId && this.removeSkipMessageId(messageId);
           resolve(message);
           return;
         }

diff --git a/src/midjourney.ts b/src/midjourney.ts
@@ -254,6 +254,7 @@ export class Midjourney extends MidjourneyMessage {
       return await wsClient.waitImageMessage({
         nonce,
         loading,
+        messageId: msgId,
         prompt: content,
         onmodal: async (nonde, id) => {
           if (content === undefined || content === "") {