selenium-webdriver 2.47.0 → 2.52.0

package/remote/index.js

@@ -17,17 +17,19 @@
 
 'use strict';
 
-var AdmZip = require('adm-zip'),
+const AdmZip = require('adm-zip'),
+    AdmConstants = require('adm-zip/util/constants'),
     fs = require('fs'),
     path = require('path'),
     url = require('url'),
     util = require('util');
 
-var _base = require('../_base'),
-    webdriver = require('../'),
-    promise = require('../').promise,
-    httpUtil = require('../http/util'),
+const httpUtil = require('../http/util'),
     exec = require('../io/exec'),
+    cmd = require('../lib/command'),
+    input = require('../lib/input'),
+    promise = require('../lib/promise'),
+    webdriver = require('../lib/webdriver'),
     net = require('../net'),
     portprober = require('../net/portprober');
 
@@ -38,6 +40,8 @@ var _base = require('../_base'),
  *
  * - `loopback` - Whether the service should only be accessed on this host's
  *     loopback address.
+ * - `hostname` - The host name to access the server on. If this option is
+ *     specified, the `loopback` option will be ignored.
  * - `port` - The port to start the server on (must be > 0). If the port is
  *     provided as a promise, the service will wait for the promise to resolve
  *     before starting.
@@ -51,11 +55,14 @@ var _base = require('../_base'),
  *     information, refer to the documentation of `child_process.spawn`.
  *
  * @typedef {{
- *   port: (number|!webdriver.promise.Promise.<number>),
- *   args: !(Array.<string>|webdriver.promise.Promise.<!Array.<string>>),
- *   path: (string|undefined),
- *   env: (!Object.<string, string>|undefined),
- *   stdio: (string|!Array.<string|number|!Stream|null|undefined>|undefined)
+ *   loopback: (boolean|undefined),
+ *   hostname: (string|undefined),
+ *   port: (number|!promise.Promise<number>),
+ *   args: !(Array<string>|promise.Promise<!Array<string>>),
+ *   path: (string|undefined|null),
+ *   env: (Object<string, string>|undefined),
+ *   stdio: (string|!Array<string|number|!stream.Stream|null|undefined>|
+ *           undefined)
  * }}
  */
 var ServiceOptions;
@@ -68,227 +75,235 @@ var ServiceOptions;
  * https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol.
  * Furthermore, the managed server should support multiple concurrent sessions,
  * so that this class may be reused for multiple clients.
- *
- * @param {string} executable Path to the executable to run.
- * @param {!ServiceOptions} options Configuration options for the service.
- * @constructor
  */
-function DriverService(executable, options) {
-
-  /** @private {string} */
-  this.executable_ = executable;
-
-  /** @private {boolean} */
-  this.loopbackOnly_ = !!options.loopback;
-
-  /** @private {(number|!webdriver.promise.Promise.<number>)} */
-  this.port_ = options.port;
-
+class DriverService {
   /**
-   * @private {!(Array.<string>|webdriver.promise.Promise.<!Array.<string>>)}
+   * @param {string} executable Path to the executable to run.
+   * @param {!ServiceOptions} options Configuration options for the service.
    */
-  this.args_ = options.args;
-
-  /** @private {string} */
-  this.path_ = options.path || '/';
-
-  /** @private {!Object.<string, string>} */
-  this.env_ = options.env || process.env;
-
-  /** @private {(string|!Array.<string|number|!Stream|null|undefined>)} */
-  this.stdio_ = options.stdio || 'ignore';
+  constructor(executable, options) {
+    /** @private {string} */
+    this.executable_ = executable;
+
+    /** @private {boolean} */
+    this.loopbackOnly_ = !!options.loopback;
+
+    /** @private {(string|undefined)} */
+    this.hostname_ = options.hostname;
+
+    /** @private {(number|!promise.Promise<number>)} */
+    this.port_ = options.port;
+
+    /**
+     * @private {!(Array<string>|promise.Promise<!Array<string>>)}
+     */
+    this.args_ = options.args;
+
+    /** @private {string} */
+    this.path_ = options.path || '/';
+
+    /** @private {!Object<string, string>} */
+    this.env_ = options.env || process.env;
+
+    /**
+     * @private {(string|!Array<string|number|!stream.Stream|null|undefined>)}
+     */
+    this.stdio_ = options.stdio || 'ignore';
+
+    /**
+     * A promise for the managed subprocess, or null if the server has not been
+     * started yet. This promise will never be rejected.
+     * @private {promise.Deferred<!exec.Command>}
+     */
+    this.command_ = null;
+
+    /**
+     * Promise that resolves to the server's address or null if the server has
+     * not been started. This promise will be rejected if the server terminates
+     * before it starts accepting WebDriver requests.
+     * @private {promise.Deferred<string>}
+     */
+    this.address_ = null;
+  }
 
   /**
-   * A promise for the managed subprocess, or null if the server has not been
-   * started yet. This promise will never be rejected.
-   * @private {promise.Promise.<!exec.Command>}
+   * @return {!promise.Promise<string>} A promise that resolves to
+   *    the server's address.
+   * @throws {Error} If the server has not been started.
    */
-  this.command_ = null;
+  address() {
+    if (this.address_) {
+      return this.address_.promise;
+    }
+    throw Error('Server has not been started.');
+  }
 
   /**
-   * Promise that resolves to the server's address or null if the server has
-   * not been started. This promise will be rejected if the server terminates
-   * before it starts accepting WebDriver requests.
-   * @private {promise.Promise.<string>}
+   * Returns whether the underlying process is still running. This does not take
+   * into account whether the process is in the process of shutting down.
+   * @return {boolean} Whether the underlying service process is running.
    */
-  this.address_ = null;
-}
-
-
-/**
- * The default amount of time, in milliseconds, to wait for the server to
- * start.
- * @type {number}
- */
-DriverService.DEFAULT_START_TIMEOUT_MS = 30 * 1000;
-
-
-/**
- * @return {!webdriver.promise.Promise.<string>} A promise that resolves to
- *    the server's address.
- * @throws {Error} If the server has not been started.
- */
-DriverService.prototype.address = function() {
-  if (this.address_) {
-    return this.address_;
+  isRunning() {
+    return !!this.address_;
   }
-  throw Error('Server has not been started.');
-};
-
-
-/**
- * Returns whether the underlying process is still running. This does not take
- * into account whether the process is in the process of shutting down.
- * @return {boolean} Whether the underlying service process is running.
- */
-DriverService.prototype.isRunning = function() {
-  return !!this.address_;
-};
-
 
-/**
- * Starts the server if it is not already running.
- * @param {number=} opt_timeoutMs How long to wait, in milliseconds, for the
- *     server to start accepting requests. Defaults to 30 seconds.
- * @return {!promise.Promise.<string>} A promise that will resolve
- *     to the server's base URL when it has started accepting requests. If the
- *     timeout expires before the server has started, the promise will be
- *     rejected.
- */
-DriverService.prototype.start = function(opt_timeoutMs) {
-  if (this.address_) {
-    return this.address_;
-  }
-
-  var timeout = opt_timeoutMs || DriverService.DEFAULT_START_TIMEOUT_MS;
-
-  var self = this;
-  this.command_ = promise.defer();
-  this.address_ = promise.defer();
-  this.address_.fulfill(promise.when(this.port_, function(port) {
-    if (port <= 0) {
-      throw Error('Port must be > 0: ' + port);
+  /**
+   * Starts the server if it is not already running.
+   * @param {number=} opt_timeoutMs How long to wait, in milliseconds, for the
+   *     server to start accepting requests. Defaults to 30 seconds.
+   * @return {!promise.Promise<string>} A promise that will resolve
+   *     to the server's base URL when it has started accepting requests. If the
+   *     timeout expires before the server has started, the promise will be
+   *     rejected.
+   */
+  start(opt_timeoutMs) {
+    if (this.address_) {
+      return this.address_.promise;
     }
-    return promise.when(self.args_, function(args) {
-      var command = exec(self.executable_, {
-        args: args,
-        env: self.env_,
-        stdio: self.stdio_
-      });
 
-      self.command_.fulfill(command);
+    var timeout = opt_timeoutMs || DriverService.DEFAULT_START_TIMEOUT_MS;
+
+    var self = this;
+    this.command_ = promise.defer();
+    this.address_ = promise.defer();
+    this.address_.fulfill(promise.when(this.port_, function(port) {
+      if (port <= 0) {
+        throw Error('Port must be > 0: ' + port);
+      }
+      return promise.when(self.args_, function(args) {
+        var command = exec(self.executable_, {
+          args: args,
+          env: self.env_,
+          stdio: self.stdio_
+        });
 
-      var earlyTermination = command.result().then(function(result) {
-        var error = result.code == null ?
-            Error('Server was killed with ' + result.signal) :
-            Error('Server terminated early with status ' + result.code);
-        self.address_.reject(error);
-        self.address_ = null;
-        self.command_ = null;
-        throw error;
-      });
+        self.command_.fulfill(command);
 
-      var serverUrl = url.format({
-        protocol: 'http',
-        hostname: !self.loopbackOnly_ && net.getAddress() ||
-            net.getLoopbackAddress(),
-        port: port,
-        pathname: self.path_
-      });
+        var earlyTermination = command.result().then(function(result) {
+          var error = result.code == null ?
+              Error('Server was killed with ' + result.signal) :
+              Error('Server terminated early with status ' + result.code);
+          self.address_.reject(error);
+          self.address_ = null;
+          self.command_ = null;
+          throw error;
+        });
+
+        var hostname = self.hostname_;
+        if (!hostname) {
+          hostname = !self.loopbackOnly_ && net.getAddress()
+              || net.getLoopbackAddress();
+        }
+
+        var serverUrl = url.format({
+          protocol: 'http',
+          hostname: hostname,
+          port: port,
+          pathname: self.path_
+        });
 
-      return new promise.Promise(function(fulfill, reject) {
-        var ready = httpUtil.waitForServer(serverUrl, timeout)
-            .then(fulfill, reject);
-        earlyTermination.thenCatch(function(e) {
-          ready.cancel(e);
-          reject(Error(e.message));
+        return new promise.Promise(function(fulfill, reject) {
+          var ready = httpUtil.waitForServer(serverUrl, timeout)
+              .then(fulfill, reject);
+          earlyTermination.thenCatch(function(e) {
+            ready.cancel(/** @type {Error} */(e));
+            reject(Error(e.message));
+          });
+        }).then(function() {
+          return serverUrl;
         });
-      }).then(function() {
-        return serverUrl;
       });
-    });
-  }));
+    }));
 
-  return this.address_;
-};
+    return this.address_.promise;
+  }
 
+  /**
+   * Stops the service if it is not currently running. This function will kill
+   * the server immediately. To synchronize with the active control flow, use
+   * {@link #stop()}.
+   * @return {!promise.Promise} A promise that will be resolved when
+   *     the server has been stopped.
+   */
+  kill() {
+    if (!this.address_ || !this.command_) {
+      return promise.fulfilled();  // Not currently running.
+    }
+    return this.command_.promise.then(function(command) {
+      command.kill('SIGTERM');
+    });
+  }
 
-/**
- * Stops the service if it is not currently running. This function will kill
- * the server immediately. To synchronize with the active control flow, use
- * {@link #stop()}.
- * @return {!webdriver.promise.Promise} A promise that will be resolved when
- *     the server has been stopped.
- */
-DriverService.prototype.kill = function() {
-  if (!this.address_ || !this.command_) {
-    return promise.fulfilled();  // Not currently running.
+  /**
+   * Schedules a task in the current control flow to stop the server if it is
+   * currently running.
+   * @return {!promise.Promise} A promise that will be resolved when
+   *     the server has been stopped.
+   */
+  stop() {
+    return promise.controlFlow().execute(this.kill.bind(this));
   }
-  return this.command_.then(function(command) {
-    command.kill('SIGTERM');
-  });
-};
+}
 
 
 /**
- * Schedules a task in the current control flow to stop the server if it is
- * currently running.
- * @return {!webdriver.promise.Promise} A promise that will be resolved when
- *     the server has been stopped.
+ * The default amount of time, in milliseconds, to wait for the server to
+ * start.
+ * @const {number}
  */
-DriverService.prototype.stop = function() {
-  return promise.controlFlow().execute(this.kill.bind(this));
-};
-
+DriverService.DEFAULT_START_TIMEOUT_MS = 30 * 1000;
 
 
 /**
  * Manages the life and death of the
  * <a href="http://selenium-release.storage.googleapis.com/index.html">
  * standalone Selenium server</a>.
- *
- * @param {string} jar Path to the Selenium server jar.
- * @param {SeleniumServer.Options=} opt_options Configuration options for the
- *     server.
- * @throws {Error} If the path to the Selenium jar is not specified or if an
- *     invalid port is specified.
- * @constructor
- * @extends {DriverService}
  */
-function SeleniumServer(jar, opt_options) {
-  if (!jar) {
-    throw Error('Path to the Selenium jar not specified');
-  }
+class SeleniumServer extends DriverService {
+  /**
+   * @param {string} jar Path to the Selenium server jar.
+   * @param {SeleniumServer.Options=} opt_options Configuration options for the
+   *     server.
+   * @throws {Error} If the path to the Selenium jar is not specified or if an
+   *     invalid port is specified.
+   */
+  constructor(jar, opt_options) {
+    if (!jar) {
+      throw Error('Path to the Selenium jar not specified');
+    }
 
-  var options = opt_options || {};
+    var options = opt_options || {};
 
-  if (options.port < 0) {
-    throw Error('Port must be >= 0: ' + options.port);
-  }
+    if (options.port < 0) {
+      throw Error('Port must be >= 0: ' + options.port);
+    }
 
-  var port = options.port || portprober.findFreePort();
-  var args = promise.when(options.jvmArgs || [], function(jvmArgs) {
-    return promise.when(options.args || [], function(args) {
-      return promise.when(port, function(port) {
-        return jvmArgs.concat(['-jar', jar, '-port', port]).concat(args);
+    var port = options.port || portprober.findFreePort();
+    var args = promise.when(options.jvmArgs || [], function(jvmArgs) {
+      return promise.when(options.args || [], function(args) {
+        return promise.when(port, function(port) {
+          return jvmArgs.concat(['-jar', jar, '-port', port]).concat(args);
+        });
       });
     });
-  });
-
-  DriverService.call(this, 'java', {
-    port: port,
-    args: args,
-    path: '/wd/hub',
-    env: options.env,
-    stdio: options.stdio
-  });
+
+    super('java', {
+      loopback: options.loopback,
+      port: port,
+      args: args,
+      path: '/wd/hub',
+      env: options.env,
+      stdio: options.stdio
+    });
+  }
 }
-util.inherits(SeleniumServer, DriverService);
 
 
 /**
  * Options for the Selenium server:
  *
+ * - `loopback` - Whether the server should only be accessed on this host's
+ *     loopback address.
  * - `port` - The port to start the server on (must be > 0). If the port is
  *     provided as a promise, the service will wait for the promise to resolve
  *     before starting.
@@ -302,13 +317,15 @@ util.inherits(SeleniumServer, DriverService);
  *     information, refer to the documentation of `child_process.spawn`.
  *
  * @typedef {{
- *   port: (number|!webdriver.promise.Promise.<number>),
- *   args: !(Array.<string>|webdriver.promise.Promise.<!Array.<string>>),
- *   jvmArgs: (!Array.<string>|
- *             !webdriver.promise.Promise.<!Array.<string>>|
+ *   loopback: (boolean|undefined),
+ *   port: (number|!promise.Promise<number>),
+ *   args: !(Array<string>|promise.Promise<!Array<string>>),
+ *   jvmArgs: (!Array<string>|
+ *             !promise.Promise<!Array<string>>|
  *             undefined),
- *   env: (!Object.<string, string>|undefined),
- *   stdio: (string|!Array.<string|number|!Stream|null|undefined>|undefined)
+ *   env: (!Object<string, string>|undefined),
+ *   stdio: (string|!Array<string|number|!stream.Stream|null|undefined>|
+ *           undefined)
  * }}
  */
 SeleniumServer.Options;
@@ -329,35 +346,33 @@ SeleniumServer.Options;
  * Java Selenium server. The file detector will fail if used with a server that
  * only supports standard WebDriver commands (such as the ChromeDriver).
  *
- * @constructor
- * @extends {webdriver.FileDetector}
  * @final
  */
-var FileDetector = function() {};
-util.inherits(webdriver.FileDetector, FileDetector);
-
-
-/** @override */
-FileDetector.prototype.handleFile = function(driver, filePath) {
-  return promise.checkedNodeCall(fs.stat, filePath).then(function(stats) {
-    if (stats.isDirectory()) {
-      throw TypeError('Uploading directories is not supported: ' + filePath);
-    }
-
-    var zip = new AdmZip();
-    zip.addLocalFile(filePath);
+class FileDetector extends input.FileDetector {
+  /** @override */
+  handleFile(driver, filePath) {
+    return promise.checkedNodeCall(fs.stat, filePath).then(function(stats) {
+      if (stats.isDirectory()) {
+        throw TypeError('Uploading directories is not supported: ' + filePath);
+      }
+
+      var zip = new AdmZip();
+      zip.addLocalFile(filePath);
+      zip.getEntries()[0].header.method = AdmConstants.STORED;
+
+      var command = new cmd.Command(cmd.Name.UPLOAD_FILE)
+          .setParameter('file', zip.toBuffer().toString('base64'));
+      return driver.schedule(command,
+          'remote.FileDetector.handleFile(' + filePath + ')');
+    }, function(err) {
+      if (err.code === 'ENOENT') {
+        return filePath;  // Not a file; return original input.
+      }
+      throw err;
+    });
+  }
+}
 
-    var command = new webdriver.Command(webdriver.CommandName.UPLOAD_FILE)
-        .setParameter('file', zip.toBuffer().toString('base64'));
-    return driver.schedule(command,
-        'remote.FileDetector.handleFile(' + filePath + ')');
-  }, function(err) {
-    if (err.code === 'ENOENT') {
-      return filePath;  // Not a file; return original input.
-    }
-    throw err;
-  });
-};
 
 // PUBLIC API