n8n-nodes-signal-cli-rest-api 0.3.0 → 0.5.0

package/README.md

@@ -93,7 +93,7 @@ services:
 
 1. In your n8n instance, go to **Settings** → **Community Nodes**
 2. Click **Install a community node**
-3. Enter the package name: `n8n-nodes-signal`
+3. Enter the package name: `n8n-nodes-signal-cli-rest-api`
 4. Click **Install**
 
 ### Method 2: Manual Installation
@@ -101,7 +101,7 @@ services:
 1. Navigate to your n8n installation directory
 2. Install the package:
    ```bash
-   npm install n8n-nodes-signal
+   npm install n8n-nodes-signal-cli-rest-api
    ```
 3. Restart n8n
 

package/dist/nodes/Signal/SignalTrigger.node.js

@@ -55,6 +55,13 @@ class SignalTrigger {
                     default: false,
                     description: 'Enable to ignore messages with reactions',
                 },
+                {
+                    displayName: 'Mark Messages as Read',
+                    name: 'markAsRead',
+                    type: 'boolean',
+                    default: false,
+                    description: 'Automatically mark processed incoming messages as read',
+                },
             ],
         };
     }
@@ -67,10 +74,39 @@ class SignalTrigger {
         const ignoreMessages = this.getNodeParameter('ignoreMessages', 0);
         const ignoreAttachments = this.getNodeParameter('ignoreAttachments', 0);
         const ignoreReactions = this.getNodeParameter('ignoreReactions', 0);
+        const markAsRead = this.getNodeParameter('markAsRead', 0);
         const wsUrl = `${apiUrl.replace('http', 'ws')}/v1/receive/${phoneNumber}`;
         this.logger.debug(`SignalTrigger: Attempting to connect to WS URL: ${wsUrl}`);
         const processedMessages = new Set();
         const maxMessages = 1000;
+        // Функція для позначення повідомлення як прочитаного
+        const markMessageAsRead = async (sourceNumber, sourceUuid, timestamp) => {
+            try {
+                const readReceiptUrl = `${apiUrl}/v1/read-receipt/${phoneNumber}`;
+                const requestBody = {
+                    recipient: sourceUuid || sourceNumber,
+                    timestamps: [timestamp]
+                };
+                const response = await fetch(readReceiptUrl, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        ...(apiToken && { Authorization: `Bearer ${apiToken}` }),
+                    },
+                    body: JSON.stringify(requestBody),
+                });
+                if (response.ok) {
+                    this.logger.debug(`SignalTrigger: Successfully marked message as read for ${sourceNumber} (${sourceUuid}), timestamp: ${timestamp}`);
+                }
+                else {
+                    const errorText = await response.text();
+                    this.logger.warn(`SignalTrigger: Failed to mark message as read: ${response.status} ${errorText}`);
+                }
+            }
+            catch (error) {
+                this.logger.error(`SignalTrigger: Error marking message as read`, { error });
+            }
+        };
         const connectWebSocket = () => {
             const ws = new ws_1.WebSocket(wsUrl, {
                 headers: apiToken ? { Authorization: `Bearer ${apiToken}` } : {},
@@ -78,8 +114,8 @@ class SignalTrigger {
             ws.on('open', () => {
                 this.logger.debug(`SignalTrigger: Successfully connected to ${wsUrl}`);
             });
-            ws.on('message', (data) => {
-                var _a, _b, _c, _d, _e;
+            ws.on('message', async (data) => {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
                 try {
                     const message = JSON.parse(data.toString());
                     this.logger.debug(`SignalTrigger: Received raw message: ${JSON.stringify(message, null, 2)}`);
@@ -93,13 +129,53 @@ class SignalTrigger {
                     }
                     processedMessages.add(timestamp);
                     const dataMsg = ((_b = message.envelope) === null || _b === void 0 ? void 0 : _b.dataMessage) || ((_d = (_c = message.envelope) === null || _c === void 0 ? void 0 : _c.syncMessage) === null || _d === void 0 ? void 0 : _d.sentMessage) || {};
+                    // Визначаємо тип повідомлення на основі структури envelope
+                    const hasDataMessage = !!((_e = message.envelope) === null || _e === void 0 ? void 0 : _e.dataMessage);
+                    const hasSyncMessage = !!((_f = message.envelope) === null || _f === void 0 ? void 0 : _f.syncMessage);
+                    let shouldProcess = false;
+                    let messageType = 'unknown';
+                    if (hasDataMessage) {
+                        // Вхідне повідомлення - обробляємо
+                        shouldProcess = true;
+                        messageType = 'incoming';
+                        this.logger.debug(`SignalTrigger: Incoming message detected`);
+                    }
+                    else if (hasSyncMessage) {
+                        const sentMessage = message.envelope.syncMessage.sentMessage;
+                        const sourceUuid = message.envelope.sourceUuid;
+                        const destinationUuid = sentMessage === null || sentMessage === void 0 ? void 0 : sentMessage.destinationUuid;
+                        if (sourceUuid === destinationUuid) {
+                            // Повідомлення самому собі - обробляємо
+                            shouldProcess = true;
+                            messageType = 'self_note';
+                            this.logger.debug(`SignalTrigger: Self note detected`);
+                        }
+                        else {
+                            // Вихідне повідомлення комусь - НЕ обробляємо
+                            shouldProcess = false;
+                            messageType = 'outgoing';
+                            this.logger.debug(`SignalTrigger: Outgoing message detected - skipping`);
+                        }
+                    }
+                    if (!shouldProcess) {
+                        this.logger.debug(`SignalTrigger: Skipping message type: ${messageType} with timestamp ${timestamp}`);
+                        return;
+                    }
                     const processedMessage = {
                         messageText: dataMsg.message || '',
                         attachments: dataMsg.attachments || [],
                         reactions: dataMsg.reactions || [],
-                        sourceNumber: ((_e = message.envelope) === null || _e === void 0 ? void 0 : _e.sourceNumber) || '',
+                        sourceNumber: ((_g = message.envelope) === null || _g === void 0 ? void 0 : _g.sourceNumber) || '',
+                        sourceUuid: ((_h = message.envelope) === null || _h === void 0 ? void 0 : _h.sourceUuid) || '',
+                        sourceName: ((_j = message.envelope) === null || _j === void 0 ? void 0 : _j.sourceName) || '',
                         timestamp: timestamp,
+                        serverReceivedTimestamp: ((_k = message.envelope) === null || _k === void 0 ? void 0 : _k.serverReceivedTimestamp) || 0,
+                        serverDeliveredTimestamp: ((_l = message.envelope) === null || _l === void 0 ? void 0 : _l.serverDeliveredTimestamp) || 0,
                         account: message.account || '',
+                        hasContent: ((_m = message.envelope) === null || _m === void 0 ? void 0 : _m.hasContent) || false,
+                        isUnidentifiedSender: ((_o = message.envelope) === null || _o === void 0 ? void 0 : _o.isUnidentifiedSender) || false,
+                        messageType: messageType,
+                        envelope: message.envelope || {},
                     };
                     this.logger.debug(`SignalTrigger: Processed message content: ${JSON.stringify(processedMessage, null, 2)}`);
                     // Ігнорувати події без вмісту
@@ -121,6 +197,10 @@ class SignalTrigger {
                     };
                     this.emit([this.helpers.returnJsonArray([returnData])]);
                     this.logger.debug(`SignalTrigger: Emitted message with timestamp ${timestamp}`);
+                    // Позначити повідомлення як прочитане, якщо це вхідне повідомлення і увімкнено опцію
+                    if (markAsRead && messageType === 'incoming') {
+                        await markMessageAsRead(processedMessage.sourceNumber, processedMessage.sourceUuid, timestamp);
+                    }
                 }
                 catch (error) {
                     this.logger.error('SignalTrigger: Error parsing message', { error });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-signal-cli-rest-api",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Signal Node for n8n using signal-cli-rest-api",
   "repository": {
     "type": "git",