diff --git a/sample/notify.js b/sample/notify.js index 49ae9f24..f935e8ce 100644 --- a/sample/notify.js +++ b/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);