@ludeo/cloud-common 1.2.184 → 1.2.186-beta-yahil-1

package/src/v4/events/cloud-resources/create-ludeocast-game-request.ts

@@ -1,8 +1,9 @@
 import { LudeoEvent } from '../../../infra';
 import { ValidateNestedType } from '../../../decorators';
-import { IsString, IsUUID, IsOptional } from 'class-validator';
+import { IsUUID, IsOptional } from 'class-validator';
 import { GameCreationPayload } from '../../types/site-controller';
-import { SiteControllerContext } from '../../contexts';
+import { CloudResourceContext } from '../../contexts';
+import { LudeoCastV2ProviderSettings } from '../../types/cloud/ludeocast-v2/provider-settings';
 
 export class CreateLudeocastGameRequestPayload {
   @IsUUID()
@@ -11,23 +12,22 @@ export class CreateLudeocastGameRequestPayload {
   @IsUUID()
   gameResourceId: string;
 
-  gameCreationPayload: GameCreationPayload;
+  @IsUUID()
+  gamePoolId: string;
 
-  @IsString()
-  site: string;
+  @IsOptional()
+  gameCreationPayload?: GameCreationPayload;
 
-  @IsString()
-  region: string;
+  providerSettings: LudeoCastV2ProviderSettings;
 
-  @IsOptional()
   @IsUUID()
-  buildId?: string;
+  buildId: string;
 }
 
 export class CreateLudeocastGameRequest extends LudeoEvent {
   static readonly EVENT_NAME = 'cloud-resources.create-ludeocast-game-request';
 
-  constructor(payload: CreateLudeocastGameRequestPayload, context: SiteControllerContext) {
+  constructor(payload: CreateLudeocastGameRequestPayload, context: CloudResourceContext) {
     super(CreateLudeocastGameRequest.EVENT_NAME);
     this.payload = payload;
     this.context = context;
@@ -36,7 +36,7 @@ export class CreateLudeocastGameRequest extends LudeoEvent {
   @ValidateNestedType(() => CreateLudeocastGameRequestPayload)
   payload: CreateLudeocastGameRequestPayload;
 
-  @ValidateNestedType(() => SiteControllerContext)
-  context: SiteControllerContext;
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
 }
 

package/src/v4/events/cloud-resources/create-ludeocast-machine-request.ts

@@ -1,8 +1,8 @@
 import { LudeoEvent } from '../../../infra';
 import { ValidateNestedType } from '../../../decorators';
-import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
-import { MachineMode } from '../../types/site-controller';
-import { SiteControllerContext } from '../../contexts';
+import { IsOptional, IsUUID } from 'class-validator';
+import { CloudResourceContext } from '../../contexts';
+import { LudeoCastV2ProviderSettings } from '../../types';
 
 export class AndroidMachineCreationPayload {}
 
@@ -12,27 +12,20 @@ export class CreateLudeocastMachineRequestPayload {
   @IsUUID()
   machineResourceId: string;
 
-  @IsEnum(MachineMode)
-  mode: MachineMode;
+  @IsUUID()
+  machinePoolId: string;
 
   @IsOptional()
   @ValidateNestedType(() => AndroidMachineCreationPayload)
   machineCreationPayload?: MachineCreationPayload;
 
-  @IsString()
-  site: string;
-
-  @IsString()
-  region: string;
-
-  @IsString()
-  machineType: string;
+  providerSettings: LudeoCastV2ProviderSettings;
 }
 
 export class CreateLudeocastMachineRequest extends LudeoEvent {
   static readonly EVENT_NAME = 'cloud-resources.create-ludeocast-machine-request';
 
-  constructor(payload: CreateLudeocastMachineRequestPayload, context: SiteControllerContext) {
+  constructor(payload: CreateLudeocastMachineRequestPayload, context: CloudResourceContext) {
     super(CreateLudeocastMachineRequest.EVENT_NAME);
     this.payload = payload;
     this.context = context;
@@ -41,7 +34,7 @@ export class CreateLudeocastMachineRequest extends LudeoEvent {
   @ValidateNestedType(() => CreateLudeocastMachineRequestPayload)
   payload: CreateLudeocastMachineRequestPayload;
 
-  @ValidateNestedType(() => SiteControllerContext)
-  context: SiteControllerContext;
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
 }
 

package/src/v4/events/cloud-resources/terminate-ludeocast-game-request.ts

@@ -1,7 +1,7 @@
 import { LudeoEvent } from '../../../infra';
 import { ValidateNestedType } from '../../../decorators';
 import { IsString, IsUUID } from 'class-validator';
-import { SiteControllerContext } from '../../contexts';
+import { CloudResourceContext } from '../../contexts';
 
 export class TerminateLudeocastGameRequestPayload {
   @IsUUID()
@@ -20,7 +20,7 @@ export class TerminateLudeocastGameRequestPayload {
 export class TerminateLudeocastGameRequest extends LudeoEvent {
   static readonly EVENT_NAME = 'cloud-resources.terminate-ludeocast-game-request';
 
-  constructor(payload: TerminateLudeocastGameRequestPayload, context: SiteControllerContext) {
+  constructor(payload: TerminateLudeocastGameRequestPayload, context: CloudResourceContext) {
     super(TerminateLudeocastGameRequest.EVENT_NAME);
     this.payload = payload;
     this.context = context;
@@ -29,7 +29,7 @@ export class TerminateLudeocastGameRequest extends LudeoEvent {
   @ValidateNestedType(() => TerminateLudeocastGameRequestPayload)
   payload: TerminateLudeocastGameRequestPayload;
 
-  @ValidateNestedType(() => SiteControllerContext)
-  context: SiteControllerContext;
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
 }
 

package/src/v4/events/cloud-resources/terminate-ludeocast-machine-request.ts

@@ -1,23 +1,21 @@
 import { LudeoEvent } from '../../../infra';
 import { ValidateNestedType } from '../../../decorators';
-import { IsString, IsUUID } from 'class-validator';
-import { SiteControllerContext } from '../../contexts';
+import { IsUUID } from 'class-validator';
+import { CloudResourceContext } from '../../contexts';
+import { LudeoCastV2ProviderSettings } from '../../types';
 
 export class TerminateLudeocastMachineRequestPayload {
   @IsUUID()
   machineResourceId: string;
 
-  @IsString()
-  site: string;
-
-  @IsString()
-  region: string;
+  @ValidateNestedType(() => LudeoCastV2ProviderSettings)
+  providerSettings: LudeoCastV2ProviderSettings;
 }
 
 export class TerminateLudeocastMachineRequest extends LudeoEvent {
   static readonly EVENT_NAME = 'cloud-resources.terminate-ludeocast-machine-request';
 
-  constructor(payload: TerminateLudeocastMachineRequestPayload, context: SiteControllerContext) {
+  constructor(payload: TerminateLudeocastMachineRequestPayload, context: CloudResourceContext) {
     super(TerminateLudeocastMachineRequest.EVENT_NAME);
     this.payload = payload;
     this.context = context;
@@ -26,7 +24,7 @@ export class TerminateLudeocastMachineRequest extends LudeoEvent {
   @ValidateNestedType(() => TerminateLudeocastMachineRequestPayload)
   payload: TerminateLudeocastMachineRequestPayload;
 
-  @ValidateNestedType(() => SiteControllerContext)
-  context: SiteControllerContext;
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
 }
 

package/src/v4/events/ludeocast-agent/resource-update.ts

@@ -34,7 +34,7 @@ export class ResourceUpdate extends BaseCommand<ResourceUpdatePayload> {
   payload: ResourceUpdatePayload;
 
   constructor(payload: ResourceUpdatePayload) {
-    super(payload.machineResourceId, 'resource-update', payload);
+    super(payload.machineResourceId, RESOURCE_UPDATE, payload);
   }
 
   getTopic(): string {
@@ -44,3 +44,4 @@ export class ResourceUpdate extends BaseCommand<ResourceUpdatePayload> {
 
 export const RESOURCE_UPDATE_SUBSCRIBE_PATTERN = `$share/site-controller-group/${AGENT_STRING}/${RESOURCE_UPDATE}/${WILDCARD_MQTT_STRING}`;
 
+export const RESOURCE_UPDATE_AGENT_SUBSCRIBE_PATTERN = `${AGENT_STRING}/${RESOURCE_UPDATE}`;

package/src/v4/events/site-controller/game-ludeocast-creation-ended.ts

@@ -1,34 +1,41 @@
 import { LudeoEvent } from '../../../infra';
 import { ValidateNestedType } from '../../../decorators';
 import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
-import { SiteControllerContext } from '../../contexts';
+import { CloudResourceContext } from '../../contexts';
 import { SiteOperationStatus } from '../../types/site-controller';
+import { CloudResourceStatus } from '../../types/pools';
 
-export class GameCreationEndedPayload {
+export class GameLudeocastCreationEndedPayload {
   @IsUUID()
   gameResourceId: string;
 
+  @IsUUID()
+  gamePoolId: string;
+
   @IsEnum(SiteOperationStatus)
-  status: SiteOperationStatus;
+  operationStatus: SiteOperationStatus;
+
+  @IsEnum(CloudResourceStatus)
+  status: CloudResourceStatus;
 
   @IsOptional()
   @IsString()
   reason?: string;
 }
 
-export class GameCreationEnded extends LudeoEvent {
-  static readonly EVENT_NAME = 'site-controller.game-creation-ended';
+export class GameLudeocastCreationEnded extends LudeoEvent {
+  static readonly EVENT_NAME = 'site-controller.game-ludeocast-creation-ended';
 
-  constructor(payload: GameCreationEndedPayload, context: SiteControllerContext) {
-    super(GameCreationEnded.EVENT_NAME);
+  constructor(payload: GameLudeocastCreationEndedPayload, context: CloudResourceContext) {
+    super(GameLudeocastCreationEnded.EVENT_NAME);
     this.payload = payload;
     this.context = context;
   }
 
-  @ValidateNestedType(() => GameCreationEndedPayload)
-  payload: GameCreationEndedPayload;
+  @ValidateNestedType(() => GameLudeocastCreationEndedPayload)
+  payload: GameLudeocastCreationEndedPayload;
 
-  @ValidateNestedType(() => SiteControllerContext)
-  context: SiteControllerContext;
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
 }
 

package/src/v4/events/site-controller/game-ludeocast-termination-ended.ts

@@ -0,0 +1,41 @@
+import { LudeoEvent } from '../../../infra';
+import { ValidateNestedType } from '../../../decorators';
+import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
+import { CloudResourceContext } from '../../contexts';
+import { SiteOperationStatus } from '../../types/site-controller';
+import { CloudResourceStatus } from '../../types/pools';
+
+export class GameLudeocastTerminationEndedPayload {
+  @IsUUID()
+  gameResourceId: string;
+
+  @IsUUID()
+  gamePoolId: string;
+
+  @IsEnum(SiteOperationStatus)
+  operationStatus: SiteOperationStatus;
+
+  @IsEnum(CloudResourceStatus)
+  status: CloudResourceStatus;
+
+  @IsOptional()
+  @IsString()
+  reason?: string;
+}
+
+export class GameLudeocastTerminationEnded extends LudeoEvent {
+  static readonly EVENT_NAME = 'site-controller.game-ludeocast-termination-ended';
+
+  constructor(payload: GameLudeocastTerminationEndedPayload, context: CloudResourceContext) {
+    super(GameLudeocastTerminationEnded.EVENT_NAME);
+    this.payload = payload;
+    this.context = context;
+  }
+
+  @ValidateNestedType(() => GameLudeocastTerminationEndedPayload)
+  payload: GameLudeocastTerminationEndedPayload;
+
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
+}
+

package/src/v4/events/site-controller/index.ts

@@ -1,6 +1,8 @@
 
 export * from './machine-ludeocast-creation-ended';
 export * from './game-ludeocast-creation-ended';
+export * from './game-ludeocast-termination-ended';
+export * from './machine-ludeocast-termination-ended';
 
 export * from './snapshot-ludeocast-creation-ended';
 export * from './snapshot-ludeocast-termination-ended';

package/src/v4/events/site-controller/machine-ludeocast-creation-ended.ts

@@ -1,34 +1,41 @@
 import { LudeoEvent } from '../../../infra';
 import { ValidateNestedType } from '../../../decorators';
 import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
-import { SiteControllerContext } from '../../contexts';
+import { CloudResourceContext } from '../../contexts';
 import { SiteOperationStatus } from '../../types/site-controller';
+import { CloudResourceStatus } from '../../types/pools';
 
-export class MachineCreationEndedPayload {
+export class MachineLudeocastCreationEndedPayload {
   @IsUUID()
   machineResourceId: string;
 
+  @IsUUID()
+  machinePoolId: string;
+
   @IsEnum(SiteOperationStatus)
-  status: SiteOperationStatus;
+  operationStatus: SiteOperationStatus;
+
+  @IsEnum(CloudResourceStatus)
+  status: CloudResourceStatus;
 
   @IsOptional()
   @IsString()
   reason?: string;
 }
 
-export class MachineCreationEnded extends LudeoEvent {
-  static readonly EVENT_NAME = 'site-controller.machine-creation-ended';
+export class MachineLudeocastCreationEnded extends LudeoEvent {
+  static readonly EVENT_NAME = 'site-controller.machine-ludeocast-creation-ended';
 
-  constructor(payload: MachineCreationEndedPayload, context: SiteControllerContext) {
-    super(MachineCreationEnded.EVENT_NAME);
+  constructor(payload: MachineLudeocastCreationEndedPayload, context: CloudResourceContext) {
+    super(MachineLudeocastCreationEnded.EVENT_NAME);
     this.payload = payload;
     this.context = context;
   }
 
-  @ValidateNestedType(() => MachineCreationEndedPayload)
-  payload: MachineCreationEndedPayload;
+  @ValidateNestedType(() => MachineLudeocastCreationEndedPayload)
+  payload: MachineLudeocastCreationEndedPayload;
 
-  @ValidateNestedType(() => SiteControllerContext)
-  context: SiteControllerContext;
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
 }
 

package/src/v4/events/site-controller/machine-ludeocast-termination-ended.ts

@@ -0,0 +1,41 @@
+import { LudeoEvent } from '../../../infra';
+import { ValidateNestedType } from '../../../decorators';
+import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
+import { CloudResourceContext } from '../../contexts';
+import { SiteOperationStatus } from '../../types/site-controller';
+import { CloudResourceStatus } from '../../types/pools';
+
+export class MachineLudeocastTerminationEndedPayload {
+  @IsUUID()
+  machineResourceId: string;
+
+  @IsUUID()
+  machinePoolId: string;
+
+  @IsEnum(SiteOperationStatus)
+  operationStatus: SiteOperationStatus;
+
+  @IsEnum(CloudResourceStatus)
+  status: CloudResourceStatus;
+
+  @IsOptional()
+  @IsString()
+  reason?: string;
+}
+
+export class MachineLudeocastTerminationEnded extends LudeoEvent {
+  static readonly EVENT_NAME = 'site-controller.machine-ludeocast-termination-ended';
+
+  constructor(payload: MachineLudeocastTerminationEndedPayload, context: CloudResourceContext) {
+    super(MachineLudeocastTerminationEnded.EVENT_NAME);
+    this.payload = payload;
+    this.context = context;
+  }
+
+  @ValidateNestedType(() => MachineLudeocastTerminationEndedPayload)
+  payload: MachineLudeocastTerminationEndedPayload;
+
+  @ValidateNestedType(() => CloudResourceContext)
+  context: CloudResourceContext;
+}
+

package/src/v4/events/site-controller/start-game.command.ts

@@ -1,12 +1,15 @@
 import { BaseCommand, BaseCommandPayload } from '../base/base';
 import { GameCreationPayload, MachineMode } from '../../types/site-controller';
 import { ValidateNestedType } from '../../../decorators';
-import { IsEnum } from 'class-validator';
+import { IsEnum, IsString } from 'class-validator';
 
 
 export class StartGameCommandPayload extends BaseCommandPayload {
   payload: GameCreationPayload;
 
+  @IsString()
+  gameResourceId: string;
+  
   @IsEnum(MachineMode)
   machineMode: MachineMode;
 }

package/src/v4/types/cloud/index.ts

@@ -11,3 +11,4 @@ export * from "./mock";
 export * from "./machine-provider-settings";
 export * from "./ludeocast";
 export * from "./cloud-configuration-settings";
+export * from "./ludeocast-v2";

package/src/v4/types/cloud/ludeocast-v2/allocation-data.ts

@@ -0,0 +1,6 @@
+import { IsString } from "class-validator";
+
+export class LudeoCastV2AllocationData {
+  @IsString()
+  signalingURI: string;
+}

package/src/v4/types/cloud/ludeocast-v2/game-creation-response.ts

@@ -0,0 +1 @@
+export class LudeoCastV2GameCreationResponse {}

package/src/v4/types/cloud/ludeocast-v2/index.ts

@@ -0,0 +1,6 @@
+export * from "./resource-provider-settings";
+export * from "./provider-settings";
+export * from "./request-data";
+export * from "./game-creation-response";
+export * from "./allocation-data";
+export * from "./machine-provider-settings";

package/src/v4/types/cloud/ludeocast-v2/machine-provider-settings.ts

@@ -0,0 +1,6 @@
+import { IsString } from "class-validator";
+
+export class LudeoCastV2MachineResourceProviderSettings {
+  @IsString()
+  machineId: string;
+}

package/src/v4/types/cloud/ludeocast-v2/provider-settings.ts

@@ -0,0 +1,28 @@
+import { MachineMode } from "../..";
+import { CloudProviderSettings } from "../provider-settings";
+
+export class LudeoCastV2ProviderSettings {
+  site: string;
+
+  region?: string;
+
+  mode?: MachineMode;
+
+  executableLaunchPath?: string;
+
+  machineClass?: string;
+
+  additionalEnvironmentVariables?: Record<string, string>;
+
+  additionalLaunchArgs?: string[];
+}
+
+export const isLudeoCastV2ProviderSettings = (
+  settings: CloudProviderSettings
+): settings is LudeoCastV2ProviderSettings => {
+  return (
+    settings &&
+    "mode" in settings &&
+    typeof settings.mode === "string"
+  );
+};

package/src/v4/types/cloud/ludeocast-v2/request-data.ts

@@ -0,0 +1,7 @@
+import { IsNotEmpty, IsString } from "class-validator";
+
+export class LudeoCastV2RequestData {
+  @IsString()
+  @IsNotEmpty()
+  signalRequest: string; // not neccessary probably
+}

package/src/v4/types/cloud/ludeocast-v2/resource-provider-settings.ts

@@ -0,0 +1,21 @@
+import { IsEnum, IsOptional, IsString } from "class-validator";
+import { CloudProvider } from "../provider";
+
+export class LudeoCastV2ResourceProviderSettings {
+  @IsOptional()
+  @IsString()
+  machineId?: string;
+
+  @IsOptional()
+  @IsEnum(CloudProvider)
+  cloudProvider?: CloudProvider;
+
+  @IsOptional()
+  @IsString()
+  region?: string;
+
+
+  @IsOptional()
+  @IsString()
+  site?: string;
+}

package/src/v4/types/cloud/ludeocast-v2/site.ts

@@ -0,0 +1,7 @@
+// export enum LudeoCastSite {
+//   GCP_ME_WEST1 = "gcp-me-west1",
+//   GCP_US_EAST_2 = "gcp-us-east2",
+//   GCP_US_WEST_2 = "gcp-us-west2",
+//   GCP_EU_CENTRAL_1 = "gcp-eu-central1",
+//   GCP_AP_NORTHEAST_1 = "gcp-ap-northeast1",
+// }

package/src/v4/types/cloud/provider.ts

@@ -2,6 +2,7 @@ export enum CloudProvider {
   AWS = "aws",
   NVIDIA = "nvidia",
   LUDEOCAST = "ludeocast",
+  LUDEOCAST_V2 = "ludeocast-v2",
   MOCK = "mock",
   GAMELIFT = "gamelift",
 }

package/src/v4/types/site-controller/types.ts

@@ -1,4 +1,4 @@
-import { IsString, IsUUID, IsOptional, IsObject } from 'class-validator';
+import { IsString, IsUUID, IsOptional, IsObject, IsArray } from 'class-validator';
 
 export enum MachineMode {
   PROTON = 'proton',
@@ -9,29 +9,19 @@ export class ProtonGameCreationPayload {
   @IsString()
   exeRelativePath: string;
 
-  @IsUUID()
-  machineResourceId: string;
-
-  @IsOptional()
-  @IsUUID()
-  gameResourceId?: string;
-
   @IsOptional()
   @IsObject()
   additionalEnvironmentVariables?: Record<string, string>;
+
+  @IsOptional()
+  @IsArray()
+  additionalLaunchArgs?: string[];
 }
 
 export class AndroidGameCreationPayload {
   @IsString()
   packageId: string;
 
-  @IsUUID()
-  machineResourceId: string;
-
-  @IsUUID()
-  @IsOptional()
-  gameResourceId?: string;
-
   @IsOptional()
   @IsObject()
   additionalEnvironmentVariables?: Record<string, string>;