xshell 1.0.200 → 1.0.202

package/Terminal.d.ts

@@ -2,7 +2,7 @@ import '@xterm/xterm/css/xterm.css';
 import { Terminal as XTerminal } from '@xterm/xterm';
 import { FitAddon } from '@xterm/addon-fit';
 import { Model } from 'react-object-model';
-import type { Remote } from './net.browser.js';
+import type { Remote } from './net.browser.ts';
 export declare function Terminal({ font }: {
     font: string;
 }): import("react/jsx-runtime").JSX.Element;

package/Terminal.js

@@ -8,7 +8,7 @@ import { WebLinksAddon } from '@xterm/addon-web-links';
 // 没有 ui
 // import { SearchAddon } from '@xterm/addon-search'
 import { Model } from 'react-object-model';
-import { assert, defer, genid } from './utils.browser.js';
+import { assert, defer, genid } from "./utils.browser.js";
 export function Terminal({ font }) {
     let rterminal = useRef();
     useEffect(() => {

package/apps.d.ts

@@ -1,6 +1,6 @@
 import type { Readable } from 'stream';
 import type OSS from 'ali-oss';
-import { type CallOptions } from './process.js';
+import { type CallOptions } from './process.ts';
 export declare let npm: {
     bin: string;
     call(cwd: string, bin: string, args: string[], options?: CallOptions): Promise<import("./process.ts").CallResult<string>>;

package/apps.js

@@ -1,7 +1,7 @@
 import util from 'util';
-import { call_nodejs, platform, username } from './process.js';
-import { check } from './utils.js';
-import { path } from './path.js';
+import { call_nodejs, platform, username } from "./process.js";
+import { check } from "./utils.js";
+import { path } from "./path.js";
 export let npm = {
     bin: platform == 'win32' ? `C:/Users/${username}/AppData/Roaming/npm/node_modules/pnpm/bin/pnpm.cjs` : '/usr/bin/pnpm',
     async call(cwd, bin, args, options) {

package/builder.d.ts

@@ -1,5 +1,5 @@
 import type Webpack from 'webpack';
-import { Lock } from './utils.js';
+import { Lock } from './utils.ts';
 /** target web 时的 npm 包依赖管理
     有 productions 但无 devs 时，大部分情况是相同配置，因此在 dev 模式下会用 productions
     也可以手动设置 [ ] 禁用 fallback */

package/builder.js

@@ -1,8 +1,8 @@
 import { fileURLToPath } from 'url';
-import { noprint } from './process.js';
-import { Lock, check, filter_values, not_empty } from './utils.js';
-import { fcopy, fmkdir, fwrite } from './file.js';
-import { path } from './path.js';
+import { noprint } from "./process.js";
+import { Lock, check, filter_values, not_empty } from "./utils.js";
+import { fcopy, fmkdir, fwrite } from "./file.js";
+import { path } from "./path.js";
 const monaco_files = [
     'loader.js',
     'nls.messages.zh-cn.js',

package/file.js

@@ -1,9 +1,9 @@
 import { promises as fsp, default as fs } from 'fs';
 import { isUint8Array } from 'util/types';
-import { path } from './path.js';
-import { t } from './i18n/instance.js';
-import { to_json } from './prototype.js';
-import { check, Lock, WritableMemoryStream } from './utils.js';
+import { path } from "./path.js";
+import { t } from "./i18n/instance.js";
+import { to_json } from "./prototype.js";
+import { check, Lock, WritableMemoryStream } from "./utils.js";
 export { fsp };
 export const encodings = ['utf-8', 'gb18030', 'shift-jis', 'utf-16le'];
 export const ramdisk = fexists('T:/TEMP/', { print: false });

package/git.d.ts

@@ -1,10 +1,10 @@
-import { type CallOptions } from './process.js';
+import { type CallOptions } from './process.ts';
 export declare class Git {
     static exe: string;
     cwd: string;
     constructor(cwd: string);
     static init(cwd: string, print?: boolean): Promise<Git>;
-    static clone(repo: string, fpd: string, shallow?: boolean | string): Promise<void>;
+    static clone(repo: string, fpd: string, shallow?: boolean | string): Promise<Git>;
     call(args?: any[], { color, print, printers, throw_code, }?: {
         color?: boolean;
         print?: CallOptions['print'];

package/git.js

@@ -1,5 +1,5 @@
-import { call, print_no_command } from './process.js';
-import { fread, fmkdir } from './file.js';
+import { call, print_no_command } from "./process.js";
+import { fread, fmkdir } from "./file.js";
 export class Git {
     static exe = 'git';
     cwd;
@@ -13,14 +13,15 @@ export class Git {
     }
     static async clone(repo, fpd, shallow = false) {
         await fmkdir(fpd);
-        await new this(fpd)
-            .call([
+        let git = new this(fpd);
+        await git.call([
             'clone',
             ...typeof shallow === 'string' ? ['--branch', shallow, '--single-branch'] : [],
             ...shallow ? ['--depth', '1'] : [],
             repo,
             '.'
         ]);
+        return git;
     }
     async call(args = [], { color = true, print, printers, throw_code, } = {}) {
         return call(Git.exe, [

package/i18n/dict.d.ts

@@ -1,4 +1,4 @@
-import type { Language } from './index.js';
+import type { Language } from './index.ts';
 export declare class Dict {
     _dict: _Dict;
     constructor(_dict?: _Dict);

package/i18n/i18n-scan.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { program } from 'commander';
-import { path } from '../path.js';
-import { scanner } from './scanner/index.js';
-import { try_load_dict } from './utils.js';
+import { path } from "../path.js";
+import { scanner } from "./scanner/index.js";
+import { try_load_dict } from "./utils.js";
 (async function main() {
     program.name('i18n-scan')
         .option('-r, --rootdir [rootdir]', '根目录：默认为当前工作目录', path.normalize(process.cwd()))

package/i18n/index.d.ts

@@ -1,6 +1,6 @@
 import { type i18n as I18Next } from 'i18next';
 import type { Trans } from 'react-i18next';
-import { type _Dict, type Item } from './dict.js';
+import { type _Dict, type Item } from './dict.ts';
 export type Language = 'zh' | 'en' | 'ja' | 'ko';
 export declare const LANGUAGES: readonly ["zh", "en", "ja", "ko"];
 declare global {

package/i18n/index.js

@@ -1,5 +1,5 @@
 import { default as i18next } from 'i18next';
-import { Dict } from './dict.js';
+import { Dict } from "./dict.js";
 export const LANGUAGES = ['zh', 'en', 'ja', 'ko'];
 /**
     提供翻译文本功能，自动解析当前语言

package/i18n/instance.d.ts

@@ -1,4 +1,4 @@
-import { I18N } from './index.js';
+import { I18N } from './index.ts';
 export declare let i18n: I18N;
 declare const t: (text: string, options?: {
     language?: import("./index.ts").Language;

package/i18n/instance.js

@@ -1,4 +1,4 @@
-import { I18N } from './index.js';
+import { I18N } from "./index.js";
 import _dict from './dict.json' with { type: 'json' };
 export let i18n = new I18N(_dict);
 const { t, language } = i18n;

package/i18n/rwdict.d.ts

@@ -1,6 +1,6 @@
-import '../prototype.js';
-import type { Language } from './index.js';
-import { Dict, type Item, type _Dict } from './dict.js';
+import '../prototype.ts';
+import type { Language } from './index.ts';
+import { Dict, type Item, type _Dict } from './dict.ts';
 /** read write Dict for scanner */
 export declare class RWDict extends Dict {
     /** 更新词条 */

package/i18n/rwdict.js

@@ -1,5 +1,5 @@
-import '../prototype.js';
-import { Dict, } from './dict.js';
+import "../prototype.js";
+import { Dict, } from "./dict.js";
 /** read write Dict for scanner */
 export class RWDict extends Dict {
     /** 更新词条 */

package/i18n/scanner/index.d.ts

@@ -1,4 +1,4 @@
-import '../../prototype.js';
+import '../../prototype.ts';
 /** 默认 i18next 扫描配置 */
 declare const DEFAULT_CONFIG: {
     debug: boolean;

package/i18n/scanner/index.js

@@ -6,13 +6,13 @@ import cli_truncate from 'cli-truncate';
 import Vinyl from 'vinyl';
 import through2 from 'through2';
 import CliTable from 'cli-table3';
-import '../../prototype.js';
-import { path } from '../../path.js';
-import { map_stream } from '../../utils.js';
-import { LANGUAGES } from '../index.js';
-import { RWDict } from '../rwdict.js';
-import { try_load_dict } from '../utils.js';
-import { mix_parse_trans_from_string_by_babel } from './parser.js';
+import "../../prototype.js";
+import { path } from "../../path.js";
+import { map_stream } from "../../utils.js";
+import { LANGUAGES } from "../index.js";
+import { RWDict } from "../rwdict.js";
+import { try_load_dict } from "../utils.js";
+import { mix_parse_trans_from_string_by_babel } from "./parser.js";
 /** 默认 i18next 扫描配置 */
 const DEFAULT_CONFIG = {
     debug: false,

package/i18n/scanner/parser.d.ts

@@ -1,3 +1,3 @@
-import '../../prototype.js';
+import '../../prototype.ts';
 /** file:///D:/0/i18next-scanner/src/parser.js */
 export declare function mix_parse_trans_from_string_by_babel(parser: any): void;

package/i18n/scanner/parser.js

@@ -6,7 +6,7 @@ import babel_traverse from '@babel/traverse';
 const { default: traverse } = babel_traverse;
 import { parse } from '@babel/parser';
 import t from '@babel/types';
-import '../../prototype.js';
+import "../../prototype.js";
 // import { Checker } from './checker'
 /** file:///D:/0/i18next-scanner/src/parser.js */
 export function mix_parse_trans_from_string_by_babel(parser) {

package/i18n/utils.js

@@ -1,4 +1,4 @@
-import { fread_json } from '../file.js';
+import { fread_json } from "../file.js";
 export async function try_load_dict(fp_dict) {
     try {
         return await fread_json(fp_dict, { print: false });

package/index.d.ts

@@ -1,6 +1,6 @@
-export * from './path.js';
-export * from './prototype.js';
-export * from './utils.js';
-export * from './file.js';
-export * from './process.js';
-export * from './net.js';
+export * from './path.ts';
+export * from './prototype.ts';
+export * from './utils.ts';
+export * from './file.ts';
+export * from './process.ts';
+export * from './net.ts';

package/index.js

@@ -1,7 +1,7 @@
-export * from './path.js';
-export * from './prototype.js';
-export * from './utils.js';
-export * from './file.js';
-export * from './process.js';
-export * from './net.js';
+export * from "./path.js";
+export * from "./prototype.js";
+export * from "./utils.js";
+export * from "./file.js";
+export * from "./process.js";
+export * from "./net.js";
 //# sourceMappingURL=index.js.map

package/net.browser.d.ts

@@ -1,5 +1,5 @@
-import './prototype.browser.js';
-import { Lock } from './utils.browser.js';
+import './prototype.browser.ts';
+import { Lock } from './utils.browser.ts';
 export interface FullResponse<TBody extends ArrayBuffer | string> {
     status: number;
     headers: Headers;
@@ -197,7 +197,7 @@ export declare class Remote {
     disconnected: boolean;
     /** 使用 Uint8Array 作为参数更灵活 https://stackoverflow.com/a/74505197/7609214 */
     static parse<TData extends any[] = any[]>(buffer: Uint8Array): Message<TData>;
-    static pack({ id, func, data, done, error }: Message): Uint8Array;
+    static pack({ id, func, data, done, error }: Message): Uint8Array<ArrayBuffer>;
     /** 作为 websocket 连接发起方，传入 url 或 websocket，定义远程 Remote
         作为 websocket 连接接收方，不传 url 和 websocket，定义本地 Remote */
     constructor({ url, funcs, print, verbose, websocket, keeper, on_error, }?: {

package/net.browser.js

@@ -1,6 +1,6 @@
-import { t } from './i18n/instance.js';
-import './prototype.browser.js'; // to_time_str()
-import { assert, concat, genid, delay, Lock, encode, decode, timeout, check } from './utils.browser.js';
+import { t } from "./i18n/instance.js";
+import "./prototype.browser.js"; // to_time_str()
+import { assert, concat, genid, delay, Lock, encode, decode, timeout, check } from "./utils.browser.js";
 const drop_request_headers = new Set([
     // : 开头的 key
     // sec-*

package/net.d.ts

@@ -2,9 +2,9 @@ import { type Readable } from 'stream';
 import type { FormData } from 'undici';
 import type { WebSocket, CloseEvent, ErrorEvent } from 'ws';
 import type { Cookie, CookieJar, MemoryCookieStore } from 'tough-cookie';
-import './prototype.js';
-import type { Encoding } from './file.js';
-import { inspect, Lock } from './utils.js';
+import './prototype.ts';
+import type { Encoding } from './file.ts';
+import { inspect, Lock } from './utils.ts';
 export type { WebSocket };
 export declare const WebSocketConnecting = 0;
 export declare const WebSocketOpen = 1;
@@ -52,7 +52,7 @@ export interface RequestOptions {
     timeout?: number;
     auth?: BasicAuth | BearerAuth;
     cookies?: Record<string, string>;
-    redirect?: RequestRedirect;
+    redirect?: 'follow' | 'manual';
     decode?: boolean;
 }
 export interface RequestFullOptions extends RequestOptions {
@@ -257,7 +257,7 @@ export declare class Remote {
     disconnected: boolean;
     /** 使用 Uint8Array 作为参数更灵活 https://stackoverflow.com/a/74505197/7609214 */
     static parse<TData extends any[] = any[]>(buffer: Uint8Array): Message<TData>;
-    static pack({ id, func, data, done, error }: Message): Uint8Array;
+    static pack({ id, func, data, done, error }: Message): Uint8Array<ArrayBuffer>;
     /** 作为 websocket 连接发起方，传入 url 或 websocket，定义远程 Remote
         作为 websocket 连接接收方，不传 url 和 websocket，定义本地 Remote */
     constructor({ url, funcs, print, verbose, websocket, keeper, on_error, }?: {

package/net.js

@@ -1,9 +1,9 @@
 import zlib from 'zlib';
 import { buffer as stream_to_buffer, text as stream_to_text } from 'stream/consumers';
 import { isReadable } from 'stream';
-import { t } from './i18n/instance.js';
-import './prototype.js';
-import { inspect, concat, assert, genid, delay, Lock, encode, decode, pipe_with_error, map_values, unique, timeout, check } from './utils.js';
+import { t } from "./i18n/instance.js";
+import "./prototype.js";
+import { inspect, concat, assert, genid, delay, Lock, encode, decode, pipe_with_error, map_values, unique, timeout, check } from "./utils.js";
 export const WebSocketConnecting = 0;
 export const WebSocketOpen = 1;
 export const WebSocketClosing = 2;
@@ -37,7 +37,7 @@ const drop_request_headers = new Set([
     'transfer-encoding',
     'upgrade',
 ]);
-let proxy_agents = {};
+let agents = {};
 async function request_retry(url, options, _timeout, retries = 0, count = 0) {
     let { default: undici, request: undici_request } = await import('undici');
     undici_request ??= undici.request;
@@ -45,7 +45,9 @@ async function request_retry(url, options, _timeout, retries = 0, count = 0) {
         if (_timeout > 0) {
             // 设置给 undici 设置 timeout, signal 不一定管用，还是得自己兜底
             options.signal = AbortSignal.timeout(_timeout);
-            return await timeout(_timeout + 300 /* 为 undici 兜底 */, async () => undici.request(url, options));
+            return await timeout(_timeout + 300, // 为 undici 兜底
+            async () => undici.request(url, options), undefined, count >= retries // 只打印最后一次超时的错误，避免太多冗余输出
+            );
         }
         else
             return await undici.request(url, options);
@@ -89,7 +91,7 @@ export async function request(url, options = {}) {
     let 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',
         'accept-encoding': 'gzip, deflate, br',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
         'sec-ch-ua-platform': '"Windows"',
         'sec-ch-ua-platform-version': '"15.0.0"',
     };
@@ -121,12 +123,20 @@ export async function request(url, options = {}) {
     }
     let undici_options = {
         ...method ? { method } : {},
-        dispatcher: (() => {
-            if (proxy) {
-                if (proxy === true)
-                    proxy = MyProxy.socks5;
-                return proxy_agents[proxy] ??= new UndiciProxyAgent({ uri: proxy });
-            }
+        dispatcher: await (async () => {
+            const { default: { 
+            // @ts-ignore
+            ProxyAgent, Agent, interceptors } } = await import('undici');
+            if (proxy === true)
+                proxy = MyProxy.socks5;
+            return agents[`${proxy || 'direct'}.${redirect}`] ??= (() => {
+                let dispatcher = proxy ? new ProxyAgent({ uri: proxy }) : new Agent();
+                if (redirect === 'follow')
+                    dispatcher = dispatcher.compose(
+                    // todo: 强制手动处理重定向，来正确处理 cookie ?
+                    interceptors.redirect({ maxRedirections: 5 }));
+                return dispatcher;
+            })();
         })(),
         // todo: 强制手动处理重定向，来正确处理 cookie ?
         maxRedirections: redirect === 'follow' ? 5 : 0,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.200",
+    "version": "1.0.202",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -57,9 +57,9 @@
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.13",
-        "@typescript-eslint/eslint-plugin": "^8.15.0",
-        "@typescript-eslint/parser": "^8.15.0",
-        "@typescript-eslint/utils": "^8.15.0",
+        "@typescript-eslint/eslint-plugin": "^8.16.0",
+        "@typescript-eslint/parser": "^8.16.0",
+        "@typescript-eslint/utils": "^8.16.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
@@ -81,7 +81,7 @@
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
         "https-proxy-agent": "^7.0.5",
-        "i18next": "^23.16.8",
+        "i18next": "^24.0.2",
         "i18next-scanner": "^4.6.0",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
@@ -91,8 +91,8 @@
         "mime-types": "^2.1.35",
         "ora": "^8.1.1",
         "react": "^18.3.1",
-        "react-i18next": "^15.1.1",
-        "react-object-model": "^1.2.17",
+        "react-i18next": "^15.1.2",
+        "react-object-model": "^1.2.18",
         "resolve-path": "^1.4.0",
         "sass": "^1.81.0",
         "sass-loader": "^16.0.3",
@@ -100,12 +100,12 @@
         "strip-ansi": "^7.1.0",
         "style-loader": "^4.0.0",
         "through2": "^4.0.2",
-        "tough-cookie": "^5.0.0-rc.4",
+        "tough-cookie": "^5.0.0",
         "ts-loader": "^9.5.1",
         "tslib": "^2.8.1",
-        "typescript": "^5.6.3",
-        "ua-parser-js": "^2.0.0-rc.3",
-        "undici": "^6.21.0",
+        "typescript": "^5.7.2",
+        "ua-parser-js": "^2.0.0",
+        "undici": "^7.0.0-alpha.7",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.96.1",
@@ -126,7 +126,7 @@
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.13",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.9.1",
+        "@types/node": "^22.10.0",
         "@types/react": "^18.3.12",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/process.d.ts

@@ -1,8 +1,8 @@
 import { type ChildProcess } from 'child_process';
-import './prototype.js';
-import type { Encoding } from './file.js';
-import type { MyProxy } from './net.js';
-import { inspect } from './utils.js';
+import './prototype.ts';
+import type { Encoding } from './file.ts';
+import type { MyProxy } from './net.ts';
+import { inspect } from './utils.ts';
 export declare const exe_nodejs: string;
 export declare const platform: NodeJS.Platform;
 export declare const username: string;

package/process.js

@@ -1,8 +1,8 @@
 import { spawn } from 'child_process';
 import os from 'os';
-import { t } from './i18n/instance.js';
-import './prototype.js';
-import { inspect, DecoderStream, filter_values, assert } from './utils.js';
+import { t } from "./i18n/instance.js";
+import "./prototype.js";
+import { inspect, DecoderStream, filter_values, assert, check } from "./utils.js";
 export const exe_nodejs = process.execPath.fp;
 export const platform = os.platform();
 export const username = os.userInfo().username;
@@ -26,23 +26,38 @@ export async function start(exe, args = [], options = {}) {
     const { cwd, encoding = 'utf-8', detached = false, window: _window = true, envs, input, fp_stdin, fp_stdout, fp_stderr } = options;
     let { print = true, stdio = detached ? 'ignore' : 'pipe', proxy } = options;
     if (proxy === true) {
-        const { MyProxy } = await import('./net.js');
+        const { MyProxy } = await import("./net.js");
         proxy = MyProxy.socks5;
     }
     if (typeof stdio === 'string')
         stdio = [stdio, stdio, stdio];
     if (input)
         assert(!fp_stdin, 'input 和 fp_stdin 不能同时设置');
+    let opened_handles = [];
+    async function close_all_handles() {
+        await Promise.all(opened_handles.map(async (handle) => handle.close()));
+    }
     if (fp_stdin || fp_stdout || fp_stderr) {
-        const { fopen } = await import('./file.js');
+        const { fopen } = await import("./file.js");
+        async function open(fp, flags) {
+            try {
+                const handle = await fopen(fp, flags);
+                opened_handles.push(handle);
+                return handle.fd;
+            }
+            catch (error) {
+                await close_all_handles();
+                throw error;
+            }
+        }
         if (fp_stdin)
-            stdio[0] = (await fopen(fp_stdin, 'r')).fd;
+            stdio[0] = await open(fp_stdin, 'r');
         if (fp_stdout)
-            stdio[1] = (await fopen(fp_stdout, 'w')).fd;
+            stdio[1] = await open(fp_stdout, 'w');
         if (fp_stderr)
             stdio[2] = fp_stderr === fp_stdout
                 ? stdio[1]
-                : (await fopen(fp_stderr, 'w')).fd;
+                : await open(fp_stderr, 'w');
     }
     const options_ = {
         cwd,
@@ -78,12 +93,26 @@ export async function start(exe, args = [], options = {}) {
                 :
                     '')).blue);
     if (detached) {
-        assert(stdio.every(x => x === 'ignore' || typeof x === 'number'), '调用 start({ detached: true }) 时 stdio 只能是 fd 或者 ignore');
-        let child = spawn(exe, args, options_);
-        child.unref();
-        return child;
+        check(stdio.every(x => x === 'ignore' || typeof x === 'number'), '调用 start({ detached: true }) 时 stdio 只能是 fd 或者 ignore');
+        try {
+            let child = spawn(exe, args, options_);
+            child.unref();
+            return child;
+        }
+        finally {
+            if (opened_handles.length)
+                await close_all_handles();
+        }
+    }
+    let child;
+    try {
+        child = spawn(exe, args, options_);
+    }
+    catch (error) {
+        if (opened_handles.length)
+            await close_all_handles();
+        throw error;
     }
-    let child = spawn(exe, args, options_);
     // 防止 child spawn 失败时 crash nodejs 进程
     child.on('error', error => {
         console.error(error);
@@ -110,10 +139,12 @@ export async function start(exe, args = [], options = {}) {
     }
     if (input)
         child.stdin.end(input);
+    if (opened_handles.length)
+        await close_all_handles();
     return child;
 }
 export async function start_nodejs(js, args = [], options) {
-    return start(exe_nodejs, [js, ...args], options);
+    return start(exe_nodejs, ['--enable-source-maps', js, ...args], options);
 }
 export async function call(exe, args = [], options = {}) {
     const { encoding = 'utf-8', throw_code = true, printers, on_child } = options;

package/prototype.browser.js

@@ -1,7 +1,7 @@
 /** 在浏览器端修改 prototype，需要更加小心 */
 import byte_size from 'byte-size';
 import EmojiRegex from 'emoji-regex';
-import { t } from './i18n/instance.js';
+import { t } from "./i18n/instance.js";
 export const emoji_regex = EmojiRegex();
 export function to_method_property_descriptors(methods) {
     return Object.fromEntries(Object.entries(methods)

package/prototype.js

@@ -2,8 +2,8 @@ import byte_size from 'byte-size';
 import EmojiRegex from 'emoji-regex';
 import strip_ansi from 'strip-ansi';
 import chalk from 'chalk';
-import { to_fp, dirname, basename, extname } from './path.js';
-import { t } from './i18n/instance.js';
+import { to_fp, dirname, basename, extname } from "./path.js";
+import { t } from "./i18n/instance.js";
 chalk.level = 2;
 export const emoji_regex = EmojiRegex();
 export { chalk };

package/repl.d.ts

@@ -1,5 +1,5 @@
 import type { Context } from 'koa';
-import './prototype.js';
+import './prototype.ts';
 declare global {
     var __: any;
     var tstarted: Date;

package/repl.js

@@ -1,10 +1,10 @@
 import repl from 'repl';
 import process from 'process';
 import { fileURLToPath } from 'url';
-import { path } from './path.js';
-import { t } from './i18n/instance.js';
-import './prototype.js';
-import { delay, set_inspect_options } from './utils.js';
+import { path } from "./path.js";
+import { t } from "./i18n/instance.js";
+import "./prototype.js";
+import { delay, set_inspect_options } from "./utils.js";
 set_inspect_options();
 let server;
 /** 谨慎使用，webpack 打包后可能会变成 /d:/1/mod/node_modules/xshell/ 这样的编译期路径 */
@@ -28,7 +28,7 @@ export async function start_repl() {
         pollute_global(),
         (async () => {
             // --- http server
-            let { Server } = await import('./server.js');
+            let { Server } = await import('./server.ts');
             server = new Server({
                 name: 'repl',
                 http: true,

package/server.d.ts

@@ -14,7 +14,7 @@ declare module 'koa' {
     }
 }
 import type { UAParser } from 'ua-parser-js';
-import { Remote, type RequestOptions, type RawResponse } from './net.js';
+import { Remote, type RequestOptions, type RawResponse } from './net.ts';
 declare module 'http' {
     interface IncomingMessage {
         body?: Buffer;

package/server.js

@@ -6,10 +6,10 @@ import fs from 'fs';
 import { buffer as stream_to_buffer } from 'stream/consumers';
 import util from 'util';
 // --- my libs
-import { t } from './i18n/instance.js';
-import { request as _request, Remote } from './net.js';
-import { inspect, output_width, check, range_to_numbers, encode, filter_keys, filter_values, consume_stream, assert } from './utils.js';
-import { flist, fread, fstat } from './file.js';
+import { t } from "./i18n/instance.js";
+import { request as _request, Remote } from "./net.js";
+import { inspect, output_width, check, range_to_numbers, encode, filter_keys, filter_values, consume_stream, assert } from "./utils.js";
+import { flist, fread, fstat } from "./file.js";
 // ------------ my server
 export class Server {
     /** proxy 时需要丢弃的 resposne headers */

package/toaster.browser.js

@@ -1,5 +1,5 @@
 import './toaster.sass';
-import { delay } from './utils.browser.js';
+import { delay } from "./utils.browser.js";
 export let toaster = {
     messages: [],
     state: 'IDLE',

package/tsconfig.json

@@ -22,11 +22,12 @@
         
         
         // --- emit
-        "noEmit": true,
+        "noEmit": false,
         "declaration": true,
         "emitDeclarationOnly": false,
         "noEmitOnError": false,
         "listEmittedFiles": true,
+        "rewriteRelativeImportExtensions": true,
         
         // --- source maps
         "sourceMap": true,

package/utils.browser.d.ts

@@ -76,7 +76,7 @@ export declare class Lock<TResource = void> {
 }
 export declare function pause(milliseconds?: number): Promise<void>;
 /** 将字符串简单的编码为 utf-8 的 buffer (Uint8Array)。高频使用或者在流式处理时，考虑使用 TextEncoder 的 encodeInto 方法 */
-export declare function encode(str: string): Uint8Array;
+export declare function encode(str: string): Uint8Array<ArrayBufferLike>;
 /** 将 utf-8 buffer (Uint8Array) 简单的解码为 string。
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
@@ -90,7 +90,7 @@ export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;
 export declare function global_get<TReturn = any>(keypath: string): TReturn;
 export declare function invoke<TReturn = any>(obj: any, funcpath: string, args: any[]): TReturn;
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
-export declare function concat(arrays: ArrayBufferView[]): Uint8Array;
+export declare function concat(arrays: ArrayBufferView[]): Uint8Array<ArrayBuffer>;
 /** 时间间隔 (milliseconds) 格式化 */
 export declare function delta2str(delta: number): string;
 /** generate random id */

package/utils.browser.js

@@ -1,4 +1,4 @@
-import { t } from './i18n/instance.js';
+import { t } from "./i18n/instance.js";
 export const noop = () => { };
 /** value 不为 null 或 undefined */
 export const not_empty = (value) => value !== null && value !== undefined;

package/utils.d.ts

@@ -2,7 +2,7 @@ import { Writable, Transform, type Readable, type Duplex, type TransformCallback
 import util from 'util';
 import type { TimerOptions } from 'timers';
 import type Vinyl from 'vinyl';
-import './prototype.js';
+import './prototype.ts';
 export declare const noop: () => void;
 /** value 不为 null 或 undefined */
 export declare const not_empty: (value: any) => boolean;
@@ -53,8 +53,8 @@ export declare function get<TReturn = any>(obj: any, keypath: string): TReturn;
 export declare function global_get<TReturn = any>(keypath: string): TReturn;
 export declare function invoke<TReturn = any>(obj: any, funcpath: string, args: any[]): TReturn;
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
-export declare function concat(arrays: ArrayBufferView[]): Uint8Array;
-export declare function typed_array_to_buffer(view: ArrayBufferView): Buffer;
+export declare function concat(arrays: ArrayBufferView[]): Uint8Array<ArrayBuffer>;
+export declare function typed_array_to_buffer(view: ArrayBufferView): Buffer<ArrayBufferLike>;
 /** 时间间隔 (milliseconds) 格式化 */
 export declare function delta2str(delta: number): string;
 /** generate random id */
@@ -136,7 +136,7 @@ export declare class Lock<TResource = void> {
     request<TResult>(action: LockedAction<TResource, TResult>, signal?: AbortSignal): Promise<TResult>;
 }
 /** 将字符串简单的编码为 utf-8 的 buffer (Uint8Array)。高频使用或者在流式处理时，考虑使用 TextEncoder 的 encodeInto 方法 */
-export declare function encode(str: string): Uint8Array;
+export declare function encode(str: string): Uint8Array<ArrayBufferLike>;
 /** 将 utf-8 buffer (Uint8Array) 简单的解码为 string。
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
@@ -171,7 +171,7 @@ export declare function stream_to_lines(stream: Readable): AsyncGenerator<string
 export declare function pipe_with_error<TWritable extends Writable>(readable: Readable, writable: TWritable): TWritable;
 export declare class WritableMemoryStream extends Writable {
     chunks: Buffer[];
-    pbuffer: Deferred<Buffer>;
+    pbuffer: Deferred<Buffer<ArrayBufferLike>>;
     constructor();
     _write(chunk: Buffer, encoding: BufferEncoding, callback: (error?: Error) => void): void;
     _writev(chunks: {

package/utils.js

@@ -1,8 +1,8 @@
 import { Stream, Writable, Transform } from 'stream';
 import util from 'util';
 import timers from 'timers/promises';
-import { t } from './i18n/instance.js';
-import './prototype.js';
+import { t } from "./i18n/instance.js";
+import "./prototype.js";
 export const noop = () => { };
 /** value 不为 null 或 undefined */
 export const not_empty = (value) => value !== null && value !== undefined;

package/xshell.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 globalThis.tstarted = new Date();
-import { start_repl } from './repl.js';
+import { start_repl } from "./repl.js";
 start_repl();
 //# sourceMappingURL=xshell.js.map