Merge pull request #668 from leancloud/develop

chore: tweak code

AVOS/AVOS.xcodeproj/project.pbxproj

@@ -10,7 +10,7 @@
 		D305F7B0235577AD00222EBC /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D305F7AF235577AD00222EBC /* main.swift */; };
 		D30B6A1424A09978006ABE09 /* LeanCloudObjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30B6A0B24A09978006ABE09 /* LeanCloudObjc.framework */; };
 		D30B6A1B24A09978006ABE09 /* LeanCloudObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = D30B6A0D24A09978006ABE09 /* LeanCloudObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D30B6A2224A09B1F006ABE09 /* UserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AAC1A5A7A0000C5C6C4 /* UserAgent.h */; };
+		D30B6A2224A09B1F006ABE09 /* UserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AAC1A5A7A0000C5C6C4 /* UserAgent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A2424A09B1F006ABE09 /* LCGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C8419F41A5A79FF00C5C6C4 /* LCGlobal.h */; };
 		D30B6A2824A09B1F006ABE09 /* LCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = D3700B782475345C00678B2B /* LCApplication.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A2924A09B1F006ABE09 /* LCApplication_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D3596DAC2480EEED002D2D22 /* LCApplication_Internal.h */; };
@@ -70,7 +70,7 @@
 		D30B6A6D24A09D62006ABE09 /* LCQuery_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A691A5A79FF00C5C6C4 /* LCQuery_Internal.h */; };
 		D30B6A6E24A09D7B006ABE09 /* LCRequestOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A6C1A5A79FF00C5C6C4 /* LCRequestOperation.h */; };
 		D30B6A6F24A09D7B006ABE09 /* LCRequestOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A6D1A5A79FF00C5C6C4 /* LCRequestOperation.m */; };
-		D30B6A7024A09D7B006ABE09 /* LCPaasClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A6E1A5A79FF00C5C6C4 /* LCPaasClient.h */; };
+		D30B6A7024A09D7B006ABE09 /* LCPaasClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A6E1A5A79FF00C5C6C4 /* LCPaasClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A7224A09D7B006ABE09 /* LCPaasClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A6F1A5A79FF00C5C6C4 /* LCPaasClient.m */; };
 		D30B6A7324A09D87006ABE09 /* LCRouter.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F9A2C51CE014430002E21B /* LCRouter.h */; };
 		D30B6A7424A09D87006ABE09 /* LCRouter_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D34EBDCC211C20FF0092A538 /* LCRouter_Internal.h */; };
@@ -81,19 +81,19 @@
 		D30B6A7924A09DA3006ABE09 /* LCSearchSortBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A761A5A79FF00C5C6C4 /* LCSearchSortBuilder.m */; };
 		D30B6A7C24A09DBE006ABE09 /* LCStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A781A5A7A0000C5C6C4 /* LCStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A7D24A09DBF006ABE09 /* LCStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A791A5A7A0000C5C6C4 /* LCStatus.m */; };
-		D30B6A7E24A09DCA006ABE09 /* LCCompatibilityMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AC23ACF39700AACE99 /* LCCompatibilityMacros.h */; };
-		D30B6A7F24A09DCA006ABE09 /* LCHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AD23ACF39700AACE99 /* LCHTTPSessionManager.h */; };
+		D30B6A7E24A09DCA006ABE09 /* LCCompatibilityMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AC23ACF39700AACE99 /* LCCompatibilityMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D30B6A7F24A09DCA006ABE09 /* LCHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AD23ACF39700AACE99 /* LCHTTPSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A8024A09DCA006ABE09 /* LCHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4AA23ACF39700AACE99 /* LCHTTPSessionManager.m */; };
-		D30B6A8124A09DCA006ABE09 /* LCNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A923ACF39700AACE99 /* LCNetworking.h */; };
-		D30B6A8224A09DCA006ABE09 /* LCNetworkReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AE23ACF39700AACE99 /* LCNetworkReachabilityManager.h */; };
+		D30B6A8124A09DCA006ABE09 /* LCNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A923ACF39700AACE99 /* LCNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D30B6A8224A09DCA006ABE09 /* LCNetworkReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AE23ACF39700AACE99 /* LCNetworkReachabilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A8324A09DCA006ABE09 /* LCNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4AF23ACF39700AACE99 /* LCNetworkReachabilityManager.m */; };
-		D30B6A8424A09DCA006ABE09 /* LCSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4B023ACF39700AACE99 /* LCSecurityPolicy.h */; };
+		D30B6A8424A09DCA006ABE09 /* LCSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4B023ACF39700AACE99 /* LCSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A8524A09DCA006ABE09 /* LCSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4A323ACF39600AACE99 /* LCSecurityPolicy.m */; };
-		D30B6A8624A09DCA006ABE09 /* LCURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A423ACF39600AACE99 /* LCURLRequestSerialization.h */; };
+		D30B6A8624A09DCA006ABE09 /* LCURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A423ACF39600AACE99 /* LCURLRequestSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A8724A09DCA006ABE09 /* LCURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4A623ACF39700AACE99 /* LCURLRequestSerialization.m */; };
-		D30B6A8824A09DCA006ABE09 /* LCURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A523ACF39600AACE99 /* LCURLResponseSerialization.h */; };
+		D30B6A8824A09DCA006ABE09 /* LCURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A523ACF39600AACE99 /* LCURLResponseSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A8924A09DCA006ABE09 /* LCURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4A723ACF39700AACE99 /* LCURLResponseSerialization.m */; };
-		D30B6A8A24A09DCA006ABE09 /* LCURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A823ACF39700AACE99 /* LCURLSessionManager.h */; };
+		D30B6A8A24A09DCA006ABE09 /* LCURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A823ACF39700AACE99 /* LCURLSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A8B24A09DCA006ABE09 /* LCURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4AB23ACF39700AACE99 /* LCURLSessionManager.m */; };
 		D30B6A8C24A09DD8006ABE09 /* LCKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 836705DC1BA1C1710050E968 /* LCKeychain.h */; };
 		D30B6A8D24A09DD8006ABE09 /* LCKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 836705DD1BA1C1710050E968 /* LCKeychain.m */; };
@@ -288,7 +288,7 @@
 		D30B6B5524A09FB6006ABE09 /* LCRTMConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = D3700B722475244E00678B2B /* LCRTMConnection.h */; };
 		D30B6B5624A09FB6006ABE09 /* LCRTMConnection_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D34C417D2483C3FD00CD2459 /* LCRTMConnection_Internal.h */; };
 		D30B6B5724A09FB6006ABE09 /* LCRTMConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = D3700B732475244E00678B2B /* LCRTMConnection.m */; };
-		D30B6B5824A09FB6006ABE09 /* LCRTMWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = D3120E0823B0DA8E00A64120 /* LCRTMWebSocket.h */; };
+		D30B6B5824A09FB6006ABE09 /* LCRTMWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = D3120E0823B0DA8E00A64120 /* LCRTMWebSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6B5924A09FB6006ABE09 /* LCRTMWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = D3120E0923B0DA8E00A64120 /* LCRTMWebSocket.m */; };
 		D30B6B5B24A0A03D006ABE09 /* LCLiveQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 838CE3521EC9838500B24F5B /* LCLiveQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6B5C24A0A03D006ABE09 /* LCLiveQuery_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D34FD72B2068CFE900B7C11B /* LCLiveQuery_Internal.h */; };
@@ -1013,7 +1013,6 @@
 		8C841A7A1A5A7A0000C5C6C4 /* Vendor */ = {
 			isa = PBXGroup;
 			children = (
-				83FCB9911CEDC57C007D8712 /* LCNetworking */,
 				836705DA1BA1C1710050E968 /* JNKeychain */,
 				83DF02A41AF86032000E289C /* LCDB */,
 			);
@@ -1286,6 +1285,24 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		D3516D1A26FB19640013BCF3 /* Vendor */ = {
+			isa = PBXGroup;
+			children = (
+				83FCB9911CEDC57C007D8712 /* LCNetworking */,
+				D3516D1B26FB19860013BCF3 /* WebSocket */,
+			);
+			path = Vendor;
+			sourceTree = "<group>";
+		};
+		D3516D1B26FB19860013BCF3 /* WebSocket */ = {
+			isa = PBXGroup;
+			children = (
+				D3120E0823B0DA8E00A64120 /* LCRTMWebSocket.h */,
+				D3120E0923B0DA8E00A64120 /* LCRTMWebSocket.m */,
+			);
+			path = WebSocket;
+			sourceTree = "<group>";
+		};
 		D365E42126C3D23900148DE8 /* Leaderboard */ = {
 			isa = PBXGroup;
 			children = (
@@ -1302,8 +1319,6 @@
 				D3700B722475244E00678B2B /* LCRTMConnection.h */,
 				D34C417D2483C3FD00CD2459 /* LCRTMConnection_Internal.h */,
 				D3700B732475244E00678B2B /* LCRTMConnection.m */,
-				D3120E0823B0DA8E00A64120 /* LCRTMWebSocket.h */,
-				D3120E0923B0DA8E00A64120 /* LCRTMWebSocket.m */,
 			);
 			path = Connection;
 			sourceTree = "<group>";
@@ -1332,6 +1347,7 @@
 		D3F227BC2649133900A599F5 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				D3516D1A26FB19640013BCF3 /* Vendor */,
 				8C8419881A5A791300C5C6C4 /* Foundation */,
 				D3F227BD264914E400A599F5 /* Realtime */,
 			);

AVOS/LeanCloudObjc/Foundation.h

@@ -8,14 +8,21 @@
 
 #import <Foundation/Foundation.h>
 
-// Application
-#import "LCApplication.h"
+// Vendor
+#import "LCNetworking.h"
 
 // Constants
+#import "UserAgent.h"
 #import "LCLogger.h"
 #import "LCErrorUtils.h"
 #import "LCUtils.h"
 
+// HTTP Client
+#import "LCPaasClient.h"
+
+// Application
+#import "LCApplication.h"
+
 // Object
 #import "LCObject.h"
 #import "LCObject+Subclass.h"

AVOS/LeanCloudObjc/Realtime.h

@@ -10,6 +10,9 @@
 
 #import "Foundation.h"
 
+// Vendor
+#import "LCRTMWebSocket.h"
+
 // Constant
 #import "LCIMCommon.h"
 

AVOS/Sources/Foundation/File/LCFile.m

@@ -188,7 +188,7 @@ - (instancetype)initWithLocalPath:(NSString *)localPath
         });
 
         NSNumber *fileSize = fileAttributes[NSFileSize];
-        _rawJSONData[kLCFile_metaData] = fileSize ? @{ kLCFile_size : fileSize } : @{};
+        _rawJSONData[kLCFile_metaData] = (fileSize != nil) ? @{ kLCFile_size : fileSize } : @{};
 
         _ACL = ({
 

AVOS/Sources/Foundation/LCApplication.h

@@ -166,6 +166,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, readonly) NSString *identifier;
 @property (nonatomic, readonly) NSString *key;
+@property (nonatomic, readonly, nullable) NSString *serverURLString;
 @property (nonatomic, copy, nullable) NSString *RTMServer;
 
 - (void)setWithIdentifier:(NSString *)identifier key:(NSString *)key;

AVOS/Sources/Foundation/LCApplication.m

@@ -184,25 +184,37 @@ + (instancetype)defaultApplication {
     return instance;
 }
 
+- (NSString *)serverURLString {
+    return [LCRouter serverURLString];
+}
+
 - (void)setWithIdentifier:(NSString *)identifier key:(NSString *)key {
     _identifier = [identifier copy];
     _key = [key copy];
 }
 
+- (NSString *)identifier {
+    return [self identifierThrowException];
+}
+
+- (NSString *)key {
+    return [self keyThrowException];
+}
+
 - (NSString *)identifierThrowException {
-    if (!self.identifier) {
+    if (!_identifier || _identifier.length == 0) {
         [NSException raise:NSInternalInconsistencyException
                     format:@"Application identifier not found."];
     }
-    return self.identifier;
+    return _identifier;
 }
 
 - (NSString *)keyThrowException {
-    if (!self.key) {
+    if (!_key || _key.length == 0) {
         [NSException raise:NSInternalInconsistencyException
                     format:@"Application key not found."];
     }
-    return self.key;
+    return _key;
 }
 
 @end

AVOS/Sources/Foundation/LCApplication_Internal.h

@@ -10,6 +10,9 @@
 
 @interface LCApplication ()
 
+@property (nonatomic) NSString *identifier;
+@property (nonatomic) NSString *key;
+
 - (NSString *)identifierThrowException;
 - (NSString *)keyThrowException;
 

AVOS/Sources/Foundation/Query/LCQuery.h

@@ -109,12 +109,18 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)includeKey:(NSString *)key;
 
+/// Reset included keys.
+- (void)resetIncludeKey;
+
 /*!
  Make the query restrict the fields of the returned LCObjects to include only the provided keys.
  If this is called multiple times, then all of the keys specified in each of the calls will be included.
  @param keys The keys to include in the result.
  */
-- (void)selectKeys:(NSArray *)keys;
+- (void)selectKeys:(NSArray<NSString *> *)keys;
+
+/// Reset selected keys.
+- (void)resetSelectKey;
 
 /*!
  Add a constraint that requires a particular key exists.

AVOS/Sources/Foundation/Query/LCQuery.m

@@ -171,19 +171,25 @@ - (void)doInitialization {
     _maxCacheAge = 24 * 3600;
 }
 
-- (void)includeKey:(NSString *)key
-{
+- (void)includeKey:(NSString *)key {
     [self.include addObject:key];
 }
 
-- (void)selectKeys:(NSArray *)keys
-{
-    if (self.selectedKeys == nil) {
-        _selectedKeys = [[NSMutableSet alloc] initWithCapacity:keys.count];
+- (void)resetIncludeKey {
+    self.include = [[NSMutableSet alloc] init];
+}
+
+- (void)selectKeys:(NSArray<NSString *> *)keys {
+    if (!self.selectedKeys) {
+        self.selectedKeys = [[NSMutableSet alloc] initWithCapacity:keys.count];
     }
     [self.selectedKeys addObjectsFromArray:keys];
 }
 
+- (void)resetSelectKey {
+    self.selectedKeys = nil;
+}
+
 - (void)addWhereItem:(id)dict forKey:(NSString *)key {
     if ([dict objectForKey:@"$eq"]) {
         if ([self.where objectForKey:@"$and"]) {

AVOS/Sources/Foundation/Query/LCQuery_Internal.h

@@ -11,7 +11,7 @@
 @interface LCQuery ()
 @property (nonatomic, readwrite, strong) NSMutableDictionary *parameters;
 @property (nonatomic, readwrite, strong) NSMutableDictionary *where;
-@property (nonatomic, readwrite, strong) NSMutableSet * selectedKeys;
+@property (nonatomic) NSMutableSet<NSString *> *selectedKeys;
 @property (nonatomic, strong) NSMutableDictionary *extraParameters;
 
 - (NSDictionary *)assembleParameters;

AVOS/Sources/Foundation/Router/LCRouter.m

@@ -30,7 +30,7 @@ + (NSString *)serverURLString {
 }
 
 + (void)setServerURLString:(NSString *)URLString {
-    serverURLString = URLString;
+    serverURLString = [URLString copy];
 }
 
 + (instancetype)sharedInstance

LeanCloudObjc.podspec

@@ -23,10 +23,14 @@ Pod::Spec.new do |s|
   s.subspec 'Foundation' do |ss|
     ss.source_files =
       'AVOS/LeanCloudObjc/Foundation.h',
+      'AVOS/Sources/Vendor/LCNetworking/*.{h,m}',
       'AVOS/Sources/Foundation/**/*.{h,m}'
 
     ss.public_header_files =
       'AVOS/LeanCloudObjc/Foundation.h',
+      'AVOS/Sources/Vendor/LCNetworking/*.h',
+      'AVOS/Sources/Foundation/UserAgent.h',
+      'AVOS/Sources/Foundation/Request/LCPaasClient.h',
       'AVOS/Sources/Foundation/Captcha/LCCaptcha.h',
       'AVOS/Sources/Foundation/Utils/LCDynamicObject.h',
       'AVOS/Sources/Foundation/SMS/LCSMS.h',
@@ -77,11 +81,13 @@ Pod::Spec.new do |s|
 
     ss.source_files =
       'AVOS/LeanCloudObjc/Realtime.h',
+      'AVOS/Sources/Vendor/WebSocket/*.{h,m}',
       'AVOS/Sources/Realtime/IM/**/*.{h,m,c}',
       'AVOS/Sources/Realtime/LiveQuery/**/*.{h,m}'
 
     ss.public_header_files =
       'AVOS/LeanCloudObjc/Realtime.h',
+      'AVOS/Sources/Vendor/WebSocket/*.h',
       'AVOS/Sources/Realtime/IM/Message/LCIMMessageOption.h',
       'AVOS/Sources/Realtime/IM/Conversation/LCIMKeyedConversation.h',
       'AVOS/Sources/Realtime/IM/Conversation/LCIMConversationQuery.h',