feature-open-with-vscode (#4)
Some checks failed
CI/CD Pipeline for DevStar Extension / build (push) Failing after 11s

Co-authored-by: 孟宁 <mengning@mengning.com.cn>
Reviewed-on: #4
Co-authored-by: yinxue <2643126914@qq.com>
Co-committed-by: yinxue <2643126914@qq.com>
This commit is contained in:
2025-12-31 01:52:07 +00:00
committed by 孟宁
parent deee8f378f
commit 67cb6ab7f0
5 changed files with 112 additions and 37 deletions

View File

@@ -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;
}
}
},

View File

@@ -66,31 +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');
let devstarDomain = rawDevstarDomain;
if (rawDevstarDomain) {
try {
const url = new URL(rawDevstarDomain);
devstarDomain = `${url.protocol}//${url.hostname}`;
const devstarDomain = params.get('devstar_domain');
const forwardPortsParam = params.get('forwardPorts');
// 从 rawDevstarDomain 的查询参数中提取 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);
}
// 处理 forwardPorts 参数
if (forwardPortsParam) {
const ports = forwardPortsParam.split(',').map(port => parseInt(port, 10)).filter(port => !isNaN(port));
context.globalState.update('forwardPorts', ports);
} else {
// 如果没有 forwardPorts 参数,清除 globalState 中的旧值
context.globalState.update('forwardPorts', undefined);
}
console.log('sanitized_devstar_domain:', devstarDomain);
// 使用修正后的 devstar_domain
if (devstarDomain) {
this.user.setDevstarDomain(devstarDomain);
this.remoteContainer.setUser(this.user);

View File

@@ -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) {
this.sshProcesses = new Map();
}
const key = `${hostname}:${sshPort}:${containerPort}`;
this.sshProcesses.set(key, sshProcess);
// 注意:由于进程已 detached 和 unref不再需要保存到 sshProcesses Map
// 因为我们无法也不需要控制这些独立进程的生命周期
// 等待 SSH 连接建立
setTimeout(() => {
resolve();
}, 2000);
@@ -355,6 +363,7 @@ export default class RemoteContainer {
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 方法