xshell 1.0.80 → 1.0.81

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.81",
     "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,19 +107,19 @@
         "@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.10.8",
+        "@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",
+        "@typescript-eslint/eslint-plugin": "^6.18.1",
+        "@typescript-eslint/parser": "^6.18.1",
         "eslint": "^8.56.0",
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-xlint": "^1.0.11"

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/utils.browser.d.ts

@@ -56,7 +56,7 @@ export declare function encode(str: string): Uint8Array;
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;

package/utils.d.ts

@@ -32,7 +32,7 @@ export declare function map_values<TValue, TNewValue>(obj: {
 /** 映射对象中的 keys, 返回新对象 */
 export declare function filter_keys<TObj>(obj: TObj, filter: (key: string) => any): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 1 | 0 | -1;
+export declare function strcmp(l: string, r: string): 0 | 1 | -1;
 /** 比较 1.10.02 这种版本号 */
 export declare function vercmp(l: string, r: string): number;
 export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;