fixed #398

windkh · Jan 8, 2025 · d346c52 · d346c52
1 parent 1591117
commit d346c52
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# [16.1.2] - 2025-01-08
+### webhook url parsing improved - [#398](https://github.com/windkh/node-red-contrib-telegrambot/issues/398) 
+
 # [16.1.1] - 2024-09-29
 ### IP address family any is 0 now - [#343](https://github.com/windkh/node-red-contrib-telegrambot/issues/343) 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-telegrambot",
-    "version": "16.1.1",
+    "version": "16.1.2",
     "description": "Telegram bot nodes for Node-RED",
     "dependencies": {
         "bluebird": "^3.7.2",

diff --git a/telegrambot/99-telegrambot.html b/telegrambot/99-telegrambot.html
@@ -30,7 +30,7 @@
             bothost: { value: "", required: false },
 			botpath: { value: "", required: false },
             localbotport: { value: 8443, required: false, validate:function(v) { return ((v === "") || (RED.validators.number(v) && (v >= 0) && (v <= 2147483))) }},
-            publicbotport: { value: 8443, required: false, validate:function(v) { return ((v === "") || (RED.validators.number(v) && (v >= 0) && (v <= 2147483))) }},
+            publicbotport: { value: 8443, required: false, validate:function(v) { return ((v === "") || (RED.validators.number(v) && ((v == 80) || (v == 88) || (v == 443) || (v == 8443)))) }},
 
             // only for webhook and certificate
             privatekey: { value: "", required: false },
@@ -204,7 +204,7 @@
                     <input type="checkbox" id="node-config-input-sslterminated" style="display: inline-block; width: auto; vertical-align: top;">
                 </div>
 
-                <div class="form-tips" style="width: auto"><b>Tip:</b> Webhook mode requires a HTTPS certificate. The certificate can also be a self-signed (=custom) one. If any of the host, key, certificate properties is left blank the bot will default to send only mode. If SSL termination is already handled by reverse proxy, key and certificate is not required.</div>
+                <div class="form-tips" style="width: auto"><b>Tip:</b> Webhook mode requires a HTTPS certificate. The certificate can also be a self-signed (=custom) one. If any of the host, key, certificate properties is left blank the bot will default to send only mode. If SSL termination is already handled by reverse proxy, key and certificate is not required. Port must be one of 80, 88, 443, 8443.</div>
             </div>
         </div>
 

diff --git a/telegrambot/99-telegrambot.js b/telegrambot/99-telegrambot.js
@@ -323,11 +323,29 @@ module.exports = function (RED) {
                 // });
             });
 
-            let botUrl = 'https://' + this.botHost + ':' + this.publicBotPort + '/';
-            if (this.botPath !== '') {
-                botUrl += this.botPath + '/';
+            const protocol = 'https://';
+            let tempUrl = this.botHost;
+            if(!tempUrl.startsWith(protocol)){
+                 tempUrl = protocol + tempUrl;
             }
-            botUrl += this.token;
+            const parsed = new URL(tempUrl);
+
+            if(parsed.port == ''){
+                parsed.port = this.publicBotPort;
+            }
+            parsed.port = 80;
+
+            if(parsed.pathname == ''){
+                parsed.pathname = this.botPath;
+            } 
+            else {
+                if(parsed.botPath != ''){
+                    parsed.pathname = parsed.pathname +  '/' + this.botPath;    
+                } 
+            }
+
+            let botUrl = parsed.href;
+            botUrl +=  '/' + this.token;
 
             let setWebHookOptions;
             if (!this.sslTerminated && this.useSelfSignedCertificate) {