capacitor-jitsi-meet 6.1.0 → 6.2.0-beta.0

package/CapacitorJitsiMeet.podspec

@@ -1,7 +1,7 @@
 
   Pod::Spec.new do |s|
     s.name = 'CapacitorJitsiMeet'
-    s.version = '6.1.0'
+    s.version = '6.2.0'
     s.summary = 'This plugin is used to make video calls using Jitsi video platform (https://meet.jit.si) on iOS and Android using Capacitor. Since the current implementation of Ionic/PWA apps on iOS run on top of WKWebView, and as of today (24/01/2019), Apple does not support WebRTC on WKWebView, the only way to work with Jitsi Video on this platform is to build it natively.'
     s.license = 'MIT'
     s.homepage = 'https://github.com/calvinckho/capacitor-jitsi-meet'
@@ -15,5 +15,5 @@
     }
     s.ios.deployment_target  = '13.4'
     s.dependency 'Capacitor'
-    s.dependency 'JitsiMeetSDK', '10.0.0'
+    s.dependency 'JitsiMeetSDK', '10.1.2'
   end

package/README.md

@@ -149,6 +149,14 @@ window.addEventListener('onConferenceTerminated', () => {
 window.addEventListener('onConferenceLeft', () => {
     // do things here
 });
+window.addEventListener('onChatMessageReceived', (data: any) => {
+    // console.log("message", JSON.stringify(data))
+    // {"isTrusted":false,"senderId":"00b50123","isPrivate":"false","message":"this is the message","timestamp":"2024-09-16T18:53:34Z"}
+});
+window.addEventListener('onParticipantsInfoRetrieved', (data: any) => {
+    // console.log("participant info", JSON.stringify(data));
+    //{"isTrusted":false,"participantsInfo":"[{participantId=00b50123, name=My Name, role=moderator, avatarUrl=https://xxx.png, isLocal=true}
+});
 
 const result = await Jitsi.leaveConference()
 console.log(result) // { success: true }

package/android/build.gradle

@@ -52,7 +52,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    implementation ('org.jitsi.react:jitsi-meet-sdk:10.0.0') { transitive = true }
+    implementation ('org.jitsi.react:jitsi-meet-sdk:10.1.2') { transitive = true }
     implementation 'androidx.activity:activity:1.2.3'
 
     // Firebase

package/android/src/main/java/com/capacitor/jitsi/plugin/Jitsi.java

@@ -16,28 +16,26 @@ import android.content.Intent;
 import android.Manifest;
 import android.os.Build;
 
-import androidx.annotation.RequiresApi;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import timber.log.Timber;
 
 import org.jitsi.meet.sdk.*;
 import org.json.JSONException;
 
-import static android.content.Context.RECEIVER_EXPORTED;
+import static android.content.Context.RECEIVER_NOT_EXPORTED;
 
 @CapacitorPlugin(
-    name= "Jitsi",
-    permissions={
-        @Permission(strings = {Manifest.permission.RECORD_AUDIO}),
-        @Permission(strings = {Manifest.permission.CAMERA}),
-      }
-  )
+        name= "Jitsi",
+        permissions={
+                @Permission(strings = {Manifest.permission.RECORD_AUDIO}),
+                @Permission(strings = {Manifest.permission.CAMERA}),
+        }
+)
 public class Jitsi extends Plugin {
     private static final String TAG = "CapacitorJitsiMeet";
     private JitsiBroadcastReceiver receiver;
     private JitsiMeetUserInfo userInfo;
 
-    @RequiresApi(api = Build.VERSION_CODES.N)
     @PluginMethod()
     public void joinConference(PluginCall call) throws JSONException {
         URL url = null;
@@ -63,12 +61,14 @@ public class Jitsi extends Plugin {
         filter.addAction("onConferenceWillJoin");
         filter.addAction("onConferenceJoined");
         filter.addAction("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
+        filter.addAction("onChatMessageReceived");
+        filter.addAction("onParticipantsInfoRetrieved");
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            getContext().registerReceiver(receiver, filter, RECEIVER_EXPORTED);
+            getContext().registerReceiver(receiver, filter, RECEIVER_NOT_EXPORTED);
         } else {
             getContext().registerReceiver(receiver, filter);
         }
-
         if(roomName == null) {
             call.reject("Must provide an conference room name");
             return;
@@ -171,9 +171,12 @@ public class Jitsi extends Plugin {
         call.resolve(ret);
     }
 
-    public void onEventReceived(String eventName) {
-        bridge.triggerWindowJSEvent(eventName);
-        Timber.tag(TAG).d(eventName);
+    public void onEventReceived(String eventName, String data) {
+        bridge.triggerWindowJSEvent(eventName, data);
+        if(eventName.equals("onConferenceJoined")) {
+            Intent retrieveParticipantsIntent = BroadcastIntentHelper.buildRetrieveParticipantsInfo("retrieveSelfInfo");
+            LocalBroadcastManager.getInstance(getContext()).sendBroadcast(retrieveParticipantsIntent);
+        }
         if(eventName.equals("onConferenceLeft")) {
             if (receiver != null) {
                 getContext().unregisterReceiver(receiver);

package/android/src/main/java/com/capacitor/jitsi/plugin/JitsiActivity.java

@@ -12,8 +12,8 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import timber.log.Timber;
 
 import com.facebook.react.bridge.UiThreadUtil;
-
 import org.jitsi.meet.sdk.*;
+import org.json.JSONObject;
 
 public class JitsiActivity extends JitsiMeetActivity {
     private BroadcastReceiver broadcastReceiver;
@@ -61,35 +61,40 @@ public class JitsiActivity extends JitsiMeetActivity {
             BroadcastEvent event = new BroadcastEvent(intent);
             switch (event.getType()) {
                 case CONFERENCE_JOINED:
-                    on("onConferenceJoined");
+                    on("onConferenceJoined", null);
                     break;
                 case CONFERENCE_WILL_JOIN:
-                    on("onConferenceWillJoin");
-                    break;
-                case CONFERENCE_TERMINATED:
-                    finish();
-                    on("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
+                    on("onConferenceWillJoin", null);
                     break;
-                case READY_TO_CLOSE:
+                case CONFERENCE_TERMINATED, READY_TO_CLOSE:
                     finish();
-                    on("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
+                    on("onConferenceLeft", null); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
                     break;
                 case PARTICIPANT_JOINED:
-                    on("onParticipantJoined");
+                    on("onParticipantJoined", null);
                     break;
                 case PARTICIPANT_LEFT:
-                    on("onParticipantLeft");
+                    on("onParticipantLeft", null);
+                    break;
+                case CHAT_MESSAGE_RECEIVED:
+                    on("onChatMessageReceived", event);
+                    break;
+                case PARTICIPANTS_INFO_RETRIEVED:
+                    on("onParticipantsInfoRetrieved", event);
                     break;
             }
         }
     }
 
-    private void on(String name) {
+    private void on(String eventName, BroadcastEvent event) {
         UiThreadUtil.assertOnUiThread();
-        Timber.tag(TAG).d(JitsiMeetView.class.getSimpleName() + ": " + name);
-
-        Intent intent = new Intent(name);
-        intent.putExtra("eventName", name);
+        Intent intent = new Intent(eventName);
+        intent.putExtra("eventName", eventName);
+        if (event != null) {
+            JSONObject json = new JSONObject(event.getData());
+            intent.putExtra("data", json.toString());
+            Timber.tag(TAG).d(JitsiMeetView.class.getSimpleName() + ": " + eventName + ", " + json);
+        }
         sendBroadcast(intent);
     }
 
@@ -101,11 +106,28 @@ public class JitsiActivity extends JitsiMeetActivity {
         Timber.tag(TAG).d("onStop %s", session_options.getFeatureFlags().getBoolean("pip.enabled"));
         if (session_options.getFeatureFlags().getBoolean("pip.enabled")) { //TODO: also check the CapacitorJitsiMeet's AndroidManifest.xml file and ensure android:supportsPictureInPicture="true"
             finish();
-            on("onConferenceLeft"); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
+            on("onConferenceLeft", null); // intentionally uses the obsolete onConferenceLeft in order to be consistent with iOS deployment and broadcast to JS listeners
         }
         super.onStop();
     }
 
+    @Override
+    public void onDestroy() {
+        // Here we are trying to handle the following corner case: an application using the SDK
+        // is using this Activity for displaying meetings, but there is another "main" Activity
+        // with other content. If this Activity is "swiped out" from the recent list we will get
+        // Activity#onDestroy() called without warning. At this point we can try to leave the
+        // current meeting, but when our view is detached from React the JS <-> Native bridge won't
+        // be operational so the external API won't be able to notify the native side that the
+        // conference terminated. Thus, try our best to clean up.
+        leave();
+        finish();
+        JitsiMeetOngoingConferenceService.abort(this);
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver);
+        JitsiMeetActivityDelegate.onHostDestroy(this);
+        super.onDestroy();
+    }
+
     // for logging entering and leaving PIP only
     @Override
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {

package/android/src/main/java/com/capacitor/jitsi/plugin/JitsiBroadcastReceiver.java

@@ -4,6 +4,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import timber.log.Timber;
+
 public class JitsiBroadcastReceiver extends BroadcastReceiver {
 
     private static final String TAG = "JitsiBroadcastReceiver";
@@ -14,9 +16,11 @@ public class JitsiBroadcastReceiver extends BroadcastReceiver {
     }
 
     public void onReceive(Context context, Intent intent) {
-        String eventName = (String) intent.getSerializableExtra("eventName");
+        String actionName = (String) intent.getSerializableExtra("eventName");
+        String data = (String) intent.getSerializableExtra("data");
+        // Timber.tag(TAG).d("JitsiMeetView: " + actionName + ", " + data);
         if (jitsi != null) {
-            jitsi.onEventReceived(eventName);
+            jitsi.onEventReceived(actionName, data);
         }
     }
-}
+}

package/dist/esm/definitions.js

@@ -1 +1,2 @@
+export {};
 //# sourceMappingURL=definitions.js.map

package/dist/esm/index.js

@@ -2,5 +2,6 @@ import { registerPlugin } from '@capacitor/core';
 const Jitsi = registerPlugin('Jitsi', {
     web: () => import('./web').then(m => new m.JitsiWeb()),
 });
+export * from './definitions';
 export { Jitsi };
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,MAAM,KAAK,GAAG,cAAc,CAAc,OAAO,EAAE;IAC/C,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;CACzD,CAAC,CAAC;AAGH,OAAO,EAAE,KAAK,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,MAAM,KAAK,GAAG,cAAc,CAAc,OAAO,EAAE;IAC/C,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;CACzD,CAAC,CAAC;AAEH,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,CAAC"}

package/ios/Plugin/Plugin/JitsiMeetViewController.swift

@@ -74,16 +74,33 @@ public class JitsiMeetViewController: UIViewController, UIGestureRecognizerDeleg
 
 protocol JitsiMeetViewControllerDelegate: AnyObject {
     func onConferenceJoined()
-
     func onConferenceLeft()
+    func onChatMessageReceived(_ dataString: String)
+    func onParticipantsInfoRetrieved(_ dataString: String)
 }
 
 // MARK: JitsiMeetViewDelegate
 extension JitsiMeetViewController: JitsiMeetViewDelegate {
 
-    @objc public func conferenceJoined(_ data: [AnyHashable : Any]!) {
+    @objc public func conferenceJoined(_ data: NSDictionary) {
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::conference joined");
         delegate?.onConferenceJoined()
-        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::conference joined.");
+        Task {
+            // print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::retrieveParticipantsInfo");
+            let jitsiMeetView = JitsiMeetView()
+            self.jitsiMeetView = jitsiMeetView
+            await jitsiMeetView.retrieveParticipantsInfo({ (_ data: Any) -> Void in
+                if let theJSONData = try?  JSONSerialization.data(
+                      withJSONObject: data,
+                      options: .prettyPrinted
+                      ),
+                      let theJSONText = String(data: theJSONData,
+                                           encoding: String.Encoding.ascii) {
+                      print("JSON string = \n\(theJSONText)")
+                    self.delegate?.onParticipantsInfoRetrieved(theJSONText)
+                }
+            });
+        }
     }
 
     @objc public func ready(toClose: [AnyHashable : Any]!) {
@@ -94,11 +111,25 @@ extension JitsiMeetViewController: JitsiMeetViewDelegate {
         self.dismiss(animated: true, completion: nil); // e.g. user ends the call. This is preferred over conferenceLeft to shorten the white screen while exiting the room
     }
 
-    @objc public func conferenceTerminated(_ data: [AnyHashable : Any]!) {
+    @objc public func conferenceTerminated(_ data: NSDictionary) {
         print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::conference terminated");
         delegate?.onConferenceLeft()
         self.cleanUp()
 
         self.dismiss(animated: true, completion: nil); // e.g. user ends the call. This is preferred over conferenceLeft to shorten the white screen while exiting the room
     }
+
+    @objc public func chatMessageReceived(_ data: NSDictionary) {
+        print("[Jitsi Plugin Native iOS]: JitsiMeetViewController::chat message received");
+        if let theJSONData = try?  JSONSerialization.data(
+              withJSONObject: data,
+              options: .prettyPrinted
+              ),
+              let theJSONText = String(data: theJSONData,
+                                   encoding: String.Encoding.ascii) {
+              print("JSON string = \n\(theJSONText)")
+            delegate?.onChatMessageReceived(theJSONText)
+        }
+    }
+
 }

package/ios/Plugin/Plugin/Plugin.swift

@@ -119,10 +119,18 @@ public class Jitsi: CAPPlugin {
 
 extension Jitsi: JitsiMeetViewControllerDelegate {
     @objc func onConferenceJoined() {
-        self.bridge?.triggerJSEvent(eventName: "onConferenceJoined", target: "window");
+        self.bridge?.triggerWindowJSEvent(eventName: "onConferenceJoined");
     }
 
     @objc func onConferenceLeft() {
-        self.bridge?.triggerJSEvent(eventName: "onConferenceLeft", target: "window");
+        self.bridge?.triggerWindowJSEvent(eventName: "onConferenceLeft");
+    }
+
+    @objc func onChatMessageReceived(_ dataString: String) {
+        self.bridge?.triggerWindowJSEvent(eventName: "onChatMessageReceived", data: dataString);
+    }
+
+    @objc func onParticipantsInfoRetrieved(_ dataString: String) {
+        self.bridge?.triggerWindowJSEvent(eventName: "onParticipantsInfoRetrieved", data: dataString);
     }
 }

package/ios/Plugin/Podfile

@@ -7,7 +7,7 @@ target 'Plugin' do
 
   # Pods for IonicRunner
   pod 'Capacitor'
-  pod 'JitsiMeetSDK', '10.0.0'
+  pod 'JitsiMeetSDK', '10.1.2'
 end
 
 post_install do |installer|
@@ -22,5 +22,5 @@ target 'PluginTests' do
   use_frameworks!
 
   pod 'Capacitor'
-  pod 'JitsiMeetSDK', '10.0.0'
+  pod 'JitsiMeetSDK', '10.1.2'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-jitsi-meet",
-  "version": "6.1.0",
+  "version": "6.2.0-beta.0",
   "description": "This Ionic Capacitor plugin is created to make video calls through the free, open-sourced Jitsi video platform (https://meet.jit.si) on iOS and Android.",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -23,11 +23,11 @@
     "@capacitor/ios": "^6.0.0",
     "@ionic/prettier-config": "^1.0.0",
     "@ionic/swiftlint-config": "^1.0.0",
-    "@rollup/plugin-node-resolve": "^8.1.0",
+    "@rollup/plugin-node-resolve": "^15.3.0",
     "prettier": "^2.7.1",
     "prettier-plugin-java": "^1.6.2",
     "rimraf": "^3.0.0",
-    "rollup": "^2.79.1",
+    "rollup": "^4.22.4",
     "swiftlint": "^1.0.1",
     "typescript": "~4.8.4"
   },