Apply prettier formatting to notify.js

Co-authored-by: whyour <22700758+whyour@users.noreply.github.com>

back/api/script.ts

@@ -130,7 +130,7 @@ export default (app: Router) => {
         originFilename: Joi.string().optional().allow(''),
         directory: Joi.string().optional().allow(''),
         file: Joi.string().optional().allow(''),
-      }),
+      }).unknown(true),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {

sample/notify.js

@@ -482,9 +482,13 @@ function tgBotNotify(text, desp) {
         timeout,
       };
       if (TG_PROXY_HOST && TG_PROXY_PORT) {
+        let proxyHost = TG_PROXY_HOST;
+        if (TG_PROXY_AUTH && !TG_PROXY_HOST.includes('@')) {
+          proxyHost = `${TG_PROXY_AUTH}@${TG_PROXY_HOST}`;
+        }
         let agent;
         agent = new ProxyAgent({
-          uri: `http://${TG_PROXY_AUTH}${TG_PROXY_HOST}:${TG_PROXY_PORT}`,
+          uri: `http://${proxyHost}:${TG_PROXY_PORT}`,
         });
         options.dispatcher = agent;
       }
@@ -992,7 +996,10 @@ function fsBotNotify(text, desp) {
   return new Promise((resolve) => {
     const { FSKEY, FSSECRET } = push_config;
     if (FSKEY) {
-      const body = { msg_type: 'text', content: { text: `${text}\n\n${desp}` } };
+      const body = {
+        msg_type: 'text',
+        content: { text: `${text}\n\n${desp}` },
+      };
 
       // Add signature if secret is provided
       // Note: Feishu's signature algorithm uses timestamp+"\n"+secret as the HMAC key
@@ -1278,7 +1285,15 @@ function ntfyNotify(text, desp) {
   }
 
   return new Promise((resolve) => {
-    const { NTFY_URL, NTFY_TOPIC, NTFY_PRIORITY, NTFY_TOKEN, NTFY_USERNAME, NTFY_PASSWORD, NTFY_ACTIONS } = push_config;
+    const {
+      NTFY_URL,
+      NTFY_TOPIC,
+      NTFY_PRIORITY,
+      NTFY_TOKEN,
+      NTFY_USERNAME,
+      NTFY_PASSWORD,
+      NTFY_ACTIONS,
+    } = push_config;
     if (NTFY_TOPIC) {
       const options = {
         url: `${NTFY_URL || 'https://ntfy.sh'}/${NTFY_TOPIC}`,
@@ -1293,7 +1308,8 @@ function ntfyNotify(text, desp) {
       if (NTFY_TOKEN) {
         options.headers['Authorization'] = `Bearer ${NTFY_TOKEN}`;
       } else if (NTFY_USERNAME && NTFY_PASSWORD) {
-        options.headers['Authorization'] = `Basic ${Buffer.from(`${NTFY_USERNAME}:${NTFY_PASSWORD}`).toString('base64')}`;
+        options.headers['Authorization'] =
+          `Basic ${Buffer.from(`${NTFY_USERNAME}:${NTFY_PASSWORD}`).toString('base64')}`;
       }
       if (NTFY_ACTIONS) {
         options.headers['Actions'] = encodeRFC2047(NTFY_ACTIONS);

src/pages/crontab/modal.tsx

@@ -3,7 +3,7 @@ import config from '@/utils/config';
 import { request } from '@/utils/http';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { Button, Form, Input, Modal, Select, Space, message } from 'antd';
-import cronParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import { useEffect, useState } from 'react';
 import intl from 'react-intl-universal';
 import { getScheduleType, scheduleTypeMap } from './const';
@@ -91,14 +91,10 @@ const CronModal = ({
             { required: true },
             {
               validator: (_, value) => {
-                try {
-                  if (!value || cronParser.CronExpressionParser.parse(value).hasNext()) {
-                    return Promise.resolve();
-                  }
-                  return Promise.reject(intl.get('Cron表达式格式有误'));
-                } catch (e) {
-                  return Promise.reject(intl.get('Cron表达式格式有误'));
+                if (!value || CronExpressionParser.parse(value).hasNext()) {
+                  return Promise.resolve();
                 }
+                return Promise.reject(intl.get('Cron表达式格式有误'));
               },
             },
           ]}

src/pages/subscription/modal.tsx

@@ -12,7 +12,7 @@ import {
 } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
-import cronParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import isNil from 'lodash/isNil';
 
 const { Option } = Select;
@@ -378,17 +378,13 @@ const SubscriptionModal = ({
             { required: true },
             {
               validator: (rule, value) => {
-                try {
-                  if (
-                    scheduleType === 'interval' ||
-                    !value ||
-                    cronParser.CronExpressionParser.parse(value).hasNext()
-                  ) {
-                    return Promise.resolve();
-                  } else {
-                    return Promise.reject(intl.get('Subscription表达式格式有误'));
-                  }
-                } catch (e) {
+                if (
+                  scheduleType === 'interval' ||
+                  !value ||
+                  CronExpressionParser.parse(value).hasNext()
+                ) {
+                  return Promise.resolve();
+                } else {
                   return Promise.reject(intl.get('Subscription表达式格式有误'));
                 }
               },

src/utils/index.ts

@@ -1,6 +1,6 @@
 import intl from 'react-intl-universal';
 import { LANG_MAP, LOG_END_SYMBOL } from './const';
-import cronParser from 'cron-parser';
+import { CronExpressionParser } from 'cron-parser';
 import { ICrontab } from '@/pages/crontab/type';
 
 export default function browserType() {
@@ -333,7 +333,7 @@ export function getCommandScript(
 
 export function parseCrontab(schedule: string): Date | null {
   try {
-    const time = cronParser.CronExpressionParser.parse(schedule);
+    const time = CronExpressionParser.parse(schedule);
     if (time) {
       return time.next().toDate();
     }