@takaro/modules 0.0.4 → 0.0.5

package/src/__tests__/roleExpiry.integration.test.ts

@@ -1,4 +1,4 @@
-import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 
 const group = 'Role expiry';
@@ -20,7 +20,7 @@ const tests = [
         this.setupData.teleportsModule.id,
       );
 
-      const eventsBeforeRole = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);
+      const eventsBeforeRole = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -28,7 +28,7 @@ const tests = [
       });
 
       expect((await eventsBeforeRole).length).to.be.eq(1);
-      expect((await eventsBeforeRole)[0].data.msg).to.match(/You do not have permission to use teleports/);
+      expect((await eventsBeforeRole)[0].data.meta.msg).to.match(/You do not have permission to use teleports/);
 
       // Assign the role with expiry 10 minutes from now
       await this.client.player.playerControllerAssignRole(this.setupData.players[0].id, this.setupData.role.id, {
@@ -36,7 +36,7 @@ const tests = [
       });
 
       // Execute the command again. Now it should work, since the role is assigned
-      const eventsWithRole = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);
+      const eventsWithRole = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test2',
@@ -44,7 +44,7 @@ const tests = [
       });
 
       expect((await eventsWithRole).length).to.be.eq(1);
-      expect((await eventsWithRole)[0].data.msg).to.match(/Teleport test2 set/);
+      expect((await eventsWithRole)[0].data.meta.msg).to.match(/Teleport test2 set/);
 
       // Remove the role and reassign with expiry 1 ms from now
       await this.client.player.playerControllerRemoveRole(this.setupData.players[0].id, this.setupData.role.id);
@@ -53,7 +53,7 @@ const tests = [
       });
 
       // Execute the command again. Now it should not work, since the role is expired
-      const eventsAfterExpire = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);
+      const eventsAfterExpire = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test3',
@@ -61,7 +61,7 @@ const tests = [
       });
 
       expect((await eventsAfterExpire).length).to.be.eq(1);
-      expect((await eventsAfterExpire)[0].data.msg).to.match(/You do not have permission to use teleports/);
+      expect((await eventsAfterExpire)[0].data.meta.msg).to.match(/You do not have permission to use teleports/);
     },
   }),
 ];

package/src/__tests__/serverMessages.integration.test.ts

@@ -1,4 +1,4 @@
-import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 import { sleep } from '@takaro/util';
 
@@ -16,7 +16,7 @@ const tests = [
         this.setupData.serverMessagesModule.id,
       );
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
 
       await this.client.cronjob.cronJobControllerTrigger({
         cronjobId: this.setupData.serverMessagesModule.cronJobs[0].id,
@@ -25,7 +25,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.be.eq(
+      expect((await events)[0].data.meta.msg).to.be.eq(
         // eslint-disable-next-line
         "This is an automated message, don't forget to read the server rules!",
       );
@@ -47,7 +47,7 @@ const tests = [
         },
       );
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
 
       await this.client.cronjob.cronJobControllerTrigger({
         cronjobId: this.setupData.serverMessagesModule.cronJobs[0].id,
@@ -56,7 +56,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.be.eq('This is a custom message');
+      expect((await events)[0].data.meta.msg).to.be.eq('This is a custom message');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -78,7 +78,10 @@ const tests = [
       // We should see each of our test messages at least once
 
       const numberOfEvents = 10;
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, numberOfEvents);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(
+        GameEvents.CHAT_MESSAGE,
+        numberOfEvents,
+      );
 
       for (let i = 0; i < numberOfEvents; i++) {
         await sleep(Math.floor(Math.random() * 10) + 1);
@@ -89,7 +92,7 @@ const tests = [
         });
       }
 
-      const messages = (await events).map((e) => e.data.msg);
+      const messages = (await events).map((e) => e.data.meta.msg);
       expect(messages).to.include('Test message 1');
       expect(messages).to.include('Test message 2');
     },

package/src/__tests__/systemConfigCost.integration.test.ts

@@ -1,4 +1,4 @@
-import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 import { sleep } from '@takaro/util';
 
@@ -30,14 +30,14 @@ const customSetup = async function (this: IntegrationTest<IModuleTestsSetupData>
     },
   );
 
-  const setEvents = setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+  const setEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
   await this.client.command.commandControllerTrigger(setupData.gameserver.id, {
     msg: '/settp test',
     playerId: setupData.players[0].id,
   });
 
   expect((await setEvents).length).to.be.eq(1);
-  expect((await setEvents)[0].data.msg).to.be.eq('Teleport test set.');
+  expect((await setEvents)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
   const giveCurrencies = setupData.players.map(async (player) => {
     const playerOnGameServer = (
@@ -66,7 +66,7 @@ const tests = [
     setup: customSetup,
     name: 'Deducts money when cost is configured',
     test: async function () {
-      const events = this.setupData.eventAwaiter.waitForEvents('command-executed', 1);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents('command-executed', 1);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tp test',
         playerId: this.setupData.players[0].id,
@@ -91,7 +91,7 @@ const tests = [
     test: async function () {
       const amount = 10;
 
-      const setEvents = this.setupData.eventAwaiter.waitForEvents('command-executed', amount);
+      const setEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents('command-executed', amount);
 
       await Promise.all(
         Array.from({ length: amount }).map(async (_, index) => {
@@ -105,7 +105,7 @@ const tests = [
 
       expect((await setEvents).length).to.be.eq(amount);
 
-      const events = this.setupData.eventAwaiter.waitForEvents('command-executed', amount);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents('command-executed', amount);
       await Promise.all(
         Array.from({ length: amount }).map(async (_, index) => {
           await sleep(1);
@@ -136,7 +136,7 @@ const tests = [
     setup: customSetup,
     name: 'Does not deduct currency when command unsuccessful',
     test: async function () {
-      const events = this.setupData.eventAwaiter.waitForEvents('command-executed', 1);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents('command-executed', 1);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tp doesntexist',
         playerId: this.setupData.players[0].id,
@@ -176,14 +176,14 @@ const tests = [
         },
       );
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tp test',
         playerId: this.setupData.players[1].id,
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.be.eq('You do not have enough currency to execute this command.');
+      expect((await events)[0].data.meta.msg).to.be.eq('You do not have enough currency to execute this command.');
     },
   }),
 ];

package/src/__tests__/teleports/listtp.integration.test.ts

@@ -1,4 +1,4 @@
-import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../../dto/index.js';
 
 const group = 'Teleports suite';
@@ -15,7 +15,7 @@ const tests = [
         this.setupData.teleportsModule.id,
       );
 
-      const setEvents = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 3);
+      const setEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 3);
 
       await Promise.all(
         Array.from({ length: 3 }).map(async (_, i) => {
@@ -29,10 +29,10 @@ const tests = [
       expect((await setEvents).length).to.be.eq(3);
 
       for (const event of await setEvents) {
-        expect(event.data.msg).to.match(/Teleport test\d set\./);
+        expect(event.data.meta.msg).to.match(/Teleport test\d set\./);
       }
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 4);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 4);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tplist',
@@ -40,10 +40,10 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(4);
-      expect((await events)[0].data.msg).to.be.eq('You have 3 teleports available');
-      expect((await events)[1].data.msg).to.match(/test0: \([-\d]+,[-\d]+,[-\d]+\)/);
-      expect((await events)[2].data.msg).to.match(/test1: \([-\d]+,[-\d]+,[-\d]+\)/);
-      expect((await events)[3].data.msg).to.match(/test2: \([-\d]+,[-\d]+,[-\d]+\)/);
+      expect((await events)[0].data.meta.msg).to.be.eq('You have 3 teleports available');
+      expect((await events)[1].data.meta.msg).to.match(/test0: \([-\d]+,[-\d]+,[-\d]+\)/);
+      expect((await events)[2].data.meta.msg).to.match(/test1: \([-\d]+,[-\d]+,[-\d]+\)/);
+      expect((await events)[3].data.meta.msg).to.match(/test2: \([-\d]+,[-\d]+,[-\d]+\)/);
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -62,7 +62,7 @@ const tests = [
         },
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -70,9 +70,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const setPublicEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPublicEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setpublic test',
@@ -80,9 +80,9 @@ const tests = [
       });
 
       expect((await setPublicEvent).length).to.be.eq(1);
-      expect((await setPublicEvent)[0].data.msg).to.be.eq('Teleport test is now public.');
+      expect((await setPublicEvent)[0].data.meta.msg).to.be.eq('Teleport test is now public.');
 
-      const setTpEvent2 = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent2 = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test2',
@@ -90,9 +90,9 @@ const tests = [
       });
 
       expect((await setTpEvent2).length).to.be.eq(1);
-      expect((await setTpEvent2)[0].data.msg).to.be.eq('Teleport test2 set.');
+      expect((await setTpEvent2)[0].data.meta.msg).to.be.eq('Teleport test2 set.');
 
-      const tpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const tpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tplist',
@@ -100,8 +100,8 @@ const tests = [
       });
 
       expect((await tpEvent).length).to.be.eq(2);
-      expect((await tpEvent)[0].data.msg).to.be.eq('You have 1 teleport available');
-      expect((await tpEvent)[1].data.msg).to.match(/test: \([-\d]+,[-\d]+,[-\d]+\) \(public\)/);
+      expect((await tpEvent)[0].data.meta.msg).to.be.eq('You have 1 teleport available');
+      expect((await tpEvent)[1].data.meta.msg).to.match(/test: \([-\d]+,[-\d]+,[-\d]+\) \(public\)/);
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -115,7 +115,7 @@ const tests = [
         this.setupData.teleportsModule.id,
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -123,9 +123,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const tpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const tpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tplist',
@@ -133,7 +133,9 @@ const tests = [
       });
 
       expect((await tpEvent).length).to.be.eq(1);
-      expect((await tpEvent)[0].data.msg).to.be.eq('You have no teleports available, use /settp <name> to set one.');
+      expect((await tpEvent)[0].data.meta.msg).to.be.eq(
+        'You have no teleports available, use /settp <name> to set one.',
+      );
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -148,7 +150,7 @@ const tests = [
         this.setupData.teleportsModule.id,
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -156,9 +158,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const setTpEvent2 = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent2 = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test2',
@@ -166,9 +168,9 @@ const tests = [
       });
 
       expect((await setTpEvent2).length).to.be.eq(1);
-      expect((await setTpEvent2)[0].data.msg).to.be.eq('Teleport test2 set.');
+      expect((await setTpEvent2)[0].data.meta.msg).to.be.eq('Teleport test2 set.');
 
-      const tpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const tpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tplist',
@@ -176,8 +178,8 @@ const tests = [
       });
 
       expect((await tpEvent).length).to.be.eq(2);
-      expect((await tpEvent)[0].data.msg).to.be.eq('You have 1 teleport available');
-      expect((await tpEvent)[1].data.msg).to.match(/test2: \([-\d]+,[-\d]+,[-\d]+\)/);
+      expect((await tpEvent)[0].data.meta.msg).to.be.eq('You have 1 teleport available');
+      expect((await tpEvent)[1].data.meta.msg).to.match(/test2: \([-\d]+,[-\d]+,[-\d]+\)/);
     },
   }),
 ];

package/src/__tests__/teleports/publicteleports.integration.test.ts

@@ -1,4 +1,4 @@
-import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup } from '@takaro/test';
+import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../../dto/index.js';
 
 const group = 'Teleports suite';
@@ -20,7 +20,7 @@ const tests = [
         },
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -28,9 +28,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const setPublicEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPublicEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setpublic test',
@@ -38,16 +38,16 @@ const tests = [
       });
 
       expect((await setPublicEvent).length).to.be.eq(1);
-      expect((await setPublicEvent)[0].data.msg).to.be.eq('Teleport test is now public.');
+      expect((await setPublicEvent)[0].data.meta.msg).to.be.eq('Teleport test is now public.');
 
-      const tpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const tpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tp test',
         playerId: this.setupData.players[1].id,
       });
 
-      expect((await tpEvent)[0].data.msg).to.be.eq('Teleported to test.');
+      expect((await tpEvent)[0].data.meta.msg).to.be.eq('Teleported to test.');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -66,7 +66,7 @@ const tests = [
         },
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -74,9 +74,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const setPublicEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPublicEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setpublic test',
@@ -84,9 +84,12 @@ const tests = [
       });
 
       expect((await setPublicEvent).length).to.be.eq(1);
-      expect((await setPublicEvent)[0].data.msg).to.be.eq('Teleport test is now public.');
+      expect((await setPublicEvent)[0].data.meta.msg).to.be.eq('Teleport test is now public.');
 
-      const setPrivateEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPrivateEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(
+        GameEvents.CHAT_MESSAGE,
+        1,
+      );
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setprivate test',
@@ -94,16 +97,16 @@ const tests = [
       });
 
       expect((await setPrivateEvent).length).to.be.eq(1);
-      expect((await setPrivateEvent)[0].data.msg).to.be.eq('Teleport test is now private.');
+      expect((await setPrivateEvent)[0].data.meta.msg).to.be.eq('Teleport test is now private.');
 
-      const tpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const tpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tp test',
         playerId: this.setupData.players[1].id,
       });
 
-      expect((await tpEvent)[0].data.msg).to.be.eq('Teleport test does not exist.');
+      expect((await tpEvent)[0].data.meta.msg).to.be.eq('Teleport test does not exist.');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -123,7 +126,7 @@ const tests = [
         },
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -131,9 +134,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const setPublicEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPublicEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setpublic test',
@@ -141,7 +144,7 @@ const tests = [
       });
 
       expect((await setPublicEvent).length).to.be.eq(1);
-      expect((await setPublicEvent)[0].data.msg).to.be.eq('Public teleports are disabled.');
+      expect((await setPublicEvent)[0].data.meta.msg).to.be.eq('Public teleports are disabled.');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -161,7 +164,7 @@ const tests = [
         },
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -169,9 +172,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const setPublicEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPublicEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setpublic test',
@@ -179,9 +182,9 @@ const tests = [
       });
 
       expect((await setPublicEvent).length).to.be.eq(1);
-      expect((await setPublicEvent)[0].data.msg).to.be.eq('Teleport test is now public.');
+      expect((await setPublicEvent)[0].data.meta.msg).to.be.eq('Teleport test is now public.');
 
-      const tpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const tpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tp test',
@@ -189,7 +192,7 @@ const tests = [
       });
 
       expect((await tpEvent).length).to.be.eq(1);
-      expect((await tpEvent)[0].data.msg).to.be.eq('Teleported to test.');
+      expect((await tpEvent)[0].data.meta.msg).to.be.eq('Teleported to test.');
 
       await this.client.gameserver.gameServerControllerInstallModule(
         this.setupData.gameserver.id,
@@ -202,7 +205,7 @@ const tests = [
         },
       );
 
-      const tpEvent2 = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const tpEvent2 = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/tp test',
@@ -210,7 +213,7 @@ const tests = [
       });
 
       expect((await tpEvent2).length).to.be.eq(1);
-      expect((await tpEvent2)[0].data.msg).to.be.eq('Teleport test does not exist.');
+      expect((await tpEvent2)[0].data.meta.msg).to.be.eq('Teleport test does not exist.');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -240,7 +243,7 @@ const tests = [
         },
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/settp test',
@@ -248,9 +251,9 @@ const tests = [
       });
 
       expect((await setTpEvent).length).to.be.eq(1);
-      expect((await setTpEvent)[0].data.msg).to.be.eq('Teleport test set.');
+      expect((await setTpEvent)[0].data.meta.msg).to.be.eq('Teleport test set.');
 
-      const setPublicEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPublicEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setpublic test',
@@ -258,7 +261,9 @@ const tests = [
       });
 
       expect((await setPublicEvent).length).to.be.eq(1);
-      expect((await setPublicEvent)[0].data.msg).to.be.eq('You do not have permission to create public teleports.');
+      expect((await setPublicEvent)[0].data.meta.msg).to.be.eq(
+        'You do not have permission to create public teleports.',
+      );
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -292,7 +297,7 @@ const tests = [
         },
       );
 
-      const setTpEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 4);
+      const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 4);
 
       await Promise.all(
         Array.from({ length: 4 }).map(async (_, i) => {
@@ -306,10 +311,10 @@ const tests = [
       expect((await setTpEvent).length).to.be.eq(4);
 
       for (const event of await setTpEvent) {
-        expect(event.data.msg).to.match(/Teleport test\d set\./);
+        expect(event.data.meta.msg).to.match(/Teleport test\d set\./);
       }
 
-      const setPublicEvent = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 3);
+      const setPublicEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 3);
 
       await Promise.all(
         Array.from({ length: 3 }).map(async (_, i) => {
@@ -323,10 +328,13 @@ const tests = [
       expect((await setPublicEvent).length).to.be.eq(3);
 
       for (const event of await setPublicEvent) {
-        expect(event.data.msg).to.match(/Teleport test\d is now public\./);
+        expect(event.data.meta.msg).to.match(/Teleport test\d is now public\./);
       }
 
-      const setPublicEvent2 = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const setPublicEvent2 = (await new EventsAwaiter().connect(this.client)).waitForEvents(
+        GameEvents.CHAT_MESSAGE,
+        1,
+      );
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/setpublic test4',
@@ -335,7 +343,7 @@ const tests = [
 
       expect((await setPublicEvent2).length).to.be.eq(1);
 
-      expect((await setPublicEvent2)[0].data.msg).to.be.eq(
+      expect((await setPublicEvent2)[0].data.meta.msg).to.be.eq(
         'You have reached the maximum number of public teleports for your role, maximum allowed is 3',
       );
     },