@patricktobias86/node-red-telegram-account 1.1.1 → 1.1.2

package/nodes/auth.html

@@ -3,26 +3,24 @@
         category: 'telegram-account',
         color: '#a6bbcf',
         defaults: {
-            api_id: { value: "", required: true },
-            api_hash: { value: "", required: true },
-            phoneNumber: { value: "", required: true },
-            password: { value: "" },
+            api_id: { value: "" },
+            api_hash: { value: "" },
+            phoneNumber: { value: "" },
+            password: { value: "" }
         },
         inputs: 1,
         outputs: 1,
-        icon: "font-awesome/fa-lock",
-        label: function () {
-            return this.name || "Telegram Auth";
-        },
+        icon: 'tg.png',
+        paletteLabel: 'user auth',
         oneditprepare: function () {
-            // Инициализация значений
+            // Initialize values
             $("#node-input-api_id").val(this.api_id || "");
             $("#node-input-api_hash").val(this.api_hash || "");
             $("#node-input-phoneNumber").val(this.phoneNumber || "");
             $("#node-input-password").val(this.password || "");
         },
         oneditsave: function () {
-            // Сохранение значений
+            // Save values
             this.api_id = $("#node-input-api_id").val();
             this.api_hash = $("#node-input-api_hash").val();
             this.phoneNumber = $("#node-input-phoneNumber").val();
@@ -61,78 +59,67 @@
 </div>
 
 <p>
-    <strong>Note:</strong> This configuration is required for connecting to the Telegram API and starting a session.
+    <strong>Note:</strong> These values are used to create a Telegram session string.
 </p>
 </script>
 
-
 <script type="text/html" data-help-name="auth">
-    <p>The <b>auth</b> node facilitates Telegram API authentication using the <code>telegram</code> library. It allows users to authenticate a session and retrieve a stringSession for future use.</p>
+    <p>The <b>auth</b> node facilitates Telegram API authentication using the <code>telegram</code> (GramJS) library. It allows users to authenticate a session and retrieve a <code>stringSession</code> for reuse with other Telegram clients.</p>
 
     <h3>Inputs</h3>
     <dl class="message-properties">
-        <dt>payload.api_id
-            <span class="property-type">number | string</span>
-        </dt>
-        <dd>The Telegram API ID. Required for authentication.</dd>
-        
-        <dt>payload.api_hash
-            <span class="property-type">string</span>
-        </dt>
-        <dd>The Telegram API hash. Required for authentication.</dd>
-        
-        <dt>payload.phoneNumber
-            <span class="property-type">string</span>
-        </dt>
-        <dd>The phone number associated with the Telegram account.</dd>
-        
-        <dt>payload.password
-            <span class="property-type">string</span>
-        </dt>
-        <dd>The password for two-factor authentication (if enabled on the Telegram account).</dd>
+        <dt>payload.api_id <span class="property-type">number | string</span></dt>
+        <dd>The Telegram API ID.</dd>
+
+        <dt>payload.api_hash <span class="property-type">string</span></dt>
+        <dd>The Telegram API hash.</dd>
+
+        <dt>payload.phoneNumber <span class="property-type">string</span></dt>
+        <dd>The phone number of the Telegram account, including country code (e.g. +1701234567).</dd>
+
+        <dt>payload.password <span class="property-type">string</span></dt>
+        <dd>(Optional) The password for two-factor authentication.</dd>
     </dl>
 
+    <h3>Behavior</h3>
+    <p>When triggered, the node starts the login flow by sending a code via SMS or Telegram to the specified phone number. The node will wait for a verification code to be supplied separately.</p>
+    <p>To complete authentication, you must send the code using a function node like this:</p>
+    <pre>
+const code = msg.payload.code;
+const wait = flow.get("waitForCode");
+if (typeof wait === "function") {
+    wait(code);
+    flow.set("waitForCode", null);
+}
+    </pre>
+
     <h3>Outputs</h3>
     <dl class="message-properties">
-        <dt>topic
-            <span class="property-type">string</span>
-        </dt>
+        <dt>topic <span class="property-type">string</span></dt>
         <dd>
-            - <b>"auth_success"</b>: Authentication was successful.  
-            - <b>"auth_error"</b>: An error occurred during authentication.
+            - <b>"auth_success"</b>: Login succeeded.<br>
+            - <b>"auth_error"</b>: Login failed.
         </dd>
 
-        <dt>payload
-            <span class="property-type">object</span>
-        </dt>
+        <dt>payload <span class="property-type">object</span></dt>
         <dd>
-            For <b>"auth_success"</b>:  
-            <ul>
-                <li><code>payload.stringSession</code>: The generated session string.</li>
-                <li><code>payload.message</code>: Success message.</li>
-            </ul>
-            For <b>"auth_error"</b>:  
             <ul>
-                <li><code>payload.error</code>: The error message describing the issue.</li>
+                <li><code>stringSession</code>: The generated session string to reuse in your bots.</li>
+                <li><code>message</code> or <code>error</code>: Additional info.</li>
             </ul>
         </dd>
     </dl>
 
-    <h3>Details</h3>
-    <p>To use the <b>auth</b> node, pass the required API credentials and phone number as part of the input message payload. The node will initiate the Telegram authentication flow. If a two-factor password is required, include it in the <code>payload.password</code>.</p>
-
-    <p>The node temporarily stores the phone code resolver in the flow context under the key <code>phoneCode</code>. This allows subsequent nodes to resolve the phone code using a separate input mechanism, such as user interaction.</p>
-
     <h3>Example</h3>
     <pre>
-    {
-        "payload": {
-            "api_id": 123456,
-            "api_hash": "your_api_hash",
-            "phoneNumber": "+123456789",
-            "password": "your_password"
-        }
+{
+    "payload": {
+        "api_id": "123456",
+        "api_hash": "your_api_hash",
+        "phoneNumber": "+46701234567",
+        "password": "optional_password"
     }
+}
     </pre>
-    <p>This example input payload initiates the authentication process. Upon receiving the phone code, it should be resolved using a dedicated node or interface.</p>
+    <p>Use a separate node to submit the received code after triggering this payload.</p>
 </script>

package/nodes/auth.js

@@ -7,51 +7,63 @@ module.exports = function (RED) {
         const node = this;
 
         this.on("input", async (msg) => {
-            const api_idString = msg.payload.api_id || config.api_id;
-            const api_hash = msg.payload.api_hash || config.api_hash;
-            const phoneNumber = msg.payload.phoneNumber || config.phoneNumber;
-            const password = msg.payload.password || config.password;
-            const api_id = parseInt(api_idString);
 
-            const session = new StringSession("");
+            const payload = (msg && typeof msg.payload === "object") ? msg.payload : {};
+
+            const api_id = parseInt(payload.api_id || config.api_id);
+            const api_hash = payload.api_hash || config.api_hash;
+            const phoneNumber = payload.phoneNumber || config.phoneNumber;
+            const password = payload.password || config.password;
+
+            if (!api_id || !api_hash || !phoneNumber) {
+                node.error("Missing required API credentials (api_id, api_hash, or phoneNumber).");
+                return;
+            }
+
+            const session = new StringSession(""); // always generate a new session
             const client = new TelegramClient(session, api_id, api_hash, {
                 connectionRetries: 5,
             });
 
- 
-            let resolvePhoneCode;
             const context = node.context().flow;
 
+            let phoneCodePromise = new Promise((resolve) => {
+                context.set("waitForCode", resolve);
+            });
+
             try {
                 await client.start({
                     phoneNumber: () => phoneNumber,
                     password: () => password,
-                    phoneCode: async () =>{
-                        return new Promise((resolve) => {
-                            resolvePhoneCode = resolve;
-                            context.set("phoneCode", resolvePhoneCode);
-                        })
+                    phoneCode: async () => {
+                        node.status({ fill: "yellow", shape: "ring", text: "Waiting for code" });
+                        const code = await phoneCodePromise;
+                        return code;
                     },
-                    onError: (err) => node.error(`Error: ${err.message}`),
+                    onError: (err) => node.error("GramJS Error: " + err.message),
                 });
 
-                const stringSession = client.session.save(); // Save session
+                const stringSession = client.session.save();
                 node.send({
-                    topic: "auth_success",
+                    topic: "auth_complete",
                     payload: {
                         stringSession,
-                        message: "Authorization successful!",
-                    },
+                        messages: [
+                            { type: "auth_success", text: "Authorization successful!" },
+                            { type: "session_token", text: "Copy this stringSession to use in other nodes." }
+                        ]
+                    }
                 });
-               
-            } catch (error) {
-                node.error(`Authorization error: ${error.message}`);
+
+                node.status({ fill: "green", shape: "dot", text: "Authenticated" });
+
+            } catch (err) {
+                node.error("Authentication failed: " + err.message);
                 node.send({
                     topic: "auth_error",
-                    payload: {
-                        error: error.message,
-                    },
+                    payload: { error: err.message },
                 });
+                node.status({ fill: "red", shape: "ring", text: "Failed" });
             }
         });
     }

package/nodes/command.html

@@ -3,17 +3,16 @@
       category: 'telegram-account',
       color: '#229ED9',
       icon: 'tg.png',
-      align:"right",
       defaults: {
         name: { value: '' },
         config: { type: 'config', required: false },
-        command: { value: "", required:true },
-        regex:{ value:false }
+        command: { value: "", required: true },
+        regex: { value: false }
       },
       inputs: 1,
       outputs: 1,
       label: function () {
-        return this.name || 'Command';
+        return this.name || 'command';
       },
       
     });

package/nodes/config.html

@@ -27,7 +27,7 @@
           testServers: {value: undefined}
       },
       label: function() {
-          return this.name || "Telegram Client Config";
+          return this.name || "telegram client config";
       },
       oneditprepare: function() {
    

package/nodes/config.js

@@ -1,58 +1,54 @@
 const { TelegramClient } = require("telegram");
 const { StringSession } = require("telegram/sessions");
 
+const activeClients = {}; // Cache: session string → connected client
+
 module.exports = function (RED) {
     function TelegramClientConfig(config) {
         RED.nodes.createNode(this, config);
-        this.apiId = config.api_id;
-        this.apiHash = config.api_hash;
-        this.session = new StringSession(config.session);
-        this.useIPV6 = config.useIPV6;
-        this.timeout = config.timeout;
-        this.requestRetries = config.requestRetries;
-        this.connectionRetries = config.connectionRetries;
-        this.proxy = config.proxy;
-        this.downloadRetries = config.downloadRetries;
-        this.retryDelay = config.retryDelay;
-        this.autoReconnect = config.autoReconnect;
-        this.sequentialUpdates = config.sequentialUpdates;
-        this.floodSleepThreshold = config.floodSleepThreshold;
-        this.deviceModel = config.deviceModel;
-        this.systemVersion = config.systemVersion;
-        this.appVersion = config.appVersion;
-        this.langCode = config.langCode;
-        this.systemLangCode = config.systemLangCode;
-        this.useWSS = config.useWSS;
-        this.maxConcurrentDownloads = config.maxConcurrentDownloads;
-        this.securityChecks = config.securityChecks;
-        this.testServers = config.testServers;
-        const node = this;
 
+        const sessionStr = config.session;
+        const apiId = parseInt(config.api_id);
+        const apiHash = config.api_hash;
 
-        this.client = new TelegramClient(this.session, parseInt(this.apiId), this.apiHash, {
-           
-           
-        });
+        this.session = new StringSession(sessionStr);
+        this.client = null;
+
+        const node = this;
+
+        if (activeClients[sessionStr]) {
+            // Reuse existing client
+            this.client = activeClients[sessionStr];
+            node.status({ fill: "green", shape: "dot", text: "Reused existing client" });
+        } else {
+            // Create and connect new client
+            this.client = new TelegramClient(this.session, apiId, apiHash, {
+                connectionRetries: config.connectionRetries || 5,
+                autoReconnect: config.autoReconnect !== false,
+                requestRetries: config.requestRetries || 5,
+            });
 
-        try {
             this.client.connect().then(async () => {
-                let isAuthorized = await this.client.isUserAuthorized();
-                if (!isAuthorized) {
-                    node.error(`Session is invalid`);
+                const authorized = await this.client.isUserAuthorized();
+                if (!authorized) {
+                    node.error("Session is invalid");
                 } else {
                     node.status({ fill: "green", shape: "dot", text: "Connected" });
+                    activeClients[sessionStr] = this.client;
                 }
+            }).catch(err => {
+                node.error("Connection error: " + err.message);
             });
-        } catch (err) {
-            node.error('Authorisation error: ' + err.message);
         }
 
-        this.on("close", () => {
-            if (this.client) {
-                this.client.disconnect();
+        this.on("close", async () => {
+            if (this.client && activeClients[sessionStr] === this.client) {
+                await this.client.disconnect();
+                delete activeClients[sessionStr];
                 node.status({ fill: "red", shape: "ring", text: "Disconnected" });
             }
         });
     }
+
     RED.nodes.registerType('config', TelegramClientConfig);
 };

package/nodes/delete-message.html

@@ -3,7 +3,6 @@
       category: 'telegram-account',
       color: '#FF5733',
       icon: 'tg.png',
-      align: 'right',
       defaults: {
         name: { value: '' },
         config: { type: 'config', required: false },
@@ -11,7 +10,7 @@
       inputs: 1,
       outputs: 1,
       label: function () {
-        return this.name || 'Delete Message';
+        return this.name || 'delete message';
       },
     });
 </script>

package/nodes/get-entity.html

@@ -3,7 +3,6 @@
         category: 'telegram-account',
         color: '#229ED9',
         icon: 'tg.png',
-        align: "right",
         defaults: {
             name: { value: '' },
             config: { type: 'config', required: false },
@@ -11,7 +10,7 @@
         inputs: 1,
         outputs: 1,
         label: function () {
-            return this.name || 'Get Entity';
+            return this.name || 'get entity';
         }
     });
 </script>

package/nodes/iter-dialogs.html

@@ -2,6 +2,7 @@
     RED.nodes.registerType('iter-dialogs', {
         category: 'telegram-account',
         color: '#32a3e0',
+        icon: 'tg.png',
         defaults: {
             name: { value: '' },
             config: { type: 'config', required: true },
@@ -15,9 +16,9 @@
         },
         inputs: 1,
         outputs: 1,
-        paletteLabel: 'Iterate Dialogs',
+        paletteLabel: 'iterate dialogs',
         label: function () {
-            return this.name || 'Iterate Dialogs';
+            return this.name || 'iterate dialogs';
         },
     });
 </script>

package/nodes/iter-messages.html

@@ -2,6 +2,7 @@
     RED.nodes.registerType('iter-messages', {
         category: 'telegram',
         color: '#32a3e0',
+        icon: 'tg.png',
         defaults: {
             name: { value: '' },
             config: { type: 'config', required: true },
@@ -23,9 +24,9 @@
         },
         inputs: 1,
         outputs: 1,
-        paletteLabel: 'Iterate Messages',
+        paletteLabel: 'iterate messages',
         label: function () {
-            return this.name || 'Iterate Messages';
+            return this.name || 'iterate messages';
         },
         oneditprepare: function(){
             const node = this;

package/nodes/promote-admin.html

@@ -3,7 +3,6 @@
         category: 'telegram-account',
         color: '#229ED9',
         icon: 'tg.png',
-        align: "right",
         defaults: {
             name: { value: '' },
             config: { type: 'config', required: false },
@@ -25,7 +24,7 @@
         inputs: 1,
         outputs: 1,
         label: function () {
-            return this.name || 'Promote Admin';
+            return this.name || 'promote admin';
         },
         oneditprepare: function () {
             // No extra logic needed

package/nodes/receiver.html

@@ -3,7 +3,6 @@
       category: 'telegram-account',
       color: '#229ED9',
       icon: 'tg.png',
-      align:"right",
       defaults: {
         name: { value: '' },
         config: { type: 'config', required: false },
@@ -12,7 +11,7 @@
       inputs: 1,
       outputs: 1,
       label: function () {
-        return this.name || 'Receiver';
+        return this.name || 'receiver';
       },
       
     });

package/nodes/send-file.html

@@ -30,10 +30,10 @@
         },
         inputs: 1,
         outputs: 1,
-        icon: 'file.png',
-        paletteLabel: 'Send Files',
+        icon: 'tg.png',
+        paletteLabel: 'send files',
         label: function () {
-            return this.name || 'Send Files';
+            return this.name || 'send files';
         },
     });
 </script>

package/nodes/send-message.html

@@ -3,7 +3,6 @@
         category: 'telegram-account',
         color: '#229ED9',
         icon: 'tg.png',
-        align: "right",
         defaults: {
             name: { value: '' },
             chatId: { value: '' },
@@ -29,7 +28,7 @@
         inputs: 1,
         outputs: 1,
         label: function () {
-            return this.name || 'Send Message';
+            return this.name || 'send message';
         },
         oneditprepare: function () {
             const node = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patricktobias86/node-red-telegram-account",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Node-RED nodes to communicate with GramJS.",
   "main": "nodes/config.js",
   "keywords": [