xshell 1.3.24 → 1.3.26

package/git.d.ts

@@ -37,6 +37,10 @@ export declare class Git {
     checkout(branch?: 'main'): Promise<void>;
     checkout(branch?: string): Promise<void>;
     _checkout(branch: string, create: boolean, remote_branch?: string): Promise<void>;
+    /** 基于远程分支创建相同且干净的本地分支 (reset)，用于 ci
+        会自动先通过 this.fetch 更新 remote_branch 对应的远程仓库
+        - branch: 远程分支名，必须类似 origin/main 这样的格式 */
+    checkout_remote(remote_branch: string): Promise<void>;
     get_version_info(version?: string): Promise<{
         version: string;
         branch: string;
@@ -45,6 +49,8 @@ export declare class Git {
         commiter: string;
         message: string;
     }>;
+    /** 重置分支到最后提交的状态 */
+    reset(remote_branch?: string): Promise<void>;
 }
 export interface GitVersionInfo {
     version: string;

package/git.js

@@ -121,6 +121,23 @@ export class Git {
             ...remote_branch ? [remote_branch] : []
         ], print_no_command);
     }
+    /** 基于远程分支创建相同且干净的本地分支 (reset)，用于 ci
+        会自动先通过 this.fetch 更新 remote_branch 对应的远程仓库
+        - branch: 远程分支名，必须类似 origin/main 这样的格式 */
+    async checkout_remote(remote_branch) {
+        const [remote, name] = remote_branch.split2('/');
+        await this.fetch({ remote });
+        const branches = await this.get_branches(false);
+        if (!branches.includes(`remotes/${remote_branch}`))
+            throw new Error(`远程分支 ${remote_branch} 不存在`);
+        // 存在对应的本地分支
+        if (branches.includes(name)) {
+            await this._checkout(name, false);
+            await this.reset(remote_branch);
+        }
+        else
+            await this._checkout(name, true, remote_branch);
+    }
     async get_version_info(version) {
         const branch = await this.get_branch();
         const { hash, time, commiter, message } = (await this.get_last_commits(1))[0];
@@ -135,6 +152,15 @@ export class Git {
             message
         };
     }
+    /** 重置分支到最后提交的状态 */
+    async reset(remote_branch) {
+        console.log(`重置分支到${remote_branch ? ` ${remote_branch}` : '最后提交的状态'}`);
+        await this.call([
+            'reset',
+            '--hard',
+            ...remote_branch ? [remote_branch] : []
+        ], print_no_command);
+    }
 }
 const print_stdout = { print: { code: false, command: false, stdout: true, stderr: true } };
 //# sourceMappingURL=git.js.map

package/net.common.d.ts

@@ -102,6 +102,7 @@ export interface RemoteOptions {
     print?: boolean;
     /** `false` 打印所有交互的 rpc messages */
     verbose?: boolean;
+    proxy?: string;
     /** 使用者自定义的在 websocket 连接出错时，或者 handlers 出错时的处理
         用户设置后会覆盖默认的 print 错误功能 */
     on_error?(error: WebSocketConnectionError | Error, remote: Remote): void;
@@ -141,6 +142,7 @@ export declare class Remote {
     print: boolean;
     /** `false` 打印所有交互的 rpc messages */
     verbose: boolean;
+    proxy?: string;
     /** 防止作为 websocket 连接发起方时并发创建 websocket 连接 */
     lwebsocket: Lock<WebSocket>;
     /** map<id, message handler>: 通过 (rpc message).id 找到对应的 handler
@@ -154,7 +156,7 @@ export declare class Remote {
     error: WebSocketConnectionError | Error;
     /** 作为 websocket 连接发起方，传入 url
         作为 websocket 连接接收方，传入 websocket + name */
-    constructor({ name, url, websocket, funcs, print, verbose, alive, args, on_error, on_reconnect, on_connected }?: RemoteOptions);
+    constructor({ name, url, websocket, funcs, print, verbose, alive, args, proxy, on_error, on_reconnect, on_connected }?: RemoteOptions);
     /** 统一处理首次连接和连接后的 websocket 错误 */
     _on_error: (error: WebSocketConnectionError | Error) => void;
     on_reconnect?: (this: Remote) => Promise<void>;

package/net.common.js

@@ -213,6 +213,7 @@ export class Remote {
     print = true;
     /** `false` 打印所有交互的 rpc messages */
     verbose = false;
+    proxy;
     // --- states
     /** 防止作为 websocket 连接发起方时并发创建 websocket 连接 */
     lwebsocket = new Lock();
@@ -227,7 +228,7 @@ export class Remote {
     error;
     /** 作为 websocket 连接发起方，传入 url
         作为 websocket 连接接收方，传入 websocket + name */
-    constructor({ name, url, websocket, funcs, print, verbose, alive, args, on_error, on_reconnect, on_connected } = {}) {
+    constructor({ name, url, websocket, funcs, print, verbose, alive, args, proxy, on_error, on_reconnect, on_connected } = {}) {
         if (name)
             this.name = name;
         if (alive) {
@@ -280,6 +281,8 @@ export class Remote {
             this.print = print;
         if (verbose !== undefined)
             this.verbose = verbose;
+        if (proxy)
+            this.proxy = proxy;
         if (on_error)
             this.on_error = on_error;
     }
@@ -368,7 +371,8 @@ export class Remote {
             on_message: this._on_message,
             on_error: this._on_error,
             print: this.print,
-            keep_alive_duration: this.alive ? 30_000 : undefined
+            keep_alive_duration: this.alive ? 30_000 : undefined,
+            proxy: this.proxy
         });
         this.error = null;
         if (this.args)

package/package.json

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

package/path.d.ts

@@ -54,7 +54,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ";" | ":";
+export declare const delimiter: ":" | ";";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -81,7 +81,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ";" | ":";
+    delimiter: ":" | ";";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/react.development.js

@@ -30733,6 +30733,12 @@ if (false) // removed by dead control flow
 /******/ 		if (cachedModule !== undefined) {
 /******/ 			return cachedModule.exports;
 /******/ 		}
+/******/ 		// Check if module exists (development only)
+/******/ 		if (__webpack_modules__[moduleId] === undefined) {
+/******/ 			var e = new Error("Cannot find module '" + moduleId + "'");
+/******/ 			e.code = 'MODULE_NOT_FOUND';
+/******/ 			throw e;
+/******/ 		}
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = __webpack_module_cache__[moduleId] = {
 /******/ 			id: moduleId,