@capgo/capacitor-realtimekit 7.0.6 → 7.1.0

package/Package.swift

@@ -11,7 +11,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
-        .package(url: "https://github.com/dyte-in/RealtimeKitCoreiOS.git", from: "1.0.0")
+        .package(url: "https://github.com/dyte-in/RealtimeKitCoreiOS.git", from: "1.0.0"),
+        .package(url: "https://github.com/dyte-in/RealtimeKitUI.git", from: "0.5.3")
     ],
     targets: [
         .target(
@@ -19,7 +20,8 @@ let package = Package(
             dependencies: [
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
                 .product(name: "Cordova", package: "capacitor-swift-pm"),
-                .product(name: "RealtimeKit", package: "RealtimeKitCoreiOS")
+                .product(name: "RealtimeKit", package: "RealtimeKitCoreiOS"),
+                .product(name: "RealtimeKitUI", package: "RealtimeKitUI")
             ],
             path: "ios/Sources/CapacitorRealtimekitPlugin"),
         .testTarget(

package/android/src/main/java/ee/forgr/plugin/capacitor_realtimekit/CapacitorRealtimekitPlugin.java

@@ -1,13 +1,20 @@
 package ee.forgr.plugin.capacitor_realtimekit;
 
 import android.Manifest;
+import android.app.Activity;
 import android.util.Log;
+import com.cloudflare.realtimekit.models.RtkMeetingInfo;
+import com.cloudflare.realtimekit.ui.RealtimeKitUI;
+import com.cloudflare.realtimekit.ui.RealtimeKitUIBuilder;
+import com.cloudflare.realtimekit.ui.RealtimeKitUIInfo;
 import com.getcapacitor.JSObject;
+import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
+import com.getcapacitor.annotation.PermissionCallback;
 
 @CapacitorPlugin(
     name = "CapacitorRealtimekit",
@@ -19,8 +26,23 @@ import com.getcapacitor.annotation.Permission;
 public class CapacitorRealtimekitPlugin extends Plugin {
 
     private static final String TAG = "RealtimekitPlugin";
-    private final String pluginVersion = "7.0.6";
+    private static final String REALTIMEKIT_BASE_DOMAIN = "realtime.cloudflare.com";
+    private final String pluginVersion = "7.1.0";
     private boolean isInitialized = false;
+    private PendingMeetingRequest pendingMeetingRequest;
+
+    private static final class PendingMeetingRequest {
+
+        private final String authToken;
+        private final boolean enableAudio;
+        private final boolean enableVideo;
+
+        private PendingMeetingRequest(String authToken, boolean enableAudio, boolean enableVideo) {
+            this.authToken = authToken;
+            this.enableAudio = enableAudio;
+            this.enableVideo = enableVideo;
+        }
+    }
 
     @Override
     public void load() {
@@ -30,8 +52,6 @@ public class CapacitorRealtimekitPlugin extends Plugin {
 
     @PluginMethod
     public void initialize(PluginCall call) {
-        // Initialize the RealtimeKit SDK
-        // TODO: Add Cloudflare RealtimeKit SDK initialization here
         isInitialized = true;
         Log.d(TAG, "RealtimeKit initialized");
         call.resolve();
@@ -53,20 +73,21 @@ public class CapacitorRealtimekitPlugin extends Plugin {
         Boolean enableAudio = call.getBoolean("enableAudio", true);
         Boolean enableVideo = call.getBoolean("enableVideo", true);
 
-        // Start meeting with the built-in UI
-        // TODO: Integrate with Cloudflare RealtimeKit SDK to launch meeting UI
-        // In a real implementation, this would:
-        // 1. Create and configure the RealtimeKit meeting activity/fragment
-        // 2. Set the auth token, audio, and video settings
-        // 3. Launch the meeting UI
+        String trimmedToken = authToken.trim();
+        if (trimmedToken.isEmpty()) {
+            call.reject("authToken is required");
+            return;
+        }
+
+        PendingMeetingRequest request = new PendingMeetingRequest(trimmedToken, enableAudio, enableVideo);
 
-        Log.d(TAG, "Starting meeting with authToken: " + authToken);
-        Log.d(TAG, "Audio enabled: " + enableAudio);
-        Log.d(TAG, "Video enabled: " + enableVideo);
+        if (!hasMediaPermissions()) {
+            pendingMeetingRequest = request;
+            requestPermissionForAliases(new String[] { "camera", "microphone" }, call, "startMeetingPermissionsCallback");
+            return;
+        }
 
-        // For now, just resolve successfully
-        // Real implementation would launch the meeting UI here
-        call.resolve();
+        launchMeeting(call, request);
     }
 
     @PluginMethod
@@ -79,4 +100,61 @@ public class CapacitorRealtimekitPlugin extends Plugin {
             call.reject("Could not get plugin version", e);
         }
     }
+
+    @PermissionCallback
+    private void startMeetingPermissionsCallback(PluginCall call) {
+        if (call == null) {
+            pendingMeetingRequest = null;
+            return;
+        }
+
+        if (!hasMediaPermissions()) {
+            pendingMeetingRequest = null;
+            call.reject("Camera and microphone permissions are required to start a meeting.");
+            return;
+        }
+
+        PendingMeetingRequest request = pendingMeetingRequest;
+        pendingMeetingRequest = null;
+
+        if (request == null) {
+            call.reject("Missing meeting configuration after granting permissions.");
+            return;
+        }
+
+        launchMeeting(call, request);
+    }
+
+    private boolean hasMediaPermissions() {
+        return getPermissionState("camera") == PermissionState.GRANTED && getPermissionState("microphone") == PermissionState.GRANTED;
+    }
+
+    private void launchMeeting(PluginCall call, PendingMeetingRequest request) {
+        pendingMeetingRequest = null;
+        Activity activity = getActivity();
+        if (activity == null) {
+            call.reject("Unable to access the current Activity to show the meeting UI.");
+            return;
+        }
+
+        activity.runOnUiThread(() -> {
+            try {
+                RtkMeetingInfo meetingInfo = new RtkMeetingInfo(
+                    request.authToken,
+                    request.enableAudio,
+                    request.enableVideo,
+                    REALTIMEKIT_BASE_DOMAIN
+                );
+                RealtimeKitUIInfo uiInfo = new RealtimeKitUIInfo(activity, meetingInfo);
+                RealtimeKitUI realtimeKitUI = RealtimeKitUIBuilder.build(uiInfo);
+                RealtimeKitUIBuilder.getMeeting().setUiKitInfo("capacitor-android", pluginVersion);
+                realtimeKitUI.startMeeting();
+                Log.d(TAG, "RealtimeKit meeting started successfully");
+                call.resolve();
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to start RealtimeKit meeting", e);
+                call.reject("Failed to start meeting: " + e.getMessage(), e);
+            }
+        });
+    }
 }

package/ios/Sources/CapacitorRealtimekitPlugin/CapacitorRealtimekit.swift

@@ -1,12 +1,23 @@
+import Capacitor
 import Foundation
+import RealtimeKit
+import RealtimeKitUI
 import UIKit
 
-public class CapacitorRealtimekit: NSObject {
+public final class CapacitorRealtimekit: NSObject {
+    private weak var plugin: CAPPlugin?
+    private let pluginVersion: String
+    private let baseDomain = "realtime.cloudflare.com"
     private var isInitialized = false
+    private var realtimeKitUI: RealtimeKitUI?
+
+    init(plugin: CAPPlugin, pluginVersion: String) {
+        self.plugin = plugin
+        self.pluginVersion = pluginVersion
+        super.init()
+    }
 
     public func initialize() {
-        // Initialize the RealtimeKit SDK
-        // TODO: Add Cloudflare RealtimeKit SDK initialization here
         isInitialized = true
         print("RealtimeKit initialized")
     }
@@ -18,31 +29,65 @@ public class CapacitorRealtimekit: NSObject {
         completion: @escaping (Error?) -> Void
     ) {
         guard isInitialized else {
-            let error = NSError(
-                domain: "CapacitorRealtimekit",
-                code: -1,
-                userInfo: [NSLocalizedDescriptionKey: "RealtimeKit not initialized. Call initialize() first."]
-            )
-            completion(error)
+            completion(makeError("RealtimeKit not initialized. Call initialize() first."))
             return
         }
 
-        // Start meeting with the built-in UI
-        // TODO: Integrate with Cloudflare RealtimeKit SDK to launch meeting UI
-        DispatchQueue.main.async {
-            // Placeholder implementation
-            // In a real implementation, this would:
-            // 1. Create and configure the RealtimeKit meeting view controller
-            // 2. Set the auth token, audio, and video settings
-            // 3. Present the meeting UI modally
-
-            print("Starting meeting with authToken: \(authToken)")
-            print("Audio enabled: \(enableAudio)")
-            print("Video enabled: \(enableVideo)")
-
-            // For now, just complete successfully
-            // Real implementation would present the meeting UI here
-            completion(nil)
+        let trimmedToken = authToken.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmedToken.isEmpty else {
+            completion(makeError("authToken is required"))
+            return
+        }
+
+        guard let presenter = topViewController(from: plugin?.bridge?.viewController) else {
+            completion(makeError("Unable to find a view controller to present the meeting UI."))
+            return
         }
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+
+            let meetingInfo = RtkMeetingInfo(
+                authToken: trimmedToken,
+                enableAudio: enableAudio,
+                enableVideo: enableVideo,
+                baseDomain: self.baseDomain
+            )
+
+            let uiKit = RealtimeKitUI(meetingInfo: meetingInfo)
+            uiKit.rtkClient.setUiKitInfo(name: "capacitor-ios", version: self.pluginVersion)
+            self.realtimeKitUI = uiKit
+
+            let meetingController = uiKit.startMeeting { [weak self] in
+                self?.realtimeKitUI = nil
+            }
+            meetingController.modalPresentationStyle = .fullScreen
+
+            presenter.present(meetingController, animated: true) {
+                completion(nil)
+            }
+        }
+    }
+
+    private func topViewController(from root: UIViewController?) -> UIViewController? {
+        guard let root else { return nil }
+
+        if let presented = root.presentedViewController {
+            return topViewController(from: presented)
+        }
+
+        if let navigation = root as? UINavigationController {
+            return topViewController(from: navigation.visibleViewController ?? navigation)
+        }
+
+        if let tab = root as? UITabBarController {
+            return topViewController(from: tab.selectedViewController ?? tab)
+        }
+
+        return root
+    }
+
+    private func makeError(_ message: String) -> NSError {
+        NSError(domain: "CapacitorRealtimekit", code: -1, userInfo: [NSLocalizedDescriptionKey: message])
     }
 }

package/ios/Sources/CapacitorRealtimekitPlugin/CapacitorRealtimekitPlugin.swift

@@ -7,7 +7,7 @@ import Capacitor
  */
 @objc(CapacitorRealtimekitPlugin)
 public class CapacitorRealtimekitPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "7.0.6"
+    private let pluginVersion: String = "7.1.0"
     public let identifier = "CapacitorRealtimekitPlugin"
     public let jsName = "CapacitorRealtimekit"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -16,7 +16,7 @@ public class CapacitorRealtimekitPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getPluginVersion", returnType: CAPPluginReturnPromise)
     ]
 
-    private let implementation = CapacitorRealtimekit()
+    private lazy var implementation = CapacitorRealtimekit(plugin: self, pluginVersion: pluginVersion)
 
     @objc func initialize(_ call: CAPPluginCall) {
         implementation.initialize()
@@ -29,11 +29,17 @@ public class CapacitorRealtimekitPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
+        let trimmedToken = authToken.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmedToken.isEmpty {
+            call.reject("authToken is required")
+            return
+        }
+
         let enableAudio = call.getBool("enableAudio") ?? true
         let enableVideo = call.getBool("enableVideo") ?? true
 
         implementation.startMeeting(
-            authToken: authToken,
+            authToken: trimmedToken,
             enableAudio: enableAudio,
             enableVideo: enableVideo
         ) { error in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-realtimekit",
-  "version": "7.0.6",
+  "version": "7.1.0",
   "description": "Cloudflare Calls integration for Capacitor apps with built-in UI for meetings.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",