Copy channels for public iterate() on internal queue.

Source/ARTChannels.h

@@ -18,6 +18,6 @@
 - (ChannelType)get:(NSString *)name;
 - (ChannelType)get:(NSString *)name options:(ARTChannelOptions *)options;
 - (void)release:(NSString *)name;
-- (id<NSFastEnumeration>)iterate;
+- (id<NSFastEnumeration>)copyIntoIteratorWithMapper:(id (^)(ChannelType))mapper;
 
 @end

Source/ARTChannels.m

@@ -33,10 +33,14 @@ - (instancetype)initWithDelegate:(id)delegate dispatchQueue:(dispatch_queue_t)qu
     return self;
 }
 
-- (id<NSFastEnumeration>)iterate {
+- (id<NSFastEnumeration>)copyIntoIteratorWithMapper:(id (^)(id))mapper {
     __block id<NSFastEnumeration>ret;
 dispatch_sync(_queue, ^{
-    ret = [self getNosyncIterable];
+    NSMutableArray *channels = [[NSMutableArray alloc] init];
+    for (id internalChannel in [self getNosyncIterable]) {
+        [channels addObject:mapper(internalChannel)];
+    }
+    ret = [channels objectEnumerator];
 });
     return ret;
 }

Source/ARTRealtimeChannels+Private.h

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (ARTRealtimeChannelInternal *)get:(NSString *)name;
 - (ARTRealtimeChannelInternal *)get:(NSString *)name options:(ARTChannelOptions *)options;
+- (id<NSFastEnumeration>)copyIntoIteratorWithMapper:(ARTRealtimeChannel *(^)(ARTRealtimeChannelInternal *))mapper;
 
 - (instancetype)initWithRealtime:(ARTRealtimeInternal *)realtime;
 

Source/ARTRealtimeChannels.h

@@ -20,14 +20,14 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)exists:(NSString *)name;
 - (void)release:(NSString *)name callback:(nullable void (^)(ARTErrorInfo *_Nullable))errorInfo;
 - (void)release:(NSString *)name;
-- (id<NSFastEnumeration>)iterate;
 
 @end
 
 @interface ARTRealtimeChannels : NSObject<ARTRealtimeChannelsProtocol>
 
 - (ARTRealtimeChannel *)get:(NSString *)name;
 - (ARTRealtimeChannel *)get:(NSString *)name options:(ARTChannelOptions *)options;
+- (id<NSFastEnumeration>)iterate;
 
 @end
 

Source/ARTRealtimeChannels.m

@@ -47,11 +47,9 @@ - (void)release:(NSString *)name {
 }
 
 - (id<NSFastEnumeration>)iterate {
-    NSMutableArray *channels = [[NSMutableArray alloc] init];
-    for (ARTRealtimeChannelInternal *internalChannel in [_internal iterate]) {
-        [channels addObject:[[ARTRealtimeChannel alloc] initWithInternal:internalChannel queuedDealloc:_dealloc]];
-    }
-    return channels;
+    return [_internal copyIntoIteratorWithMapper:^ARTRealtimeChannel *(ARTRealtimeChannelInternal *internalChannel) {
+        return [[ARTRealtimeChannel alloc] initWithInternal:internalChannel queuedDealloc:self->_dealloc];
+    }];
 }
 
 @end
@@ -86,8 +84,8 @@ - (id)makeChannel:(NSString *)name options:(ARTChannelOptions *)options {
     return [ARTRealtimeChannelInternal channelWithRealtime:_realtime andName:name withOptions:options];
 }
 
-- (id<NSFastEnumeration>)iterate {
-    return [_channels iterate];
+- (id<NSFastEnumeration>)copyIntoIteratorWithMapper:(ARTRealtimeChannel *(^)(ARTRealtimeChannelInternal *))mapper {
+    return [_channels copyIntoIteratorWithMapper:mapper];
 }
 
 - (ARTRealtimeChannelInternal *)get:(NSString *)name {

Source/ARTRestChannels+Private.h

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (ARTRestChannelInternal *)get:(NSString *)name;
 - (ARTRestChannelInternal *)get:(NSString *)name options:(ARTChannelOptions *)options;
+- (id<NSFastEnumeration>)copyIntoIteratorWithMapper:(ARTRestChannel *(^)(ARTRestChannelInternal *))mapper;
 
 - (instancetype)initWithRest:(ARTRestInternal *)rest;
 - (ARTRestChannelInternal *)_getChannel:(NSString *)name options:(ARTChannelOptions * _Nullable)options addPrefix:(BOOL)addPrefix;

Source/ARTRestChannels.h

@@ -19,14 +19,14 @@ NS_ASSUME_NONNULL_BEGIN
 // Thus, we can't make ARTRestChannels inherit from ARTChannels; we have to compose them instead.
 - (BOOL)exists:(NSString *)name;
 - (void)release:(NSString *)name;
-- (id<NSFastEnumeration>)iterate;
 
 @end
 
 @interface ARTRestChannels : NSObject<ARTRestChannelsProtocol>
 
 - (ARTRestChannel *)get:(NSString *)name;
 - (ARTRestChannel *)get:(NSString *)name options:(ARTChannelOptions *)options;
+- (id<NSFastEnumeration>)iterate;
 
 @end
 

Source/ARTRestChannels.m

@@ -42,11 +42,9 @@ - (void)release:(NSString *)name {
 }
 
 - (id<NSFastEnumeration>)iterate {
-    NSMutableArray *channels = [[NSMutableArray alloc] init];
-    for (ARTRestChannelInternal *internalChannel in [_internal iterate]) {
-        [channels addObject:[[ARTRestChannel alloc] initWithInternal:internalChannel queuedDealloc:_dealloc]];
-    }
-    return channels;
+    return [_internal copyIntoIteratorWithMapper:^ARTRestChannel *(ARTRestChannelInternal *internalChannel) {
+        return [[ARTRestChannel alloc] initWithInternal:internalChannel queuedDealloc:self->_dealloc];
+    }];
 }
 
 @end
@@ -80,9 +78,9 @@ - (id)makeChannel:(NSString *)name options:(ARTChannelOptions *)options {
 } ART_TRY_OR_REPORT_CRASH_END
 }
 
-- (id<NSFastEnumeration>)iterate {
+- (id<NSFastEnumeration>)copyIntoIteratorWithMapper:(ARTRestChannel *(^)(ARTRestChannelInternal *))mapper {
 ART_TRY_OR_REPORT_CRASH_START(_rest) {
-    return [_channels iterate];
+    return [_channels copyIntoIteratorWithMapper:mapper];
 } ART_TRY_OR_REPORT_CRASH_END
 }