Add configuration for websocket timeout

src/browser/remote.ts

@@ -16,7 +16,8 @@ const config = <RemoteConfig>parseArgs(parseQuery());
 const channel = new Channel({
   url: config.serverUrl,
   sessionId: config.sessionId,
-  port: config.socketPort
+  port: config.socketPort,
+  timeout: config.socketTimeout
 });
 
 function displayMessage(message: string) {

src/lib/RemoteSuite.ts

@@ -191,7 +191,8 @@ export default class RemoteSuite extends Suite {
           runInSync: config.runInSync || false,
           serverUrl: serverUrl.href,
           sessionId: sessionId,
-          socketPort: server.socketPort
+          socketPort: server.socketPort,
+          socketTimeout: config.socketTimeout
         };
 
         // Do some pre-serialization of the options
@@ -239,7 +240,8 @@ export default class RemoteSuite extends Suite {
           reporters: true,
           serverUrl: true,
           sessionId: true,
-          socketPort: true
+          socketPort: true,
+          socketTimeout: true
         };
 
         // Pass all non-excluded keys to the remote config
@@ -304,4 +306,5 @@ export interface RemoteConfig extends Config {
   sessionId: string;
   runInSync: boolean;
   socketPort?: number;
+  socketTimeout?: number;
 }

src/lib/channels/WebSocket.ts

@@ -18,9 +18,9 @@ export default class WebSocketChannel extends BaseChannel {
 
   constructor(options: ChannelOptions) {
     super(options);
-
-    if (this.timeout == null) {
-      this.timeout = 10000;
+    this.timeout = 10000;
+    if (options.timeout !== undefined) {
+      this.timeout = options.timeout;
     }
 
     if (!options.port) {

src/lib/common/config.ts

@@ -302,6 +302,12 @@ export interface Config extends ResourceConfig {
    */
   socketPort?: number;
 
+  /**
+   * The number of milliseconds to wait before a websocket message is considered
+   * to be timed out.
+   */
+  socketTimeout?: number;
+
   /**
    * The Dig Dug tunnel class to use for WebDriver testing.
    *

src/lib/common/util.ts

@@ -664,7 +664,8 @@ export function processOption<C extends Config>(
     case 'heartbeatInterval':
     case 'maxConcurrency':
     case 'serverPort':
-    case 'socketPort': {
+    case 'socketPort':
+    case 'socketTimeout': {
       setOption(config, name, parseValue(name, value, 'number'));
       break;
     }

src/lib/executors/Node.ts

@@ -88,6 +88,7 @@ export default class Node extends Executor<NodeEvents, Config, NodePlugins> {
       serverPort: 9000,
       serverUrl: '',
       socketPort: 9001,
+      socketTimeout: 10000,
       tunnel: 'selenium',
       tunnelOptions: { tunnelId: String(Date.now()) }
     });

src/schemas/config.json

@@ -399,6 +399,12 @@
           "examples": [9001]
         },
 
+        "socketTimeout": {
+          "description": "The number of milliseconds to wait before a websocket message is considered to be timed out",
+          "type": "integer",
+          "examples": [10000]
+        },
+
         "suites": { "$ref": "#/definitions/suitesProperty" },
         "suites+": { "$ref": "#/definitions/suitesProperty+" },
 

tests/unit/lib/executors/Node.ts

@@ -723,6 +723,7 @@ registerSuite('lib/executors/Node', function() {
           maxConcurrency: numberTest('maxConcurrency'),
           serverPort: numberTest('serverPort'),
           socketPort: numberTest('socketPort'),
+          socketTimeout: numberTest('socketTimeout'),
 
           functionalBaseUrl: stringTest('functionalBaseUrl'),
           proxy: stringTest('proxy'),