Make reconnection in response to video channel inactivity less aggressive.

remoting/webapp/smart_reconnector.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * Class handling reconnecting the session when it is disconnected due to
  * network failure.
  *
  * The SmartReconnector listens for changes in connection state of
@@ skipping 44 matching lines @@
       remoting.ClientSession.Events.videoChannelStateChanged,
       this.bound_.videoChannelStateChanged);
 };
 
 // The online event only means the network adapter is enabled, but
 // it doesn't necessarily mean that we have a working internet connection.
 // Therefore, delay the connection by |kReconnectDelay| to allow for the network
 // to connect.
 remoting.SmartReconnector.kReconnectDelay = 2000;
 
-// If no frames are received from the server for more than |kConnectionTimeout|,
-// disconnect the session.
+// If the video channel is inactive for 10 seconds reconnect the session.
 remoting.SmartReconnector.kConnectionTimeout = 10000;
 
 remoting.SmartReconnector.prototype = {
   reconnect_: function() {
     this.cancelPending_();
     remoting.disconnect();
     remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
     this.connector_.reconnect();
   },
 
@@ skipping 13 matching lines @@
       this.cancelPending_();
       if (navigator.onLine) {
         this.reconnect_();
       } else {
         window.addEventListener('online', this.bound_.reconnectAsync, false);
       }
     }
   },
 
   /**
-   * @param {boolean} active  This function is called if no frames are received
-   *    on the client for more than 1 second.
+   * @param {boolean} active  True if the video channel is active.
    */
   videoChannelStateChanged_: function (active) {
     this.cancelPending_();
     if (!active) {
-      // If the channel becomes inactive due to a lack of network connection,
-      // wait for it to go online.  The plugin will try to reconnect the video
-      // channel once it is online.  If the video channels doesn't finish
-      // reconnecting within the timeout, tear down the session and reconnect.
-      if (navigator.onLine) {

[Wez, 2014/05/23 20:26:40]

Would it be better to just have a shorter timeout for the am-online case, before
reconnecting?  Or is navigator.onLine just too unreliable for our purposes?

[Sergey Ulanov, 2014/05/23 20:38:36]

navigator.onLine=true just tells us that the machine might be online. It's still
possible that network is broken. So I don't think we should treat that case
differently.

-        this.reconnect_();
-      } else {
-        window.addEventListener(
+      window.addEventListener(
           'online', this.bound_.startReconnectTimeout, false);
-      }
     }
   },
 
   startReconnectTimeout_: function () {
     this.cancelPending_();
     this.connectionTimeoutTimerId_ = window.setTimeout(
           this.bound_.reconnect, remoting.SmartReconnector.kConnectionTimeout);
   },
 
   cancelPending_: function() {
     window.removeEventListener(
         'online', this.bound_.startReconnectTimeout, false);
     window.removeEventListener('online', this.bound_.reconnectAsync, false);
     window.clearTimeout(this.reconnectTimerId_);
     window.clearTimeout(this.connectionTimeoutTimerId_);
     this.reconnectTimerId_ = null;
     this.connectionTimeoutTimerId_ = null;
   },
 
   dispose: function() {
     this.clientSession_.removeEventListener(
         remoting.ClientSession.Events.stateChanged,
         this.bound_.stateChanged);
     this.clientSession_.removeEventListener(
         remoting.ClientSession.Events.videoChannelStateChanged,
         this.bound_.videoChannelStateChanged);
   }
 };