From 18ae4a86f9802391223fc171cf96952da2278a04 Mon Sep 17 00:00:00 2001
From: Daniele Teti <d.teti@bittime.it>
Date: Wed, 20 Oct 2021 11:12:57 +0200
Subject: [PATCH] - messages and subscription expiring - refactoring - fixing
 border-case bugs

---
 sources/MVCFramework.ActiveRecord.pas         | 24 ++++++++++++++++--
 .../MVCFramework.Middleware.Compression.pas   |  2 +-
 sources/MVCFramework.RESTClient.Intf.pas      |  4 ++-
 sources/MVCFramework.RESTClient.pas           | 14 ++++++++++-
 sources/MVCFramework.pas                      | 25 +++++++------------
 5 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/sources/MVCFramework.ActiveRecord.pas b/sources/MVCFramework.ActiveRecord.pas
index 53f8af98..d3bb81ed 100644
--- a/sources/MVCFramework.ActiveRecord.pas
+++ b/sources/MVCFramework.ActiveRecord.pas
@@ -439,7 +439,8 @@ type
     ['{7B87473C-1784-489F-A838-925E7DDD0DE2}']
     procedure AddConnection(const aName: string; const aConnection: TFDConnection;
       const Owns: Boolean = false);
-    procedure AddDefaultConnection(const aConnection: TFDConnection; const Owns: Boolean = false);
+    procedure AddDefaultConnection(const aConnection: TFDConnection; const Owns: Boolean = false); overload;
+    procedure AddDefaultConnection(const aConnectionDefName: String); overload;
     procedure RemoveConnection(const aName: string; const RaiseExceptionIfNotAvailable: Boolean = True);
     procedure RemoveDefaultConnection(const RaiseExceptionIfNotAvailable: Boolean = True);
     procedure SetCurrent(const aName: string);
@@ -467,7 +468,8 @@ type
     destructor Destroy; override;
     procedure AddConnection(const aName: string; const aConnection: TFDConnection;
       const aOwns: Boolean = false);
-    procedure AddDefaultConnection(const aConnection: TFDConnection; const aOwns: Boolean = false);
+    procedure AddDefaultConnection(const aConnection: TFDConnection; const aOwns: Boolean = false); overload;
+    procedure AddDefaultConnection(const aConnectionDefName: String); overload;
     procedure RemoveConnection(const aName: string; const RaiseExceptionIfNotAvailable: Boolean = True);
     procedure RemoveDefaultConnection(const RaiseExceptionIfNotAvailable: Boolean = True);
     procedure SetCurrent(const aName: string);
@@ -716,6 +718,24 @@ begin
   AddConnection('default', aConnection, aOwns);
 end;
 
+procedure TMVCConnectionsRepository.AddDefaultConnection(
+  const aConnectionDefName: String);
+var
+  lConn: TFDConnection;
+begin
+  lConn := TFDConnection.Create(nil);
+  try
+    lConn.ConnectionDefName := aConnectionDefName;
+    AddDefaultConnection(lConn, True);
+  except
+    on E: Exception do
+    begin
+      lConn.Free;
+      raise;
+    end;
+  end;
+end;
+
 constructor TMVCConnectionsRepository.Create;
 begin
   inherited;
diff --git a/sources/MVCFramework.Middleware.Compression.pas b/sources/MVCFramework.Middleware.Compression.pas
index 6d94c21d..18f25edc 100644
--- a/sources/MVCFramework.Middleware.Compression.pas
+++ b/sources/MVCFramework.Middleware.Compression.pas
@@ -139,7 +139,7 @@ begin
     // create gzip compliant streams
 {.$ELSE}
     lZStream := TZCompressionStream.Create(lMemStream,
-      TZCompressionLevel.zcDefault, MVC_COMPRESSION_ZLIB_WINDOW_BITS
+      TZCompressionLevel.zcMax, MVC_COMPRESSION_ZLIB_WINDOW_BITS
       [lRespCompressionType]);
     try
       lContentStream.Position := 0;
diff --git a/sources/MVCFramework.RESTClient.Intf.pas b/sources/MVCFramework.RESTClient.Intf.pas
index 03b68997..a1c32b33 100644
--- a/sources/MVCFramework.RESTClient.Intf.pas
+++ b/sources/MVCFramework.RESTClient.Intf.pas
@@ -40,7 +40,7 @@ uses
   MVCFramework.Serializer.Intf,
   MVCFramework.Commons,
   MVCFramework.Serializer.Commons,
-  Data.DB;
+  Data.DB, JsonDataObjects;
 
 type
   IMVCRESTResponse = interface;
@@ -459,6 +459,8 @@ type
     function ContentRawBytes: TBytes;
     procedure SaveContentToStream(aStream: TStream);
     procedure SaveContentToFile(const aFileName: string);
+    function ToJSONObject: TJDOJsonObject;
+    function ToJSONArray: TJDOJsonArray;
   end;
 
 implementation
diff --git a/sources/MVCFramework.RESTClient.pas b/sources/MVCFramework.RESTClient.pas
index 9e79edf2..23fdf639 100644
--- a/sources/MVCFramework.RESTClient.pas
+++ b/sources/MVCFramework.RESTClient.pas
@@ -46,7 +46,7 @@ uses
   MVCFramework.RESTClient.Commons,
   MVCFramework.Serializer.Intf,
   MVCFramework.Serializer.Commons,
-  Data.DB;
+  Data.DB, JsonDataObjects;
 
 type
   /// <summary>
@@ -506,6 +506,8 @@ type
     function ContentRawBytes: TBytes;
     procedure SaveContentToStream(aStream: TStream);
     procedure SaveContentToFile(const aFileName: string);
+    function ToJSONObject: TJDOJsonObject;
+    function ToJSONArray: TJDOJsonArray;
   end;
 
 implementation
@@ -1761,6 +1763,16 @@ end;
 
 { TMVCRESTResponse }
 
+function TMVCRESTResponse.ToJSONArray: TJDOJsonArray;
+begin
+  Result := StrTOJSONArray(fContent, True);
+end;
+
+function TMVCRESTResponse.ToJSONObject: TJDOJsonObject;
+begin
+  Result := StrTOJSONObject(fContent, True);
+end;
+
 function TMVCRESTResponse.Content: string;
 begin
   Result := fContent;
diff --git a/sources/MVCFramework.pas b/sources/MVCFramework.pas
index 963d2a2f..d13db71c 100644
--- a/sources/MVCFramework.pas
+++ b/sources/MVCFramework.pas
@@ -1085,18 +1085,18 @@ uses
   MVCFramework.Serializer.HTML, MVCFramework.Serializer.Abstract;
 
 var
-  _IsShuttingDown: Int64 = 0;
-  _MVCGlobalActionParamsCache: TMVCStringObjectDictionary<TMVCActionParamCacheItem> = nil;
-  _HostingFramework: TMVCHostingFrameworkType = hftUnknown;
+  gIsShuttingDown: Int64 = 0;
+  gMVCGlobalActionParamsCache: TMVCStringObjectDictionary<TMVCActionParamCacheItem> = nil;
+  gHostingFramework: TMVCHostingFrameworkType = hftUnknown;
 
 function IsShuttingDown: Boolean;
 begin
-  Result := TInterlocked.Read(_IsShuttingDown) = 1
+  Result := TInterlocked.Read(gIsShuttingDown) = 1
 end;
 
 procedure EnterInShutdownState;
 begin
-  TInterlocked.Add(_IsShuttingDown, 1);
+  TInterlocked.Add(gIsShuttingDown, 1);
 end;
 
 function CreateResponse(const StatusCode: UInt16; const ReasonString: string;
@@ -2333,7 +2333,7 @@ begin
     try
       DefineDefaultResponseHeaders(lContext);
       lHandled := False;
-      lRouter := TMVCRouter.Create(FConfig, _MVCGlobalActionParamsCache);
+      lRouter := TMVCRouter.Create(FConfig, gMVCGlobalActionParamsCache);
       try // finally
         lSelectedController := nil;
         try // only for lSelectedController
@@ -4087,21 +4087,14 @@ begin
   FFormat := AFormat;
 end;
 
-{ TMVCHackHTTPAppRequest }
-
-// function TMVCHackHTTPAppRequest.GetHeaders: TStringList;
-// begin
-// Result := FRequestInfo.RawHeaders;
-// end;
-
 initialization
 
-_IsShuttingDown := 0;
+gIsShuttingDown := 0;
 
-_MVCGlobalActionParamsCache := TMVCStringObjectDictionary<TMVCActionParamCacheItem>.Create;
+gMVCGlobalActionParamsCache := TMVCStringObjectDictionary<TMVCActionParamCacheItem>.Create;
 
 finalization
 
-FreeAndNil(_MVCGlobalActionParamsCache);
+FreeAndNil(gMVCGlobalActionParamsCache);
 
 end.