Skip to content

feat: support system proxy#408

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

Merged
codebytere merged 1 commit into from
Jun 5, 2020
Merged

feat: support system proxy #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions lib/proxy.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
const ProxyAgent = require('proxy-agent');
const { globalAgent } = require('https');
const { spawnSync } = require('child_process');
const { getMergedConfig } = require('./config');

function proxy() {
let proxyUrl = getMergedConfig().proxy;
if (proxyUrl == null || proxyUrl === '') {
proxyUrl = spawnSync(
'git',
['config', '--get', '--path', 'https.proxy']
).stdout.toString();
}
if (proxyUrl == null || proxyUrl === '') {
return globalAgent;
} else {
return new ProxyAgent(proxyUrl);
}
}

module.exports = proxy;
5 changes: 5 additions & 0 deletions lib/request.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ const fetch = require('node-fetch');
const fs = require('fs');
const path = require('path');
const { CI_DOMAIN } = require('./ci/ci_type_parser');
const proxy = require('./proxy');

class Request {
constructor(credentials) {
this.credentials = credentials;
this.proxyAgent = proxy();
}

loadQuery(file) {
Expand All@@ -16,6 +18,7 @@ class Request {
}

async text(url, options = {}) {
options.agent = this.proxyAgent;
if (url.startsWith(`https://${CI_DOMAIN}`)) {
options.headers = options.headers || {};
Object.assign(options.headers, this.getJenkinsHeaders());
Expand All@@ -24,6 +27,7 @@ class Request {
}

async json(url, options = {}) {
options.agent = this.proxyAgent;
options.headers = options.headers || {};
options.headers.Accept = 'application/json';
if (url.startsWith(`https://${CI_DOMAIN}`)) {
Expand DownExpand Up@@ -65,6 +69,7 @@ class Request {
}
const url = 'https://api.github.com/graphql';
const options = {
agent: this.proxyAgent,
method: 'POST',
headers: {
Authorization: `Basic ${githubCredentials}`,
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@
"lodash": "^4.17.15",
"node-fetch": "^2.6.0",
"ora": "^4.0.4",
"proxy-agent": "^3.1.1",
"replace-in-file": "^6.0.0",
"rimraf": "^3.0.2",
"yargs": "^15.3.1"
Expand Down