gritty 7.2.0 → 8.0.0

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "gritty",
-  "version": "7.2.0",
+  "version": "8.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Web terminal emulator",
-  "commitType": "colon",
   "bin": {
     "gritty": "bin/gritty.js"
   },
@@ -59,35 +58,34 @@
     "@babel/preset-env": "^7.0.0",
     "@iocmd/wait": "^2.1.0",
     "babel-loader": "^9.1.3",
-    "c8": "^8.0.1",
+    "c8": "^9.1.0",
     "clean-css-loader": "^4.1.1",
-    "coveralls": "^3.0.0",
     "css-loader": "^6.2.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
+    "css-minimizer-webpack-plugin": "^6.0.0",
     "css-modules-require-hook": "^4.0.6",
     "es6-promisify": "^7.0.0",
     "eslint": "^8.0.0-beta.0",
     "eslint-plugin-n": "^16.0.1",
-    "eslint-plugin-putout": "^19.0.3",
+    "eslint-plugin-putout": "^22.4.1",
     "json-loader": "^0.5.4",
-    "madrun": "^9.0.6",
+    "madrun": "^10.0.1",
     "mock-require": "^3.0.2",
     "nodemon": "^3.0.1",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "putout": "^31.0.3",
+    "putout": "^35.7.3",
     "request": "^2.81.0",
     "serve-once": "^2.0.0",
     "socket.io-client": "^4.0.0",
     "style-loader": "^3.2.1",
-    "supertape": "^8.1.0",
+    "supertape": "^10.4.0",
     "webpack": "^5.1.3",
     "webpack-cli": "^5.1.4",
-    "xterm": "^5.0.0",
-    "xterm-addon-fit": "^0.7.0",
-    "xterm-addon-webgl": "^0.15.0"
+    "@xterm/xterm": "^5.0.0",
+    "@xterm/addon-fit": "^0.9.0",
+    "@xterm/addon-webgl": "^0.17.0"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "license": "MIT",
   "publishConfig": {

package/server/gritty.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const process = require('node:process');
+const isFn = (a) => typeof a === 'function';
 const path = require('path');
 
 const log = require('debug')('gritty');
@@ -7,11 +9,11 @@ const Router = require('router');
 
 const currify = require('currify');
 const wraptile = require('wraptile');
-const pty = require('node-pty');
+const _pty = require('node-pty');
 const stringArgv = require('string-to-argv');
 const isBool = (a) => typeof a === 'boolean';
 
-const DIR_ROOT = __dirname + '/..';
+const DIR_ROOT = `${__dirname}/..`;
 
 const terminalFn = currify(_terminalFn);
 const connectionWraped = wraptile(connection);
@@ -38,11 +40,10 @@ const choose = (a, b, options) => {
 
 module.exports = (options = {}) => {
     const router = Router();
-    const {
-        prefix = '/gritty',
-    } = options;
+    const {prefix = '/gritty'} = options;
     
-    router.route(prefix + '/*')
+    router
+        .route(`${prefix}/*`)
         .get(terminalFn(options))
         .get(staticFn);
     
@@ -50,9 +51,7 @@ module.exports = (options = {}) => {
 };
 
 function _terminalFn(options, req, res, next) {
-    const {
-        prefix = '/gritty',
-    } = options;
+    const {prefix = '/gritty'} = options;
     
     req.url = req.url.replace(prefix, '');
     
@@ -67,7 +66,7 @@ function staticFn(req, res) {
     res.sendFile(file);
 }
 
-function createTerminal({command, env, cwd, cols, rows}) {
+function createTerminal({command, env, cwd, cols, rows, pty = _pty}) {
     cols = cols || 80;
     rows = rows || 24;
     
@@ -91,10 +90,7 @@ function createTerminal({command, env, cwd, cols, rows}) {
 module.exports.listen = (socket, options = {}) => {
     check(socket, options);
     
-    const {
-        prefix,
-        auth,
-    } = options;
+    const {prefix, auth} = options;
     
     socket
         .of(prefix || '/gritty')
@@ -115,7 +111,7 @@ function check(socket, options) {
     
     const {auth} = options;
     
-    if (auth && typeof auth !== 'function')
+    if (auth && !isFn(auth))
         throw Error('options.auth should be a function!');
 }
 
@@ -129,10 +125,7 @@ function connection(options, socket) {
     const onResize = (size) => {
         size = size || {};
         
-        const {
-            cols = 80,
-            rows = 25,
-        } = size;
+        const {cols = 80, rows = 25} = size;
         
         term.resize(cols, rows);
         log(`Resized terminal ${term.pid} to ${cols} cols and ${rows} rows.`);
@@ -152,6 +145,7 @@ function connection(options, socket) {
         } = params;
         
         const command = params.command || options.command || CMD;
+        
         const autoRestart = choose(params.autoRestart, options.autoRestart, {
             default: true,
         });
@@ -198,4 +192,3 @@ function connection(options, socket) {
         socket.on('disconnect', onDisconnect);
     }
 }
-