xshell 1.0.79 → 1.0.81

package/file.d.ts

@@ -179,23 +179,26 @@ export interface ZipOptions {
         files: boolean;
     };
 }
-/** 将文件夹压缩为 zip
-    返回 fp_zip 或压缩包数据
+/** 将文件夹或文件列表压缩为 zip，返回生成的压缩包路径 (fp_zip)
     - data:
-        - 被压缩文件夹路径 (fpd_src: string) 或
-        - 文件索引对象 (entries: Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
-    - fp_zip?:
-        - 传压缩包完整路径时压缩到文件, 函数返回值为 Promise<zip 路径>
-        - 传 undefined 时压缩到内存, 函数返回值为 Promise<zip Uint8Array>
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - fp_zip: 生成的压缩包路径 (string)
     - options?:
         - dirname?: `fpd_src.fname` 传入 fpd_src 才生效，修改 zip 中顶层的文件夹的名字（需要以 / 结尾），如 'web/', 为空字符串时去掉顶层文件夹，不要多一个文件夹层级 (flat)
         - print?:
             - info?: `true` 开始压缩、压缩完成
             - files?: `true` 打印压缩文件列表 */
-export declare function fzip(entries: Record<string, string | Uint8Array>, fp_zip?: undefined, options?: ZipOptions): Promise<Uint8Array>;
-export declare function fzip(entries: Record<string, string | Uint8Array>, fp_zip: string, options?: ZipOptions): Promise<string>;
-export declare function fzip(fpd_src: string, fp_zip?: undefined, options?: ZipOptions): Promise<Uint8Array>;
-export declare function fzip(fpd_src: string, fp_zip: string, options?: ZipOptions): Promise<string>;
+export declare function fzip(data: string | Record<string, string | Uint8Array>, fp_zip: string, options?: ZipOptions): Promise<string>;
+/** 将文件夹或文件列表压缩为 zip，返回压缩包数据 (Uint8Array)
+    - data:
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - options?:
+        - print?:
+            - info?: `true` 开始压缩、压缩完成
+            - files?: `true` 打印压缩文件列表 */
+export declare function zip(data: string | Record<string, string | Uint8Array>, options?: ZipOptions): Promise<Buffer>;
 export declare let fwatchers: Record<string, fs.FSWatcher>;
 /** 跟踪文本文件追加的内容，类似 tail -f */
 export declare function ftail(fp: string, handler: (lines: string[]) => void | Promise<void>, { print }?: {

package/file.js

@@ -362,7 +362,31 @@ export async function flink(fp_real, fp_link, { junction = false, print = true }
     else
         fsp.symlink(fp_real, fp_link, is_fpd_real ? 'dir' : 'file');
 }
-export async function fzip(data, fp_zip, { dirname, print = { files: true, info: true } } = {}) {
+/** 将文件夹或文件列表压缩为 zip，返回生成的压缩包路径 (fp_zip)
+    - data:
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - fp_zip: 生成的压缩包路径 (string)
+    - options?:
+        - dirname?: `fpd_src.fname` 传入 fpd_src 才生效，修改 zip 中顶层的文件夹的名字（需要以 / 结尾），如 'web/', 为空字符串时去掉顶层文件夹，不要多一个文件夹层级 (flat)
+        - print?:
+            - info?: `true` 开始压缩、压缩完成
+            - files?: `true` 打印压缩文件列表 */
+export async function fzip(data, fp_zip, options) {
+    return _zip(data, fp_zip, options);
+}
+/** 将文件夹或文件列表压缩为 zip，返回压缩包数据 (Uint8Array)
+    - data:
+        - fpd_src: 被压缩文件夹路径 (string) 或
+        - entries: 文件列表 (Record<压缩后相对路径, 原文件绝对路径 (string) | 数据 (Uint8Array)>)
+    - options?:
+        - print?:
+            - info?: `true` 开始压缩、压缩完成
+            - files?: `true` 打印压缩文件列表 */
+export async function zip(data, options) {
+    return _zip(data, undefined, options);
+}
+async function _zip(data, fp_zip, { dirname, print = { files: true, info: true } } = {}) {
     let entries;
     let fpd_src;
     if (typeof data === 'string') {
@@ -376,12 +400,14 @@ export async function fzip(data, fp_zip, { dirname, print = { files: true, info:
         entries = Object.fromEntries((await flist(fpd_src, { print: false }))
             .map(fp => ([dirname + fp, fpd_src + fp])));
     }
-    else
+    else {
+        assert(!dirname, 'dirname 在传入 fpd_src 时才生效');
         entries = data;
+    }
     if (print.info)
         console.log(`开始压缩${fpd_src ? ` ${fpd_src}` : '文件索引'} -> ${fp_zip ? `${fp_zip}/${dirname || '{entries}'}` : '内存'}`);
     const { default: archiver } = await import('archiver');
-    let archive = archiver('zip', { zlib: { chunkSize: 16 * 2 ** 20 /* 16 MB */ } });
+    let archive = archiver('zip');
     let ostream = fp_zip ?
         fs.createWriteStream(fp_zip, { highWaterMark: 16 * 2 ** 20 /* 16 MB */ })
         :

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,15 +43,18 @@ async function request_retry(url, options, timeout, retries = 0, count = 0) {
         return await undici_request(url, options);
     }
     catch (error) {
-        if (count >= retries ||
-            error.name !== 'TimeoutError' && !['ECONNRESET', 'ETIMEDOUT', 'ESOCKETTIMEDOUT'].includes(error.cause?.code))
-            throw error;
-        else {
-            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
+            throw error;
     }
 }
 export async function request(url, options = {}) {
@@ -118,6 +121,12 @@ export async function request(url, options = {}) {
         })(),
         // todo: 强制手动处理重定向，来正确处理 cookie ?
         maxRedirections: redirect === 'follow' ? 5 : 0,
+        // 下面这些 timeout 都不是总的时间，没法用
+        // headersTimeout: timeout - 1000,
+        // 从收完 headers 开始算
+        // bodyTimeout: timeout - 1000,
+        // @ts-ignore 没有类型声明，实际可用
+        // connectTimeout: timeout - 1000,
         headers,
         // --- body
         body: (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.79",
+    "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,