@qingfu/core-env 0.1.6 → 0.1.10

package/lib/helper.js

@@ -67,22 +67,29 @@ helper.parseLike = ( ...fields ) => {
 };
 
 helper.checkRestrict = async ( ctx, next ) => {
-    let count = await brokers( 'core' ).call( 'check.count', ctx.ip );
+    let scene = ctx.state.user ? ctx.state.user.id : ctx.ip;
+    let count = await brokers( 'core' ).call( 'check.count', scene );
     if ( count > 50 ) return ctx.throw( 429 );
     try {
         await next();
     } catch ( err ) {
-        await brokers( 'core' ).call( 'check.increase', ctx.ip );
+        await brokers( 'core' ).call( 'check.increase', scene );
         throw err;
     }
 };
 
 helper.validatePassword = async ( ctx, next ) => {
-    if ( !ctx.header.password ) return ctx.throw( 428, 'PASSWORD_REQUIRED' );
-    let match = await broker.call( 'user.validatePassword', {
-        userID: ctx.state.user.id, password: ctx.header.password });
-    if ( !match ) return ctx.throw( 412, 'PASSWORD_WRONG' );
-    else return await next();
+    let userID = ctx.state.user.id, password = ctx.header.password;
+    if ( !password ) return ctx.throw( 428, 'PASSWORD_REQUIRED' );
+    let count = await brokers( 'core' ).call( 'check.count', userID );
+    if ( count > 50 ) return ctx.throw( 429 );
+    let match = await broker.call( 'user.validatePassword', { userID, password });
+    if ( match ) {
+        return await next();
+    } else {
+        await brokers( 'core' ).call( 'check.increase', userID );
+        return ctx.throw( 412, 'PASSWORD_WRONG' );
+    }
 };
 
 helper.wmpTestGet = async ctx => {

package/lib/server.js

@@ -10,11 +10,17 @@ if ( process.env.HTTP_PORT ) {
     app.use( require( 'koa-helmet' )({ frameguard: false, contentSecurityPolicy: false }));
     app.use( require( 'koa-methodoverride' )() );
     app.use( require( 'koa-logger' )() );
+    app.use( dontparse );
     app.use( require( 'koa-bodyparser' )({ enableTypes: [ 'json', 'form', 'xml' ]}));
     app.use( require( 'koa-favicon' )( path.join( __dirname, '../favicon.ico' )));
     app.use( error );
     require( 'koa-qs' )( app );
 
+    async function dontparse( ctx, next ) {
+        if ( ctx.path.includes( '/dontparse' ) ctx.disableBodyParser = true;
+        await next();
+    };
+
     async function error( ctx, next ) {
         try {
             await next();
@@ -46,7 +52,8 @@ if ( process.env.HTTP_PORT ) {
             logger.error( Object.assign( err, {
                 url: ctx.path,
                 query: ctx.query,
-                body: ctx.request.body
+                body: ctx.request.body,
+                user: ctx.state.user
             }));
     });
 

package/lib/utils.js

@@ -17,6 +17,10 @@ utils.json2xml = json => {
     return builder.buildObject( json );
 };
 
+utils.trimZeroWidthSpace = string => {
+    return _.isString( string ) ? string.trim().replace( /[\uFEFF\u0001\u200b-\u200f\u202a-\u202e]/g, '' ) : string;
+};
+
 utils.json2xlsx = ( json, mapping, type = 'xlsx' ) => {
     let data = json.map( obj => mapping.map( v => {
         let value = v.value ? v.value( obj ) : _.get( obj, v.field );
@@ -56,7 +60,7 @@ utils.xlsx2json = ( buffer, mapping ) => {
         return _.transform( mapping, ( r, map ) => {
             if ( map.index === -1 ) return;
             let value = values[ map.index ];
-            if ( _.isString( value )) value = value.trim().replace( /\u200B/g, '' ).replace( /\u0001/g, '' );
+            if ( _.isString( value )) value = utils.trimZeroWidthSpace( value );
             else if ( value instanceof Date ) value = fixImportedDate( value, date1904 );
             r[ map.field ] = ( map.format || _.identity )( value );
         }, {});

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@qingfu/core-env",
-  "version": "0.1.6",
+  "version": "0.1.10",
   "readmeFilename": "README.md",
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "bull": "4.1.1",
+    "bull": "4.1.4",
     "busboy": "0.3.1",
     "cookie": "0.4.1",
     "dotenv-extended": "2.9.0",
     "glob": "7.2.0",
-    "ioredis": "4.28.0",
+    "ioredis": "4.28.2",
     "jsonwebtoken": "8.5.1",
     "koa": "2.13.4",
     "koa-bodyparser": "4.3.0",
@@ -21,11 +21,11 @@
     "koa-qs": "3.0.0",
     "lodash": "4.17.21",
     "moleculer": "0.14.18",
-    "mongoose": "6.0.13",
+    "mongoose": "6.1.2",
     "mongoose-cast-aggregation": "0.2.1",
     "mongoose-geojson-schema": "2.1.7",
     "mongoose-lean-defaults": "2.0.1",
-    "mongoose-lean-getters": "0.2.1",
+    "mongoose-lean-getters": "0.2.2",
     "mongoose-lean-virtuals": "0.9.0",
     "ms": "2.1.3",
     "notepack.io": "2.3.0",