@takaro/modules 0.0.14 → 0.0.18

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

@@ -7,6 +7,7 @@ import {
   EventsAwaiter,
 } from '@takaro/test';
 import { GameEvents } from '../dto/gameEvents.js';
+import { describe } from 'node:test';
 
 const group = 'Help command';
 
@@ -17,10 +18,10 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Help command responds with a list of installed commands',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.utilsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.utilsModule.latestVersion.id,
+      });
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 3);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/help',
@@ -45,14 +46,14 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Help command responds with a list of installed commands, picking up commands from multiple modules',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.utilsModule.id,
-      );
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.utilsModule.latestVersion.id,
+      });
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+      });
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 13);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/help',
@@ -92,10 +93,10 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Help command responds with detailed info about a specific command',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.utilsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.utilsModule.latestVersion.id,
+      });
 
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
@@ -118,10 +119,10 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Help command responds with unknown command message if command does not exist',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.utilsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.utilsModule.latestVersion.id,
+      });
 
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 

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

@@ -1,6 +1,7 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 import { Client } from '@takaro/apiclient';
+import { describe } from 'node:test';
 
 const group = 'lottery suite';
 const ticketCost = 50;
@@ -35,7 +36,10 @@ const setup = async function (this: IntegrationTest<IModuleTestsSetupData>): Pro
     gameServerId: data.gameserver.id,
   });
 
-  await this.client.gameserver.gameServerControllerInstallModule(data.gameserver.id, data.economyUtilsModule.id);
+  await this.client.module.moduleInstallationsControllerInstallModule({
+    gameServerId: data.gameserver.id,
+    versionId: data.economyUtilsModule.latestVersion.id,
+  });
 
   const pogs = await this.client.playerOnGameserver.playerOnGameServerControllerSearch({
     filters: {
@@ -51,7 +55,9 @@ const setup = async function (this: IntegrationTest<IModuleTestsSetupData>): Pro
 
   await Promise.allSettled(tasks);
 
-  await this.client.gameserver.gameServerControllerInstallModule(data.gameserver.id, data.lotteryModule.id, {
+  await this.client.module.moduleInstallationsControllerInstallModule({
+    gameServerId: data.gameserver.id,
+    versionId: data.lotteryModule.latestVersion.id,
     systemConfig: JSON.stringify({
       commands: {
         buyTicket: {
@@ -211,16 +217,14 @@ const tests = [
 
       await this.client.cronjob.cronJobControllerTrigger({
         moduleId: this.setupData.lotteryModule.id,
-        cronjobId: this.setupData.lotteryModule.cronJobs[0].id,
+        cronjobId: this.setupData.lotteryModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
       });
 
-      const mod = (
-        await this.client.gameserver.gameServerControllerGetModuleInstallation(
-          this.setupData.gameserver.id,
-          this.setupData.lotteryModule.id,
-        )
-      ).data.data;
+      const installationsRes = await this.client.module.moduleInstallationsControllerGetInstalledModules({
+        filters: { gameserverId: [this.setupData.gameserver.id], moduleId: [this.setupData.lotteryModule.id] },
+      });
+      const mod = installationsRes.data.data[0];
 
       const userConfig: Record<string, any> = mod.userConfig;
       const prize = ticketCost * playerAmount * (1 - userConfig.profitMargin);
@@ -252,7 +256,7 @@ const tests = [
 
       await this.client.cronjob.cronJobControllerTrigger({
         moduleId: this.setupData.lotteryModule.id,
-        cronjobId: this.setupData.lotteryModule.cronJobs[0].id,
+        cronjobId: this.setupData.lotteryModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
       });
 
@@ -288,7 +292,7 @@ const tests = [
 
       await this.client.cronjob.cronJobControllerTrigger({
         moduleId: this.setupData.lotteryModule.id,
-        cronjobId: this.setupData.lotteryModule.cronJobs[0].id,
+        cronjobId: this.setupData.lotteryModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
       });
 

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

@@ -7,12 +7,18 @@ import {
   EventsAwaiter,
 } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
+import { describe } from 'node:test';
 
 const group = 'Module permissions role assignments';
 
 async function cleanRoleSetup(this: IntegrationTest<IModuleTestsSetupData>) {
   const defaultSetup = await modulesTestSetup.bind(this)();
 
+  await this.client.module.moduleInstallationsControllerInstallModule({
+    gameServerId: defaultSetup.gameserver.id,
+    versionId: defaultSetup.teleportsModule.latestVersion.id,
+  });
+
   const playersRes = await this.client.player.playerControllerSearch();
 
   const permissions = await this.client.permissionCodesToInputs(['TELEPORTS_USE']);
@@ -22,10 +28,10 @@ async function cleanRoleSetup(this: IntegrationTest<IModuleTestsSetupData>) {
     permissions,
   });
 
-  await this.client.gameserver.gameServerControllerInstallModule(
-    defaultSetup.gameserver.id,
-    defaultSetup.teleportsModule.id,
-  );
+  await this.client.module.moduleInstallationsControllerInstallModule({
+    gameServerId: defaultSetup.gameserver.id,
+    versionId: defaultSetup.teleportsModule.latestVersion.id,
+  });
 
   await Promise.all(
     playersRes.data.data.map(async (player) => {
@@ -128,15 +134,13 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Uses system roles',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-        {
-          userConfig: JSON.stringify({
-            timeout: 0,
-          }),
-        },
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+        userConfig: JSON.stringify({
+          timeout: 0,
+        }),
+      });
 
       await Promise.all(
         this.setupData.players.map(async (player) => {

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

@@ -1,36 +1,31 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
-import { EventPlayerConnected, GameEvents } from '../dto/gameEvents.js';
+import { GameEvents } from '../dto/gameEvents.js';
 import { HookEvents } from '../main.js';
+import { faker } from '@faker-js/faker';
+import { describe } from 'node:test';
 
 const group = 'Onboarding';
 const groupStarterkit = 'Onboarding - Starterkit';
 
-const _tests = [
+const tests = [
   new IntegrationTest<IModuleTestsSetupData>({
     group,
     snapshot: false,
     setup: modulesTestSetup,
     name: 'PlayerConnected hook sends a message when a player connects to the server',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.onboardingModule.id,
-      );
-      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
-      await this.client.hook.hookControllerTrigger({
+      await this.client.module.moduleInstallationsControllerInstallModule({
         gameServerId: this.setupData.gameserver.id,
-        playerId: this.setupData.players[0].id,
-        eventType: GameEvents.PLAYER_CONNECTED,
-        eventMeta: new EventPlayerConnected({
-          player: {
-            gameId: '1',
-          },
-          msg: 'Player connected',
-        }),
+        versionId: this.setupData.onboardingModule.latestVersion.id,
+      });
+      const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 5);
+      await this.client.gameserver.gameServerControllerExecuteCommand(this.setupData.gameserver.id, {
+        command: 'connectAll',
       });
 
-      expect((await events).length).to.be.eq(1);
-      expect((await events)[0].data.meta.msg).to.match(/Welcome .+ to the server!/);
+      expect((await events).length).to.be.eq(5);
+      // Expect all messages to match
+      expect((await events).every((event) => event.data.meta.msg.match(/Welcome .+ to the server!/))).to.be.true;
     },
   }),
   new IntegrationTest<IModuleTestsSetupData>({
@@ -39,15 +34,18 @@ const _tests = [
     setup: modulesTestSetup,
     name: 'Starterkit command gives the player items',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.onboardingModule.id,
-        {
-          userConfig: JSON.stringify({
-            starterKitItems: ['cigar'],
-          }),
-        },
-      );
+      const items = (await this.client.item.itemControllerSearch()).data.data;
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.onboardingModule.latestVersion.id,
+        userConfig: JSON.stringify({
+          starterKitItems: items.map((item) => ({
+            item: item.id,
+            amount: faker.number.int({ min: 1, max: 6 }),
+            quality: faker.number.int({ min: 1, max: 6 }).toString(),
+          })),
+        }),
+      });
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.COMMAND_EXECUTED);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/starterkit',
@@ -64,15 +62,18 @@ const _tests = [
     setup: modulesTestSetup,
     name: 'Starterkit command can only be used once',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.onboardingModule.id,
-        {
-          userConfig: JSON.stringify({
-            starterKitItems: ['cigar'],
-          }),
-        },
-      );
+      const items = (await this.client.item.itemControllerSearch()).data.data;
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.onboardingModule.latestVersion.id,
+        userConfig: JSON.stringify({
+          starterKitItems: items.map((item) => ({
+            item: item.id,
+            amount: faker.number.int({ min: 1, max: 6 }),
+            quality: faker.number.int({ min: 1, max: 6 }).toString(),
+          })),
+        }),
+      });
       const firstEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.COMMAND_EXECUTED);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/starterkit',
@@ -98,10 +99,10 @@ const _tests = [
     setup: modulesTestSetup,
     name: 'Starterkit with nothing configured, shows an error message',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.onboardingModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.onboardingModule.latestVersion.id,
+      });
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
       await this.client.command.commandControllerTrigger(this.setupData.gameserver.id, {
         msg: '/starterkit',
@@ -114,9 +115,8 @@ const _tests = [
   }),
 ];
 
-// Temp disabled...
-/* describe(group, function () {
+describe(group, function () {
   tests.forEach((test) => {
     test.run();
   });
-}); */
+});

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

@@ -1,5 +1,6 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { HookEvents } from '../dto/index.js';
+import { describe } from 'node:test';
 
 const group = 'Ping command';
 
@@ -10,10 +11,10 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Ping command replies with pong',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.utilsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.utilsModule.latestVersion.id,
+      });
 
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(HookEvents.CHAT_MESSAGE);
 

package/src/__tests__/roleExpiry.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 = 'Role expiry';
 
@@ -15,10 +16,10 @@ const tests = [
         this.setupData.players.map((p) => this.client.player.playerControllerRemoveRole(p.id, this.setupData.role.id)),
       );
 
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+      });
 
       const eventsBeforeRole = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
 

package/src/__tests__/serverMessages.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 = 'Server messages';
 
@@ -10,15 +11,15 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Default install sends the default message',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.serverMessagesModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.serverMessagesModule.latestVersion.id,
+      });
 
       const events = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE);
 
       await this.client.cronjob.cronJobControllerTrigger({
-        cronjobId: this.setupData.serverMessagesModule.cronJobs[0].id,
+        cronjobId: this.setupData.serverMessagesModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
         moduleId: this.setupData.serverMessagesModule.id,
       });
@@ -36,20 +37,18 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Can override default message via userConfig',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.serverMessagesModule.id,
-        {
-          userConfig: JSON.stringify({
-            messages: ['This is a custom message'],
-          }),
-        },
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.serverMessagesModule.latestVersion.id,
+        userConfig: JSON.stringify({
+          messages: ['This is a custom 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,
+        cronjobId: this.setupData.serverMessagesModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
         moduleId: this.setupData.serverMessagesModule.id,
       });
@@ -64,22 +63,20 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Can override default message via userConfig with multiple messages',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.serverMessagesModule.id,
-        {
-          userConfig: JSON.stringify({
-            messages: ['Test message 1', 'Test message 2'],
-          }),
-        },
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.serverMessagesModule.latestVersion.id,
+        userConfig: JSON.stringify({
+          messages: ['Test message 1', 'Test message 2'],
+        }),
+      });
 
       // We should see each of our test messages at least once
 
       const firstEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.cronjob.cronJobControllerTrigger({
-        cronjobId: this.setupData.serverMessagesModule.cronJobs[0].id,
+        cronjobId: this.setupData.serverMessagesModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
         moduleId: this.setupData.serverMessagesModule.id,
       });
@@ -90,7 +87,7 @@ const tests = [
       const secondEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.cronjob.cronJobControllerTrigger({
-        cronjobId: this.setupData.serverMessagesModule.cronJobs[0].id,
+        cronjobId: this.setupData.serverMessagesModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
         moduleId: this.setupData.serverMessagesModule.id,
       });
@@ -102,7 +99,7 @@ const tests = [
       const thirdEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
       await this.client.cronjob.cronJobControllerTrigger({
-        cronjobId: this.setupData.serverMessagesModule.cronJobs[0].id,
+        cronjobId: this.setupData.serverMessagesModule.latestVersion.cronJobs[0].id,
         gameServerId: this.setupData.gameserver.id,
         moduleId: this.setupData.serverMessagesModule.id,
       });

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

@@ -1,12 +1,15 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { HookEvents } from '../dto/index.js';
+import { describe } from 'node:test';
 
 const group = 'System config - cooldown';
 
 const customSetup = async function (this: IntegrationTest<IModuleTestsSetupData>): Promise<IModuleTestsSetupData> {
   const setupData = await modulesTestSetup.bind(this)();
 
-  await this.client.gameserver.gameServerControllerInstallModule(setupData.gameserver.id, setupData.utilsModule.id, {
+  await this.client.module.moduleInstallationsControllerInstallModule({
+    gameServerId: setupData.gameserver.id,
+    versionId: setupData.utilsModule.latestVersion.id,
     systemConfig: JSON.stringify({
       commands: {
         ping: {
@@ -48,6 +51,7 @@ const tests = [
   new IntegrationTest<IModuleTestsSetupData>({
     group,
     snapshot: false,
+    attempts: 5,
     setup: customSetup,
     name: 'Handles cooldown when using commands in rapid succession',
     test: async function () {

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

@@ -1,6 +1,7 @@
 import { IntegrationTest, expect, IModuleTestsSetupData, modulesTestSetup, EventsAwaiter } from '@takaro/test';
 import { GameEvents } from '../dto/index.js';
 import { sleep } from '@takaro/util';
+import { describe } from 'node:test';
 
 const group = 'System config - cost';
 
@@ -11,24 +12,22 @@ const customSetup = async function (this: IntegrationTest<IModuleTestsSetupData>
     gameServerId: setupData.gameserver.id,
   });
 
-  await this.client.gameserver.gameServerControllerInstallModule(
-    setupData.gameserver.id,
-    setupData.teleportsModule.id,
-    {
-      userConfig: JSON.stringify({
-        timeout: 0,
-      }),
-      systemConfig: JSON.stringify({
-        commands: {
-          teleport: {
-            delay: 0,
-            aliases: [],
-            cost: 10,
-          },
+  await this.client.module.moduleInstallationsControllerInstallModule({
+    gameServerId: setupData.gameserver.id,
+    versionId: setupData.teleportsModule.latestVersion.id,
+    userConfig: JSON.stringify({
+      timeout: 0,
+    }),
+    systemConfig: JSON.stringify({
+      commands: {
+        teleport: {
+          delay: 0,
+          aliases: [],
+          cost: 10,
         },
-      }),
-    },
-  );
+      },
+    }),
+  });
 
   const setEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
   await this.client.command.commandControllerTrigger(setupData.gameserver.id, {

package/src/__tests__/teleports/listtp.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 = 'Teleports suite';
 
@@ -10,10 +11,10 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Can list teleports with /tplist',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+      });
 
       const setEvents = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 3);
 
@@ -52,15 +53,13 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Public teleports show up in /tplist',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-        {
-          userConfig: JSON.stringify({
-            allowPublicTeleports: true,
-          }),
-        },
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+        userConfig: JSON.stringify({
+          allowPublicTeleports: true,
+        }),
+      });
 
       const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
@@ -110,10 +109,10 @@ const tests = [
     setup: modulesTestSetup,
     name: 'Teleports set by player A cannot be seen by player B with /tplist',
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+      });
 
       const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);
 
@@ -145,10 +144,10 @@ const tests = [
     // eslint-disable-next-line quotes
     name: "bug repro /tplist: Player A and B have teleports set but B cannot see A's teleports",
     test: async function () {
-      await this.client.gameserver.gameServerControllerInstallModule(
-        this.setupData.gameserver.id,
-        this.setupData.teleportsModule.id,
-      );
+      await this.client.module.moduleInstallationsControllerInstallModule({
+        gameServerId: this.setupData.gameserver.id,
+        versionId: this.setupData.teleportsModule.latestVersion.id,
+      });
 
       const setTpEvent = (await new EventsAwaiter().connect(this.client)).waitForEvents(GameEvents.CHAT_MESSAGE, 1);