From 623853f3f4da32d151aeb0bdab2887241eb97cfb Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Mon, 13 Jun 2016 15:50:18 -0700 Subject: [PATCH 1/3] Get demo working on Windows - Removed bin bash scripts in favor of npm scripts so they work cross-platform - Moved to use 127.0.0.1 as 0.0.0.0 doesn't work on Windows Note that this doesn't work with the current pty.js as it doesn't build on Windows. --- README.md | 2 +- bin/server | 4 ---- bin/test | 5 ----- demo/app.js | 4 ++-- package.json | 4 ++-- 5 files changed, 5 insertions(+), 14 deletions(-) delete mode 100755 bin/server delete mode 100755 bin/test diff --git a/README.md b/README.md index d6b40e3d..3db3c9f9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ npm install npm start ``` -Then open http://0.0.0.0:3000 in a web browser. +Then open http://127.0.0.1:3000 in a web browser. ## Addons diff --git a/bin/server b/bin/server deleted file mode 100755 index 91f32dba..00000000 --- a/bin/server +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env sh - -# Development server for xterm.js -node demo/app.js diff --git a/bin/test b/bin/test deleted file mode 100755 index d7d2ed24..00000000 --- a/bin/test +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/bash -# -# Testing script for xterm.js - -node_modules/.bin/mocha $@ diff --git a/demo/app.js b/demo/app.js index c48f6091..81fd92dd 100644 --- a/demo/app.js +++ b/demo/app.js @@ -22,7 +22,7 @@ app.ws('/bash', function(ws, req) { /** * Open bash terminal and attach it */ - var term = pty.spawn('bash', [], { + var term = pty.spawn(process.platform === 'win32' ? 'cmd.exe' : 'bash', [], { name: 'xterm-color', cols: 80, rows: 24, @@ -46,7 +46,7 @@ app.ws('/bash', function(ws, req) { }); var port = process.env.PORT || 3000, - host = '0.0.0.0'; + host = '127.0.0.1'; console.log('App listening to http://' + host + ':' + port); app.listen(port, host); diff --git a/package.json b/package.json index f1d3e577..e7b66bf8 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "chai": "3.5.0" }, "scripts": { - "start": "bash bin/server", - "test": "bash bin/test --recursive" + "start": "node demo/app.js", + "test": "node_modules/.bin/mocha --recursive" } } From 2aab58473eba519a503816f2d8100194db621b47 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 16 Jun 2016 16:31:01 -0700 Subject: [PATCH 2/3] Fix npm scripts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1b98517c..055ef340 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "docdash": "0.4.0" }, "scripts": { - "start": "bash bin/server", - "test": "bash bin/test --recursive", + "start": "node demo/app", + "test": "mocha --recursive", "build:docs": "node_modules/.bin/jsdoc -c jsdoc.json" } } From 15cf76c76719bc99a1c8de12d2e4a111d058e512 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 22 Jun 2016 20:43:41 -0700 Subject: [PATCH 3/3] Bind to 127.0.0.1 on Windows only --- README.md | 2 +- demo/app.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3db3c9f9..9720507d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ npm install npm start ``` -Then open http://127.0.0.1:3000 in a web browser. +Then open http://0.0.0.0:3000 in a web browser (use http://127.0.0.1:3000 is running under Windows). ## Addons diff --git a/demo/app.js b/demo/app.js index 81fd92dd..8661cc62 100644 --- a/demo/app.js +++ b/demo/app.js @@ -1,6 +1,7 @@ var express = require('express'); var app = express(); var expressWs = require('express-ws')(app); +var os = require('os'); var pty = require('pty.js'); app.use('/src', express.static(__dirname + '/../src')); @@ -46,7 +47,7 @@ app.ws('/bash', function(ws, req) { }); var port = process.env.PORT || 3000, - host = '127.0.0.1'; + host = os.platform() === 'win32' ? '127.0.0.1' : '0.0.0.0'; console.log('App listening to http://' + host + ':' + port); app.listen(port, host);