Removed deprecated RCTEventDispatcher & cleanup

Author: timhonders

index.android.js

@@ -1,7 +1,3 @@
-import { Platform } from "react-native"
-import RNRabbitMqIos from "./index.ios.js"
-import RNRabbitMqAndroid from "./index.android.js"
-
-const RNRabbitMq = Platform.OS === "ios" ? RNRabbitMqIos : RNRabbitMqAndroid
-
-export default RNRabbitMq
+export { Connection } from './lib/Connection';
+export { Queue } from './lib/Queue';
+export { Exchange } from './lib/Exchange';

index.ios.js

@@ -7,11 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5D72D2EC1C16249000E22EC1 /* RCTReactNativeRabbitMq.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D72D2EB1C16249000E22EC1 /* RCTReactNativeRabbitMq.h */; };
-		5D72D2EE1C16249000E22EC1 /* RCTReactNativeRabbitMq.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D72D2ED1C16249000E22EC1 /* RCTReactNativeRabbitMq.m */; };
 		E82757861DD4899200DEF92C /* RabbitMqConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = E82757851DD4899200DEF92C /* RabbitMqConnection.m */; };
 		E82757A61DD4CEDF00DEF92C /* RabbitMqQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = E82757A51DD4CEDF00DEF92C /* RabbitMqQueue.m */; };
 		E84EF0841DDB5832000F141B /* RabbitMqDelegateLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = E84EF0831DDB5832000F141B /* RabbitMqDelegateLogger.m */; };
+		E8547EE0227C7A0C008ABBC5 /* EventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8547EDF227C7A0C008ABBC5 /* EventEmitter.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -21,22 +20,21 @@
 			dstPath = "include/$(PRODUCT_NAME)";
 			dstSubfolderSpec = 16;
 			files = (
-				5D72D2EC1C16249000E22EC1 /* RCTReactNativeRabbitMq.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
 		5D72D2E81C16249000E22EC1 /* libRCTReactNativeRabbitMq.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTReactNativeRabbitMq.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		5D72D2EB1C16249000E22EC1 /* RCTReactNativeRabbitMq.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTReactNativeRabbitMq.h; sourceTree = "<group>"; };
-		5D72D2ED1C16249000E22EC1 /* RCTReactNativeRabbitMq.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTReactNativeRabbitMq.m; sourceTree = "<group>"; };
 		E82757841DD4899200DEF92C /* RabbitMqConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RabbitMqConnection.h; sourceTree = "<group>"; };
 		E82757851DD4899200DEF92C /* RabbitMqConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RabbitMqConnection.m; sourceTree = "<group>"; };
 		E82757A41DD4CEDF00DEF92C /* RabbitMqQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RabbitMqQueue.h; sourceTree = "<group>"; };
 		E82757A51DD4CEDF00DEF92C /* RabbitMqQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RabbitMqQueue.m; sourceTree = "<group>"; };
 		E84EF0821DDB5832000F141B /* RabbitMqDelegateLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RabbitMqDelegateLogger.h; sourceTree = "<group>"; };
 		E84EF0831DDB5832000F141B /* RabbitMqDelegateLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RabbitMqDelegateLogger.m; sourceTree = "<group>"; };
+		E8547EDE227C7A0C008ABBC5 /* EventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventEmitter.h; sourceTree = "<group>"; };
+		E8547EDF227C7A0C008ABBC5 /* EventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EventEmitter.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -69,14 +67,14 @@
 		5D72D2EA1C16249000E22EC1 /* RCTReactNativeRabbitMq */ = {
 			isa = PBXGroup;
 			children = (
+				E8547EDE227C7A0C008ABBC5 /* EventEmitter.h */,
+				E8547EDF227C7A0C008ABBC5 /* EventEmitter.m */,
 				E84EF0821DDB5832000F141B /* RabbitMqDelegateLogger.h */,
 				E84EF0831DDB5832000F141B /* RabbitMqDelegateLogger.m */,
 				E82757A41DD4CEDF00DEF92C /* RabbitMqQueue.h */,
 				E82757A51DD4CEDF00DEF92C /* RabbitMqQueue.m */,
 				E82757841DD4899200DEF92C /* RabbitMqConnection.h */,
 				E82757851DD4899200DEF92C /* RabbitMqConnection.m */,
-				5D72D2EB1C16249000E22EC1 /* RCTReactNativeRabbitMq.h */,
-				5D72D2ED1C16249000E22EC1 /* RCTReactNativeRabbitMq.m */,
 			);
 			path = RCTReactNativeRabbitMq;
 			sourceTree = "<group>";
@@ -138,9 +136,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				E84EF0841DDB5832000F141B /* RabbitMqDelegateLogger.m in Sources */,
-				5D72D2EE1C16249000E22EC1 /* RCTReactNativeRabbitMq.m in Sources */,
 				E82757861DD4899200DEF92C /* RabbitMqConnection.m in Sources */,
 				E82757A61DD4CEDF00DEF92C /* RabbitMqQueue.m in Sources */,
+				E8547EE0227C7A0C008ABBC5 /* EventEmitter.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

index.js

@@ -7,7 +7,7 @@
 		<key>RCTReactNativeRabbitMq.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

ios/RCTReactNativeRabbitMq.xcodeproj/project.pbxproj

@@ -0,0 +1,8 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface EventEmitter : RCTEventEmitter <RCTBridgeModule>
+
++ (void)emitEventWithName:(NSString *)name body:(NSDictionary *)body;
+
+@end

ios/RCTReactNativeRabbitMq.xcodeproj/xcuserdata/timhonders.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,38 @@
+#import "EventEmitter.h"
+
+@implementation EventEmitter
+
+RCT_EXPORT_MODULE();
+
+- (NSArray<NSString *> *)supportedEvents {
+  return @[@"RabbitMqQueueEvent", @"RabbitMqConnectionEvent"];
+}
+
+
+- (void)startObserving {
+    NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+    for (NSString *notificationName in [self supportedEvents]) {
+        [center addObserver:self
+               selector:@selector(emitEventInternal:)
+                   name:notificationName
+                 object:nil];
+    }
+}
+
+- (void)stopObserving {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)emitEventInternal:(NSNotification *)notification {
+    [self sendEventWithName:notification.name
+                   body:notification.userInfo];
+}
+
++ (void)emitEventWithName:(NSString *)name body:(NSDictionary *)body {
+    [[NSNotificationCenter defaultCenter] postNotificationName:name
+                                                    object:self
+                                                  userInfo:body];
+}
+
+
+@end

ios/RCTReactNativeRabbitMq/EventEmitter.h

@@ -1,16 +1,11 @@
-
-#ifdef OLDER_IMPORT
-    #import "RCTBridge.h"
-    #import "RCTEventDispatcher.h"
-#else
-    #import <React/RCTBridgeModule.h>
-    #import <React/RCTEventDispatcher.h>
-#endif
+#import <React/RCTBridgeModule.h>
 
 #import <RMQClient/RMQClient.h>
 #import <RMQClient/RMQChannel.h>
+
 #import "RabbitMqQueue.h"
 #import "RabbitMqDelegateLogger.h"
+#import "EventEmitter.h"
 
 @interface RabbitMqConnection : NSObject <RCTBridgeModule>