diff --git a/package-lock.json b/package-lock.json index 6531ed9..2feb00d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2690,9 +2690,9 @@ "optional": true }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -8079,12 +8079,12 @@ } }, "node-zookeeper-client": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/node-zookeeper-client/-/node-zookeeper-client-1.1.0.tgz", - "integrity": "sha512-Vp9kP8noRV6LcNcHg4/1wjDfxLDbRfnaXoBIbw87ZkG1fPi4H/mIs9ko5dNrniAq7wK6ugBEUGZ1Wzy0VkMnFw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/node-zookeeper-client/-/node-zookeeper-client-1.1.1.tgz", + "integrity": "sha512-KhtRhLBvUm8SaiBsMAPojicK0L9ZKCm/vMekgklxzs1EHEjfpqYqyoLrhpk0FZOzRzXmc0cXdStik3GNelMTwg==", "requires": { "async": "~0.2.7", - "underscore": "~1.4.4" + "underscore": "~1.12.1" } }, "nodemon": { @@ -8156,9 +8156,9 @@ "dev": true }, "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", "dev": true }, "npm-run-path": { @@ -8447,9 +8447,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-to-regexp": { @@ -8605,9 +8605,9 @@ "dev": true }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==", "dev": true }, "yargs": { @@ -10213,9 +10213,9 @@ } }, "underscore": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", - "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=" + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz", + "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==" }, "union-value": { "version": "1.0.1", @@ -10365,9 +10365,9 @@ } }, "urijs": { - "version": "1.19.6", - "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.6.tgz", - "integrity": "sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw==" + "version": "1.19.7", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.7.tgz", + "integrity": "sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==" }, "urix": { "version": "0.1.0", diff --git a/package.json b/package.json index fbb79a3..7c63ed3 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "mongoose": "^5.12.12", "mongoose-lean-virtuals": "^0.4.4", "node-rdkafka": "^2.10.1", - "node-zookeeper-client": "^1.1.0", + "node-zookeeper-client": "^1.1.1", "ramda": "^0.26.1", "tslib": "^1.10.0", "uuid": "^3.3.3" diff --git a/src/kafka/index.ts b/src/kafka/index.ts index d1126d1..15a52c6 100644 --- a/src/kafka/index.ts +++ b/src/kafka/index.ts @@ -124,7 +124,6 @@ export const pollWithMessage = ( messageNumber, (error: LibrdKafkaError, messages: Message[]) => { if (error) return reject(error); - consumer.commitMessageSync; resolve([ messages.map((message: Message) => { return jsonTryParse(message.value.toString()); diff --git a/src/store/redis/taskInstance.ts b/src/store/redis/taskInstance.ts index f1b437c..52d8a8c 100644 --- a/src/store/redis/taskInstance.ts +++ b/src/store/redis/taskInstance.ts @@ -96,6 +96,10 @@ export class TaskInstanceRedisStore extends RedisStore `${prefix}.workflow-task.${workflowId}`, ); + if (!taskKeys.length) { + return []; + } + const tasksString = await this.client.mget( ...taskKeys.map((taskId: string) => `${prefix}.task.${taskId}`), );