Merge pull request #4 from getCompass/release_v4.4.0

Release v4.4.0

Author: getcompass-opensource

jitsi_custom/jitsi-meet-source/react-native-sdk/prepare_sdk.js

@@ -36,9 +36,10 @@ export async function loadScript(
     const controller = new AbortController();
     const signal = controller.signal;
 
-    const timer = setTimeout(() => {
-        controller.abort();
-    }, timeout);
+    // const timer = setTimeout(() => {
+    //     controller.abort();
+    // }, timeout);
+    const timer = 0;
 
     const response = await fetch(url, { signal });
 

jitsi_custom/jitsi-meet-source/react/features/base/util/loadScript.native.ts

@@ -17,8 +17,9 @@ export function timeoutPromise<T>(
         timeout: number
 ): Promise<T> {
     return new Promise((resolve, reject) => {
-        const timeoutID
-            = setTimeout(() => reject(new Error('timeout')), timeout);
+        // const timeoutID
+        //     = setTimeout(() => reject(new Error('timeout')), timeout);
+        const timeoutID = 0;
 
         promise.then(
             /* onFulfilled */ value => {

jitsi_custom/jitsi-meet-source/react/features/base/util/timeoutPromise.ts

@@ -315,9 +315,11 @@ function occupant_left(event)
     local occupant_data = room_data:on_occupant_leave(occupant_jid, room);
     module:log("info", "Occupant left - %s", json.encode(occupant_data));
 
+    local stanza = event.stanza;
     local payload = {
         ['event_name'] = 'muc-occupant-left';
         ['occupant'] = occupant_data;
+        ['stanza'] = stanza;
     };
     update_with_room_attributes(payload, room);
 

jitsi_custom/prosody/prosody-plugins-custom/mod_event_sync_component.lua

@@ -17,8 +17,8 @@ end
 
 function parse(s)
     local ans = {}
-    for k,v in s:gmatch('([^&=?]-)=([^&=?]+)' ) do
-        ans[ k ] = urldecode(v)
+    for k, v in s:gmatch('([^&=?]-)=([^&=?]+)') do
+        ans[k] = urldecode(v)
     end
     return ans
 end
@@ -47,9 +47,17 @@ function create_room(event)
         return { status_code = 400; body = "Missing required parameters" }
     end
 
+    -- проверяем существование комнаты с таким идентификатором
+    local room = get_room_by_name_and_subdomain(params["room"]);
+    if room then
+
+        module:log("info", "Room with passed id (%s) already exists", params["room"]);
+        return { status_code = 409; };
+    end
+
     local muc_domain_prefix = module:get_option_string("muc_mapper_domain_prefix", "conference");
     local muc_domain_base = module:get_option_string("muc_mapper_domain_base", module.host);
-    local muc_domain = module:get_option_string("muc_mapper_domain", muc_domain_prefix.."."..muc_domain_base);
+    local muc_domain = module:get_option_string("muc_mapper_domain", muc_domain_prefix .. "." .. muc_domain_base);
 
     -- получаем название комнаты, которую намереваемся создать
     local room_name = params["room"];
@@ -60,7 +68,7 @@ function create_room(event)
     local component = hosts[muc_domain];
     if component then
         local muc = component.modules.muc;
-        local room = muc.create_room(room_address);
+        local room, err = muc.create_room(room_address);
         if room then
 
             -- если нужно включить лобби
@@ -71,7 +79,22 @@ function create_room(event)
 
             return { status_code = 200; };
         else
-            return { status_code = 500; };
+
+            -- если не удалось создать комнату, то формируем ошибку
+            local err_str = "Room (id: %s, address: %s) is not created";
+            local err_str_values = { params["room"], room_address }
+            if err ~= nil then
+
+                err_str = err_str .. ", err: %s"
+                table.insert(err_str_values, err)
+            end
+
+            -- собираем текст ошибки и логируем
+            local unpack = table.unpack or unpack
+            local err_str_formatted = string.format(err_str, unpack(err_str_values))
+            module:log("warn", err_str_formatted)
+
+            return { status_code = 500; body = err_str_formatted };
         end
     else
         return { status_code = 404; };

jitsi_custom/prosody/prosody-plugins-custom/mod_rest_api.lua

@@ -0,0 +1,2 @@
+README.md
+.gitignore

jitsi_prosody/.dockerignore

@@ -0,0 +1,4 @@
+FROM docker.getcompass.ru/service/prosody:stable-9364-1
+
+COPY prosody-custom-plugins/ /prosody-custom-plugins
+COPY prosody-plugins/mod_persistent_lobby.lua /prosody-plugins/mod_persistent_lobby.lua