n8n-nodes-msteams-botframework 1.2.10 → 1.2.12

package/dist/nodes/MsTeamsBotFramework/MsTeamsBotFrameworkTrigger.node.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsTeamsBotFrameworkTrigger = void 0;
-const n8n_workflow_1 = require("n8n-workflow");
-const botbuilder_1 = require("botbuilder");
 // Track processed activity IDs to prevent duplicates
 const processedActivities = new Map();
 // Clean up old entries every 5 minutes
@@ -39,8 +37,7 @@ class MsTeamsBotFrameworkTrigger {
                 {
                     name: 'default',
                     httpMethod: 'POST',
-                    responseMode: '={{$parameter["respondWhen"]}}',
-                    responseData: '={{$parameter["responseData"]}}',
+                    responseMode: 'onReceived',
                     path: 'webhook',
                 },
             ],
@@ -80,64 +77,6 @@ class MsTeamsBotFrameworkTrigger {
                     required: true,
                     description: 'The events to listen to',
                 },
-                {
-                    displayName: 'Respond',
-                    name: 'respondWhen',
-                    type: 'options',
-                    options: [
-                        {
-                            name: 'Immediately',
-                            value: 'immediately',
-                            description: 'Respond immediately (useful for keeping connection alive)',
-                        },
-                        {
-                            name: 'When Last Node Finishes',
-                            value: 'lastNode',
-                            description: 'Wait for workflow to complete before responding',
-                        },
-                        {
-                            name: 'Using Respond to Webhook Node',
-                            value: 'responseNode',
-                            description: 'Use a Respond to Webhook node to control the response',
-                        },
-                    ],
-                    default: 'immediately',
-                    description: 'When to respond to the webhook call',
-                },
-                {
-                    displayName: 'Response Data',
-                    name: 'responseData',
-                    type: 'options',
-                    displayOptions: {
-                        show: {
-                            respondWhen: ['lastNode'],
-                        },
-                    },
-                    options: [
-                        {
-                            name: 'All Entries',
-                            value: 'allEntries',
-                            description: 'Return all entries from the workflow',
-                        },
-                        {
-                            name: 'First Entry JSON',
-                            value: 'firstEntryJson',
-                            description: 'Return only the JSON of the first entry',
-                        },
-                        {
-                            name: 'First Entry Binary',
-                            value: 'firstEntryBinary',
-                            description: 'Return only the binary data of the first entry',
-                        },
-                        {
-                            name: 'No Response Body',
-                            value: 'noData',
-                            description: 'Return success status without response body',
-                        },
-                    ],
-                    default: 'allEntries',
-                    description: 'What data should be returned',
-                },
                 {
                     displayName: 'Options',
                     name: 'options',
@@ -159,13 +98,6 @@ class MsTeamsBotFrameworkTrigger {
                             default: false,
                             description: 'Whether to include the raw Bot Framework activity in output',
                         },
-                        {
-                            displayName: 'Auto Reply',
-                            name: 'autoReply',
-                            type: 'boolean',
-                            default: false,
-                            description: 'Whether to automatically send a typing indicator',
-                        },
                     ],
                 },
             ],
@@ -185,145 +117,114 @@ class MsTeamsBotFrameworkTrigger {
         };
     }
     async webhook() {
-        const node = this.getNode();
-        let credentials;
-        try {
-            credentials = await this.getCredentials('msTeamsBotFrameworkApi');
-        }
-        catch (error) {
-            throw new n8n_workflow_1.NodeOperationError(node, 'Failed to get credentials', {
-                description: error.message,
-            });
-        }
-        const req = this.getRequestObject();
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        const bodyData = this.getBodyData();
         const events = this.getNodeParameter('events', []);
         const options = this.getNodeParameter('options', {});
-        const appId = credentials.appId;
-        const appPassword = credentials.appPassword;
-        // Create Bot Framework Adapter
-        const adapter = new botbuilder_1.BotFrameworkAdapter({
-            appId,
-            appPassword,
-        });
-        // Process the incoming activity
-        let activityData = null;
-        let shouldTrigger = false;
-        try {
-            await adapter.processActivity(req, req.res, async (context) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-                const activity = context.activity;
-                // Check for duplicate activity
-                const activityKey = `${activity.id}_${activity.timestamp}`;
-                if (processedActivities.has(activityKey)) {
-                    // Already processed this activity, skip
-                    shouldTrigger = false;
-                    return;
-                }
-                // Check if we should process this activity type
-                if (!events.includes(activity.type)) {
-                    shouldTrigger = false;
-                    return;
-                }
-                // Ignore bot messages if configured
-                if (options.ignoreBotMessages && ((_a = activity.from) === null || _a === void 0 ? void 0 : _a.role) === 'bot') {
-                    shouldTrigger = false;
-                    return;
-                }
-                // Mark this activity as processed
-                processedActivities.set(activityKey, Date.now());
-                shouldTrigger = true;
-                // Send typing indicator if auto reply is enabled
-                if (options.autoReply && activity.type === 'message') {
-                    await context.sendActivity({ type: 'typing' });
-                }
-                // Extract useful data from activity
-                activityData = {
-                    type: activity.type,
-                    text: activity.text,
-                    timestamp: activity.timestamp,
-                    id: activity.id,
-                    conversation: {
-                        id: (_b = activity.conversation) === null || _b === void 0 ? void 0 : _b.id,
-                        name: (_c = activity.conversation) === null || _c === void 0 ? void 0 : _c.name,
-                        conversationType: (_d = activity.conversation) === null || _d === void 0 ? void 0 : _d.conversationType,
-                        tenantId: (_e = activity.conversation) === null || _e === void 0 ? void 0 : _e.tenantId,
-                    },
-                    from: {
-                        id: (_f = activity.from) === null || _f === void 0 ? void 0 : _f.id,
-                        name: (_g = activity.from) === null || _g === void 0 ? void 0 : _g.name,
-                        aadObjectId: (_h = activity.from) === null || _h === void 0 ? void 0 : _h.aadObjectId,
-                        role: (_j = activity.from) === null || _j === void 0 ? void 0 : _j.role,
-                    },
-                    recipient: {
-                        id: (_k = activity.recipient) === null || _k === void 0 ? void 0 : _k.id,
-                        name: (_l = activity.recipient) === null || _l === void 0 ? void 0 : _l.name,
-                    },
-                    channelId: activity.channelId,
-                    serviceUrl: activity.serviceUrl,
-                    locale: activity.locale,
-                };
-                // Add type-specific data
-                switch (activity.type) {
-                    case 'message':
-                        activityData.message = {
-                            text: activity.text,
-                            textFormat: activity.textFormat,
-                            attachments: activity.attachments,
-                            mentions: (_m = activity.entities) === null || _m === void 0 ? void 0 : _m.filter((e) => e.type === 'mention'),
-                        };
-                        break;
-                    case 'conversationUpdate':
-                        activityData.conversationUpdate = {
-                            membersAdded: activity.membersAdded,
-                            membersRemoved: activity.membersRemoved,
-                        };
-                        break;
-                    case 'messageReaction':
-                        activityData.messageReaction = {
-                            reactionsAdded: activity.reactionsAdded,
-                            reactionsRemoved: activity.reactionsRemoved,
-                            replyToId: activity.replyToId,
-                        };
-                        break;
-                    case 'messageUpdate':
-                        activityData.messageUpdate = {
-                            text: activity.text,
-                            updatedText: activity.text,
-                        };
-                        break;
-                    case 'messageDelete':
-                        activityData.messageDelete = {
-                            deletedMessageId: activity.id,
-                        };
-                        break;
-                }
-                // Include raw activity if requested
-                if (options.includeRawActivity) {
-                    activityData.rawActivity = activity;
-                }
-            });
-            if (!shouldTrigger || !activityData) {
-                // Don't trigger workflow - Bot Framework Adapter already sent 200 OK
-                return {
-                    noWebhookResponse: true,
-                };
-            }
-            // Return the activity data to the workflow
+        // Get the activity from body
+        const activity = bodyData;
+        // Validate activity object
+        if (!activity || !activity.type) {
             return {
-                workflowData: [
-                    [
-                        {
-                            json: activityData,
-                        },
-                    ],
-                ],
+                webhookResponse: { status: 'ok', message: 'Invalid activity' },
             };
         }
-        catch (error) {
-            throw new n8n_workflow_1.NodeOperationError(node, `Failed to process Teams webhook: ${error.message}`, {
-                description: error.message,
-            });
+        // Check for duplicate activity
+        const activityKey = `${activity.id || 'unknown'}_${activity.timestamp || Date.now()}`;
+        if (processedActivities.has(activityKey)) {
+            return {
+                webhookResponse: { status: 'ok' },
+            };
+        }
+        // Check if we should process this activity type
+        if (!events.includes(activity.type)) {
+            return {
+                webhookResponse: { status: 'ok' },
+            };
+        }
+        // Ignore bot messages if configured
+        if (options.ignoreBotMessages && ((_a = activity.from) === null || _a === void 0 ? void 0 : _a.role) === 'bot') {
+            return {
+                webhookResponse: { status: 'ok' },
+            };
         }
+        // Mark this activity as processed
+        processedActivities.set(activityKey, Date.now());
+        // Extract useful data from activity
+        const activityData = {
+            type: activity.type,
+            text: activity.text || '',
+            timestamp: activity.timestamp,
+            id: activity.id,
+            conversation: {
+                id: (_b = activity.conversation) === null || _b === void 0 ? void 0 : _b.id,
+                name: (_c = activity.conversation) === null || _c === void 0 ? void 0 : _c.name,
+                conversationType: (_d = activity.conversation) === null || _d === void 0 ? void 0 : _d.conversationType,
+                tenantId: (_e = activity.conversation) === null || _e === void 0 ? void 0 : _e.tenantId,
+            },
+            from: {
+                id: (_f = activity.from) === null || _f === void 0 ? void 0 : _f.id,
+                name: (_g = activity.from) === null || _g === void 0 ? void 0 : _g.name,
+                aadObjectId: (_h = activity.from) === null || _h === void 0 ? void 0 : _h.aadObjectId,
+                role: (_j = activity.from) === null || _j === void 0 ? void 0 : _j.role,
+            },
+            recipient: {
+                id: (_k = activity.recipient) === null || _k === void 0 ? void 0 : _k.id,
+                name: (_l = activity.recipient) === null || _l === void 0 ? void 0 : _l.name,
+            },
+            channelId: activity.channelId,
+            serviceUrl: activity.serviceUrl,
+            locale: activity.locale,
+        };
+        // Add type-specific data
+        switch (activity.type) {
+            case 'message':
+                activityData.message = {
+                    text: activity.text || '',
+                    textFormat: activity.textFormat,
+                    attachments: activity.attachments || [],
+                    mentions: ((_m = activity.entities) === null || _m === void 0 ? void 0 : _m.filter((e) => e.type === 'mention')) || [],
+                };
+                break;
+            case 'conversationUpdate':
+                activityData.conversationUpdate = {
+                    membersAdded: activity.membersAdded || [],
+                    membersRemoved: activity.membersRemoved || [],
+                };
+                break;
+            case 'messageReaction':
+                activityData.messageReaction = {
+                    reactionsAdded: activity.reactionsAdded || [],
+                    reactionsRemoved: activity.reactionsRemoved || [],
+                    replyToId: activity.replyToId,
+                };
+                break;
+            case 'messageUpdate':
+                activityData.messageUpdate = {
+                    text: activity.text || '',
+                    updatedText: activity.text || '',
+                };
+                break;
+            case 'messageDelete':
+                activityData.messageDelete = {
+                    deletedMessageId: activity.id,
+                };
+                break;
+        }
+        // Include raw activity if requested
+        if (options.includeRawActivity) {
+            activityData.rawActivity = activity;
+        }
+        // Return the activity data to the workflow
+        return {
+            workflowData: [
+                [
+                    {
+                        json: activityData,
+                    },
+                ],
+            ],
+        };
     }
 }
 exports.MsTeamsBotFrameworkTrigger = MsTeamsBotFrameworkTrigger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-msteams-botframework",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "n8n node for MS Teams Azure Bot Framework",
   "keywords": [
     "n8n-community-node-package",
@@ -18,7 +18,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/weonVN/n8n-nodes-msteams-botframework.git"
+    "url": "git+https://github.com/weonVN/n8n-nodes-msteams-botframework.git"
   },
   "main": "index.js",
   "scripts": {