Refactors code to support inheritance

src/server/queue/bee.js

@@ -0,0 +1,91 @@
+const Queue = require('./queue');
+const Job = require('./job');
+const JobData = require('./jobData');
+
+class BeeJob extends Job {
+  constructor(job) {
+    super(job);
+  }
+
+  async remove() {
+    await this._job.remove();
+  }
+
+  async getStatus() {
+    return Promise.resolve(this._job.status);
+  }
+
+  async toJSON() {
+    const {id, progress, data, options: {timestamp, stacktraces: stacktrace, delay}} = this._job;
+    return new JobData({id, progress, data, timestamp, stacktrace, delay});
+  }
+}
+
+const VALID_STATES = ['waiting', 'active', 'succeeded', 'failed', 'delayed'];
+const SUPPORTED_ACTIONS = ['remove'];
+
+module.exports = class BeeQueue extends Queue {
+  constructor(queueConfig) {
+    const {name} = queueConfig;
+    const options = BeeQueue.parseConfig(queueConfig);
+    const queue = new BeeQueue(name, options);
+    super(queue);
+  }
+
+  static parseConfig(queueConfig) {
+    const options = {
+      redis: this.parseRedisConfig(queueConfig),
+      isWorker: false,
+      getEvents: false,
+      sendEvents: false,
+      storeJobs: false,
+    };
+    const {prefix} = queueConfig;
+    if (prefix) options.prefix = prefix;
+    return options;
+  }
+
+  async getJob(id) {
+    const job = this._queue.getJob(id);
+    return new BeeJob(job);
+  }
+
+  async getJobCounts() {
+    const jobCounts = this._queue.checkHealth();
+    delete jobCounts.newestJob;
+    return jobCounts;
+  }
+
+  async getJobs(state, start, size) {
+    const page = {};
+
+    if (['failed', 'succeeded'].includes(state)) {
+      page.size = size;
+    } else {
+      page.start = start;
+      page.end = start + size - 1;
+    }
+
+    let jobs = await this._queue.getJobs(state, page);
+    // Filter out Bee jobs that have already been removed by the time the promise resolves
+    jobs = jobs.filter((job) => job);
+    return jobs.map((j) => new BeeJob(j));
+  }
+
+  async addJob(data) {
+    const job = await this._queue.createJob(data).save();
+    return new BeeJob(job);
+  }
+
+  isValidState(state) {
+    return VALID_STATES.includes(state);
+  }
+
+  isActionSupported(action) {
+    return SUPPORTED_ACTIONS.includes(action);
+  }
+
+  isPaginationSupported(state) {
+    return state !== 'succeeded' && state !== 'failed';
+  }
+};

src/server/queue/bull.js

@@ -0,0 +1,101 @@
+const {capitalize} = require('lodash');
+const Bull = require('bull');
+const Queue = require('./queue');
+const Job = require('./job');
+const JobData = require('./jobData');
+
+const VALID_STATES = ['waiting', 'active', 'completed', 'failed', 'delayed'];
+const SUPPORTED_ACTIONS = ['remove', 'retry'];
+
+class BullJob extends Job {
+  constructor(job) {
+    super(job);
+  }
+
+  async remove() {
+    await this._job.remove();
+  }
+
+  async retry() {
+    await this._job.retry();
+  }
+
+  async getStatus() {
+    return this._job.getState();
+  }
+
+
+  async toJSON() {
+    const {
+      id,
+      name,
+      data,
+      attemptsMade,
+      failedReason,
+      stacktrace,
+      returnvalue: returnValue,
+      timestamp,
+      delay,
+      progress
+    } = this._job.toJSON();
+    return new JobData({
+      id,
+      name,
+      data,
+      attemptsMade,
+      failedReason,
+      stacktrace,
+      timestamp,
+      delay,
+      progress,
+      returnValue,
+    });
+  }
+}
+
+module.exports = class BullQueue extends Queue {
+  constructor(queueConfig) {
+    const {name} = queueConfig;
+    const options = BullQueue.parseConfig(queueConfig);
+    const queue = Bull(name, options);
+    super(queue);
+  }
+
+  static parseConfig(queueConfig) {
+    const options = {redis: this.parseRedisConfig(queueConfig)};
+    const {createClient, prefix} = queueConfig;
+    if (createClient) options.createClient = createClient;
+    if (prefix) options.prefix = prefix;
+    return options;
+  }
+
+  async getJob(id) {
+    const job = await this._queue.getJob(id);
+    return new BullJob(job);
+  }
+
+  async getJobCounts() {
+    return this._queue.getJobCounts();
+  }
+
+  async getJobs(state, start, size) {
+    const jobs = await this._queue[`get${capitalize(state)}`](start, start + size - 1);
+    return jobs.map((j) => new BullJob(j));
+  }
+
+  async addJob(data) {
+    const job = await this._queue.add(data, {
+      removeOnComplete: false,
+      removeOnFail: false
+    });
+    return new BullJob(job);
+  }
+
+  isValidState(state) {
+    return VALID_STATES.includes(state);
+  }
+
+  isActionSupported(action) {
+    return SUPPORTED_ACTIONS.includes(action);
+  }
+};

src/server/queue/index.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
-const Bull = require('bull');
-const Bee = require('bee-queue');
+const BullQueue = require('./bull');
+const BeeQueue = require('./bee');
 
 class Queues {
   constructor(config) {
@@ -38,59 +38,19 @@ class Queues {
       return this._queues[queueHost][queueName];
     }
 
-    const { type, name, port, host, db, password, prefix, url, redis, tls } = queueConfig;
-
-    const redisHost = { host };
-    if (password) redisHost.password = password;
-    if (port) redisHost.port = port;
-    if (db) redisHost.db = db;
-    if (tls) redisHost.tls = tls;
-
-    const isBee = type === 'bee';
-
-    const options = {
-      redis: redis || url || redisHost
-    };
-    if (prefix) options.prefix = prefix;
-
+    const {type} = queueConfig;
     let queue;
-    if (isBee) {
-      _.extend(options, {
-        isWorker: false,
-        getEvents: false,
-        sendEvents: false,
-        storeJobs: false
-      });
-
-      queue = new Bee(name, options);
-      queue.IS_BEE = true;
+    if (type === 'bee') {
+      queue = new BeeQueue(queueConfig);
     } else {
-      if (queueConfig.createClient) options.createClient = queueConfig.createClient;
-      queue = new Bull(name, options);
+      queue = new BullQueue(queueConfig);
     }
 
     this._queues[queueHost] = this._queues[queueHost] || {};
     this._queues[queueHost][queueName] = queue;
 
     return queue;
   }
-
-  /**
-   * Creates and adds a job with the given `data` to the given `queue`.
-   *
-   * @param {Object} queue A bee or bull queue class
-   * @param {Object} data The data to be used within the job
-   */
-  async set(queue, data) {
-    if (queue.IS_BEE) {
-      return queue.createJob(data).save();
-    } else {
-      return queue.add(data, {
-        removeOnComplete: false,
-        removeOnFail: false
-      });
-    }
-  }
 }
 
 module.exports = Queues;

src/server/queue/job.js

@@ -0,0 +1,17 @@
+module.exports = class Job {
+  constructor(job) {
+    this._job = job;
+    if (new.target === Job) {
+      throw new TypeError("Cannot construct Job instances directly");
+    }
+  }
+
+  async remove() {
+  }
+
+  async getStatus() {
+  }
+
+  async toJSON() {
+  }
+};

src/server/queue/jobData.js

@@ -0,0 +1,16 @@
+module.exports = class JobData {
+  constructor({id, name, data, stacktrace, timestamp, progress, delay, attemptsMade, returnValue, failedReason}) {
+    this.id = id;
+    this.name = name;
+    this.data = data;
+    this.progress = progress;
+    this.attemptsMade = attemptsMade;
+    this.returnValue = returnValue;
+    this.failedReason = failedReason;
+    this.options = {
+      stacktrace,
+      timestamp,
+      delay,
+    };
+  }
+};

src/server/queue/queue.js

@@ -0,0 +1,43 @@
+module.exports = class Queue {
+  constructor(queue) {
+    this._queue = queue;
+    if (new.target === Queue) {
+      throw new TypeError("Cannot construct Queue instances directly");
+    }
+  }
+
+  static parseRedisConfig({port, host, db, password, url, redis, tls}) {
+    const redisHost = {host};
+    if (password) redisHost.password = password;
+    if (port) redisHost.port = port;
+    if (db) redisHost.db = db;
+    if (tls) redisHost.tls = tls;
+    return redis || url || redisHost;
+  }
+
+  get redisClient() {
+    return this._queue.client;
+  }
+
+  async getJob(id) {
+  }
+
+  async getJobCounts() {
+  }
+
+  async getJobs(state, start, size) {
+  }
+
+  async addJob(data, options) {
+  }
+
+  isValidState(state) {
+  }
+
+  isActionSupported(action) {
+  }
+
+  isPaginationSupported(_state) {
+    return true;
+  }
+};

src/server/views/api/bulkAction.js

@@ -1,21 +1,19 @@
 const _ = require('lodash');
 
-const ACTIONS = ['remove', 'retry'];
-
 function bulkAction(action) {
   return async function handler(req, res) {
-    if (!_.includes(ACTIONS, action)) {
-      res.status(401).send({
-        error: 'unauthorized action',
-        details: `action ${action} not permitted`
-      });
-    }
-
     const { queueName, queueHost } = req.params;
     const {Queues} = req.app.locals;
     const queue = await Queues.get(queueName, queueHost);
     if (!queue) return res.status(404).send({error: 'queue not found'});
 
+    if (!queue.isActionSupported(action)) {
+      return res.status(401).send({
+        error: 'unauthorized action',
+        details: `queue does not support action ${action}`
+      });
+    }
+
     const {jobs} = req.body;
 
     try {

src/server/views/api/jobRemove.js

@@ -1,23 +1 @@
-async function handler(req, res) {
-  const { queueName, queueHost, id } = req.params;
-
-  const {Queues} = req.app.locals;
-  const queue = await Queues.get(queueName, queueHost);
-  if (!queue) return res.status(404).send({error: 'queue not found'});
-
-  const job = await queue.getJob(id);
-  if (!job) return res.status(404).send({error: 'job not found'});
-
-  try {
-    await job.remove();
-    return res.sendStatus(200);
-  } catch (e) {
-    const body = {
-      error: 'queue error',
-      details: e.stack
-    };
-    return res.status(500).send(body);
-  }
-}
-
-module.exports = handler;
+module.exports = require('./performAction')('remove');