parent
0c2c55726e
commit
1ef585613e
|
@ -71,7 +71,28 @@ MeshCentral HTTPS relay server running on relay1.mesh.meshcentral.com:443.
|
||||||
MeshCentral Telegram client is bot connected.
|
MeshCentral Telegram client is bot connected.
|
||||||
```
|
```
|
||||||
|
|
||||||
Note the last line, indicating it's connected as a bot.
|
Note the last line, indicating it's connected as a bot. If you wish to use Telegram with a proxy, here are the possible Telegram settings. You can use the proxy settings for both user or bot login modes.
|
||||||
|
|
||||||
|
```
|
||||||
|
{
|
||||||
|
"messaging": {
|
||||||
|
"telegram": {
|
||||||
|
"apiid": 0,
|
||||||
|
"apihash": "00000000000000000000000",
|
||||||
|
"session": "aaaaaaaaaaaaaaaaaaaaaaa",
|
||||||
|
"useWSS": false, // Important. Most proxies cannot use SSL.
|
||||||
|
"proxy": {
|
||||||
|
"ip": "123.123.123.123", // Proxy host (IP or hostname)
|
||||||
|
"port": 123, // Proxy port
|
||||||
|
"MTProxy": false, // Whether it's an MTProxy or a normal Socks one
|
||||||
|
"secret": "00000000000000000000000000000000", // If used MTProxy then you need to provide a secret (or zeros).
|
||||||
|
"socksType": 5, // If used Socks you can choose 4 or 5.
|
||||||
|
"timeout": 2 // Timeout (in seconds) for connection,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
## Discord Setup
|
## Discord Setup
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,26 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For Telegram login with proxy settings, add this in config.json
|
||||||
|
{
|
||||||
|
"messaging": {
|
||||||
|
"telegram": {
|
||||||
|
"apiid": 0,
|
||||||
|
"apihash": "00000000000000000000000",
|
||||||
|
"session": "aaaaaaaaaaaaaaaaaaaaaaa",
|
||||||
|
"useWSS": false, // Important. Most proxies cannot use SSL.
|
||||||
|
"proxy": {
|
||||||
|
"ip": "123.123.123.123", // Proxy host (IP or hostname)
|
||||||
|
"port": 123, // Proxy port
|
||||||
|
"MTProxy": false, // Whether it's an MTProxy or a normal Socks one
|
||||||
|
"secret": "00000000000000000000000000000000", // If used MTProxy then you need to provide a secret (or zeros).
|
||||||
|
"socksType": 5, // If used Socks you can choose 4 or 5.
|
||||||
|
"timeout": 2 // Timeout (in seconds) for connection,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// For Discord login, add this in config.json
|
// For Discord login, add this in config.json
|
||||||
"messaging": {
|
"messaging": {
|
||||||
"discord": {
|
"discord": {
|
||||||
|
@ -120,10 +140,14 @@ module.exports.CreateServer = function (parent) {
|
||||||
const logger = new Logger({ LogLevel : 'none' });
|
const logger = new Logger({ LogLevel : 'none' });
|
||||||
const input = require('input');
|
const input = require('input');
|
||||||
var client;
|
var client;
|
||||||
|
var options = { connectionRetries: 5, baseLogger: logger };
|
||||||
|
if (parent.config.messaging.telegram.usewss == false) { options.useWSS = false; }
|
||||||
|
if (typeof parent.config.messaging.telegram.connectionretries == 'number') { options.connectionRetries = parent.config.messaging.telegram.connectionretries; }
|
||||||
|
if (typeof parent.config.messaging.telegram.proxy == 'object') { options.proxy = parent.config.messaging.telegram.proxy; }
|
||||||
if (parent.config.messaging.telegram.bottoken == null) {
|
if (parent.config.messaging.telegram.bottoken == null) {
|
||||||
// User login
|
// User login
|
||||||
var stringSession = new StringSession(parent.config.messaging.telegram.session);
|
var stringSession = new StringSession(parent.config.messaging.telegram.session);
|
||||||
const client = new TelegramClient(stringSession, parent.config.messaging.telegram.apiid, parent.config.messaging.telegram.apihash, { connectionRetries: 5, baseLogger: logger });
|
const client = new TelegramClient(stringSession, parent.config.messaging.telegram.apiid, parent.config.messaging.telegram.apihash, options);
|
||||||
await client.start({ onError: function (err) { console.log('Telegram error', err); } });
|
await client.start({ onError: function (err) { console.log('Telegram error', err); } });
|
||||||
obj.telegramClient = client;
|
obj.telegramClient = client;
|
||||||
obj.providers += 1; // Enable Telegram messaging
|
obj.providers += 1; // Enable Telegram messaging
|
||||||
|
@ -131,7 +155,7 @@ module.exports.CreateServer = function (parent) {
|
||||||
} else {
|
} else {
|
||||||
// Bot login
|
// Bot login
|
||||||
var stringSession = new StringSession('');
|
var stringSession = new StringSession('');
|
||||||
const client = new TelegramClient(stringSession, parent.config.messaging.telegram.apiid, parent.config.messaging.telegram.apihash, { connectionRetries: 5, baseLogger: logger });
|
const client = new TelegramClient(stringSession, parent.config.messaging.telegram.apiid, parent.config.messaging.telegram.apihash, options);
|
||||||
await client.start({ botAuthToken: parent.config.messaging.telegram.bottoken, onError: function (err) { console.log('Telegram error', err); } });
|
await client.start({ botAuthToken: parent.config.messaging.telegram.bottoken, onError: function (err) { console.log('Telegram error', err); } });
|
||||||
obj.telegramClient = client;
|
obj.telegramClient = client;
|
||||||
obj.providers += 1; // Enable Telegram messaging
|
obj.providers += 1; // Enable Telegram messaging
|
||||||
|
|
|
@ -46,10 +46,12 @@
|
||||||
"express": "^4.17.0",
|
"express": "^4.17.0",
|
||||||
"express-handlebars": "^5.3.5",
|
"express-handlebars": "^5.3.5",
|
||||||
"express-ws": "^4.0.0",
|
"express-ws": "^4.0.0",
|
||||||
|
"input": "^1.0.1",
|
||||||
"ipcheck": "^0.1.0",
|
"ipcheck": "^0.1.0",
|
||||||
"minimist": "^1.2.5",
|
"minimist": "^1.2.5",
|
||||||
"multiparty": "^4.2.1",
|
"multiparty": "^4.2.1",
|
||||||
"node-forge": "^1.0.0",
|
"node-forge": "^1.0.0",
|
||||||
|
"telegram": "^2.13.6",
|
||||||
"ws": "^5.2.3",
|
"ws": "^5.2.3",
|
||||||
"yauzl": "^2.10.0",
|
"yauzl": "^2.10.0",
|
||||||
"zulip": "^0.1.0"
|
"zulip": "^0.1.0"
|
||||||
|
|
Loading…
Reference in New Issue