mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-25 04:34:06 -08:00
Fix Subscription
This commit is contained in:
parent
7648ee8d93
commit
1a1accce43
|
@ -1,4 +1,4 @@
|
|||
import { Container, ContainerOptions, EventContext, ReceiverOptions } from 'rhea';
|
||||
import { Container, ContainerOptions, EventContext, Message, ReceiverOptions } from 'rhea';
|
||||
|
||||
import { ITriggerFunctions } from 'n8n-core';
|
||||
import {
|
||||
|
@ -169,11 +169,11 @@ export class AmqpTrigger implements INodeType {
|
|||
let lastMsgId: string| number | Buffer | undefined = undefined;
|
||||
const self = this;
|
||||
|
||||
container.on('receiver_open', (context: any) => { // tslint:disable-line:no-any
|
||||
context.receiver.add_credit(pullMessagesNumber);
|
||||
container.on('receiver_open', (context: EventContext) => {
|
||||
context.receiver?.add_credit(pullMessagesNumber);
|
||||
});
|
||||
|
||||
container.on('message', (context: EventContext) => { // tslint:disable-line:no-any
|
||||
container.on('message', (context: EventContext) => {
|
||||
|
||||
// No message in the context
|
||||
if(!context.message)
|
||||
|
@ -241,6 +241,7 @@ export class AmqpTrigger implements INodeType {
|
|||
const connection = container.connect(connectOptions);
|
||||
|
||||
let clientOptions : ReceiverOptions = {
|
||||
name: subscription ? subscription : undefined,
|
||||
source: {
|
||||
address: sink,
|
||||
durable: (durable ? 2 : undefined),
|
||||
|
@ -269,14 +270,15 @@ export class AmqpTrigger implements INodeType {
|
|||
const timeoutHandler = setTimeout(() => {
|
||||
reject(new Error('Aborted, no message received within 30secs. This 30sec timeout is only set for "manually triggered execution". Active Workflows will listen indefinitely.'));
|
||||
}, 3000);
|
||||
container.on('message', (context: any) => { // tslint:disable-line:no-any
|
||||
container.on('message', (context: EventContext) => {
|
||||
// Check if the only property present in the message is body
|
||||
// in which case we only emit the content of the body property
|
||||
// otherwise we emit all properties and their content
|
||||
if (Object.keys(context.message)[0] === 'body' && Object.keys(context.message).length === 1) {
|
||||
self.emit([self.helpers.returnJsonArray([context.message.body])]);
|
||||
const message = context.message as Message;
|
||||
if (Object.keys(message)[0] === 'body' && Object.keys(message).length === 1) {
|
||||
self.emit([self.helpers.returnJsonArray([message.body])]);
|
||||
} else {
|
||||
self.emit([self.helpers.returnJsonArray([context.message])]);
|
||||
self.emit([self.helpers.returnJsonArray([message as any])]);
|
||||
}
|
||||
clearTimeout(timeoutHandler);
|
||||
resolve(true);
|
||||
|
|
Loading…
Reference in a new issue