Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "pocketnet",
"project": "Bastyon",

"version": "0.9.129",
"versionsuffix": "5",
"cordovaversion": "1.8.129",
"cordovaversioncode": "1801295",
"version": "0.9.130",
"versionsuffix": "1",
"cordovaversion": "1.8.130",
"cordovaversioncode": "1801301",

"description": "Bastyon desktop application",
"author": "Pocketnet Community <[email protected]>",
Expand Down
7 changes: 6 additions & 1 deletion proxy16/node/control.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,12 @@ var Control = function(settings, proxy) {
'rpcuser=' + f.randomString(10) + EOL +
'rpcpassword=' + f.randomString(256) + EOL +
'api=1' + EOL +
'rest=0' + EOL
'rest=0' + EOL +
'logips=1' + EOL +
'disconnectold=1' + EOL +
'# tor' + EOL +
'listenonion=1' + EOL +
'torcontrol=127.0.0.1:9251' + EOL

fs.writeFileSync(node.confPath, data)
}
Expand Down
3 changes: 2 additions & 1 deletion proxy16/node/torcontrol.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ class TorControl {
"# The user is free to edit this config if he know\n" +
"# how to do that. Read TOR documentation before...\n",

"SocksPort 0.0.0.0:9051",
"SocksPort 9250 # Default: Bind to localhost:9250 for local connections.",
"ControlPort 9251",
"CookieAuthentication 1",
"DormantCanceledByStartup 1",
`DataDirectory ${getSettingsPath("data")}`,
Expand Down
10 changes: 5 additions & 5 deletions proxy16/transports.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class WrappedAxios {
}

static handleError(error) {
const isConnRefused = error.message.includes('ECONNREFUSED 127.0.0.1:9051');
const isConnRefused = error.message.includes('ECONNREFUSED 127.0.0.1:9250');
const isSocksRejection = error.message.includes('Socks5 proxy rejected connection');

if (isConnRefused || isSocksRejection) {
Expand Down Expand Up @@ -310,7 +310,7 @@ class WrappedFetch {
}

static handleError(error) {
const isConnRefused = error.message.includes('ECONNREFUSED 127.0.0.1:9051');
const isConnRefused = error.message.includes('ECONNREFUSED 127.0.0.1:9250');
const isSocksRejection = error.message.includes('Socks5 proxy rejected connection');

if (isConnRefused || isSocksRejection) {
Expand Down Expand Up @@ -441,7 +441,7 @@ class WrappedRequest {
}

static handleError(error) {
const isConnRefused = error.message.includes('ECONNREFUSED 127.0.0.1:9051');
const isConnRefused = error.message.includes('ECONNREFUSED 127.0.0.1:9250');
const isSocksRejection = error.message.includes('Socks5 proxy rejected connection');

if (isConnRefused || isSocksRejection) {
Expand Down Expand Up @@ -708,7 +708,7 @@ class Transports {

getTorAgent() {
if (!this.torAgent) {
const url = new URL('socks5h://127.0.0.1:9051');
const url = new URL('socks5h://127.0.0.1:9250');
url.tls = { rejectUnauthorized: false };
this.torAgent = new SocksProxyAgent(url, {
keepAlive: true,
Expand Down Expand Up @@ -754,7 +754,7 @@ class Transports {
}

isTorRefuseConnections(error) {
return error.message.includes('ECONNREFUSED 127.0.0.1:9051');
return error.message.includes('ECONNREFUSED 127.0.0.1:9250');
}
}

Expand Down