Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
.*

jest-e2e.json

tsconfig.build-test.json
tsconfig.build.json
tsconfig.json

node_modules
src
*
!dist/**/*
!asyncapi/**/*
!types/**/*
!pacakge.json
!*.md
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@globalid/iris-node",
"version": "1.0.0",
"version": "1.1.5",
"description": "",
"main": "dist/index",
"types": "dist/index.d.ts",
Expand Down
8 changes: 7 additions & 1 deletion src/lib/consume.handle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import * as errors from './errors'
import * as amqpHelper from './amqp.helper'
import * as consumeAck from './consume.ack'
import * as consumeError from './consume.error'
import * as _ from 'lodash'

const logger = getLogger('Iris:ConsumerHandle')

Expand Down Expand Up @@ -37,7 +38,7 @@ export function getMessageHandler({ resolveMessageHandler, obtainChannel, queueN
queueName,
message: msg.content.toString(),
fields: msg.fields,
headers: amqpHelper.safeAmqpObjectForLogging(msg.properties.headers),
headers: <undefined | object>amqpHelper.safeAmqpObjectForLogging(msg.properties.headers) ?? '<missing headers>',
})

if (consumeAck.ignoreMsg(msg, ch)) {
Expand All @@ -46,6 +47,11 @@ export function getMessageHandler({ resolveMessageHandler, obtainChannel, queueN
return
}

if (_.isNil(msg.properties.headers)) {
logger.warn('Received message with no headers. Assigning empty object.')
msg.properties.headers = {}
}

const handler = resolveMessageHandler(msg)

try {
Expand Down
2 changes: 2 additions & 0 deletions src/lib/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ export function enhancedDetails<T extends Object>(details: T, error: Error): T {
let detailsEnhanced = { ...details }
if (error instanceof InvalidObjectConverionError) {
detailsEnhanced = { ...detailsEnhanced, validation: error.validationErrors }
} else if (error instanceof Error) {
detailsEnhanced = { ...details, err: JSON.stringify(error, Object.getOwnPropertyNames(error)) }
} else {
detailsEnhanced = { ...details, err: error }
}
Expand Down