Skip to content

Add http proxy support #68

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add http proxy support #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa4b651
Update index.html
gmc-2 Jan 13, 2024
05390b8
Update utils.js
gmc-2 Jan 13, 2024
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
3 changes: 2 additions & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@
</label>

<select id="proxyType" class="select-input m-1">
<option value="1">HTTP</option>
<option value="4">SOCKS4</option>
<option value="5">SOCKS5</option>
</select>
Expand Down Expand Up @@ -579,4 +580,4 @@ <h1>TrafficerMC</h1>
</body>
<script defer src="./js/bot.js"></script>
<script defer src="./js/htmlControl.js"></script>
</html>
</html>
151 changes: 106 additions & 45 deletions src/js/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ const { EventEmitter } = require('events')
const socks = require('socks').SocksClient
const ProxyAgent = require('proxy-agent')
const botApi = new EventEmitter()
const { HttpsProxyAgent } = require('https-proxy-agent');
const Http = require('http')
const fetch = require('node-fetch')
const fs = require('fs')
const currentVersion = "2.3"
Expand Down Expand Up @@ -70,60 +72,119 @@ function getBotInfo(botName, num) {
const serverPort = idIp.value.split(':')[1] ? idIp.value.split(':')[1] : 25565;

if (idProxyToggle.checked) {
const proxy = getProxy(num);
const proxyHost = proxy.split(":")[0];
const proxyPort = proxy.split(":")[1];

options = {
connect: client => {
socks.createConnection({
proxy: {
if (idProxyType.value != 1) {
var proxy = getProxy(num);
var proxyHost = proxy.split(":")[0];
var proxyPort = proxy.split(":")[1];

options = {
connect: client => {
socks.createConnection({
proxy: {
host: proxyHost,
port: parseInt(proxyPort),
type: parseInt(idProxyType.value)
},
command: 'connect',
destination: {
host: serverHost,
port: parseInt(serverPort)
}
}, (err, info) => {
if (err) {
sendLog(`[ProxyError] [${botName}] [${proxyHost}:${proxyPort}] ${err}`)
return;
}
client.setSocket(info.socket);
client.emit('connect')
})
},
agent: new ProxyAgent({
protocol: `socks${idProxyType.value}`,
host: proxyHost,
port: proxyPort
}),
checkTimeoutInterval: 60 * 10000,
host: serverHost,
port: serverPort,
username: unm ? unm : salt(10),
version: idBotVersion.value,
auth: idAuthType.value,
easyMcToken: idAltToken.value,
onMsaCode: function (data) {
const code = data.user_code
sendLog(`<li> <img src="./assets/icons/code.svg" class="icon-sm" style="filter: brightness(0) saturate(100%) invert(28%) sepia(100%) saturate(359%) hue-rotate(172deg) brightness(93%) contrast(89%)">[${botName}] First time signing in. Please authenticate now: To sign in, use a web browser to open the page <b style="cursor: pointer; color: blue;" onClick="shell.openExternal('https://www.microsoft.com/link')">https://www.microsoft.com/link</b> and enter the code: ${code} <img src="./assets/icons/clipboard.svg" onclick="navigator.clipboard.writeText('${code}')" style="cursor: pointer; filter: brightness(0) invert(1);" height="16px;"> to authenticate. </li>`)
}
};
return options;
} else {
let proxyAuth
let proxyHost
let proxyPort
let authed
if (getProxy(num).split("@").length > 1) {
proxyAuth = btoa(getProxy(num).split("@")[0]);
proxyHost = getProxy(num).split("@")[1].split(":")[0];
proxyPort = parseInt(getProxy(num).split("@")[1].split(":")[1]);
authed = true
} else {
proxyHost = getProxy(num).split(":")[0];
proxyPort = parseInt(getProxy(num).split(":")[1]);
authed = false
}
var options = {
connect: client => {
let req = Http.request({
host: proxyHost,
port: parseInt(proxyPort),
type: parseInt(idProxyType.value)
},
command: 'connect',
destination: {
host: serverHost,
port: parseInt(serverPort)
}
}, (err, info) => {
if (err) {
sendLog(`[ProxyError] [${botName}] [${proxyHost}:${proxyPort}] ${err}`)
return;
port: proxyPort,
method: 'CONNECT',
path: serverHost + ':' + serverPort
})
if (authed) {
req = Http.request({
host: proxyHost,
port: proxyPort,
method: 'CONNECT',
headers: {
"host": `${serverHost}:${serverPort}`,
"proxy-authorization": "Basic " + proxyAuth
},
path: serverHost + ':' + serverPort
})
}
client.setSocket(info.socket);
client.emit('connect')
})
},
agent: new ProxyAgent({
protocol: `socks${idProxyType.value}`,
host: proxyHost,
port: proxyPort
}),
host: serverHost,
port: serverPort,
username: botName,
version: idBotVersion.value,
auth: idAuthType.value,
hideErrors: true,
easyMcToken: idAltToken.value,
onMsaCode: function(data) {
const code = data.user_code
sendLog(`<li> <img src="./assets/icons/code.svg" class="icon-sm" style="filter: brightness(0) saturate(100%) invert(28%) sepia(100%) saturate(359%) hue-rotate(172deg) brightness(93%) contrast(89%)">[${botName}] First time signing in. Please authenticate now: To sign in, use a web browser to open the page <b style="cursor: pointer; color: blue;" onClick="shell.openExternal('https://www.microsoft.com/link')">https://www.microsoft.com/link</b> and enter the code: ${code} <img src="./assets/icons/clipboard.svg" onclick="navigator.clipboard.writeText('${code}')" style="cursor: pointer; filter: brightness(0) invert(1);" height="16px;"> to authenticate. </li>`)
}
};
return options;
req.end()

req.on('connect', (res, stream) => {
client.setSocket(stream)
client.emit('connect')
})
},
agent: new ProxyAgent({ protocol: 'http', host: proxyHost, port: proxyPort }),
checkTimeoutInterval: 60 * 10000,
host: serverHost,
port: serverPort,
username: botName,
hideErrors: true,
version: idBotVersion.value,
auth: idAuthType.value,
easyMcToken: idAltToken.value,
onMsaCode: function (data) {
const code = data.user_code
sendLog(`<li> <img src="./assets/icons/code.svg" class="icon-sm" style="filter: brightness(0) saturate(100%) invert(28%) sepia(100%) saturate(359%) hue-rotate(172deg) brightness(93%) contrast(89%)">[${botName}] First time signing in. Please authenticate now: To sign in, use a web browser to open the page <b style="cursor: pointer; color: blue;" onClick="shell.openExternal('https://www.microsoft.com/link')">https://www.microsoft.com/link</b> and enter the code: ${code} <img src="./assets/icons/clipboard.svg" onclick="navigator.clipboard.writeText('${code}')" style="cursor: pointer; filter: brightness(0) invert(1);" height="16px;"> to authenticate. </li>`)
}
};
return options;
}
} else {
options = {
checkTimeoutInterval: 60 * 10000,
host: serverHost,
port: serverPort,
username: botName,
version: idBotVersion.value,
auth: idAuthType.value,
hideErrors: true,
easyMcToken: idAltToken.value,
onMsaCode: function(data) {
onMsaCode: function (data) {
const code = data.user_code
sendLog(`<li> <img src="./assets/icons/code.svg" class="icon-sm" style="filter: brightness(0) saturate(100%) invert(28%) sepia(100%) saturate(359%) hue-rotate(172deg) brightness(93%) contrast(89%)">[${botName}] First time signing in. Please authenticate now: To sign in, use a web browser to open the page <b style="cursor: pointer; color: blue;" onClick="shell.openExternal('https://www.microsoft.com/link')">https://www.microsoft.com/link</b> and enter the code: ${code} <img src="./assets/icons/clipboard.svg" onclick="navigator.clipboard.writeText('${code}')" style="cursor: pointer; filter: brightness(0) invert(1);" height="16px;"> to authenticate. </li>`)
}
Expand Down Expand Up @@ -465,4 +526,4 @@ module.exports = {
createBot,
scrapeProxy,
botApi
}
}