Add host and port configuration to start-example server and the stand…

…alone client (#409)

examples/workflow-standalone/scripts/start-example-server.ts

@@ -23,8 +23,12 @@ const serverDirPath = path.resolve(__dirname, '..', 'server');
 async function run() {
     const serverFile = await downloadIfNecessary();
     console.log();
+
+    const port = parsePortArg();
+    const host = parseHostArg();
+
     sh.cd(serverDirPath);
-    sh.exec(`node ${serverFile} -w -p 8081`);
+    sh.exec(`node ${serverFile} -w --port ${port} --host ${host}`);
 }
 
 async function downloadIfNecessary(): Promise<string> {
@@ -72,4 +76,30 @@ async function downloadIfNecessary(): Promise<string> {
     return `${config.fileName}-${version}.js`;
 }
 
+function parsePortArg(): number {
+    let port = 8081;
+    const portIndex = process.argv.indexOf('--port');
+    if (portIndex >= 0) {
+        port = parseInt(process.argv[portIndex + 1]);
+    }
+    if(isNaN(port)) {
+        console.error('Invalid port number');
+        process.exit(1);
+    }
+    return port;
+}
+
+function parseHostArg(): string {
+    let host = 'localhost';
+    const hostIndex = process.argv.indexOf('--host');
+    if(hostIndex >= 0) {
+        host = process.argv[hostIndex + 1];
+    }
+    if(typeof host !== 'string') {
+        console.error('Invalid host');
+        process.exit(1);
+    }
+    return host;
+}
+
 run();

examples/workflow-standalone/src/app.ts

@@ -28,7 +28,8 @@ import { Container } from 'inversify';
 import { join, resolve } from 'path';
 import { MessageConnection } from 'vscode-jsonrpc';
 import createContainer from './di.config';
-const port = 8081;
+const host = GLSP_SERVER_HOST;
+const port = GLSP_SERVER_PORT;
 const id = 'workflow';
 const diagramType = 'workflow-diagram';
 
@@ -37,7 +38,7 @@ const currentDir = loc.substring(0, loc.lastIndexOf('/'));
 const examplePath = resolve(join(currentDir, '../app/example1.wf'));
 const clientId = 'sprotty';
 
-const webSocketUrl = `ws://localhost:${port}/${id}`;
+const webSocketUrl = `ws://${host}:${port}/${id}`;
 
 let glspClient: GLSPClient;
 let container: Container;

examples/workflow-standalone/src/globals.d.ts

@@ -0,0 +1,2 @@
+declare const GLSP_SERVER_HOST: string;
+declare const GLSP_SERVER_PORT: string;

examples/workflow-standalone/webpack.config.js

@@ -70,6 +70,10 @@ module.exports = {
         new webpack.ProvidePlugin({
             process: 'process/browser'
         }),
-        new webpack.WatchIgnorePlugin({ paths: [/\.js$/, /\.d\.ts$/] })
+        new webpack.WatchIgnorePlugin({ paths: [/\.js$/, /\.d\.ts$/] }),
+        new webpack.DefinePlugin({
+            GLSP_SERVER_HOST: JSON.stringify(process.env.GLSP_SERVER_HOST || 'localhost'),
+            GLSP_SERVER_PORT: JSON.stringify(process.env.GLSP_SERVER_PORT || '8081'),
+        })
     ]
 };