diff --git a/Server/wwwroot/scripts/RemoteControl/RtcDtos/CaptureFrameDto.ts b/Server/wwwroot/scripts/RemoteControl/RtcDtos/CaptureFrameDto.ts index c527e7db..b330e1f5 100644 --- a/Server/wwwroot/scripts/RemoteControl/RtcDtos/CaptureFrameDto.ts +++ b/Server/wwwroot/scripts/RemoteControl/RtcDtos/CaptureFrameDto.ts @@ -1,4 +1,6 @@ -declare interface CaptureFrameDto { +import { DynamicDto } from "../DynamicDto.js"; + +export interface CaptureFrameDto extends DynamicDto { EndOfFrame: boolean; Left: number; Top: number; diff --git a/Server/wwwroot/scripts/RemoteControl/RtcDtos/MachineNameDto.ts b/Server/wwwroot/scripts/RemoteControl/RtcDtos/MachineNameDto.ts index e767734a..a052edd3 100644 --- a/Server/wwwroot/scripts/RemoteControl/RtcDtos/MachineNameDto.ts +++ b/Server/wwwroot/scripts/RemoteControl/RtcDtos/MachineNameDto.ts @@ -1,3 +1,5 @@ -declare interface MachineNameDto { +import { DynamicDto } from "../DynamicDto.js"; + +export interface MachineNameDto extends DynamicDto { MachineName: string; } \ No newline at end of file diff --git a/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenDataDto.ts b/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenDataDto.ts index f2798ec4..1f97c650 100644 --- a/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenDataDto.ts +++ b/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenDataDto.ts @@ -1,4 +1,6 @@ -declare interface ScreenDataDto { +import { DynamicDto } from "../DynamicDto.js"; + +export interface ScreenDataDto extends DynamicDto { DisplayNames: string[]; SelectedScreen: string; } \ No newline at end of file diff --git a/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenSizeDto.ts b/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenSizeDto.ts index a08068d5..c31fffa5 100644 --- a/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenSizeDto.ts +++ b/Server/wwwroot/scripts/RemoteControl/RtcDtos/ScreenSizeDto.ts @@ -1,4 +1,6 @@ -declare interface ScreenSizeDto { +import { DynamicDto } from "../DynamicDto.js"; + +export interface ScreenSizeDto extends DynamicDto { Width: number; Height: number; } \ No newline at end of file diff --git a/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.js.map b/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.js.map index acf6ad2b..acda3096 100644 --- a/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.js.map +++ b/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.js.map @@ -1 +1 @@ -{"version":3,"file":"RtcMessageHandler.js","sourceRoot":"","sources":["RtcMessageHandler.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RtcMessageHandler.js","sourceRoot":"","sources":["RtcMessageHandler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.ts b/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.ts index 92eb834f..d7d0ba71 100644 --- a/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.ts +++ b/Server/wwwroot/scripts/RemoteControl/RtcMessageHandler.ts @@ -2,6 +2,10 @@ import { DynamicDtoType } from "../Enums/DynamicDtoType.js"; import { DynamicDto } from "./DynamicDto.js"; import { Remotely } from "./Main.js"; +import { CaptureFrameDto } from "./RtcDtos/CaptureFrameDto.js"; +import { MachineNameDto } from "./RtcDtos/MachineNameDto.js"; +import { ScreenDataDto } from "./RtcDtos/ScreenDataDto.js"; +import { ScreenSizeDto } from "./RtcDtos/ScreenSizeDto.js"; export class RtcMessageHandler { FpsStack: Array = []; diff --git a/Shared/Enums/DynamicDtoType.cs b/Shared/Enums/DynamicDtoType.cs index d6ff70aa..746f85f4 100644 --- a/Shared/Enums/DynamicDtoType.cs +++ b/Shared/Enums/DynamicDtoType.cs @@ -12,6 +12,8 @@ namespace Remotely.Shared.Enums [EnumMember(Value = "ScreenSize")] ScreenSize = 2, [EnumMember(Value = "MachineName")] - MachineName = 3 + MachineName = 3, + [EnumMember(Value = "ClipboardText")] + ClipboardText = 4 } } diff --git a/Shared/Models/RtcDtos/ClipboardTextDto.cs b/Shared/Models/RtcDtos/ClipboardTextDto.cs index 897729e0..27ea9fd5 100644 --- a/Shared/Models/RtcDtos/ClipboardTextDto.cs +++ b/Shared/Models/RtcDtos/ClipboardTextDto.cs @@ -1,4 +1,5 @@ -using System; +using Remotely.Shared.Enums; +using System; using System.Collections.Generic; using System.Runtime.Serialization; using System.Text; @@ -6,7 +7,7 @@ using System.Text; namespace Remotely.Shared.Models.RtcDtos { [DataContract] - public class ClipboardTextDto + public class ClipboardTextDto : IDynamicDto { public ClipboardTextDto(string clipboardText) { @@ -15,5 +16,9 @@ namespace Remotely.Shared.Models.RtcDtos [DataMember(Name = "ClipboardText")] public string ClipboardText { get; } + + + [DataMember(Name = "DtoType")] + public DynamicDtoType DtoType { get; } = DynamicDtoType.ClipboardText; } }