Skip to content

implemented onConfig to by pass the request if certain conditions are matched #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyfung1031 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

implemented onConfig to by pass the request if certain conditions are matched #120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba2271f
implemented `onConfig`
cyfung1031 Aug 16, 2023
a5904ee
implemented `onFilter` (2)
cyfung1031 Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ interface XhrErrorHandler extends XhrHandler {
}

interface Proxy {
onConfig?: (config: XhrRequestConfig, xhrProxy: Hooks) => boolean | void,
Copy link
Collaborator

@DAHUIAAAAA DAHUIAAAAA Sep 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

改成 onFilter 吧，语义化更好，第二个参数没什么太大用处，可以不传，因为过滤 url 后就可以直接走原生方法了，不用手动调用，切莫过度设计

Copy link
Contributor Author

@cyfung1031 cyfung1031 Sep 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

改了

onRequest?: (config: XhrRequestConfig, handler: XhrRequestHandler) => void,
onResponse?: (response: XhrResponse, handler: XhrResponseHandler) => void,
onError?: (err: XhrError, handler: XhrErrorHandler) => void,
Expand Down
8 changes: 7 additions & 1 deletion src/xhr-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ var ErrorHandler = makeHandler(function (error) {
});

function proxyAjax(proxy, win) {
var onRequest = proxy.onRequest,
var onConfig = proxy.onConfig,
onRequest = null,
onRequest_ = proxy.onRequest,
onResponse = proxy.onResponse,
onError = proxy.onError;

Expand Down Expand Up @@ -187,6 +189,10 @@ function proxyAjax(proxy, win) {
// 所以我们在send拦截函数中再手动调用open，因此返回true阻止xhr.open调用。
//
// 如果没有请求拦截器，则不用阻断xhr.open调用
onRequest = onRequest_;
if (onConfig) {
if (onConfig(config, this) === false) onRequest = null;
}
if (onRequest) return true;
Copy link
Collaborator

@DAHUIAAAAA DAHUIAAAAA Sep 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

上面这段代码直接改成这样就可以了:

if (onFilter && onFilter(config)) {
    return;
}

if (onRequest) return true;

可以看到 hookFunction 里面，当函数没有 ret 的时候，就会直接走原生方法：
image

},
send: function (args, xhr) {
Expand Down