修复删除JavaScript进程，修改依赖重新安装逻辑

back/loaders/initData.ts

@@ -22,14 +22,14 @@ export default async () => {
   );
 
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  dependenceDb.find({ status: { $in: [0, 1, 2] } }).exec((err, docs) => {
+  dependenceDb.find({ status: { $in: [0, 1, 2] } }).exec(async (err, docs) => {
     const groups = _.groupBy(docs, 'type');
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
         const group = groups[key];
         const depIds = group.map((x) => x._id);
         for (const dep of depIds) {
-          dependenceService.reInstall([dep]);
+          await dependenceService.reInstall([dep]);
         }
       }
     }

back/services/cron.ts

@@ -245,8 +245,11 @@ export default class CronService {
       } else {
         return;
       }
-      const pids = pid.match(/\(\d+/g);
+      let pids = pid.match(/\(\d+/g);
       const killLogs = [];
+      if (pids && pids.length > 0) {
+        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
+        pids = pids.slice(0, 3);
         for (const id of pids) {
           const c = `kill -9 ${id.slice(1)}`;
           const { stdout, stderr } = await execAsync(c);
@@ -257,6 +260,7 @@ export default class CronService {
             killLogs.push(stdout);
           }
         }
+      }
       return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
     } catch (e) {
       return JSON.stringify(e);

back/services/dependence.ts

@@ -131,7 +131,7 @@ export default class DependenceService {
         { $set: { status: DependenceStatus.installing, log: [] } },
         { multi: true, returnUpdatedDocs: true },
         async (err, num, docs: Dependence[]) => {
-          this.installOrUninstallDependencies(docs);
+          await this.installOrUninstallDependencies(docs);
           resolve(docs);
         },
       );
@@ -178,7 +178,9 @@ export default class DependenceService {
     dependencies: Dependence[],
     isInstall: boolean = true,
   ) {
+    return new Promise((resolve) => {
       if (dependencies.length === 0) {
+        resolve(null);
         return;
       }
       const depNames = dependencies.map((x) => x.name).join(' ');
@@ -229,6 +231,7 @@ export default class DependenceService {
           references: depIds,
         });
         this.updateLog(depIds, JSON.stringify(err));
+        resolve(null);
       });
 
       cp.on('close', (code) => {
@@ -275,6 +278,9 @@ export default class DependenceService {
             this.removeDb(depIds);
           }, 5000);
         }
+
+        resolve(null);
+      });
     });
   }
 }