Merge pull request #68 from mconf/master

v2.4.21/v2.4.22

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:14
 
 ADD . app
 

config/custom-environment-variables.yml

@@ -75,6 +75,9 @@ videoSubscriberSpecSlave:
 screenshareSubscriberSpecSlave:
   __name: SCREENSHARE_SUBSCRIBER_SLAVE
   __format: json
+screensharePlayStartEnabled:
+  __name: SCREENSHARE_PLAY_START_ENABLED
+  __format: json
 
 kurentoAllowedCandidateIps:
   __name: KURENTO_ALLOWED_CANDIDATE_IPS

config/default.example.yml

@@ -45,6 +45,7 @@ common-message-version: 2.x
 screenshareKeyframeInterval: 0
 screenshareEnableFlashRTPBridge: false
 screenshareSubscriberSpecSlave: false
+screensharePlayStartEnabled: false
 videoSubscriberSpecSlave: false
 
 recordScreenSharing: true

lib/screenshare/screenshare.js

@@ -27,6 +27,9 @@ const SUBSCRIBER_SPEC_SLAVE = config.has('videoSubscriberSpecSlave')
   ? config.get('videoSubscriberSpecSlave')
   : false;
 const KURENTO_REMB_PARAMS = config.util.cloneDeep(config.get('kurentoRembParams'));
+const SCREENSHARE_PLAY_START_ENABLED = config.has(`screensharePlayStartEnabled`)
+  ? config.get(`screensharePlayStartEnabled`)
+  : false;
 
 const LOG_PREFIX = "[screenshare]";
 
@@ -158,7 +161,6 @@ module.exports = class Screenshare extends BaseProvider {
       connectionId,
       type: C.SCREENSHARE_APP,
       id : 'iceCandidate',
-      cameraId: this._connectionId,
       candidate : candidate
     }), C.FROM_SCREENSHARE);
   }
@@ -176,6 +178,7 @@ module.exports = class Screenshare extends BaseProvider {
           this.startRecording();
         }
         this._status = C.MEDIA_STARTED;
+        this.sendPlayStart(C.SEND_ROLE, connectionId);
       }
     }
   };
@@ -186,9 +189,26 @@ module.exports = class Screenshare extends BaseProvider {
     // TODO properly implement a handler when we have a client-side reconnection procedure
   }
 
+  sendPlayStart (role, connectionId) {
+    if (SCREENSHARE_PLAY_START_ENABLED) {
+      this.bbbGW.publish(JSON.stringify({
+        type: C.SCREENSHARE_APP,
+        id : 'playStart',
+        connectionId,
+        role,
+      }), C.FROM_SCREENSHARE);
+    }
+  }
+
   _onViewerWebRTCMediaFlowing (connectionId) {
     Logger.info(LOG_PREFIX, `Viewer WebRTC session is FLOWING`,
       this._getFullViewerLogMetadata(connectionId));
+    const viewerUser = this._viewerUsers[connectionId];
+
+    if (viewerUser && !viewerUser.started) {
+      this.sendPlayStart(C.RECV_ROLE, connectionId);
+      viewerUser.started = true;
+    }
   }
 
   _onViewerWebRTCMediaNotFlowing (connectionId) {
@@ -614,7 +634,11 @@ module.exports = class Screenshare extends BaseProvider {
           this._voiceBridge,
           'SFU',
           { externalUserId: userId, name: bbbUserName, autoLeave: true });
-        this._viewerUsers[connectionId] = { userId, connectionId };
+        this._viewerUsers[connectionId] = {
+          userId,
+          connectionId,
+          started: false,
+        };
 
         // Get the REMB spec to be used. Screenshare uses the default mixed in with
         // the default spec bitrate. Fetching bitrate by the VP8 codec is just an
@@ -657,11 +681,10 @@ module.exports = class Screenshare extends BaseProvider {
           this._getFullViewerLogMetadata(connectionId));
 
         return resolve(sdpAnswer);
-      }
-      catch (err) {
-        Logger.error(LOG_PREFIX, `Viewer subscribe failed for ${userId} due to ${err.message}`,
-          { ...this._getFullViewerLogMetadata(id), error: this._handleError(LOG_PREFIX, err) });
-        return reject(this._handleError(LOG_PREFIX, err));
+      } catch (error) {
+        Logger.error(LOG_PREFIX, `Viewer subscribe failed for ${userId} due to ${error.message}`,
+          { ...this._getFullViewerLogMetadata(connectionId), error: this._handleError(LOG_PREFIX, error) });
+        return reject(this._handleError(LOG_PREFIX, error));
       }
     });
   }

lib/video/video.js

@@ -302,6 +302,14 @@ module.exports = class Video extends BaseProvider {
       this.id
     );
 
+    this.bbbGW.publish(JSON.stringify({
+      connectionId: this.connectionId,
+      type: 'video',
+      role: this.role,
+      id : 'playStop',
+      cameraId: this.id,
+    }), C.FROM_VIDEO);
+
     this.bbbGW.publish(userCamEvent, C.TO_AKKA_APPS_CHAN_2x);
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bbb-webrtc-sfu",
-  "version": "2.4.20",
+  "version": "2.4.22",
   "private": true,
   "scripts": {
     "start": "node server.js",
@@ -18,8 +18,8 @@
     "redis": "2.8.0",
     "sdp-transform": "2.13.0",
     "sip.js": "git+https://github.com/mconf/sip.js.git#v0.7.5.10",
-    "winston": "2.4.2",
-    "ws": "3.3.3"
+    "winston": "2.4.5",
+    "ws": "7.3.1"
   },
   "optionalDependencies": {}
 }