From a0a8003d608d180f551f3745f2fe1f747e35dc98 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 11 Dec 2018 09:06:50 -0800 Subject: [PATCH 1/3] Add unit tests debug target --- .gitignore | 1 - .vscode/launch.json | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .vscode/launch.json diff --git a/.gitignore b/.gitignore index 25e93d9b..b50ab2d9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ npm-debug.log /.idea/ .env build/ -.vscode/ .DS_Store fixtures/typings-test/*.js package-lock.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..1c3aaf0f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,23 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Unit Tests", + "cwd": "${workspaceRoot}", + "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha", + "windows": { + "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha.cmd" + }, + "runtimeArgs": [ + "--colors", + "--recursive", + "${workspaceRoot}/lib" + ], + "sourceMaps": true, + "outFiles": [ "${workspaceRoot}/lib/**/*.js" ], + "internalConsoleOptions": "openOnSessionStart" + } + ] +} From 943def1391e06f08488c574c681eb9ffd4aef474 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 11 Dec 2018 09:37:20 -0800 Subject: [PATCH 2/3] Add debug target for client, fix source maps in demo to point to ts --- .vscode/launch.json | 10 ++++++++++ demo/start.js | 5 +++++ package.json | 2 +- yarn.lock | 21 +++++---------------- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 1c3aaf0f..36008195 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,6 +18,16 @@ "sourceMaps": true, "outFiles": [ "${workspaceRoot}/lib/**/*.js" ], "internalConsoleOptions": "openOnSessionStart" + }, + { + "type": "chrome", + "request": "launch", + "name": "Demo", + "url": "http://0.0.0.0:3000", + "windows": { + "url": "http://127.0.0.1:3000" + }, + "webRoot": "${workspaceFolder}/" } ] } diff --git a/demo/start.js b/demo/start.js index ad9e9f2f..f53ae7cc 100644 --- a/demo/start.js +++ b/demo/start.js @@ -22,6 +22,11 @@ const clientConfig = { test: /\.tsx?$/, use: 'ts-loader', exclude: /node_modules/ + }, + { + test: /\.js$/, + use: ["source-map-loader"], + enforce: "pre" } ] }, diff --git a/package.json b/package.json index 4aef95af..d4c4099b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "nodemon": "1.10.2", "nyc": "^11.8.0", "sorcery": "^0.10.0", - "source-map-loader": "^0.2.3", + "source-map-loader": "^0.2.4", "ts-loader": "^4.5.0", "tslint": "^5.9.1", "tslint-consistent-codestyle": "^1.13.0", diff --git a/yarn.lock b/yarn.lock index db31bfe1..54fdb7bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3894,16 +3894,6 @@ loader-utils@^1.0.2, loader-utils@^1.1.0: emojis-list "^2.0.0" json5 "^0.5.0" -loader-utils@~0.2.2: - version "0.2.17" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" - integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g= - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - object-assign "^4.0.1" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -6039,14 +6029,13 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A== -source-map-loader@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.3.tgz#d4b0c8cd47d54edce3e6bfa0f523f452b5b0e521" - integrity sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw== +source-map-loader@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271" + integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ== dependencies: async "^2.5.0" - loader-utils "~0.2.2" - source-map "~0.6.1" + loader-utils "^1.1.0" source-map-resolve@^0.5.0, source-map-resolve@^0.5.1: version "0.5.2" From d7f284c676eb59ad917d23675e8e9917648b951c Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 11 Dec 2018 09:56:33 -0800 Subject: [PATCH 3/3] Add debug target for demo server, merge 2 start processes into one --- .vscode/launch.json | 13 +++- demo/server.js | 174 +++++++++++++++++++++++--------------------- demo/start.js | 4 +- package.json | 1 + 4 files changed, 105 insertions(+), 87 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 36008195..c7bf7381 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -22,12 +22,23 @@ { "type": "chrome", "request": "launch", - "name": "Demo", + "name": "Demo Client", "url": "http://0.0.0.0:3000", "windows": { "url": "http://127.0.0.1:3000" }, "webRoot": "${workspaceFolder}/" + }, + { + "type": "node", + "request": "launch", + "name": "Demo Server", + "runtimeExecutable": "npm", + "runtimeArgs": [ + "run", + "start-debug" + ], + "port": 9229 } ] } diff --git a/demo/server.js b/demo/server.js index ebe2f644..5ff9ca61 100644 --- a/demo/server.js +++ b/demo/server.js @@ -1,100 +1,106 @@ var express = require('express'); -var app = express(); -var expressWs = require('express-ws')(app); +var expressWs = require('express-ws'); var os = require('os'); var pty = require('node-pty'); -var terminals = {}, - logs = {}; +function startServer() { + var app = express(); + expressWs(app); -app.use('/build', express.static(__dirname + '/../build')); + var terminals = {}, + logs = {}; -app.get('/', function(req, res){ - res.sendFile(__dirname + '/index.html'); -}); + app.use('/build', express.static(__dirname + '/../build')); -app.get('/style.css', function(req, res){ - res.sendFile(__dirname + '/style.css'); -}); - -app.get('/dist/client-bundle.js', function(req, res){ - res.sendFile(__dirname + '/dist/client-bundle.js'); -}); - -app.post('/terminals', function (req, res) { - var cols = parseInt(req.query.cols), - rows = parseInt(req.query.rows), - term = pty.spawn(process.platform === 'win32' ? 'cmd.exe' : 'bash', [], { - name: 'xterm-color', - cols: cols || 80, - rows: rows || 24, - cwd: process.env.PWD, - env: process.env - }); - - console.log('Created terminal with PID: ' + term.pid); - terminals[term.pid] = term; - logs[term.pid] = ''; - term.on('data', function(data) { - logs[term.pid] += data; + app.get('/', function(req, res){ + res.sendFile(__dirname + '/index.html'); }); - res.send(term.pid.toString()); - res.end(); -}); -app.post('/terminals/:pid/size', function (req, res) { - var pid = parseInt(req.params.pid), - cols = parseInt(req.query.cols), - rows = parseInt(req.query.rows), - term = terminals[pid]; + app.get('/style.css', function(req, res){ + res.sendFile(__dirname + '/style.css'); + }); - term.resize(cols, rows); - console.log('Resized terminal ' + pid + ' to ' + cols + ' cols and ' + rows + ' rows.'); - res.end(); -}); + app.get('/dist/client-bundle.js', function(req, res){ + res.sendFile(__dirname + '/dist/client-bundle.js'); + }); -app.ws('/terminals/:pid', function (ws, req) { - var term = terminals[parseInt(req.params.pid)]; - console.log('Connected to terminal ' + term.pid); - ws.send(logs[term.pid]); + app.post('/terminals', function (req, res) { + var cols = parseInt(req.query.cols), + rows = parseInt(req.query.rows), + term = pty.spawn(process.platform === 'win32' ? 'cmd.exe' : 'bash', [], { + name: 'xterm-color', + cols: cols || 80, + rows: rows || 24, + cwd: process.env.PWD, + env: process.env + }); - function buffer(socket, timeout) { - let s = ''; - let sender = null; - return (data) => { - s += data; - if (!sender) { - sender = setTimeout(() => { - socket.send(s); - s = ''; - sender = null; - }, timeout); - } - }; - } - const send = buffer(ws, 5); + console.log('Created terminal with PID: ' + term.pid); + terminals[term.pid] = term; + logs[term.pid] = ''; + term.on('data', function(data) { + logs[term.pid] += data; + }); + res.send(term.pid.toString()); + res.end(); + }); - term.on('data', function(data) { - try { - send(data); - } catch (ex) { - // The WebSocket is not open, ignore + app.post('/terminals/:pid/size', function (req, res) { + var pid = parseInt(req.params.pid), + cols = parseInt(req.query.cols), + rows = parseInt(req.query.rows), + term = terminals[pid]; + + term.resize(cols, rows); + console.log('Resized terminal ' + pid + ' to ' + cols + ' cols and ' + rows + ' rows.'); + res.end(); + }); + + app.ws('/terminals/:pid', function (ws, req) { + var term = terminals[parseInt(req.params.pid)]; + console.log('Connected to terminal ' + term.pid); + ws.send(logs[term.pid]); + + function buffer(socket, timeout) { + let s = ''; + let sender = null; + return (data) => { + s += data; + if (!sender) { + sender = setTimeout(() => { + socket.send(s); + s = ''; + sender = null; + }, timeout); + } + }; } - }); - ws.on('message', function(msg) { - term.write(msg); - }); - ws.on('close', function () { - term.kill(); - console.log('Closed terminal ' + term.pid); - // Clean things up - delete terminals[term.pid]; - delete logs[term.pid]; - }); -}); + const send = buffer(ws, 5); -var port = process.env.PORT || 3000, - host = os.platform() === 'win32' ? '127.0.0.1' : '0.0.0.0'; + term.on('data', function(data) { + try { + send(data); + } catch (ex) { + // The WebSocket is not open, ignore + } + }); + ws.on('message', function(msg) { + term.write(msg); + }); + ws.on('close', function () { + term.kill(); + console.log('Closed terminal ' + term.pid); + // Clean things up + delete terminals[term.pid]; + delete logs[term.pid]; + }); + }); -console.log('App listening to http://' + host + ':' + port); -app.listen(port, host); + var port = process.env.PORT || 3000, + host = os.platform() === 'win32' ? '127.0.0.1' : '0.0.0.0'; + + console.log('App listening to http://' + host + ':' + port); + app.listen(port, host); +} + +module.exports = startServer; diff --git a/demo/start.js b/demo/start.js index f53ae7cc..78f1ff1d 100644 --- a/demo/start.js +++ b/demo/start.js @@ -8,9 +8,9 @@ const cp = require('child_process'); const path = require('path'); const webpack = require('webpack'); +const startServer = require('./server.js'); -// Launch server -cp.spawn('node', [path.resolve(__dirname, 'server.js')], { stdio: 'inherit' }); +startServer(); // Build/watch client source const clientConfig = { diff --git a/package.json b/package.json index d4c4099b..b9d1d34d 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ }, "scripts": { "start": "node demo/start", + "start-debug": "node --inspect-brk demo/start", "start-zmodem": "node demo/zmodem/app", "lint": "tslint 'src/**/*.ts' './demo/**/*.ts'", "pretest": "npm run layering",