From 5b9bfe3cc6847325512b9e72fdef5b869d4fcea2 Mon Sep 17 00:00:00 2001 From: Mitja Cotic Date: Mon, 29 May 2023 11:26:04 +0200 Subject: [PATCH 1/2] feat(GID-1981): add new "original queue" header for retry messages --- src/lib/constants.ts | 1 + src/lib/consume.retry.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index d63cc49..4644719 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -98,6 +98,7 @@ export const MESSAGE_HEADERS = { NOTIFY_CLIENT: 'x-notify-client', ORIGINAL_EXCHANGE: 'x-original-exchange', ORIGINAL_ROUTING_KEY: 'x-original-routing-key', + ORIGINAL_QUEUE: 'x-original-queue', RETRY_COUNT: 'x-retry-count', }, diff --git a/src/lib/consume.retry.ts b/src/lib/consume.retry.ts index 92890a1..364d979 100644 --- a/src/lib/consume.retry.ts +++ b/src/lib/consume.retry.ts @@ -35,6 +35,7 @@ export async function enqueueWithBackoff( headers[MESSAGE_HEADERS.REQUEUE.ORIGINAL_EXCHANGE] = msg.fields.exchange headers[MESSAGE_HEADERS.REQUEUE.ORIGINAL_ROUTING_KEY] = msg.fields.routingKey + headers[MESSAGE_HEADERS.REQUEUE.ORIGINAL_QUEUE] = handler.processedConfig.queueName headers[MESSAGE_HEADERS.REQUEUE.MAX_RETRIES] = msgMeta.maxRetry ?? connection.getConfig().maxMessageRetryCount headers[MESSAGE_HEADERS.REQUEUE.NOTIFY_CLIENT] = errors.shouldNotifyClient(error, msg) headers[MESSAGE_HEADERS.MESSAGE.SERVER_TIMESTAMP] = Date.now() From 7f47509a199c8791f3ea4dce65f71f1ed7def124 Mon Sep 17 00:00:00 2001 From: Mitja Cotic Date: Mon, 29 May 2023 11:47:53 +0200 Subject: [PATCH 2/2] chore: no sdk for this package --- .github/workflows/release-js-sdk.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .github/workflows/release-js-sdk.yml diff --git a/.github/workflows/release-js-sdk.yml b/.github/workflows/release-js-sdk.yml deleted file mode 100644 index d649d28..0000000 --- a/.github/workflows/release-js-sdk.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Release JS SDK -on: - push: - tags: - - v* - -jobs: - publish: - name: Publish - uses: globalid/.github/.github/workflows/npm-publish.yml@master - secrets: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }}