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

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

src/pages/script/editModal.tsx

@@ -47,6 +47,7 @@ const EditModal = ({
   const [log, setLog] = useState<string>('');
   const { theme } = useTheme();
   const editorRef = useRef<any>(null);
+  const [isRunning, setIsRunning] = useState(false);
 
   const cancel = () => {
     handleCancel();
@@ -80,7 +81,22 @@ const EditModal = ({
           path: cNode.parent || '',
         },
       })
-      .then((data) => {});
+      .then((data) => {
+        setIsRunning(true);
+      });
+  };
+
+  const stop = () => {
+    request
+      .put(`${config.apiPrefix}scripts/stop`, {
+        data: {
+          filename: cNode.value,
+          path: cNode.parent || '',
+        },
+      })
+      .then((data) => {
+        setIsRunning(false);
+      });
   };
 
   useEffect(() => {
@@ -94,6 +110,13 @@ const EditModal = ({
       return;
     }
 
+    if (_message === '执行结束') {
+      _message = '';
+      setTimeout(() => {
+        setIsRunning(false);
+      }, 300);
+    }
+
     if (log) {
       _message = `\n${_message}`;
     }
@@ -135,8 +158,12 @@ const EditModal = ({
             <Option value="shell">shell</Option>
             <Option value="python">python</Option>
           </Select>
-          <Button type="primary" style={{ marginRight: 8 }} onClick={run}>
-            运行
+          <Button
+            type="primary"
+            style={{ marginRight: 8 }}
+            onClick={isRunning ? stop : run}
+          >
+            {isRunning ? '停止' : '运行'}
           </Button>
           <Button
             type="primary"
@@ -169,6 +196,7 @@ const EditModal = ({
             type="primary"
             style={{ marginRight: 8 }}
             onClick={() => {
+              stop();
               handleCancel();
             }}
           >
@@ -181,7 +209,12 @@ const EditModal = ({
       onClose={cancel}
       visible={visible}
     >
-      <SplitPane split="vertical" minSize={200} defaultSize="50%">
+      <SplitPane
+        split="vertical"
+        minSize={200}
+        defaultSize="50%"
+        style={{ height: 'calc(100vh - 55px)' }}
+      >
         <Editor
           language={language}
           value={value}
@@ -196,9 +229,7 @@ const EditModal = ({
             editorRef.current = editor;
           }}
         />
-        <div>
-          <pre>{log}</pre>
-        </div>
+        <pre style={{ height: '100%', whiteSpace: 'break-spaces' }}>{log}</pre>
       </SplitPane>
       <SaveModal
         visible={saveModalVisible}