From 193d305dcd37537aa47758e580059ffd220b8723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Thu, 29 Sep 2022 10:36:08 +0200
Subject: [PATCH] revert timeout to 5ms, remove log in server.js

---
 demo/server.js                  | 17 +++--------------
 src/common/input/WriteBuffer.ts |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/demo/server.js b/demo/server.js
index c594da3e..0e82f9e9 100644
--- a/demo/server.js
+++ b/demo/server.js
@@ -16,8 +16,7 @@ function startServer() {
   var app = express();
   expressWs(app);
 
-  var terminals = {},
-      logs = {};
+  var terminals = {};
 
   app.use('/xterm.css', express.static(__dirname + '/../css/xterm.css'));
   app.get('/logo.png', (req, res) => {
@@ -55,10 +54,6 @@ function startServer() {
 
     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();
   });
@@ -77,7 +72,6 @@ function startServer() {
   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]);
 
     // unbuffered delivery after user input
     let userInput = false;
@@ -132,17 +126,13 @@ function startServer() {
         }
       };
     }
-    const send = (USE_BINARY ? bufferUtf8 : buffer)(ws, 2, 262144);
+    const send = (USE_BINARY ? bufferUtf8 : buffer)(ws, 5, 262144);
 
     // 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) {
-      try {
-        send(data);
-      } catch (ex) {
-        // The WebSocket is not open, ignore
-      }
+      send(data);
     });
     ws.on('message', function(msg) {
       term.write(msg);
@@ -153,7 +143,6 @@ function startServer() {
       console.log('Closed terminal ' + term.pid);
       // Clean things up
       delete terminals[term.pid];
-      delete logs[term.pid];
     });
   });
 
diff --git a/src/common/input/WriteBuffer.ts b/src/common/input/WriteBuffer.ts
index 4f316f24..8cb1edf4 100644
--- a/src/common/input/WriteBuffer.ts
+++ b/src/common/input/WriteBuffer.ts
@@ -106,7 +106,7 @@ export class WriteBuffer {
       this._bufferOffset = 0;
 
       // If this is the first write call after the user has done some input,
-      // parse it immediately in an upcoming microtask to minimize reduce input,
+      // parse it immediately to minimize reduce input,
       // otherwise schedule for the next event
       if (this._didUserInput) {
         this._didUserInput = false;