added raw events

Author: windka

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# [0.1.2] - 2023-10-09
+### added raw events
+
 # [0.1.1] - 2023-10-08
 ### login with bot token added - [#1](https://github.com/windkh/node-red-node-telegrambot/issues/1) 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-telegrambot",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Telegram userbot nodes for Node-RED",
   "dependencies": {
     "telegram": "^2.18.38"

telegrambot/telegrambot.html

@@ -226,7 +226,8 @@ <h3>Details</h3>
         color: '#3BABDD',
         defaults: {
             name: { value: "" },
-            bot: { value:"", type: "telegram client config", required: true }
+            bot: { value:"", type: "telegram client config", required: true },
+            sendrawevents: { value: false, required: false },
         },
         inputs: 0,
         outputs: 1,
@@ -252,6 +253,16 @@ <h3>Details</h3>
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+
+    <hr align="middle"/> 
+
+    <div class="form-row">
+        <label for="node-config-input-sendrawevents"><i class="fa fa-filter"></i> Send raw events</label>
+        <input type="checkbox" id="node-config-input-sendrawevents" style="display: inline-block; width: auto; vertical-align: top;">
+    </div>
+    
+    <div class="form-tips" style="width: auto"><b>Tip:</b> When raw events is turned on, all events are sent to the output without further filtering.</div>
+
 </script>
 
 <script type="text/x-red" data-help-name="telegram client receiver">

telegrambot/telegrambot.js

@@ -207,6 +207,7 @@ module.exports = function (RED) {
                     }
 
                     await client.start(authParams);
+                    await client.connect();
                 } else {
                     node.warn('No session: login first.');
                 }
@@ -250,27 +251,44 @@ module.exports = function (RED) {
         let node = this;
         this.bot = config.bot;
         this.config = RED.nodes.getNode(this.bot);
-        this.eventHandlerAdded = false;
+        this.sendRawEvents = config.sendrawevents || false;
+        this.rawEventHandlerAdded = false;
+        this.newMessageEventHandlerAdded = false;
 
-        const eventHandler = async function (event) {
-            const message = event.message;
-            const sender = await message.getSender();
-            const chat = await message.getChat();
+        this.rawEventHandler = async (event) => {
+            let msg = {
+                payload: event,
+            };
+            node.send(msg);
+        };
+
+        this.newMessageEventHandler = async (event) => {
+            let message = event.message;
             let msg = {
                 payload: {
-                    sender: sender,
-                    chat: chat,
                     message: message,
-                    originalUpdate: event.originalUpdate,
+                    sender: await message.getSender(),
+                    chat: await message.getChat(),
+                    event: event,
                 },
             };
             node.send(msg);
         };
 
         this.stop = async () => {
-            if (node.eventHandlerAdded) {
-                client.removeEventHandler(eventHandler, new NewMessage({}));
-                node.eventHandlerAdded = false;
+            if (node.config) {
+                let client = await node.config.getTelegramClient(node);
+                if (client) {
+                    if (node.rawEventHandlerAdded) {
+                        client.removeEventHandler(node.rawEventHandler);
+                        node.rawEventHandlerAdded = false;
+                    }
+
+                    if (node.newMessageEventHandlerAdded) {
+                        client.removeEventHandler(node.newMessageEventHandler, new NewMessage({}));
+                        node.newMessageEventHandlerAdded = false;
+                    }
+                }
             }
 
             node.status({
@@ -290,8 +308,13 @@ module.exports = function (RED) {
                         text: 'connected',
                     });
 
-                    client.addEventHandler(eventHandler, new NewMessage({}));
-                    node.eventHandlerAdded = true;
+                    if (node.sendRawEvents) {
+                        client.addEventHandler(node.rawEventHandler);
+                        node.rawEventHandlerAdded = true;
+                    } else {
+                        client.addEventHandler(node.newMessageEventHandler, new NewMessage({}));
+                        node.newMessageEventHandlerAdded = true;
+                    }
                 }
             } else {
                 // no config node?