From dd6a0553d85435e5025899fb332ab500c6782438 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Tue, 26 Apr 2022 12:36:31 -0600 Subject: [PATCH] Some additional cleanup --- core/client.js | 5 ----- core/servers/login/ssh.js | 2 -- core/servers/login/telnet.js | 4 +--- yarn.lock | 9 +-------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/core/client.js b/core/client.js index 8d17f953..9e0e2f82 100644 --- a/core/client.js +++ b/core/client.js @@ -87,13 +87,8 @@ function Client(/*input, output*/) { this.lastActivityTime = Date.now(); this.menuStack = new MenuStack(this); this.acs = new ACS( { client : this, user : this.user } ); - this.mciCache = {}; this.interruptQueue = new UserInterruptQueue(this); - this.clearMciCache = function() { - this.mciCache = {}; - }; - Object.defineProperty(this, 'currentTheme', { get : () => { if (this.currentThemeConfig) { diff --git a/core/servers/login/ssh.js b/core/servers/login/ssh.js index d1d8f19b..44e6588a 100644 --- a/core/servers/login/ssh.js +++ b/core/servers/login/ssh.js @@ -231,8 +231,6 @@ function SSHClient(clientConn) { if(termHeight > 0 && termWidth > 0) { self.term.termHeight = termHeight; self.term.termWidth = termWidth; - - self.clearMciCache(); // term size changes = invalidate cache } if(_.isString(info.term) && info.term.length > 0 && 'unknown' === self.term.termType) { diff --git a/core/servers/login/telnet.js b/core/servers/login/telnet.js index b3e13a8b..a9f5f745 100644 --- a/core/servers/login/telnet.js +++ b/core/servers/login/telnet.js @@ -128,7 +128,7 @@ class TelnetClient { const value = parseInt(getValue(what)); if (value) { this.term[what === 'ROWS' ? 'termHeight' : 'termWidth'] = value; - this.clearMciCache(); + this._logDebug( { [ what ] : value, source : 'NEW-ENVIRON' }, 'Window size updated' @@ -157,8 +157,6 @@ class TelnetClient { this.term.env.ROWS = height; } - this.clearMciCache(); - this._logDebug( { width, height, source : 'NAWS' }, 'Windows size updated' diff --git a/yarn.lock b/yarn.lock index 0aa2d6be..bcd3c96e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1231,7 +1231,7 @@ nan@^2.10.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA== -nan@^2.12.1, nan@^2.13.2, nan@^2.14.0: +nan@^2.12.1, nan@^2.14.0: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== @@ -2015,13 +2015,6 @@ xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= -xxhash@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/xxhash/-/xxhash-0.3.0.tgz#d20893a62c5b0f7260597dd55859b12a1e02c559" - integrity sha512-1ud2yyPiR1DJhgyF1ZVMt+Ijrn0VNS/wzej1Z8eSFfkNfRPp8abVZNV2u9tYy9574II0ZayZYZgJm8KJoyGLCw== - dependencies: - nan "^2.13.2" - yallist@^3.0.0, yallist@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"