@cloudflare/realtimekit-react-native 0.2.1 → 0.2.2-staging.1

package/android/src/main/java/com/cloudflare/realtimekit/incallmanager/InCallProximityManager.java

@@ -29,6 +29,7 @@ import java.lang.Runnable;
 
 import com.facebook.react.bridge.UiThreadUtil;
 
+import com.cloudflare.realtimekit.RTKLogger;
 import com.cloudflare.realtimekit.incallmanager.AppRTCProximitySensor;
 
 public class InCallProximityManager {
@@ -45,7 +46,7 @@ public class InCallProximityManager {
     }
 
     private InCallProximityManager(Context context, final InCallManagerModule inCallManager) {
-        // Log.d(TAG, "InCallProximityManager");
+        RTKLogger.d("InCallProximity", "InCallProximityManager");
         checkProximitySupport(context);
         if (proximitySupported) {
             UiThreadUtil.runOnUiThread(() -> {
@@ -88,18 +89,18 @@ public class InCallProximityManager {
                 mProximityLock.setReferenceCounted(false);
             }
         } catch (Exception e) {
-            // Log.d(TAG, "Failed to get proximity screen locker. exception: ", e);
+            RTKLogger.d("InCallProximity", "Failed to get proximity screen locker. exception: " + e.getMessage());
         }
 
         if (mProximityLock != null) {
-            // Log.d(TAG, "use native screen locker...");
+            RTKLogger.d("InCallProximity", "use native screen locker...");
             try {
                 mPowerManagerRelease = mProximityLock.getClass().getDeclaredMethod("release", int.class);
             } catch (Exception e) {
-                // Log.d(TAG, "failed to get proximity screen locker: `release()`. exception: ", e);
+                RTKLogger.d("InCallProximity", "failed to get proximity screen locker: `release()`. exception: " + e.getMessage());
             }
         } else {
-            // Log.d(TAG, "fallback to old school screen locker...");
+            RTKLogger.d("InCallProximity", "fallback to old school screen locker...");
         }
     }
 
@@ -137,7 +138,7 @@ public class InCallProximityManager {
         }
         synchronized (mProximityLock) {
             if (!mProximityLock.isHeld()) {
-                // Log.d(TAG, "acquireProximityWakeLock()");
+                RTKLogger.d("InCallProximity", "acquireProximityWakeLock()");
                 mProximityLock.acquire();
             }
         }
@@ -152,9 +153,9 @@ public class InCallProximityManager {
                 try {
                     int flags = waitForNoProximity ? PowerManager.RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY : 0;
                     mPowerManagerRelease.invoke(mProximityLock, flags);
-                    // Log.d(TAG, "releaseProximityWakeLock()");
+                    RTKLogger.d("InCallProximity", "releaseProximityWakeLock()");
                 } catch (Exception e) {
-                    // Log.e(TAG, "failed to release proximity lock. e: ", e);
+                    RTKLogger.e("InCallProximity", "failed to release proximity lock. e: " + e.getMessage());
                 }
             }
         }

package/android/src/main/java/com/cloudflare/realtimekit/incallmanager/InCallWakeLockUtils.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
+import com.cloudflare.realtimekit.RTKLogger;
 
 public class InCallWakeLockUtils {
     private static final String TAG = "realtimekit:InCallWakeLock";
@@ -74,43 +75,43 @@ public class InCallWakeLockUtils {
 
     public boolean acquireFullWakeLock() {
         boolean sta = _acquireWakeLock(mFullLock);
-        // Log.d(TAG, "acquireFullWakeLock(). sta=" + sta);
+        RTKLogger.d("InCallWakeLock", "acquireFullWakeLock(). sta=" + sta);
         return sta;
     }
 
     public boolean releaseFullWakeLock() {
         boolean sta = _releaseWakeLock(mFullLock);
-        // Log.d(TAG, "releaseFullWakeLock(). sta=" + sta);
+        RTKLogger.d("InCallWakeLock", "releaseFullWakeLock(). sta=" + sta);
         return sta;
     }
 
     public boolean acquirePokeFullWakeLock() {
         boolean sta = _acquireWakeLock(mPokeFullLock);
-        // Log.d(TAG, "acquirePokeFullWakeLock(). sta=" + sta);
+        RTKLogger.d("InCallWakeLock", "acquirePokeFullWakeLock(). sta=" + sta);
         return sta;
     }
 
     public boolean releasePokeFullWakeLock() {
         boolean sta = _releaseWakeLock(mPokeFullLock);
-        // Log.d(TAG, "releasePokeFullWakeLock(). sta=" + sta);
+        RTKLogger.d("InCallWakeLock", "releasePokeFullWakeLock(). sta=" + sta);
         return sta;
     }
 
     public boolean acquirePartialWakeLock() {
         boolean sta = _acquireWakeLock(mPartialLock);
-        // Log.d(TAG, "acquirePartialWakeLock(). sta=" + sta);
+        RTKLogger.d("InCallWakeLock", "acquirePartialWakeLock(). sta=" + sta);
         return sta;
     }
 
     public boolean releasePartialWakeLock() {
         boolean sta = _releaseWakeLock(mPartialLock);
-        // Log.d(TAG, "releasePartialWakeLock(). sta=" + sta);
+        RTKLogger.d("InCallWakeLock", "releasePartialWakeLock(). sta=" + sta);
         return sta;
     }
 
     public boolean acquirePokeFullWakeLockReleaseAfter(long timeout) {
         boolean sta = _acquireWakeLock(mPokeFullLock, timeout);
-        // Log.d(TAG, String.format("acquirePokeFullWakeLockReleaseAfter() timeout=%s, sta=%s", timeout, sta));
+        RTKLogger.d("InCallWakeLock", String.format("acquirePokeFullWakeLockReleaseAfter() timeout=%s, sta=%s", timeout, sta));
         return sta;
     }
 }

package/ios/BroadcastEventEmitter.m

@@ -1,4 +1,5 @@
 #import "BroadcastEventEmitter.h"
+#import "RTKLogger.h"
 #import <React/RCTLog.h>
 
 // Define the notification names
@@ -29,6 +30,7 @@ RCT_EXPORT_MODULE();
 - (instancetype)init {
     self = [super init];
     if (self) {
+        [RTKLogger debug:@"BroadcastEventEmitter: Initializing and registering Darwin notification observers"];
         // Listen for the broadcast started notification
         CFNotificationCenterAddObserver(
             CFNotificationCenterGetDarwinNotifyCenter(),
@@ -38,6 +40,7 @@ RCT_EXPORT_MODULE();
             NULL,
             CFNotificationSuspensionBehaviorDeliverImmediately
         );
+        [RTKLogger debug:@"BroadcastEventEmitter: Registered observer for %@", BroadcastStartedNotification];
 
         // Listen for the broadcast stopped notification
         CFNotificationCenterAddObserver(
@@ -48,6 +51,7 @@ RCT_EXPORT_MODULE();
             NULL,
             CFNotificationSuspensionBehaviorDeliverImmediately
         );
+        [RTKLogger debug:@"BroadcastEventEmitter: Registered observer for %@", BroadcastStoppedNotification];
     }
     return self;
 }
@@ -65,8 +69,12 @@ void broadcastEventCallback(CFNotificationCenterRef center,
 // Handle incoming notifications and send events to React Native
 - (void)handleNotification:(CFNotificationName)name {
     NSString *eventName = (__bridge NSString *)name;
+    [RTKLogger debug:@"BroadcastEventEmitter: Received Darwin notification: %@", eventName];
     if (hasListeners && [self canSendEvents]) {
+        [RTKLogger debug:@"BroadcastEventEmitter: Sending event to React Native: %@", eventName];
         [self sendEventWithName:eventName body:nil];
+    } else {
+        [RTKLogger warning:@"BroadcastEventEmitter: Cannot send event %@ - hasListeners: %d, canSendEvents: %d", eventName, hasListeners, [self canSendEvents]];
     }
 }
 
@@ -82,6 +90,7 @@ void broadcastEventCallback(CFNotificationCenterRef center,
 
 // Remove observers on deallocation
 - (void)dealloc {
+    [RTKLogger debug:@"BroadcastEventEmitter: Removing all Darwin notification observers"];
     CFNotificationCenterRemoveEveryObserver(
         CFNotificationCenterGetDarwinNotifyCenter(),
         (__bridge const void *)(self)

package/ios/Core.h

@@ -1,5 +1,13 @@
 #import <React/RCTBridgeModule.h>
 
 @interface Core : NSObject <RCTBridgeModule>
+
 -(NSString*)getRandomBase64:(NSUInteger)byteLength;
-@end
+
++ (void)enableLogging;
++ (void)disableLogging;
++ (void)setLoggingEnabled:(BOOL)enabled;
++ (void)setLogLevel:(NSInteger)level;
++ (BOOL)getLoggingEnabled;
+
+@end

package/ios/Core.m

@@ -1,4 +1,5 @@
 #import "Core.h"
+#import "RTKLogger.h"
 
 @implementation Core
 
@@ -25,4 +26,45 @@ RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString*, getRandomBase64:(NSUInteger)byteL
     return [data base64EncodedStringWithOptions:0];
 }
 
+#pragma mark - RTKLogger Control
+
+RCT_EXPORT_METHOD(enableLogging)
+{
+    // Enable Objective-C logger
+    [RTKLogger sharedInstance].loggingEnabled = YES;
+    
+    [RTKLogger info:@"RTKLogger logging enabled"];
+}
+
+RCT_EXPORT_METHOD(disableLogging)
+{
+    [RTKLogger info:@"RTKLogger logging disabled"];
+    
+    // Disable Objective-C logger
+    [RTKLogger sharedInstance].loggingEnabled = NO;
+}
+
+RCT_EXPORT_METHOD(setLoggingEnabled:(BOOL)enabled)
+{
+    // Set for Objective-C logger
+    [RTKLogger sharedInstance].loggingEnabled = enabled;
+    
+    [RTKLogger info:@"RTKLogger logging %@", enabled ? @"enabled" : @"disabled"];
+}
+
+RCT_EXPORT_METHOD(setLogLevel:(NSInteger)level)
+{
+    // Set for Objective-C logger
+    [RTKLogger sharedInstance].minimumLogLevel = (RTKLogLevel)level;
+    
+    [RTKLogger info:@"RTKLogger minimum log level set to: %ld", (long)level];
+}
+
+RCT_EXPORT_METHOD(getLoggingEnabled:(RCTPromiseResolveBlock)resolve
+                            reject:(RCTPromiseRejectBlock)reject)
+{
+    BOOL enabled = [RTKLogger sharedInstance].loggingEnabled;
+    resolve(@(enabled));
+}
+
 @end