xshell 1.0.69 → 1.0.71

package/apps.d.ts

@@ -31,11 +31,13 @@ export declare let oss: {
     client: OSS;
     bucket: string;
     region: string;
-    root: string;
-    init({ bucket, region, root, access_id, access_key }: {
+    fpd_cdn: string;
+    fpd_oss: string;
+    init({ bucket, region, fpd_cdn, fpd_oss, access_id, access_key }: {
         bucket: string;
         region: string;
-        root: string;
+        fpd_cdn: string;
+        fpd_oss: string;
         access_id: string;
         access_key: string;
     }): Promise<void>;
@@ -44,10 +46,12 @@ export declare let oss: {
         - data: 文件 (Uint8Array) | 本地文件完整路径 (string) | ReadableStream
         - options?:
             - private?: `false` 设置为私有，需要通过 URL 签名参数访问
+            - cdn?: `false` false 时返回 oss 链接，true 时返回 cdn 链接
             - print?: `true` 打印消息 */
-    upload(fp: string, data: Uint8Array | string | Readable, { private: _private, print, }?: {
+    upload(fp: string, data: Uint8Array | string | Readable, { private: _private, print, cdn, }?: {
         private?: boolean;
         print?: boolean;
+        cdn?: boolean;
     }): Promise<string>;
     /** 获取经过签名后可访问的 url */
     get_url(fp: string): Promise<string>;

package/apps.js

@@ -41,14 +41,16 @@ export let oss = {
     client: null,
     bucket: null,
     region: null,
-    root: null,
-    async init({ bucket, region, root, access_id, access_key }) {
+    fpd_cdn: null,
+    fpd_oss: null,
+    async init({ bucket, region, fpd_cdn, fpd_oss, access_id, access_key }) {
         if (this.client)
             return;
         const OSS = (await import('ali-oss')).default;
         this.bucket = bucket;
         this.region = region;
-        this.root = root;
+        this.fpd_cdn = fpd_cdn;
+        this.fpd_oss = fpd_oss;
         this.client = new OSS({
             accessKeyId: access_id,
             accessKeySecret: access_key,
@@ -62,9 +64,11 @@ export let oss = {
         - data: 文件 (Uint8Array) | 本地文件完整路径 (string) | ReadableStream
         - options?:
             - private?: `false` 设置为私有，需要通过 URL 签名参数访问
+            - cdn?: `false` false 时返回 oss 链接，true 时返回 cdn 链接
             - print?: `true` 打印消息 */
-    async upload(fp, data, { private: _private = false, print = true, } = {}) {
+    async upload(fp, data, { private: _private = false, print = true, cdn = false, } = {}) {
         assert(this.client, 'OSS 应该已经初始化了');
+        assert(!fp.startsWith('/'), 'fp 不能以 / 开头');
         assert(!fp.isdir, '不能使用 oss.upload 上传文件夹，请使用 oss.upload_dir');
         if (typeof data === 'string')
             assert(data[1] === ':' && path.isAbsolute(data), 'oss.upload 传入 data 参数类型为 string 时，必须为本地文件完整路径');
@@ -77,7 +81,7 @@ export let oss = {
             url = await this.get_url(fp);
         }
         else
-            url = new URL(this.root + fp).toString();
+            url = new URL(`${cdn ? this.fpd_cdn : this.fpd_oss}${fp}`).toString();
         if (print)
             console.log(`已上传到 OSS${_private ? ' (私有)' : ''}:`, url);
         return url;
@@ -86,7 +90,7 @@ export let oss = {
     async get_url(fp) {
         assert(this.client, 'OSS 应该已经初始化了');
         const url = new URL(this.client.signatureUrl(fp, { expires: /* 十年 */ 3600 * 24 * 365 * 10 }));
-        const url_ = `${this.root}${url.pathname.slice(1)}${url.search}`;
+        const url_ = `${this.fpd_cdn}${url.pathname.slice(1)}${url.search}`;
         return url_;
     }
 };

package/git.d.ts

@@ -14,12 +14,12 @@ export declare class Git {
     get_branches(print?: boolean): Promise<string[]>;
     has_branch(branch: string): Promise<boolean>;
     /** - last?: `4` */
-    log({ last, graph, format, }?: {
-        last?: number;
+    log({ n, graph, format, }?: {
+        n?: number;
         graph?: boolean;
         format?: string;
     }): Promise<import("./process.js").CallResult<string>>;
-    get_last_commits(last?: number): Promise<{
+    get_last_commits(n?: number): Promise<{
         time: Date;
         commiter: string;
         hash: string;

package/git.js

@@ -52,19 +52,19 @@ export class Git {
             .includes(branch);
     }
     /** - last?: `4` */
-    async log({ last = 4, graph = false, format, } = {}) {
+    async log({ n = 4, graph = false, format, } = {}) {
         if (!graph && !format)
             // 多行 commit message 会被 join 在一起，用空格隔开
             format = ['ct', 'cn', 'H', 's'].map(x => `%${x}`).join('%x00');
         return this.call([
             'log',
             ...graph ? ['--graph'] : [],
-            `-${last}`,
+            `-${n}`,
             ...format ? [`--pretty=format:${format}`] : [],
         ], { color: !format, print: !format });
     }
-    async get_last_commits(last = 100) {
-        const { stdout } = await this.log({ last });
+    async get_last_commits(n = 100) {
+        const { stdout } = await this.log({ n });
         return stdout.split_lines()
             .map(line => {
             const [unixtime, commiter, hash, message] = line.split('\x00');

package/net.js

@@ -346,7 +346,8 @@ on_message, on_error, on_close }) {
     const { WebSocket } = await import('ws');
     let websocket = new WebSocket(url, protocols, {
         maxPayload: max_payload,
-        skipUTF8Validation: true
+        skipUTF8Validation: true,
+        allowSynchronousEvents: true,
     });
     // https://stackoverflow.com/questions/11821096/what-is-the-difference-between-an-arraybuffer-and-a-blob/39951543
     websocket.binaryType = 'arraybuffer';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "type": "module",
   "main": "./index.js",
   "bin": {
@@ -45,10 +45,10 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.23.5",
-    "@babel/parser": "^7.23.5",
-    "@babel/traverse": "^7.23.5",
-    "@koa/cors": "^4.0.0",
+    "@babel/core": "^7.23.6",
+    "@babel/parser": "^7.23.6",
+    "@babel/traverse": "^7.23.6",
+    "@koa/cors": "^5.0.0",
     "@types/ws": "^8.5.10",
     "ali-oss": "^6.18.1",
     "archiver": "^6.0.1",
@@ -63,7 +63,7 @@
     "fetch-cookie": "^2.1.0",
     "gulp-sort": "^2.0.0",
     "hash-string": "^1.0.0",
-    "i18next": "^23.7.7",
+    "i18next": "^23.7.9",
     "i18next-scanner": "^4.4.0",
     "js-cookie": "^3.0.5",
     "koa": "^2.14.2",
@@ -74,25 +74,25 @@
     "ora": "^7.0.1",
     "react": "^18.2.0",
     "react-i18next": "^13.5.0",
-    "react-object-model": "^1.2.0",
+    "react-object-model": "^1.2.1",
     "resolve-path": "^1.4.0",
     "strip-ansi": "^7.1.0",
     "through2": "^4.0.2",
     "tough-cookie": "^4.1.3",
     "tslib": "^2.6.2",
-    "typescript": "^5.3.2",
+    "typescript": "^5.3.3",
     "ua-parser-js": "2.0.0-alpha.2",
-    "undici": "^5.28.2",
+    "undici": "^6.0.1",
     "vinyl": "^3.0.0",
     "vinyl-fs": "^4.0.0",
-    "ws": "^8.14.2",
+    "ws": "^8.15.1",
     "xterm": "^5.3.0",
     "xterm-addon-fit": "^0.8.0",
     "xterm-addon-web-links": "^0.9.0",
     "xterm-addon-webgl": "^0.16.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.23.5",
+    "@babel/types": "^7.23.6",
     "@types/ali-oss": "^6.16.11",
     "@types/archiver": "^6.0.2",
     "@types/babel__traverse": "^7.20.4",
@@ -104,18 +104,18 @@
     "@types/koa-compress": "^4.0.6",
     "@types/lodash": "^4.14.202",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^20.10.3",
-    "@types/react": "^18.2.41",
+    "@types/node": "^20.10.4",
+    "@types/react": "^18.2.45",
     "@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.84.2",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "@typescript-eslint/parser": "^6.13.1",
+    "@types/vscode": "^1.85.0",
+    "@typescript-eslint/eslint-plugin": "^6.14.0",
+    "@typescript-eslint/parser": "^6.14.0",
     "eslint": "^8.55.0",
     "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-xlint": "^1.0.10"
+    "eslint-plugin-xlint": "^1.0.11"
   },
   "scripts": {
     "start": "node --title=xshell --inspect=0.0.0.0:8420 ./xshell.js",

package/repl.js

@@ -31,6 +31,7 @@ export async function start_repl() {
             let { Server } = await import('./server.js');
             server = new Server({
                 name: 'repl',
+                http: true,
                 http_port: 8421,
                 funcs: {
                     echo({ data: [data] }) {

package/server.d.ts

@@ -35,6 +35,10 @@ export declare class Server {
     js_exts: Set<string>;
     app: Koa;
     handler: ReturnType<Koa['callback']>;
+    /** 启用 http server */
+    http: boolean;
+    /** 启用 http2 server */
+    http2: boolean;
     http_port: number;
     http2_port: number;
     /** http2 server 证书文件夹路径，设置后才会启用 http2 server */
@@ -55,8 +59,10 @@ export declare class Server {
     stdout_write: Function;
     stderr_write: Function;
     encoder: TextEncoder;
-    constructor({ name, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }: {
+    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }: {
         name: string;
+        http?: boolean;
+        http2?: boolean;
         http_port?: number;
         http2_port?: number;
         fpd_certs?: string;

package/server.js

@@ -26,6 +26,10 @@ export class Server {
     js_exts = new Set(['.js', '.mjs', '.cjs']);
     app;
     handler;
+    /** 启用 http server */
+    http = false;
+    /** 启用 http2 server */
+    http2 = false;
     http_port = 80;
     http2_port = 443;
     /** http2 server 证书文件夹路径，设置后才会启用 http2 server */
@@ -44,8 +48,13 @@ export class Server {
     stdout_write;
     stderr_write;
     encoder = new TextEncoder();
-    constructor({ name, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }) {
+    constructor({ name, http, http2, http_port, http2_port, fpd_certs, default_hostnames, remote, funcs, stdio_subscribable, }) {
         this.name = name;
+        if (http)
+            this.http = http;
+        if (http2)
+            this.http2 = http2;
+        assert(this.http || this.http2, 'http 和 http2 至少启用一个');
         if (http_port !== undefined)
             this.http_port = http_port;
         if (http2_port !== undefined)
@@ -86,14 +95,18 @@ export class Server {
             },
             threshold: 512
         }));
-        app.use(KoaCors({ credentials: true }));
+        app.use(KoaCors({
+            credentials: true,
+            origin: (ctx) => ctx.request.get('origin') || '*'
+        }));
         await this.init_app(app);
         app.use(this._router.bind(this));
         this.app = app;
         this.handler = this.app.callback();
         this.http_server = http_create_server(this.handler);
-        const { fpd_certs } = this;
-        if (fpd_certs) {
+        const { http, http2 } = this;
+        if (http2) {
+            const { fpd_certs } = this;
             let lazy_secure_ctxs = Object.fromEntries(await Promise.all(
             // fpd_certs 文件夹下面的每个 .key 对应一个证书及域名
             (await flist(fpd_certs, { print: false, filter: /\.key$/ }))
@@ -121,6 +134,7 @@ export class Server {
                 noServer: true,
                 skipUTF8Validation: true,
                 perMessageDeflate: true,
+                allowSynchronousEvents: true,
                 maxPayload: 2 ** 30 // 1 GB
             });
             this.websocket_server.on('connection', (ws, request) => {
@@ -192,16 +206,19 @@ export class Server {
             }
         }
         await Promise.all([
-            new Promise(resolve => {
+            http && new Promise(resolve => {
                 this.http_server.listen(this.http_port, resolve);
             }),
-            fpd_certs && new Promise(resolve => {
+            http2 && new Promise(resolve => {
                 this.http2_server.listen(this.http2_port, resolve);
             }),
         ]);
         console.log(t('{{name}} 启动成功，正在监听 {{ports}} 端口', {
             name: this.name,
-            ports: `${this.http_port}${fpd_certs ? `, ${this.http2_port}` : ''}`
+            ports: [
+                ...http ? [this.http_port] : [],
+                ...http2 ? [this.http2_port] : []
+            ].join(', ')
         }));
     }
     stop() {

package/utils.browser.d.ts

@@ -51,7 +51,7 @@ export declare class Lock<TResource = void> {
 }
 export declare function pause(milliseconds?: number): Promise<void>;
 /** 字符串字典序比较 */
-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.browser.js

@@ -181,7 +181,7 @@ export function delta2str(delta) {
     // [1, 1000) ms
     if (delta < 1000)
         return `${delta.toFixed(0)} ms`;
-    // 1.123 s
+    // 1.1 s
     if (1000 <= delta && delta < 1000 * 60)
         return `${(delta / 1000).toFixed(1)} s`;
     // 1 min 12 s [1 min 0s, 60 min)

package/utils.d.ts

@@ -22,7 +22,7 @@ export declare function unique<T>(iterable: T[] | Iterable<T>, selector?: string
 /** 排序对象中 key 的顺序，返回新的对象 */
 export declare function sort_keys<T>(obj: T): T;
 /** 字符串字典序比较 */
-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.js

@@ -144,7 +144,7 @@ export function delta2str(delta) {
     // [1, 1000) ms
     if (delta < 1000)
         return `${delta.toFixed(0)} ms`;
-    // 1.123 s
+    // 1.1 s
     if (1000 <= delta && delta < 1000 * 60)
         return `${(delta / 1000).toFixed(1)} s`;
     // 1 min 12 s [1 min 0s, 60 min)