add gz compress/decompress

Author: ollydev

Source/script/imports/simba.import_encoding.pas

@@ -144,7 +144,7 @@ procedure _LapeBaseDecode(const Params: PParamArray; const Result: Pointer); LAP
 ECompressAlgo
 -------------
 ```
-type ECompressAlgo = enum(ZLIB, SYNLZ);
+type ECompressAlgo = enum(ZLIB, SYNLZ, GZ);
 ```
 
 ```{note}
@@ -229,20 +229,16 @@ procedure _LapeDecompressString(const Params: PParamArray; const Result: Pointer
 ------------------
 ```
 function HOTPCalculateToken(const Secret: String; const Counter: Integer): Integer;
+function TOTPCalculateToken(const Secret: String): Integer;
 ```
+
+HOTP and TOTP One-time password algorithms. Compatible with Google Authenticator.
 *)
 procedure _LapeHOTPCalculateToken(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
 begin
   PInteger(Result)^ := HOTPCalculateToken(PString(Params^[0])^, PInteger(Params^[1])^);
 end;
 
-(*
-TOTPCalculateToken
-------------------
-```
-function TOTPCalculateToken(const Secret: String): Integer;
-```
-*)
 procedure _LapeTOTPCalculateToken(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
 begin
   PInteger(Result)^ := TOTPCalculateToken(PString(Params^[0])^);
@@ -400,7 +396,7 @@ procedure ImportEncoding(Script: TSimbaScript);
     addGlobalFunc('function Hash32(Data: Pointer; Len: Int32; Seed: UInt32 = 0): UInt32; overload', @_LapeHash32);
     addGlobalFunc('function Hash32(S: String; Seed: UInt32 = 0): UInt32; overload', @_LapeHash32String);
 
-    addGlobalType('enum(ZLIB, SYNLZ)', 'ECompressAlgo');
+    addGlobalType('enum(ZLIB, SYNLZ, GZ)', 'ECompressAlgo');
 
     addGlobalFunc('procedure CompressData(Algo: ECompressAlgo; InData: Pointer; InSize: Int64; out OutData: Pointer; out OutSize: Int64);', @_LapeCompressData);
     addGlobalFunc('function CompressBytes(Algo: ECompressAlgo; Bytes: TByteArray): TByteArray', @_LapeCompressBytes);

Source/simba.compress.pas

@@ -18,7 +18,8 @@ interface
 type
   ESimbaCompressAlgo = (
     ZLIB,
-    SYNLZ
+    SYNLZ,
+    GZ
   );
 {$POP}
 
@@ -35,6 +36,7 @@ implementation
 
 uses
   ZStream,
+  gz,
   mormot2_synlz,
   mormot2_rle;
 
@@ -47,6 +49,7 @@ procedure CompressData(Algo: ESimbaCompressAlgo; InData: PByte; InSize: Int64; o
   begin
     OutStream := TMemoryStream.Create();
     InStream := TCompressionStream.Create(clDefault, OutStream);
+    InStream.SourceOwner := False;
     try
       InStream.Write(InData^, InSize);
       InStream.Flush();
@@ -89,13 +92,38 @@ procedure CompressData(Algo: ESimbaCompressAlgo; InData: PByte; InSize: Int64; o
     OutData := ReAllocMem(OutData, OutSize);
   end;
 
+  procedure CompressWithGz;
+  var
+    InStream: TGZFileStream;
+    OutStream: TMemoryStream;
+  begin
+    OutStream := TMemoryStream.Create();
+    try
+      InStream := TGZFileStream.Create(OutStream, True);
+      InStream.SourceOwner := False;
+      try
+        InStream.Write(InData^, InSize);
+      finally
+        InStream.Free(); // flushes on free
+      end;
+
+      OutSize := OutStream.Position;
+      OutData := GetMem(OutSize);
+
+      Move(OutStream.Memory^, OutData^, OutSize);
+    finally
+      OutStream.Free();
+    end;
+  end;
+
 begin
   OutSize := 0;
   OutData := nil;
 
   case Algo of
     ESimbaCompressAlgo.ZLIB:  CompressWithZLib();
     ESimbaCompressAlgo.SYNLZ: CompressWithSynLZ();
+    ESimbaCompressAlgo.GZ:    CompressWithGZ();
   end;
 end;
 
@@ -113,6 +141,7 @@ procedure DecompressData(Algo: ESimbaCompressAlgo; InData: PByte; InSize: Int64;
     InStream.Position := 0;
     OutStream := TMemoryStream.Create();
     DecompressStream := TDeCompressionStream.Create(InStream);
+    DecompressStream.SourceOwner := False;
     try
       repeat
         Count := DecompressStream.Read(Chunk[0], Length(Chunk));
@@ -156,13 +185,44 @@ procedure DecompressData(Algo: ESimbaCompressAlgo; InData: PByte; InSize: Int64;
     end;
   end;
 
+  procedure DecompressWithGZ;
+  var
+    InStream, OutStream: TMemoryStream;
+    GzStream: TGZFileStream;
+    Count: Integer;
+    Chunk: array[0..4095] of Byte;
+  begin
+    InStream := TMemoryStream.Create();
+    InStream.Write(InData^, InSize);
+    InStream.Position := 0;
+    OutStream := TMemoryStream.Create();
+    GzStream := TGZFileStream.Create(InStream, False);
+    GzStream.SourceOwner := False;
+    try
+      repeat
+        Count := GzStream.Read(Chunk[0], Length(Chunk));
+        if (Count > 0) then
+          OutStream.Write(Chunk[0], Count);
+      until (Count = 0);
+      OutSize := OutStream.Position;
+      OutData := GetMem(OutSize);
+
+      Move(OutStream.Memory^, OutData^, OutSize);
+    finally
+      InStream.Free();
+      OutStream.Free();
+      GzStream.Free();
+    end;
+  end;
+
 begin
   OutData := nil;
   OutSize := 0;
 
   case Algo of
     ESimbaCompressAlgo.ZLIB:  DecompressWithZLib();
     ESimbaCompressAlgo.SYNLZ: DecompressWithSynLZ();
+    ESimbaCompressAlgo.GZ:    DecompressWithGZ();
   end;
 end;
 

Source/simba.encoding.pas

@@ -13,10 +13,11 @@ interface
   Classes, SysUtils,
   simba.base;
 
-{$scopedenums on}
+{$PUSH}
+{$SCOPEDENUMS ON}
 type
   EBaseEncoding = (b64URL, b64, b32, b32Hex, b16);
-{$scopedenums off}
+{$POP}
 
 function BaseEncode(Encoding: EBaseEncoding; const Data: String): String;
 function BaseDecode(Encoding: EBaseEncoding; const Data: String): String;

Tests/compress.simba

@@ -48,31 +48,28 @@ end;
 
 var
   testData: String;
+  algo: ECompressAlgo;
+  encoding: EBaseEncoding;
 begin
   // test with some binary data, where rle might be used
   testData := '0000000000000000011111111111111111111111111' * 1234;
 
   testD(ECompressAlgo.ZLIB, @testData[1], Length(testData));
   testD(ECompressAlgo.SYNLZ, @testData[1], Length(testData));
+  testD(ECompressAlgo.GZ, @testData[1], Length(testData));
 
   // non binary data
   testData := 'ABCDEF111222333000' * 1234;
 
   testD(ECompressAlgo.ZLIB, @testData[1], Length(testData));
   testD(ECompressAlgo.SYNLZ, @testData[1], Length(testData));
+  testD(ECompressAlgo.GZ, @testData[1], Length(testData));
 
   testB(ECompressAlgo.ZLIB);
   testB(ECompressAlgo.SYNLZ);
+  testB(ECompressAlgo.GZ);
 
-  testS(ECompressAlgo.SYNLZ, EBaseEncoding.b16);
-  testS(ECompressAlgo.SYNLZ, EBaseEncoding.b32);
-  testS(ECompressAlgo.SYNLZ, EBaseEncoding.b32Hex);
-  testS(ECompressAlgo.SYNLZ, EBaseEncoding.b64);
-  testS(ECompressAlgo.SYNLZ, EBaseEncoding.b64URL);
-
-  testS(ECompressAlgo.ZLIB, EBaseEncoding.b16);
-  testS(ECompressAlgo.ZLIB, EBaseEncoding.b32);
-  testS(ECompressAlgo.ZLIB, EBaseEncoding.b32Hex);
-  testS(ECompressAlgo.ZLIB, EBaseEncoding.b64);
-  testS(ECompressAlgo.ZLIB, EBaseEncoding.b64URL);
+  for algo in ECompressAlgo do
+    for encoding in EBaseEncoding do
+      testS(algo, encoding);
 end.

Third-Party/gz.pas

@@ -1087,7 +1087,7 @@ destructor TGZFileStream.Destroy;
   inherited Destroy();
 end;
 
-function TGZFileStream.Read(Var Buffer; Count : longint): longint;
+function TGZFileStream.Read(var Buffer; Count: LongInt): LongInt;
 begin
   If FWriteMode then
     Raise ezliberror.create(SWriteOnlyStream);
@@ -1096,7 +1096,7 @@ function TGZFileStream.Read(Var Buffer; Count : longint): longint;
     raise EZlibError.Create('Gzip decompression error: ' + gzerror(FFile));
 end;
 
-function TGZFileStream.Write(const Buffer; Count: Longint): Longint;
+function TGZFileStream.Write(const Buffer; Count: LongInt): Longint;
 begin
   If not FWriteMode then
     Raise EzlibError.Create(SReadonlyStream);