xshell 1.0.28 → 1.0.30

package/.eslintrc.json

@@ -0,0 +1,175 @@
+{
+    "$schema": "./.eslintrc.schema.json",
+    
+    "root": true,
+    
+    "ignorePatterns": [
+        "**/*.d.ts"
+    ],
+    
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module",
+        "project": "./tsconfig.json",
+        "ecmaFeatures": {
+            "jsx": true
+        }
+    },
+    
+    "plugins": [
+        "@typescript-eslint",
+        "react",
+        "xlint"
+    ],
+    
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    },
+    
+    "env": {
+        "node": true,
+        "browser": true
+    },
+    
+    "rules": {
+        "xlint/fold-jsdoc-comments": "error",
+        
+        // 取代 nonblock-statement-body-position
+        "xlint/nonblock-statement-body-position-with-indentation": "error",
+        
+        "xlint/empty-bracket-spacing": "error",
+        
+        // a + b**c
+        "xlint/space-infix-ops-except-exponentiation": "error",
+        
+        "xlint/space-in-for-statement": "error",
+        
+        "xlint/jsx-no-redundant-parenthesis-in-return": "error",
+        
+        "xlint/keep-indent": "error",
+        
+        
+        "@typescript-eslint/semi": ["error", "never"],
+        "@typescript-eslint/no-extra-semi": "error",
+        "semi-style": ["error", "first"],
+        
+        // 使用 ===
+        "eqeqeq": "error",
+        
+        // 父类尽量返回 this 类型
+        "@typescript-eslint/prefer-return-this-type": "error",
+        
+        // 尽量使用 . 访问属性而不是 []
+        "@typescript-eslint/dot-notation": "error",
+        
+        // 必须 throw Error
+        "@typescript-eslint/no-throw-literal": "error",
+        
+        // ------------ async
+        // 返回 Promise 的函数一定要标记为 async 函数
+        "@typescript-eslint/promise-function-async": "error",
+        
+        // 不要 return await promise, 直接 return promise, 除非外面有 try catch
+        "@typescript-eslint/return-await": "error",
+        
+        // ------------ 括号
+        
+        // a => { } 而不是 (a) => { }
+        "arrow-parens": ["error", "as-needed", { "requireForBlockBody": false }],
+        
+        // 不要多余的大括号
+        // if (true)
+        //     console.log()
+        "curly": ["error", "multi"],
+        
+        // 简单属性不要冗余的大括号 <Component prop='simple-value' />
+        "react/jsx-curly-brace-presence": ["error", "never"],
+        
+        // ------------ 空格
+        
+        // { a, b } 这样的对象，大括号里面要有空格
+        "@typescript-eslint/object-curly-spacing": ["error", "always"],
+        
+        // [a, b, c]
+        "@typescript-eslint/comma-spacing": "error",
+        
+        // foo()
+        "@typescript-eslint/func-call-spacing": "error",
+        
+        // a => { } 中箭头左右两边空格
+        "arrow-spacing": ["error"],
+        
+        // 注释双斜杠后面要有空格
+        "spaced-comment": ["error", "always", { "markers": ["/"] }],
+        
+        // 函数声明中，名称后面要有空格
+        "@typescript-eslint/space-before-function-paren": "error",
+        
+        // { return true } 这样的 block 大括号里面要有空格
+        "block-spacing": ["error", "always"],
+        
+        // aaa: 123
+        "@typescript-eslint/key-spacing": ["error", { "beforeColon": false, "afterColon": true, "mode": "minimum" }],
+        
+        // aaa: string
+        "@typescript-eslint/type-annotation-spacing": "error",
+        
+        // if ()
+        "@typescript-eslint/keyword-spacing": ["error", { "before": true, "after": true }],
+        
+        // if (1) { }
+        "@typescript-eslint/space-before-blocks": "error",
+        
+        // case 1: ...
+        "switch-colon-spacing": "error",
+        
+        // <Hello name={firstname} />
+        "react/jsx-equals-spacing": ["error", "never"],
+        
+        // 不允许使用 tab
+        "no-tabs": "error",
+        
+        // 使用 \n 换行
+        "linebreak-style": ["error", "unix"],
+        
+        // 文件以 \n 结尾
+        "eol-last": ["error", "always"],
+        
+        // ------------ 引号
+        
+        // 用单引号
+        "jsx-quotes": ["error", "prefer-single"],
+        
+        // 用单引号
+        "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": false }],
+        
+        // 不要冗余的引号包裹属性
+        "quote-props": ["error", "as-needed", { "keywords": false, "unnecessary": true }],
+        
+        // ------------ 其它
+        // boolean 属性不要冗余的 ={true} <Component boolprop />
+        "react/jsx-boolean-value": ["error", "never"],
+        
+        // 没有 children 的 Component 写成闭合标签 <Component />
+        "react/self-closing-comp": "error",
+        
+        // 单行类型声明用 `,` 分割，多行类型声明结尾不要加分号
+        "@typescript-eslint/member-delimiter-style": ["error", {
+            "multiline": {
+                "delimiter": "none",
+                "requireLast": false
+            },
+            "singleline": {
+                "delimiter": "comma",
+                "requireLast": false
+            }
+        }],
+        
+        "@typescript-eslint/prefer-includes": "error",
+        
+        "@typescript-eslint/prefer-regexp-exec": "error"
+    }
+}

package/file.js

@@ -134,7 +134,7 @@ export async function flist(fpd, options = {}) {
             :
                 fp))).flat();
     else if (stats)
-        return Promise.all(fps.map(fp => fstat(absolute ? fp : fpd + fp)));
+        return Promise.all(fps.map(async (fp) => fstat(absolute ? fp : fpd + fp)));
     else
         return fps;
 }

package/i18n/rwdict.js

@@ -62,7 +62,7 @@ export class RWDict extends Dict {
                 console.error(`${`已存在 ${id} 词条:`.red} ${JSON.stringify(item)}`);
                 console.error(`${'M? '.yellow}${_translation.replace(/\n/g, '\\n')} → ${translation.replace(/\n/g, '\\n')}`);
                 if (!dryrun)
-                    console.error(`如要更新翻译请设置 { overwrite: true }，否则使用 i18n.t('text', { context: 'xxx' }) 标记文本以区分。\n`);
+                    console.error('如要更新翻译请设置 { overwrite: true }，否则使用 i18n.t(\'text\', { context: \'xxx\' }) 标记文本以区分。\n');
                 return;
             }
             else {

package/i18n/scanner/checker.js

@@ -5,14 +5,14 @@ let Trans = 0;
 function is_t(node) {
     if (types.isCallExpression(node)) {
         // t('chtext')
-        if (types.isIdentifier(node.callee) && node.callee.name === "t")
+        if (types.isIdentifier(node.callee) && node.callee.name === 't')
             return true;
         // i18n.t('chtext') | i18n.__('chtext')
         if (types.isMemberExpression(node.callee) &&
             types.isIdentifier(node.callee.object) &&
             types.isIdentifier(node.callee.property) &&
-            node.callee.object.name === "i18n" &&
-            (node.callee.property.name === "t" || node.callee.property.name === '__'))
+            node.callee.object.name === 'i18n' &&
+            (node.callee.property.name === 't' || node.callee.property.name === '__'))
             return true;
     }
     return false;
@@ -22,7 +22,7 @@ function is_trans(node) {
     return (types.isJSXElement(node) &&
         types.isJSXOpeningElement(node.openingElement) &&
         types.isJSXIdentifier(node.openingElement.name) &&
-        node.openingElement.name.name === "Trans");
+        node.openingElement.name.name === 'Trans');
 }
 const has_unmarked_chinese_characters = (str) => !t && !Trans && /[\u4e00-\u9fa5]/.test(str);
 export function Checker({ filepath }) {

package/i18n/scanner/parser.js

@@ -28,7 +28,7 @@ export function mix_parse_trans_from_string_by_babel(parser) {
                 return;
             const getLiteralValue = literal => {
                 if (t.isTemplateLiteral(literal))
-                    return literal.quasis.map(element => element.value.cooked).join("");
+                    return literal.quasis.map(element => element.value.cooked).join('');
                 return literal.value;
             };
             const attr = castArray(node.openingElement.attributes).reduce((acc, attribute) => {
@@ -53,26 +53,24 @@ export function mix_parse_trans_from_string_by_babel(parser) {
                             if (t.isLiteral(property.value))
                                 obj[property.key.name] = getLiteralValue(property.value);
                             else // Unable to get value of the property
-                                obj[property.key.name] = "";
+                                obj[property.key.name] = '';
                             return obj;
                         }, {});
-                        /**
-                        * 防止 count 被忽略，如
-                        * ```jsx
-                        * <Trans count={arr.length}>
-                        *  一二三{{ count: arr.length }}
-                        * </Trans>
-                        * ```
-                        */
+                        /** 防止 count 被忽略，如
+                            ```jsx
+                            <Trans count={arr.length}>
+                             一二三{{ count: arr.length }}
+                            </Trans>
+                            ``` */
                     }
-                    else if (name === "count")
+                    else if (name === 'count')
                         acc[name] = 0;
                 }
                 return acc;
             }, {});
             const transKey = trim(attr[i18nKey]);
-            const defaultsString = attr[defaultsKey] || "";
-            if (typeof defaultsString !== "string")
+            const defaultsString = attr[defaultsKey] || '';
+            if (typeof defaultsString !== 'string')
                 this.log(`defaults value must be a static string, saw ${defaultsString.yellow}`);
             // https://www.i18next.com/translation-function/essentials#overview-options
             const tOptions = attr.tOptions;
@@ -81,10 +79,10 @@ export function mix_parse_trans_from_string_by_babel(parser) {
                 defaultValue: defaultsString || nodes_to_string(node.children, filepath, on_error),
                 fallbackKey,
             };
-            if (Object.prototype.hasOwnProperty.call(attr, "count"))
+            if (Object.prototype.hasOwnProperty.call(attr, 'count'))
                 options.count = Number(attr.count) || 0;
-            if (Object.prototype.hasOwnProperty.call(attr, "ns")) {
-                if (typeof options.ns !== "string")
+            if (Object.prototype.hasOwnProperty.call(attr, 'ns')) {
+                if (typeof options.ns !== 'string')
                     this.log(`The ns attribute must be a string, saw ${attr.ns?.yellow}`);
                 options.ns = attr.ns;
             }
@@ -103,11 +101,11 @@ export function mix_parse_trans_from_string_by_babel(parser) {
             on_error(() => {
                 console.error('');
                 const { line, column } = (err && err.loc) || { line: 1, column: 1 };
-                console.error([filepath, line, column].join(":").yellow);
+                console.error([filepath, line, column].join(':').yellow);
                 console.error(`Unable to parse ${component?.blue} component.\n`.red);
                 if (!filepath)
                     console.error(String(code).red);
-                console.error(("    " + err.message).red);
+                console.error(('    ' + err.message).red);
             });
         }
         return this;
@@ -119,9 +117,9 @@ function nodes_to_string(nodes, filepath, onError) {
     nodes.forEach((node, i) => {
         if (t.isJSXText(node) || t.isStringLiteral(node)) {
             const value = node.value
-                .replace(/^[\r\n]+\s*/g, "") // remove leading spaces containing a leading newline character
-                .replace(/[\r\n]+\s*$/g, "") // remove trailing spaces containing a leading newline character
-                .replace(/[\r\n]+\s*/g, " "); // replace spaces containing a leading newline character with a single space character
+                .replace(/^[\r\n]+\s*/g, '') // remove leading spaces containing a leading newline character
+                .replace(/[\r\n]+\s*$/g, '') // remove trailing spaces containing a leading newline character
+                .replace(/[\r\n]+\s*/g, ' '); // replace spaces containing a leading newline character with a single space character
             if (!value)
                 return;
             memo += value;
@@ -139,7 +137,7 @@ function nodes_to_string(nodes, filepath, onError) {
                 onError(() => {
                     const { line, column } = (node.expression && node.expression.loc.start) || { line: 1, column: 1 };
                     console.error('');
-                    console.error([filepath, line, column].join(":").yellow);
+                    console.error([filepath, line, column].join(':').yellow);
                     console.error('Unsupported JSX expression. Only static values or {{interpolation}} blocks are supported.'.red);
                 });
         }

package/net.browser.js

@@ -188,12 +188,11 @@ export async function connect_websocket(url, { protocols, on_message, on_error,
                     console.log(`${websocket.url} ${t('已正常关闭')}`);
             else { // 异常关闭，认为发生了错误，进行错误处理
                 const error = new WebSocketConnectionError(websocket, event, `${t('连接被关闭')}, code: ${event.code}${event.reason ? `, ${t('原因')}: ${event.reason}` : ''}`);
-                if (settled) {
+                if (settled)
                     if (on_error)
                         on_error(error, websocket);
                     else // 既然用户不传 on_error, 就当 unhandled error 抛出来
                         throw error;
-                }
                 else {
                     settled = true;
                     reject(error);
@@ -205,12 +204,11 @@ export async function connect_websocket(url, { protocols, on_message, on_error,
             // https://blog.insiderattack.net/promises-next-ticks-and-immediates-nodejs-event-loop-part-3-9226cbe7a6aa
             // close 的错误信息比较多，这里延后触发 error 事件，放到微任务队列之后的 timers 队列中
             setTimeout(() => {
-                if (settled) {
+                if (settled)
                     if (on_error)
                         on_error(error, websocket);
                     else // 既然用户不传 on_error, 就当 unhandled error 抛出来
                         throw error;
-                }
                 else {
                     settled = true;
                     reject(error);
@@ -319,7 +317,7 @@ export class Remote {
     /** 幂等，保证 websocket 已连接，否则抛出异常，不需要手动调用，在其它方法中已默认自动重连
         作为接收方需要传入使用的 websocket 连接，确保这个这个连接的状态 */
     async connect(websocket) {
-        if (this.initiator) {
+        if (this.initiator)
             if (this.lwebsocket.resource?.readyState === WebSocket.OPEN)
                 return;
             else if (!this.url)
@@ -342,7 +340,6 @@ export class Remote {
                             on_error: this.on_error.bind(this)
                         });
                 });
-        }
         else if (websocket.readyState === WebSocket.OPEN)
             return;
         else

package/net.d.ts

@@ -17,7 +17,7 @@ export declare enum MyProxy {
 export declare const cookies: {
     store: MemoryCookieStore;
     jar: CookieJar;
-    get(domain_or_url: string, str?: boolean): Cookie[] | Promise<string> | Promise<Cookie[]>;
+    get(domain_or_url: string, str?: boolean): Cookie[] | Promise<Cookie[] | string>;
 };
 export { Cookie };
 export interface BasicAuth {

package/net.js

@@ -359,12 +359,11 @@ on_message, on_error, on_close }) {
         });
         websocket.addEventListener('error', event => {
             const error = new WebSocketConnectionError(websocket, event, event.error?.message);
-            if (settled) {
+            if (settled)
                 if (on_error)
                     on_error(error, websocket);
                 else // 既然用户不传 on_error, 就当 unhandled error 抛出来
                     throw error;
-            }
             else {
                 settled = true;
                 reject(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -45,9 +45,9 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.21.8",
-    "@babel/parser": "^7.21.8",
-    "@babel/traverse": "^7.21.5",
+    "@babel/core": "^7.22.1",
+    "@babel/parser": "^7.22.4",
+    "@babel/traverse": "^7.22.4",
     "@koa/cors": "^4.0.0",
     "@types/ws": "^8.5.4",
     "byte-size": "^8.1.1",
@@ -75,7 +75,7 @@
     "react": "^18.2.0",
     "react-i18next": "^12.3.1",
     "resolve-path": "^1.4.0",
-    "strip-ansi": "^7.0.1",
+    "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
     "tough-cookie": "^4.1.2",
     "tslib": "^2.5.2",
@@ -87,8 +87,8 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.21.5",
-    "@types/babel__traverse": "^7.18.5",
+    "@babel/types": "^7.22.4",
+    "@types/babel__traverse": "^7.20.0",
     "@types/byte-size": "^8.1.0",
     "@types/chardet": "^0.8.1",
     "@types/fs-extra": "^11.0.1",
@@ -96,16 +96,21 @@
     "@types/js-cookie": "^3.0.3",
     "@types/koa": "^2.13.6",
     "@types/koa-compress": "^4.0.3",
-    "@types/lodash": "^4.14.194",
-    "@types/node": "^20.2.1",
+    "@types/lodash": "^4.14.195",
+    "@types/node": "^20.2.5",
     "@types/qs": "^6.9.7",
-    "@types/react": "^18.2.6",
+    "@types/react": "^18.2.7",
     "@types/through2": "^2.0.38",
     "@types/tough-cookie": "^4.0.2",
     "@types/vinyl-fs": "^3.0.2",
-    "@types/vscode": "^1.78.0",
+    "@types/vscode": "^1.78.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.8",
+    "eslint": "^8.41.0",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-xlint": "^1.0.6",
     "source-map-loader": "^4.0.1",
-    "ts-loader": "^9.4.2"
+    "ts-loader": "^9.4.3"
   },
   "scripts": {
     "start": "node --title=xshell --inspect=0.0.0.0:8420 ./xshell.js",

package/process.js

@@ -181,7 +181,7 @@ export const exe_winterm = `C:/Users/${userInfo().username}/AppData/Local/Micros
     - args: 调用参数  call parameter
     - options?: WinTermOptions
 */
-export function term(exe, args = [], { cwd = 'd:/t/', print = true, title,
+export async function term(exe, args = [], { cwd = 'd:/t/', print = true, title,
 // env
  } = {}) {
     return start(exe_winterm, [

package/prototype.browser.js

@@ -260,8 +260,8 @@ Object.defineProperties(String.prototype, {
                 return this;
             let text_;
             text_ = this
-                .replace(new RegExp(cjk + `(['"])`, 'g'), '$1 $2')
-                .replace(new RegExp(`(['"])` + cjk, 'g'), '$1 $2')
+                .replace(new RegExp(cjk + '([\'"])', 'g'), '$1 $2')
+                .replace(new RegExp('([\'"])' + cjk, 'g'), '$1 $2')
                 .replace(/(["']+)\s*(.+?)\s*(["']+)/g, '$1$2$3')
                 .replace(new RegExp(cjk + '([\\+\\-\\*\\/=&\\\\\\|<>])([A-Za-z0-9])', 'g'), '$1 $2 $3')
                 .replace(new RegExp('([A-Za-z0-9])([\\+\\-\\*\\/=&\\\\\\|<>])' + cjk, 'g'), '$1 $2 $3');

package/prototype.js

@@ -282,8 +282,8 @@ if (!global.my_prototype_defined) {
                     return this;
                 let text_;
                 text_ = this
-                    .replace(new RegExp(cjk + `(['"])`, 'g'), '$1 $2')
-                    .replace(new RegExp(`(['"])` + cjk, 'g'), '$1 $2')
+                    .replace(new RegExp(cjk + '([\'"])', 'g'), '$1 $2')
+                    .replace(new RegExp('([\'"])' + cjk, 'g'), '$1 $2')
                     .replace(/(["']+)\s*(.+?)\s*(["']+)/g, '$1$2$3')
                     .replace(new RegExp(cjk + '([\\+\\-\\*\\/=&\\\\\\|<>])([A-Za-z0-9])', 'g'), '$1 $2 $3')
                     .replace(new RegExp('([A-Za-z0-9])([\\+\\-\\*\\/=&\\\\\\|<>])' + cjk, 'g'), '$1 $2 $3');

package/repl.js

@@ -311,6 +311,7 @@ export async function pollute_global() {
             if (mod?.__esModule)
                 return mod;
             let result = {};
+            // eslint-disable-next-line eqeqeq
             if (mod != null)
                 for (let k in mod)
                     if (Object.hasOwnProperty.call(mod, k))

package/server.js

@@ -122,9 +122,8 @@ export class Server {
             request.body = JSON.parse(req.body.toString());
         else if (ctx.is('application/x-www-form-urlencoded'))
             request.body = qs.parse(req.body.toString());
-        else if (ctx.is('multipart/form-data')) {
+        else if (ctx.is('multipart/form-data'))
             throw new Error('multipart/form-data is not supported');
-        }
         else
             request.body = req.body;
     }
@@ -300,7 +299,7 @@ export class Server {
                 assert(stats.size <= Number.MAX_SAFE_INTEGER);
                 let start = range[1] ? parseInt(range[1]) : undefined;
                 let end = range[2] ? parseInt(range[2]) : Number(stats.size) - 1;
-                if (typeof start == 'undefined') {
+                if (start === undefined) {
                     start = Number(stats.size) - end;
                     end = Number(stats.size) - 1;
                 }

package/utils.browser.d.ts

@@ -11,7 +11,8 @@ export interface Deferred<TValue> extends Promise<TValue> {
     reject(reason?: Error): void;
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值
-    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态 */
+    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态
+    注: 下面的方法不能标记为 aysnc function, 否则会对返回值再做一层 Promise.resolve() 导致 reject, resolve 属性丢失 */
 export declare function defer<TValue>(initial?: TValue): Deferred<TValue>;
 export interface LockedAction<TResource, TResult> {
     (resource: TResource): TResult | Promise<TResult>;

package/utils.browser.js

@@ -17,7 +17,9 @@ export async function timeout(milliseconds) {
     throw error;
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值
-    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态 */
+    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态
+    注: 下面的方法不能标记为 aysnc function, 否则会对返回值再做一层 Promise.resolve() 导致 reject, resolve 属性丢失 */
+// eslint-disable-next-line @typescript-eslint/promise-function-async
 export function defer(initial) {
     if (initial === undefined) {
         let resolve;

package/utils.d.ts

@@ -51,7 +51,8 @@ export interface Deferred<TValue> extends Promise<TValue> {
     reject(reason?: Error): void;
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值
-    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态 */
+    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态
+    注: 下面的方法不能标记为 aysnc function, 否则会对返回值再做一层 Promise.resolve() 导致 reject, resolve 属性丢失 */
 export declare function defer<TValue>(initial?: TValue): Deferred<TValue>;
 export interface LockedAction<TResource, TResult> {
     (resource: TResource): TResult | Promise<TResult>;

package/utils.js

@@ -156,7 +156,9 @@ export async function timeout(milliseconds) {
     throw error;
 }
 /** 创建一个 promise，后续可调用 promise.resolve, promise.reject 方法设置其状态和值
-    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态 */
+    - initial?: `undefined` 传入非 undefined 值（包括 null）时直接设置为 resolved 状态
+    注: 下面的方法不能标记为 aysnc function, 否则会对返回值再做一层 Promise.resolve() 导致 reject, resolve 属性丢失 */
+// eslint-disable-next-line @typescript-eslint/promise-function-async
 export function defer(initial) {
     if (initial === undefined) {
         let resolve;