Merge pull request #551 from zapcannon87/master

RTM support goaway

Author: zapcannon87

AVOS/AVOSCloud/UserAgent.h

@@ -1 +1 @@
-#define SDK_VERSION @"v11.5.1"
+#define SDK_VERSION @"v11.5.2"

AVOS/AVOSCloudIM/WebSocket/AVIMWebSocketWrapper.m

@@ -513,6 +513,9 @@ - (void)webSocket:(AVIMWebSocket *)webSocket didReceiveMessage:(id)message
         LCIMProtobufCommandWrapper *commandWrapper = [LCIMProtobufCommandWrapper new];
         commandWrapper.inCommand = inCommand;
         [delegate webSocketWrapper:self didReceiveCommand:commandWrapper];
+        if (!inCommand.hasPeerId) {
+            [self handleGoawayWith:inCommand];
+        }
     }
 }
 
@@ -832,4 +835,25 @@ - (uint16_t)serialIndex
     return result;
 }
 
+- (void)handleGoawayWith:(AVIMGenericCommand *)command
+{
+    AssertRunInQueue(self->_internalSerialQueue);
+    if (command.cmd != AVIMCommandType_Goaway) {
+        return;
+    }
+    NSError *error;
+    [[LCRouter sharedInstance] cleanCacheWithKey:RouterCacheKeyRTM error:&error];
+    if (error) {
+        AVLoggerError(AVLoggerDomainIM, @"%@", error);
+        return;
+    }
+    error = ({
+        AVIMErrorCode code = AVIMErrorCodeConnectionLost;
+        LCError(code, @"Connection did close by local peer.", nil);
+    });
+    [self purgeWithError:error];
+    [self pauseWithError:error];
+    [self tryConnecting:false];
+}
+
 @end

AVOS/AVOSCloudIMTests/Swift/AVIMClientTestCase.swift

@@ -340,4 +340,32 @@ class AVIMClientTestCase: LCIMTestBase {
         }, failure: { XCTFail("timeout") })
     }
 
+    func test_goaway() {
+        AVOSCloudIM.defaultOptions().rtmServer = "wss://rtm51.leancloud.cn";
+        
+        guard let client: AVIMClient = LCIMTestBase.newOpenedClient(clientId: String(#function[..<#function.index(of: "(")!])) else {
+            XCTFail()
+            return
+        }
+        let delegator = AVIMClientDelegateWrapper()
+        client.delegate = delegator
+        
+        AVOSCloudIM.defaultOptions().rtmServer = nil;
+        
+        let exp = expectation(description: "test goaway")
+        exp.expectedFulfillmentCount = 3
+        LCRouter.sharedInstance().getRTMURLWithAppID(AVOSCloud.getApplicationId()) { (response, error) in
+            XCTAssertNotNil(response)
+            XCTAssertNil(error)
+            exp.fulfill()
+        }
+        delegator.pausedClosure = { _ in
+            exp.fulfill()
+        }
+        delegator.resumedClosure = { _ in
+            exp.fulfill()
+        }
+        wait(for: [exp], timeout: 90)
+    }
+    
 }

AVOS/AVOSCloudIMTests/Swift/AVOSCloudIM-iOSTests-Bridging-Header.h

@@ -13,3 +13,4 @@
 #import "AVIMClientInternalConversationManager_Internal.h"
 #import "AVPaasClient.h"
 #import "AVIMClientPushManager.h"
+#import "LCRouter_Internal.h"

AVOSCloud.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloud'
-  s.version  = '11.5.1'
+  s.version  = '11.5.2'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud Objective-C SDK'
   s.authors  = 'LeanCloud'

AVOSCloudIM.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudIM'
-  s.version  = '11.5.1'
+  s.version  = '11.5.2'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud IM Objective-C SDK'
   s.authors  = 'LeanCloud'

AVOSCloudLiveQuery.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudLiveQuery'
-  s.version  = '11.5.1'
+  s.version  = '11.5.2'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud LiveQuery Objective-C SDK'
   s.authors  = 'LeanCloud'