Send channel error with server close reason

[#119621443]

Author: camelpunch

RMQClient/RMQErrors.h

@@ -13,6 +13,8 @@ typedef NS_ENUM(NSInteger, RMQError) {
     RMQErrorChannelIncorrectSyncMethod,
     RMQErrorChannelQueueNameCollision,
 
-    RMQErrorInvalidPath,
     RMQErrorInvalidScheme,
+
+    RMQErrorInvalidPath                 = 402,
+    RMQErrorNotFound                    = 404,
 };

RMQClient/RMQSuspendResumeDispatcher.m

@@ -114,9 +114,7 @@ - (void)sendAsyncMethod:(id<RMQMethod>)method {
 
 - (void)handleFrameset:(RMQFrameset *)frameset {
     if (self.state != DispatcherStateClosedByServer && [self isClose:frameset.method]) {
-        self.state = DispatcherStateClosedByServer;
-        [self.sender sendFrameset:[[RMQFrameset alloc] initWithChannelNumber:self.channelNumber
-                                                                      method:[RMQChannelCloseOk new]]];
+        [self processServerClose:(RMQChannelClose *)frameset.method];
     } else if (self.state != DispatcherStateClosedByServer) {
         [self.validator fulfill:frameset];
     }
@@ -138,6 +136,16 @@ - (void)handleClosure:(id<RMQMethod>)method
     }
 }
 
+- (void)processServerClose:(RMQChannelClose *)close {
+    self.state = DispatcherStateClosedByServer;
+    NSError *error = [NSError errorWithDomain:RMQErrorDomain
+                                         code:close.replyCode.integerValue
+                                     userInfo:@{NSLocalizedDescriptionKey: close.replyText.stringValue}];
+    [self.delegate channel:self.channel error:error];
+    [self.sender sendFrameset:[[RMQFrameset alloc] initWithChannelNumber:self.channelNumber
+                                                                  method:[RMQChannelCloseOk new]]];
+}
+
 - (void)sendChannelClosedError {
     NSError *error = [NSError errorWithDomain:RMQErrorDomain
                                          code:RMQErrorChannelClosed

RMQClientTests/RMQSuspendResumeDispatcherTest.swift

@@ -223,11 +223,24 @@ class RMQSuspendResumeDispatcherTest: XCTestCase {
         XCTAssertFalse(called)
     }
 
+    func testServerCloseSendsErrorToDelegateWithCloseReasonWhen404() {
+        let (dispatcher, _, _, delegate, _) = setupActivated()
+        let close = RMQChannelClose(
+            replyCode: RMQShort(404),
+            replyText: RMQShortstr("NOT_FOUND - no exchange 'yomoney' in vhost '/'"),
+            classId: RMQShort(60),
+            methodId: RMQShort(40)
+        )
+        dispatcher.handleFrameset(RMQFrameset(channelNumber: 123, method: close))
+        XCTAssertEqual(RMQError.NotFound.rawValue, delegate.lastChannelError?.code)
+        XCTAssertEqual("NOT_FOUND - no exchange 'yomoney' in vhost '/'", delegate.lastChannelError?.localizedDescription)
+    }
+
     func testServerCloseTriggersErrorsForFutureOperations() {
         let (dispatcher, q, _, delegate, _) = setupActivated()
         dispatcher.handleFrameset(RMQFrameset(channelNumber: 123, method: MethodFixtures.channelClose()))
         dispatcher.sendSyncMethod(MethodFixtures.basicGet())
-        XCTAssertNil(delegate.lastChannelError)
+        delegate.lastChannelError = nil
         try! q.step()
         XCTAssertEqual(RMQError.ChannelClosed.rawValue, delegate.lastChannelError?.code)
     }
@@ -243,6 +256,7 @@ class RMQSuspendResumeDispatcherTest: XCTestCase {
         let (dispatcher, q, sender, delegate, _) = setupActivated()
         dispatcher.handleFrameset(RMQFrameset(channelNumber: 123, method: MethodFixtures.channelClose()))
 
+        delegate.lastChannelError = nil
         sender.lastSentMethod = nil
         dispatcher.sendSyncMethodBlocking(MethodFixtures.channelClose())
         try! q.finish()