fix: use VSCode Extension API for remote SSH connection to support Trae IDE

Co-authored-by: 孟宁 <mengning@mengning.com.cn>
Reviewed-on: #4
Co-authored-by: yinxue <2643126914@qq.com>
Co-committed-by: yinxue <2643126914@qq.com>

.gitea/workflows/devstar-vscode-release.yaml

@@ -7,17 +7,59 @@ on:
     branches:
       - main
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
     container:
       image: node:20-alpine
     steps:
+      - name: 安装 Git
+        run: |
+          apk add --no-cache git
+
       - name: 拉取代码
-        uses: https://devstar.cn/actions/checkout@v4
+        uses: actions/checkout@v4
         with:
+          token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
+      - name: 配置 Git
+        run: |
+          # 添加工作目录为安全目录
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config --global --add safe.directory /github/workspace
+          
+          # 配置用户信息
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: 自动递增版本号
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        run: |
+          apk add --no-cache jq
+          CURRENT_VERSION=$(jq -r '.version' package.json)
+          echo "当前版本: $CURRENT_VERSION"
+          
+          # 分解版本号
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
+          
+          # 递增补丁版本号
+          NEW_PATCH=$((PATCH + 1))
+          NEW_VERSION="$MAJOR.$MINOR.$NEW_PATCH"
+          echo "新版本: $NEW_VERSION"
+          
+          # 更新 package.json
+          jq --arg version "$NEW_VERSION" '.version = $version' package.json > package.json.tmp
+          mv package.json.tmp package.json
+          
+          # 提交版本变更
+          git add package.json
+          git commit -m "chore: bump version to $NEW_VERSION [skip ci]"
+          git push
+
       - name: 安装依赖
         run: |
           npm install
@@ -27,7 +69,7 @@ jobs:
           npm run package
       
       - name: 发布插件
-        if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/main'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: |
           npm run publish
         env:

package.json

@@ -2,7 +2,7 @@
   "name": "devstar",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "keywords": [],
   "publisher": "mengning",
   "engines": {

src/home.ts

@@ -79,7 +79,33 @@ export default class DSHome {
       async (message) => {
         const data = message.data;
         const need_return = message.need_return;
-        if (!need_return) {
+
+        if (need_return) {
+          // 处理需要返回结果的消息
+          switch (message.command) {
+            case 'getUserToken':
+              panel.webview.postMessage({
+                command: 'getUserToken',
+                data: { userToken: this.user.getUserTokenFromLocal() }
+              });
+              break;
+
+            case 'getUsername':
+              panel.webview.postMessage({
+                command: 'getUsername',
+                data: { username: this.user.getUsernameFromLocal() }
+              });
+              break;
+
+            case 'getDevstarDomain':
+              panel.webview.postMessage({
+                command: 'getDevstarDomain',
+                data: { devstarDomain: this.devstarDomain }
+              });
+              break;
+          }
+        } else {
+          // 处理不需要返回结果的消息
           switch (message.command) {
             case 'openExternalUrl':
               const url = message.url || (data && data.url);
@@ -96,6 +122,18 @@ export default class DSHome {
                 vscode.window.showErrorMessage('打开链接失败: 链接地址无效');
               }
               break;
+
+            case 'showInformationNotification':
+              if (data && data.message) {
+                vscode.window.showInformationMessage(data.message);
+              }
+              break;
+
+            case 'showErrorNotification':
+              if (data && data.message) {
+                vscode.window.showErrorMessage(data.message);
+              }
+              break;
           }
         }
       },

src/main.ts

@@ -66,32 +66,17 @@ export class DevStarExtension {
           const path = params.get('path');
           const accessToken = params.get('access_token');
           const devstarUsername = params.get('devstar_username');
-          const rawDevstarDomain = params.get('devstar_domain');
+          const devstarDomain = params.get('devstar_domain');
-          const cmd = params.get('cmd') || 'code'; // 获取 cmd 参数，默认为 code
+          const forwardPortsParam = params.get('forwardPorts');
-          let devstarDomain = rawDevstarDomain;
-          if (rawDevstarDomain) {
-            try {
-              const url = new URL(rawDevstarDomain);
-              devstarDomain = `${url.protocol}//${url.hostname}`;
 
-              // 从 rawDevstarDomain 的查询参数中提取 forwardPorts
+          // 处理 forwardPorts 参数
-              const forwardPortsParam = url.searchParams.get('forwardPorts');
           if (forwardPortsParam) {
             const ports = forwardPortsParam.split(',').map(port => parseInt(port, 10)).filter(port => !isNaN(port));
-                console.log('解析到的 forwardPorts 参数:', ports);
             context.globalState.update('forwardPorts', ports);
           } else {
             // 如果没有 forwardPorts 参数，清除 globalState 中的旧值
-                console.log('未找到 forwardPorts 参数，清除旧的 forwardPorts 配置');
             context.globalState.update('forwardPorts', undefined);
           }
-            } catch (error) {
-              console.error('Invalid devstar_domain URL:', error);
-            }
-          }
-          console.log('sanitized_devstar_domain:', devstarDomain);
-
-          // 使用修正后的 devstar_domain
           if (devstarDomain) {
             this.user.setDevstarDomain(devstarDomain);
             this.remoteContainer.setUser(this.user);
@@ -124,11 +109,11 @@ export class DevStarExtension {
                 // 如果没有用户登录，则直接登录;
                 const res = await this.user.login(accessToken, devstarUsername)
                 if (res === 'ok') {
-                  await this.remoteContainer.firstOpenProject(containerHost, containerHostname, containerPort, containerUsername, projectPath, this.context, cmd)
+                  await this.remoteContainer.firstOpenProject(containerHost, containerHostname, containerPort, containerUsername, projectPath, this.context)
                 }
               } else if (devstarUsername === this.user.getUsernameFromLocal()) {
                 // 如果同用户已经登录，则忽略，直接打开项目
-                await this.remoteContainer.firstOpenProject(containerHost, containerHostname, containerPort, containerUsername, projectPath, this.context, cmd)
+                await this.remoteContainer.firstOpenProject(containerHost, containerHostname, containerPort, containerUsername, projectPath, this.context)
               } else {
                 // 如果不是同用户，可以选择切换用户，或者不切换登录用户，直接打开容器
                 const selection = await vscode.window.showWarningMessage(`已登录用户：${this.user.getUsernameFromLocal()}，是否切换用户？`,
@@ -137,14 +122,14 @@ export class DevStarExtension {
                   // 如果没有用户登录，则直接登录;
                   const res = await this.user.login(accessToken, devstarUsername)
                   if (res === 'ok') {
-                    await this.remoteContainer.firstOpenProject(containerHost, containerHostname, containerPort, containerUsername, projectPath, this.context, cmd)
+                    await this.remoteContainer.firstOpenProject(containerHost, containerHostname, containerPort, containerUsername, projectPath, this.context)
                   }
                 } else if (selection === 'No') {
-                  await openProjectWithoutLogging(containerHost, containerPort, containerUsername, projectPath, cmd);
+                  await openProjectWithoutLogging(containerHost, containerPort, containerUsername, projectPath);
                 }
               }
             } else {
-              await openProjectWithoutLogging(containerHost, containerPort, containerUsername, projectPath, cmd);
+              await openProjectWithoutLogging(containerHost, containerPort, containerUsername, projectPath);
             }
           } else {
             vscode.window.showErrorMessage('Missing required parameters.');
@@ -161,7 +146,6 @@ export class DevStarExtension {
           const username = params.get('username');
           const path = params.get('path');
           const devstarDomain = params.get('devstar_domain')
-          const cmd = params.get('cmd') || 'code'; // 获取 cmd 参数，默认为 code
 
           if (host && hostname && port && username && path) {
             const container_host = host;
@@ -181,10 +165,10 @@ export class DevStarExtension {
               // 将devstar domain存在global state中
               context.globalState.update('devstarDomain', devstarDomain)
 
-              await this.remoteContainer.firstOpenProject(container_host, container_hostname, container_port, container_username, project_path, this.context, cmd)
+              await this.remoteContainer.firstOpenProject(container_host, container_hostname, container_port, container_username, project_path, this.context)
             } else {
               // devstarDomain参数不存在，则不存储，使用默认用户配置
-              await this.remoteContainer.firstOpenProject(container_host, container_hostname, container_port, container_username, project_path, this.context, cmd)
+              await this.remoteContainer.firstOpenProject(container_host, container_hostname, container_port, container_username, project_path, this.context)
             }
           }
         }

src/remote-container.ts

@@ -28,7 +28,7 @@ export default class RemoteContainer {
   /**
    * 第一次打开远程项目
    */
-  async firstOpenProject(host: string, hostname: string, port: number, username: string, path: string, context: vscode.ExtensionContext, cmd: string = 'code') {
+  async firstOpenProject(host: string, hostname: string, port: number, username: string, path: string, context: vscode.ExtensionContext) {
     if (vscode.env.remoteName) {
       try {
         await vscode.commands.executeCommand('workbench.action.terminal.newLocal');
@@ -76,7 +76,7 @@ export default class RemoteContainer {
         await this.firstConnect(host, hostname, username, port, path)
           .then((res) => {
             if (res === 'success') {
-              this.openRemoteFolder(host, port, username, path, context, cmd);
+              this.openRemoteFolder(host, port, username, path, context);
             } else {
               vscode.window.showErrorMessage('首次连接容器失败，请检查网络和容器状态。');
             }
@@ -263,24 +263,32 @@ export default class RemoteContainer {
         `root@${hostname}`
       ];
 
-      const sshProcess = spawn('ssh', sshArgs);
+      // 使用 detached 选项让 SSH 进程独立运行，不随父进程退出
+      const sshProcess = spawn('ssh', sshArgs, {
+        detached: true,  // 让进程在后台独立运行
+        stdio: 'ignore'  // 忽略输入输出，避免进程挂起
+      });
+
+      // 解除父进程对子进程的引用，使其真正独立
+      sshProcess.unref();
 
       sshProcess.on('error', (error: Error) => {
         reject(error);
       });
 
-      sshProcess.stdout.on('data', (_data: Buffer) => {
+      // 由于使用了 stdio: 'ignore'，这些事件监听器不再需要
-      });
+      // sshProcess.stdout.on('data', (data: Buffer) => {
+      //   console.log(`[SSH stdout] ${data.toString()}`);
+      // });
 
-      sshProcess.stderr.on('data', (_data: Buffer) => {
+      // sshProcess.stderr.on('data', (data: Buffer) => {
-      });
+      //   console.error(`[SSH stderr] ${data.toString()}`);
+      // });
 
-      if (!this.sshProcesses) {
+      // 注意：由于进程已 detached 和 unref，不再需要保存到 sshProcesses Map
-        this.sshProcesses = new Map();
+      // 因为我们无法也不需要控制这些独立进程的生命周期
-      }
-      const key = `${hostname}:${sshPort}:${containerPort}`;
-      this.sshProcesses.set(key, sshProcess);
 
+      // 等待 SSH 连接建立
       setTimeout(() => {
         resolve();
       }, 2000);
@@ -352,9 +360,10 @@ export default class RemoteContainer {
   /**
    * local env - 使用 Extension API 打开远程文件夹
    */
-  async openRemoteFolder(host: string, port: number, _username: string, path: string, context: vscode.ExtensionContext, _cmd: string = 'code'): Promise<void> {
+  async openRemoteFolder(host: string, port: number, _username: string, path: string, context: vscode.ExtensionContext): Promise<void> {
     try {
       const sshConfig = await this.getSSHConfig(host);
+
       if (sshConfig) {
         try {
           // 调用 setupPortForwardingFromGlobalState 方法
@@ -467,7 +476,7 @@ export default class RemoteContainer {
 /**
  * 打开项目（无须插件登录）- 使用 Extension API
  */
-export async function openProjectWithoutLogging(host: string, _port: number, _username: string, path: string, _cmd: string = 'code'): Promise<void> {
+export async function openProjectWithoutLogging(host: string, _port: number, _username: string, path: string): Promise<void> {
   try {
     // 使用 VSCode Extension API 打开远程连接
     // 使用 SSH config 中的 Host 别名，让 SSH config 的用户配置生效