feat(core): unify proxy; optimize request-wrapper (#11472)

* feat(core): unify proxy; optimize request-wrapper

Signed-off-by: Rongrong <i@rong.moe>

* Fix DeepScan issue

Signed-off-by: Rongrong <i@rong.moe>

* Simplify protocol existence judgment

Signed-off-by: Rongrong <i@rong.moe>

* chore: regenerate yarn.lock

Signed-off-by: Rongrong <i@rong.moe>
This commit is contained in:
Rongrong
2022-12-23 01:13:01 +08:00
committed by GitHub
parent 58d00a6917
commit d60d89ea87
7 changed files with 835 additions and 640 deletions

View File

@@ -145,9 +145,9 @@ describe('got', () => {
jest.resetModules();
require('../../lib/utils/request-wrapper');
check = (request) => {
expect(request.agent.constructor.name).toBe('TunnelingAgent');
expect(request.agent.options.proxy.host).toBe('rsshub.proxy');
expect(request.agent.options.proxy.port).toBe(2333);
expect(request.agent.constructor.name).toBe('HttpsProxyAgent');
expect(request.agent.proxy.host).toBe('rsshub.proxy');
expect(request.agent.proxy.port).toBe(2333);
};
nock(/rsshub\.test/)
@@ -167,9 +167,9 @@ describe('got', () => {
jest.resetModules();
require('../../lib/utils/request-wrapper');
check = (request) => {
expect(request.agent.constructor.name).toBe('TunnelingAgent');
expect(request.agent.options.proxy.host).toBe('rsshub.proxy');
expect(request.agent.options.proxy.port).toBe(2333);
expect(request.agent.constructor.name).toBe('HttpsProxyAgent');
expect(request.agent.proxy.host).toBe('rsshub.proxy');
expect(request.agent.proxy.port).toBe(2333);
};
nock(/rsshub\.test/)
@@ -183,7 +183,7 @@ describe('got', () => {
it('auth', async () => {
process.env.PROXY_AUTH = 'testtest';
process.env.PROXY_PROTOCOL = 'socks';
process.env.PROXY_PROTOCOL = 'http'; // only http(s) proxies extract auth from Headers
process.env.PROXY_HOST = 'rsshub.proxy';
process.env.PROXY_PORT = '2333';