@takaro/modules 0.0.14 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takaro/modules",
-  "version": "0.0.14",
+  "version": "0.0.18",
   "description": "Built-in modules for Takaro",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
@@ -9,10 +9,7 @@
     "start:dev": "tsc --watch --preserveWatchOutput -p ./tsconfig.build.json",
     "build": "tsc -p ./tsconfig.build.json",
     "postbuild": "npm run build:builtin-json",
-    "test": "npm run test:unit --if-present && npm run test:integration --if-present",
-    "test:unit": "mocha --config ../../.mocharc.js src/**/*.unit.test.ts",
-    "test:integration": "mocha --file ../test/dist/waitUntilReady.js --config ../../.mocharc.js 'src/**/*.integration.test.ts' --exit",
-    "build:builtin-json": "node --loader ts-node/esm ./scripts/buildBuiltinJson.ts"
+    "build:builtin-json": "node --import=ts-node-maintained/register/esm ./scripts/buildBuiltinJson.ts"
   },
   "keywords": [],
   "author": "",

package/scripts/buildBuiltinJson.ts

@@ -1,7 +1,7 @@
 import 'reflect-metadata';
 import { getModules } from '@takaro/modules';
 import { writeFile } from 'fs/promises';
-import { readdir, readFile } from 'node:fs/promises';
+import { readdir, readFile, stat } from 'node:fs/promises';
 import path from 'path';
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
@@ -12,7 +12,7 @@ async function main() {
   const modules = getModules();
   const modulesJson = JSON.stringify(modules, null, 2);
   await writeFile('dist/modules.json', modulesJson);
-  await writeFile('../web-docs/docs/modules.json', modulesJson);
+  await writeFile('../web-docs/docs/modules/modules.json', modulesJson);
   await writeFile('../e2e/src/web-main/fixtures/modules.json', modulesJson);
 
   // Community modules
@@ -28,6 +28,54 @@ async function main() {
   await writeFile('dist/community-modules.json', communityModulesJson);
   await writeFile('../web-docs/docs/community-modules.json', communityModulesJson);
   await writeFile('../e2e/src/web-main/fixtures/community-modules.json', communityModulesJson);
+
+  const startMarker = '{/* AUTO-GENERATED CONTENT () */}';
+  const endMarker = '{/* END AUTO-GENERATED CONTENT */}';
+
+  // Generate docs pages for each builtin module
+  for (const mod of modules) {
+    const fileExists = await stat(`../web-docs/docs/modules/${mod.name}.mdx`).catch(() => null);
+    // This is also generated, but docusaurus takes the first content of the page as the title, so we cannot put the auto-generated content at the top
+    const autoGeneratedContent = `---
+description: ${mod.versions.find((v) => v.tag === 'latest')?.description}
+---
+
+${startMarker}
+
+import { Commands, Config, CronJobs, Hooks } from './helpers';
+
+# ${mod.name}
+
+export function Module() {
+  const mod = ${JSON.stringify(mod, null, 2)};
+
+  return (
+    <div>
+      <p>{mod.versions[0].description}</p>
+      <Commands commands={mod.versions[0].commands} />
+      <CronJobs cronJobs={mod.versions[0].cronJobs} />
+      <Hooks hooks={mod.versions[0].hooks} />
+      <Config configSchema={mod.versions[0].configSchema} />
+    </div>
+  )
+}
+
+<Module />
+
+${endMarker}`;
+
+    // If file doesnt exist yet, create it
+    if (!fileExists) {
+      await writeFile(`../web-docs/docs/modules/${mod.name}.mdx`, autoGeneratedContent);
+    } else {
+      const existingFile = await readFile(`../web-docs/docs/modules/${mod.name}.mdx`, 'utf-8');
+      // Otherwise, fine the auto generated content markers and replace it
+      const end = existingFile.indexOf(endMarker) + endMarker.length;
+
+      const newFile = autoGeneratedContent + existingFile.slice(end);
+      await writeFile(`../web-docs/docs/modules/${mod.name}.mdx`, newFile);
+    }
+  }
 }
 
 main().catch(console.error);

package/src/BuiltinModule.ts

@@ -77,40 +77,48 @@ export class IPermission extends TakaroDTO<IPermission> {
   canHaveCount?: boolean;
 }
 
-export class BuiltinModule<T> extends TakaroDTO<T> {
-  constructor(name: string, description: string, configSchema: string, uiSchema: string = JSON.stringify({})) {
-    super();
-    this.name = name;
-    this.description = description;
-    this.configSchema = configSchema;
-    this.uiSchema = uiSchema;
-  }
-
+export class ModuleTransferVersionDTO<T> extends TakaroDTO<T> {
   @IsString()
-  public name: string;
+  public tag: string;
   @IsString()
   public description: string;
   @IsString()
   public configSchema: string;
   @IsString()
-  public uiSchema: string;
-
+  public uiSchema = '{}';
   @ValidateNested({ each: true })
   @Type(() => ICommand)
-  public commands: Array<ICommand> = [];
+  @IsOptional()
+  public commands?: Array<ICommand>;
   @ValidateNested({ each: true })
   @Type(() => IHook)
-  public hooks: Array<IHook> = [];
+  @IsOptional()
+  public hooks?: Array<IHook>;
   @ValidateNested({ each: true })
   @Type(() => ICronJob)
-  public cronJobs: Array<ICronJob> = [];
+  @IsOptional()
+  public cronJobs?: Array<ICronJob>;
   @ValidateNested({ each: true })
   @Type(() => IFunction)
-  public functions: Array<IFunction> = [];
+  @IsOptional()
+  public functions?: Array<IFunction>;
   @IsArray()
   @Type(() => IPermission)
   @ValidateNested({ each: true })
-  public permissions: IPermission[] = [];
+  @IsOptional()
+  public permissions?: IPermission[];
+}
+
+export class ModuleTransferDTO<T> extends TakaroDTO<T> {
+  @IsString()
+  public name: string;
+  @IsString()
+  @IsOptional()
+  takaroVersion = process.env.TAKARO_VERSION;
+
+  @ValidateNested({ each: true })
+  @Type(() => ModuleTransferVersionDTO)
+  versions: ModuleTransferVersionDTO<T>[];
 
   protected loadFn(type: 'commands' | 'hooks' | 'cronJobs' | 'functions', name: string) {
     const folderPath = path.join(__dirname, 'modules', this.name, type);

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

@@ -1,5 +1,6 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
+import { describe } from 'node:test';
 
 const group = 'Aliases';
 
@@ -10,20 +11,18 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Can install and use aliases',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-        {
-          systemConfig: JSON.stringify({
-            commands: {
-              teleport: {
-                delay: 0,
-                aliases: ['tp', 'tellyport'],
-              },
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+        systemConfig: JSON.stringify({
+          commands: {
+            teleport: {
+              delay: 0,
+              aliases: ['tp', 'tellyport'],
             },
-          }),
-        },
-      );
+          },
+        }),
+      });
 
       const setEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
@@ -50,20 +49,18 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Aliases are case insensitive',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-        {
-          systemConfig: JSON.stringify({
-            commands: {
-              teleport: {
-                delay: 0,
-                aliases: ['tp', 'tellyport'],
-              },
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+        systemConfig: JSON.stringify({
+          commands: {
+            teleport: {
+              delay: 0,
+              aliases: ['tp', 'tellyport'],
             },
-          }),
-        },
-      );
+          },
+        }),
+      });
 
       const setEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {

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

@@ -1,6 +1,8 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents, HookEvents } from '../dto/index.js';
 import { EventChatMessageChannelEnum } from '@takaro/apiclient';
+import { randomUUID } from 'crypto';
+import { describe } from 'node:test';
 
 const group = 'Bug repros';
 
@@ -30,7 +32,7 @@ const tests = [
       // Add the buggy hooks
       await this.client.hook.hookControllerCreate({
         name: 'Test hook 1',
-        moduleId: mod.id,
+        versionId: mod.latestVersion.id,
         regex: 'test msg',
         eventType: 'chat-message',
         function: genFn('First'),
@@ -38,13 +40,16 @@ const tests = [
 
       await this.client.hook.hookControllerCreate({
         name: 'Test hook 2',
-        moduleId: mod.id,
+        versionId: mod.latestVersion.id,
         regex: 'test msg',
         eventType: 'chat-message',
         function: genFn('Second'),
       });
 
-      await this.client.gameserver.gameServerControllerInstallModule(this.setupData.gameserver.id, mod.id);
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: mod.latestVersion.id,
+      });
 
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
 
@@ -79,7 +84,7 @@ const tests = [
       ).data.data;
       await this.client.hook.hookControllerCreate({
         name: 'Test hook 1',
-        moduleId: mod.id,
+        versionId: mod.latestVersion.id,
         regex: 'test msg',
         eventType: 'chat-message',
         function: `import { data, takaro } from '@takaro/helpers';
@@ -91,7 +96,10 @@ const tests = [
         await main();`,
       });
 
-      await this.client.gameserver.gameServerControllerInstallModule(this.setupData.gameserver.id, mod.id);
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: mod.latestVersion.id,
+      });
 
       const listener = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.HOOK_EXECUTED, 1);
 
@@ -113,6 +121,59 @@ const tests = [
       expect(msgs).to.include.members(['foo', JSON.stringify({ foo: 'bar' }), JSON.stringify(['baz', 1])]);
     },
   }),
+  /**
+   * Repro for `console.log`ging `undefined`
+   */
+  new IntegrationTest<IModuleTestsSetupData>({
+    group,
+    snapshot: false,
+    name: 'Bug repro: console.log in a function works with undefined and null objects',
+    setup: modulesTestSetup,
+    test: async function () {
+      const mod = (
+        await this.client.module.moduleControllerCreate({
+          name: 'Test module',
+        })
+      ).data.data;
+      await this.client.hook.hookControllerCreate({
+        name: 'Test hook 1',
+        versionId: mod.latestVersion.id,
+        regex: 'test msg',
+        eventType: 'chat-message',
+        function: `import { data, takaro } from '@takaro/helpers';
+        async function main() {
+          console.log(undefined);
+          console.log(null);
+        }
+        await main();`,
+      });
+
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: mod.latestVersion.id,
+      });
+
+      const listener = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.HOOK_EXECUTED, 1);
+
+      await this.client.hook.hookControllerTrigger({
+        eventType: 'chat-message',
+        gameServerId: this.setupData.gameserver.id,
+        moduleId: mod.id,
+        playerId: this.setupData.players[0].id,
+        eventMeta: {
+          msg: 'test msg',
+          channel: EventChatMessageChannelEnum.Global,
+        },
+      });
+
+      const result = (await listener)[0].data.meta.result;
+      expect(result.success).to.be.true;
+      const logs = result.logs;
+      const msgs = logs.map((l: any) => l.msg);
+      expect(msgs[0]).to.be.eq('undefined');
+      expect(msgs[1]).to.be.eq('null');
+    },
+  }),
   /**
    * Repro for https://github.com/gettakaro/takaro/issues/1047
    * System config uses the names of functions to create structure
@@ -131,7 +192,7 @@ const tests = [
       ).data.data;
       const createdCommand = await this.client.command.commandControllerCreate({
         name: 'testcmd',
-        moduleId: mod.id,
+        versionId: mod.latestVersion.id,
         trigger: 'testpong',
         function: `import { data, takaro } from '@takaro/helpers';
         async function main() {
@@ -143,7 +204,9 @@ const tests = [
         await main();`,
       });
 
-      await this.client.gameserver.gameServerControllerInstallModule(this.setupData.gameserver.id, mod.id, {
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: mod.latestVersion.id,
         userConfig: JSON.stringify({}),
         systemConfig: JSON.stringify({ commands: { testcmd: { aliases: ['foobar'] } } }),
       });
@@ -190,7 +253,7 @@ const tests = [
       ).data.data;
       await this.client.command.commandControllerCreate({
         name: 'testcmd',
-        moduleId: mod.id,
+        versionId: mod.latestVersion.id,
         trigger: 'test',
         // Yes, very bad code! This is what a user might accidentally do
         function: `import { data, takaro } from '@takaro/helpers';
@@ -207,7 +270,9 @@ const tests = [
           `,
       });
 
-      await this.client.gameserver.gameServerControllerInstallModule(this.setupData.gameserver.id, mod.id, {
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: mod.latestVersion.id,
         userConfig: JSON.stringify({}),
         systemConfig: JSON.stringify({}),
       });
@@ -219,12 +284,198 @@ const tests = [
         playerId: this.setupData.players[0].id,
       });
 
-      console.log(JSON.stringify((await events)[0].data.meta.result, null, 2));
       const result = (await events)[0].data.meta.result;
       expect(result.success).to.be.false;
       expect(result.reason).to.include('SyntaxError: Unexpected end of input.');
     },
   }),
+  /**
+   * Create a module with a version and command that returns a 'hello world' message and tag it
+   * Install the module and trigger the command
+   * Then, edit the command so it returns a 'goodbye world' message and tag the module again
+   * Trigger the command again and check if the message is 'goodbye world'   *
+   */
+  new IntegrationTest<IModuleTestsSetupData>({
+    group,
+    snapshot: false,
+    name: 'Bug repro: command code not updated after tag change',
+    setup: modulesTestSetup,
+    test: async function () {
+      const mod = (
+        await this.client.module.moduleControllerCreate({
+          name: 'Test module',
+        })
+      ).data.data;
+      const createdCommand = await this.client.command.commandControllerCreate({
+        name: 'testcmd',
+        versionId: mod.latestVersion.id,
+        trigger: 'test',
+        function: `import { data, takaro } from '@takaro/helpers';
+        async function main() {
+            const { player } = data;
+            await takaro.gameserver.gameServerControllerSendMessage(data.gameServerId, {
+                message: 'hello world',
+            });
+        }
+        await main();`,
+      });
+
+      const tagRes1 = await this.client.module.moduleVersionControllerTagVersion({
+        moduleId: mod.id,
+        tag: '0.0.1',
+      });
+
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: tagRes1.data.data.id,
+        userConfig: JSON.stringify({}),
+        systemConfig: JSON.stringify({}),
+      });
+
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+
+      await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
+        msg: '/test',
+        playerId: this.setupData.players[0].id,
+      });
+
+      expect((await events).length).to.be.eq(1);
+      expect((await events)[0].data.meta.msg).to.be.eq('hello world');
+
+      // Update the command
+      await this.client.command.commandControllerUpdate(createdCommand.data.data.id, {
+        function: `import { data, takaro } from '@takaro/helpers';
+        async function main() {
+            const { player } = data;
+            await takaro.gameserver.gameServerControllerSendMessage(data.gameServerId, {
+              message: 'goodbye world',
+            });
+        }
+        await main();`,
+      });
+
+      const tagRes2 = await this.client.module.moduleVersionControllerTagVersion({
+        moduleId: mod.id,
+        tag: '0.0.2',
+      });
+
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: tagRes2.data.data.id,
+        userConfig: JSON.stringify({}),
+        systemConfig: JSON.stringify({}),
+      });
+
+      const eventsAfter = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+
+      await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
+        msg: '/test',
+        playerId: this.setupData.players[0].id,
+      });
+
+      expect((await eventsAfter).length).to.be.eq(1);
+      expect((await eventsAfter)[0].data.meta.msg).to.be.eq('goodbye world');
+    },
+  }),
+  new IntegrationTest<IModuleTestsSetupData>({
+    group,
+    snapshot: false,
+    name: 'Bug repro: permissions from old module versions cleanly transfer when upgrading',
+    setup: modulesTestSetup,
+    /**
+     * Scenario:
+     * Module with PermA, v0.0.1 is installed
+     * User then tags v0.0.2 and installs this
+     * Players with permA can still use the module function that requires that permission
+     */
+    test: async function () {
+      const permission = 'USE_TEST_PERMISSION';
+      const module = (
+        await this.client.module.moduleControllerCreate({
+          name: randomUUID(),
+          latestVersion: {
+            permissions: [{ permission, canHaveCount: false, friendlyName: 'test', description: 'blabla test' }],
+          },
+        })
+      ).data.data;
+
+      await this.client.command.commandControllerCreate({
+        name: 'test',
+        versionId: module.latestVersion.id,
+        trigger: 'test',
+        function: `import { data, takaro, checkPermission } from '@takaro/helpers';
+        async function main() {
+            const { player, pog } = data;
+
+              if (!checkPermission(pog, '${permission}')) {
+                await takaro.gameserver.gameServerControllerSendMessage('${this.setupData.gameserver.id}', {
+                    message: 'no permission',
+                });
+              } else {
+                await takaro.gameserver.gameServerControllerSendMessage('${this.setupData.gameserver.id}', {
+                    message: 'yes permission',
+                });               
+              }
+
+        }
+        await main();`,
+      });
+
+      // Create version 0.0.1
+      const v1 = (
+        await this.client.module.moduleVersionControllerTagVersion({
+          moduleId: module.id,
+          tag: '0.0.1',
+        })
+      ).data.data;
+
+      // Install this version
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: v1.id,
+      });
+
+      // Create a role with the permission
+      const permissionCode = await this.client.permissionCodesToInputs([permission]);
+      const role = (await this.client.role.roleControllerCreate({ name: 'testing role', permissions: permissionCode }))
+        .data.data;
+
+      // Assign the role to a player
+      await this.client.player.playerControllerAssignRole(this.setupData.players[0].id, role.id);
+
+      // Firing the command should return 'yes permission'
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
+        msg: '/test',
+        playerId: this.setupData.players[0].id,
+      });
+
+      expect((await events)[0].data.meta.msg).to.be.eq('yes permission');
+
+      // Tag a new version
+      const v2 = (
+        await this.client.module.moduleVersionControllerTagVersion({
+          moduleId: module.id,
+          tag: '0.0.2',
+        })
+      ).data.data;
+
+      // Install this version
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: v2.id,
+      });
+
+      // Firing the command should return 'yes permission'
+      const eventsAfter = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
+      await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
+        msg: '/test',
+        playerId: this.setupData.players[0].id,
+      });
+
+      expect((await eventsAfter)[0].data.meta.msg).to.be.eq('yes permission');
+    },
+  }),
 ];
 
 describe(group, function () {

package/src/__tests__/builtinmodule.unit.test.ts

@@ -1,5 +1,6 @@
 import { expect } from '@takaro/test';
 import { getModules } from '../main.js';
+import { describe, it } from 'node:test';
 
 describe('BuiltInModule', () => {
   it('Can load module items', async () => {
@@ -8,6 +9,7 @@ describe('BuiltInModule', () => {
     const utilsModule = mods.find((mod) => mod.name === 'utils');
 
     expect(utilsModule).to.not.be.undefined;
-    expect(utilsModule?.commands).to.have.length(2);
+    expect(utilsModule?.versions).to.have.length(1);
+    expect(utilsModule?.versions[0].commands).to.have.length(2);
   });
 });

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

@@ -1,6 +1,7 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../dto/gameEvents.js';
 import { CommandArgumentCreateDTO } from '@takaro/apiclient';
+import { describe } from 'node:test';
 
 const group = 'Command args';
 
@@ -14,7 +15,7 @@ const createSetup = (commandArgs: CommandArgumentCreateDTO[]) => {
     await this.client.command.commandControllerCreate({
       name: 'test',
       trigger: 'test',
-      moduleId: moduleRes.data.data.id,
+      versionId: moduleRes.data.data.latestVersion.id,
       arguments: commandArgs,
       function: `import { getTakaro, getData } from '@takaro/helpers';
 
@@ -28,7 +29,10 @@ const createSetup = (commandArgs: CommandArgumentCreateDTO[]) => {
       await main();`,
     });
 
-    await this.client.gameserver.gameServerControllerInstallModule(setupRes.gameserver.id, moduleRes.data.data.id);
+    await this.client.module.moduleInstallationsControllerInstallModule({
+      gameServerId: setupRes.gameserver.id,
+      versionId: moduleRes.data.data.latestVersion.id,
+    });
 
     return setupRes;
   };
@@ -43,7 +47,7 @@ const playerArgSetup = async function (this: IntegrationTest<IModuleTestsSetupDa
   await this.client.command.commandControllerCreate({
     name: 'test',
     trigger: 'test',
-    moduleId: moduleRes.data.data.id,
+    versionId: moduleRes.data.data.latestVersion.id,
     arguments: [{ name: 'name', type: 'player', position: 0 }],
     function: `import { getTakaro, getData } from '@takaro/helpers';
 
@@ -58,7 +62,10 @@ const playerArgSetup = async function (this: IntegrationTest<IModuleTestsSetupDa
     await main();`,
   });
 
-  await this.client.gameserver.gameServerControllerInstallModule(setupRes.gameserver.id, moduleRes.data.data.id);
+  await this.client.module.moduleInstallationsControllerInstallModule({
+    gameServerId: setupRes.gameserver.id,
+    versionId: moduleRes.data.data.latestVersion.id,
+  });
 
   return setupRes;
 };
@@ -162,8 +169,6 @@ const tests = [
     snapshot: false,
     setup: playerArgSetup,
     test: async function () {
-      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
-
       const pogRes = await this.client.playerOnGameserver.playerOnGameServerControllerSearch({
         filters: {
           playerId: [this.setupData.players[0].id],
@@ -172,6 +177,8 @@ const tests = [
       });
       const pog = pogRes.data.data[0];
 
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 2);
+
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: `/test ${this.setupData.players[0].name.substring(0, 3)}`,
         playerId: this.setupData.players[0].id,

package/src/__tests__/economy/claim.integration.test.ts

@@ -1,5 +1,6 @@
 import { EventsAwaiter, expect, IntegrationTest, IShopSetup, shopSetup } from '@takaro/test';
 import { HookEvents } from '../../dto/index.js';
+import { describe } from 'node:test';
 
 const group = 'EconomyUtils:Shop:Claim';