@takaro/modules 0.0.4 → 0.0.5

package/dist/modules/geoBlock/hooks/IPDetected.js

@@ -32,16 +32,16 @@ async function main() {
         await handleAction();
         return;
     }
-}
-if (mode === 'deny') {
-    if (countries.includes(country)) {
-        console.log('Blocked country detected, performing actions');
-        await handleAction();
-        return;
-    }
-    else {
-        console.log('Allowed country detected, no action');
-        return;
+    if (mode === 'deny') {
+        if (countries.includes(country)) {
+            console.log('Blocked country detected, performing actions');
+            await handleAction();
+            return;
+        }
+        else {
+            console.log('Allowed country detected, no action');
+            return;
+        }
     }
 }
 await main();

package/dist/modules/geoBlock/hooks/IPDetected.js.map

@@ -1 +1 @@
-{"version":3,"file":"IPDetected.js","sourceRoot":"","sources":["../../../../src/modules/geoBlock/hooks/IPDetected.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IAE9E,KAAK,UAAU,YAAY;QACzB,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,WAAW,GAAG,IAAI,CAAC,CAAC;YAC/D,MAAM,MAAM,CAAC,UAAU,CAAC,6BAA6B,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,EAAE;gBAC7E,MAAM,EAAE,OAAO;gBACf,SAAS;aACV,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,EAAE;gBAC9E,MAAM,EAAE,OAAO;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAC3D,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,OAAO;IACT,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC5D,MAAM,YAAY,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;AACH,CAAC;AAED,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;IACpB,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC5D,MAAM,YAAY,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;QACnD,OAAO;IACT,CAAC;AACH,CAAC;AAED,MAAM,IAAI,EAAE,CAAC"}
+{"version":3,"file":"IPDetected.js","sourceRoot":"","sources":["../../../../src/modules/geoBlock/hooks/IPDetected.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IAE9E,KAAK,UAAU,YAAY;QACzB,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,WAAW,GAAG,IAAI,CAAC,CAAC;YAC/D,MAAM,MAAM,CAAC,UAAU,CAAC,6BAA6B,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,EAAE;gBAC7E,MAAM,EAAE,OAAO;gBACf,SAAS;aACV,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,CAAC,UAAU,CAAC,8BAA8B,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,EAAE;gBAC9E,MAAM,EAAE,OAAO;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAC3D,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,OAAO;IACT,CAAC;IAED,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QAC5D,MAAM,YAAY,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;IAED,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;YAC5D,MAAM,YAAY,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,IAAI,EAAE,CAAC"}

package/dist/modules/gimme/commands/gimme.js

@@ -12,6 +12,7 @@ async function main() {
         await takaro.gameserver.gameServerControllerGiveItem(data.gameServerId, data.player.id, {
             name: randomOption,
             amount: 1,
+            quality: 0,
         });
         await data.player.pm(`You received ${randomOption}!`);
     }

package/dist/modules/gimme/commands/gimme.js.map

@@ -1 +1 @@
-{"version":3,"file":"gimme.js","sourceRoot":"","sources":["../../../../src/modules/gimme/commands/gimme.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;IAEjD,IAAI,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,eAAe,CACvB,iGAAiG,CAClG,CAAC;IACJ,CAAC;IAED,oFAAoF;IACpF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjF,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,WAAW,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACtF,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,YAAY,GAAG,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,CAAC,UAAU,CAAC,kCAAkC,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3G,CAAC;AACH,CAAC;AAED,MAAM,IAAI,EAAE,CAAC"}
+{"version":3,"file":"gimme.js","sourceRoot":"","sources":["../../../../src/modules/gimme/commands/gimme.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;IAEjD,IAAI,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,eAAe,CACvB,iGAAiG,CAClG,CAAC;IACJ,CAAC;IAED,oFAAoF;IACpF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACjF,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,WAAW,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACtF,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,YAAY,GAAG,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,CAAC,UAAU,CAAC,kCAAkC,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3G,CAAC;AACH,CAAC;AAED,MAAM,IAAI,EAAE,CAAC"}

package/dist/modules.json

@@ -272,7 +272,7 @@
   {
     "commands": [
       {
-        "function": "import { takaro, data, TakaroUserError } from '@takaro/helpers';\nasync function main() {\n    const items = data.module.userConfig.items;\n    const commands = data.module.userConfig.commands;\n    if (items.length + commands.length === 0) {\n        throw new TakaroUserError('No items or commands configured, please ask your server administrator to configure this module.');\n    }\n    // pick a random item between 0 and the length of both the items and commands arrays\n    const randomIndex = Math.floor(Math.random() * (items.length + commands.length));\n    const randomOption = items.concat(commands)[randomIndex];\n    if (randomIndex < items.length) {\n        await takaro.gameserver.gameServerControllerGiveItem(data.gameServerId, data.player.id, {\n            name: randomOption,\n            amount: 1,\n        });\n        await data.player.pm(`You received ${randomOption}!`);\n    }\n    else {\n        await takaro.gameserver.gameServerControllerExecuteCommand(data.gameServerId, { command: randomOption });\n    }\n}\nawait main();\n//# sourceMappingURL=gimme.js.map",
+        "function": "import { takaro, data, TakaroUserError } from '@takaro/helpers';\nasync function main() {\n    const items = data.module.userConfig.items;\n    const commands = data.module.userConfig.commands;\n    if (items.length + commands.length === 0) {\n        throw new TakaroUserError('No items or commands configured, please ask your server administrator to configure this module.');\n    }\n    // pick a random item between 0 and the length of both the items and commands arrays\n    const randomIndex = Math.floor(Math.random() * (items.length + commands.length));\n    const randomOption = items.concat(commands)[randomIndex];\n    if (randomIndex < items.length) {\n        await takaro.gameserver.gameServerControllerGiveItem(data.gameServerId, data.player.id, {\n            name: randomOption,\n            amount: 1,\n            quality: 0,\n        });\n        await data.player.pm(`You received ${randomOption}!`);\n    }\n    else {\n        await takaro.gameserver.gameServerControllerExecuteCommand(data.gameServerId, { command: randomOption });\n    }\n}\nawait main();\n//# sourceMappingURL=gimme.js.map",
         "name": "gimme",
         "trigger": "gimme",
         "helpText": "Randomly selects item from a list of items and entities.",
@@ -477,7 +477,7 @@
       {
         "eventType": "player-new-ip-detected",
         "name": "IPDetected",
-        "function": "import { takaro, data, checkPermission } from '@takaro/helpers';\nasync function main() {\n    const { gameServerId, player, pog } = data;\n    const { country } = data.eventData;\n    const { ban, banDuration, countries, message, mode } = data.module.userConfig;\n    async function handleAction() {\n        if (ban) {\n            const now = new Date();\n            const expiresAt = new Date(now.getTime() + banDuration * 1000);\n            await takaro.gameserver.gameServerControllerBanPlayer(gameServerId, player.id, {\n                reason: message,\n                expiresAt,\n            });\n        }\n        else {\n            await takaro.gameserver.gameServerControllerKickPlayer(gameServerId, player.id, {\n                reason: message,\n            });\n        }\n    }\n    const isImmune = checkPermission(pog, 'GEOBLOCK_IMMUNITY');\n    if (isImmune) {\n        console.log('Player has immunity, no action');\n        return;\n    }\n    if (mode === 'allow') {\n        if (countries.includes(country)) {\n            console.log('Allowed country detected, no action');\n            return;\n        }\n        console.log('Blocked country detected, performing actions');\n        await handleAction();\n        return;\n    }\n}\nif (mode === 'deny') {\n    if (countries.includes(country)) {\n        console.log('Blocked country detected, performing actions');\n        await handleAction();\n        return;\n    }\n    else {\n        console.log('Allowed country detected, no action');\n        return;\n    }\n}\nawait main();\n//# sourceMappingURL=IPDetected.js.map"
+        "function": "import { takaro, data, checkPermission } from '@takaro/helpers';\nasync function main() {\n    const { gameServerId, player, pog } = data;\n    const { country } = data.eventData;\n    const { ban, banDuration, countries, message, mode } = data.module.userConfig;\n    async function handleAction() {\n        if (ban) {\n            const now = new Date();\n            const expiresAt = new Date(now.getTime() + banDuration * 1000);\n            await takaro.gameserver.gameServerControllerBanPlayer(gameServerId, player.id, {\n                reason: message,\n                expiresAt,\n            });\n        }\n        else {\n            await takaro.gameserver.gameServerControllerKickPlayer(gameServerId, player.id, {\n                reason: message,\n            });\n        }\n    }\n    const isImmune = checkPermission(pog, 'GEOBLOCK_IMMUNITY');\n    if (isImmune) {\n        console.log('Player has immunity, no action');\n        return;\n    }\n    if (mode === 'allow') {\n        if (countries.includes(country)) {\n            console.log('Allowed country detected, no action');\n            return;\n        }\n        console.log('Blocked country detected, performing actions');\n        await handleAction();\n        return;\n    }\n    if (mode === 'deny') {\n        if (countries.includes(country)) {\n            console.log('Blocked country detected, performing actions');\n            await handleAction();\n            return;\n        }\n        else {\n            console.log('Allowed country detected, no action');\n            return;\n        }\n    }\n}\nawait main();\n//# sourceMappingURL=IPDetected.js.map"
       }
     ],
     "cronJobs": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takaro/modules",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Built-in modules for Takaro",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",

package/src/__tests__/aliases.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 = 'Aliases';
@@ -25,23 +25,23 @@ const tests = [
         },
       );
 
-      const setEvents = this.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(this.setupData.gameserver.id, {
         msg: '/settp test',
         playerId: this.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 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: '/tellyport test',
         playerId: this.setupData.players[0].id,
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.be.eq('Teleported to test.');
+      expect((await events)[0].data.meta.msg).to.be.eq('Teleported to test.');
     },
   }),
 ];

package/src/__tests__/bugRepros.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 { EventChatMessageChannelEnum } from '@takaro/apiclient';
 
@@ -46,7 +46,7 @@ const tests = [
 
       await this.client.gameserver.gameServerControllerInstallModule(this.setupData.gameserver.id, mod.id);
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       await this.client.hook.hookControllerTrigger({
         eventType: 'chat-message',
@@ -60,7 +60,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(2);
-      expect((await events).map((e) => e.data.msg)).to.include.members(['First hook', 'Second hook']);
+      expect((await events).map((e) => e.data.meta.msg)).to.include.members(['First hook', 'Second hook']);
     },
   }),
 ];

package/src/__tests__/commandArgs.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/gameEvents.js';
 import { CommandArgumentCreateDTO } from '@takaro/apiclient';
 
@@ -76,7 +76,7 @@ const tests = [
       },
     ]),
     test: async function () {
-      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: '/test "test"',
@@ -84,7 +84,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(
         'The value for "test" should be a number. Please correct it and try again.',
       );
     },
@@ -99,7 +99,7 @@ const tests = [
       { name: 'number', type: 'number', position: 2, defaultValue: '42' },
     ]),
     test: async function () {
-      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: '/test "test"',
@@ -107,7 +107,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.be.eq('{"name":"test","public":false,"number":42}');
+      expect((await events)[0].data.meta.msg).to.be.eq('{"name":"test","public":false,"number":42}');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -119,7 +119,7 @@ const tests = [
       { name: 'public', type: 'boolean', position: 1 },
     ]),
     test: async function () {
-      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: '/test "test test" true',
@@ -127,7 +127,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.be.eq('{"name":"test test","public":true}');
+      expect((await events)[0].data.meta.msg).to.be.eq('{"name":"test test","public":true}');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -136,7 +136,7 @@ const tests = [
     snapshot: false,
     setup: playerArgSetup,
     test: async function () {
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       const pogRes = await this.client.playerOnGameserver.playerOnGameServerControllerSearch({
         filters: {
@@ -152,8 +152,8 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(2);
-      expect((await events)[0].data.msg).to.be.eq(pog.gameId);
-      expect((await events)[1].data.msg).to.be.eq(pog.positionX?.toString());
+      expect((await events)[0].data.meta.msg).to.be.eq(pog.gameId);
+      expect((await events)[1].data.meta.msg).to.be.eq(pog.positionX?.toString());
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -162,7 +162,7 @@ const tests = [
     snapshot: false,
     setup: playerArgSetup,
     test: async function () {
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       const pogRes = await this.client.playerOnGameserver.playerOnGameServerControllerSearch({
         filters: {
@@ -178,8 +178,8 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(2);
-      expect((await events)[0].data.msg).to.be.eq(pog.gameId);
-      expect((await events)[1].data.msg).to.be.eq(pog.positionX?.toString());
+      expect((await events)[0].data.meta.msg).to.be.eq(pog.gameId);
+      expect((await events)[1].data.meta.msg).to.be.eq(pog.positionX?.toString());
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -188,7 +188,7 @@ const tests = [
     snapshot: false,
     setup: playerArgSetup,
     test: async function () {
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       const pogRes = await this.client.playerOnGameserver.playerOnGameServerControllerSearch({
         filters: {
@@ -204,8 +204,8 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(2);
-      expect((await events)[0].data.msg).to.be.eq(pog.gameId);
-      expect((await events)[1].data.msg).to.be.eq(pog.positionX?.toString());
+      expect((await events)[0].data.meta.msg).to.be.eq(pog.gameId);
+      expect((await events)[1].data.meta.msg).to.be.eq(pog.positionX?.toString());
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -214,7 +214,7 @@ const tests = [
     snapshot: false,
     setup: playerArgSetup,
     test: async function () {
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       const pogRes = await this.client.playerOnGameserver.playerOnGameServerControllerSearch({
         filters: {
@@ -230,8 +230,8 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(2);
-      expect((await events)[0].data.msg).to.be.eq(pog.gameId);
-      expect((await events)[1].data.msg).to.be.eq(pog.positionX?.toString());
+      expect((await events)[0].data.meta.msg).to.be.eq(pog.gameId);
+      expect((await events)[1].data.meta.msg).to.be.eq(pog.positionX?.toString());
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -240,7 +240,7 @@ const tests = [
     snapshot: false,
     setup: playerArgSetup,
     test: async function () {
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       // Find a letter contained in one of the players' names
       const letterToSearch = ['e', 'a'].find((letter) => {
@@ -255,7 +255,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.match(/Multiple players found/);
+      expect((await events)[0].data.meta.msg).to.match(/Multiple players found/);
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -264,7 +264,7 @@ const tests = [
     snapshot: false,
     setup: playerArgSetup,
     test: async function () {
-      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: '/test itsimpossiblethatwewilleverfindaplayerwiththisnameright',
@@ -272,7 +272,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.match(/No player found with the name or ID/);
+      expect((await events)[0].data.meta.msg).to.match(/No player found with the name or ID/);
     },
   }),
 ];

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

@@ -1,4 +1,11 @@
-import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, chatMessageSorter } from '@takaro/test';
+import {
+  IntegrationTest,
+  expect,
+  IModuleTestsSetupData,
+  modulesTestSetup,
+  chatMessageSorter,
+  EventsAwaiter,
+} from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 
 const group = 'Economy utils suite';
@@ -33,7 +40,7 @@ const tests = [
         this.setupData.economyUtilsModule.id,
       );
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/balance',
@@ -61,8 +68,8 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(2);
-      expect((await events)[0].data.msg).to.be.eq('balance: 0 test coin');
-      expect((await events)[1].data.msg).to.be.eq('balance: 1000 test coin');
+      expect((await events)[0].data.meta.msg).to.be.eq('balance: 0 test coin');
+      expect((await events)[1].data.meta.msg).to.be.eq('balance: 1000 test coin');
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -95,14 +102,14 @@ const tests = [
       await Promise.all(giveCurrencies);
 
       // title message (1) + balance of player messages (5)
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 6);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 6);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/topcurrency',
         playerId: this.setupData.players[0].id,
       });
 
-      const messages = (await events).map((e) => e.data.msg as string);
+      const messages = (await events).map((e) => e.data.meta.msg as string);
       expect((await events).length).to.be.eq(6);
       for (const message of messages) {
         expect(message).to.match(
@@ -142,14 +149,14 @@ const tests = [
       if (!receiverPog) throw new Error('Receiver playerOnGameServer does not exist');
       expect(receiverPog.currency).to.be.eq(0);
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: `/transfer ${receiver.name} ${transferAmount}`,
         playerId: sender.id,
       });
 
-      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
       expect((await events).length).to.be.eq(2);
 
       // check if balances are correct
@@ -184,14 +191,14 @@ const tests = [
       const receiver = this.setupData.players[1];
       const transferAmount = 500;
 
-      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: `/transfer ${receiver.name} ${transferAmount}`,
         playerId: sender.id,
       });
 
-      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
       expect((await events).length).to.be.eq(1);
       expect(messages[0]).to.be.eq(
         `Failed to transfer ${transferAmount} test coin to ${receiver.name}. Are you sure you have enough balance?`,
@@ -237,14 +244,14 @@ const tests = [
       if (!receiverPog) throw new Error('Receiver playerOnGameServer does not exist');
       expect(receiverPog.currency).to.be.eq(0);
 
-      let events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      let events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: `/transfer ${receiver.name} ${transferAmount}`,
         playerId: sender.id,
       });
 
-      let messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      let messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
 
       // check if balances have not changed yet
       expect(
@@ -271,13 +278,13 @@ const tests = [
       // =================================================
       // transfer confirmed
       // =================================================
-      events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: `${prefix}confirmtransfer`,
         playerId: sender.id,
       });
 
-      messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
       expect((await events).length).to.be.eq(2);
       expect(
         (
@@ -315,13 +322,13 @@ 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: '/confirmtransfer',
         playerId: this.setupData.players[0].id,
       });
 
-      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
       expect(messages[0]).to.be.eq('You have no pending transfer.');
     },
   }),
@@ -356,13 +363,13 @@ const tests = [
       if (!receiverPog) throw new Error('Receiver playerOnGameServer does not exist');
       expect(receiverPog.currency).to.be.eq(0);
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: `/grantcurrency ${receiver.name} ${grantAmount}`,
         playerId: granter.id,
       });
 
-      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
       expect(
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
@@ -418,13 +425,13 @@ const tests = [
         receiver.playerOnGameServers?.find((pog) => pog.gameServerId === this.setupData.gameserver.id)?.currency,
       ).to.be.eq(0);
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: `/revokecurrency ${receiver.name} ${revokeAmount}`,
         playerId: revoker.id,
       });
 
-      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
       expect(
         (
           await this.client.playerOnGameserver.playerOnGameServerControllerGetOne(
@@ -462,7 +469,7 @@ const tests = [
         receiver.playerOnGameServers?.find((pog) => pog.gameServerId === this.setupData.gameserver.id)?.currency,
       ).to.be.eq(0);
 
-      const events = this.setupData.eventAwaiter.waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: `/grantcurrency ${receiver.name} ${amount}`,
         playerId: sender.id,
@@ -473,7 +480,7 @@ const tests = [
         playerId: sender.id,
       });
 
-      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.msg as string);
+      const messages = (await events).sort(chatMessageSorter).map((e) => e.data.meta.msg as string);
       expect(messages[0]).to.be.eq('You do not have permission to use grant currency command.');
       expect(messages[1]).to.be.eq('You do not have permission to use revoke currency command.');
     },

package/src/__tests__/geoblock.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 { HookEvents } from '../dto/index.js';
 import { TakaroEventPlayerNewIpDetected } from '@takaro/modules';
 import { faker } from '@faker-js/faker';
@@ -35,7 +35,7 @@ const tests = [
           }),
         },
       );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.PLAYER_DISCONNECTED);
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,
         playerId: this.setupData.players[0].id,
@@ -50,8 +50,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.match(/Kicked Your IP address is banned/);
-      expect((await events)[0].data.player.name).to.be.eq(this.setupData.players[0].name);
+      expect((await events)[0].data.playerId).to.be.eq(this.setupData.players[0].id);
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -71,7 +70,7 @@ const tests = [
           }),
         },
       );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.HOOK_EXECUTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.HOOK_EXECUTED);
 
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,
@@ -110,7 +109,7 @@ const tests = [
           }),
         },
       );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.HOOK_EXECUTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.HOOK_EXECUTED);
 
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,
@@ -149,7 +148,7 @@ const tests = [
           }),
         },
       );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.PLAYER_DISCONNECTED);
 
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,
@@ -165,8 +164,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.match(/Kicked Your IP address is banned/);
-      expect((await events)[0].data.player.name).to.be.eq(this.setupData.players[0].name);
+      expect((await events)[0].data.playerId).to.be.eq(this.setupData.players[0].id);
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -186,7 +184,7 @@ const tests = [
           }),
         },
       );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.PLAYER_DISCONNECTED);
 
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,
@@ -202,46 +200,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.match(/Banned Your IP address is banned/);
-      expect((await events)[0].data.player.name).to.be.eq(this.setupData.players[0].name);
-    },
-  }),
-  new IntegrationTest<IModuleTestsSetupData>({
-    group,
-    snapshot: false,
-    setup: customSetup,
-    name: 'MESSAGE CONFIGURATION: Custom message displayed to player on kick/ban',
-    test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.geoBlockModule.id,
-        {
-          userConfig: JSON.stringify({
-            mode: 'allow',
-            countries: ['RU'],
-            ban: true,
-            message: 'Custom message',
-          }),
-        },
-      );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
-
-      await this.client.hook.hookControllerTrigger({
-        gameServerId: this.setupData.gameserver.id,
-        playerId: this.setupData.players[0].id,
-        eventType: HookEvents.PLAYER_NEW_IP_DETECTED,
-        eventMeta: new TakaroEventPlayerNewIpDetected({
-          city: 'nowhere',
-          country: 'BE',
-          latitude: '0',
-          longitude: '0',
-          ip: faker.internet.ip(),
-        }),
-      });
-
-      expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.match(/Banned Custom message/);
-      expect((await events)[0].data.player.name).to.be.eq(this.setupData.players[0].name);
+      expect((await events)[0].data.playerId).to.be.eq(this.setupData.players[0].id);
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -262,7 +221,7 @@ const tests = [
           }),
         },
       );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.PLAYER_DISCONNECTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.PLAYER_DISCONNECTED);
 
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,
@@ -278,8 +237,7 @@ const tests = [
       });
 
       expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.msg).to.match(/Banned Custom message/);
-      expect((await events)[0].data.player.name).to.be.eq(this.setupData.players[0].name);
+      expect((await events)[0].data.playerId).to.be.eq(this.setupData.players[0].id);
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -308,7 +266,7 @@ const tests = [
 
       await this.client.player.playerControllerAssignRole(this.setupData.players[0].id, roleRes.data.data.id);
 
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.HOOK_EXECUTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.HOOK_EXECUTED);
 
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,
@@ -348,7 +306,7 @@ const tests = [
           }),
         },
       );
-      const events = this.setupData.eventAwaiter.waitForEvents(HookEvents.HOOK_EXECUTED);
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.HOOK_EXECUTED);
 
       await this.client.hook.hookControllerTrigger({
         gameServerId: this.setupData.gameserver.id,