From a94350505117326967ab95d0887ddb382db7d88b Mon Sep 17 00:00:00 2001 From: windka Date: Fri, 21 Jun 2024 22:13:02 +0200 Subject: [PATCH] updated dependencies, removed reuqest dep --- CHANGELOG.md | 3 +++ package-lock.json | 46 +++++++++++++++++------------------ package.json | 2 +- telegrambot/99-telegrambot.js | 16 +----------- 4 files changed, 28 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e695ce..24b70b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog All notable changes to this project will be documented in this file. +# [16.0.0] - 2024-06-14 +### updated to 0.66.0, removed dependancies to deprectated request, updated sock agent + # [15.1.11] - 2024-06-14 ### added option for enabling test environment - [#380](https://github.com/windkh/node-red-contrib-telegrambot/issues/380) diff --git a/package-lock.json b/package-lock.json index 5c6ab92..92b5f9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "bluebird": "^3.7.2", "node-telegram-bot-api": "^0.66.0", - "socks-proxy-agent": "^7.0.0" + "socks-proxy-agent": "^8.0.3" }, "devDependencies": { "eslint": "^8.20.0", @@ -273,14 +273,14 @@ } }, "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "dependencies": { - "debug": "4" + "debug": "^4.3.4" }, "engines": { - "node": ">= 6.0.0" + "node": ">= 14" } }, "node_modules/ajv": { @@ -2139,16 +2139,16 @@ } }, "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", + "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.7.1" }, "engines": { - "node": ">= 10" + "node": ">= 14" } }, "node_modules/sshpk": { @@ -2631,11 +2631,11 @@ "requires": {} }, "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", "requires": { - "debug": "4" + "debug": "^4.3.4" } }, "ajv": { @@ -3988,13 +3988,13 @@ } }, "socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", + "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", "requires": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.7.1" } }, "sshpk": { diff --git a/package.json b/package.json index a2e2b86..6a5b2b3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dependencies": { "bluebird": "^3.7.2", "node-telegram-bot-api": "^0.66.0", - "socks-proxy-agent": "^7.0.0" + "socks-proxy-agent": "^8.0.3" }, "scripts": { "lint": "eslint telegrambot/*.js", diff --git a/telegrambot/99-telegrambot.js b/telegrambot/99-telegrambot.js index 348078c..78ff8f8 100644 --- a/telegrambot/99-telegrambot.js +++ b/telegrambot/99-telegrambot.js @@ -404,23 +404,9 @@ module.exports = function (RED) { if (error.message === 'ETELEGRAM: 401 Unauthorized') { hint = 'Please check if the bot token is valid: ' + self.credentials.token; stopPolling = true; - } else if (error.message.startsWith('EFATAL: Error: connect ETIMEDOUT')) { - hint = 'Timeout connecting to server. Maybe proxy blocked polling. Trying again.'; - } else if (error.message.startsWith('EFATAL: Error: read ECONNRESET')) { - hint = 'Network connection may be down. Trying again.'; - } else if (error.message.startsWith('EFATAL: Error: getaddrinfo EAI_AGAIN')) { - hint = 'Network connection may be down. Trying again.'; - } else if (error.message.startsWith('EFATAL: Error: getaddrinfo ENOTFOUND')) { - hint = 'Network connection may be down. Trying again.'; - } else if (error.message.startsWith('EFATAL: Error: SOCKS connection failed. Connection refused.')) { - hint = 'Username or password may be be wrong or connection is down. Aborting.'; - } else if (error.message.startsWith('EFATAL: Error: Client network socket disconnected before secure TLS connection was established')) { - hint = 'Maybe SOCKS proxy refused connection.'; - } else if (error.message.startsWith('EFATAL: Error: certificate has expired')) { - hint = 'Maybe SOCKS proxy refused connection.'; } else { // unknown error occured... we simply ignore it. - hint = 'Unknown error. Trying again.'; + hint = error.message + ' --> Trying again.'; } if (stopPolling) {