@qingfu/core-env 0.5.3 → 0.5.5

package/index.js

@@ -25,7 +25,7 @@ exports.start = async function() {
 
 exports.stop = async function( code = 0 ) {
     try {
-        setTimeout(() => process.exit( 1 ), 5000 );
+        setTimeout(() => process.exit( 1 ), 30 * 1000 );
         for ( let bundle of bundles.reverse() )
             if ( bundle.stopPromise )
                 await bundle.stopPromise();

package/lib/broker.js

@@ -14,6 +14,7 @@ if ( process.env.BROKER_URI ) {
             skipProcessEventRegistration: true,
             namespace: ns, transporter,
             serializer: 'Notepack',
+            tracking: { enabled: true, shutdownTimeout: 30 * 1000 },
             requestTimeout: process.env.BROKER_TIMEOUT || 10 * 1000,
             cacher: { type: 'Memory', options: { ttl: 30, clone: true }},
             logger: { type: 'Console', options: { level: 'error', formatter: 'short' }},

package/lib/helper.js

@@ -98,7 +98,7 @@ helper.parseLike = ( ...fields ) => {
 helper.ip2geo = async ( ctx, next ) => {
     try {
         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 });
+        let geo = ctx.state.geo = brokers( 'core' ) && await brokers( 'core' ).call( 'detect.geo', { ip });
         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

@@ -1,31 +1,3 @@
-if ( process.env.QUEUE_URI ) {
-
-    const Bull = require( 'bull' );
-    const list = [];
-    const defaults = { defaultJobOptions: { removeOnComplete: true, removeOnFail: true }};
-
-    global.Queue = module.exports = ( name, options ) => {
-        let queue = new Bull( name, process.env.QUEUE_URI, _.defaultsDeep( options, defaults ));
-        queue.on( 'error', err => {
-            logger.error( err, { queue: name });
-        });
-        queue.on( 'failed', ( job, err ) => {
-            logger.error( err, { queue: name, data: job.data });
-        });
-        queue.close = _.wrap( queue.close, function( func, ...args ) {
-            _.pull( list, this );
-            return func.apply( this, args );
-        });
-        list.push( queue );
-        return queue;
-    };
-
-    Queue.stopPromise = () => {
-        return Promise.all( list.map( v => v.close() ));
-    };
-
-}
-
 if ( process.env.BULLMQ_URI ) {
 
     const { Queue, Worker } = require( 'bullmq' );

package/package.json

@@ -1,34 +1,33 @@
 {
   "name": "@qingfu/core-env",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "readmeFilename": "README.md",
   "dependencies": {
     "@koa/cors": "5.0.0",
     "@koa/router": "13.1.0",
     "base-x": "5.0.0",
-    "bull": "4.16.3",
-    "bullmq": "5.13.1",
+    "bullmq": "5.34.8",
     "busboy": "1.6.0",
-    "cookie": "0.6.0",
+    "cookie": "1.0.2",
     "dotenv-extended": "2.9.0",
     "glob": "8.1.0",
-    "ioredis": "5.4.1",
+    "ioredis": "5.4.2",
     "jsonwebtoken": "9.0.2",
     "koa": "2.15.3",
     "koa-bodyparser": "4.4.1",
     "koa-favicon": "2.1.0",
-    "koa-helmet": "7.0.2",
+    "koa-helmet": "8.0.1",
     "koa-logger": "3.2.1",
     "koa-methodoverride": "2.0.0",
     "koa-qs": "3.0.0",
     "lodash": "4.17.21",
-    "moleculer": "0.14.34",
-    "mongoose": "7.8.1",
+    "moleculer": "0.14.35",
+    "mongoose": "7.8.3",
     "mongoose-cast-aggregation": "0.3.1",
     "mongoose-geojson-schema": "2.2.5",
     "mongoose-lean-defaults": "2.2.1",
     "mongoose-lean-getters": "2.1.1",
-    "mongoose-lean-virtuals": "1.0.0",
+    "mongoose-lean-virtuals": "1.1.0",
     "ms": "2.1.3",
     "notepack.io": "3.0.1",
     "pinyin": "3.1.0",
@@ -36,10 +35,10 @@
     "primus-rooms": "3.4.3",
     "qr-image": "3.2.0",
     "serialize-error": "8.1.0",
-    "superagent": "10.1.0",
+    "superagent": "10.1.1",
     "wechat-encrypt": "1.1.1",
-    "winston": "3.14.2",
-    "winston-mongodb": "5.1.1",
+    "winston": "3.17.0",
+    "winston-mongodb": "6.0.0",
     "xlsx": "0.18.5",
     "xml2js": "0.6.2"
   }