minicx
/
hk_bot
1
0
Fork 0
Code Issues 3 Pull Requests Releases 1 Activity

migration to test docker image

This commit is contained in:
minicx 2023-02-19 15:36:49 +03:00
parent b4bc78f8a4
commit ae1e1a17ef
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Automatization/Bots.ts
View File

@ -18,7 +18,7 @@ export async function doBotTasks(telegramWorker: TelegramWorker,earnMSG: Api.Mes
// unknown state
throw new UnknownError("Unknown state of message due doing bot tasks")
} finally{
console.log(`${telegramWorker.worker.phoneNumber}: All Bot tasks are completed`)
console.log(`${telegramWorker.worker.phoneNumber}: All bot tasks are completed`)
return
}

4
DockerWrapper/Docker.ts
View File

@ -6,7 +6,7 @@ import { DockerContainerIsBroken, DockerNoSuchContainer, DockerNotPulled } from
import { Tor } from 'tor-control-ts';
import { startsWith } from "lodash";
export const DOCKERIMAGE = 'dockage/tor-privoxy'
export const DOCKERIMAGE = 'tor_privoxy_mod'
export class DockerController {
protected static dockerAPI = new Docker({ socketPath: "/var/run/docker.sock" });
@ -28,7 +28,7 @@ export class DockerController {
if (await this.isPulled()) {
const options: Docker.ContainerCreateOptions = {
Image: DOCKERIMAGE,
// Env: ["PASSWORD=qwerty", "LOCATION=US", "TOR_NewCircuitPeriod=50"],
Env: [ 'LOCATION="US"', "TOR_NewCircuitPeriod=30000"],
HostConfig: {
PortBindings: {
"8118/tcp": [

7
Worker/TelegramWorker.ts
View File

@ -64,7 +64,7 @@ export class TelegramWorker extends telegram.TelegramClient {
let messages: TotalList<telegram.Api.Message>=[];
if (isString(waitFor)) {
do {
messages=(await this.getMessagesByEntity(entity, { minId: idOfLastMessage, limit: 2147483647 })).filter((message) => {
messages=(await this.getMessagesByEntity(entity, { minId: idOfLastMessage, limit: 100 })).filter((message) => {
return message.message.includes(waitFor)
})
await sleep(500);
@ -72,8 +72,7 @@ export class TelegramWorker extends telegram.TelegramClient {
return messages
} else if (isArray(waitFor)) {
do {
messages=(await this.getMessagesByEntity(entity, { minId: idOfLastMessage, limit: 2147483647 })).filter((message) => {
console.log(waitFor.some(_waitFor => message.message.includes(_waitFor)))
messages=(await this.getMessagesByEntity(entity, { minId: idOfLastMessage, limit: 100 })).filter((message) => {
return waitFor.some(_waitFor => message.message.includes(_waitFor))
})
await sleep(500);
@ -81,7 +80,7 @@ export class TelegramWorker extends telegram.TelegramClient {
return messages
} else {
do {
messages=(await this.getMessagesByEntity(entity, { minId: idOfLastMessage, limit: 2147483647 }))
messages=(await this.getMessagesByEntity(entity, { minId: idOfLastMessage, limit: 100 }))
await sleep(500);
} while (messages.length < waitFor)
return messages