调试脚本增加停止，修复调试交互

back/api/script.ts

@@ -266,4 +266,30 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.put(
+    '/stop',
+    celebrate({
+      body: Joi.object({
+        filename: Joi.string().required(),
+        path: Joi.string().optional().allow(''),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      try {
+        let { filename, path } = req.body as {
+          filename: string;
+          path: string;
+        };
+        const filePath = join(path, filename);
+        const scriptService = Container.get(ScriptService);
+        const result = await scriptService.stopScript(filePath);
+        res.send(result);
+      } catch (e) {
+        logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
 };

back/services/cron.ts

@@ -241,7 +241,7 @@ export default class CronService {
     });
   }
 
-  private async killTask(name: string) {
+  public async killTask(name: string) {
     let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
     const execAsync = promisify(exec);
     try {

back/services/script.ts

@@ -2,21 +2,19 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { spawn } from 'child_process';
 import SockService from './sock';
+import CronService from './cron';
 
 @Service()
 export default class ScriptService {
   constructor(
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
+    private cronService: CronService,
   ) {}
 
   public async runScript(path: string) {
     const cp = spawn(`task -l ${path} now`, { shell: '/bin/bash' });
 
-    this.sockService.sendMessage({
-      type: 'manuallyRunScript',
-      message: `开始执行脚本`,
-    });
     cp.stdout.on('data', (data) => {
       this.sockService.sendMessage({
         type: 'manuallyRunScript',
@@ -38,6 +36,26 @@ export default class ScriptService {
       });
     });
 
+    cp.on('close', (err) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: `执行结束`,
+      });
+    });
+
+    return { code: 200 };
+  }
+
+  public async stopScript(path: string) {
+    const err = await this.cronService.killTask(`task -l ${path} now`);
+    const str = err ? `\n${err}` : '';
+    this.sockService.sendMessage({
+      type: 'manuallyRunScript',
+      message: `${str}\n## 执行结束...  ${new Date()
+        .toLocaleString('zh', { hour12: false })
+        .replace(' 24:', ' 00:')} `,
+    });
+
     return { code: 200 };
   }
 }