Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Capture data between terminal creation and connected to terminal in demo #4194

Merged
merged 4 commits into from
Oct 15, 2022
Merged

Capture data between terminal creation and connected to terminal in demo #4194

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb91b01
Adds logs again in server.js
silamon Oct 9, 2022
8246440
Merge branch 'master' into fixmissingline
silamon Oct 15, 2022
a055948
unsentOutput instead of logs and dispose temporary listener
silamon Oct 15, 2022
cc82f60
delete clean up
silamon Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions demo/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ function startServer() {
var app = express();
expressWs(app);

var terminals = {};
var terminals = {},
unsentOutput = {},
temporaryDisposable = {};

app.use('/xterm.css', express.static(__dirname + '/../css/xterm.css'));
app.get('/logo.png', (req, res) => {
Expand Down Expand Up @@ -54,6 +56,10 @@ function startServer() {

console.log('Created terminal with PID: ' + term.pid);
terminals[term.pid] = term;
unsentOutput[term.pid] = '';
temporaryDisposable[term.pid] = term.onData(function(data) {
unsentOutput[term.pid] += data;
});
res.send(term.pid.toString());
res.end();
});
Expand All @@ -72,6 +78,10 @@ function startServer() {
app.ws('/terminals/:pid', function (ws, req) {
var term = terminals[parseInt(req.params.pid)];
console.log('Connected to terminal ' + term.pid);
temporaryDisposable[term.pid].dispose();
delete temporaryDisposable[term.pid];
ws.send(unsentOutput[term.pid]);
delete unsentOutput[term.pid];

// unbuffered delivery after user input
let userInput = false;
Expand Down Expand Up @@ -131,8 +141,12 @@ function startServer() {
// WARNING: This is a naive implementation that will not throttle the flow of data. This means
// it could flood the communication channel and make the terminal unresponsive. Learn more about
// the problem and how to implement flow control at https://xtermjs.org/docs/guides/flowcontrol/
term.on('data', function(data) {
send(data);
term.onData(function(data) {
try {
send(data);
} catch (ex) {
// The WebSocket is not open, ignore
}
});
ws.on('message', function(msg) {
term.write(msg);
Expand Down