@qingfu/core-env 0.4.3 → 0.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/helper.js +5 -6
- package/package.json +1 -1
package/lib/helper.js
CHANGED
|
@@ -55,19 +55,18 @@ helper.multipart = ({ count = 5, size = 20 * 1024 * 1024 } = {}) => {
|
|
|
55
55
|
};
|
|
56
56
|
};
|
|
57
57
|
|
|
58
|
-
helper.upload = ({
|
|
58
|
+
helper.upload = ({ dir, limit, timeout = ms( '1min' )}) => {
|
|
59
59
|
if ( !dir ) throw new Error( 422 );
|
|
60
60
|
return async ctx => await helper.multipart( limit )( ctx, async () => {
|
|
61
61
|
let files = ctx.request.files;
|
|
62
|
-
if ( _.isFunction( bucket )) bucket = await bucket( ctx );
|
|
63
62
|
if ( _.isFunction( dir )) dir = await dir( ctx );
|
|
64
63
|
if ( _.isEmpty( files )) return ctx.throw( 422 );
|
|
65
64
|
let results = await Promise.all( Object.keys( files ).map( async field => {
|
|
66
65
|
let { name, buffer } = files[ field ];
|
|
67
66
|
let readable = new stream.PassThrough();
|
|
68
67
|
readable.end( buffer );
|
|
69
|
-
let meta = { name,
|
|
70
|
-
let data = await brokers( 'core' ).call( 'store.save', readable, { meta });
|
|
68
|
+
let meta = { name, dir };
|
|
69
|
+
let data = await brokers( 'core' ).call( 'store.save', readable, { meta, timeout });
|
|
71
70
|
return { field, ...data };
|
|
72
71
|
}));
|
|
73
72
|
ctx.status = 201;
|
|
@@ -100,8 +99,8 @@ helper.ip2geo = async ( ctx, next ) => {
|
|
|
100
99
|
try {
|
|
101
100
|
let userID = ctx.state.user && ctx.state.user.id;
|
|
102
101
|
let ip = ctx.ip, agent = ctx.get( 'User-Agent' );
|
|
103
|
-
let geo = ctx.state.geo = await brokers( '
|
|
104
|
-
if (
|
|
102
|
+
let geo = ctx.state.geo = brokers( 'sign' ) && await brokers( 'sign' ).call( 'detect.geo', { ip });
|
|
103
|
+
if ( brokers( 'qfu' ) && userID && geo ) await brokers( 'qfu' ).call( 'user.refreshGEO', { userID, ip, agent, ...geo });
|
|
105
104
|
} catch ( err ) {
|
|
106
105
|
( global.logger || global.console ).warn( err );
|
|
107
106
|
}
|