xshell 1.0.104 → 1.0.105

package/Terminal.d.ts

@@ -1,13 +1,13 @@
-import 'xterm/css/xterm.css';
-import { Terminal as XTermTerminal } from 'xterm';
-import { FitAddon } from 'xterm-addon-fit';
+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';
 export declare function Terminal({ font }: {
     font: string;
 }): import("react/jsx-runtime").JSX.Element;
 declare class TerminalModel extends Model<TerminalModel> {
-    term: XTermTerminal;
+    term: XTerminal;
     fit_addon: FitAddon;
     stdio_id: number;
     fit(): void;

package/Terminal.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import 'xterm/css/xterm.css';
+import '@xterm/xterm/css/xterm.css';
 import { useEffect, useRef } from 'react';
-import { Terminal as XTermTerminal } from 'xterm';
-import { FitAddon } from 'xterm-addon-fit';
-import { WebglAddon } from 'xterm-addon-webgl';
-import { WebLinksAddon } from 'xterm-addon-web-links';
+import { Terminal as XTerminal } from '@xterm/xterm';
+import { FitAddon } from '@xterm/addon-fit';
+import { WebglAddon } from '@xterm/addon-webgl';
+import { WebLinksAddon } from '@xterm/addon-web-links';
 // 没有 ui
 // import { SearchAddon } from 'xterm-addon-search'
 import { Model } from 'react-object-model';
@@ -14,7 +14,7 @@ export function Terminal({ font }) {
     useEffect(() => {
         (async () => {
             await document.fonts.ready;
-            let term = new XTermTerminal({
+            let term = new XTerminal({
                 fontFamily: font,
                 fontSize: 16,
                 cursorStyle: 'bar',

package/git.d.ts

@@ -33,22 +33,4 @@ export declare class Git {
     checkout(branch?: 'main'): Promise<void>;
     checkout(branch?: string): Promise<void>;
     _checkout(branch?: string): Promise<void>;
-    /** 返回是否进行了修改 */
-    merge(branch: string, fast_forward?: boolean): Promise<boolean>;
-    /** 记住当前分支名
-        checkout 到 <目标分支>
-        merge 当前分支 */
-    merge_into(target_branch?: string): Promise<void>;
-    /** 1. fetch 远程修改
-        2. checkout `<branch>` 分支
-        3. merge `<remote>/<branch>`
-        
-        执行前需要保证工作目录 clean
-        
-        - branch?: `'main'` */
-    update(branch?: 'main'): Promise<void>;
-    update(branch: string): Promise<void>;
-    update(branch: string, remote?: string): Promise<void>;
-    /** - message?: stash description */
-    stash(message?: string): Promise<import("./process.js").CallResult<string>>;
 }

package/git.js

@@ -1,4 +1,3 @@
-import { assert } from './utils.js';
 import { call } from './process.js';
 import { fread, fmkdir } from './file.js';
 export class Git {
@@ -121,56 +120,5 @@ export class Git {
             throw error;
         }
     }
-    /** 返回是否进行了修改 */
-    async merge(branch, fast_forward = true) {
-        console.log(`合并 ${branch} 分支`);
-        try {
-            const { stdout, stderr } = await this.call([
-                'merge',
-                branch,
-                ...fast_forward ? [] : ['--no-ff']
-            ], { print: false });
-            const unchanged = stdout === 'Already up to date.\n';
-            if (unchanged)
-                console.log('当前分支无需更新');
-            else
-                console.log(stdout.trimEnd());
-            if (stderr)
-                console.log(stderr);
-            return !unchanged;
-        }
-        catch (error) {
-            if (error.result) {
-                const { stdout, stderr } = error.result;
-                if (stdout)
-                    console.log(stdout);
-                if (stderr)
-                    console.log(stderr);
-            }
-            throw error;
-        }
-    }
-    /** 记住当前分支名
-        checkout 到 <目标分支>
-        merge 当前分支 */
-    async merge_into(target_branch = 'main') {
-        const branch = await this.get_branch();
-        assert(branch !== target_branch);
-        await this.checkout(target_branch);
-        await this.merge(branch, true);
-    }
-    async update(branch = 'main', remote) {
-        await this.fetch({ remote });
-        await this.checkout(branch);
-        await this.merge(`${remote || 'origin'}/${branch}`);
-    }
-    /** - message?: stash description */
-    async stash(message) {
-        return this.call([
-            'stash',
-            'push',
-            ...message ? ['--message', message] : [],
-        ]);
-    }
 }
 //# sourceMappingURL=git.js.map

package/i18n/README.md

@@ -266,7 +266,6 @@ npm i eslint eslint-plugin-i18n --save-dev
 
 ## Runtime Dependencies
 - i18next
-- js-cookie
 - qs
 - 使用 Trans 组件时
     - react

package/i18n/index.js

@@ -1,4 +1,3 @@
-import Cookies from 'js-cookie';
 import { default as i18next } from 'i18next';
 import { Dict } from './dict.js';
 export const LANGUAGES = ['zh', 'en', 'ja', 'ko'];
@@ -35,8 +34,7 @@ export class I18N {
         const dict = new Dict(_dict);
         if (!language && is_browser)
             language = (new URLSearchParams(location.search).get('language') ||
-                window.language ||
-                Cookies.get('language'));
+                window.language);
         if (!language)
             language = Intl.DateTimeFormat().resolvedOptions().locale.slice(0, 2);
         if (!I18N.LANGUAGE_REGEXP.test(language)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.104",
+    "version": "1.0.105",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -16,7 +16,7 @@
         "interactive programming"
     ],
     "engines": {
-        "node": ">=21.3.0",
+        "node": ">=22.2.0",
         "vscode": ">=1.81.0"
     },
     "scripts": {
@@ -61,6 +61,10 @@
         "@typescript-eslint/eslint-plugin": "^7.9.0",
         "@typescript-eslint/parser": "^7.9.0",
         "@typescript-eslint/utils": "^7.9.0",
+        "@xterm/addon-fit": "^0.10.0",
+        "@xterm/addon-web-links": "^0.11.0",
+        "@xterm/addon-webgl": "^0.18.0",
+        "@xterm/xterm": "^5.5.0",
         "ali-oss": "^6.20.0",
         "archiver": "^7.0.1",
         "byte-size": "^8.1.1",
@@ -79,7 +83,6 @@
         "https-proxy-agent": "^7.0.4",
         "i18next": "^23.11.4",
         "i18next-scanner": "^4.4.0",
-        "js-cookie": "^3.0.5",
         "koa": "^2.15.3",
         "koa-compress": "^5.1.1",
         "lodash": "^4.17.21",
@@ -99,11 +102,7 @@
         "undici": "^6.16.1",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
-        "ws": "^8.17.0",
-        "xterm": "^5.3.0",
-        "xterm-addon-fit": "^0.8.0",
-        "xterm-addon-web-links": "^0.9.0",
-        "xterm-addon-webgl": "^0.16.0"
+        "ws": "^8.17.0"
     },
     "devDependencies": {
         "@babel/types": "^7.24.5",
@@ -115,10 +114,9 @@
         "@types/eslint": "^8.56.10",
         "@types/estree": "^1.0.5",
         "@types/gulp-sort": "^2.0.4",
-        "@types/js-cookie": "^3.0.6",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
-        "@types/lodash": "^4.17.1",
+        "@types/lodash": "^4.17.4",
         "@types/mime-types": "^2.1.4",
         "@types/node": "^20.12.12",
         "@types/react": "^18.3.2",

package/process.js

@@ -178,9 +178,7 @@ export async function call(exe, args = [], options = {}) {
         - throw_code?: `true` code 不为 0 时是否抛出异常  whether to throw Error when code is not 0 */
 export async function call_nodejs(js, args = [], { inspect, break: _break, ...options } = {}) {
     return call(exe_nodejs, [
-        ...inspect ? [
-            _break ? `--inspect-brk=localhost:${inspect}` : `--inspect=localhost:${inspect}`
-        ] : [],
+        ...inspect ? [`--inspect${_break ? '-brk' : ''}=localhost:${inspect}`] : [],
         js,
         ...args
     ], options);

package/server.d.ts

@@ -33,6 +33,7 @@ export declare class Server {
     name: string;
     UAParser: typeof UAParser;
     js_exts: Set<string>;
+    empty_body_statuses: Set<number>;
     app: Koa;
     handler: ReturnType<Koa['callback']>;
     /** 启用 http server */

package/server.js

@@ -8,7 +8,7 @@ import util from 'util';
 // --- my libs
 import { t } from './i18n/instance.js';
 import { request as _request, Remote } from './net.js';
-import { inspect, output_width, assert, range_to_numbers, encode, filter_keys, filter_values } from './utils.js';
+import { inspect, output_width, assert, range_to_numbers, encode, filter_keys, filter_values, consume_stream } from './utils.js';
 import { flist, fread, fstat } from './file.js';
 // ------------ my server
 export class Server {
@@ -24,6 +24,7 @@ export class Server {
     name;
     UAParser;
     js_exts = new Set(['.js', '.mjs', '.cjs']);
+    empty_body_statuses = new Set([304, 204, 205]);
     app;
     handler;
     /** 启用 http server */
@@ -472,7 +473,17 @@ export class Server {
             response.status = response_.status;
             response.set(Server.filter_response_headers(response_.headers));
             if (response_.body)
-                response.body = await stream_to_buffer(response_.body);
+                // 如果设置了 response.status 为 304 等状态码，koa/application.js#respond() 方法中会执行
+                // ctx.body = null
+                // response.res.end()
+                // 而 res.end() 会触发 res 流的 finish, 然后由于之前 response.body = response_.body 这条语句
+                // 关联了 response_.body 到 res 的 finish 事件，(koa/response.js#set body() 中 onFinish(res, destroy.bind(null, response_.body))
+                // 会让 response_.body 这个 UndiciBodyReadable 被提前 finish，而此时
+                // 流还没 emit end, 会触发错误 RequestAbortedError [AbortError]: Request aborted
+                if (this.empty_body_statuses.has(response_.status))
+                    consume_stream(response_.body, true);
+                else
+                    response.body = response_.body;
         }
         catch (error) {
             if (error.response?.status !== 404)

package/utils.d.ts

@@ -34,7 +34,7 @@ export declare function map_values<TValue, TNewValue>(obj: {
 };
 /** 过滤对象中的 keys, 返回新对象 */
 export declare function filter_keys<TObj>(obj: TObj, filter: (key: string) => any): TObj;
-/** 过滤对象中的 valus, 返回新对象 */
+/** 过滤对象中的 values, 返回新对象 */
 export declare function filter_values<TObj extends Record<string, any>>(obj: TObj, filter?: (value: TObj[string]) => any): TObj;
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
@@ -147,7 +147,7 @@ export declare function map_stream<Out, In = Vinyl>(mapper: (obj: In, cb: Functi
     failures?: boolean;
 }): Duplex;
 export declare function stream_to_lines(stream: Readable): AsyncGenerator<string, void, unknown>;
-export declare function pipe_with_error(readable: Readable, transform: Transform): Transform;
+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>;
@@ -168,6 +168,8 @@ export declare class DecoderStream extends Transform {
     _transform(chunk: Uint8Array, encoding: BufferEncoding, callback: TransformCallback): void;
     _flush(callback: TransformCallback): void;
 }
+/** 消费一个可读流 */
+export declare function consume_stream(stream: Readable, ignore_error?: boolean): Promise<void>;
 /** 根据 range 生成整数序列 (iterable)
     - range: 取值为逗号分割的多个可用值或值区间 (不能含有空格)，比如：`8321,8322,8300-8310,11000-11999`
     - reverse?: `false` 在 range 内从后往前生成 */

package/utils.js

@@ -80,7 +80,7 @@ export function filter_keys(obj, filter) {
     return Object.fromEntries(Object.entries(obj)
         .filter(([key]) => filter(key)));
 }
-/** 过滤对象中的 valus, 返回新对象 */
+/** 过滤对象中的 values, 返回新对象 */
 export function filter_values(obj, filter = not_empty) {
     return Object.fromEntries(Object.entries(obj)
         .filter(([, value]) => filter(value)));
@@ -218,18 +218,13 @@ export async function timeout(milliseconds, action) {
 // eslint-disable-next-line @typescript-eslint/promise-function-async
 export function defer(initial) {
     if (initial === undefined) {
-        let resolve;
-        let reject;
-        let promise = new Promise((_resolve, _reject) => {
-            resolve = _resolve;
-            reject = _reject;
-        });
+        let { promise, resolve, reject } = Promise.withResolvers();
         return Object.assign(promise, { resolve, reject });
     }
     else
         return Object.assign(Promise.resolve(initial), {
-            resolve() { },
-            reject() { }
+            resolve: noop,
+            reject: noop
         });
 }
 /** @example
@@ -476,10 +471,10 @@ export async function* stream_to_lines(stream) {
         buf = chunk.slice(j);
     }
 }
-export function pipe_with_error(readable, transform) {
+export function pipe_with_error(readable, writable) {
     // 不知道 transform 作为 AsyncIterable 使用时， emit error 是否会在 for await (...) 循环中触发错误
-    readable.once('error', error => { transform.emit('error', error); });
-    return readable.pipe(transform);
+    readable.once('error', error => { writable.emit('error', error); });
+    return readable.pipe(writable);
 }
 export class WritableMemoryStream extends Writable {
     chunks = [];
@@ -525,6 +520,17 @@ export class DecoderStream extends Transform {
         callback();
     }
 }
+/** 消费一个可读流 */
+export async function consume_stream(stream, ignore_error = false) {
+    try {
+        for await (const chunk of stream)
+            ;
+    }
+    catch (error) {
+        if (!ignore_error)
+            throw error;
+    }
+}
 /** 根据 range 生成整数序列 (iterable)
     - range: 取值为逗号分割的多个可用值或值区间 (不能含有空格)，比如：`8321,8322,8300-8310,11000-11999`
     - reverse?: `false` 在 range 内从后往前生成 */