Windows chromoting host installation via the NPAPI plugin

remoting/webapp/host_controller.js

 // Copyright (c) 2012 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.
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /** @constructor */
 remoting.HostController = function() {
-  /** @return {remoting.HostPlugin} */
-  var createPluginForMe2Me = function() {
-    /** @type {HTMLElement} @private */
-    var container = document.getElementById('daemon-plugin-container');
-    return remoting.createNpapiPlugin(container);
-  };
-
-  /** @type {remoting.HostDispatcher} @private */
-  this.hostDispatcher_ = new remoting.HostDispatcher(createPluginForMe2Me);
-
-  /** @param {string} version */
-  var printVersion = function(version) {
-    if (version == '') {
-      console.log('Host not installed.');
-    } else {
-      console.log('Host version: ' + version);
-    }
-  };
-
-  this.hostDispatcher_.getDaemonVersion(printVersion, function() {
-    console.log('Host version not available.');
-  });
+  this.hostDispatcher_ = this.createDispatcher();
 };
 
 // Note that the values in the enums below are copied from
 // daemon_controller.h and must be kept in sync.
 /** @enum {number} */
 remoting.HostController.State = {
   NOT_IMPLEMENTED: -1,
   NOT_INSTALLED: 0,
   INSTALLING: 1,
   STOPPED: 2,
@@ skipping 27 matching lines @@
  * @return {remoting.HostController.AsyncResult} The result enum value.
  */
 remoting.HostController.AsyncResult.fromString = function(result) {
   if (!remoting.HostController.AsyncResult.hasOwnProperty(result)) {
     throw "Invalid HostController.AsyncResult: " + result;
   }
   return remoting.HostController.AsyncResult[result];
 }
 
 /**
+ * @return {remoting.HostDispatcher}
+ */
+remoting.HostController.prototype.createDispatcher = function() {

[Jamie, 2014/04/10 18:29:32]

If this is private, please append _ to the name and add @private to the JSDoc.

[weitao, 2014/04/10 21:33:47]

Done.

+  /** @return {remoting.HostPlugin} */
+  var createPluginForMe2Me = function() {
+    /** @type {HTMLElement} @private */
+    var container = document.getElementById('daemon-plugin-container');
+    return remoting.createNpapiPlugin(container);
+  };
+
+  /** @type {remoting.HostDispatcher} @private */
+  var hostDispatcher = new remoting.HostDispatcher(createPluginForMe2Me);
+
+  /** @param {string} version */
+  var printVersion = function(version) {
+    if (version == '') {
+      console.log('Host not installed.');
+    } else {
+      console.log('Host version: ' + version);
+    }
+  };
+
+  hostDispatcher.getDaemonVersion(printVersion, function() {
+    console.log('Host version not available.');
+  });
+
+  return hostDispatcher;
+};
+
+/**
  * Set of features for which hasFeature() can be used to test.
  *
  * @enum {string}
  */
 remoting.HostController.Feature = {
   PAIRING_REGISTRY: 'pairingRegistry',
   OAUTH_CLIENT: 'oauthClient'
 };
 
 /**
@@ skipping 11 matching lines @@
  * @param {function(boolean, boolean, boolean):void} onDone Callback to be
  *     called when done.
  * @param {function(remoting.Error):void} onError Callback to be called on
  *     error.
  */
 remoting.HostController.prototype.getConsent = function(onDone, onError) {
   this.hostDispatcher_.getUsageStatsConsent(onDone, onError);
 };
 
 /**
+ * @param {function(remoting.HostController.AsyncResult):void} onDone
+ * @param {function(remoting.Error):void} onError
+ * @return {void}
+ */
+remoting.HostController.prototype.installHost = function(onDone, onError) {
+  this.hostDispatcher_.installHost(onDone, onError);
+};
+
+/**
  * Registers and starts the host.
  *
  * @param {string} hostPin Host PIN.
  * @param {boolean} consent The user's consent to crash dump reporting.
  * @param {function():void} onDone Callback to be called when done.
  * @param {function(remoting.Error):void} onError Callback to be called on
  *     error.
  * @return {void} Nothing.
  */
 remoting.HostController.prototype.start = function(hostPin, consent, onDone,
@@ skipping 196 matching lines @@
 
   /**
    * @param {string} hostName
    * @return {void} Nothing.
    */
   function startWithHostname(hostName) {
     that.hostDispatcher_.generateKeyPair(onKeyGenerated.bind(null, hostName),
                                          onError);
   }
 
-  this.hostDispatcher_.getHostName(startWithHostname, onError);
+  /** @param {remoting.HostController.AsyncResult} asyncResult */
+  var onHostInstalled = function(asyncResult) {
+    if (asyncResult == remoting.HostController.AsyncResult.OK) {
+      console.log('Recreating the host dispatcher.');
+      that.hostDispatcher_ = that.createDispatcher();

[Jamie, 2014/04/10 18:29:32]

This is done in the ctor; does it need to be done again here?

[weitao, 2014/04/10 21:33:47]

Yes. Now that the host is installed, we need to get a new dispatcher that
dispatches to the NM host instead of the NPAPI plugin. I'll add a comment.

On 2014/04/10 18:29:32, Jamie wrote:

+      that.hostDispatcher_.getHostName(startWithHostname, onError);
+    } else if (asyncResult == remoting.HostController.AsyncResult.CANCELLED) {
+      onError(remoting.Error.CANCELLED);
+    } else {
+      onError(remoting.Error.UNEXPECTED);
+    }
+  }
+
+  // Perform the installation step here on Windows.
+  if (navigator.platform == 'Win32') {
+    this.installHost(onHostInstalled, onError);
+  } else {
+    this.hostDispatcher_.getHostName(startWithHostname, onError);
+  }
 };
 
 /**
  * Stop the daemon process.
  * @param {function():void} onDone Callback to be called when done.
  * @param {function(remoting.Error):void} onError Callback to be called on
  *     error.
  * @return {void} Nothing.
  */
 remoting.HostController.prototype.stop = function(onDone, onError) {
@@ skipping 156 matching lines @@
 /**
  * Returns true if the NPAPI plugin is being used.
  * @return {boolean}
  */
 remoting.HostController.prototype.usingNpapiPlugin = function() {
   return this.hostDispatcher_.usingNpapiPlugin();
 }
 
 /** @type {remoting.HostController} */
 remoting.hostController = null;