Merge 1a83503 into e68c987

src/telegramServer.ts

@@ -217,29 +217,37 @@ export class TelegramServer extends EventEmitter {
     }
   }
 
-  /**
-   * @FIXME
-   * (node:103570) MaxListenersExceededWarning: Possible EventEmitter memory leak detected. 11
-   * EditedMessageText listeners added to [TelegramServer]. Use emitter.setMaxListeners() to
-   * increase limit (Use `node --trace-warnings ...` to show where the warning was created)
-   */
   async waitBotEdits() {
     return new Promise<void>((resolve) => {
-      this.on('EditedMessageText', () => resolve());
+      const handler = () => {
+        this.off('EditedMessageText', handler);
+        resolve();
+      };
+      this.on('EditedMessageText', handler);
     });
   }
 
   async waitBotMessage() {
     return new Promise<void>((resolve) => {
-      this.on('AddedBotMessage', () => resolve());
+      const handler = () => {
+        this.off('AddedBotMessage', handler);
+        resolve();
+      };
+      this.on('AddedBotMessage', handler);
     });
   }
 
   async waitUserMessage() {
     return new Promise<void>((resolve) => {
-      this.on('AddedUserMessage', () => resolve());
-      this.on('AddedUserCommand', () => resolve());
-      this.on('AddedUserCallbackQuery', () => resolve());
+      const messageHandler = () => {
+        this.off('AddedUserMessage', messageHandler);
+        this.off('AddedUserCommand', messageHandler);
+        this.off('AddedUserCallbackQuery', messageHandler);
+        resolve();
+      };
+      this.on('AddedUserMessage', messageHandler);
+      this.on('AddedUserCommand', messageHandler);
+      this.on('AddedUserCallbackQuery', messageHandler);
     });
   }
 
@@ -254,7 +262,6 @@ export class TelegramServer extends EventEmitter {
 
   async addUserCommand(message: CommandRequest) {
     assert.ok(message.entities, 'Command should have entities');
-
     await this.addUserUpdate({
       ...this.getCommonFields(message.botToken),
       message,

src/test/generic.test.ts

@@ -138,6 +138,15 @@ describe('Telegram Server', () => {
     }).catch((err) => assert.fail(err));
   });
 
+  it('waits user message', async () => {
+    const { server, client } = await getServerAndClient(token);
+    client.sendCommand(client.makeCommand('/start'));
+    await server.waitUserMessage();
+    const history = await client.getUpdatesHistory();
+    assert.equal(history.length, 1);
+    await server.stop();
+  });
+
   it('should fully implement user-bot interaction', async () => {
     const { server, client } = await getServerAndClient(token);
     let message = client.makeMessage('/start');