feature: gritty: get rid of mock-require

Author: coderaiser

package.json

@@ -72,7 +72,6 @@
     "eslint-plugin-putout": "^30.0.2",
     "json-loader": "^0.5.4",
     "madrun": "^12.1.0",
-    "mock-require": "^3.0.2",
     "nodemon": "^3.0.1",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
     "putout": "^41.0.8",

server/gritty.js

@@ -20,11 +20,16 @@ const DIR_ROOT = `${__dirname}/..`;
 const terminalFn = currify(_terminalFn);
 const connectionWraped = wraptile(connection);
 
-const CMD = process.platform === 'win32' ? 'cmd.exe' : 'bash';
-const isDev = process.env.NODE_ENV === 'development';
+const getCMD = (overrides = {}) => {
+    const {platform = process.platform} = overrides;
+    
+    return platform === 'win32' ? 'cmd.exe' : 'bash';
+};
+
+const isDev = () => process.env.NODE_ENV === 'development';
 
 const getDist = () => {
-    if (isDev)
+    if (isDev())
         return '/dist-dev';
 
     return '/dist';
@@ -65,14 +70,21 @@ function _terminalFn(options, req, res, next) {
 
 function staticFn(req, res) {
     const file = path.normalize(DIR_ROOT + req.url);
+    
     res.sendFile(file, {
         dotfiles: 'allow',
     });
 }
 
-function createTerminal({command, env, cwd, cols, rows, pty = _pty}) {
-    cols = cols || 80;
-    rows = rows || 24;
+function createTerminal(overrides = {}) {
+    const {
+        command,
+        env,
+        cwd,
+        cols = 80,
+        rows = 24,
+        pty = _pty,
+    } = overrides;
 
     const [cmd, ...args] = stringArgv(command);
     const term = pty.spawn(cmd, args, {
@@ -129,7 +141,10 @@ 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.`);
@@ -139,18 +154,20 @@ function connection(options, socket) {
         term.write(msg);
     };
 
-    function onTerminal(params) {
-        params = params || {};
+    function onTerminal(overrides = {}) {
         const {
             env,
             rows,
             cols,
             cwd,
-        } = params;
+            platform,
+        } = overrides;
 
-        const command = params.command || options.command || CMD;
+        const command = overrides.command || options.command || getCMD({
+            platform,
+        });
 
-        const autoRestart = choose(params.autoRestart, options.autoRestart, {
+        const autoRestart = choose(overrides.autoRestart, options.autoRestart, {
             default: true,
         });
 

test/server/gritty.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const {stripVTControlCharacters} = require('node:util');
 const process = require('node:process');
 
 const {once} = require('node:events');
@@ -8,19 +9,15 @@ const {tryCatch} = require('try-catch');
 const {test, stub} = require('supertape');
 
 const currify = require('currify');
-const io = require('socket.io-client');
-const mockRequire = require('mock-require');
+const {io} = require('socket.io-client');
 const wait = require('@iocmd/wait');
 
 const serveOnce = require('serve-once');
 const gritty = require('../../');
 
 const {connect} = require('../before');
-
 const {request} = serveOnce(gritty);
 
-const {reRequire, stopAll} = mockRequire;
-
 test('gritty: listen: args: no', (t) => {
     const [error] = tryCatch(gritty.listen);
 
@@ -44,8 +41,6 @@ test('gritty: listen: args: auth', (t) => {
 
 test('gritty: server: dist-dev', async (t) => {
     process.env.NODE_ENV = 'development';
-    
-    const gritty = reRequire('../..');
     const {request} = serveOnce(gritty);
 
     const {status} = await request.get('/gritty/gritty.js');
@@ -156,22 +151,36 @@ test('gritty: server: terminal: parse args', async (t) => {
     const {port, done} = await connect();
     const socket = io(`http://localhost:${port}/gritty`);
 
-    mockRequire('node-pty', {
-        spawn: stub(),
+    await once(socket, 'connect');
+    socket.emit('terminal', {
+        command: 'bash -c "hello world"',
     });
 
+    const [data] = await once(socket, 'data');
+    socket.close();
+    done();
+    
+    t.match(data, 'bash: line 1: hello: command not found');
+    t.end();
+});
+
+test('gritty: server: terminal: platform', async (t) => {
+    const platform = 'win32';
+    const {port, done} = await connect();
+    const socket = io(`http://localhost:${port}/gritty`);
+    
     await once(socket, 'connect');
     socket.emit('terminal', {
-        command: 'bash -c "hello world"',
+        platform,
     });
 
     const [data] = await once(socket, 'data');
     socket.close();
     done();
 
-    stopAll();
+    const stripped = stripVTControlCharacters(data);
 
-    t.match(data, 'bash: line 1: hello: command not found');
+    t.equal(stripped, 'bash-5.2$ ');
     t.end();
 });
 
@@ -243,24 +252,6 @@ test('gritty: server: socket: auth: reject', async (t) => {
     t.end();
 });
 
-test('gritty: server: platform', (t) => {
-    const {platform} = process;
-    
-    Object.defineProperty(process, 'platform', {
-        value: 'win32',
-    });
-    
-    reRequire('../..');
-    
-    t.pass('set CMD');
-    
-    Object.defineProperty(process, 'platform', {
-        value: platform,
-    });
-    
-    t.end();
-});
-
 test('gritty: server: socket: authCheck', async (t) => {
     const auth = (connect, reject) => ({username, password}) => {
         if (username !== 'hello' || password !== 'world')