feat: add fontSize option #292

billchurch · Jul 30, 2022 · 5e78812 · 5e78812
1 parent 6fa65a3
commit 5e78812
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -107,6 +107,8 @@ docker run --name webssh2 -d -p 2222:2222 -v `pwd`/app/config.json:/usr/src/conf
 
 * **bellStyle** - _string_ - Style of terminal bell: ("sound"|"none"). **Default:** "sound". **Enforced Values:** "sound", "none"
 
+* **fontSize** - _integer_ - Size of terminal font. **Default:** "12".
+
 ## GET request vars
 
 * **port=** - _integer_ - port of SSH server (defaults to 22)
@@ -127,6 +129,8 @@ docker run --name webssh2 -d -p 2222:2222 -v `pwd`/app/config.json:/usr/src/conf
 
 * **bellStyle** - _string_ - Style of terminal bell: ("sound"|"none"). **Default:** "sound". **Enforced Values:** "sound", "none"
 
+* **fontSize** - _integer_ - Size of terminal font. **Default:** "12".
+
 ## Headers
 
 * **allowreplay** - _boolean_ - Allow use of password replay feature, example `allowreplay: true`

diff --git a/app/client/public/webssh2.bundle.js b/app/client/public/webssh2.bundle.js
diff --git a/app/client/src/js/index.ts b/app/client/src/js/index.ts
@@ -170,7 +170,13 @@ socket.on('connect', () => {
 
 socket.on(
   'setTerminalOpts',
-  (data: { cursorBlink: any; scrollback: any; tabStopWidth: any; bellStyle: any }) => {
+  (data: {
+    cursorBlink: boolean;
+    scrollback: number;
+    tabStopWidth: number;
+    bellStyle: 'none' | 'sound';
+    fontSize: number;
+  }) => {
     term.options = data;
   }
 );

diff --git a/app/server/routes.js b/app/server/routes.js
@@ -30,7 +30,7 @@ exports.connect = function connect(req, res) {
   let { host, port } = config.ssh;
   let { text: header, background: headerBackground } = config.header;
   let { term: sshterm, readyTimeout } = config.ssh;
-  let { cursorBlink, scrollback, tabStopWidth, bellStyle } = config.terminal;
+  let { cursorBlink, scrollback, tabStopWidth, bellStyle, fontSize } = config.terminal;
 
   // capture, assign, and validate variables
 
@@ -71,6 +71,8 @@ exports.connect = function connect(req, res) {
       validator.isInt(`${req.body.readyTimeout}`, { min: 1, max: 300000 })
     )
       readyTimeout = req.body.readyTimeout;
+    if (req.body.fontSize && validator.isInt(`${req.body.fontSize}`, { min: 1, max: 300000 }))
+      fontSize = req.body.fontSize;
   }
 
   if (req.method === 'GET') {
@@ -99,6 +101,8 @@ exports.connect = function connect(req, res) {
       validator.isInt(`${req.query.readyTimeout}`, { min: 1, max: 300000 })
     )
       readyTimeout = req.query.readyTimeout;
+    if (req.query?.fontSize && validator.isInt(`${req.query.fontSize}`, { min: 1, max: 300000 }))
+      fontSize = req.query.fontSize;
   }
 
   req.session.ssh = {
@@ -120,6 +124,7 @@ exports.connect = function connect(req, res) {
       scrollback,
       tabStopWidth,
       bellStyle,
+      fontSize,
     },
     allowreplay:
       config.options.challengeButton ||

diff --git a/app/server/socket.js b/app/server/socket.js
@@ -115,9 +115,9 @@ module.exports = function appSocket(socket) {
         `LOGIN user=${socket.request.session.username} from=${socket.handshake.address} host=${socket.request.session.ssh.host}:${socket.request.session.ssh.port}`
       );
       login = true;
+      socket.emit('setTerminalOpts', socket.request.session.ssh.terminal);
       socket.emit('menu');
       socket.emit('allowreauth', socket.request.session.ssh.allowreauth);
-      socket.emit('setTerminalOpts', socket.request.session.ssh.terminal);
       socket.emit('title', `ssh://${socket.request.session.ssh.host}`);
       if (socket.request.session.ssh.header.background)
         socket.emit('headerBackground', socket.request.session.ssh.header.background);