修复任务频繁运行通知

back/services/notify.ts

@@ -4,9 +4,11 @@ import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import nodemailer from 'nodemailer';
 import { Inject, Service } from 'typedi';
 import winston from 'winston';
-import { parseBody, parseHeaders } from '../config/util';
+import { parseBody, parseHeaders, safeJSONParse } from '../config/util';
 import { NotificationInfo } from '../data/notify';
 import UserService from './user';
+import { readFile } from 'fs/promises';
+import config from '../config';
 
 @Service()
 export default class NotificationService {
@@ -43,7 +45,28 @@ export default class NotificationService {
     retry: 1,
   };
 
-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor() {}
+
+  public async externalNotify(
+    title: string,
+    content: string,
+  ): Promise<boolean | undefined> {
+    const { type, ...rest } = safeJSONParse(
+      await readFile(config.systemNotifyFile, 'utf-8'),
+    );
+    if (type) {
+      this.title = title;
+      this.content = content;
+      this.params = rest;
+      const notificationModeAction = this.modeMap.get(type);
+      try {
+        return await notificationModeAction?.call(this);
+      } catch (error: any) {
+        throw error;
+      }
+    }
+    return false;
+  }
 
   public async notify(
     title: string,

back/services/subscription.ts

@@ -306,7 +306,6 @@ export default class SubscriptionService {
     for (const doc of docs) {
       if (doc.pid) {
         try {
-          taskLimit.removeQueuedCron(String(doc.id));
           await killTask(doc.pid);
         } catch (error) {
           this.logger.error(error);

back/services/system.ts

@@ -382,7 +382,6 @@ export default class SystemService {
       return { code: 400, message: '参数错误' };
     }
 
-    taskLimit.removeQueuedCron(command.replace(/ /g, '-'));
     if (pid) {
       await killTask(pid);
       return { code: 200 };