@qingfu/core-env 0.3.8 → 0.4.1

package/lib/queue.js

@@ -7,14 +7,14 @@ if ( process.env.QUEUE_URI ) {
     global.Queue = module.exports = ( name, options ) => {
         let queue = new Bull( name, process.env.QUEUE_URI, _.defaultsDeep( options, defaults ));
         queue.on( 'error', err => {
-            logger.error( Object.assign( err, { queue: name }));
+            logger.error( err, { queue: name });
         });
         queue.on( 'failed', ( job, err ) => {
-            logger.error( Object.assign( err, { queue: name, data: job.data }));
+            logger.error( err, { queue: name, data: job.data });
         });
         queue.close = _.wrap( queue.close, function( func, ...args ) {
             _.pull( list, this );
-            func.apply( this, args );
+            return func.apply( this, args );
         });
         list.push( queue );
         return queue;
@@ -25,3 +25,70 @@ if ( process.env.QUEUE_URI ) {
     };
 
 }
+
+if ( process.env.BULLMQ_URI ) {
+
+    const { parseURL } = require( 'ioredis/built/utils' );
+    const { Queue, Worker } = require( 'bullmq' );
+    const queues = [], workers = [], flows = [];
+    const DEFAULT_PREFIX = 'bullmq', DEFAULT_NAME = 'default name';
+
+    global.BullQueue = _.memoize(( name, options ) => {
+        let connection = parseURL( process.env.BULLMQ_URI );
+        let queue = new Queue( name, { connection, prefix: DEFAULT_PREFIX, ...options });
+        queue.add = _.wrap( queue.add, function( func, ...args ) {
+            if ( !_.isString( args[ 0 ])) args = [ DEFAULT_NAME, ...args ];
+            let cron = _.get( _.last( args ), 'repeat.cron' );
+            if ( cron ) {
+                _.set( _.last( args ), 'repeat.pattern', cron );
+                _.set( _.last( args ), 'repeat.cron', null );
+            }
+            return func.apply( this, args );
+        });
+        queue.addBulk = _.wrap( queue.addBulk, function( func, ...args ) {
+            if ( _.isArray( args[ 0 ])) args[ 0 ] = args[ 0 ]
+                .map( v => _.defaults( v, { name: DEFAULT_NAME }));
+            return func.apply( this, args );
+        });
+        queue.close = _.wrap( queue.close, function( func, ...args ) {
+            _.pull( queues, this );
+            return func.apply( this, args );
+        });
+        queues.push( queue );
+        return queue;
+    });
+
+    global.BullWorker = ( name, func, options ) => {
+        let connection = parseURL( process.env.BULLMQ_URI );
+        let defaults = { removeOnComplete: { count: 0 }, removeOnFail: { count: 0 }};
+        let worker = new Worker( name, func, { connection, prefix: DEFAULT_PREFIX, ...defaults, ...options });
+        worker.on( 'error', err => {
+            logger.error( err, { queue: name });
+        });
+        worker.on( 'failed', ( job, err ) => {
+            logger.error( err, { queue: name, data: job.data });
+        });
+        worker.close = _.wrap( worker.close, function( func, ...args ) {
+            _.pull( workers, this );
+            return func.apply( this, args );
+        });
+        workers.push( worker );
+        return worker;
+    };
+
+    global.BullFlow = options => {
+        let connection = parseURL( process.env.BULLMQ_URI );
+        let flow = new FlowProducer({ connection, prefix: DEFAULT_PREFIX, ...options });
+        flow.close = _.wrap( flow.close, function( func, ...args ) {
+            _.pull( flows, this );
+            return func.apply( this, args );
+        });
+        flows.push( flow );
+        return flow;
+    };
+
+    exports.stopPromise = () => {
+        return Promise.all([ ...queues, ...workers, ...flows ].map( v => v.close() ));
+    };
+
+}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@qingfu/core-env",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "readmeFilename": "README.md",
   "dependencies": {
     "@koa/cors": "5.0.0",
     "@koa/router": "12.0.1",
     "base-x": "4.0.0",
-    "bull": "4.12.9",
+    "bull": "4.15.1",
+    "bullmq": "5.10.3",
     "busboy": "1.6.0",
     "cookie": "0.6.0",
     "dotenv-extended": "2.9.0",
@@ -36,7 +37,7 @@
     "qr-image": "3.2.0",
     "superagent": "8.1.2",
     "wechat-encrypt": "1.1.1",
-    "winston": "3.13.0",
+    "winston": "3.13.1",
     "winston-mongodb": "5.1.1",
     "xlsx": "0.18.5",
     "xml2js": "0.4.23"