blackteay/fes.js
1
0
Fork 0
mirror of https://github.com/WeBankFinTech/fes.js.git synced 2025-04-06 03:59:53 +08:00
Code Issues Projects Releases Wiki Activity

feat: 优化 request 插件

Browse Source
This commit is contained in:
bac-joker 2020-12-29 21:27:26 +08:00
parent 8280e5f3a9
commit 2ee1b659a0
11 changed files with 72 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/fes-core/src/service/getPaths.js
View File

@ -19,7 +19,8 @@ export default function getServicePaths({
if (isDirectoryAndExist(join(cwd, 'src'))) {
absSrcPath = join(cwd, 'src');
}
const absPagesPath = config.singular
const absPagesPath = config.singular !== false
? join(absSrcPath, 'page')
: join(absSrcPath, 'pages');

8
packages/fes-plugin-request/src/template/cacheControl.js
View File

@ -1,5 +1,5 @@
import {
genRequestKey, isObject, isString, isURLSearchParams, checkHttpRequestHasBody
isObject, isString, isURLSearchParams, checkHttpRequestHasBody
} from './helpers';
/**
* 缓存实现的功能
@ -122,13 +122,11 @@ function getCacheData({ key, cacheType = 'ram' }) {
export default (ctx, next) => {
const { config } = ctx;
let requestKey;
if (config.cache) {
const data = checkHttpRequestHasBody(config.method) ? config.data : config.params;
requestKey = genRequestKey(config.url, data, config.method);
if (canCache(data)) {
ctx.response = {
data: getCacheData({ key: requestKey, cacheType: config.cache.cacheType })
data: getCacheData({ key: ctx.key, cacheType: config.cache.cacheType })
};
return;
}
@ -137,7 +135,7 @@ export default (ctx, next) => {
if (config.cache) {
setCacheData({
key: requestKey,
key: ctx.key,
data: ctx.response.data,
...config.cache
});

15
packages/fes-plugin-request/src/template/genRequestKey.js Normal file
View File

@ -0,0 +1,15 @@
import { isURLSearchParams } from './helpers';
/**
* 唯一定位一个请求（url, data | params, method）
* 其中请求参数(data, params)根据请求方法,只使用其中一个
* 一个请求同时包含 data | params 参数的设计本身不合理
* 不对这种情况进行兼容
*/
export default function genRequestKey(ctx, next) {
const { url, data, method } = ctx.config;
if (isURLSearchParams(data)) {
ctx.key = `${url}${data.toString()}${method}`;
}
ctx.key = `${url}${JSON.stringify(data)}${method}`;
next();
}

13
packages/fes-plugin-request/src/template/helpers.js
View File

@ -90,16 +90,3 @@ export function trimObj(obj) {
});
}
}
/**
* 唯一定位一个请求（url, data | params, method）
* 其中请求参数(data, params)根据请求方法,只使用其中一个
* 一个请求同时包含 data | params 参数的设计本身不合理
* 不对这种情况进行兼容
*/
export function genRequestKey(url, data, method) {
if (isURLSearchParams(data)) {
return `${url}${data.toString()}${method}`;
}
return `${url}${JSON.stringify(data)}${method}`;
}

17
packages/fes-plugin-request/src/template/preventRepeatReq.js Normal file
View File

@ -0,0 +1,17 @@
const requestQueue = new Map();
export default (ctx, next) => {
const key = ctx.key;
if (requestQueue.get(key)) {
ctx.error = {
type: 'REPEAT',
msg: '重复请求'
};
return;
}
requestQueue.set(key, true);
next();
requestQueue.delete(key);
};

6
packages/fes-plugin-request/src/template/request.js
View File

@ -8,6 +8,9 @@ import {
import setDataField from './setDataField';
import paramsProcess from './paramsProcess';
import genRequestKey from './genRequestKey';
import preventRepeatReq from './preventRepeatReq';
import cacheControl from './cacheControl';
import resDataAdaptor from './resDataAdaptor';
import resErrorProcess from './resErrorProcess';
@ -63,6 +66,9 @@ function getRequestInstance() {
addResponseInterceptors(instance, responseInterceptors);
scheduler.use(paramsProcess);
scheduler.use(genRequestKey);
scheduler.use(preventRepeatReq);
scheduler.use(cacheControl);
scheduler.use(axiosMiddleware);
scheduler.use(resDataAdaptor);
scheduler.use(resErrorProcess);

1
packages/fes-preset-built-in/src/index.js
View File

@ -44,6 +44,7 @@ export default function () {
require.resolve('./plugins/features/proxy'),
require.resolve('./plugins/features/publicPath'),
require.resolve('./plugins/features/styleLoader'),
require.resolve('./plugins/features/singular'),
require.resolve('./plugins/features/targets'),
require.resolve('./plugins/features/terserOptions'),
require.resolve('./plugins/features/vueLoader'),

4
packages/fes-preset-built-in/src/plugins/features/define.js
View File

@ -5,6 +5,10 @@ export default (api) => {
config: {
schema(joi) {
return joi.object();
},
default: {
__VUE_OPTIONS_API__: true,
__VUE_PROD_DEVTOOLS__: false
}
}
});

12
packages/fes-preset-built-in/src/plugins/features/singular.js Normal file
View File

@ -0,0 +1,12 @@
export default (api) => {
api.describe({
key: 'singular',
config: {
default: {},
schema(joi) {
return joi
.boolean();
}
}
});
};

15
packages/fes-preset-built-in/src/plugins/misc/route/index.js
View File

@ -47,8 +47,9 @@ const getRouteName = function (parentRoutePath, fileName) {
.replace(/\*/g, 'FUZZYMATCH');
};
const getComponentPath = function (parentRoutePath, fileName) {
return posix.join('@/pages/', parentRoutePath, fileName);
const getComponentPath = function (parentRoutePath, fileName, config) {
const pagesName = config.singular ? 'page' : 'pages';
return posix.join(`@/${pagesName}/`, parentRoutePath, fileName);
};
const getRoutePath = function (parentRoutePath, fileName) {
@ -67,7 +68,7 @@ const getRoutePath = function (parentRoutePath, fileName) {
};
// TODO 约定 layout 目录作为布局文件夹，
const genRoutes = function (parentRoutes, path, parentRoutePath) {
const genRoutes = function (parentRoutes, path, parentRoutePath, config) {
const dirList = readdirSync(path);
const hasLayout = checkHasLayout(path);
const layoutRoute = {
@ -91,7 +92,7 @@ const genRoutes = function (parentRoutes, path, parentRoutePath) {
const routePath = getRoutePath(parentRoutePath, fileName);
// 路由名称
const routeName = getRouteName(parentRoutePath, fileName);
const componentPath = getComponentPath(parentRoutePath, fileName);
const componentPath = getComponentPath(parentRoutePath, fileName, config);
if (hasLayout) {
if (fileName === 'layout') {
layoutRoute.component = componentPath;
@ -120,9 +121,9 @@ const genRoutes = function (parentRoutes, path, parentRoutePath) {
const component = join(path, item);
const nextParentRouteUrl = posix.join(parentRoutePath, item);
if (hasLayout) {
genRoutes(layoutRoute.children, component, nextParentRouteUrl);
genRoutes(layoutRoute.children, component, nextParentRouteUrl, config);
} else {
genRoutes(parentRoutes, component, nextParentRouteUrl);
genRoutes(parentRoutes, component, nextParentRouteUrl, config);
}
}
});
@ -172,7 +173,7 @@ const getRoutes = function ({ config, absPagesPath }) {
if (config.routes) return config.routes;
const routes = [];
genRoutes(routes, absPagesPath, '/');
genRoutes(routes, absPagesPath, '/', config);
fix(routes);
return routes;
};

4
packages/fes-template-h5/.fes.js
View File

@ -3,6 +3,10 @@ import pxtoviewport from 'postcss-px-to-viewport';
export default {
define: {
// __VUE_OPTIONS_API__: true,
// __VUE_PROD_DEVTOOLS__: false
},
html: {
options: {
title: '海贼王'