Merge 4a88ce9ee4 into de27312d1e

.gitignore

@@ -21,4 +21,9 @@ nbactions.xml
 */.project
 */.classpath
 */.settings/*
+.idea/
+log/
+\.vscode/
+*.iml
 */.tscache/*
+

openvidu-browser/src/OpenVidu/OpenVidu.ts

@@ -658,6 +658,11 @@ export class OpenVidu {
 
   private reconnectedCallback(): void {
     console.warn('Websocket reconnected');
+    if (this.isRoomAvailable()) {
+      this.session.onRecoveredConnection();
+    } else {
+      alert('Connection error. Please reload page.');
+    }
   }
 
   private isRoomAvailable(): boolean {

openvidu-browser/src/OpenVidu/Session.ts

@@ -869,6 +869,26 @@ export class Session implements EventDispatcher {
         }
     }
 
+    /**
+     * @hidden
+     */
+    onRecoveredConnection(): void {
+
+        /*if (!this.connection) {
+
+            console.warn('Not connected to session: if you are not debugging, this is probably a certificate error');
+
+            const url = 'https://' + this.openvidu.getWsUri().split('wss://')[1].split('/openvidu')[0];
+            if (window.confirm('If you are not debugging, this is probably a certificate error at \"' + url + '\"\n\nClick OK to navigate and accept it')) {
+                location.assign(url + '/accept-certificate');
+            }
+            return;
+        }*/
+
+        console.warn('Recovered connection in Session ' + this.sessionId);
+        this.ee.emitEvent('connectionRecovered', []);
+    }
+
     /**
      * @hidden
      */

openvidu-server/docker/openvidu-server-kms/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+MAINTAINER miguel.rodriguez@cocodin.com
 
 # Install Kurento Media Server (KMS) 
 RUN echo "deb http://ubuntu.openvidu.io/6.7.2 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \
@@ -20,15 +20,16 @@ RUN apt-get update && apt-get install -y \
 RUN mkdir -p /var/log/supervisor
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
+
 # Copy OpenVidu Server
-COPY openvidu-server.jar openvidu-server.jar
+COPY openvidu-server-cbx.jar openvidu-server-cbx.jar
 
 # Copy KMS entrypoint
 COPY kms.sh /kms.sh
 
 EXPOSE 8888
 EXPOSE 9091
-EXPOSE 4443
+EXPOSE 8443
 
 # Exec supervisord
 CMD ["/usr/bin/supervisord"]

openvidu-server/docker/openvidu-server-kms/create_image.sh

@@ -1,5 +1,5 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
+cp ../../target/openvidu-server-"$1".jar ./openvidu-server-cbx.jar
 
-docker build -t openvidu/openvidu-server-kms .
+docker build -t councilbox/server-kms .
 
-rm ./openvidu-server.jar
+rm ./openvidu-server-cbx.jar

openvidu-server/docker/openvidu-server-kms/supervisord.conf

@@ -9,5 +9,5 @@ command=/bin/bash /kms.sh
 redirect_stderr=true
 
 [program:openvidu-server]
-command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server.jar"
+command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server-cbx.jar"
 redirect_stderr=true

openvidu-server/docker/openvidu-server/Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:16.04
-MAINTAINER openvidu@gmail.com
+MAINTAINER miguel.rodriguez@cocodin.com
 
 # Install Java, supervisor and netstat
 RUN apt-get update && apt-get install -y \
@@ -12,9 +12,9 @@ RUN mkdir -p /var/log/supervisor
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 # Copy OpenVidu Server
-COPY openvidu-server.jar /
+COPY openvidu-server-cbx.jar /
 
-EXPOSE 4443
+EXPOSE 8443
 EXPOSE 8888
 
 # Exec supervisord

openvidu-server/docker/openvidu-server/create_image.sh

@@ -1,5 +1,5 @@
-cp ../../target/openvidu-server-"$1".jar ./openvidu-server.jar
+cp ../../target/openvidu-server-"$1".jar ./openvidu-server-cbx.jar
 
-docker build -t openvidu/openvidu-server .
+docker build -t councilbox/server-java .
 
-rm ./openvidu-server.jar
+rm ./openvidu-server-cbx.jar

openvidu-server/docker/openvidu-server/supervisord.conf

@@ -5,5 +5,5 @@ pidfile=/var/run/supervisord.pid;
 loglevel=debug
 
 [program:openvidu-server]
-command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server.jar"
+command=/bin/bash -c "java -jar -Dspring.profiles.active=docker /openvidu-server-cbx.jar"
 redirect_stderr=true

openvidu-server/src/main/resources/application-ngrok.properties

@@ -6,7 +6,7 @@ server.ssl.enabled: false
 openvidu.recording.version: 2.1.0
 
 kms.uris=[\"ws://localhost:8888/kurento\"]
-openvidu.secret: MY_SECRET
+openvidu.secret: YOUR_SECRET
 openvidu.publicurl: ngrok
 openvidu.cdr: false
 openvidu.recording: false

openvidu-server/src/main/resources/application.properties

@@ -1,21 +1,17 @@
 server.address: 0.0.0.0
 server.ssl.enabled: true
 openvidu.recording.version: 2.1.0
-
-
-
-server.port: 4443
-server.ssl.key-store: classpath:openvidu-selfsigned.jks
-server.ssl.key-store-password: openvidu
 server.ssl.key-store-type: JKS
-server.ssl.key-alias: openvidu-selfsigned
+server.ssl.key-alias: councilbox
 
-openvidu.secret: MY_SECRET
-openvidu.publicurl: local
+#kms.uris=[\"ws://217.182.136.130:8888/kurento\"]
+kms.uris=[\"ws://localhost:8888/kurento\"]
+openvidu.secret: uincBgf9ysUCIo4MNbrfMg5hsX6FYYak
+openvidu.publicurl: https://172.18.2.38:8443
 openvidu.cdr: false
 
 openvidu.recording: false
-openvidu.recording.path: /opt/openvidu/recordings
+openvidu.recording.path: /home/recordings
 openvidu.recording.public-access: false
 openvidu.recording.notification: publisher_moderator
 openvidu.recording.custom-layout: /opt/openvidu/custom-layout

openvidu-server/src/main/resources/councilbox_server_kms_docker.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+command=$(docker run -d -p 8443:8443 --name server-kms \
+-v /var/run/docker.sock:/var/run/docker.sock \
+-v /home/recordings:/home/recordings \
+-e openvidu.recording=true \
+-e openvidu.recording.path=/home/recordings \
+-e openvidu.recording.free-access=true \
+-e openvidu.secret=YOUR_SECRET \
+-e openvidu.publicurl=https://217.182.136.130:8443/ \
+--net="host" \
+councilbox/server-kms:1.8.0)
+
+echo $command