Module versions

deploy/compose/docker-compose.yml

@@ -44,7 +44,7 @@ services:
     depends_on:
       - postgresql
     container_name: takaro_migrator
-    command: npm -w packages/app-api run db:migrate && npm -w packages/app-api run domainInit
+    command: npm -w packages/app-api run db:migrate
     env_file:
       - .env 
     environment:

packages/app-api/package.json

@@ -7,16 +7,15 @@
   "type": "module",
   "scripts": {
     "start": "node --experimental-vm-modules --loader ../../node_modules/@takaro/util/dist/tracing.js dist/main.js",
-    "start:dev": "nodemon --exec 'npm run build && npm run domainInit && node  --experimental-vm-modules --inspect=0.0.0.0:12001 --loader ../../node_modules/@takaro/util/dist/tracing.js dist/main.js' --config ../../nodemon.json",
+    "start:dev": "nodemon --exec 'npm run build && node  --experimental-vm-modules --inspect=0.0.0.0:12001 --loader ../../node_modules/@takaro/util/dist/tracing.js dist/main.js' --config ../../nodemon.json",
     "prestart:dev": "npm run db:migrate",
     "preload": "node -e \"import('geolite2-redist').then(geolite => geolite.downloadDbs())\"",
     "build": "tsc -p ./tsconfig.build.json",
     "test": "npm run test:unit --if-present && npm run test:integration --if-present",
     "test:unit": "mocha --config ../../.mocharc.js src/**/*.unit.test.ts --exit",
     "test:integration": "mocha --file ../test/dist/waitUntilReady.js --config ../../.mocharc.js src/**/*.integration.test.ts --exit",
     "db:migrate": "node scripts/migrate-up.mjs",
-    "db:rollback": "node scripts/migrate-down.mjs",
-    "domainInit": "node --experimental-vm-modules --loader ../../node_modules/@takaro/util/dist/tracing.js dist/domainInit.js"
+    "db:rollback": "node scripts/migrate-down.mjs"
   },
   "keywords": [],
   "author": "",
@@ -44,4 +43,4 @@
     "bufferutil": "4.0.8",
     "utf-8-validate": "6.0.4"
   }
-}
+}

packages/app-api/src/controllers/GameServerController.ts

@@ -6,7 +6,6 @@ import {
   IsNumber,
   IsOptional,
   IsString,
-  IsUUID,
   MaxLength,
   MinLength,
   ValidateNested,
@@ -26,8 +25,6 @@ import {
   GameServerOutputDTO,
   GameServerService,
   GameServerUpdateDTO,
-  ModuleInstallationOutputDTO,
-  ModuleInstallDTO,
 } from '../service/GameServerService.js';
 import { AuthenticatedRequest, AuthService, checkPermissions } from '../service/AuthService.js';
 import { Body, Get, Post, Delete, JsonController, UseBefore, Req, Put, Params, Res } from 'routing-controllers';
@@ -111,26 +108,6 @@ class GameServerTestReachabilityInputDTO extends TakaroDTO<GameServerTestReachab
   type: GAME_SERVER_TYPE;
 }
 
-class ParamIdAndModuleId {
-  @IsUUID('4')
-  gameServerId!: string;
-
-  @IsUUID('4')
-  moduleId!: string;
-}
-
-class ModuleInstallationOutputDTOAPI extends APIOutput<ModuleInstallationOutputDTO> {
-  @Type(() => ModuleInstallationOutputDTO)
-  @ValidateNested()
-  declare data: ModuleInstallationOutputDTO;
-}
-
-class ModuleInstallationOutputArrayDTOAPI extends APIOutput<ModuleInstallationOutputDTO[]> {
-  @Type(() => ModuleInstallationOutputDTO)
-  @ValidateNested({ each: true })
-  declare data: ModuleInstallationOutputDTO[];
-}
-
 class CommandExecuteDTOAPI extends APIOutput<CommandOutput> {
   @Type(() => CommandOutput)
   @ValidateNested()
@@ -346,57 +323,6 @@ export class GameServerController {
     return apiResponse(res);
   }
 
-  @UseBefore(AuthService.getAuthMiddleware([]))
-  @ResponseSchema(ModuleInstallationOutputDTOAPI)
-  @OpenAPI({
-    description: 'Get a module installation by id',
-  })
-  @Get('/gameserver/:gameServerId/module/:moduleId')
-  async getModuleInstallation(@Req() req: AuthenticatedRequest, @Params() params: ParamIdAndModuleId) {
-    const service = new GameServerService(req.domainId);
-    const res = await service.getModuleInstallation(params.gameServerId, params.moduleId);
-    return apiResponse(res);
-  }
-
-  @UseBefore(AuthService.getAuthMiddleware([]))
-  @ResponseSchema(ModuleInstallationOutputArrayDTOAPI)
-  @OpenAPI({
-    description: 'Get all module installations for a gameserver',
-  })
-  @Get('/gameserver/:id/modules')
-  async getInstalledModules(@Req() req: AuthenticatedRequest, @Params() params: ParamId) {
-    const service = new GameServerService(req.domainId);
-    const res = await service.getInstalledModules({ gameserverId: params.id });
-    return apiResponse(res);
-  }
-
-  @UseBefore(AuthService.getAuthMiddleware([PERMISSIONS.MANAGE_GAMESERVERS]))
-  @ResponseSchema(ModuleInstallationOutputDTOAPI)
-  @OpenAPI({
-    description: 'Install a module on a gameserver. If the module is already installed, it will be updated.',
-  })
-  @Post('/gameserver/:gameServerId/modules/:moduleId')
-  async installModule(
-    @Req() req: AuthenticatedRequest,
-    @Params() params: ParamIdAndModuleId,
-    @Body() data?: ModuleInstallDTO,
-  ) {
-    const service = new GameServerService(req.domainId);
-
-    return apiResponse(await service.installModule(params.gameServerId, params.moduleId, data));
-  }
-
-  @UseBefore(AuthService.getAuthMiddleware([PERMISSIONS.MANAGE_GAMESERVERS]))
-  @ResponseSchema(ModuleInstallationOutputDTOAPI)
-  @OpenAPI({
-    description: 'Uninstall a module from a gameserver. This will not delete the module from the database.',
-  })
-  @Delete('/gameserver/:gameServerId/modules/:moduleId')
-  async uninstallModule(@Req() req: AuthenticatedRequest, @Params() params: ParamIdAndModuleId) {
-    const service = new GameServerService(req.domainId);
-    return apiResponse(await service.uninstallModule(params.gameServerId, params.moduleId));
-  }
-
   @UseBefore(AuthService.getAuthMiddleware([PERMISSIONS.MANAGE_GAMESERVERS]))
   @ResponseSchema(CommandExecuteDTOAPI)
   @OpenAPI({

packages/app-api/src/controllers/Module/installations.ts

@@ -0,0 +1,115 @@
+import { IsOptional, IsUUID, ValidateNested } from 'class-validator';
+import { ITakaroQuery } from '@takaro/db';
+import { APIOutput, apiResponse } from '@takaro/http';
+import { ModuleService } from '../../service/Module/index.js';
+import { AuthenticatedRequest, AuthService } from '../../service/AuthService.js';
+import { Body, Get, Post, Delete, JsonController, UseBefore, Req, Params, Res } from 'routing-controllers';
+import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
+import { Type } from 'class-transformer';
+import { ParamId } from '../../lib/validators.js';
+import { PERMISSIONS } from '@takaro/auth';
+import { Response } from 'express';
+import { AllowedFilters } from '../shared.js';
+import { InstallModuleDTO, ModuleInstallationOutputDTO } from '../../service/Module/dto.js';
+
+
+class ModuleInstallationOutputDTOAPI extends APIOutput<ModuleInstallationOutputDTO> {
+  @Type(() => ModuleInstallationOutputDTO)
+  @ValidateNested()
+  declare data: ModuleInstallationOutputDTO;
+}
+
+class ModuleInstallationOutputArrayDTOAPI extends APIOutput<ModuleInstallationOutputDTO[]> {
+  @Type(() => ModuleInstallationOutputDTO)
+  @ValidateNested({ each: true })
+  declare data: ModuleInstallationOutputDTO[];
+}
+
+
+class ModuleInstallationSearchInputAllowedFilters extends AllowedFilters {
+  @IsOptional()
+  @IsUUID('4', { each: true })
+  versionId: string[];
+  @IsOptional()
+  @IsUUID('4', { each: true })
+  moduleId: string[];
+  @IsOptional()
+  @IsUUID('4', { each: true })
+  gameServerId: string[];
+}
+
+class ModuleInstallationSearchInputDTO extends ITakaroQuery<ModuleInstallationSearchInputAllowedFilters> {
+  @ValidateNested()
+  @Type(() => ModuleInstallationSearchInputAllowedFilters)
+  declare filters: ModuleInstallationSearchInputAllowedFilters;
+
+  @ValidateNested()
+  @Type(() => ModuleInstallationSearchInputAllowedFilters)
+  declare search: ModuleInstallationSearchInputAllowedFilters;
+}
+
+
+@OpenAPI({
+  security: [{ domainAuth: [] }],
+  tags: ['Module'],
+})
+@JsonController('/module/installation')
+export class ModuleInstallationsController {
+  @UseBefore(AuthService.getAuthMiddleware([PERMISSIONS.READ_MODULES]))
+  @ResponseSchema(ModuleInstallationOutputArrayDTOAPI)
+  @OpenAPI({
+    summary: 'Search module installations',
+  })
+  @Post('/search')
+  async getInstalledModules(@Req() req: AuthenticatedRequest, @Res() res: Response, @Body() query: ModuleInstallationSearchInputDTO) {
+    const service = new ModuleService(req.domainId);
+    const result = await service.findInstallations({
+      ...query,
+      page: res.locals.page,
+      limit: res.locals.limit,
+    });
+    return apiResponse(result.results, {
+      meta: { total: result.total },
+      req,
+      res,
+    });
+  }
+
+  @UseBefore(AuthService.getAuthMiddleware([PERMISSIONS.READ_MODULES]))
+  @ResponseSchema(ModuleInstallationOutputDTOAPI)
+  @OpenAPI({
+    summary: 'Get one installation',
+  })
+  @Get('/:id')
+  async getModuleInstallation(@Req() req: AuthenticatedRequest, @Params() params: ParamId) {
+    const service = new ModuleService(req.domainId);
+    const res = await service.findOneInstallation(params.id);
+    return apiResponse(res);
+  }
+
+
+  @UseBefore(AuthService.getAuthMiddleware([PERMISSIONS.MANAGE_GAMESERVERS]))
+  @ResponseSchema(ModuleInstallationOutputDTOAPI)
+  @OpenAPI({
+    description: 'Install a module on a gameserver. You can have multiple installations of the same module on the same gameserver.',
+  })
+  @Post('/')
+  async installModule(
+    @Req() req: AuthenticatedRequest,
+    @Body() data: InstallModuleDTO,
+  ) {
+    const service = new ModuleService(req.domainId);
+    return apiResponse(await service.installModule(data));
+  }
+
+  @UseBefore(AuthService.getAuthMiddleware([PERMISSIONS.MANAGE_GAMESERVERS]))
+  @ResponseSchema(ModuleInstallationOutputDTOAPI)
+  @OpenAPI({
+    description: 'Uninstall a module from a gameserver. This will not delete the module from the database.',
+  })
+  @Delete('/:id')
+  async uninstallModule(@Req() req: AuthenticatedRequest, @Params() params: ParamId) {
+    const service = new ModuleService(req.domainId);
+    return apiResponse(await service.uninstallModule(params.id));
+  }
+}