[FEAT]: Add stream events

jni-wrappers/privmx-endpoint/includes/privmx/endpoint/wrapper/parsers/parser.h

@@ -18,6 +18,8 @@
 #include "privmx/endpoint/core/Types.hpp"
 #include "privmx/endpoint/core/Events.hpp"
 #include "privmx/endpoint/inbox/Types.hpp"
+#include "privmx/endpoint/stream/Events.hpp"
+#include "privmx/endpoint/wrapper/streams/parsers/model_native_initializers.h"
 
 std::vector<privmx::endpoint::core::UserWithPubKey>
 usersToVector(JniContextUtils &ctx, jobjectArray users);

jni-wrappers/privmx-endpoint/includes/privmx/endpoint/wrapper/streams/parsers/model_native_initializers.h

@@ -63,6 +63,46 @@ namespace privmx {
 
             jobject
             sdpWithTypeModel2Java(JniContextUtils &ctx, privmx::endpoint::stream::SdpWithTypeModel sdpWithTypeModel_c);
+            jobject
+                    streamTrackModificationPair2Java(JniContextUtils & ctx, endpoint::stream::StreamTrackModificationPair
+            streamTrackModificationPair);
+
+            jobject
+                    streamTrackModification2Java(JniContextUtils & ctx, endpoint::stream::StreamTrackModification
+            streamTrackModification);
+
+            jobject
+                    streamUpdatedEventData2Java(JniContextUtils & ctx, privmx::endpoint::stream::StreamUpdatedEventData
+            data);
+
+            jobject
+                    updatedStreamData2Java(JniContextUtils & ctx, endpoint::stream::UpdatedStreamData
+            updatedStreamData);
+
+            jobject
+                    streamRoomDeletedEventData2Java(JniContextUtils & ctx, privmx::endpoint::stream::StreamRoomDeletedEventData
+            data);
+
+            jobject
+                    streamPublishedEventData2Java(JniContextUtils & ctx, privmx::endpoint::stream::StreamPublishedEventData
+            data);
+
+            jobject
+                    streamEventData2Java(JniContextUtils & ctx, privmx::endpoint::stream::StreamEventData
+            data);
+
+            jobject
+                    streamUnpublishedEventData2Java(JniContextUtils & ctx, privmx::endpoint::stream::StreamUnpublishedEventData
+            data);
+
+            jobject
+                    newStreams2Java(JniContextUtils & ctx, privmx::endpoint::stream::NewStreams
+            data);
+
+            jobject
+                    streamsUpdated2Java(JniContextUtils & ctx, privmx::endpoint::stream::StreamsUpdatedData
+            data);
+
         } // streams
     } // wrapper
 } // privmx

jni-wrappers/privmx-endpoint/includes/privmx/endpoint/wrapper/streams/parsers/parser.h

@@ -31,4 +31,4 @@ privmx::endpoint::stream::StreamSettings parseStreamSettings(JNIEnv *env, jobjec
 
 privmx::endpoint::stream::StreamSubscription parseStreamSubscription(JniContextUtils &ctx, jobject streamSubscription);
 
-//#endif //PRIVMX_POCKET_LIB_PARSER_H
+privmx::endpoint::stream::SdpWithTypeModel parseSdpWithTypeModel(JniContextUtils &ctx, jobject sdpWithTypeModel);

jni-wrappers/privmx-endpoint/src/cpp/modules/EventQueue.cpp

@@ -54,8 +54,8 @@ Java_com_simplito_java_privmx_1endpoint_modules_core_EventQueue_getEvent(
     ctx.callResultEndpointApi<jobject>(&result, [&ctx]() {
         auto eventHolder = EventQueue::getInstance().getEvent();
         return !eventHolder.has_value() ?
-               nullptr :
-               parseEvent(ctx, eventHolder.value().get());
+                nullptr :
+                parseEvent(ctx, eventHolder.value().get());
     });
     if (ctx->ExceptionCheck()) {
         return nullptr;

jni-wrappers/privmx-endpoint/src/cpp/parsers/parser.cpp

@@ -647,6 +647,135 @@ parseEvent(JniContextUtils &ctx, std::shared_ptr<privmx::endpoint::core::Event>
                     event_cast.timestamp,
                     privmx::wrapper::kvdbDeletedEntryEventData2Java(ctx, event_cast.data)
             );
+        } else  if (stream::Events::isStreamRoomCreatedEvent(event)) {
+            privmx::endpoint::stream::StreamRoomCreatedEvent event_cast = stream::Events::extractStreamRoomCreatedEvent(
+                    event);
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamRoom2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamRoomUpdatedEvent(event)) {
+            privmx::endpoint::stream::StreamRoomUpdatedEvent event_cast =
+                    stream::Events::extractStreamRoomUpdatedEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamRoom2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamRoomDeletedEvent(event)) {
+            privmx::endpoint::stream::StreamRoomDeletedEvent event_cast =
+                    stream::Events::extractStreamRoomDeletedEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamRoomDeletedEventData2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamPublishedEvent(event)) {
+            privmx::endpoint::stream::StreamPublishedEvent event_cast =
+                    stream::Events::extractStreamPublishedEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamPublishedEventData2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamUpdatedEvent(event)) {
+            privmx::endpoint::stream::StreamUpdatedEvent event_cast =
+                    stream::Events::extractStreamUpdatedEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamUpdatedEventData2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamJoinedEvent(event)) {
+            privmx::endpoint::stream::StreamJoinedEvent event_cast =
+                    stream::Events::extractStreamJoinedEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamEventData2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamUnpublishedEvent(event)) {
+            privmx::endpoint::stream::StreamUnpublishedEvent event_cast =
+                    stream::Events::extractStreamUnpublishedEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamUnpublishedEventData2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamLeftEvent(event)) {
+            privmx::endpoint::stream::StreamLeftEvent event_cast =
+                    stream::Events::extractStreamLeftEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamEventData2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamNewStreamsEvent(event)) {
+            privmx::endpoint::stream::StreamNewStreamsEvent event_cast =
+                    stream::Events::extractStreamNewStreamsEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::newStreams2Java(ctx, event_cast.data)
+            );
+        } else if (stream::Events::isStreamsUpdatedEvent(event)) {
+            privmx::endpoint::stream::StreamsUpdatedEvent event_cast =
+                    stream::Events::extractStreamsUpdatedEvent(event);
+
+            return initEvent(
+                    ctx,
+                    event_cast.type,
+                    event_cast.channel,
+                    event_cast.connectionId,
+                    event_cast.subscriptions,
+                    event_cast.timestamp,
+                    privmx::wrapper::streams::streamsUpdated2Java(ctx, event_cast.data)
+            );
         } else {
             return initEvent(
                     ctx,

jni-wrappers/privmx-endpoint/src/cpp/streams/modules/StreamApiLow.cpp

@@ -13,8 +13,6 @@
 #include "privmx/endpoint/wrapper/streams/parsers/model_native_initializers.h"
 #include "privmx/endpoint/wrapper/streams/parsers/parser.h"
 
-//#include <privmx-endpoint/includes/privmx/endpoint/wrapper/parsers/parser.h>
-
 using namespace privmx::endpoint::stream;
 using namespace privmx::endpoint;
 //using namespace privmx::wrapper;
@@ -424,12 +422,10 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_publishStrea
         auto result = getStreamApi(ctx, thiz)->publishStream(
                 parseStreamHandle(ctx, stream_handle)
         );
-        return nullptr;
-        //TODO: Return result
-//        return privmx::wrapper::streams::streamPublishResult2Java(
-//                ctx,
-//                result
-//        );
+        return privmx::wrapper::streams::streamPublishResult2Java(
+                ctx,
+                result
+        );
     });
     if (ctx->ExceptionCheck()) {
         return nullptr;
@@ -649,6 +645,38 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_unsubscribeF
     });
 }
 
+extern "C"
+JNIEXPORT jstring JNICALL
+Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_buildSubscriptionQuery(
+        JNIEnv *env,
+        jobject thiz,
+        jlong event_type,
+        jlong selector_type,
+        jstring selector_id
+) {
+    JniContextUtils ctx(env);
+    if (ctx.nullCheck(selector_id, "SelectorID")) {
+        return nullptr;
+    }
+
+    jstring result = nullptr;
+    ctx.callResultEndpointApi<jstring>(
+            &result,
+            [&ctx, &thiz, &event_type, &selector_type, &selector_id]() {
+                std::string query_result_c = getStreamApi(ctx, thiz)->buildSubscriptionQuery(
+                        static_cast<stream::EventType>(event_type),
+                        static_cast<stream::EventSelectorType>(selector_type),
+                        ctx.jString2string(selector_id)
+                );
+                return ctx->NewStringUTF(query_result_c.c_str());
+            }
+    );
+    if (ctx->ExceptionCheck()) {
+        return nullptr;
+    }
+    return result;
+}
+
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_keyManagement(
@@ -837,4 +865,59 @@ Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_subscribeToR
                 parseSettings(ctx, options)
         );
     });
+}
+extern "C"
+JNIEXPORT jobject JNICALL
+Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_updateStream(
+        JNIEnv *env,
+        jobject thiz,
+        jobject stream_handle
+) {
+    JniContextUtils ctx(env);
+    jobject result;
+
+    ctx.callResultEndpointApi<jobject>(
+            &result, [
+                    &ctx,
+                    &env,
+                    &thiz,
+                    &stream_handle
+            ] {
+
+                auto stream_handle_c = parseStreamHandle(ctx, stream_handle);
+                auto stream_result = getStreamApi(ctx, thiz)->updateStream(
+                        stream_handle_c
+                );
+
+                return privmx::wrapper::streams::streamPublishResult2Java(
+                        ctx,
+                        stream_result
+                );
+
+            });
+    if (ctx->ExceptionCheck()) {
+        return nullptr;
+    }
+    return result;
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_simplito_java_privmx_1endpoint_modules_stream_StreamApiLow_acceptOfferOnReconfigure(
+        JNIEnv *env,
+        jobject thiz,
+        jlong session_id,
+        jobject sdp
+) {
+    JniContextUtils ctx(env);
+    if (ctx.nullCheck(sdp, " SDP")) {
+        return;
+    }
+
+    ctx.callVoidEndpointApi([&ctx, &thiz, &session_id, &sdp]() {
+
+        getStreamApi(ctx, thiz)->acceptOfferOnReconfigure(
+                session_id,
+                parseSdpWithTypeModel(ctx, sdp)
+        );
+    });
 }

jni-wrappers/privmx-endpoint/src/cpp/streams/modules/StreamSettingsJNI.cpp

@@ -25,31 +25,31 @@ namespace privmx::wrapper::streams {
         this->jstreamSettings = env->NewGlobalRef(jstreamSettings);
 
 
-        this->OnFrame = [this](
-                int64_t a,
-                int64_t b,
-                const std::shared_ptr<privmx::endpoint::stream::Frame> &frame,
-                const std::string &c
-        ) {
-            JNIEnv *env = privmx::wrapper::jni::AttachCurrentThreadIfNeeded(
-                    javaVM,
-                    privmx::wrapper::jni::getPrivmxCallbackThreadName());
-            JniContextUtils ctx(env);
-        };
-
-        this->OnVideo = [this](const std::string &a) {
-            JNIEnv *env = privmx::wrapper::jni::AttachCurrentThreadIfNeeded(
-                    javaVM,
-                    privmx::wrapper::jni::getPrivmxCallbackThreadName());
-            JniContextUtils ctx(env);
-        };
-
-        this->OnVideoRemove = [this](const std::string &a) {
-            JNIEnv *env = privmx::wrapper::jni::AttachCurrentThreadIfNeeded(
-                    javaVM,
-                    privmx::wrapper::jni::getPrivmxCallbackThreadName());
-            JniContextUtils ctx(env);
-        };
+//        this->OnFrame = [this](
+//                int64_t a,
+//                int64_t b,
+//                const std::shared_ptr<privmx::endpoint::stream::Frame> &frame,
+//                const std::string &c
+//        ) {
+//            JNIEnv *env = privmx::wrapper::jni::AttachCurrentThreadIfNeeded(
+//                    javaVM,
+//                    privmx::wrapper::jni::getPrivmxCallbackThreadName());
+//            JniContextUtils ctx(env);
+//        };
+//
+//        this->OnVideo = [this](const std::string &a) {
+//            JNIEnv *env = privmx::wrapper::jni::AttachCurrentThreadIfNeeded(
+//                    javaVM,
+//                    privmx::wrapper::jni::getPrivmxCallbackThreadName());
+//            JniContextUtils ctx(env);
+//        };
+//
+//        this->OnVideoRemove = [this](const std::string &a) {
+//            JNIEnv *env = privmx::wrapper::jni::AttachCurrentThreadIfNeeded(
+//                    javaVM,
+//                    privmx::wrapper::jni::getPrivmxCallbackThreadName());
+//            JniContextUtils ctx(env);
+//        };
     }
 
 //    void StreamSettingsJNI::StreamSettingsJNI::onVideo2(