gritty 9.0.3 → 10.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gritty",
-  "version": "9.0.3",
-  "type": "commonjs",
+  "version": "10.0.0",
+  "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Web terminal emulator",
   "bin": {
@@ -12,6 +12,10 @@
     "type": "git",
     "url": "git+https://github.com/cloudcmd/gritty.git"
   },
+  "imports": {
+    "#gritty/client": "./client/gritty.js",
+    "#gritty/server": "./server/gritty.js"
+  },
   "scripts": {
     "start": "madrun start",
     "start:dev": "madrun start:dev",
@@ -72,7 +76,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",

package/server/gritty.js

@@ -1,17 +1,16 @@
-'use strict';
-
-const process = require('node:process');
-
-const path = require('node:path');
-
-const log = require('debug')('gritty');
-const Router = require('router');
-
-const currify = require('currify');
-const wraptile = require('wraptile');
-const _pty = require('node-pty');
-
-const stringArgv = require('string-to-argv');
+import process from 'node:process';
+import path, {dirname} from 'node:path';
+import {fileURLToPath} from 'node:url';
+import debug from 'debug';
+import Router from 'router';
+import currify from 'currify';
+import wraptile from 'wraptile';
+import _pty from 'node-pty';
+import stringArgv from 'string-to-argv';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const log = debug('gritty');
 const isFn = (a) => typeof a === 'function';
 const isBool = (a) => typeof a === 'boolean';
 
@@ -20,11 +19,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';
@@ -40,7 +44,7 @@ const choose = (a, b, options) => {
     return options.default;
 };
 
-module.exports = (options = {}) => {
+export const gritty = (options = {}) => {
     const router = Router();
     const {prefix = '/gritty'} = options;
     
@@ -65,14 +69,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, {
@@ -91,7 +102,7 @@ function createTerminal({command, env, cwd, cols, rows, pty = _pty}) {
     return term;
 }
 
-module.exports.listen = (socket, options = {}) => {
+gritty.listen = (socket, options = {}) => {
     check(socket, options);
     
     const {prefix, auth} = options;
@@ -129,7 +140,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 +153,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,
         });