Skip to content
Open
Changes from 1 commit
Commits
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
81 changes: 49 additions & 32 deletions browser/services/request.js
Original file line number Diff line number Diff line change
@@ -1,58 +1,75 @@
'use strict';

class Request {
constructor(requestMod, $window) {
constructor(requestMod, $window, electron ) {
this.request = requestMod;
this.electron = electron;
this.userAgentString = $window.navigator.userAgent;
if(process.env.DSI_TEST_AGENT && this.userAgentString) {
this.userAgentString = $window.navigator.userAgent.replace("Installer", "TestInstaller");
}
}

get(req) {
return new Promise((resolve, reject)=>{
let options;
if (req instanceof Object) {
options = req;
return new Promise((resolve)=> {
if(this.electron) {
this.electron.remote.getCurrentWindow().webContents.session.resolveProxy("https://google.com", function(p){
//parse PROXY XXX.XXX.XXX.XXX:XXXX;
let proxy = p.replace(/(PROXY|DIRECT)/g,'').replace(/;/g,'').replace(/ /g,'');
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you merge these replace calls?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jrichter1 sure

resolve(proxy.length > 0 ? `http://${proxy}`: undefined);
console.log(proxy);
});
} else {
options = {
url: req
};
resolve();
}
if(options.headers === undefined) {
options.headers = {};
}
options.headers['User-Agent'] = this.userAgentString;

this.request(options, (error, response, data) => {
if (error) {
reject(error);
} else if(response.statusCode == 200) {
resolve({
status: response.statusCode,
data: JSON.parse(data)
});
} else if (response.statusCode == 401) {
resolve({
status: response.statusCode,
data: data
});
}).then((proxy)=> {
return new Promise((resolve, reject)=>{
let options;
if (req instanceof Object) {
options = req;
} else {
resolve({
status: response.statusCode
});
options = {
url: req
};
}
if(options.headers === undefined) {
options.headers = {};
}
if(proxy) {
options.proxy = proxy;
}
options.headers['User-Agent'] = this.userAgentString;

this.request(options, (error, response, data) => {
if (error) {
reject(error);
} else if(response.statusCode == 200) {
resolve({
status: response.statusCode,
data: JSON.parse(data)
});
} else if (response.statusCode == 401) {
resolve({
status: response.statusCode,
data: data
});
} else {
resolve({
status: response.statusCode
});
}
});
});
});
}

static factory(requestMod, $window) {
static factory(requestMod, $window, electron) {
return function(req) {
return new Request(requestMod, $window).get(req);
return new Request(requestMod, $window, electron).get(req);
};
}
}

Request.factory.$inject=['requestMod', '$window'];
Request.factory.$inject=['requestMod', '$window', 'electron'];

export default Request;