@qingfu/core-env 0.5.1 → 0.5.3

package/lib/helper.js

@@ -97,10 +97,9 @@ helper.parseLike = ( ...fields ) => {
 
 helper.ip2geo = async ( ctx, next ) => {
     try {
-        let userID = ctx.state.user && ctx.state.user.id;
-        let ip = ctx.ip, agent = ctx.get( 'User-Agent' );
+        let user = ctx.state.user, ip = ctx.ip, agent = ctx.get( 'User-Agent' );
         let geo = ctx.state.geo = brokers( 'sign' ) && await brokers( 'sign' ).call( 'detect.geo', { ip });
-        if ( brokers( 'qfu' ) && userID && geo ) await brokers( 'qfu' ).call( 'user.refreshGEO', { userID, ip, agent, ...geo });
+        if ( brokers( 'qfu' ) && user && geo ) await brokers( 'qfu' ).call( 'user.refreshGEO', { user, ip, agent, ...geo });
     } catch ( err ) {
         ( global.logger || global.console ).warn( err );
     }

package/lib/queue.js

@@ -28,13 +28,12 @@ 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 connection = { url: 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 ];
@@ -59,7 +58,7 @@ if ( process.env.BULLMQ_URI ) {
     });
 
     global.BullWorker = ( name, func, options ) => {
-        let connection = parseURL( process.env.BULLMQ_URI );
+        let connection = { url: 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 => {
@@ -77,7 +76,7 @@ if ( process.env.BULLMQ_URI ) {
     };
 
     global.BullFlow = options => {
-        let connection = parseURL( process.env.BULLMQ_URI );
+        let connection = { url: process.env.BULLMQ_URI };
         let flow = new FlowProducer({ connection, prefix: DEFAULT_PREFIX, ...options });
         flow.close = _.wrap( flow.close, function( func, ...args ) {
             _.pull( flows, this );

package/lib/utils.js

@@ -7,8 +7,11 @@ const baseX   = require( 'base-x' ).default;
 const pinyin  = require( 'pinyin' ).default;
 const qrcode  = require( 'qr-image' );
 const request = require( 'superagent' );
+const { serializeError } = require( 'serialize-error' );
 const utils   = global.utils = module.exports = {};
 
+utils.serializeError = serializeError;
+
 utils.xml2json = async ( xml, opts ) => {
     if ( !opts ) opts = { explicitRoot: false, explicitArray: false };
     var parser = new xml2js.Parser( opts );

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@qingfu/core-env",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "readmeFilename": "README.md",
   "dependencies": {
     "@koa/cors": "5.0.0",
-    "@koa/router": "13.0.0",
+    "@koa/router": "13.1.0",
     "base-x": "5.0.0",
     "bull": "4.16.3",
-    "bullmq": "5.12.15",
+    "bullmq": "5.13.1",
     "busboy": "1.6.0",
     "cookie": "0.6.0",
     "dotenv-extended": "2.9.0",
@@ -35,6 +35,7 @@
     "primus": "8.0.9",
     "primus-rooms": "3.4.3",
     "qr-image": "3.2.0",
+    "serialize-error": "8.1.0",
     "superagent": "10.1.0",
     "wechat-encrypt": "1.1.1",
     "winston": "3.14.2",