xshell 1.0.70 → 1.0.72

package/git.d.ts

@@ -25,7 +25,10 @@ export declare class Git {
         hash: string;
         message: string;
     }[]>;
-    fetch(print?: boolean): Promise<void>;
+    fetch({ print, remote }?: {
+        print?: boolean;
+        remote?: string;
+    }): Promise<void>;
     /** - branch?: `'main'` */
     checkout(branch?: 'main'): Promise<void>;
     checkout(branch?: string): Promise<void>;
@@ -45,4 +48,6 @@ export declare class Git {
     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

@@ -76,8 +76,12 @@ export class Git {
             };
         });
     }
-    async fetch(print = true) {
-        await this.call(['fetch', '--all', '--prune'], { print: { code: false, command: false, stdout: true, stderr: true } });
+    async fetch({ print = true, remote } = {}) {
+        await this.call([
+            'fetch',
+            remote || '--all',
+            '--prune'
+        ], { print: { code: false, command: false, stdout: true, stderr: true } });
         if (print)
             console.log('更新远程分支成功');
     }
@@ -152,10 +156,18 @@ export class Git {
         await this.checkout(target_branch);
         await this.merge(branch, true);
     }
-    async update(branch = 'main', remote = 'origin') {
-        await this.fetch();
+    async update(branch = 'main', remote) {
+        await this.fetch({ remote });
         await this.checkout(branch);
-        await this.merge(`${remote}/${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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xshell",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "type": "module",
   "main": "./index.js",
   "bin": {

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)
@@ -95,8 +104,9 @@ export class Server {
         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$/ }))
@@ -196,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() {