From 5df9dd459899af9c2cc568874e0b53e7177263ef Mon Sep 17 00:00:00 2001 From: hkc Date: Sun, 7 Jul 2024 19:27:41 +0300 Subject: [PATCH] Removed watchdog :/ --- async-bot.py | 304 ++++++++++++++++++++++++-------------------------- settings.json | 29 +---- 2 files changed, 154 insertions(+), 179 deletions(-) diff --git a/async-bot.py b/async-bot.py index 4fdc5be..c0c55d8 100644 --- a/async-bot.py +++ b/async-bot.py @@ -1,7 +1,7 @@ import asyncio from typing import Callable, NewType, Optional from socketio import AsyncClient, AsyncSimpleClient -from aiohttp import ClientSession +from aiohttp import ClientSession, ClientTimeout from aiohttp_socks import ProxyConnector from PIL import Image, ImageFont, ImageDraw, ImageFilter, ImageSequence, ImageChops from base64 import b64decode @@ -15,6 +15,8 @@ PixelMap = NewType("PixelMap", dict[int, bool]) Animation = NewType("Animation", tuple[list[PixelMap], float]) Font = ImageFont.FreeTypeFont | ImageFont.ImageFont +TIMEOUT = ClientTimeout(120) + class AsyncBotManager: def __init__(self, base: str = "https://onemillioncheckboxes.com"): self.base = base @@ -38,6 +40,7 @@ class AsyncBotManager: self._active: set[int] = set() self.reader_event = asyncio.Event() + self.ready_event = asyncio.Event() @staticmethod def get_text_image(text: str, font: ImageFont.ImageFont | ImageFont.FreeTypeFont) -> Image.Image: @@ -143,17 +146,19 @@ class AsyncBotManager: async def listener(self) -> None: try: - async with ClientSession() as http: + async with ClientSession(timeout=TIMEOUT) as http: + print("Getting initial state") async with http.get(f"{self.base}/api/initial-state") as req: data = await req.json() buffer = b64decode(data["full_state"].encode() + b"=") self.canvas.paste(Image.frombytes("1", (1000, 1000), buffer)) self._last_update = data["timestamp"] + print("Initial state received") async with AsyncSimpleClient(http_session=http) as sio: await sio.connect(f"{self.base}/socket.io") while not self._shutdown: try: - async with asyncio.timeout(10): + async with asyncio.timeout(20): event, data = await sio.receive() except TimeoutError: print("Reading failed") @@ -162,6 +167,7 @@ class AsyncBotManager: await sio.connect(f"{self.base}/socket.io") continue self.reader_event.set() + self.ready_event.set() if event == "full_state": buffer = b64decode(data["full_state"].encode() + b"=") image = Image.frombytes("1", (1000, 1000), buffer) @@ -191,7 +197,7 @@ class AsyncBotManager: print(f"I/O: {incoming:7.2f}/s | {outgoing:7.2f}/s") print(f"Alive workers: {len(self._active)}") - if len(self._active) < 5: + if len(self._active) < 2: self._shutdown = True return @@ -230,9 +236,11 @@ class AsyncBotManager: delay: float = 0.25, ): proxy = ProxyConnector.from_url(proxy_url) if proxy_url else None - async with ClientSession(connector=proxy) as http: + await self.ready_event.wait() + async with ClientSession(connector=proxy, timeout=TIMEOUT) as http: async with AsyncSimpleClient(http_session=http) as sio: await sio.connect(f"{self.base}/socket.io") + print(f"Writer {bot_index} connected") offset = 0 while not self._shutdown: diff = list(self.difference.items()) @@ -262,172 +270,156 @@ async def amain() -> None: with open("settings.json", "r") as fp: settings = load(fp) - mgr = AsyncBotManager() + async with AsyncBotManager() as mgr: + for avoid in settings["avoid"]: + if avoid["type"] == "rect": + mgr.add_avoid_rect( + avoid["x"], avoid["y"], avoid["w"], avoid["h"] + ) + print("AVOID rectangle {w}x{h}+{x}+{y}".format(**avoid)) + elif avoid["type"] == "range": + mgr.add_avoid_range( + avoid["start"], avoid["stop"], avoid.get("step", 1) + ) + print("AVOID range {start}-{stop}".format(**avoid)) + elif avoid["type"] == "image": + with Image.open(avoid["path"]).convert("LA") as im: + assert im.width == 1000 and im.height == 1000 + for y in range(im.height): + for x in range(im.width): + l, a = im.getpixel((x, y)) # type: ignore + if a > 128: + mgr.add_avoid_index(x + y * 1000) + print("AVOID image", avoid["path"]) - - async def watchdog(): - listener_task = asyncio.create_task(mgr.listener(), name="Listener") - while True: - try: - async with asyncio.timeout(30): - await mgr.reader_event.wait() - except TimeoutError: - print("WATCHDOG TIMER PASSED") - listener_task.cancel() - listener_task = asyncio.create_task(mgr.listener()) - - watchdog_task = asyncio.create_task(watchdog(), name="Watchdog") - - for avoid in settings["avoid"]: - if avoid["type"] == "rect": - mgr.add_avoid_rect( - avoid["x"], avoid["y"], avoid["w"], avoid["h"] - ) - print("AVOID rectangle {w}x{h}+{x}+{y}".format(**avoid)) - elif avoid["type"] == "range": - mgr.add_avoid_range( - avoid["start"], avoid["stop"], avoid.get("step", 1) - ) - print("AVOID range {start}-{stop}".format(**avoid)) - elif avoid["type"] == "image": - with Image.open(avoid["path"]).convert("LA") as im: - assert im.width == 1000 and im.height == 1000 - for y in range(im.height): - for x in range(im.width): - l, a = im.getpixel((x, y)) # type: ignore - if a > 128: - mgr.add_avoid_index(x + y * 1000) - print("AVOID image", avoid["path"]) - - for elem in settings["elements"]: - if elem["type"] == "text": - mgr.put_text(elem["x"], elem["y"], elem["text"], elem.get("font", "default"), elem.get("size", 8)) - print("ADD text", elem) - elif elem["type"] == "text_anim": - frames: list[Image.Image] = [] - for text in elem["lines"]: - frames.append(mgr.get_text_image(text, mgr.get_font(elem.get("font", "default"), elem.get("size", 8)))) - mgr.add_animation(elem["x"], elem["y"], frames, elem["spf"]) - for frame in frames: - frame.close() - print("ADD text animation", elem) - elif elem["type"] == "image": - with Image.open(elem["path"]).convert("LA") as im: - mgr.put_image(elem["x"], elem["y"], im) - print("ADD image", elem) - - elif elem["type"] == "time": - time_format = elem["format"] - pos_x, pos_y = elem["x"], elem["y"] - font = mgr.get_font(elem.get("font", "default"), elem.get("size", 8)) - def update() -> PixelMap: - now = datetime.datetime.now(datetime.timezone.utc) - txt = now.strftime(time_format) - img = mgr.get_text_image(txt, font) - pixmap = mgr.get_image_diff(pos_x, pos_y, img) - img.close() - return pixmap - mgr.animation_functions.append(update) - elif elem["type"] == "tile": - with Image.open(elem["path"]).convert("LA") as im: - for oy in range(elem.get("h", im.height)): - for ox in range(elem.get("w", im.width)): - l, a = im.getpixel((ox % im.width, oy % im.height)) # type: ignore - if a: - x, y = elem["x"] + ox, elem["y"] + oy - index = x + y * 1000 - mgr.put_bit(index, l > 0) - print("ADD tile", elem) - elif elem["type"] == "animation": - with Image.open(elem["path"]) as anim: + for elem in settings["elements"]: + if elem["type"] == "text": + mgr.put_text(elem["x"], elem["y"], elem["text"], elem.get("font", "default"), elem.get("size", 8)) + print("ADD text", elem) + elif elem["type"] == "text_anim": frames: list[Image.Image] = [] - for frame in ImageSequence.Iterator(anim): - frames.append(frame.copy()) + for text in elem["lines"]: + frames.append(mgr.get_text_image(text, mgr.get_font(elem.get("font", "default"), elem.get("size", 8)))) mgr.add_animation(elem["x"], elem["y"], frames, elem["spf"]) for frame in frames: frame.close() - print("ADD animation", elem) - elif elem["type"] == "rgb111": - ox, oy = elem["x"], elem["y"] - with Image.open(elem["path"]).convert("RGBA") as im: - for y in range(im.height): - for x in range(im.width): - r, g, b, a = im.getpixel((x, y)) # type: ignore - if a < 128: - continue + print("ADD text animation", elem) + elif elem["type"] == "image": + with Image.open(elem["path"]).convert("LA") as im: + mgr.put_image(elem["x"], elem["y"], im) + print("ADD image", elem) - start_ndx = (x + ox + (y + oy) * 577) * 3 - mgr.put_bit(start_ndx, r > 128) - mgr.put_bit(start_ndx + 1, g > 128) - mgr.put_bit(start_ndx + 2, b > 128) - elif elem["type"] == "rgb565": - ox, oy = elem["x"], elem["y"] - with Image.open(elem["path"]).convert("RGBA") as im: - for y in range(im.height): - for x in range(im.width): - r, g, b, a = im.getpixel((x, y)) # type: ignore - if a < 128: - continue + elif elem["type"] == "time": + time_format = elem["format"] + pos_x, pos_y = elem["x"], elem["y"] + font = mgr.get_font(elem.get("font", "default"), elem.get("size", 8)) + def update() -> PixelMap: + now = datetime.datetime.now(datetime.timezone.utc) + txt = now.strftime(time_format) + img = mgr.get_text_image(txt, font) + pixmap = mgr.get_image_diff(pos_x, pos_y, img) + img.close() + return pixmap + mgr.animation_functions.append(update) + elif elem["type"] == "tile": + with Image.open(elem["path"]).convert("LA") as im: + for oy in range(elem.get("h", im.height)): + for ox in range(elem.get("w", im.width)): + l, a = im.getpixel((ox % im.width, oy % im.height)) # type: ignore + if a: + x, y = elem["x"] + ox, elem["y"] + oy + index = x + y * 1000 + mgr.put_bit(index, l > 0) + print("ADD tile", elem) + elif elem["type"] == "animation": + with Image.open(elem["path"]) as anim: + frames: list[Image.Image] = [] + for frame in ImageSequence.Iterator(anim): + frames.append(frame.copy()) + mgr.add_animation(elem["x"], elem["y"], frames, elem["spf"]) + for frame in frames: + frame.close() + print("ADD animation", elem) + elif elem["type"] == "rgb111": + ox, oy = elem["x"], elem["y"] + with Image.open(elem["path"]).convert("RGBA") as im: + for y in range(im.height): + for x in range(im.width): + r, g, b, a = im.getpixel((x, y)) # type: ignore + if a < 128: + continue - offset: int = (x + ox + (y + oy) * 250) * 16 + start_ndx = (x + ox + (y + oy) * 577) * 3 + mgr.put_bit(start_ndx, r > 128) + mgr.put_bit(start_ndx + 1, g > 128) + mgr.put_bit(start_ndx + 2, b > 128) + elif elem["type"] == "rgb565": + ox, oy = elem["x"], elem["y"] + with Image.open(elem["path"]).convert("RGBA") as im: + for y in range(im.height): + for x in range(im.width): + r, g, b, a = im.getpixel((x, y)) # type: ignore + if a < 128: + continue - # pack rgb888 to rgb565 - rgb: int = (r >> 3) << 11 - rgb |= (g >> 2) << 5 - rgb |= (b >> 3) + offset: int = (x + ox + (y + oy) * 250) * 16 - # write to a bitstream - for i in range(16): - mgr.put_bit( - offset + i, ((rgb << i) & 0x8000) > 0 - ) - elif elem["type"] == "rect": - for y in range(elem["y"], elem["y"] + elem["h"]): - for x in range(elem["x"], elem["x"] + elem["w"]): - mgr.put_pixel(x, y, elem["fill"]) - elif elem["type"] == "blob": - with open(elem["path"], "rb") as fp: - offset = elem["offset"] - length = elem.get("length", 1000000) - written = 0 - while (char := fp.read(1)): - byte = char[0] - if written > length: - break - for i in range(8): + # pack rgb888 to rgb565 + rgb: int = (r >> 3) << 11 + rgb |= (g >> 2) << 5 + rgb |= (b >> 3) + + # write to a bitstream + for i in range(16): + mgr.put_bit( + offset + i, ((rgb << i) & 0x8000) > 0 + ) + elif elem["type"] == "rect": + for y in range(elem["y"], elem["y"] + elem["h"]): + for x in range(elem["x"], elem["x"] + elem["w"]): + mgr.put_pixel(x, y, elem["fill"]) + elif elem["type"] == "blob": + with open(elem["path"], "rb") as fp: + offset = elem["offset"] + length = elem.get("length", 1000000) + written = 0 + while (char := fp.read(1)): + byte = char[0] if written > length: break - mgr.put_bit(offset, bool((byte >> (7 - i)) & 1)) - written += 1 - offset += 1 + for i in range(8): + if written > length: + break + mgr.put_bit(offset, bool((byte >> (7 - i)) & 1)) + written += 1 + offset += 1 - mgr.get_difference_image().save("result.png") - mgr.get_avoid_image().save("avoid.png") + mgr.get_difference_image().save("result.png") + mgr.get_avoid_image().save("avoid.png") - print("Starting writers...") - if n_proxies := len(settings["proxies"]): - res = await asyncio.gather( - *[ - mgr.writer( - i, - settings["proxies"][i % n_proxies], - settings["delay"], - ) - for i in range(settings["n_bots"]) - ], - return_exceptions=True, - ) - else: - res = await asyncio.gather( - *[mgr.writer(i) for i in range(settings["n_bots"])], - return_exceptions=True, - ) + print("Starting writers...") + if n_proxies := len(settings["proxies"]): + res = await asyncio.gather( + *[ + mgr.writer( + i, + settings["proxies"][i % n_proxies], + settings["delay"], + ) + for i in range(settings["n_bots"]) + ], + return_exceptions=True, + ) + else: + res = await asyncio.gather( + *[mgr.writer(i) for i in range(settings["n_bots"])], + return_exceptions=True, + ) - for ret in res: - print("RETURN", repr(ret)) + for ret in res: + print("RETURN", repr(ret)) - mgr._shutdown = True - watchdog_task.cancel() + mgr._shutdown = True if __name__ == "__main__": diff --git a/settings.json b/settings.json index 261c9ea..4d4ca41 100644 --- a/settings.json +++ b/settings.json @@ -1,9 +1,12 @@ { "url": "https://onemillioncheckboxes.com", "font": "./ic8x8u.ttf", - "proxies": [], - "n_bots": 5, - "delay": 0.125, + "proxies": [ + "", + "socks5://127.0.0.1:9999" + ], + "n_bots": 4, + "delay": 0.5, "avoid": [ { "type": "rect", @@ -57,26 +60,6 @@ "x": 0, "y": 128 }, - { - "type": "rgb565", - "path": "./pictures/niko_standing.png", - "x": 116, - "y": 132 - }, - { - "type": "rgb565", - "path": "./pictures/hello.png", - "x": 112, - "y": 203 - }, - { - "type": "text", - "font": "/usr/share/fonts/TTF/comic.ttf", - "size": 20, - "x": 250, - "y": 492, - "text": "You like kissing, don't you?" - }, { "type": "animation", "path": "./pictures/neko.gif",