修复webterminal无法获取docker exec命令

html/src/components/terminal/xterm/index.ts

@@ -280,7 +280,7 @@ export class Xterm {
         register(addEventListener(socket, 'close', this.onSocketClose as EventListener));
         register(addEventListener(socket, 'error', () => (this.doReconnect = false)));
         const options = new URLSearchParams(decodeURIComponent(window.location.search));
-        if (options.get('type') === 'docker') {
+        if (options.get('type') === 'docker' && !this.intervalID) {
             this.intervalID = setInterval(this.loadCommand, 3000);
         }
     }
@@ -352,28 +352,29 @@ export class Xterm {
         )
             .then(response => response.json())
             .then(data => {
-                if (data.status !== '4' && data.status !== '0') {
-                    this.sendData(data.command);
-                } else {
-                    clearInterval(this.intervalID);
-                    if (data.status === '4') {
-                        fetch(
-                            'http://' + options.get('domain') + ':'+ options.get('port') +'/' +
-                                options.get('user') +
-                                '/' +
-                                options.get('repo') +
-                                '/devcontainer/command?' +
-                                params
-                        )
-                            .then(response => response.json())
-                            .then(data => {
-                                this.sendData(data.command);
-                            })
-                            .catch(error => {
-                                console.error('Error:', error);
-                            });
-                    }
+                const isReady = data.status === '4';
+                this.changeStatus(isReady);
+                if (data.status === '0') {
+                    this.beforeCommand = undefined;
+                    return;
                 }
+
+                if (isReady) {
+                    if (this.beforeCommand !== data.command) {
+                        this.beforeCommand = data.command;
+                        // 确保命令以换行符结尾，并增加一点延迟
+                        const cmd = data.command.endsWith('\n') ? data.command : data.command + '\n';
+                        setTimeout(() => {
+                            this.sendData(cmd);
+                        }, 500);
+                        // 停止轮询，因为已经进入交互模式
+                        clearInterval(this.intervalID);
+                    }
+                    return;
+                }
+
+                this.beforeCommand = data.command;
+                this.sendData(data.command);
             })
             .catch(error => {
                 console.error('Error:', error);