updated videoroom plugin

examples/android/app/src/main/java/com/github/helloiampau/app/custom/CustomPluginFactory.java

@@ -7,8 +7,7 @@
 public class CustomPluginFactory extends PluginFactory {
 
   @Override
-  public Plugin create(Protocol owner) {
+  public Plugin create(long handleId, Protocol owner) {
     return new CustomPlugin();
   }
-
 }

examples/android/app/src/main/java/com/github/helloiampau/app/custom/CustomProtocol.java

@@ -44,12 +44,12 @@ public void onAnswer(String sdp, Bundle context) {
   }
 
   @Override
-  public void onIceCandidate(String mid, int index, String sdp) {
+  public void onIceCandidate(String mid, int index, String sdp, long id) {
 
   }
 
   @Override
-  public void onIceCompleted() {
+  public void onIceCompleted(long id) {
 
   }
 

generated/cpp/janus/janus_event.hpp

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 
 namespace Janus {
@@ -14,6 +15,8 @@ class JanusEvent {
 public:
     virtual ~JanusEvent() {}
 
+    virtual int64_t sender() = 0;
+
     virtual std::shared_ptr<Jsep> jsep() = 0;
 
     virtual std::shared_ptr<JanusData> data() = 0;

generated/cpp/janus/plugin_factory.hpp

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 
 namespace Janus {
@@ -14,7 +15,7 @@ class PluginFactory {
 public:
     virtual ~PluginFactory() {}
 
-    virtual std::shared_ptr<Plugin> create(const std::shared_ptr<Protocol> & owner) = 0;
+    virtual std::shared_ptr<Plugin> create(int64_t handleId, const std::shared_ptr<Protocol> & owner) = 0;
 };
 
 }  // namespace Janus

generated/cpp/janus/protocol.hpp

@@ -32,9 +32,9 @@ class Protocol {
 
     virtual void onAnswer(const std::string & sdp, const std::shared_ptr<Bundle> & context) = 0;
 
-    virtual void onIceCandidate(const std::string & mid, int32_t index, const std::string & sdp, const std::shared_ptr<Bundle> & context) = 0;
+    virtual void onIceCandidate(const std::string & mid, int32_t index, const std::string & sdp, int64_t id) = 0;
 
-    virtual void onIceCompleted(const std::shared_ptr<Bundle> & context) = 0;
+    virtual void onIceCompleted(int64_t id) = 0;
 };
 
 }  // namespace Janus

generated/java/com/github/helloiampau/janus/generated/JanusEvent.java

@@ -6,6 +6,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class JanusEvent {
+    public abstract long sender();
+
     public abstract Jsep jsep();
 
     public abstract JanusData data();
@@ -33,6 +35,14 @@ protected void finalize() throws java.lang.Throwable
             super.finalize();
         }
 
+        @Override
+        public long sender()
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            return native_sender(this.nativeRef);
+        }
+        private native long native_sender(long _nativeRef);
+
         @Override
         public Jsep jsep()
         {

generated/java/com/github/helloiampau/janus/generated/PluginFactory.java

@@ -6,7 +6,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class PluginFactory {
-    public abstract Plugin create(Protocol owner);
+    public abstract Plugin create(long handleId, Protocol owner);
 
     private static final class CppProxy extends PluginFactory
     {
@@ -32,11 +32,11 @@ protected void finalize() throws java.lang.Throwable
         }
 
         @Override
-        public Plugin create(Protocol owner)
+        public Plugin create(long handleId, Protocol owner)
         {
             assert !this.destroyed.get() : "trying to use a destroyed object";
-            return native_create(this.nativeRef, owner);
+            return native_create(this.nativeRef, handleId, owner);
         }
-        private native Plugin native_create(long _nativeRef, Protocol owner);
+        private native Plugin native_create(long _nativeRef, long handleId, Protocol owner);
     }
 }

generated/java/com/github/helloiampau/janus/generated/Protocol.java

@@ -20,9 +20,9 @@ public abstract class Protocol {
 
     public abstract void onAnswer(String sdp, Bundle context);
 
-    public abstract void onIceCandidate(String mid, int index, String sdp, Bundle context);
+    public abstract void onIceCandidate(String mid, int index, String sdp, long id);
 
-    public abstract void onIceCompleted(Bundle context);
+    public abstract void onIceCompleted(long id);
 
     private static final class CppProxy extends Protocol
     {
@@ -104,19 +104,19 @@ public void onAnswer(String sdp, Bundle context)
         private native void native_onAnswer(long _nativeRef, String sdp, Bundle context);
 
         @Override
-        public void onIceCandidate(String mid, int index, String sdp, Bundle context)
+        public void onIceCandidate(String mid, int index, String sdp, long id)
         {
             assert !this.destroyed.get() : "trying to use a destroyed object";
-            native_onIceCandidate(this.nativeRef, mid, index, sdp, context);
+            native_onIceCandidate(this.nativeRef, mid, index, sdp, id);
         }
-        private native void native_onIceCandidate(long _nativeRef, String mid, int index, String sdp, Bundle context);
+        private native void native_onIceCandidate(long _nativeRef, String mid, int index, String sdp, long id);
 
         @Override
-        public void onIceCompleted(Bundle context)
+        public void onIceCompleted(long id)
         {
             assert !this.destroyed.get() : "trying to use a destroyed object";
-            native_onIceCompleted(this.nativeRef, context);
+            native_onIceCompleted(this.nativeRef, id);
         }
-        private native void native_onIceCompleted(long _nativeRef, Bundle context);
+        private native void native_onIceCompleted(long _nativeRef, long id);
     }
 }

generated/jni/native_janus_event.cpp

@@ -2,6 +2,7 @@
 // This file generated by Djinni from janus-client.djinni
 
 #include "native_janus_event.hpp"  // my header
+#include "Marshal.hpp"
 #include "native_janus_data.hpp"
 #include "native_jsep.hpp"
 
@@ -20,6 +21,16 @@ CJNIEXPORT void JNICALL Java_com_github_helloiampau_janus_generated_JanusEvent_0
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 
+CJNIEXPORT jlong JNICALL Java_com_github_helloiampau_janus_generated_JanusEvent_00024CppProxy_native_1sender(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
+        const auto& ref = ::djinni::objectFromHandleAddress<::Janus::JanusEvent>(nativeRef);
+        auto r = ref->sender();
+        return ::djinni::release(::djinni::I64::fromCpp(jniEnv, r));
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
+}
+
 CJNIEXPORT jobject JNICALL Java_com_github_helloiampau_janus_generated_JanusEvent_00024CppProxy_native_1jsep(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
 {
     try {

generated/jni/native_plugin_factory.cpp

@@ -2,6 +2,7 @@
 // This file generated by Djinni from janus-client.djinni
 
 #include "native_plugin_factory.hpp"  // my header
+#include "Marshal.hpp"
 #include "native_plugin.hpp"
 #include "native_protocol.hpp"
 
@@ -15,11 +16,12 @@ NativePluginFactory::JavaProxy::JavaProxy(JniType j) : Handle(::djinni::jniGetTh
 
 NativePluginFactory::JavaProxy::~JavaProxy() = default;
 
-std::shared_ptr<::Janus::Plugin> NativePluginFactory::JavaProxy::create(const std::shared_ptr<::Janus::Protocol> & c_owner) {
+std::shared_ptr<::Janus::Plugin> NativePluginFactory::JavaProxy::create(int64_t c_handleId, const std::shared_ptr<::Janus::Protocol> & c_owner) {
     auto jniEnv = ::djinni::jniGetThreadEnv();
     ::djinni::JniLocalScope jscope(jniEnv, 10);
     const auto& data = ::djinni::JniClass<::djinni_generated::NativePluginFactory>::get();
     auto jret = jniEnv->CallObjectMethod(Handle::get().get(), data.method_create,
+                                         ::djinni::get(::djinni::I64::fromCpp(jniEnv, c_handleId)),
                                          ::djinni::get(::djinni_generated::NativeProtocol::fromCpp(jniEnv, c_owner)));
     ::djinni::jniExceptionCheck(jniEnv);
     return ::djinni_generated::NativePlugin::toCpp(jniEnv, jret);
@@ -33,12 +35,13 @@ CJNIEXPORT void JNICALL Java_com_github_helloiampau_janus_generated_PluginFactor
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 
-CJNIEXPORT jobject JNICALL Java_com_github_helloiampau_janus_generated_PluginFactory_00024CppProxy_native_1create(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef, jobject j_owner)
+CJNIEXPORT jobject JNICALL Java_com_github_helloiampau_janus_generated_PluginFactory_00024CppProxy_native_1create(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef, jlong j_handleId, jobject j_owner)
 {
     try {
         DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
         const auto& ref = ::djinni::objectFromHandleAddress<::Janus::PluginFactory>(nativeRef);
-        auto r = ref->create(::djinni_generated::NativeProtocol::toCpp(jniEnv, j_owner));
+        auto r = ref->create(::djinni::I64::toCpp(jniEnv, j_handleId),
+                             ::djinni_generated::NativeProtocol::toCpp(jniEnv, j_owner));
         return ::djinni::release(::djinni_generated::NativePlugin::fromCpp(jniEnv, r));
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
 }

generated/jni/native_plugin_factory.hpp

@@ -33,14 +33,14 @@ class NativePluginFactory final : ::djinni::JniInterface<::Janus::PluginFactory,
         JavaProxy(JniType j);
         ~JavaProxy();
 
-        std::shared_ptr<::Janus::Plugin> create(const std::shared_ptr<::Janus::Protocol> & owner) override;
+        std::shared_ptr<::Janus::Plugin> create(int64_t handleId, const std::shared_ptr<::Janus::Protocol> & owner) override;
 
     private:
         friend ::djinni::JniInterface<::Janus::PluginFactory, ::djinni_generated::NativePluginFactory>;
     };
 
     const ::djinni::GlobalRef<jclass> clazz { ::djinni::jniFindClass("com/github/helloiampau/janus/generated/PluginFactory") };
-    const jmethodID method_create { ::djinni::jniGetMethodID(clazz.get(), "create", "(Lcom/github/helloiampau/janus/generated/Protocol;)Lcom/github/helloiampau/janus/generated/Plugin;") };
+    const jmethodID method_create { ::djinni::jniGetMethodID(clazz.get(), "create", "(JLcom/github/helloiampau/janus/generated/Protocol;)Lcom/github/helloiampau/janus/generated/Plugin;") };
 };
 
 }  // namespace djinni_generated

generated/jni/native_protocol.cpp

@@ -77,23 +77,23 @@ void NativeProtocol::JavaProxy::onAnswer(const std::string & c_sdp, const std::s
                            ::djinni::get(::djinni_generated::NativeBundle::fromCpp(jniEnv, c_context)));
     ::djinni::jniExceptionCheck(jniEnv);
 }
-void NativeProtocol::JavaProxy::onIceCandidate(const std::string & c_mid, int32_t c_index, const std::string & c_sdp, const std::shared_ptr<::Janus::Bundle> & c_context) {
+void NativeProtocol::JavaProxy::onIceCandidate(const std::string & c_mid, int32_t c_index, const std::string & c_sdp, int64_t c_id) {
     auto jniEnv = ::djinni::jniGetThreadEnv();
     ::djinni::JniLocalScope jscope(jniEnv, 10);
     const auto& data = ::djinni::JniClass<::djinni_generated::NativeProtocol>::get();
     jniEnv->CallVoidMethod(Handle::get().get(), data.method_onIceCandidate,
                            ::djinni::get(::djinni::String::fromCpp(jniEnv, c_mid)),
                            ::djinni::get(::djinni::I32::fromCpp(jniEnv, c_index)),
                            ::djinni::get(::djinni::String::fromCpp(jniEnv, c_sdp)),
-                           ::djinni::get(::djinni_generated::NativeBundle::fromCpp(jniEnv, c_context)));
+                           ::djinni::get(::djinni::I64::fromCpp(jniEnv, c_id)));
     ::djinni::jniExceptionCheck(jniEnv);
 }
-void NativeProtocol::JavaProxy::onIceCompleted(const std::shared_ptr<::Janus::Bundle> & c_context) {
+void NativeProtocol::JavaProxy::onIceCompleted(int64_t c_id) {
     auto jniEnv = ::djinni::jniGetThreadEnv();
     ::djinni::JniLocalScope jscope(jniEnv, 10);
     const auto& data = ::djinni::JniClass<::djinni_generated::NativeProtocol>::get();
     jniEnv->CallVoidMethod(Handle::get().get(), data.method_onIceCompleted,
-                           ::djinni::get(::djinni_generated::NativeBundle::fromCpp(jniEnv, c_context)));
+                           ::djinni::get(::djinni::I64::fromCpp(jniEnv, c_id)));
     ::djinni::jniExceptionCheck(jniEnv);
 }
 
@@ -174,24 +174,24 @@ CJNIEXPORT void JNICALL Java_com_github_helloiampau_janus_generated_Protocol_000
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 
-CJNIEXPORT void JNICALL Java_com_github_helloiampau_janus_generated_Protocol_00024CppProxy_native_1onIceCandidate(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef, jstring j_mid, jint j_index, jstring j_sdp, jobject j_context)
+CJNIEXPORT void JNICALL Java_com_github_helloiampau_janus_generated_Protocol_00024CppProxy_native_1onIceCandidate(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef, jstring j_mid, jint j_index, jstring j_sdp, jlong j_id)
 {
     try {
         DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
         const auto& ref = ::djinni::objectFromHandleAddress<::Janus::Protocol>(nativeRef);
         ref->onIceCandidate(::djinni::String::toCpp(jniEnv, j_mid),
                             ::djinni::I32::toCpp(jniEnv, j_index),
                             ::djinni::String::toCpp(jniEnv, j_sdp),
-                            ::djinni_generated::NativeBundle::toCpp(jniEnv, j_context));
+                            ::djinni::I64::toCpp(jniEnv, j_id));
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 
-CJNIEXPORT void JNICALL Java_com_github_helloiampau_janus_generated_Protocol_00024CppProxy_native_1onIceCompleted(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef, jobject j_context)
+CJNIEXPORT void JNICALL Java_com_github_helloiampau_janus_generated_Protocol_00024CppProxy_native_1onIceCompleted(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef, jlong j_id)
 {
     try {
         DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
         const auto& ref = ::djinni::objectFromHandleAddress<::Janus::Protocol>(nativeRef);
-        ref->onIceCompleted(::djinni_generated::NativeBundle::toCpp(jniEnv, j_context));
+        ref->onIceCompleted(::djinni::I64::toCpp(jniEnv, j_id));
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 

generated/jni/native_protocol.hpp

@@ -40,8 +40,8 @@ class NativeProtocol final : ::djinni::JniInterface<::Janus::Protocol, NativePro
         void close() override;
         void onOffer(const std::string & sdp, const std::shared_ptr<::Janus::Bundle> & context) override;
         void onAnswer(const std::string & sdp, const std::shared_ptr<::Janus::Bundle> & context) override;
-        void onIceCandidate(const std::string & mid, int32_t index, const std::string & sdp, const std::shared_ptr<::Janus::Bundle> & context) override;
-        void onIceCompleted(const std::shared_ptr<::Janus::Bundle> & context) override;
+        void onIceCandidate(const std::string & mid, int32_t index, const std::string & sdp, int64_t id) override;
+        void onIceCompleted(int64_t id) override;
 
     private:
         friend ::djinni::JniInterface<::Janus::Protocol, ::djinni_generated::NativeProtocol>;
@@ -55,8 +55,8 @@ class NativeProtocol final : ::djinni::JniInterface<::Janus::Protocol, NativePro
     const jmethodID method_close { ::djinni::jniGetMethodID(clazz.get(), "close", "()V") };
     const jmethodID method_onOffer { ::djinni::jniGetMethodID(clazz.get(), "onOffer", "(Ljava/lang/String;Lcom/github/helloiampau/janus/generated/Bundle;)V") };
     const jmethodID method_onAnswer { ::djinni::jniGetMethodID(clazz.get(), "onAnswer", "(Ljava/lang/String;Lcom/github/helloiampau/janus/generated/Bundle;)V") };
-    const jmethodID method_onIceCandidate { ::djinni::jniGetMethodID(clazz.get(), "onIceCandidate", "(Ljava/lang/String;ILjava/lang/String;Lcom/github/helloiampau/janus/generated/Bundle;)V") };
-    const jmethodID method_onIceCompleted { ::djinni::jniGetMethodID(clazz.get(), "onIceCompleted", "(Lcom/github/helloiampau/janus/generated/Bundle;)V") };
+    const jmethodID method_onIceCandidate { ::djinni::jniGetMethodID(clazz.get(), "onIceCandidate", "(Ljava/lang/String;ILjava/lang/String;J)V") };
+    const jmethodID method_onIceCompleted { ::djinni::jniGetMethodID(clazz.get(), "onIceCompleted", "(J)V") };
 };
 
 }  // namespace djinni_generated

generated/objc/JanusJanusEvent.h

@@ -8,6 +8,8 @@
 
 @interface JanusJanusEvent : NSObject
 
+- (int64_t)sender;
+
 - (nullable JanusJsep *)jsep;
 
 - (nullable JanusJanusData *)data;

generated/objc/JanusPluginFactory.h

@@ -8,6 +8,7 @@
 
 @protocol JanusPluginFactory
 
-- (nullable id<JanusPlugin>)create:(nullable id<JanusProtocol>)owner;
+- (nullable id<JanusPlugin>)create:(int64_t)handleId
+                             owner:(nullable id<JanusProtocol>)owner;
 
 @end

generated/objc/JanusProtocol.h

@@ -32,8 +32,8 @@
 - (void)onIceCandidate:(nonnull NSString *)mid
                  index:(int32_t)index
                    sdp:(nonnull NSString *)sdp
-               context:(nullable JanusBundle *)context;
+                    id:(int64_t)id;
 
-- (void)onIceCompleted:(nullable JanusBundle *)context;
+- (void)onIceCompleted:(int64_t)id;
 
 @end

generated/objcpp/JanusJanusEvent+Private.mm

@@ -5,6 +5,7 @@
 #import "JanusJanusEvent.h"
 #import "DJICppWrapperCache+Private.h"
 #import "DJIError.h"
+#import "DJIMarshal+Private.h"
 #import "JanusJanusData+Private.h"
 #import "JanusJsep+Private.h"
 #include <exception>
@@ -31,6 +32,13 @@ - (id)initWithCpp:(const std::shared_ptr<::Janus::JanusEvent>&)cppRef
     return self;
 }
 
+- (int64_t)sender {
+    try {
+        auto objcpp_result_ = _cppRefHandle.get()->sender();
+        return ::djinni::I64::fromCpp(objcpp_result_);
+    } DJINNI_TRANSLATE_EXCEPTIONS()
+}
+
 - (nullable JanusJsep *)jsep {
     try {
         auto objcpp_result_ = _cppRefHandle.get()->jsep();