adding web socket client to app

emiMobileServer/Source/Main.pas

@@ -7,7 +7,7 @@ uses
   System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
   Vcl.StdCtrls, Vcl.ExtCtrls, System.Generics.Collections, System.IniFiles,
   Auth.Service, Auth.Server.Module, Api.Server.Module, App.Server.Module,
-  ExeInfo, Api.Service;
+  ExeInfo, Api.Service, Ws.Server.Module, Ws.Service;
 
 type
   TFMain = class(TForm)
@@ -85,6 +85,7 @@ begin
   AuthServerModule.Free;
   ApiServerModule.Free;
   AppServerModule.Free;
+  WsServerModule.Free;
 end;
 
 { --- Helpers --- }
@@ -125,6 +126,9 @@ begin
 
     AppServerModule := TAppServerModule.Create(Self);
     AppServerModule.StartAppServer(ServerConfig.url);
+
+    WsServerModule := TWsServerModule.Create(Self);
+    WsServerModule.StartWsServer(ServerConfig.url, WS_MODEL);
   except
     on E: Exception do
       Logger.Log(2, 'Failed to start server modules: ' + E.Message);

emiMobileServer/Source/Ws.Server.Module.dfm

+object WsServerModule: TWsServerModule
+  Height = 273
+  Width = 230
+  object SparkleHttpSysDispatcher: TSparkleHttpSysDispatcher
+    Left = 84
+    Top = 30
+  end
+  object XDataServer1: TXDataServer
+    Dispatcher = SparkleHttpSysDispatcher
+    ModelName = 'Ws'
+    EntitySetPermissions = <>
+    SwaggerOptions.Enabled = True
+    SwaggerOptions.AuthMode = Jwt
+    SwaggerUIOptions.Enabled = True
+    SwaggerUIOptions.ShowFilter = True
+    SwaggerUIOptions.TryItOutEnabled = True
+    Left = 85
+    Top = 110
+    object XDataServer1Logging: TSparkleGenericMiddleware
+      OnMiddlewareCreate = XDataServer1LoggingMiddlewareCreate
+    end
+    object XDataServer1CORS: TSparkleCorsMiddleware
+    end
+    object XDataServer1Compress: TSparkleCompressMiddleware
+    end
+    object XDataServer1JWT: TSparkleJwtMiddleware
+      OnGetSecret = XDataServer1JWTGetSecret
+    end
+    object XDataServer1WebSocket: TSparkleWebSocketMiddleware
+    end
+  end
+end

emiMobileServer/Source/Ws.Server.Module.pas

+unit Ws.Server.Module;
+
+interface
+
+uses
+  System.SysUtils, System.Classes, System.Generics.Collections,
+  Aurelius.Drivers.SQLite,
+  Aurelius.Comp.Connection,
+  Aurelius.Drivers.Interfaces,
+  XData.Aurelius.ConnectionPool, XData.Server.Module, Sparkle.Comp.Server,
+  XData.Comp.Server, XData.Comp.ConnectionPool, Sparkle.Comp.HttpSysDispatcher,
+  Sparkle.Comp.JwtMiddleware, Sparkle.Middleware.Jwt, Aurelius.Criteria.Linq,
+  Sparkle.HttpServer.Module, Sparkle.HttpServer.Context,
+  Sparkle.Comp.CompressMiddleware, Sparkle.Comp.CorsMiddleware,
+  Sparkle.Comp.GenericMiddleware,  Sparkle.Middleware.WebSocket, Sparkle.Comp.WebSocketMiddleware,
+  Aurelius.Drivers.UniDac, UniProvider,
+  Data.DB, DBAccess, Uni;
+
+type
+  TWsServerModule = class(TDataModule)
+    SparkleHttpSysDispatcher: TSparkleHttpSysDispatcher;
+    XDataServer1: TXDataServer;
+    XDataServer1Logging: TSparkleGenericMiddleware;
+    XDataServer1CORS: TSparkleCorsMiddleware;
+    XDataServer1Compress: TSparkleCompressMiddleware;
+    XDataServer1JWT: TSparkleJwtMiddleware;
+    XDataServer1WebSocket: TSparkleWebSocketMiddleware;
+
+    procedure XDataServer1LoggingMiddlewareCreate(Sender: TObject;
+      var Middleware: IHttpServerMiddleware);
+    procedure XDataServer1JWTGetSecret(Sender: TObject; var Secret: string);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+    procedure StartWsServer(ABaseUrl: string; AModelName: string);
+  end;
+
+const
+  SERVER_PATH_SEGMENT = 'ws';
+
+var
+  WsServerModule: TWsServerModule;
+
+implementation
+
+uses
+  Sparkle.HttpServer.Request,
+  Sparkle.Middleware.Cors,
+  Sparkle.Middleware.Compress,
+  XData.OpenApi.Service,
+  XData.Sys.Exceptions,
+  Common.Logging,
+  Common.Middleware.Logging,
+  Common.Config, Vcl.Forms, IniFiles;
+
+{%CLASSGROUP 'Vcl.Controls.TControl'}
+
+{$R *.dfm}
+
+{ TWsServerModule }
+
+
+
+procedure TWsServerModule.StartWsServer(ABaseUrl: string; AModelName: string);
+var
+  Url: string;
+begin
+  
+
+  Url := ABaseUrl;
+  if not Url.EndsWith('/') then
+    Url := Url + '/';
+  Url := Url + SERVER_PATH_SEGMENT;
+
+  XDataServer1.BaseUrl := Url;
+  XDataServer1.ModelName := AModelName;
+
+  SparkleHttpSysDispatcher.Start;
+  Logger.Log(1, Format('Ws server module listening at "%s"', [Url]));
+end;
+
+procedure TWsServerModule.XDataServer1LoggingMiddlewareCreate(Sender: TObject;
+  var Middleware: IHttpServerMiddleware);
+begin
+  Middleware := TLoggingMiddleware.Create(Logger);
+end;
+
+procedure TWsServerModule.XDataServer1JWTGetSecret(Sender: TObject;
+  var Secret: string);
+begin
+  Secret := serverConfig.jwtTokenSecret;
+end;
+
+end.

emiMobileServer/Source/Ws.Service.pas

+unit Ws.Service;
+
+interface
+
+uses
+  XData.Service.Common;
+
+const
+  WS_MODEL = 'Ws';
+
+type
+  [ServiceContract]
+  [Route('ws')]
+  IWebSocketService = interface(IInvokable)
+    ['{673FE678-D9EF-468D-89CB-CEF26E8758BC}']
+    [HttpGet, Route('emimobile')]
+    procedure WebSockerConnectionHandler;
+  end;
+
+implementation
+
+initialization
+  RegisterServiceType(TypeInfo(IWebSocketService));
+
+end.

emiMobileServer/Source/Ws.ServiceImpl.pas

+unit Ws.ServiceImpl;
+
+interface
+
+uses
+  System.SysUtils,
+  XData.Server.Module,
+  XData.Service.Common,
+  Sparkle.WebSocket,
+  System.JSON,
+  Sparkle.Sys.Timer,
+  Sparkle.HttpServer.Context,
+  Ws.Service,
+  BaseRequest,
+  LoginRequest,
+  Pkg.Json.DTO,
+  Generics.Collections;
+
+type
+  [ServiceImplementation]
+  TWebSocketService = class(TInterfacedObject, IWebSocketService)
+  private
+    procedure WebSockerConnectionHandler;
+    procedure ProcessJsonMessage(const AMsg: string);
+  end;
+
+implementation
+
+{ TWebSocketService }
+
+procedure TWebSocketService.WebSockerConnectionHandler;
+var
+  Upgrader: IWebSocketUpgrader;
+  WebSocket: IWebSocket;
+  Timer: TSparkleTimer;
+  Msg: IWebSocketMessage;
+  JSONObject: TJSONObject;
+  MsgStr: string;
+begin
+  // Check if the client sent an websocket request, if yes the IWebSocketUpgrader interface will be available.
+  Upgrader := THttpServerContext.Current.Item<IWebSocketUpgrader>;
+  if Upgrader = nil then
+  begin
+    TXDataOperationContext.Current.Handler.SetStatusCode(400);
+    Exit;
+  end;
+
+  // Upgrade to websocket
+  WebSocket := Upgrader.Upgrade;
+
+  // Send a message to client every 2 seconds
+  Timer := TSparkleTimer.Create(
+    procedure(Value: TObject)
+    begin
+      if WebSocket.State = TWebSocketState.Open then
+        WebSocket.Send('Server message at ' + TimeToStr(Time));
+    end,
+    nil, 2000, TTimerType.Periodic
+  );
+
+  // Receive messages
+  try
+    while WebSocket.State = TWebSocketState.Open do
+    begin
+      Msg := WebSocket.Receive;
+      case Msg.MessageType of
+        TWebSocketMessageType.Text:
+
+        //TODO: HERE we need to create a map to store connections for later
+        //       and implement protocol to communicate
+        //  store websocket obj, handle another layer of compression/encryption,
+        //  probably store the websocket connection in a map with device id or some other uuid
+        self.ProcessJsonMessage(MsgStr);
+        //TWebSocketMessageType.Close:
+        //  WebSocket.SendClose(WebSocketStatusCodes.NormalClosure);
+      end;
+    end;
+  finally
+    Timer.Free;
+  end;
+end;
+
+procedure TWebSocketService.ProcessJsonMessage(const AMsg: string);
+var
+  MsgDTO:  TBaseRequest;
+  request: TRequest;
+  rawJsObj: TJSONArray;
+begin
+  MsgDTO := nil;
+  try
+    rawJsObj:=TJSONObject.ParseJSONValue(AMsg) as TJSONArray;
+    MsgDTO.FromJson(AMsg);
+
+    for request in MsgDTO.Request do
+    begin
+      // Process each Request object
+      Writeln('Action: ' + request.RequestId);
+      if  request.RequestId = 'doLogin' then
+      begin
+        Writeln('Action: ' + request.RequestId);
+        //TODO: implement instantiation and handling of each request type
+        //  not sure if upcasting works in delphi here but probably not so we do this:
+        //     rawJsObj:=TJSONObject.ParseJSONValue(AMsg) as TJSONArray
+        //          and then ---->
+        //     loginRequest.FromJson(rawJsObj.Items[0].ToJSON());
+        var
+          loginRequest:TLoginRequest;
+        begin
+          loginRequest.FromJson(rawJsObj.Items[0].ToJSON());
+          //loginRequest.LoginInfo.Shift
+          //TODO: it would be really great to have the JDO convert to database sql
+        end;
+      end;
+
+
+    end;
+    // ... further logic
+  finally
+    MsgDTO.Free;
+  end;
+end;
+
+
+initialization
+  RegisterServiceType(TWebSocketService);
+
+end.

emiMobileServer/Source/shared/BaseRequest.pas

+unit BaseRequest;
+
+interface
+
+uses
+  Pkg.Json.DTO, System.Generics.Collections, REST.Json.Types;
+
+{$M+}
+
+type
+  TRequest = class(TJsonDTO)
+  private
+    [JSONName('device_id')]
+    FDeviceId: string;
+    FRequestId: string;
+    FSessionId: string;
+  published
+    property DeviceId: string read FDeviceId write FDeviceId;
+    property RequestId: string read FRequestId write FRequestId;
+    property SessionId: string read FSessionId write FSessionId;
+    procedure FromJson(aValue: string);
+  end;
+
+  TBaseRequest = class(TJsonDTO)
+  private
+    [JSONName('request'), JSONMarshalled(False)]
+    FRequestArray: TArray<TRequest>;
+    [GenericListReflect]
+    FRequest: TObjectList<TRequest>;
+    function GetRequest: TObjectList<TRequest>;
+  protected
+    function GetAsJson: string; override;
+    //procedure SetAsJson(aValue: string); virtual;
+  published
+    property Request: TObjectList<TRequest> read GetRequest;
+    procedure FromJson(aValue: string);
+
+  public
+    destructor Destroy; override;
+
+  end;
+
+implementation
+
+procedure TRequest.FromJson(aValue: string);
+ begin
+  TRequest(Self).SetAsJson(aValue);
+ end;
+
+procedure TBaseRequest.FromJson(aValue: string);
+ begin
+  TBaseRequest(Self).SetAsJson(aValue);
+ end;
+
+{ TBaseRequest }
+
+
+destructor TBaseRequest.Destroy;
+begin
+  GetRequest.Free;
+  inherited;
+end;
+
+function TBaseRequest.GetRequest: TObjectList<TRequest>;
+begin
+  Result := ObjectList<TRequest>(FRequest, FRequestArray);
+end;
+
+function TBaseRequest.GetAsJson: string;
+begin
+  RefreshArray<TRequest>(FRequest, FRequestArray);
+  Result := inherited;
+end;
+
+end.

emiMobileServer/Source/shared/LoginRequest.pas

+unit LoginRequest;
+
+interface
+
+uses
+  Pkg.Json.DTO,
+  System.Generics.Collections,
+  REST.Json.Types,
+  BaseRequest;
+
+{$M+}
+
+type
+  TLoginInfo = class
+  private
+    FCarNumber: string;
+    FDistrict: string;
+    FMileage: string;
+    FShift: string;
+    FShiftDate: string;
+    FUnitName: string;
+    FUnitType: string;
+  published
+    property CarNumber: string read FCarNumber write FCarNumber;
+    property District: string read FDistrict write FDistrict;
+    property Mileage: string read FMileage write FMileage;
+    property Shift: string read FShift write FShift;
+    property ShiftDate: string read FShiftDate write FShiftDate;
+    property UnitName: string read FUnitName write FUnitName;
+    property UnitType: string read FUnitType write FUnitType;
+  end;
+
+  TLoginRequest = class(TRequest)
+  private
+    [JSONName('device_id')]
+    FDeviceId: string;
+    FLoginInfo: TLoginInfo;
+    FPass: string;
+    FRelogin: Boolean;
+    FRequestId: string;
+    FSessionId: string;
+    FUnitnumber: string;
+    FUser: string;
+    FVersion: string;
+  published
+    property DeviceId: string read FDeviceId write FDeviceId;
+    property LoginInfo: TLoginInfo read FLoginInfo;
+    property Pass: string read FPass write FPass;
+    property Relogin: Boolean read FRelogin write FRelogin;
+    property RequestId: string read FRequestId write FRequestId;
+    property SessionId: string read FSessionId write FSessionId;
+    property Unitnumber: string read FUnitnumber write FUnitnumber;
+    property User: string read FUser write FUser;
+    property Version: string read FVersion write FVersion;
+  public
+    constructor Create; override;
+    destructor Destroy; override;
+  end;
+
+implementation
+
+{ TLoginRequest }
+
+constructor TLoginRequest.Create;
+begin
+  inherited;
+  FLoginInfo := TLoginInfo.Create;
+end;
+
+destructor TLoginRequest.Destroy;
+begin
+  FLoginInfo.Free;
+  inherited;
+end;
+
+end.

emiMobileServer/Source/shared/Pkg.Json.DTO.pas

+unit Pkg.Json.DTO;
+
+interface
+
+uses System.Classes, System.Json, Rest.Json, System.Generics.Collections, Rest.JsonReflect;
+
+type
+  TArrayMapper = class
+  protected
+    procedure RefreshArray<T>(aSource: TList<T>; var aDestination: TArray<T>);
+    function List<T>(var aList: TList<T>; aSource: TArray<T>): TList<T>;
+    function ObjectList<T: class>(var aList: TObjectList<T>; aSource: TArray<T>): TObjectList<T>;
+  public
+    constructor Create; virtual;
+  end;
+
+  TJsonDTO = class(TArrayMapper)
+  private
+    FOptions: TJsonOptions;
+    class procedure PrettyPrintPair(aJSONValue: TJSONPair; aOutputStrings: TStrings; Last: Boolean; Indent: Integer);
+    class procedure PrettyPrintJSON(aJSONValue: TJsonValue; aOutputStrings: TStrings; Indent: Integer = 0); overload;
+    class procedure PrettyPrintArray(aJSONValue: TJSONArray; aOutputStrings: TStrings; Last: Boolean; Indent: Integer);
+  protected
+    function GetAsJson: string; virtual;
+    procedure SetAsJson(aValue: string); virtual;
+  public
+    constructor Create; override;
+    class function PrettyPrintJSON(aJson: string): string; overload;
+    function ToString: string; override;
+    function Clone<T: TJsonDTO, constructor>: T;
+    property AsJson: string read GetAsJson write SetAsJson;
+  end;
+
+  GenericListReflectAttribute = class(JsonReflectAttribute)
+  public
+    constructor Create;
+  end;
+
+  SuppressZeroAttribute = class(JsonReflectAttribute)
+  public
+    constructor Create;
+  end;
+
+implementation
+
+uses System.Sysutils, System.JSONConsts, System.Rtti, System.DateUtils;
+
+{ TJsonDTO }
+
+function TJsonDTO.Clone<T>: T;
+begin
+  Result := T.Create;
+  Result.AsJson := AsJson;
+end;
+
+constructor TJsonDTO.Create;
+begin
+  inherited;
+  FOptions := [joDateIsUTC, joDateFormatISO8601];
+end;
+
+function TJsonDTO.GetAsJson: string;
+begin
+  Result := TJson.ObjectToJsonString(Self, FOptions);
+end;
+
+const
+  INDENT_SIZE = 2;
+
+class procedure TJsonDTO.PrettyPrintJSON(aJSONValue: TJsonValue; aOutputStrings: TStrings; Indent: Integer);
+var
+  i: Integer;
+  Ident: Integer;
+begin
+  Ident := Indent + INDENT_SIZE;
+  i := 0;
+
+  if aJSONValue is TJSONObject then
+  begin
+    aOutputStrings.Add(StringOfChar(' ', Ident) + '{');
+    for i := 0 to TJSONObject(aJSONValue).Count - 1 do
+      PrettyPrintPair(TJSONObject(aJSONValue).Pairs[i], aOutputStrings, i = TJSONObject(aJSONValue).Count - 1, Ident);
+
+    aOutputStrings.Add(StringOfChar(' ', Ident) + '}');
+  end
+  else if aJSONValue is TJSONArray then
+    PrettyPrintArray(TJSONArray(aJSONValue), aOutputStrings, i = TJSONObject(aJSONValue).Count - 1, Ident)
+  else
+    aOutputStrings.Add(StringOfChar(' ', Ident) + aJSONValue.ToString);
+end;
+
+class procedure TJsonDTO.PrettyPrintArray(aJSONValue: TJSONArray; aOutputStrings: TStrings; Last: Boolean; Indent: Integer);
+var
+  i: Integer;
+begin
+  aOutputStrings.Add(StringOfChar(' ', Indent + INDENT_SIZE) + '[');
+
+  for i := 0 to aJSONValue.Count - 1 do
+  begin
+    PrettyPrintJSON(aJSONValue.Items[i], aOutputStrings, Indent);
+    if i < aJSONValue.Count - 1 then
+      aOutputStrings[aOutputStrings.Count - 1] := aOutputStrings[aOutputStrings.Count - 1] + ',';
+  end;
+
+  aOutputStrings.Add(StringOfChar(' ', Indent + INDENT_SIZE - 2) + ']');
+end;
+
+class function TJsonDTO.PrettyPrintJSON(aJson: string): string;
+var
+  StringList: TStringlist;
+  JSONValue: TJsonValue;
+begin
+  StringList := TStringlist.Create;
+  try
+    JSONValue := TJSONObject.ParseJSONValue(aJson);
+    try
+      if JSONValue <> nil then
+        PrettyPrintJSON(JSONValue, StringList);
+    finally
+      JSONValue.Free;
+    end;
+
+    Result := StringList.Text;
+  finally
+    StringList.Free;
+  end;
+end;
+
+class procedure TJsonDTO.PrettyPrintPair(aJSONValue: TJSONPair; aOutputStrings: TStrings; Last: Boolean; Indent: Integer);
+const
+  TEMPLATE = '%s:%s';
+var
+  Line: string;
+  NewList: TStringlist;
+begin
+  NewList := TStringlist.Create;
+  try
+    PrettyPrintJSON(aJSONValue.JSONValue, NewList, Indent);
+    Line := Format(TEMPLATE, [aJSONValue.JsonString.ToString, Trim(NewList.Text)]);
+  finally
+    NewList.Free;
+  end;
+
+  Line := StringOfChar(' ', Indent + INDENT_SIZE) + Line;
+  if not Last then
+    Line := Line + ',';
+  aOutputStrings.Add(Line);
+end;
+
+procedure TJsonDTO.SetAsJson(aValue: string);
+var
+  JSONValue: TJsonValue;
+  JSONObject: TJSONObject;
+begin
+  JSONValue := TJSONObject.ParseJSONValue(aValue);
+  try
+    if not Assigned(JSONValue) then
+      Exit;
+
+    if (JSONValue is TJSONArray) then
+    begin
+      with TJSONUnMarshal.Create do
+        try
+          SetFieldArray(Self, 'Items', (JSONValue as TJSONArray));
+        finally
+          Free;
+        end;
+
+      Exit;
+    end;
+
+    if (JSONValue is TJSONObject) then
+      JSONObject := JSONValue as TJSONObject
+    else
+    begin
+      aValue := aValue.Trim;
+      if (aValue = '') and not Assigned(JSONValue) or (aValue <> '') and Assigned(JSONValue) and JSONValue.Null then
+        Exit
+      else
+        raise EConversionError.Create(SCannotCreateObject);
+    end;
+
+    TJson.JsonToObject(Self, JSONObject, FOptions);
+  finally
+    JSONValue.Free;
+  end;
+end;
+
+function TJsonDTO.ToString: string;
+begin
+  Result := AsJson;
+end;
+
+{ TArrayMapper }
+
+constructor TArrayMapper.Create;
+begin
+  inherited;
+end;
+
+function TArrayMapper.List<T>(var aList: TList<T>; aSource: TArray<T>): TList<T>;
+begin
+  if aList = nil then
+  begin
+    aList := TList<T>.Create;
+    aList.AddRange(aSource);
+  end;
+
+  Exit(aList);
+end;
+
+function TArrayMapper.ObjectList<T>(var aList: TObjectList<T>; aSource: TArray<T>): TObjectList<T>;
+var
+  Element: T;
+begin
+  if aList = nil then
+  begin
+    aList := TObjectList<T>.Create;
+    for Element in aSource do
+      aList.Add(Element);
+  end;
+
+  Exit(aList);
+end;
+
+procedure TArrayMapper.RefreshArray<T>(aSource: TList<T>; var aDestination: TArray<T>);
+begin
+  if aSource <> nil then
+    aDestination := aSource.ToArray;
+end;
+
+type
+  TGenericListFieldInterceptor = class(TJSONInterceptor)
+  public
+    function ObjectsConverter(Data: TObject; Field: string): TListOfObjects; override;
+  end;
+
+  { TListFieldInterceptor }
+
+function TGenericListFieldInterceptor.ObjectsConverter(Data: TObject; Field: string): TListOfObjects;
+var
+  ctx: TRttiContext;
+  List: TList<TObject>;
+  RttiProperty: TRttiProperty;
+begin
+  RttiProperty := ctx.GetType(Data.ClassInfo).GetProperty(Copy(Field, 2, MAXINT));
+  List := TList<TObject>(RttiProperty.GetValue(Data).AsObject);
+  Result := TListOfObjects(List.List);
+  SetLength(Result, List.Count);
+end;
+
+constructor GenericListReflectAttribute.Create;
+begin
+  inherited Create(ctObjects, rtObjects, TGenericListFieldInterceptor, nil, false);
+end;
+
+type
+  TSuppressZeroDateInterceptor = class(TJSONInterceptor)
+  public
+    function StringConverter(Data: TObject; Field: string): string; override;
+    procedure StringReverter(Data: TObject; Field: string; Arg: string); override;
+  end;
+
+function TSuppressZeroDateInterceptor.StringConverter(Data: TObject; Field: string): string;
+var
+  RttiContext: TRttiContext;
+  Date: TDateTime;
+begin
+  Date := RttiContext.GetType(Data.ClassType).GetField(Field).GetValue(Data).AsType<TDateTime>;
+  if Date = 0 then
+    Result := string.Empty
+  else
+    Result := DateToISO8601(Date, True);
+end;
+
+procedure TSuppressZeroDateInterceptor.StringReverter(Data: TObject; Field, Arg: string);
+var
+  RttiContext: TRttiContext;
+  Date: TDateTime;
+begin
+  if Arg.IsEmpty then
+    Date := 0
+  else
+    Date := ISO8601ToDate(Arg, True);
+
+  RttiContext.GetType(Data.ClassType).GetField(Field).SetValue(Data, Date);
+end;
+
+{ SuppressZeroAttribute }
+
+constructor SuppressZeroAttribute.Create;
+begin
+  inherited Create(ctString, rtString, TSuppressZeroDateInterceptor);
+end;
+
+end.

emiMobileServer/Source/utils/DTOGeneratorUtils.pas

+unit DTOGeneratorUtils;
+
+
+interface
+
+uses
+  SysUtils, Classes, Uni, UniProvider, DB, System.JSON, Pkg.Json.DTO;
+
+ procedure GenerateDelphiJDOForTable(UniConnection: TUniConnection; const TableName: string; S: TStrings);
+ function GenerateJsonDTOFromJson(const JsonStr, ClassName: string): string;
+ function JsonTypeToDelphiType(const Value: TJSONValue): string;
+ function SqlTypeToDelphiType(const SqlType: string): string;
+ procedure GenerateJDOsForTables(UniConn: TUniConnection);
+ procedure JsonToDTO(JsonStr:string);
+
+implementation
+function JsonTypeToDelphiType(const Value: TJSONValue): string;
+begin
+  if Value is TJSONNumber then
+  begin
+    if Pos('.', Value.Value) > 0 then
+      Result := 'Double'
+    else
+      Result := 'Integer'
+  end
+  else if Value is TJSONString then
+    Result := 'string'
+  else if Value is TJSONBool then
+    Result := 'Boolean'
+  else if Value is TJSONArray then
+    Result := 'TArray<string>' // Or further analysis could detect array of objects/numbers/etc
+  else if Value is TJSONObject then
+    Result := 'TObject' // Extend for nested DTOs if needed
+  else if Value is TJSONNull then
+    Result := 'Variant'
+  else
+    Result := 'string'
+end;
+
+function SqlTypeToDelphiType(const SqlType: string): string;
+begin
+  if SqlType.Contains('int') then
+    Result := 'Integer'
+  else if SqlType.Contains('char') or SqlType.Contains('text') then
+    Result := 'string'
+  else if SqlType.Contains('bool') then
+    Result := 'Boolean'
+  else if SqlType.Contains('date') or SqlType.Contains('time') then
+    Result := 'TDateTime'
+  else if SqlType.Contains('double') or SqlType.Contains('numeric') or SqlType.Contains('real') then
+    Result := 'Double'
+  else
+    Result := 'string'; // fallback
+end;
+
+//utility
+function PascalCase(const S: string): string;
+var
+  i: Integer;
+  NextUpper: Boolean;
+begin
+  Result := '';
+  NextUpper := True;
+  for i := 1 to Length(S) do
+  begin
+    if S[i] in ['a'..'z', 'A'..'Z', '0'..'9'] then
+    begin
+      if NextUpper then
+        Result := Result + UpCase(S[i])
+      else
+        Result := Result + LowerCase(S[i]);
+      NextUpper := False;
+    end
+    else
+      NextUpper := True;
+  end;
+end;
+
+
+procedure GenerateDelphiJDOForTable(UniConnection: TUniConnection; const TableName: string; S: TStrings);
+var
+  Q: TUniQuery;
+  FieldName, FieldType, DelphiType: string;
+begin
+  Q := TUniQuery.Create(nil);
+  try
+    Q.Connection := UniConnection;
+    Q.SQL.Text := Format(
+      'SELECT column_name, data_type ' +
+      'FROM information_schema.columns ' +
+      'WHERE table_name = %s ORDER BY ordinal_position', [QuotedStr(TableName)]);
+    Q.Open;
+
+    S.Add('type');
+    S.Add('  T' + TableName + 'JDO = class');
+    S.Add('  public');
+    while not Q.Eof do
+    begin
+      FieldName := Q.FieldByName('column_name').AsString;
+      FieldType := Q.FieldByName('data_type').AsString;
+      DelphiType := SqlTypeToDelphiType(FieldType);
+      // PascalCase the field
+      FieldName := StringReplace(FieldName, '_', '', [rfReplaceAll]);
+      FieldName[1] := UpCase(FieldName[1]);
+      S.Add(Format('    %s: %s;', [FieldName, DelphiType]));
+      Q.Next;
+    end;
+    S.Add('  end;');
+    S.Add('');
+  finally
+    Q.Free;
+  end;
+end;
+
+
+procedure GenerateJDOsForTables(UniConn: TUniConnection);
+var
+  TableList: TArray<string>;
+  Table: string;
+  OutCode: TStringList;
+begin
+  TableList := ['customer', 'orders', 'product']; // put your schema table names here
+  OutCode := TStringList.Create;
+  try
+
+
+    for Table in TableList do
+    begin
+      OutCode.Clear();
+      GenerateDelphiJDOForTable(UniConn, Table, OutCode);
+      // Output to console, file, or in-memory
+      OutCode.SaveToFile(Table+'JDOs.pas');
+      //Writeln(OutCode.Text);
+    end;
+
+
+  finally
+    OutCode.Free;
+    UniConn.Free;
+  end;
+end;
+
+
+function GenerateJsonDTOFromJson(const JsonStr, ClassName: string): string;
+var
+  Json: TJSONObject;
+  JPair: TJSONPair;
+  FieldType, PubPropName, PriFieldName: string;
+  Code: TStringList;
+begin
+  Code := TStringList.Create;
+  try
+    Json := TJSONObject.ParseJSONValue(JsonStr) as TJSONObject;
+    if not Assigned(Json) then
+      raise Exception.Create('Invalid/Unsupported JSON root object.');
+
+    Code.Add('type');
+    Code.Add('  T' + PascalCase(ClassName) + 'DTO = class(TJsonDTO)');
+    Code.Add('  private');
+    // Private fields
+    for JPair in Json do
+    begin
+      FieldType := JsonTypeToDelphiType(JPair.JsonValue);
+      PriFieldName := 'F' + PascalCase(JPair.JsonString.Value);
+      Code.Add(Format('    %s: %s;', [PriFieldName, FieldType]));
+    end;
+    Code.Add('  published');
+    // Published properties (JSON mapping)
+    for JPair in Json do
+    begin
+      FieldType := JsonTypeToDelphiType(JPair.JsonValue);
+      PubPropName := JPair.JsonString.Value;      // Use original JSON key for property
+      PriFieldName := 'F' + PascalCase(PubPropName);
+      Code.Add(Format('    property %s: %s read %s write %s;', [
+        PubPropName, FieldType, PriFieldName, PriFieldName
+      ]));
+    end;
+    Code.Add('  end;');
+    Result := Code.Text;
+    Json.Free;
+  finally
+    Code.Free;
+  end;
+end;
+
+procedure JsonToDTO(JsonStr:string);
+var
+  ClassName: string;
+  ClassSource: string;
+  OutCode: TStringList;
+begin
+  OutCode := TStringList.Create;
+  try
+    ClassName:='Customer';
+    JsonStr := '{ "id": 1, "name": "Alice", "isActive": true, "score": 42.1, "tags": ["one", "two"] }';
+    ClassSource := GenerateJsonDTOFromJson(JsonStr, ClassName);
+    Writeln(ClassSource);
+    OutCode.SaveToFile(ClassName+'JDOs.pas');
+      //Writeln(OutCode.Text);
+  finally
+    OutCode.Free
+  end;
+end;
+
+end.

emiMobileServer/emiMobileServer.dpr

@@ -21,7 +21,14 @@ uses
   Auth.ServiceImpl in 'Source\Auth.ServiceImpl.pas',
   Api.ServiceImpl in 'Source\Api.ServiceImpl.pas',
   App.Server.Module in 'Source\App.Server.Module.pas' {AppServerModule: TDataModule},
-  Common.Ini in 'Source\Common.Ini.pas';
+  Common.Ini in 'Source\Common.Ini.pas',
+  BaseRequest in 'Source\shared\BaseRequest.pas',
+  LoginRequest in 'Source\shared\LoginRequest.pas',
+  Pkg.Json.DTO in 'Source\shared\Pkg.Json.DTO.pas',
+  DTOGeneratorUtils in 'Source\utils\DTOGeneratorUtils.pas',
+  Ws.Service in 'Source\Ws.Service.pas',
+  Ws.ServiceImpl in 'Source\Ws.ServiceImpl.pas',
+  Ws.Server.Module in 'Source\Ws.Server.Module.pas' {WsServerModule: TDataModule};
 
 type
   TMemoLogAppender = class( TInterfacedObject, ILogAppender )

emiMobileServer/emiMobileServer.dproj

@@ -72,7 +72,7 @@
         <SanitizedProjectName>emiMobileServer</SanitizedProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_UsePackage>gtFRExpD28;vclwinx;dacvcl280;FlexCel_Report;fmx;PKIEDB28;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;FireDACCommonODBC;aurelius;TMSCloudPkgDEDXE14;FireDACCommonDriver;sparkle;appanalytics;IndyProtocols;vclx;TatukGIS_DK11_RX11_VCL;FMXTMSFNCMapsPkgDXE14;IndyIPClient;dbxcds;vcledge;dac280;frxe28;bindcompvclwinx;gtScaleRichVwExpD28;VCLTMSFNCUIPackPkgDXE14;gtXPressExpD28;unidac280;gtPDFkitD11ProP;FlexCel_Pdf;bindcompfmx;AdvChartDEDXE14;madBasic_;VCLTMSFNCDashboardPackPkgDXE14;SKIA_FlexCel_Core;TMSVCLUIPackPkgDXE14;inetdb;TatukGIS_DK11_RX11_FMX;AcroPDF;TatukGIS_DK11_RX11;FireDACSqliteDriver;DbxClientDriver;soapmidas;vclCryptoPressStreamD28;vclactnband;gtRBExpD28;fmxFireDAC;dbexpress;DBXMySQLDriver;VclSmp;inet;unidacvcl280;dacfmx280;SigPlus;fcstudiowin;vcltouch;fmxase;VCLTMSFNCMapsPkgDXE14;ipstudiowin;TMSWEBCorePkgLibDXE14;frx28;dbrtl;QRWRunDXE11_w64;TMSWEBCorePkgDXE14;fmxdae;addict4_d28;FlexCel_XlsAdapter;gtAdvGridExpD28;FireDACMSAccDriver;VCL_FlexCel_Core;CustomIPTransport;tmsbcl;ipstudiowinwordxp;gtDocEngD28;gtRaveExpD28;FMXTMSFNCDashboardPackPkgDXE14;vcldsnap;madExcept_;DBXInterBaseDriver;frxDB28;IndySystem;ipstudiowinclient;VCLTMSFNCCorePkgDXE14;vcldb;CamRemoteD11;FMXTMSFNCUIPackPkgDXE14;TMSCloudPkgDXE14;gtQRExpD28;VirtualTreesR;WPViewPDF_RT;FlexCel_Core;vclFireDAC;vquery280;madDisAsm_;bindcomp;FireDACCommon;FlexCel_Render;unidacfmx280;FMXTMSFNCCorePkgDXE14;IndyCore;RESTBackendComponents;gtACEExpD28;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VCL_FlexCel_Components;RESTComponents;DBXSqliteDriver;vcl;IndyIPServer;dsnapxml;dsnapcon;adortl;TMSVCLUIPackPkgExDXE14;WPViewPDF_DT;TMSVCLUIPackPkgWizDXE14;gtHtmVwExpD28;AdvChartDXE14;gtRichVwExpD28;vclimg;FireDACPgDriver;FireDAC;inetdbxpress;TMSVCLUIPackPkgXlsDXE14;xmlrtl;tethering;PKIECtrl28;crcontrols280;bindcompvcl;dsnap;xdata;CloudService;fmxobj;bindcompvclsmp;addict4db_d28;CEF4Delphi;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
+        <DCC_UsePackage>gtFRExpD28;vclwinx;dacvcl280;FlexCel_Report;fmx;PKIEDB28;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;FireDACCommonODBC;aurelius;TMSCloudPkgDEDXE14;FireDACCommonDriver;sparkle;appanalytics;IndyProtocols;vclx;TatukGIS_DK11_RX11_VCL;FMXTMSFNCMapsPkgDXE14;IndyIPClient;dbxcds;vcledge;dac280;frxe28;bindcompvclwinx;gtScaleRichVwExpD28;VCLTMSFNCUIPackPkgDXE14;gtXPressExpD28;unidac280;gtPDFkitD11ProP;FlexCel_Pdf;bindcompfmx;AdvChartDEDXE14;madBasic_;VCLTMSFNCDashboardPackPkgDXE14;SKIA_FlexCel_Core;VCLTMSFNCWebSocketPkg;FMXTMSFNCWebSocketPkg;TMSVCLUIPackPkgDXE14;inetdb;TatukGIS_DK11_RX11_FMX;AcroPDF;TatukGIS_DK11_RX11;FireDACSqliteDriver;DbxClientDriver;soapmidas;vclCryptoPressStreamD28;vclactnband;gtRBExpD28;fmxFireDAC;dbexpress;DBXMySQLDriver;VclSmp;inet;unidacvcl280;dacfmx280;SigPlus;fcstudiowin;vcltouch;fmxase;VCLTMSFNCMapsPkgDXE14;ipstudiowin;TMSWEBCorePkgLibDXE14;frx28;dbrtl;QRWRunDXE11_w64;TMSWEBCorePkgDXE14;fmxdae;addict4_d28;FlexCel_XlsAdapter;gtAdvGridExpD28;FireDACMSAccDriver;VCL_FlexCel_Core;CustomIPTransport;tmsbcl;ipstudiowinwordxp;gtDocEngD28;gtRaveExpD28;FMXTMSFNCDashboardPackPkgDXE14;vcldsnap;madExcept_;DBXInterBaseDriver;frxDB28;IndySystem;ipstudiowinclient;VCLTMSFNCCorePkgDXE14;vcldb;CamRemoteD11;FMXTMSFNCUIPackPkgDXE14;TMSCloudPkgDXE14;gtQRExpD28;VirtualTreesR;WPViewPDF_RT;FlexCel_Core;vclFireDAC;vquery280;madDisAsm_;bindcomp;FireDACCommon;FlexCel_Render;unidacfmx280;FMXTMSFNCCorePkgDXE14;IndyCore;RESTBackendComponents;gtACEExpD28;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VCL_FlexCel_Components;RESTComponents;DBXSqliteDriver;vcl;IndyIPServer;dsnapxml;dsnapcon;adortl;TMSVCLUIPackPkgExDXE14;WPViewPDF_DT;TMSVCLUIPackPkgWizDXE14;gtHtmVwExpD28;AdvChartDXE14;gtRichVwExpD28;vclimg;FireDACPgDriver;FireDAC;inetdbxpress;TMSVCLUIPackPkgXlsDXE14;xmlrtl;tethering;PKIECtrl28;crcontrols280;bindcompvcl;dsnap;xdata;CloudService;fmxobj;bindcompvclsmp;addict4db_d28;CEF4Delphi;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -81,7 +81,7 @@
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <DCC_UsePackage>vclwinx;FlexCel_Report;fmx;PKIEDB28;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;FireDACCommonODBC;FireDACCommonDriver;appanalytics;IndyProtocols;vclx;FMXTMSFNCMapsPkgDXE14;IndyIPClient;dbxcds;vcledge;bindcompvclwinx;VCLTMSFNCUIPackPkgDXE14;FlexCel_Pdf;bindcompfmx;VCLTMSFNCDashboardPackPkgDXE14;TMSVCLUIPackPkgDXE14;inetdb;FireDACSqliteDriver;DbxClientDriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;DBXMySQLDriver;VclSmp;inet;fcstudiowin;vcltouch;fmxase;VCLTMSFNCMapsPkgDXE14;ipstudiowin;dbrtl;QRWRunDXE11_w64;fmxdae;FlexCel_XlsAdapter;FireDACMSAccDriver;VCL_FlexCel_Core;CustomIPTransport;vcldsnap;DBXInterBaseDriver;IndySystem;ipstudiowinclient;VCLTMSFNCCorePkgDXE14;vcldb;CamRemoteD11;FMXTMSFNCUIPackPkgDXE14;VirtualTreesR;WPViewPDF_RT;FlexCel_Core;vclFireDAC;bindcomp;FireDACCommon;FlexCel_Render;FMXTMSFNCCorePkgDXE14;IndyCore;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VCL_FlexCel_Components;RESTComponents;DBXSqliteDriver;vcl;IndyIPServer;dsnapxml;dsnapcon;adortl;TMSVCLUIPackPkgExDXE14;AdvChartDXE14;vclimg;FireDACPgDriver;FireDAC;inetdbxpress;TMSVCLUIPackPkgXlsDXE14;xmlrtl;tethering;PKIECtrl28;bindcompvcl;dsnap;CloudService;fmxobj;bindcompvclsmp;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
+        <DCC_UsePackage>vclwinx;FlexCel_Report;fmx;PKIEDB28;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;FireDACCommonODBC;FireDACCommonDriver;appanalytics;IndyProtocols;vclx;FMXTMSFNCMapsPkgDXE14;IndyIPClient;dbxcds;vcledge;bindcompvclwinx;VCLTMSFNCUIPackPkgDXE14;FlexCel_Pdf;bindcompfmx;VCLTMSFNCDashboardPackPkgDXE14;TMSVCLUIPackPkgDXE14;inetdb;FireDACSqliteDriver;DbxClientDriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;DBXMySQLDriver;VclSmp;inet;fcstudiowin;vcltouch;fmxase;VCLTMSFNCMapsPkgDXE14;ipstudiowin;dbrtl;QRWRunDXE11_w64;fmxdae;FlexCel_XlsAdapter;FMXTMSFNCWebSocketPkg;FireDACMSAccDriver;VCL_FlexCel_Core;CustomIPTransport;vcldsnap;DBXInterBaseDriver;IndySystem;ipstudiowinclient;VCLTMSFNCCorePkgDXE14;vcldb;CamRemoteD11;FMXTMSFNCUIPackPkgDXE14;VirtualTreesR;WPViewPDF_RT;FlexCel_Core;vclFireDAC;bindcomp;FireDACCommon;FlexCel_Render;FMXTMSFNCCorePkgDXE14;IndyCore;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VCL_FlexCel_Components;RESTComponents;DBXSqliteDriver;vcl;IndyIPServer;dsnapxml;dsnapcon;adortl;TMSVCLUIPackPkgExDXE14;AdvChartDXE14;vclimg;FireDACPgDriver;FireDAC;inetdbxpress;TMSVCLUIPackPkgXlsDXE14;xmlrtl;tethering;PKIECtrl28;bindcompvcl;dsnap;CloudService;fmxobj;bindcompvclsmp;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -165,6 +165,17 @@
             <DesignClass>TDataModule</DesignClass>
         </DCCReference>
         <DCCReference Include="Source\Common.Ini.pas"/>
+        <DCCReference Include="Source\shared\BaseRequest.pas"/>
+        <DCCReference Include="Source\shared\LoginRequest.pas"/>
+        <DCCReference Include="Source\shared\Pkg.Json.DTO.pas"/>
+        <DCCReference Include="Source\utils\DTOGeneratorUtils.pas"/>
+        <DCCReference Include="Source\Ws.Service.pas"/>
+        <DCCReference Include="Source\Ws.ServiceImpl.pas"/>
+        <DCCReference Include="Source\Ws.Server.Module.pas">
+            <Form>WsServerModule</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

emiMobileServer/emiMobileServer.ini

 [Settings]
-LogFileNum=525
+LogFileNum=531
 webClientVersion=0.1.0
 

webEMIMobile/Module.Websocket.dfm

+object DataModule1: TDataModule1
+  Height = 480
+  Width = 640
+  object WebSocketClient1: TWebSocketClient
+    Left = 218
+    Top = 130
+  end
+end

webEMIMobile/Module.Websocket.pas

+unit Module.Websocket;
+
+interface
+
+uses
+  System.SysUtils, System.Classes, WEBLib.WebSocketClient;
+
+type
+  TDataModule1 = class(TDataModule)
+    WebSocketClient1: TWebSocketClient;
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  DataModule1: TDataModule1;
+
+implementation
+
+{%CLASSGROUP 'Vcl.Controls.TControl'}
+
+{$R *.dfm}
+
+end.

webEMIMobile/emiMobile.groupproj

+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{27B04508-3F72-45A2-83EF-A007750D2923}</ProjectGuid>
+    </PropertyGroup>
+    <ItemGroup>
+        <Projects Include="webEmiMobile.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="..\emiMobileServer\emiMobileServer.dproj">
+            <Dependencies/>
+        </Projects>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Default.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Default.Personality/>
+        </BorlandProject>
+    </ProjectExtensions>
+    <Target Name="webEmiMobile">
+        <MSBuild Projects="webEmiMobile.dproj"/>
+    </Target>
+    <Target Name="webEmiMobile:Clean">
+        <MSBuild Projects="webEmiMobile.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="webEmiMobile:Make">
+        <MSBuild Projects="webEmiMobile.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="emiMobileServer">
+        <MSBuild Projects="..\emiMobileServer\emiMobileServer.dproj"/>
+    </Target>
+    <Target Name="emiMobileServer:Clean">
+        <MSBuild Projects="..\emiMobileServer\emiMobileServer.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="emiMobileServer:Make">
+        <MSBuild Projects="..\emiMobileServer\emiMobileServer.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="Build">
+        <CallTarget Targets="webEmiMobile;emiMobileServer"/>
+    </Target>
+    <Target Name="Clean">
+        <CallTarget Targets="webEmiMobile:Clean;emiMobileServer:Clean"/>
+    </Target>
+    <Target Name="Make">
+        <CallTarget Targets="webEmiMobile:Make;emiMobileServer:Make"/>
+    </Target>
+    <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
+</Project>

webEMIMobile/webEmiMobile.dproj

@@ -62,6 +62,7 @@
         <VerInfo_Locale>1046</VerInfo_Locale>
         <TMSWebProject>2</TMSWebProject>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.802;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;LastCompiledTime=2018/07/25 12:57:53</VerInfo_Keys>
+        <DCC_Define>SKIA;$(DCC_Define)</DCC_Define>
         <TMSWebHTMLFile>index.html</TMSWebHTMLFile>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
@@ -507,6 +508,70 @@
                 </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="5">
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win32\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win32\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="Win32\Debug\webCharms.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="Win32\Debug\webEmiMobile.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">