@abtnode/queue 1.16.11-next-48aec895 → 1.16.11-next-9f5464a1

package/lib/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-return-assign */
 /* eslint-disable no-underscore-dangle */
 const uuid = require('uuid');
 const Queue = require('fastq');
@@ -155,6 +156,11 @@ module.exports = function createQueue({ file, store, onJob, options = {} }) {
 
       try {
         const doc = await store.getJob(id);
+        if (!doc) {
+          emit('failed', { id, job, error: err });
+          return;
+        }
+
         if (doc.retryCount >= maxRetries) {
           logger.info('fail job', { id });
           await clearJob(id);
@@ -183,7 +189,12 @@ module.exports = function createQueue({ file, store, onJob, options = {} }) {
       });
 
     if (persist) {
-      store.addJob(id, job).then(queueJob);
+      store
+        .addJob(id, job)
+        .then(queueJob)
+        .catch((err) => {
+          logger.error('Can not add job to store', { error: err });
+        });
     } else {
       queueJob();
     }
@@ -255,6 +266,10 @@ module.exports = function createQueue({ file, store, onJob, options = {} }) {
   return Object.assign(queueEvents, {
     store,
     push,
+    drain: (cb) => (queue.drain = cb),
+    empty: (cb) => (queue.empty = cb),
+    saturated: (cb) => (queue.saturated = cb),
+    error: (cb) => (queue.error = cb),
     get: getJob,
     cancel,
     options: {

package/lib/store/nedb.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable func-names */
 /* eslint-disable consistent-return */
+const CustomError = require('@abtnode/util/lib/custom-error');
 const { DataStore } = require('@abtnode/db/lib/base');
 
 class NedbStore {
@@ -38,7 +39,7 @@ class NedbStore {
   async updateJob(id, updates) {
     const job = await this.db.findOne({ id });
     if (!job) {
-      throw new Error(`Job ${id} does not exist`);
+      throw new CustomError('JOB_NOT_FOUND', `Job ${id} does not exist`);
     }
 
     const update = { ...updates, updatedAt: Date.now() };
@@ -49,7 +50,7 @@ class NedbStore {
   async addJob(id, job, attrs = {}) {
     const exist = await this.db.findOne({ id });
     if (exist) {
-      throw new Error(`Job ${id} already exist`);
+      throw new CustomError('JOB_DUPLICATE', `Job ${id} already exist`);
     }
     return this.db.insert({
       id,

package/lib/store/sequelize.js

@@ -1,3 +1,5 @@
+const CustomError = require('@abtnode/util/lib/custom-error');
+
 class SequelizeStore {
   constructor(db, queue) {
     this.db = db;
@@ -28,7 +30,7 @@ class SequelizeStore {
   async updateJob(id, updates) {
     const job = await this.db.findOne({ queue: this.queue, id });
     if (!job) {
-      throw new Error(`Job ${id} does not exist`);
+      throw new CustomError('JOB_NOT_FOUND', `Job ${id} does not exist`);
     }
 
     const update = { ...updates, updatedAt: Date.now() };
@@ -39,7 +41,7 @@ class SequelizeStore {
   async addJob(id, job, attrs = {}) {
     const exist = await this.db.findOne({ queue: this.queue, id });
     if (exist) {
-      throw new Error(`Job ${id} already exist`);
+      throw new CustomError('JOB_DUPLICATE', `Job ${id} already exist`);
     }
     return this.db.insert({
       id,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-48aec895",
+  "version": "1.16.11-next-9f5464a1",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,13 +19,13 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/db": "1.16.11-next-48aec895",
-    "@abtnode/util": "1.16.11-next-48aec895",
+    "@abtnode/db": "1.16.11-next-9f5464a1",
+    "@abtnode/util": "1.16.11-next-9f5464a1",
     "debug": "^4.3.4",
     "fastq": "^1.13.0",
     "uuid": "^8.3.2"
   },
-  "gitHead": "81aed0ba08844b437507865581dd3f8ffd0aa04f",
+  "gitHead": "8f29a3c9889c23938a75a56c682e892f04088e19",
   "devDependencies": {
     "jest": "^27.5.1"
   }