diff --git a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts index 2cdf4dc8..4e91a1fc 100644 --- a/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts +++ b/src/vs/code/electron-sandbox/deploy/deployWindowMain.ts @@ -83,7 +83,7 @@ class deployWindow { extName: msg.extName }; this.extInstallState.set(msg.extName, 2); - console.log("render send kylinide.installWizard.msg.process"); + console.log("render send kylinide.installWizard.msg.process,installExt"); ipcRenderer.send("kylinide.installWizard.msg.process", installMsg); } else if (msg.type == "extInstalled") { @@ -151,7 +151,7 @@ class deployWindow { } else if (msg.type === "extDownloadInit") { console.log("receive: kylinide.installWizard.msg:extDownloadInit"); - await ipcRenderer.invoke('kylinide.installWizard.downloadExt', { + ipcRenderer.send('kylinide.installWizard.downloadExt', { extAddressPath: this.extAddressPath, configList: this.configList }); diff --git a/src/vs/platform/issue/electron-main/deployMainService.ts b/src/vs/platform/issue/electron-main/deployMainService.ts index c3d505e3..4d4d2649 100644 --- a/src/vs/platform/issue/electron-main/deployMainService.ts +++ b/src/vs/platform/issue/electron-main/deployMainService.ts @@ -240,6 +240,7 @@ export class DeployMainService implements IDeployMainService { } this.logger.debug("安装 ext installCommand", installCommand); if (this.installQueue?.length === 0) { + this.logger.info("将命令放入installQueue中", installCommand); this.installQueue.push({ installCommand, msg }); if (!this.cancelFlag) { await this.executeNextInstall(); @@ -247,8 +248,11 @@ export class DeployMainService implements IDeployMainService { } else { - if (!this.cancelFlag) + if (!this.cancelFlag) { + this.logger.info("将命令放入installQueue中", installCommand); this.installQueue?.push({ installCommand, msg }); + } + } } catch (error) { this.logger.error(`安装 ext 执行出错 ${installCommand}: ${error.message}`); @@ -903,8 +907,9 @@ export class DeployMainService implements IDeployMainService { if (this.DeployWindow) this.DeployWindow.webContents.send('kylinide.installWizard.msg', startDownloadMsg); if (!this.cancelFlag) { + //检查缓存目录是否已经存在插件 this.logger.info(`开始下载扩展 ${val} 到 ${this.extDownloadPath + filename} 从 ${downloadUrlAddr}`); - this.download_File(downloadUrlAddr, this.extDownloadPath + filename, this.controller).then((result) => { + this.download_VSIX(downloadUrlAddr, this.extDownloadPath + filename, this.controller).then((result) => { const msg = { type: 'downloadExtDone', fileName: filename, @@ -914,21 +919,9 @@ export class DeployMainService implements IDeployMainService { }; if (result === 0) { if (this.DeployWindow) this.DeployWindow.webContents.send('kylinide.installWizard.msg', msg); - } else { - this.println(`Download ${val} failed0: `); - this.logger.error(`下载扩展 ${val} 失败`); - const msg = { - type: 'downloadExtFail', - fileName: filename, - extName: val, - extMap: this.extMap, - extTotal: Object.keys(this.extMap).length, - }; - if (this.DeployWindow) this.DeployWindow.webContents.send('kylinide.installWizard.msg', msg); } }).catch((error) => { this.logger.error(`下载扩展 ${val} 异常: ${error}`); - this.println(`Download ${val} failed1: ${error}`); const msg = { type: 'downloadExtFail', fileName: filename ? filename : val, @@ -940,9 +933,10 @@ export class DeployMainService implements IDeployMainService { if (this.DeployWindow) this.DeployWindow.webContents.send('kylinide.installWizard.msg', msg); }); + + } } catch (error) { - this.println(`Download ${val} failed2: ${error}`); this.logger.error(`下载 ${val} 异常: ${error}`); const msg = { type: 'downloadExtFail', @@ -986,6 +980,7 @@ export class DeployMainService implements IDeployMainService { validatedIpcMain.removeListener('kylinide.installWizard.removeFileLister', this.listenerRemoveFileLister); validatedIpcMain.removeListener('kylinide.installWizard.init', this.listenerWriteSelectJson); validatedIpcMain.removeListener('kylinide.installWizard.reloadwindow', this.listenerReloadWindow); + validatedIpcMain.removeListener('kylinide.installWizard.downloadExt', this.handleDownExten); } private registerListeners(): void { this.logger.info("注册监听器"); @@ -1006,7 +1001,7 @@ export class DeployMainService implements IDeployMainService { validatedIpcMain.handle('kylinide.installWizard.init.httpVerify', this.handleHttpVerify); validatedIpcMain.handle('kylinide.installWizard.msg.deplist', this.handleDepList); validatedIpcMain.handle('kylinide.installWizard.checkInstall', this.handleCheckInstall); - validatedIpcMain.handle('kylinide.installWizard.downloadExt', this.handleDownExten); + validatedIpcMain.on('kylinide.installWizard.downloadExt', this.handleDownExten); } //#endregion @@ -1080,7 +1075,7 @@ export class DeployMainService implements IDeployMainService { const { installCommand, msg } = this.installQueue[0]; try { const extlogFile = this.installConfig + '/log/extInstall.1.log'; - + this.logger.info(`开始执行${installCommand}`); let ret: { stdout: string, stderr: string } = await this.spawnCommand(installCommand) as { stdout: string; stderr: string; }; if (ret.stdout) { fs.appendFileSync(extlogFile, ret.stdout); @@ -1126,7 +1121,7 @@ export class DeployMainService implements IDeployMainService { } this.installQueue.shift(); // 执行完成后，将当前消息从队列中移除 - if (!this.cancelFlag) + if (!this.cancelFlag && this.installQueue.length > 0) await this.executeNextInstall(); // 继续执行下一个消息 else { this.installQueue.splice(0) } } @@ -1147,6 +1142,7 @@ export class DeployMainService implements IDeployMainService { }); child.on('close', (code) => { + clearTimeout(timer); this.controller.signal.removeEventListener('abort', cancelTask); if (code === 0) { resolve({ stdout, stderr }); @@ -1154,9 +1150,18 @@ export class DeployMainService implements IDeployMainService { reject(new Error(`Command failed with exit code ${code} `)); } }); - const cancelTask = () => { - if (child.pid) + const timer = setTimeout(() => { + reject(new Error('命令执行超时')); + if (child && child.pid) { execSync(`kill -9 -${child.pid}`); + } + }, 1200000); + const cancelTask = () => { + if (child.pid) { + reject(new Error('取消命令')) + execSync(`kill -9 -${child.pid}`); + } + } this.controller.signal.addEventListener('abort', cancelTask); }); @@ -1470,6 +1475,14 @@ export class DeployMainService implements IDeployMainService { resolve(0); }); + response.data.on('error', () => { + this.logger.error("文件下载失败：" + dst, "response data on error"); + if (fs.existsSync(dst)) { + fs.unlinkSync(dst); + } + reject(-1); + }); + writer.on('error', (err) => { console.error('写入文件时发生错误:', err); if (fs.existsSync(dst)) { @@ -1492,6 +1505,56 @@ export class DeployMainService implements IDeployMainService { } } + private async download_VSIX(url_git: string, dst: string, controller?: AbortController) { + return new Promise(async (resolve, reject) => { + try { + const directoryPath = path.dirname(dst); + // 判断目录是否存在 + if (!fs.existsSync(directoryPath)) { + // 创建目录 + fs.mkdirSync(directoryPath, { recursive: true }); + } + const response = await axios.get(url_git, { responseType: 'stream', timeout: 10000, signal: this.controller?.signal }); + const writer = fs.createWriteStream(dst); + response.data.pipe(writer); + writer.on('open', () => { + this.logger.info("文件开始写入：" + dst); + }); + writer.on('finish', () => { + this.logger.info("文件下载成功：" + dst); + resolve(0); + }); + response.data.on('error', () => { + this.logger.error("文件下载失败：" + dst, "response data on error"); + if (fs.existsSync(dst)) { + fs.unlinkSync(dst); + } + reject(-1); + }); + writer.on('error', (err) => { + this.logger.error('文件下载失败，写入文件时发生错误:', dst, err); + if (fs.existsSync(dst)) { + fs.unlinkSync(dst); + } + reject(-1); + }); + + } catch (error) { + this.logger.error("文件下载失败：" + dst); + if (axios.isCancel(error)) { + this.logger.error('文件下载请求已取消', dst); + } + else if (error.code === 'ECONNABORTED') { + this.logger.error("文件下载请求超时", dst); + } else { + this.logger.error('文件下载请求发生错误', dst, error); + } + reject(-1); + } + }) + } + + private async localConfigVerify(configDir: string, IDEVersion: string) { try { var dst = path.join(configDir, "./g_index.json");