更新版本 v2.13.2

back/api/log.ts

@@ -31,7 +31,7 @@ export default (app: Router) => {
       try {
         const filePath = join(
           config.logPath,
-          req.query.path as string,
+          (req.query.path || '') as string,
           req.params.file,
         );
         const content = getFileContentByName(filePath);

back/api/subscription.ts

@@ -29,7 +29,13 @@ export default (app: Router) => {
       body: Joi.object({
         type: Joi.string().required(),
         schedule: Joi.string().optional().allow('').allow(null),
-        interval_schedule: Joi.object().optional().allow('').allow(null),
+        interval_schedule: Joi.object({
+          type: Joi.string().required(),
+          value: Joi.number().min(1).required(),
+        })
+          .optional()
+          .allow('')
+          .allow(null),
         name: Joi.string().optional().allow('').allow(null),
         url: Joi.string().required(),
         whitelist: Joi.string().optional().allow('').allow(null),

back/loaders/initData.ts

@@ -21,18 +21,17 @@ export default async () => {
   );
 
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  DependenceModel.findAll({ where: {}, raw: true }).then(async (docs) => {
+  DependenceModel.findAll({
+    where: {},
+    order: [['type', 'DESC']],
+    raw: true,
+  }).then(async (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) {
-          if (dep) {
-            await dependenceService.reInstall([dep]);
-          }
-        }
-      }
+    const keys = Object.keys(groups).sort((a, b) => parseInt(b) - parseInt(a));
+    for (const key of keys) {
+      const group = groups[key];
+      const depIds = group.map((x) => x.id);
+      await dependenceService.reInstall(depIds as number[]);
     }
   });
 

back/loaders/initTask.ts

@@ -26,6 +26,11 @@ export default async () => {
   // 运行所有订阅
   const subs = await subscriptionService.list();
   for (const sub of subs) {
-    await subscriptionService.handleTask(sub);
+    await subscriptionService.handleTask(
+      sub,
+      !sub.is_disabled,
+      true,
+      !sub.is_disabled,
+    );
   }
 };

back/services/dependence.ts

@@ -13,6 +13,7 @@ import _ from 'lodash';
 import { spawn } from 'child_process';
 import SockService from './sock';
 import { Op } from 'sequelize';
+import { concurrentRun } from '../config/util';
 
 @Service()
 export default class DependenceService {
@@ -27,7 +28,7 @@ export default class DependenceService {
       return tab;
     });
     const docs = await this.insert(tabs);
-    this.installOrUninstallDependencies(docs);
+    this.installDependenceOneByOne(docs);
     return docs;
   }
 
@@ -47,7 +48,7 @@ export default class DependenceService {
       status: DependenceStatus.installing,
     });
     const newDoc = await this.updateDb(tab);
-    this.installOrUninstallDependencies([newDoc]);
+    this.installDependenceOneByOne([newDoc]);
     return newDoc;
   }
 
@@ -62,7 +63,7 @@ export default class DependenceService {
       { where: { id: ids } },
     );
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installOrUninstallDependencies(docs, false, force);
+    this.installDependenceOneByOne(docs, false, force);
     return docs;
   }
 
@@ -98,6 +99,20 @@ export default class DependenceService {
     }
   }
 
+  private installDependenceOneByOne(
+    docs: Dependence[],
+    isInstall: boolean = true,
+    force: boolean = false,
+  ) {
+    concurrentRun(
+      docs.map(
+        (dep) => async () =>
+          await this.installOrUninstallDependencies([dep], isInstall, force),
+      ),
+      1,
+    );
+  }
+
   public async reInstall(ids: number[]): Promise<Dependence[]> {
     await DependenceModel.update(
       { status: DependenceStatus.installing, log: [] },
@@ -105,7 +120,7 @@ export default class DependenceService {
     );
 
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installOrUninstallDependencies(docs);
+    this.installDependenceOneByOne(docs);
     return docs;
   }
 

back/services/schedule.ts

@@ -18,6 +18,7 @@ interface ScheduleTaskType {
 }
 
 export interface TaskCallbacks {
+  onBefore?: (startTime: dayjs.Dayjs) => Promise<void>;
   onStart?: (
     cp: ChildProcessWithoutNullStreams,
     startTime: dayjs.Dayjs,
@@ -45,6 +46,8 @@ export default class ScheduleService {
     return new Promise(async (resolve, reject) => {
       try {
         const startTime = dayjs();
+        await callbacks.onBefore?.(startTime);
+
         const cp = spawn(command, { shell: '/bin/bash' });
 
         // TODO:
@@ -106,6 +109,7 @@ export default class ScheduleService {
   async createCronTask(
     { id = 0, command, name, schedule = '' }: ScheduleTaskType,
     callbacks?: TaskCallbacks,
+    runImmediately = false,
   ) {
     const _id = this.formatId(id);
     this.logger.info(
@@ -122,6 +126,10 @@ export default class ScheduleService {
         await this.runTask(command, callbacks);
       }),
     );
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
   }
 
   async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
@@ -160,9 +168,17 @@ export default class ScheduleService {
       },
     );
 
-    const job = new LongIntervalJob({ ...schedule, runImmediately }, task, _id);
+    const job = new LongIntervalJob(
+      { ...schedule, runImmediately: false },
+      task,
+      _id,
+    );
 
     this.intervalSchedule.addIntervalJob(job);
+
+    if (runImmediately) {
+      await this.runTask(command, callbacks);
+    }
   }
 
   async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {

back/services/sshKey.ts

@@ -23,6 +23,13 @@ export default class SshKeyService {
     }
   }
 
+  private getConfigRegx(alias: string) {
+    return new RegExp(
+      `Host ${alias}\n.*[^StrictHostKeyChecking]*.*[\n]*.*StrictHostKeyChecking no`,
+      'g',
+    );
+  }
+
   private removePrivateKeyFile(alias: string): void {
     try {
       fs.unlinkSync(`${this.sshPath}/${alias}`);
@@ -47,24 +54,25 @@ export default class SshKeyService {
     }
   }
 
-  private removeSshConfig(config: string) {
+  private removeSshConfig(alias: string) {
     try {
+      const configRegx = this.getConfigRegx(alias);
       const data = fs
         .readFileSync(this.sshConfigFilePath, { encoding: 'utf8' })
-        .replace(config, '')
-        .replace(/\n\n+/, '\n\n');
+        .replace(configRegx, '')
+        .replace(/\n[\n]+/g, '\n');
       fs.writeFileSync(this.sshConfigFilePath, data, {
         encoding: 'utf8',
       });
     } catch (error) {
-      this.logger.error(`删除ssh配置文件${config}失败`, error);
+      this.logger.error(`删除ssh配置文件${alias}失败`, error);
     }
   }
 
   public addSSHKey(key: string, alias: string, host: string): void {
     this.generatePrivateKeyFile(alias, key);
     const config = this.generateSingleSshConfig(alias, host);
-    this.removeSshConfig(config);
+    this.removeSshConfig(alias);
     this.generateSshConfig([config]);
   }
 

back/services/subscription.ts

@@ -124,7 +124,12 @@ export default class SubscriptionService {
     return { url, host };
   }
 
-  public handleTask(doc: Subscription, needCreate = true, needAddKey = true) {
+  public async handleTask(
+    doc: Subscription,
+    needCreate = true,
+    needAddKey = true,
+    runImmediately = false,
+  ) {
     const { url, host } = this.formatUrl(doc);
     if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
       if (needAddKey) {
@@ -143,23 +148,36 @@ export default class SubscriptionService {
     if (doc.schedule_type === 'crontab') {
       this.scheduleService.cancelCronTask(doc as any);
       needCreate &&
-        this.scheduleService.createCronTask(
+        (await this.scheduleService.createCronTask(
           doc as any,
           this.taskCallbacks(doc),
-        );
+          runImmediately,
+        ));
     } else {
       this.scheduleService.cancelIntervalTask(doc as any);
       const { type, value } = doc.interval_schedule as any;
       needCreate &&
-        this.scheduleService.createIntervalTask(
+        (await this.scheduleService.createIntervalTask(
           doc as any,
           { [type]: value } as SimpleIntervalSchedule,
-          true,
+          runImmediately,
           this.taskCallbacks(doc),
-        );
+        ));
     }
   }
 
+  private async promiseExec(command: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+      exec(
+        command,
+        { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' },
+        (err, stdout, stderr) => {
+          resolve(stdout || stderr || JSON.stringify(err));
+        },
+      );
+    });
+  }
+
   private async handleLogPath(
     logPath: string,
     data: string = '',
@@ -174,32 +192,39 @@ export default class SubscriptionService {
 
   private taskCallbacks(doc: Subscription): TaskCallbacks {
     return {
-      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
-        // 执行sub_before
-        let beforeStr = '';
-        try {
-          if (doc.sub_before) {
-            beforeStr = execSync(doc.sub_before).toString();
-          }
-        } catch (error) {
-          beforeStr = JSON.stringify(error);
-        }
-        if (beforeStr) {
-          beforeStr += '\n';
-        }
-
+      onBefore: async (startTime) => {
         const logTime = startTime.format('YYYY-MM-DD-HH-mm-ss');
         const logPath = `${doc.alias}/${logTime}.log`;
-        await this.handleLogPath(
-          logPath as string,
-          `${beforeStr}## 开始执行... ${startTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}\n`,
-        );
         await SubscriptionModel.update(
           {
             status: SubscriptionStatus.running,
             log_path: logPath,
+          },
+          { where: { id: doc.id } },
+        );
+        const absolutePath = await this.handleLogPath(
+          logPath as string,
+          `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`,
+        );
+
+        // 执行sub_before
+        let beforeStr = '';
+        try {
+          if (doc.sub_before) {
+            fs.appendFileSync(absolutePath, `\n## 执行before命令...\n\n`);
+            beforeStr = await this.promiseExec(doc.sub_before);
+          }
+        } catch (error: any) {
+          beforeStr =
+            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
+        }
+        if (beforeStr) {
+          fs.appendFileSync(absolutePath, `${beforeStr}\n`);
+        }
+      },
+      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
+        await SubscriptionModel.update(
+          {
             pid: cp.pid,
           },
           { where: { id: doc.id } },
@@ -207,11 +232,23 @@ export default class SubscriptionService {
       },
       onEnd: async (cp, endTime, diff) => {
         const sub = await this.getDb({ id: doc.id });
-        await SubscriptionModel.update(
-          { status: SubscriptionStatus.idle, pid: undefined },
-          { where: { id: sub.id } },
-        );
         const absolutePath = await this.handleLogPath(sub.log_path as string);
+
+        // 执行 sub_after
+        let afterStr = '';
+        try {
+          if (sub.sub_after) {
+            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
+            afterStr = await this.promiseExec(sub.sub_after);
+          }
+        } catch (error: any) {
+          afterStr =
+            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
+        }
+        if (afterStr) {
+          fs.appendFileSync(absolutePath, `${afterStr}\n`);
+        }
+
         fs.appendFileSync(
           absolutePath,
           `\n## 执行结束... ${endTime.format(
@@ -219,20 +256,10 @@ export default class SubscriptionService {
           )}  耗时 ${diff} 秒`,
         );
 
-        // 执行 sub_after
-        let afterStr = '';
-        try {
-          if (sub.sub_after) {
-            afterStr = execSync(sub.sub_after).toString();
-          }
-        } catch (error) {
-          afterStr = JSON.stringify(error);
-        }
-        if (afterStr) {
-          afterStr = `\n\n${afterStr}`;
-          const absolutePath = await this.handleLogPath(sub.log_path as string);
-          fs.appendFileSync(absolutePath, afterStr);
-        }
+        await SubscriptionModel.update(
+          { status: SubscriptionStatus.idle, pid: undefined },
+          { where: { id: sub.id } },
+        );
 
         this.sockService.sendMessage({
           type: 'runSubscriptionEnd',
@@ -256,7 +283,7 @@ export default class SubscriptionService {
   public async create(payload: Subscription): Promise<Subscription> {
     const tab = new Subscription(payload);
     const doc = await this.insert(tab);
-    this.handleTask(doc);
+    await this.handleTask(doc);
     return doc;
   }
 
@@ -266,7 +293,7 @@ export default class SubscriptionService {
 
   public async update(payload: Subscription): Promise<Subscription> {
     const newDoc = await this.updateDb(payload);
-    this.handleTask(newDoc);
+    await this.handleTask(newDoc, !newDoc.is_disabled);
     return newDoc;
   }
 
@@ -309,7 +336,7 @@ export default class SubscriptionService {
   public async remove(ids: number[]) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      this.handleTask(doc, false, false);
+      await this.handleTask(doc, false, false);
     }
     await SubscriptionModel.destroy({ where: { id: ids } });
   }
@@ -340,7 +367,6 @@ export default class SubscriptionService {
           this.logger.silly(error);
         }
       }
-      this.handleTask(doc, false);
       const command = this.formatCommand(doc);
       const err = await this.killTask(command);
       const absolutePath = await this.handleLogPath(doc.log_path as string);
@@ -411,7 +437,7 @@ export default class SubscriptionService {
   public async disabled(ids: number[]) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      this.handleTask(doc, false);
+      await this.handleTask(doc, false);
     }
     await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
   }
@@ -419,14 +445,14 @@ export default class SubscriptionService {
   public async enabled(ids: number[]) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      this.handleTask(doc);
+      await this.handleTask(doc);
     }
     await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
   }
 
   public async log(id: number) {
     const doc = await this.getDb({ id });
-    if (!doc) {
+    if (!doc || !doc.log_path) {
       return '';
     }
 

docker/Dockerfile

@@ -5,7 +5,8 @@ LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=master
 
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules \
+ENV PNPM_HOME=/root/.local/share/pnpm \
+    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
     LANG=zh_CN.UTF-8 \
     SHELL=/bin/bash \
     PS1="\u@\h:\w \$ " \
@@ -38,8 +39,6 @@ RUN set -x \
     && git config --global user.email "qinglong@@users.noreply.github.com" \
     && git config --global user.name "qinglong" \
     && npm install -g pnpm \
-    && pnpm setup \
-    && source ~/.bashrc \
     && pnpm add -g pm2 ts-node typescript tslib \
     && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
     && cd ${QL_DIR} \

package.json

@@ -40,8 +40,8 @@
   },
   "dependencies": {
     "@otplib/preset-default": "^12.0.1",
-    "@sentry/node": "^6.18.1",
-    "@sentry/tracing": "^6.18.1",
+    "@sentry/node": "^7.0.0",
+    "@sentry/tracing": "^7.0.0",
     "body-parser": "^1.19.2",
     "celebrate": "^15.0.1",
     "chokidar": "^3.5.3",
@@ -77,7 +77,7 @@
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.33.1",
     "@monaco-editor/react": "^4.3.1",
-    "@sentry/react": "^6.18.1",
+    "@sentry/react": "^7.0.0",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",

sample/tool.ts

@@ -17,7 +17,7 @@ const config = new qiniu.conf.Config({ zone: qiniu.zone.Zone_z1 });
 const formUploader = new qiniu.form_up.FormUploader(config);
 const putExtra = new qiniu.form_up.PutExtra(
   '',
-  '',
+  {},
   'text/plain; charset=utf-8',
 );
 // 文件上传

shell/update.sh

@@ -305,6 +305,7 @@ patch_version() {
     fi
 
     # 兼容pnpm@7 
+    npm i -g pnpm
     pnpm setup
     source ~/.bashrc
 

src/pages/crontab/detail.tsx

@@ -115,9 +115,13 @@ const CronDetailModal = ({
 
   const onClickItem = (item: LogItem) => {
     localStorage.setItem('logCron', currentCron.id);
-    setLogUrl(`${config.apiPrefix}logs/${item.directory}/${item.filename}`);
+    setLogUrl(
+      `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+    );
     request
-      .get(`${config.apiPrefix}logs/${item.directory}/${item.filename}`)
+      .get(
+        `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+      )
       .then((data) => {
         setLog(data.data);
         setIsLogModalVisible(true);

src/pages/crontab/index.tsx

@@ -438,8 +438,10 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               message.success('删除成功');
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1);
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1);
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -470,11 +472,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                status: CrontabStatus.running,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  status: CrontabStatus.running,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -505,12 +509,14 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                pid: null,
-                status: CrontabStatus.idle,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  pid: null,
+                  status: CrontabStatus.idle,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -550,11 +556,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               const newStatus = record.isDisabled === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                isDisabled: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  isDisabled: newStatus,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -594,11 +602,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
               const newStatus = record.isPinned === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                isPinned: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  isPinned: newStatus,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -709,11 +719,13 @@ const Crontab = ({ headerStyle, isPhone, theme }: any) => {
           .parseExpression(data.data.schedule)
           .next()
           .toDate();
-        result.splice(index, 1, {
-          ...cron,
-          ...data.data,
-        });
-        setValue(result);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...cron,
+            ...data.data,
+          });
+          setValue(result);
+        }
       })
       .finally(() => setLoading(false));
   };

src/pages/dependence/index.tsx

@@ -271,9 +271,11 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       result.push(...dependence);
     } else {
       const index = value.findIndex((x) => x.id === dependence.id);
-      result.splice(index, 1, {
-        ...dependence,
-      });
+      if (index !== -1) {
+        result.splice(index, 1, {
+          ...dependence,
+        });
+      }
     }
     setValue(result);
   };
@@ -324,11 +326,13 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       .then((data: any) => {
         const index = value.findIndex((x) => x.id === dependence.id);
         const result = [...value];
-        result.splice(index, 1, {
-          ...dependence,
-          ...data.data,
-        });
-        setValue(result);
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...dependence,
+            ...data.data,
+          });
+          setValue(result);
+        }
       })
       .finally(() => setLoading(false));
   };
@@ -371,10 +375,12 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
       const result = [...value];
       for (let i = 0; i < references.length; i++) {
         const index = value.findIndex((x) => x.id === references[i]);
-        result.splice(index, 1, {
-          ...result[index],
-          status,
-        });
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status,
+          });
+        }
       }
       setValue(result);
 
@@ -383,7 +389,9 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
           const _result = [...value];
           for (let i = 0; i < references.length; i++) {
             const index = value.findIndex((x) => x.id === references[i]);
-            _result.splice(index, 1);
+            if (index !== -1) {
+              _result.splice(index, 1);
+            }
           }
           setValue(_result);
         }, 5000);
@@ -483,8 +491,10 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
           if (needRemove) {
             const index = value.findIndex((x) => x.id === logDependence.id);
             const result = [...value];
-            result.splice(index, 1);
-            setValue(result);
+            if (index !== -1) {
+              result.splice(index, 1);
+              setValue(result);
+            }
           } else if ([...value].map((x) => x.id).includes(logDependence.id)) {
             getDependenceDetail(logDependence);
           }

src/pages/dependence/logModal.tsx

@@ -90,17 +90,19 @@ const DependenceLogModal = ({
   }, [dependence]);
 
   useEffect(() => {
-    if (!socketMessage) return;
+    if (!socketMessage || !dependence) return;
     const { type, message, references } = socketMessage;
     if (
       type === 'installDependence' &&
-      message.includes('结束时间') &&
-      references.length > 0
+      references.length > 0 &&
+      references.includes(dependence.id)
     ) {
-      setExecuting(false);
-      setIsRemoveFailed(message.includes('删除失败'));
+      if (message.includes('结束时间')) {
+        setExecuting(false);
+        setIsRemoveFailed(message.includes('删除失败'));
+      }
+      setValue(`${value}${message}`);
     }
-    setValue(`${value}${message}`);
   }, [socketMessage]);
 
   useEffect(() => {

src/pages/script/index.tsx

@@ -278,13 +278,17 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
                 const index = parentNode.children.findIndex(
                   (y) => y.key === currentNode.key,
                 );
-                parentNode.children.splice(index, 1);
-                newData.splice(parentNodeIndex, 1, { ...parentNode });
+                if (index !== -1 && parentNodeIndex !== -1) {
+                  parentNode.children.splice(index, 1);
+                  newData.splice(parentNodeIndex, 1, { ...parentNode });
+                }
               } else {
                 const index = newData.findIndex(
                   (x) => x.key === currentNode.key,
                 );
-                newData.splice(index, 1);
+                if (index !== -1) {
+                  newData.splice(index, 1);
+                }
               }
               setData(newData);
             } else {
@@ -314,13 +318,15 @@ const Script = ({ headerStyle, isPhone, theme, socketMessage }: any) => {
       const _file = { title: filename, key, value: filename, parent: path };
       if (path) {
         const parentNodeIndex = newData.findIndex((x) => x.key === path);
-        const parentNode = newData[parentNodeIndex];
-        if (parentNode.children && parentNode.children.length > 0) {
-          parentNode.children.unshift(_file);
-        } else {
-          parentNode.children = [_file];
+        if (parentNodeIndex !== -1) {
+          const parentNode = newData[parentNodeIndex];
+          if (parentNode.children && parentNode.children.length > 0) {
+            parentNode.children.unshift(_file);
+          } else {
+            parentNode.children = [_file];
+          }
+          newData.splice(parentNodeIndex, 1, { ...parentNode });
         }
-        newData.splice(parentNodeIndex, 1, { ...parentNode });
       } else {
         newData.unshift(_file);
       }

src/pages/subscription/index.tsx

@@ -263,11 +263,13 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                status: SubscriptionStatus.running,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  status: SubscriptionStatus.running,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -298,12 +300,14 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
             if (data.code === 200) {
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                pid: null,
-                status: SubscriptionStatus.idle,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  pid: null,
+                  status: SubscriptionStatus.idle,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -356,8 +360,10 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
               message.success('删除成功');
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1);
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1);
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -397,11 +403,13 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
               const newStatus = record.is_disabled === 1 ? 0 : 1;
               const result = [...value];
               const i = result.findIndex((x) => x.id === record.id);
-              result.splice(i, 1, {
-                ...record,
-                is_disabled: newStatus,
-              });
-              setValue(result);
+              if (i !== -1) {
+                result.splice(i, 1, {
+                  ...record,
+                  is_disabled: newStatus,
+                });
+                setValue(result);
+              }
             } else {
               message.error(data);
             }
@@ -509,10 +517,12 @@ const Subscription = ({ headerStyle, isPhone, socketMessage }: any) => {
       const result = [...value];
       for (let i = 0; i < references.length; i++) {
         const index = value.findIndex((x) => x.id === references[i]);
-        result.splice(index, 1, {
-          ...result[index],
-          status: SubscriptionStatus.idle,
-        });
+        if (index !== -1) {
+          result.splice(index, 1, {
+            ...value[index],
+            status: SubscriptionStatus.idle,
+          });
+        }
       }
       setValue(result);
     }

src/pages/subscription/modal.tsx

@@ -107,12 +107,18 @@ const SubscriptionModal = ({
     const [intervalNumber, setIntervalNumber] = useState<number>();
     const intervalTypeChange = (type: string) => {
       setIntervalType(type);
-      onChange?.({ type, value: intervalNumber });
+      if (intervalNumber && intervalNumber > 0) {
+        onChange?.({ type, value: intervalNumber });
+      }
     };
 
     const numberChange = (value: number) => {
       setIntervalNumber(value);
-      onChange?.({ type: intervalType, value });
+      if (!value) {
+        onChange?.(null);
+      } else {
+        onChange?.({ type: intervalType, value });
+      }
     };
 
     useEffect(() => {
@@ -195,7 +201,9 @@ const SubscriptionModal = ({
         dependences,
         branch,
         extensions,
-      ] = text.split(' ').map((x) => x.trim());
+      ] = text
+        .split(' ')
+        .map((x) => x.trim().replace(/\"/g, '').replace(/\'/, ''));
       form.setFieldsValue({
         type:
           type === 'raw'
@@ -209,6 +217,7 @@ const SubscriptionModal = ({
         dependences,
         branch,
         extensions,
+        alias: formatAlias(url, branch),
       });
     }
   }, []);

src/utils/init.ts

@@ -7,9 +7,15 @@ export function init() {
   // sentry监控 init
   Sentry.init({
     dsn: 'https://3406424fb1dc4813a62d39e844a9d0ac@o1098464.ingest.sentry.io/6122818',
-    integrations: [new Integrations.BrowserTracing()],
+    integrations: [
+      new Integrations.BrowserTracing({
+        shouldCreateSpanForRequest(url) {
+          return !url.includes('/api/ws') && !url.includes('/api/static');
+        },
+      }),
+    ],
     release: version,
-    tracesSampleRate: 1.0,
+    tracesSampleRate: 0.1,
     beforeBreadcrumb(breadcrumb, hint?) {
       if (breadcrumb.data && breadcrumb.data.url) {
         const url = breadcrumb.data.url.replace(/token=.*/, '');

src/version.ts

@@ -1,12 +1,8 @@
-export const version = '2.13.0';
+export const version = '2.13.2';
 export const changeLogLink = 'https://t.me/jiao_long/303';
-export const changeLog = `2.13.0 版本说明
-1. 新增订阅管理模块，支持公开仓库/私有仓库等
-2. 支持修改头像
-3. 修复特殊字符环境变量异常
-4. 修改定时任务添加标签
-5. 修复添加任务默认会展示一个空标签
-6. 修复用户名显示
-7. 修复依赖安装
-8. 其他bug修复
+export const changeLog = `2.13.2 版本说明
+1. 修复nodejs依赖安装失败pnpm setup
+2. 修复订阅禁用失效
+3. 修复新建订阅定时验证
+4. 修复ssh配置文件更新逻辑
 `;