xshell 1.0.28 → 1.0.31

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/index.js

@@ -6,7 +6,7 @@ export const LANGUAGES = ['zh', 'en', 'ja', 'ko'];
     提供翻译文本功能，自动解析当前语言
     @see https://github.com/ShenHongFei/xshell/tree/master/i18n
 */
-class I18N {
+export class I18N {
     static LANGUAGE_REGEXP = /^(zh|en|ja|jp|ko)$/;
     /** (ISO 639-1 标准语言代码) 可能取 zh, en, ja, ko */
     language;
@@ -116,5 +116,4 @@ class I18N {
         };
     }
 }
-export { I18N };
 //# sourceMappingURL=index.js.map

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

@@ -1,6 +1,18 @@
 import { t } from './i18n/instance.js';
 import './prototype.browser.js'; // to_time_str()
 import { assert, concat, genid, delay, Lock } from './utils.browser.js';
+// ------------------------------------ fetch, request
+const drop_request_headers = new Set([
+    // : 开头的 key
+    // sec-*
+    'accept-charset',
+    'connection',
+    'content-length',
+    'keep-alive',
+    'trailer',
+    'transfer-encoding',
+    'upgrade',
+]);
 async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
     try {
         options.signal = AbortSignal.timeout(timeout);
@@ -40,16 +52,16 @@ export async function request(url, { method, queries, headers: _headers, body, t
     if (_headers)
         if (_headers instanceof Headers)
             // @ts-ignore: ts 类型不支持，实际上已经有了
-            for (const [key, value] of _headers)
-                headers.set(key, value); // Headers 类型中不会有也不允许设置 :path 等 : 开头的 key
+            for (const [key, value] of _headers) {
+                if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key))
+                    headers.set(key, value);
+            }
         else
-            for (const key in _headers) {
-                const value = _headers[key];
-                if (!value.startsWith(':')) { // 可能在 http/2 的 response 中会有这样开头的保留 headers, 在透传时忽略比较好
+            for (const key in _headers)
+                if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key)) { // 可能在 http/2 的 response 中会有这样开头的保留 headers, 在透传时忽略比较好
                     assert(key === key.toLowerCase(), t('传入 request 的 headers 参数中 key 应该都是小写的，实际为 {{key}}', { key }));
-                    headers.set(key, value);
+                    headers.set(key, _headers[key]);
                 }
-            }
     let options = {
         ...method ? { method } : {},
         keepalive: true,
@@ -188,12 +200,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 +216,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 +329,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 +352,6 @@ export class Remote {
                             on_error: this.on_error.bind(this)
                         });
                 });
-        }
         else if (websocket.readyState === WebSocket.OPEN)
             return;
         else

package/net.d.ts

@@ -14,10 +14,11 @@ export declare enum MyProxy {
     socks5 = "http://localhost:10080",
     whistle = "http://localhost:8899"
 }
+export { Headers };
 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

@@ -9,7 +9,8 @@ export var MyProxy;
 (function (MyProxy) {
     MyProxy["socks5"] = "http://localhost:10080";
     MyProxy["whistle"] = "http://localhost:8899";
-})(MyProxy = MyProxy || (MyProxy = {}));
+})(MyProxy || (MyProxy = {}));
+export { Headers };
 // ------------------------------------ fetch, request
 let cookie_store = new MemoryCookieStore();
 export const cookies = {
@@ -31,6 +32,18 @@ export const cookies = {
     },
 };
 export { Cookie };
+/** 对于 request() 函数来说无意义的 headers，会自动过滤掉 */
+const drop_request_headers = new Set([
+    // : 开头的 key
+    // sec-*
+    'accept-charset',
+    'connection',
+    'content-length',
+    'keep-alive',
+    'trailer',
+    'transfer-encoding',
+    'upgrade',
+]);
 let proxy_agents = {};
 const fetch_cookie = make_fetch_cookie(fetch, cookies.jar, false);
 async function fetch_retry(url, options, timeout, retries = 0, count = 0) {
@@ -66,7 +79,7 @@ export async function request(url, { method, queries, headers: _headers, body, t
     // --- headers, http/2 开始都用小写的 headers
     let headers = new Headers({
         'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36',
     });
     if (body !== undefined)
         headers.set('content-type', type);
@@ -78,16 +91,16 @@ export async function request(url, { method, queries, headers: _headers, body, t
             .join('; '));
     if (_headers)
         if (_headers instanceof Headers)
-            for (const [key, value] of _headers)
-                headers.set(key, value); // Headers 类型中不会有也不允许设置 :path 等 : 开头的 key
+            for (const [key, value] of _headers) {
+                if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key))
+                    headers.set(key, value);
+            }
         else
-            for (const key in _headers) {
-                const value = _headers[key];
-                if (!value.startsWith(':')) { // 可能在 http/2 的 response 中会有这样开头的保留 headers, 在透传时忽略比较好
+            for (const key in _headers)
+                if (!key.startsWith(':') && !key.startsWith('sec-') && !drop_request_headers.has(key)) { // 可能在 http/2 的 response 中会有这样开头的保留 headers, 在透传时忽略比较好
                     assert(key === key.toLowerCase(), t('传入 request 的 headers 参数中 key 应该都是小写的，实际为 {{key}}', { key }));
-                    headers.set(key, value);
+                    headers.set(key, _headers[key]);
                 }
-            }
     let options = {
         ...method ? { method } : {},
         dispatcher: (() => {
@@ -359,12 +372,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.31",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -16,8 +16,8 @@
     "interactive programming"
   ],
   "engines": {
-    "node": ">=19.9.0",
-    "vscode": ">=1.77.0"
+    "node": ">=20.3.0",
+    "vscode": ">=1.79.0"
   },
   "author": "ShenHongFei <shen.hongfei@outlook.com> (https://github.com/ShenHongFei)",
   "publisher": "ShenHongFei",
@@ -45,24 +45,24 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.21.8",
-    "@babel/parser": "^7.21.8",
-    "@babel/traverse": "^7.21.5",
+    "@babel/core": "^7.22.6",
+    "@babel/parser": "^7.22.6",
+    "@babel/traverse": "^7.22.6",
     "@koa/cors": "^4.0.0",
-    "@types/ws": "^8.5.4",
+    "@types/ws": "^8.5.5",
     "byte-size": "^8.1.1",
-    "chalk": "^5.2.0",
-    "chardet": "^1.5.1",
+    "chalk": "^5.3.0",
+    "chardet": "^1.6.0",
     "cli-table3": "^0.6.3",
     "cli-truncate": "^3.1.0",
     "colors": "^1.4.0",
-    "commander": "^10.0.1",
+    "commander": "^11.0.0",
     "emoji-regex": "^10.2.1",
     "fetch-cookie": "^2.1.0",
     "fs-extra": "^11.1.1",
     "gulp-sort": "^2.0.0",
     "hash-string": "^1.0.0",
-    "i18next": "^22.5.0",
+    "i18next": "^23.2.7",
     "i18next-scanner": "^4.2.0",
     "js-cookie": "^3.0.5",
     "koa": "^2.14.2",
@@ -73,22 +73,22 @@
     "ora": "^6.3.1",
     "qs": "^6.11.2",
     "react": "^18.2.0",
-    "react-i18next": "^12.3.1",
+    "react-i18next": "^13.0.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",
-    "typescript": "^5.0.4",
+    "tough-cookie": "^4.1.3",
+    "tslib": "^2.6.0",
+    "typescript": "^5.1.6",
     "undici": "^5.22.1",
     "upath": "^2.0.1",
     "vinyl": "^3.0.0",
-    "vinyl-fs": "^3.0.3",
+    "vinyl-fs": "^4.0.0",
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.21.5",
-    "@types/babel__traverse": "^7.18.5",
+    "@babel/types": "^7.22.5",
+    "@types/babel__traverse": "^7.20.1",
     "@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.3.3",
     "@types/qs": "^6.9.7",
-    "@types/react": "^18.2.6",
+    "@types/react": "^18.2.14",
     "@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.79.1",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
+    "eslint": "^8.44.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.4"
   },
   "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

@@ -245,7 +245,7 @@ Object.defineProperties(String.prototype, {
             let indent = 0;
             for (; i < this.length; i++)
                 if (this[i] === ' ')
-                    indent += 1;
+                    indent++;
                 else if (this[i] === '\t')
                     indent += 4;
                 else
@@ -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

@@ -252,7 +252,7 @@ if (!global.my_prototype_defined) {
                 let indent = 0;
                 for (; i < this.length; i++)
                     if (this[i] === ' ')
-                        indent += 1;
+                        indent++;
                     else if (this[i] === '\t')
                         indent += 4;
                     else
@@ -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');
@@ -454,7 +454,7 @@ if (!global.my_prototype_defined) {
             },
             indent2to4() {
                 return this.split_indents()
-                    .map(line => ' '.repeat(Math.floor(line.indent / 2) * 4) + line.text);
+                    .map(line => ' '.repeat(line.indent * 2) + line.text);
             },
             join_lines(append = true) {
                 return `${this.join('\n')}${append ? '\n' : ''}`;

package/repl.js

@@ -273,7 +273,8 @@ export async function start_repl() {
         (async () => {
             // --- http server
             let { Server } = await import('./server.js');
-            server = new Server(8421, {
+            server = new Server({
+                port: 8421,
                 remote: new Remote({
                     funcs: {
                         echo({ data: [data] }) {
@@ -311,6 +312,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.d.ts

@@ -17,7 +17,7 @@ declare module 'koa' {
         };
     }
 }
-import { type Remote } from './net.js';
+import { type Remote, type Headers } from './net.js';
 declare module 'http' {
     interface IncomingMessage {
         body?: Buffer;
@@ -27,13 +27,16 @@ declare module 'http' {
     }
 }
 export declare class Server {
+    /** proxy 时需要丢弃的 resposne headers */
+    static drop_response_headers: Set<string>;
     app: Koa;
     handler: ReturnType<Koa['callback']>;
     port: number;
     server_http: HttpServer;
     server_ws?: WebSocketServer;
     remote?: Remote;
-    constructor(port: number, { remote }?: {
+    constructor({ port, remote }?: {
+        port?: number;
         remote?: Remote;
     });
     /** start http server and listen */
@@ -48,6 +51,8 @@ export declare class Server {
     _router(ctx: Context, next: Next): Promise<void>;
     router(ctx: Context): Promise<boolean>;
     logger(ctx: Context): void;
+    proxy(ctx: Context, url: string | URL, headers_?: Record<string, string>): Promise<void>;
+    static filter_response_headers(headers: Headers): {};
     try_send(ctx: Context, fp: string, { root, log_404, }: {
         root: string;
         log_404?: boolean;

package/server.js

@@ -1,6 +1,7 @@
 import { createServer as http_create_server } from 'http';
 import zlib from 'zlib';
 import { createReadStream } from 'fs';
+import { Readable } from 'stream';
 // --- 3rd party
 import upath from 'upath';
 import qs from 'qs';
@@ -11,18 +12,30 @@ import { default as Koa } from 'koa';
 import KoaCors from '@koa/cors';
 import KoaCompress from 'koa-compress';
 import { userAgent as KoaUserAgent } from 'koa-useragent';
+// --- my libs
+import { request as _request } from './net.js';
 import { stream_to_buffer, inspect, output_width, assert } from './utils.js';
 import { fstat } from './file.js';
 // ------------ my server
 export class Server {
+    /** proxy 时需要丢弃的 resposne headers */
+    static drop_response_headers = new Set([
+        // : 开头的 key
+        'connection',
+        'content-encoding',
+        'keep-alive',
+        'transfer-encoding',
+        'x-powered-by'
+    ]);
     app;
     handler;
     port;
     server_http;
     server_ws;
     remote;
-    constructor(port, { remote } = {}) {
-        this.port = port;
+    constructor({ port, remote } = {}) {
+        if (port !== undefined)
+            this.port = port;
         if (remote)
             this.remote = remote;
     }
@@ -122,9 +135,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;
     }
@@ -210,6 +222,45 @@ export class Server {
         // --- print log
         console.log(s);
     }
+    async proxy(ctx, url, headers_ = {}) {
+        const { request: { method, headers, query, body } } = ctx;
+        let { response } = ctx;
+        try {
+            const response_ = await _request(url, {
+                method: method,
+                queries: query,
+                body,
+                headers: {
+                    ...headers,
+                    ...headers_
+                },
+                raw: true,
+            });
+            response.status = response_.status;
+            response.set(Server.filter_response_headers(response_.headers));
+            response.body = Readable.fromWeb(response_.body);
+        }
+        catch (error) {
+            console.log(error);
+            if (error.response) {
+                const { status, headers, text } = error.response;
+                response.status = status;
+                response.set(Server.filter_response_headers(headers));
+                response.body = text;
+            }
+            else {
+                response.status = 500;
+                response.body = inspect(error, { colors: false });
+            }
+        }
+    }
+    static filter_response_headers(headers) {
+        let headers_ = {};
+        for (const [key, value] of headers)
+            if (!key.startsWith(':') && !this.drop_response_headers.has(key))
+                headers_[key] = value;
+        return headers_;
+    }
     async try_send(ctx, fp, { root, log_404, }) {
         const { request: { _path, path, method }, response, } = ctx;
         if (!(typeof response.body === 'undefined') || response.status !== 404)
@@ -300,7 +351,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

@@ -8,7 +8,7 @@ import './prototype.js';
 export declare const noop: () => void;
 /** `230` term 字符宽度 （实际上有 240） */
 export declare const output_width = 230;
-export declare function set_inspect_options(): void;
+export declare function set_inspect_options(colors?: boolean): void;
 export declare function assert(assertion: any, message?: string): never | void;
 export declare function dedent(templ: TemplateStringsArray | string, ...values: any[]): string;
 /** 数组或 iterable 去重（可按 selector 去重）
@@ -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

@@ -6,11 +6,11 @@ import './prototype.js';
 export const noop = () => { };
 /** `230` term 字符宽度 （实际上有 240） */
 export const output_width = 230;
-export function set_inspect_options() {
+export function set_inspect_options(colors = true) {
     util.inspect.defaultOptions.maxArrayLength = 40;
     util.inspect.defaultOptions.maxStringLength = 10000;
     util.inspect.defaultOptions.breakLength = output_width;
-    util.inspect.defaultOptions.colors = true;
+    util.inspect.defaultOptions.colors = colors;
     util.inspect.defaultOptions.compact = false;
     util.inspect.defaultOptions.getters = true;
     util.inspect.defaultOptions.depth = 2;
@@ -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;
@@ -266,7 +268,7 @@ export function inspect(obj, options = {}) {
 }
 (function (inspect) {
     inspect.custom = util.inspect.custom;
-})(inspect = inspect || (inspect = {}));
+})(inspect || (inspect = {}));
 // ------------------------------------ stream
 /** npm map-stream
     filter will reemit the data if cb(err,pass) pass is truthy