From 5f1a9da90de5336de1036db7809ee01983ab91ee Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Fri, 10 Jul 2020 22:53:56 +0200
Subject: [PATCH] apply v2.2.20 changes

---
 mod/html5/Dockerfile    |  4 ++--
 mod/html5/settings.yml  | 13 ++++++++++++-
 mod/webhooks/Dockerfile |  2 +-
 mod/webhooks/config.yml |  3 +++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile
index d2394df..31def3a 100644
--- a/mod/html5/Dockerfile
+++ b/mod/html5/Dockerfile
@@ -14,7 +14,7 @@ USER meteor
 ENV METEOR_VERSION 1.8.1
 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
 
-ENV TAG v2.2.18
+ENV TAG v2.2.20
 RUN cd ~ \
     && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
     && mv ~/bigbluebutton-html5 ~/source \
@@ -51,4 +51,4 @@ USER meteor
 ENTRYPOINT ["/entrypoint.sh"]
 
 # lets set the tag again, so that it is include in the image for later version retrieval
-ENV TAG v2.2.18
+ENV TAG v2.2.20
diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml
index ba19f69..cd9136f 100644
--- a/mod/html5/settings.yml
+++ b/mod/html5/settings.yml
@@ -11,7 +11,7 @@ public:
     appName: BigBlueButton HTML5 Client
     bbbServerVersion: 2.2
     copyright: "©2020 BigBlueButton Inc."
-    html5ClientBuild: 960
+    html5ClientBuild: 968
     helpLink: https://bigbluebutton.org/html5/
     lockOnJoin: true
     cdn: ""
@@ -86,6 +86,16 @@ public:
     packetLostThreshold: 10
   kurento:
     wsUrl: wss://{{ .Env.DOMAIN }}/bbb-webrtc-sfu
+    # Valid for video-provider. Time (ms) before its WS connection times out
+    # and tries to reconnect.
+    wsConnectionTimeout: 4000
+    cameraTimeouts:
+      # Base camera timeout: used as the camera *sharing* timeout and
+      # as the minimum camera subscribe reconnection timeout
+      baseTimeout: 15000
+      # Max timeout: used as the max camera subscribe reconnection timeout. Each
+      # subscribe reattempt increases the reconnection timer up to this
+      maxTimeout: 60000
     chromeDefaultExtensionKey: akgoaoikmbmhcopjgakkcepdgdgkjfbc
     chromeDefaultExtensionLink: https://chrome.google.com/webstore/detail/bigbluebutton-screenshare/akgoaoikmbmhcopjgakkcepdgdgkjfbc
     chromeExtensionKey: KEY
@@ -190,6 +200,7 @@ public:
     callHangupMaximumRetries: 10
     echoTestNumber: 'echo'
     relayOnlyOnReconnect: false
+    listenOnlyCallTimeout: 15000
   presentation:
     defaultPresentationFile: default.pdf
     panZoomThrottle: 32
diff --git a/mod/webhooks/Dockerfile b/mod/webhooks/Dockerfile
index ecfbee1..36b1019 100644
--- a/mod/webhooks/Dockerfile
+++ b/mod/webhooks/Dockerfile
@@ -13,7 +13,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
 USER webhooks
 
 
-ENV TAG v2.2.19
+ENV TAG v2.2.20
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \
     && rm -rf /app/.svn \
     && cd /app && npm install --production
diff --git a/mod/webhooks/config.yml b/mod/webhooks/config.yml
index 56cdc7e..ae51d64 100644
--- a/mod/webhooks/config.yml
+++ b/mod/webhooks/config.yml
@@ -47,6 +47,8 @@ hooks:
     - 60000
   # Reset permanent interval when exceeding maximum attemps
   permanentIntervalReset: 8
+  # Hook's request module timeout for socket conn establishment and/or responses (ms)
+  requestTimeout: 5000
 
 # Mappings of internal to external meeting IDs
 mappings:
@@ -64,4 +66,5 @@ redis:
     mappingPrefix: bigbluebutton:webhooks:mapping
     eventsPrefix: bigbluebutton:webhooks:events
     userMaps: bigbluebutton:webhooks:userMaps
+    userMapPrefix: bigbluebutton:webhooks:userMap
     userMapPrefix: bigbluebutton:webhooks:userMap
\ No newline at end of file