Move ProtocolExtensionManager from SessionConnector into its own class

remoting/webapp/crd/js/session_connector_impl.js

 // Copyright 2013 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
  * Connect set-up state machine for Me2Me and IT2Me
  */
 
 'use strict';
@@ skipping 71 matching lines @@
   this.logHostOfflineErrors_ = false;
 
   /** @private {remoting.ClientPlugin} */
   this.plugin_ = null;
 
   /** @private {remoting.ClientSession} */
   this.clientSession_ = null;
 
   /** @private {remoting.CredentialsProvider} */
   this.credentialsProvider_ = null;
-
-  /** @private {Object<string,remoting.ProtocolExtension>} */
-  this.protocolExtensions_ = {};
-
-  /**
-   * True once a session has been created and we've started the extensions.
-   * This is used to immediately start any extensions that are registered
-   * after the CONNECTED state change.
-   * @private {boolean}
-   */
-  this.protocolExtensionsStarted_ = false;
 };
 
 /**
  * Initiate a Me2Me connection.
  *
  * This doesn't report host-offline errors because the connection will
  * be retried and retryConnectMe2Me is responsible for reporting these errors.
  *
  * @param {remoting.Host} host The Me2Me host to which to connect.
  * @param {function(boolean, function(string):void):void} fetchPin Function to
@@ skipping 207 matching lines @@
   }
 
   if (!this.plugin_.isSupportedVersion()) {
     console.error('ERROR: bad plugin version');
     this.pluginError_(new remoting.Error(
         remoting.Error.Tag.BAD_PLUGIN_VERSION));
     return;
   }
 
   this.clientSession_ = new remoting.ClientSession(
-      this.plugin_, this.host_, this.signalStrategy_,
-      this.onProtocolExtensionMessage_.bind(this));
+      this.plugin_, this.host_, this.signalStrategy_);
   remoting.clientSession = this.clientSession_;
 
   this.clientSession_.logHostOfflineErrors(this.logHostOfflineErrors_);
   this.clientSession_.addEventListener(
       remoting.ClientSession.Events.stateChanged,
       this.bound_.onStateChange);
 
   this.plugin_.connect(
       this.host_, this.signalStrategy_.getJid(), this.credentialsProvider_);
 };
@@ skipping 11 matching lines @@
 remoting.SessionConnectorImpl.prototype.closeSession = function() {
   base.dispose(this.clientSession_);
   this.clientSession_ = null;
   remoting.clientSession = null;
 
   base.dispose(this.plugin_);
   this.plugin_ = null;
 };
 
 /**
- * @param {remoting.ProtocolExtension} extension
- */
-remoting.SessionConnectorImpl.prototype.registerProtocolExtension =
-    function(extension) {
-  var types = extension.getExtensionTypes();
-
-  // Make sure we don't have an extension of that type already registered.
-  for (var i=0, len=types.length; i < len; i++) {
-    if (types[i] in this.protocolExtensions_) {
-      console.error(
-          'Attempt to register multiple extensions of the same type: ', type);
-      return;
-    }
-  }
-
-  for (var i=0, len=types.length; i < len; i++) {
-    var type = types[i];
-    this.protocolExtensions_[type] = extension;
-    if (this.protocolExtensionsStarted_) {
-      this.startProtocolExtension_(type);
-    }
-  }
-};
-
-/** @private */
-remoting.SessionConnectorImpl.prototype.initProtocolExtensions_ = function() {
-  base.debug.assert(!this.protocolExtensionsStarted_);
-  for (var type in this.protocolExtensions_) {
-    this.startProtocolExtension_(type);
-  }
-  this.protocolExtensionsStarted_ = true;
-};
-
-/**
- * @param {string} type
- * @private
- */
-remoting.SessionConnectorImpl.prototype.startProtocolExtension_ =
-    function(type) {
-  var extension = this.protocolExtensions_[type];
-  extension.startExtension(this.plugin_.sendClientMessage.bind(this.plugin_));
-};
-
-/**
- * Called when an extension message needs to be handled.
- *
- * @param {string} type The type of the extension message.
- * @param {string} data The payload of the extension message.
- * @return {boolean} Return true if the extension message was recognized.
- * @private
- */
-remoting.SessionConnectorImpl.prototype.onProtocolExtensionMessage_ =
-    function(type, data) {
-  if (type == 'test-echo-reply') {
-    console.log('Got echo reply: ' + data);
-    return true;
-  }
-
-  var message = base.jsonParseSafe(data);
-  if (typeof message != 'object') {
-    console.error('Error parsing extension json data: ' + data);
-    return false;
-  }
-
-  if (type in this.protocolExtensions_) {
-    /** @type {remoting.ProtocolExtension} */
-    var extension = this.protocolExtensions_[type];
-    var handled = false;
-    try {
-      handled = extension.onExtensionMessage(type, message);
-    } catch (/** @type {*} */ err) {
-      console.error('Failed to process protocol extension ' + type +
-                    ' message: ' + err);
-    }
-    if (handled) {
-      return true;
-    }
-  }
-
-  return false;
-};
-
-/**
  * Handle a change in the state of the client session prior to successful
  * connection (after connection, this class no longer handles state change
  * events). Errors that occur while connecting either trigger a reconnect
  * or notify the onError handler.
  *
  * @param {remoting.ClientSession.StateEvent=} event
  * @return {void} Nothing.
  * @private
  */
 remoting.SessionConnectorImpl.prototype.onStateChange_ = function(event) {
   switch (event.current) {
     case remoting.ClientSession.State.CONNECTED:
       // When the connection succeeds, deregister for state-change callbacks
       // and pass the session to the onConnected callback. It is expected that
       // it will register a new state-change callback to handle disconnect
       // or error conditions.
       this.clientSession_.removeEventListener(
           remoting.ClientSession.Events.stateChanged,
           this.bound_.onStateChange);
 
       base.dispose(this.reconnector_);
       if (remoting.app.getConnectionMode() != remoting.Application.Mode.IT2ME) {
         this.reconnector_ =
             new remoting.SmartReconnector(this, this.clientSession_);
       }
       var connectionInfo = new remoting.ConnectionInfo(
           this.host_, this.credentialsProvider_, this.clientSession_,
           this.plugin_);
       this.onConnected_(connectionInfo);
-      // Initialize any protocol extensions that may have been added by the app.
-      this.initProtocolExtensions_();
       break;
 
     case remoting.ClientSession.State.CONNECTING:
       remoting.identity.getEmail().then(
           function(/** string */ email) {
             console.log('Connecting as ' + email);
           });
       break;
 
     case remoting.ClientSession.State.AUTHENTICATED:
@@ skipping 51 matching lines @@
  * @return {remoting.SessionConnector}
  */
 remoting.DefaultSessionConnectorFactory.prototype.createConnector =
     function(clientContainer, onConnected, onError,
              onConnectionFailed, requiredCapabilities) {
   return new remoting.SessionConnectorImpl(clientContainer, onConnected,
                                            onError,
                                            onConnectionFailed,
                                            requiredCapabilities);
 };