xshell 1.0.80 → 1.0.82

package/i18n/dict.json

@@ -376,5 +376,8 @@
     },
     "不支持 content-encoding: {{encoding}} 的 http 请求": {
         "en": "http requests with content-encoding: {{encoding}} are not supported"
+    },
+    "等待 {{duration}} 秒后重试 request (已尝试 {{_count}} 次) …": {
+        "en": "Wait {{duration}} seconds before retrying request (tried {{_count}} times) …"
     }
 }

package/net.js

@@ -43,14 +43,16 @@ async function request_retry(url, options, timeout, retries = 0, count = 0) {
         return await undici_request(url, options);
     }
     catch (error) {
-        if (count < retries && (error.name === 'AbortError' || error.name === 'TimeoutError')) {
-            const duration = 2 ** count;
-            console.log(`${t('等待 {{duration}} 秒后重试 fetch ({{_count}}) …', { duration, _count: count }).yellow}  ${url.toString().blue.underline}`);
-            await delay(1000 * duration);
-            return request_retry(url, options, timeout, retries, count + 1);
+        if (error.name === 'TimeoutError') {
+            if (count < retries) {
+                const duration = 2 ** count;
+                console.log(`${t('等待 {{duration}} 秒后重试 request (已尝试 {{_count}} 次) …', { duration, _count: count + 1 }).yellow}  ${url.toString().blue.underline}`);
+                await delay(1000 * duration);
+                return request_retry(url, options, timeout, retries, count + 1);
+            }
+            else
+                throw Object.assign(new Error(`request 超时: ${url.toString()}`), { name: 'TimeoutError' });
         }
-        else if (error.name === 'AbortError' || error.name === 'TimeoutError')
-            throw Object.assign(new Error(`request 超时: ${url.toString()}`), { name: 'TimeoutError' });
         else
             throw error;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.80",
+    "version": "1.0.82",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -70,7 +70,7 @@
         "emoji-regex": "^10.3.0",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
-        "i18next": "^23.7.13",
+        "i18next": "^23.7.16",
         "i18next-scanner": "^4.4.0",
         "js-cookie": "^3.0.5",
         "koa": "^2.15.0",
@@ -89,7 +89,7 @@
         "tslib": "^2.6.2",
         "typescript": "^5.3.3",
         "ua-parser-js": "2.0.0-alpha.2",
-        "undici": "^6.2.1",
+        "undici": "^6.3.0",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "ws": "^8.16.0",
@@ -107,22 +107,17 @@
         "@types/chardet": "^0.8.3",
         "@types/gulp-sort": "2.0.4",
         "@types/js-cookie": "^3.0.6",
-        "@types/koa": "^2.13.12",
+        "@types/koa": "^2.14.0",
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.14.202",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^20.10.6",
-        "@types/react": "^18.2.46",
+        "@types/node": "^20.11.0",
+        "@types/react": "^18.2.47",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",
         "@types/vinyl-fs": "^3.0.5",
-        "@types/vscode": "^1.85.0",
-        "@typescript-eslint/eslint-plugin": "^6.17.0",
-        "@typescript-eslint/parser": "^6.17.0",
-        "eslint": "^8.56.0",
-        "eslint-plugin-react": "^7.33.2",
-        "eslint-plugin-xlint": "^1.0.11"
+        "@types/vscode": "^1.85.0"
     },
     "pnpm": {
         "patchedDependencies": {

package/process.d.ts

@@ -65,6 +65,16 @@ export interface CallResult<TOutput extends string | Buffer = string> {
     child: ChildProcess;
     [inspect.custom](): string;
 }
+export interface CallError {
+    result: {
+        pid: number;
+        stdout: string;
+        stderr: string;
+        code: number;
+        signal: number | NodeJS.Signals;
+        child: ChildProcess;
+    };
+}
 /** call process for result
     - exe: .exe 路径或文件名 (建议使用路径，跳过 path 搜索，性能更高)  path or filename (full path is recommanded to skip path searching for better perf)
     - args: `[]` 参数列表  arguments list

package/server.js

@@ -109,18 +109,22 @@ export class Server {
             // fpd_certs 文件夹下面的每个 .key 对应一个证书及域名
             (await flist(fpd_certs, { print: false, filter: /\.key$/ }))
                 .map(async (fname) => {
-                const domain = fname.slice(0, -'.key'.length);
+                let domain = fname.slice(0, -'.key'.length);
                 const [key, cert] = await Promise.all([
                     fname,
                     `${domain}.crt`,
                 ].map(async (fname) => fread(`${fpd_certs}${fname}`, { print: false })));
+                if (domain.startsWith('star.'))
+                    domain = `*.${domain.slice('star.'.length)}`;
                 return [domain, { key, cert }];
             })));
             const default_ctx = lazy_secure_ctxs[this.default_hostnames.find(hostname => hostname in lazy_secure_ctxs)];
             assert(default_ctx);
             this.http2_server = http2_create_server({
                 SNICallback(servername, callback) {
-                    let lazy_ctx = lazy_secure_ctxs[servername] || default_ctx;
+                    let lazy_ctx = lazy_secure_ctxs[servername] ||
+                        lazy_secure_ctxs[servername.replace(/^.*?\./, '*.')] ||
+                        default_ctx;
                     callback(null, lazy_ctx.ctx ??= createSecureContext(lazy_ctx));
                 },
                 allowHTTP1: true,

package/.eslintrc.json

@@ -1,186 +0,0 @@
-{
-    "$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",
-        
-        // 函数使用 function 来声明而不是 const foo = () => { }
-        "xlint/func-style": "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",
-        
-        // 禁止使用 export default
-        "no-restricted-exports": ["error", { "restrictDefaultExports": { "direct": true, "named": true, "defaultFrom": true, "namedFrom": true, "namespaceFrom": true } }],
-        
-        "@typescript-eslint/consistent-type-imports": ["error", { "fixStyle": "inline-type-imports", "disallowTypeAnnotations": false }],
-        
-        // () => { 返回 void 的表达式 }
-        "@typescript-eslint/no-confusing-void-expression": "error"
-    }
-}