ep_webrtc 2.0.1 → 2.0.4

package/package.json

@@ -5,7 +5,7 @@
     "url": "git@github.com:ether/ep_webrtc.git",
     "type": "git"
   },
-  "version": "2.0.1",
+  "version": "2.0.4",
   "description": "WebRTC based audio/video chat to Etherpad",
   "author": "John McLear <john@mclear.co.uk>",
   "contributors": [],

package/static/js/index.js

@@ -18,7 +18,7 @@
 require('./adapter');
 const padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie;
 
-const enableDebugLogging = false;
+let enableDebugLogging = false;
 const debug = (...args) => { if (enableDebugLogging) console.debug('ep_webrtc:', ...args); };
 
 const EventTargetPolyfill = (() => {
@@ -220,6 +220,7 @@ class PeerState extends EventTargetPolyfill {
       return;
     }
     this._debug('creating RTCPeerConnection with config', this._pcConfig);
+    this._debug('peer IDs:', peerIds);
     this._setRemoteStream(null);
     this._ids.from.instance = ++nextInstanceId;
     this._ids.to = peerIds;
@@ -341,7 +342,7 @@ class PeerState extends EventTargetPolyfill {
   }
 
   async receiveMessage(msg) {
-    if (this._closed) return debug('Ignoring message because PeerState is closed');
+    if (this._closed) return this._debug('Ignoring message because PeerState is closed');
     const {ids, candidate, description, hangup} = msg;
     if (hangup != null) {
       this.close(true);
@@ -464,6 +465,9 @@ exports.rtc = new class {
     this._trackLocks = {audio: new Mutex(), video: new Mutex()};
   }
 
+  get enableDebugLogging() { return enableDebugLogging; }
+  set enableDebugLogging(val) { enableDebugLogging = !!val; }
+
   // API HOOKS
 
   async postAceInit(hookName, {pad}) {
@@ -882,7 +886,10 @@ exports.rtc = new class {
           autoplay: '',
           muted: isLocal ? '' : null,
         })
-        .prop('muted', isLocal); // Setting the 'muted' attribute isn't sufficient for some reason.
+        .prop({
+          muted: isLocal, // Setting the 'muted' attribute isn't sufficient for some reason.
+          volume: isLocal ? 0.0 : 1.0, // Long shot attempt at fixing echo in Safari.
+        });
     const $interface = $('<div>')
         .addClass('interface-container')
         .attr('id', `interface_${videoId}`);
@@ -1235,6 +1242,9 @@ exports.rtc = new class {
   }
 
   sendMessage(to, data) {
+    if (data.ids == null) data.ids = {};
+    if (data.ids.from == null) data.ids.from = {};
+    data.ids.from.session = sessionId;
     debug(`(${to == null ? 'to everyone on the pad' : `peer ${to}`}) sending message`, data);
     this._pad.collabClient.sendMessage({
       type: 'RTC_MESSAGE',
@@ -1272,7 +1282,7 @@ exports.rtc = new class {
   // the WebRTC signaling messages. This is bad because WebRTC assumes reliable, in-order delivery
   // of signaling messages, so the discards will break future connection attempts.
   invitePeer(userId) {
-    this.sendMessage(userId, {ids: {from: {session: sessionId}}, invite: 'invite'});
+    this.sendMessage(userId, {invite: 'invite'});
   }
 
   getPeerConnection(userId) {