@qingfu/core-env 0.1.17 → 0.1.20

package/lib/broker.js

@@ -1,6 +1,6 @@
 if ( process.env.BROKER_URI ) {
 
-    const { ServiceBroker, Errors } = require( 'moleculer' );
+    const { ServiceBroker, Errors: { MoleculerError }} = require( 'moleculer' );
     const defaultTCP = { maxPacketSize: 20 * 1024 * 1024 };
     const namespaces = process.env.BROKER_NS.split( /,?\s+/ ).filter( Boolean );
     const transporters = process.env.BROKER_URI.split( /,?\s+/ ).filter( Boolean );
@@ -38,8 +38,10 @@ if ( process.env.BROKER_URI ) {
                     nonce: ctx.meta.nonce,
                     timestamp: ctx.meta.timestamp
                 });
-                if ( !nonce ) throw new Errors.MoleculerError(
-                    'nonce or timestamp conflict', 409 );
+                if ( !nonce ) throw Object.assign(
+                    new MoleculerError( 'NONCE_CONFLICT', 409 ),
+                    { expose: true }
+                );
             }
             return await next( ctx );
         };

package/lib/helper.js

@@ -57,7 +57,14 @@ helper.parseLike = ( ...fields ) => {
     let parse = data => {
         let regex = { $regex: data.like, $options: 'i' };
         let $or = fields.map( field => ({[ field ]: regex }));
-        return Object.assign( data.like ? { $or } : {}, _.omit( data, 'like' ));
+        if ( !data.like ) {
+            return _.omit( data, 'like' );
+        } else if ( data.$or ) {
+            data.$or.forEach( v => Object.assign( v, { $or }));
+            return _.omit( data, 'like' );
+        } else {
+            return { $or, ..._.omit( data, 'like' )};
+        }
     };
     return async ( ctx, next ) => {
         if ( _.has( ctx.query, 'like' )) ctx.query = parse( ctx.query );

package/lib/utils.js

@@ -1,10 +1,12 @@
-const _      = require( 'lodash' );
-const crypto = require( 'crypto' );
-const xml2js = require( 'xml2js' );
-const xlsx   = require( 'xlsx' );
-const pinyin = require( 'pinyin' );
-const qrcode = require( 'qr-image' );
-const utils  = global.utils = module.exports = {};
+const fs      = require( 'fs' );
+const _       = require( 'lodash' );
+const crypto  = require( 'crypto' );
+const xml2js  = require( 'xml2js' );
+const xlsx    = require( 'xlsx' );
+const pinyin  = require( 'pinyin' );
+const qrcode  = require( 'qr-image' );
+const request = require( 'superagent' );
+const utils   = global.utils = module.exports = {};
 
 utils.xml2json = async xml => {
     let options = { explicitRoot: false, explicitArray: false };
@@ -222,3 +224,18 @@ utils.identityValidate = identity => {
     if ( parity[ sum % 11 ] != identity[ 17 ]) return false;
     else return true;
 };
+
+utils.fetchBig = async ({ url, dest, retry = 0 }) => {
+    try {
+        return await new Promise(( resolve, reject ) => {
+            let writeStream = fs.createWriteStream( dest );
+            let readStream = request.get( url );
+            readStream.pipe( writeStream );
+            readStream.on( 'error', reject );
+            writeStream.on( 'finish', resolve );
+        });
+    } catch ( err ) {
+        if ( !retry-- ) throw err;
+        return utils.fetchBig({ url, dest, retry });
+    }
+};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@qingfu/core-env",
-  "version": "0.1.17",
+  "version": "0.1.20",
   "readmeFilename": "README.md",
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "bull": "4.5.4",
+    "bull": "4.6.2",
     "busboy": "0.3.1",
     "cookie": "0.4.2",
     "dotenv-extended": "2.9.0",
@@ -21,7 +21,7 @@
     "koa-qs": "3.0.0",
     "lodash": "4.17.21",
     "moleculer": "0.14.19",
-    "mongoose": "6.2.1",
+    "mongoose": "6.2.4",
     "mongoose-cast-aggregation": "0.2.1",
     "mongoose-geojson-schema": "2.1.7",
     "mongoose-lean-defaults": "2.1.0",
@@ -29,7 +29,7 @@
     "mongoose-lean-virtuals": "0.9.0",
     "ms": "2.1.3",
     "notepack.io": "2.3.0",
-    "pinyin": "2.10.2",
+    "pinyin": "2.11.0",
     "primus": "8.0.5",
     "primus-rooms": "3.4.1",
     "qr-image": "3.2.0",