Updates to ordering of loading

Author: auser

ios/Firestack.xcodeproj/project.pbxproj

@@ -17,7 +17,6 @@
 		D97261661D550CF5000F703F /* GoogleInterchangeUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261651D550CF5000F703F /* GoogleInterchangeUtilities.framework */; };
 		D97261691D550D03000F703F /* GoogleIPhoneUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261681D550D03000F703F /* GoogleIPhoneUtilities.framework */; };
 		D972616B1D550D07000F703F /* GoogleNetworkingUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D972616A1D550D07000F703F /* GoogleNetworkingUtilities.framework */; };
-		D972616D1D550D0B000F703F /* GoogleParsingUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D972616C1D550D0B000F703F /* GoogleParsingUtilities.framework */; };
 		D972616F1D550D0F000F703F /* GoogleSymbolUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D972616E1D550D0F000F703F /* GoogleSymbolUtilities.framework */; };
 		D97261711D550D13000F703F /* GoogleUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261701D550D13000F703F /* GoogleUtilities.framework */; };
 		D97261771D550D81000F703F /* FirebaseAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261761D550D81000F703F /* FirebaseAnalytics.framework */; };
@@ -31,6 +30,7 @@
 		D97261C51D551BF0000F703F /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261C41D551BF0000F703F /* libicucore.tbd */; };
 		D97261C71D551BF5000F703F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261C61D551BF5000F703F /* CFNetwork.framework */; };
 		D97261C91D551BFF000F703F /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D97261C81D551BFF000F703F /* AddressBook.framework */; };
+		D98A11F41D8D167D004DB865 /* AppDelegate+Firestack.m in Sources */ = {isa = PBXBuildFile; fileRef = D98A11F31D8D167D004DB865 /* AppDelegate+Firestack.m */; };
 		D9A8C7A41D7E54C900142F94 /* libPods-Firestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D95036B81D19C90300F7094D /* libPods-Firestack.a */; };
 		D9D62E7C1D6D86FD003D826D /* FirestackStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = D9D62E7B1D6D86FD003D826D /* FirestackStorage.m */; };
 		D9D62E801D6D8717003D826D /* FirestackAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = D9D62E7F1D6D8717003D826D /* FirestackAuth.m */; };
@@ -99,6 +99,8 @@
 		D97261C41D551BF0000F703F /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
 		D97261C61D551BF5000F703F /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		D97261C81D551BFF000F703F /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
+		D98A11F21D8D167D004DB865 /* AppDelegate+Firestack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "AppDelegate+Firestack.h"; path = "Firestack/AppDelegate+Firestack.h"; sourceTree = "<group>"; };
+		D98A11F31D8D167D004DB865 /* AppDelegate+Firestack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "AppDelegate+Firestack.m"; path = "Firestack/AppDelegate+Firestack.m"; sourceTree = "<group>"; };
 		D9CFBE441D531058002623BF /* buildScript.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = buildScript.sh; sourceTree = "<group>"; };
 		D9D62E7A1D6D86FD003D826D /* FirestackStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirestackStorage.h; path = Firestack/FirestackStorage.h; sourceTree = "<group>"; };
 		D9D62E7B1D6D86FD003D826D /* FirestackStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirestackStorage.m; path = Firestack/FirestackStorage.m; sourceTree = "<group>"; };
@@ -128,7 +130,6 @@
 				D97261661D550CF5000F703F /* GoogleInterchangeUtilities.framework in Frameworks */,
 				D97261691D550D03000F703F /* GoogleIPhoneUtilities.framework in Frameworks */,
 				D972616B1D550D07000F703F /* GoogleNetworkingUtilities.framework in Frameworks */,
-				D972616D1D550D0B000F703F /* GoogleParsingUtilities.framework in Frameworks */,
 				D972616F1D550D0F000F703F /* GoogleSymbolUtilities.framework in Frameworks */,
 				D97261711D550D13000F703F /* GoogleUtilities.framework in Frameworks */,
 				0A4200BEE17F6884883BB2E7 /* libPods-Firestack.a in Frameworks */,
@@ -176,6 +177,7 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				D98A11F61D8D1683004DB865 /* Extensions */,
 				D96290351D6D145F0099A3EC /* Modules */,
 				D9CFBE441D531058002623BF /* buildScript.sh */,
 				D950369C1D19C77400F7094D /* Firestack.h */,
@@ -223,6 +225,15 @@
 			name = Modules;
 			sourceTree = "<group>";
 		};
+		D98A11F61D8D1683004DB865 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				D98A11F21D8D167D004DB865 /* AppDelegate+Firestack.h */,
+				D98A11F31D8D167D004DB865 /* AppDelegate+Firestack.m */,
+			);
+			name = Extensions;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -336,6 +347,7 @@
 				D9D62E7C1D6D86FD003D826D /* FirestackStorage.m in Sources */,
 				D962903F1D6D15B00099A3EC /* FirestackErrors.m in Sources */,
 				D950369E1D19C77400F7094D /* Firestack.m in Sources */,
+				D98A11F41D8D167D004DB865 /* AppDelegate+Firestack.m in Sources */,
 				D90882D61D89C18C00FB6742 /* FirestackCloudMessaging.m in Sources */,
 				D96290851D6D28B80099A3EC /* FirestackDatabase.m in Sources */,
 			);

ios/Firestack/AppDelegate+Firestack.h

@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder
+
+@end
+

ios/Firestack/AppDelegate+Firestack.m

@@ -0,0 +1,70 @@
+#import <objc/runtime.h>
+#import "AppDelegate+Firestack.h"
+#import "Firebase.h"
+#import "Firestack.h"
+#import "FirestackEvents.h"
+
+@implementation AppDelegate (Firestack)
+
++ (void) load
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        Class class = [self class];
+        
+        SEL originalSelector = @selector(application:didFinishLaunchingWithOptions:);
+        SEL swizzledSelector = @selector(swizzled_application:didFinishLaunchingWithOptions:);
+        
+        Method originalMethod = class_getInstanceMethod(class, originalSelector);
+        Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
+        
+        BOOL didAddMethod =
+        class_addMethod(class,
+                        originalSelector,
+                        method_getImplementation(swizzledMethod),
+                        method_getTypeEncoding(swizzledMethod));
+        
+        if (didAddMethod) {
+            class_replaceMethod(class,
+                                swizzledSelector,
+                                method_getImplementation(originalMethod),
+                                method_getTypeEncoding(originalMethod));
+        } else {
+            method_exchangeImplementations(originalMethod, swizzledMethod);
+        }
+    });
+}
+
+- (BOOL) swizzled_application:(UIApplication *) application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    BOOL res = [self swizzled_application:application didFinishLaunchingWithOptions:launchOptions];
+    [FIRApp configure];
+    [self setupListeners];
+    return res;
+}
+
+- (void) dealloc 
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void) setupListeners
+{
+    // Post notification that we've initialized Firebase
+    [[NSNotificationCenter defaultCenter] 
+      postNotificationName:kFirestackInitialized
+      object:nil];
+
+    // Add listener for when firestack the app reloads
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                         selector:@selector(reloadFirestack)
+                                             name:RCTReloadNotification
+                                           object:nil];
+}
+
+- (void) reloadFirestack
+{
+  // TODO:
+}
+
+@end

ios/Firestack/Firestack.h

@@ -9,13 +9,23 @@
 #import "RCTBridgeModule.h"
 #import "RCTEventDispatcher.h"
 #import "RCTEventEmitter.h"
+#import "AppDelegate+Firestack.h"
 
 @interface Firestack : RCTEventEmitter <RCTBridgeModule> {
     FIRAuthStateDidChangeListenerHandle authListenerHandle;
 }
 
-+ (void) registerForNotification:(NSString *) typeStr andToken:(NSData *)deviceToken;
-+ (void) setup:(UIApplication *) application;
+// + (void) registerForNotification:(NSString *) typeStr andToken:(NSData *)deviceToken;
+// + (void) setup:(UIApplication *) application;
+
++ (void) reloadFirestack;
++ (void) initializeFirestack:(Firestack *) instance;
++ (instancetype) sharedInstance;
+- (FIRApp *) firebaseApp;
+
+- (void) debugLog:(NSString *)title
+              msg:(NSString *)msg;
+
 
 @property (nonatomic) BOOL debug;
 @property (atomic) BOOL configured;

ios/Firestack/Firestack.m

@@ -4,38 +4,84 @@
 //  Copyright © 2016 Facebook. All rights reserved.
 //
 
+#import <objc/runtime.h>
+
 #import "Firestack.h"
 #import "FirestackErrors.h"
 #import "FirestackEvents.h"
-#import "FirestackCloudMessaging.h"
+#import "FirestackAnalytics.h"
+// #import "FirestackCloudMessaging.h"
 
 @import Firebase;
 
+static Firestack *_sharedInstance = nil;
+
 @implementation Firestack
+
 typedef void (^UserWithTokenResponse)(NSDictionary *, NSError *);
 
 - (void)dealloc
 {
-    NSLog(@"Dealloc called on Firestack");
-    [[FIRApp defaultApp] deleteApp:^(BOOL success) {
-        if (success) {
-            NSLog(@"Successfully removed app");
-        } else {
-            NSLog(@"Unsuccessfully cleaned up all");
-        }
-    }];
+    NSLog(@"Dealloc called on Firestack: %@", self);
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (instancetype) init {
+  self = [super init];
+  if (self) {
+    NSLog(@"Initializing Firestack: %@", self);
+    [Firestack initializeFirestack:self];
+  }
+  return self;
 }
 
-+ (void) setup:(UIApplication *) application
++ (void) initializeFirestack:(Firestack *) instance
 {
-    [FirestackCloudMessaging setup:application];
+    NSLog(@"Shared instance created on Firestack: %@", instance);
+    // [FIRApp configureWithOptions:finalOptions];
+
+    _sharedInstance = instance;
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(reloadFirestack)
+                                                 name:RCTReloadNotification
+                                               object:nil];
+
+    // [[NSNotificationCenter defaultCenter] 
+    //     postNotificationName:RCTReloadNotification 
+    //     object:nil 
+    //     userInfo:nil];
+
+    // [[NSNotificationCenter defaultCenter] addObserver:self
+    //     selector:@selector(firestackConfigured:)
+    //     name:kFirestackInitialized
+    //     object:instance];
 }
 
++ (instancetype) sharedInstance
+{
+    return _sharedInstance;
+}
+
++ (void) reloadFirestack
+{
+    // Reloading firestack
+    [[Firestack sharedInstance] debugLog:@"Firestack"
+                                     msg:@"Reloading firestack"];
+}
+
+- (FIRApp *) firebaseApp
+{
+    return [FIRApp defaultApp];
+}
+
+
 RCT_EXPORT_MODULE(Firestack);
 
 RCT_EXPORT_METHOD(configureWithOptions:(NSDictionary *) opts
                   callback:(RCTResponseSenderBlock)callback)
 {
+    NSLog(@"dispatch once on configure");
     dispatch_async(dispatch_get_main_queue(),^{
         // Are we debugging, yo?
         self.debug = [opts valueForKey:@"debug"] != nil ? YES : NO;
@@ -172,13 +218,14 @@ + (void) setup:(UIApplication *) application
                                         storageBucket:[props valueForKey:@"STORAGE_BUCKET"]
                                         deepLinkURLScheme:[props valueForKey:@"DEEP_LINK_SCHEME"]];
 
-            // Save configuration option
-            //        NSDictionary *cfg = [self getConfig];
-            //        [cfg setValuesForKeysWithDictionary:props];
-            
-            // if (!self.configured) {
-            
-            [FIRApp configureWithOptions:finalOptions];
+            NSLog(@"Configuring firestack instance: %@", self);
+             // Save configuration option
+            // NSDictionary *cfg = [self getConfig];
+            // [cfg setValuesForKeysWithDictionary:props];
+            // self.configuration = cfg;
+
+            [Firestack initializeFirestack:self];
+            self.configured = YES;
             callback(@[[NSNull null], props]);
         }
         @catch (NSException *exception) {
@@ -312,17 +359,12 @@ - (void) debugLog:(NSString *)title
 {
     if (self.debug) {
         NSLog(@"%@: %@", title, msg);
-        //        [self sendJSEvent:DEBUG_EVENT
-        //                    props:@{
-        //                            @"name": title,
-        //                            @"message": msg
-        //                            }];
     }
 }
 
 // Not sure how to get away from this... yet
 - (NSArray<NSString *> *)supportedEvents {
-    return @[DEBUG_EVENT, AUTH_CHANGED_EVENT];
+    return @[INITIALIZED_EVENT, DEBUG_EVENT, AUTH_CHANGED_EVENT];
 }
 
 - (void) sendJSEvent:(NSString *)title

ios/Firestack/FirestackAnalytics.m

@@ -6,24 +6,31 @@
 //  Copyright © 2016 Facebook. All rights reserved.
 //
 
+#import "Firestack.h"
+#import "FirestackEvents.h"
 #import "FirestackAnalytics.h"
 
 @import FirebaseAnalytics;
 
 @implementation FirestackAnalytics
 
-RCT_EXPORT_MODULE(FirestackAnalytics);
-
 - (void)dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+RCT_EXPORT_MODULE(FirestackAnalytics);
+
+// Implementation
 RCT_EXPORT_METHOD(logEventWithName:(NSString *)name
                   props:(NSDictionary *)props
                   callback:(RCTResponseSenderBlock) callback)
 {
-    NSLog(@"logEventWithName called: %@ and %@", name, props);
+  NSString *debugMsg = [NSString stringWithFormat:@"%@: %@ with %@", 
+                          @"FirestackAnalytics", name, props];
+  [[Firestack sharedInstance] debugLog:@"logEventWithName called"
+                                   msg:debugMsg];
+
     [FIRAnalytics logEventWithName:name parameters:props];
     callback(@[[NSNull null], @YES]);
 }

ios/Firestack/FirestackEvents.h

@@ -12,6 +12,10 @@
 #define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
 #define SYSTEM_VERSION_LESS_THAN(v)                 ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending)
 #define SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v)     ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending)
+#define FIRESTACK_QUEUE_NAME                        "io.fullstack.firestack.WorkerQueue"
+
+static NSString *const kFirestackInitialized = @"FirestackInitializedEvent";
+static NSString *const INITIALIZED_EVENT = @"firestackInitialized";
 
 static NSString *const AUTH_CHANGED_EVENT = @"listenForAuth";
 static NSString *const DEBUG_EVENT = @"debug";