Merge branch 'releases/7.x' into sdk_v7_uc_query_v4

Author: YangSen-qn

QiniuSDK.xcodeproj/project.pbxproj

@@ -10,6 +10,10 @@
 		05EFAFE5DD675C7ECAD063A4 /* libPods-QiniuSDK_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C1D8890E270C769A9E798A8E /* libPods-QiniuSDK_iOS.a */; };
 		3115471D243476CF00D77B8B /* QNTransactionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3115471C243476CF00D77B8B /* QNTransactionTest.m */; };
 		3115471E243476D600D77B8B /* QNTransactionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3115471C243476CF00D77B8B /* QNTransactionTest.m */; };
+		31259E3324E3D02C00CF7531 /* NSData+QNGZip.m in Sources */ = {isa = PBXBuildFile; fileRef = 31259E3124E3D02C00CF7531 /* NSData+QNGZip.m */; };
+		31259E3424E3D02C00CF7531 /* NSData+QNGZip.h in Headers */ = {isa = PBXBuildFile; fileRef = 31259E3224E3D02C00CF7531 /* NSData+QNGZip.h */; };
+		31259E3624E3D32700CF7531 /* QNGZipTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 31259E3524E3D32700CF7531 /* QNGZipTest.m */; };
+		31259E3724E3D32700CF7531 /* QNGZipTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 31259E3524E3D32700CF7531 /* QNGZipTest.m */; };
 		3142419E2449553F00BD9A21 /* QNCFHttpClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3142419B2449547B00BD9A21 /* QNCFHttpClientTest.m */; };
 		3142419F2449554200BD9A21 /* QNCFHttpClientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 3142419B2449547B00BD9A21 /* QNCFHttpClientTest.m */; };
 		314944522446FED700386F16 /* NSObject+QNSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = 314944502446FED700386F16 /* NSObject+QNSwizzle.h */; };
@@ -64,6 +68,7 @@
 		31C2EEE5242DE86D00713A33 /* QNUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 31C2EEE2242DE86300713A33 /* QNUtils.m */; };
 		31C2EEEC242DEF6A00713A33 /* QNUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 31C2EEEB242DEF6A00713A33 /* QNUtilTest.m */; };
 		31C2EEED242DEF6A00713A33 /* QNUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 31C2EEEB242DEF6A00713A33 /* QNUtilTest.m */; };
+		31C6E68824ECC75700633629 /* NSData+QNGZip.m in Sources */ = {isa = PBXBuildFile; fileRef = 31259E3124E3D02C00CF7531 /* NSData+QNGZip.m */; };
 		31F553932456F2F3000B66AD /* QNUrlSafeBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = 31F5537D2456F2F2000B66AD /* QNUrlSafeBase64.m */; };
 		31F553942456F2F3000B66AD /* QNPHAssetResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 31F5537E2456F2F2000B66AD /* QNPHAssetResource.h */; };
 		31F553952456F2F3000B66AD /* QNEtag.h in Headers */ = {isa = PBXBuildFile; fileRef = 31F5537F2456F2F2000B66AD /* QNEtag.h */; };
@@ -204,6 +209,9 @@
 /* Begin PBXFileReference section */
 		135958056D8FF4295F3D9AB0 /* Pods-QiniuSDK_iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_iOSTests/Pods-QiniuSDK_iOSTests.release.xcconfig"; sourceTree = "<group>"; };
 		3115471C243476CF00D77B8B /* QNTransactionTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNTransactionTest.m; sourceTree = "<group>"; };
+		31259E3124E3D02C00CF7531 /* NSData+QNGZip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+QNGZip.m"; sourceTree = "<group>"; };
+		31259E3224E3D02C00CF7531 /* NSData+QNGZip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+QNGZip.h"; sourceTree = "<group>"; };
+		31259E3524E3D32700CF7531 /* QNGZipTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNGZipTest.m; sourceTree = "<group>"; };
 		3142419B2449547B00BD9A21 /* QNCFHttpClientTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNCFHttpClientTest.m; sourceTree = "<group>"; };
 		314944502446FED700386F16 /* NSObject+QNSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+QNSwizzle.h"; sourceTree = "<group>"; };
 		314944512446FED700386F16 /* NSObject+QNSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+QNSwizzle.m"; sourceTree = "<group>"; };
@@ -398,6 +406,8 @@
 		3149446424484DE200386F16 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				31259E3224E3D02C00CF7531 /* NSData+QNGZip.h */,
+				31259E3124E3D02C00CF7531 /* NSData+QNGZip.m */,
 				31F5538E2456F2F3000B66AD /* QN_GTM_Base64.h */,
 				31F553822456F2F2000B66AD /* QN_GTM_Base64.m */,
 				31F553832456F2F2000B66AD /* QNALAssetFile.h */,
@@ -625,6 +635,7 @@
 				CC2513C02455C141003F4C65 /* QNTempFile.m */,
 				31A1840D246942E0001D6EEE /* QNComplexUploadSceneTest.m */,
 				31A1841024694A3C001D6EEE /* QNUploadErrorTest.m */,
+				31259E3524E3D32700CF7531 /* QNGZipTest.m */,
 			);
 			path = QiniuSDKTests;
 			sourceTree = SOURCE_ROOT;
@@ -660,6 +671,7 @@
 				CC251352244C026A003F4C65 /* QNHttpResponseInfo.h in Headers */,
 				DF293C9E19DBC2AE00799011 /* QNUserAgent.h in Headers */,
 				314944572446FF4700386F16 /* QNCFHttpClient.h in Headers */,
+				31259E3424E3D02C00CF7531 /* NSData+QNGZip.h in Headers */,
 				31C2EEE3242DE86300713A33 /* QNUtils.h in Headers */,
 				31BAA27C243DB83700B7E883 /* QNURLProtocol.h in Headers */,
 				31F553952456F2F3000B66AD /* QNEtag.h in Headers */,
@@ -947,6 +959,7 @@
 				DF437CDA1B2429E10099587B /* QNUpToken.m in Sources */,
 				CC676CC124357778006A7372 /* QNSystemTool.m in Sources */,
 				CC2513B7245423C3003F4C65 /* QNConcurrentResumeUpload.m in Sources */,
+				31259E3324E3D02C00CF7531 /* NSData+QNGZip.m in Sources */,
 				31BAA277243DB83700B7E883 /* NSURLRequest+QNRequest.m in Sources */,
 				31494477244852BA00386F16 /* QNFixedZone.m in Sources */,
 				DFF525321A6235D100D02BA1 /* QNSessionManager.m in Sources */,
@@ -981,6 +994,7 @@
 				DF2CDE7119DAE90300CE01FB /* QNBase64Test.m in Sources */,
 				3115471D243476CF00D77B8B /* QNTransactionTest.m in Sources */,
 				3149446224470C0500386F16 /* XCTestCase+QNTest.m in Sources */,
+				31259E3624E3D32700CF7531 /* QNGZipTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1000,6 +1014,7 @@
 				316A4B8A24346364007BF564 /* QNTransactionManager.m in Sources */,
 				DF609A081A58E39D00AC7297 /* QNFormUpload.m in Sources */,
 				31F553BD2457FF14000B66AD /* QNConfiguration.m in Sources */,
+				31C6E68824ECC75700633629 /* NSData+QNGZip.m in Sources */,
 				31C2EECF242CC52600713A33 /* QNDnsCacheInfo.m in Sources */,
 				CC251354244C026A003F4C65 /* QNHttpResponseInfo.m in Sources */,
 				CC0F85FA2447343C008A1ABA /* QNUploadInfoCollector.m in Sources */,
@@ -1055,6 +1070,7 @@
 				DF0A03301B3BAC6E00E3778C /* QNUpTokenTest.m in Sources */,
 				3115471E243476D600D77B8B /* QNTransactionTest.m in Sources */,
 				3149446324470C0600386F16 /* XCTestCase+QNTest.m in Sources */,
+				31259E3724E3D32700CF7531 /* QNGZipTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

QiniuSDK/Storage/QNUploadInfoReporter.m

@@ -15,6 +15,7 @@
 #import "QNAsyncRun.h"
 #import "QNSystemTool.h"
 #import "QNVersion.h"
+#import "NSData+QNGZip.h"
 #import <objc/runtime.h>
 
 @interface QNReportBaseItem ()
@@ -376,7 +377,7 @@ - (instancetype)init {
     if (self) {
         _reportEnable = YES;
         _interval = 10;
-        _serverURL = @"https://uplog.qbox.me/log/4";
+        _serverURL = @"https://uplog.qbox.me/log/4?compressed=gzip";
         _recordDirectory = [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingPathComponent:@"com.qiniu.report"];
         _maxRecordFileSize = 2 * 1024 * 1024;
         _uploadThreshold = 4 * 1024;
@@ -504,13 +505,18 @@ - (void)innerReport:(NSString *)jsonString token:(NSString *)token {
             NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:_config.serverURL]];
             [request setValue:[NSString stringWithFormat:@"UpToken %@", token] forHTTPHeaderField:@"Authorization"];
             [request setValue:[[QNUserAgent sharedInstance] getUserAgent:[QNUpToken parse:token].access] forHTTPHeaderField:@"User-Agent"];
+            
             if (self.X_Log_Client_Id) {
                 [request setValue:self.X_Log_Client_Id forHTTPHeaderField:@"X-Log-Client-Id"];
             }
+            
             [request setHTTPMethod:@"POST"];
             [request setTimeoutInterval:_config.timeoutInterval];
+            
+            NSData *reportData = [NSData dataWithContentsOfFile:_recorderFilePath];
+            reportData = [NSData qn_gZip:reportData];
             __block NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
-            NSURLSessionUploadTask *uploadTask = [session uploadTaskWithRequest:request fromFile:[NSURL fileURLWithPath:_recorderFilePath] completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+            NSURLSessionUploadTask *uploadTask = [session uploadTaskWithRequest:request fromData:reportData completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
                 NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
                 if (httpResponse.statusCode == 200) {
                     self.lastReportTime = [[NSDate dateWithTimeIntervalSinceNow:0] timeIntervalSince1970];

QiniuSDK/Utils/NSData+QNGZip.h

@@ -0,0 +1,21 @@
+//
+//  NSData+QNGZip.h
+//  GZipTest
+//
+//  Created by yangsen on 2020/8/12.
+//  Copyright © 2020 yangsen. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSData(QNGZip)
+
++ (NSData *)qn_gZip:(NSData *)data;
+
++ (NSData *)qn_gUnzip:(NSData *)data;
+
+@end
+
+NS_ASSUME_NONNULL_END

QiniuSDK/Utils/NSData+QNGZip.m

@@ -0,0 +1,95 @@
+//
+//  NSData+QNGZip.m
+//  GZipTest
+//
+//  Created by yangsen on 2020/8/12.
+//  Copyright © 2020 yangsen. All rights reserved.
+//
+
+#import "NSData+QNGZip.h"
+#import <zlib.h>
+
+#pragma clang diagnostic ignored "-Wcast-qual"
+
+@implementation NSData(QNGZip)
+
++ (NSData *)qn_gZip:(NSData *)data{
+    
+    if (data.length == 0 || [self qn_isGzippedData:data]){
+        return data;
+    }
+
+    z_stream stream;
+    stream.opaque = Z_NULL;
+    stream.zalloc = Z_NULL;
+    stream.zfree = Z_NULL;
+    stream.total_out = 0;
+    stream.avail_out = 0;
+    stream.avail_in = (uint)data.length;
+    stream.next_in = (Bytef *)(void *)data.bytes;
+
+    static const NSUInteger chunkSize = 16384;
+
+    NSMutableData *gzippedData = nil;
+    
+    if (deflateInit2(&stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY) == Z_OK) {
+        gzippedData = [NSMutableData dataWithLength:chunkSize];
+        while (stream.avail_out == 0) {
+            if (stream.total_out >= gzippedData.length) {
+                gzippedData.length += chunkSize;
+            }
+            stream.next_out = (uint8_t *)gzippedData.mutableBytes + stream.total_out;
+            stream.avail_out = (uInt)(gzippedData.length - stream.total_out);
+            deflate(&stream, Z_FINISH);
+        }
+        deflateEnd(&stream);
+        gzippedData.length = stream.total_out;
+    }
+
+    return gzippedData;
+}
+
++ (NSData *)qn_gUnzip:(NSData *)data{
+    if (data.length == 0 || ![self qn_isGzippedData:data]){
+        return data;
+    }
+
+    z_stream stream;
+    stream.zalloc = Z_NULL;
+    stream.zfree = Z_NULL;
+    stream.total_out = 0;
+    stream.avail_out = 0;
+    stream.avail_in = (uint)data.length;
+    stream.next_in = (Bytef *)data.bytes;
+
+    NSMutableData *gunzippedData = nil;
+    if (inflateInit2(&stream, 47) == Z_OK) {
+        int status = Z_OK;
+        gunzippedData = [NSMutableData dataWithCapacity:data.length * 2];
+        while (status == Z_OK) {
+            if (stream.total_out >= gunzippedData.length) {
+                gunzippedData.length += data.length / 2;
+            }
+            stream.next_out = (uint8_t *)gunzippedData.mutableBytes + stream.total_out;
+            stream.avail_out = (uInt)(gunzippedData.length - stream.total_out);
+            status = inflate (&stream, Z_SYNC_FLUSH);
+        }
+        if (inflateEnd(&stream) == Z_OK) {
+            if (status == Z_STREAM_END) {
+                gunzippedData.length = stream.total_out;
+            }
+        }
+    }
+
+    return gunzippedData;
+}
+
++ (BOOL)qn_isGzippedData:(NSData *)data{
+    if (!data || data.length == 0) {
+        return false;
+    }
+    const UInt8 *bytes = (const UInt8 *)data.bytes;
+    return (data.length >= 2 && bytes[0] == 0x1f && bytes[1] == 0x8b);
+}
+
+@end

QiniuSDKTests/QNGZipTest.m

@@ -0,0 +1,45 @@
+//
+//  QNGZipTest.m
+//  QiniuSDK
+//
+//  Created by yangsen on 2020/8/12.
+//  Copyright © 2020 Qiniu. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "NSData+QNGZip.h"
+
+@interface QNGZipTest : XCTestCase
+
+@end
+
+@implementation QNGZipTest
+
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
+- (void)testGZip {
+    
+    NSData *data = [NSData data];
+    NSData *gzip = [NSData qn_gZip:data];
+    XCTAssertTrue([data isEqualToData:gzip], "pass");
+    
+    NSString *string = @"ABCDEFG";
+    data = [string dataUsingEncoding:NSUTF8StringEncoding];
+    gzip = [NSData qn_gZip:data];
+    
+    NSData *gUnzip = [NSData qn_gUnzip:gzip];
+    NSString *stringGUnzip =  [[NSString alloc] initWithData:gUnzip encoding:NSUTF8StringEncoding];
+    XCTAssertTrue([string isEqualToString:stringGUnzip], "pass");
+    
+    NSData *reGUnzip = [NSData qn_gUnzip:gUnzip];
+    XCTAssertTrue([gUnzip isEqualToData:reGUnzip], "pass");
+}
+
+
+@end

QiniuSDKTests/QNTestConfig.h

@@ -6,5 +6,5 @@
 //  Copyright (c) 2014年 Qiniu. All rights reserved.
 //
 
-
 static NSString *const g_token = @"jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:6SxDNsbfE8Womrv09M5ORkcTDKk=:eyJzY29wZSI6InpvbmUwLXNwYWNlIiwiZGVhZGxpbmUiOjE2MDI5MDA0MDAsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
+