@fastgpt-plugin/cli 0.2.0-alpha.3 → 0.2.0

package/dist/index.js

@@ -11,7 +11,7 @@ import { kebabCase } from "es-toolkit";
 import fs$1, { createWriteStream } from "node:fs";
 import os from "node:os";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
-import { Box, Text, render, useInput } from "ink";
+import { Box, Text, render, useApp, useInput } from "ink";
 import React from "react";
 import { createHash, randomUUID } from "node:crypto";
 import { Readable } from "stream";
@@ -526,7 +526,7 @@ var CheckCommand = class extends BaseCommand {
 //#endregion
 //#region package.json
 var name = "@fastgpt-plugin/cli";
-var version = "0.2.0-alpha.3";
+var version = "0.2.0";
 
 //#endregion
 //#region src/constants.ts
@@ -2246,12 +2246,13 @@ async function assertPathExists(targetPath, message) {
 //#region src/debug/gateway.ts
 const GATEWAY_DUPLICATE_CONNECTION_CODE = "connection_gateway.session_already_bound";
 const GATEWAY_HEARTBEAT_INTERVAL_MS = 5e3;
-async function connectDebugGateway({ targets, options, onLog }) {
+async function connectDebugGateway({ targets, options, onLog, onReconnect }) {
 	if (targets.length === 0) throw new Error("Gateway debug targets cannot be empty");
 	if (options.reconnect) return connectReconnectingDebugGateway({
 		targets,
 		options,
-		onLog
+		onLog,
+		onReconnect
 	});
 	return connectSingleDebugGateway({
 		targets,
@@ -2259,7 +2260,7 @@ async function connectDebugGateway({ targets, options, onLog }) {
 		onLog
 	});
 }
-async function connectReconnectingDebugGateway({ targets, options, onLog }) {
+async function connectReconnectingDebugGateway({ targets, options, onLog, onReconnect }) {
 	let closed = false;
 	let current = null;
 	let currentSession = null;
@@ -2282,6 +2283,7 @@ async function connectReconnectingDebugGateway({ targets, options, onLog }) {
 					options: currentOptions,
 					onLog
 				});
+				if (currentSession) onReconnect?.(current.session);
 				currentSession = current.session;
 				await current.closed;
 			} catch (error) {
@@ -2860,7 +2862,10 @@ async function runRemoteDebugSessionOnce({ entriesInput, options, commandName })
 		const gateway = await connectDebugGateway({
 			targets,
 			options: gatewayOptions,
-			onLog: (message) => reporter.log(`[gateway] ${message}`)
+			onLog: (message) => reporter.log(`[gateway] ${message}`),
+			onReconnect: (session) => {
+				reporter.ready(session.sessionScope.source ?? currentGatewayOptions.source ?? "-");
+			}
 		});
 		reporter.attachClose(({ force }) => {
 			gateway.close();
@@ -2947,7 +2952,10 @@ async function runWatchRemoteDebugSession({ entriesInput, options, commandName }
 		const connectedGateway = await connectDebugGateway({
 			targets: initialTargets,
 			options: gatewayOptions,
-			onLog: (message) => reporter.log(`[gateway] ${message}`)
+			onLog: (message) => reporter.log(`[gateway] ${message}`),
+			onReconnect: (session) => {
+				reporter.ready(session.sessionScope.source ?? currentGatewayOptions.source ?? "-");
+			}
 		});
 		gateway = connectedGateway;
 		reporter.attachClose(({ force }) => {
@@ -3223,13 +3231,13 @@ var TuiRemoteDebugReporter = class {
 		this.closeSession?.({ force });
 		if (force && !this.closeSession) process.exit(130);
 	};
-	requestConfigureConnectionKey = () => {
+	requestConfigureConnectionKey = (suspendTerminal) => {
 		if (this.configuring) return;
 		if (!this.configureConnectionKey) {
 			this.log("connection key 配置入口尚未就绪。");
 			return;
 		}
-		this.runConfigureConnectionKey();
+		this.runConfigureConnectionKey(suspendTerminal);
 	};
 	constructor(summary) {
 		this.summary = summary;
@@ -3286,15 +3294,16 @@ var TuiRemoteDebugReporter = class {
 		instance.unmount();
 		await Promise.race([instance.waitUntilExit(), setTimeout$1(50)]).catch(() => void 0);
 	}
-	async runConfigureConnectionKey() {
+	async runConfigureConnectionKey(suspendTerminal) {
 		if (!this.configureConnectionKey) return;
 		const previousStatus = this.status;
 		this.configuring = true;
 		this.status = "configuring";
 		this.rerender();
 		try {
-			await this.unmount();
-			await this.configureConnectionKey();
+			await suspendTerminal(async () => {
+				await this.configureConnectionKey?.();
+			});
 			this.status = "connecting";
 			this.log("已更新 connection key，正在重新连接 Connection Gateway。");
 		} catch (error) {
@@ -3320,12 +3329,13 @@ var TuiRemoteDebugReporter = class {
 	}
 };
 function RemoteDebugInkApp({ summary, status, source, logs, onClose, onConfigureConnectionKey }) {
+	const { suspendTerminal } = useApp();
 	useInput((inputValue, key) => {
 		if (key.ctrl && inputValue === "c") {
 			onClose();
 			return;
 		}
-		if (inputValue === "c") onConfigureConnectionKey();
+		if (inputValue === "c") onConfigureConnectionKey(suspendTerminal);
 	});
 	const statusMeta = getTuiStatusMeta(status);
 	const sourceLabel = source === "-" ? "waiting for bind" : source;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastgpt-plugin/cli",
-  "version": "0.2.0-alpha.3",
+  "version": "0.2.0",
   "type": "module",
   "private": false,
   "publishConfig": {