wip: [example-browser] Change backend startup method

appveyor.yml

@@ -24,7 +24,7 @@ build_script:
   - yarn
 
 test_script:
-  - yarn run test
+  - yarn run test:browser
 
 notifications:
   - provider: Webhook

examples/browser/test/main-page/main-page.ts

@@ -33,7 +33,7 @@ export class MainPage {
     }
 
     waitForStartup(): void {
-        this.driver.waitUntil(() => !this.driver.isExisting('.theia-preload'));
+        this.driver.waitUntil(() => this.driver.isExisting('.theia-preload'));
     }
 
     mainContentPanelExists(): boolean {

examples/browser/wdio.base.conf.js

@@ -2,8 +2,7 @@
 const http = require('http');
 const path = require('path');
 const temp = require('temp');
-
-const wdioRunnerScript = require.resolve('webdriverio/build/lib/runner.js');
+const cp = require('child_process');
 
 // Remove .track() if you'd like to keep the workspace and other temporary
 // files after running the tests.
@@ -190,24 +189,47 @@ function makeConfig(headless) {
         // resolved to continue.
         //
         // Gets executed once before all workers get launched.
-        onPrepare: function (config, capabilities) {
-            // Modify process.argv so that the server (which is in the
-            // master process) starts with a temporary directory as the
-            // workspace.
+        onPrepare: async function (config, capabilities) {
             const rootDir = temptrack.mkdirSync();
-            const argv = [process.argv[0], 'src-gen/backend/server.js', '--root-dir=' + rootDir];
-            return require('./src-gen/backend/server')(port, host, argv).then(created => {
-                this.execArgv = [wdioRunnerScript, cliPortKey, created.address().port,
+            const argv = ['--no-cluster', '--root-dir=' + rootDir, '--port=' + port.toString()];
+
+            let server;
+            try {
+                server = await new Promise((resolve, reject) => {
+                    const process = cp.fork('./src-gen/backend/main.js', argv);
+
+                    process.once('message', port => {
+                        resolve({
+                            process,
+                            port,
+                        });
+                    });
+
+                    process.once('error', error => {
+                        console.error(`An error happened within the Theia server process: ${error}`);
+                        reject(error);
+                    });
+                });
+            } catch (error) {
+                console.error('onPrepare ERROR:', error);
+                return undefined;
+            }
+            if (server) {
+                process.argv.push(cliPortKey, server.port,
                     '--theia-root-dir', rootDir
-                ];
-                this.server = created;
-            });
+                );
+                this.server = server.process;
+            }
         },
         // Gets executed after all workers got shut down and the process is about to exit. It is not
         // possible to defer the end of the process using a promise.
         onComplete: function (exitCode) {
             if (this.server) {
-                this.server.close();
+                try {
+                    this.server.kill();
+                } catch (error) {
+                    console.error(`Error when trying to kill the server process: ${error}`);
+                }
             }
         },
         //
@@ -257,19 +279,21 @@ function makeConfig(headless) {
             var fs = require("fs");
             let result;
             try {
-                result = browser.execute("return window.__coverage__;");
-            } catch (error) {
-                console.error(`Error retreiving the coverage: ${error}`);
+                result = browser.execute('return window.__coverage__;');
+            } catch (err) {
+                console.error(`Coverage report extraction failed: ${err}`);
                 return;
             }
             try {
-                if (!fs.existsSync('coverage')) {
-                    fs.mkdirSync('coverage');
+                if (result.value) {
+                    if (!fs.existsSync('coverage')) {
+                        fs.mkdirSync('coverage');
+                    }
+                    fs.writeFileSync('coverage/coverage.json', JSON.stringify(result.value));
                 }
-                fs.writeFileSync('coverage/coverage.json', JSON.stringify(result.value));
             } catch (err) {
-                console.error(`Error writing coverage ${err}`);
-            };
+                console.error(`Error writing coverage: ${err}`);
+            }
         },
         //
         // Gets executed after all tests are done. You still have access to all global variables from

package.json

@@ -40,10 +40,10 @@
     "typedoc": "^0.13.0",
     "typescript": "^3.1.3",
     "uuid": "^3.1.0",
-    "wdio-mocha-framework": "0.5.9",
-    "wdio-selenium-standalone-service": "0.0.8",
-    "wdio-spec-reporter": "0.1.0",
-    "webdriverio": "4.9.2"
+    "wdio-mocha-framework": "0.6.4",
+    "wdio-selenium-standalone-service": "0.0.11",
+    "wdio-spec-reporter": "0.1.5",
+    "webdriverio": "4.14.1"
   },
   "scripts": {
     "prepare": "yarn prepare:travis && yarn prepare:hoisting && yarn rebuild:clean && yarn build:clean",

packages/core/src/node/messaging/messaging-contribution.ts

@@ -173,7 +173,7 @@ export class MessagingContribution implements BackendApplicationContribution, Me
 
     protected createChannel(id: number, socket: ws): WebSocketChannel {
         return new WebSocketChannel(id, content => {
-            if (socket.readyState < ws.CLOSING) {
+            if (socket.readyState === ws.OPEN) {
                 socket.send(content, err => {
                     if (err) {
                         throw err;