Prepare for switch to gateway-proxy

Author: Gelbpunkt

.gitignore

@@ -1,6 +1,7 @@
 application.yml
 commands.txt
 /config.toml
+/config.json
 __pycache__
 *.pyc
 nohup.out

README.md

@@ -25,8 +25,8 @@ Note: This requires you to have Podman and Git working. Development instances wi
 git clone https://git.travitia.xyz/Kenvyra/IdleRPG.git
 cd IdleRPG
 ./scripts/beta.sh
-podman build -t idlerpg:latest --build-arg beta=yes .
-podman run --rm -it --name idlerpg --pod idlerpgbeta -v /path/to/config.py:/idlerpg/config.py idlerpg:latest
+podman build -t idlerpg:latest .
+podman run --rm -it --name idlerpg --pod idlerpgbeta -v $(pwd)/config.py:/idlerpg/config.py:Z idlerpg:latest
 ```
 
 ### For hosting permanently

classes/bot.py

@@ -94,24 +94,6 @@ def __init__(self, **kwargs):
             Cooldown(3, 3, 1, 2, commands.BucketType.user)
         )
 
-    async def before_identify_hook(
-        self, shard_id: int | None, *, initial: bool = False
-    ) -> None:
-        # Overwrite the default identify hook that just waits 5s with a call to twilight-gateway-queue
-        if shard_id is None:
-            self.logger.warn("Got no shard ID in before_identify_hook")
-            return
-
-        self.logger.info(f"Requesting gateway queue for shard {shard_id}")
-
-        # This can take a while
-        timeout = aiohttp.ClientTimeout(total=None)
-        await self.session.get(
-            f"http://localhost:5112/?shard={shard_id}", timeout=timeout
-        )
-
-        self.logger.info(f"Gateway queue permitted shard {shard_id}")
-
     def __repr__(self):
         return "<Bot>"
 

cogs/miscellaneous/__init__.py

@@ -210,20 +210,6 @@ async def streak(self, ctx):
             )
         )
 
-    @commands.command(brief=_("Show the bot's ping"))
-    @locale_doc
-    async def ping(self, ctx):
-        _("""Shows you the bot's current websocket latency in milliseconds.""")
-        await ctx.send(
-            embed=discord.Embed(
-                title=_("Pong!"),
-                description=_("My current latency is {lat}ms").format(
-                    lat=round(self.bot.latency * 1000, 2)
-                ),
-                color=0xF1C60C,
-            )
-        )
-
     @commands.command(aliases=["shorten"], brief=_("Shorten an image URL."))
     @locale_doc
     async def imgur(self, ctx, given_url: ImageUrl(ImageFormat.all) = None):

launcher.py

@@ -17,9 +17,13 @@
 """
 from __future__ import annotations
 
-import asyncio
 import sys
 
+if sys.version_info < (3, 9):
+    raise Exception("IdleRPG requires Python 3.9")
+
+import asyncio
+
 from enum import Enum
 from pathlib import Path
 from time import time
@@ -32,9 +36,6 @@
 from utils import random
 from utils.config import ConfigLoader
 
-if sys.version_info < (3, 9):
-    raise Exception("IdleRPG requires Python 3.9")
-
 config = ConfigLoader("config.toml")
 
 __version__ = "1.0.0"

requirements.txt

@@ -14,4 +14,5 @@ discord.py
 aiowiki
 sentry_sdk
 aioredis[hiredis]
+aiohttp[speedups]
 tomli

scripts/beta.sh

@@ -3,8 +3,46 @@
 podman pull docker://docker.io/library/redis:6-alpine
 podman pull docker://docker.io/library/postgres:14-alpine
 podman pull quay.io/gelbpunkt/stockfish:latest
+podman pull docker://docker.io/twilightrs/http-proxy:latest
+podman pull docker://docker.io/gelbpunkt/gateway-proxy:latest
 podman pod create --name idlerpgbeta -p 5432:5432 -p 6379:6379
-podman run --rm -d --pod idlerpgbeta --name redis-beta redis:6-alpine
+
+TOKEN=$(python3 -c 'from utils.config import ConfigLoader; config = ConfigLoader("config.toml"); print(config.bot.token)')
+
+podman run --rm -it -d --pod idlerpgbeta --name http-proxy -e HOST=0.0.0.0 -e PORT=5113 -e DISCORD_TOKEN=$TOKEN http-proxy:latest
+
+cat <<EOF > config.json
+{
+    "log_level": "info",
+    "token": "$TOKEN",
+    "intents": 13827,
+    "port": 5112,
+    "activity": {
+        "type": 0,
+        "name": "https://idlerpg.xyz"
+    },
+    "status": "idle",
+    "backpressure": 100,
+    "twilight_http_proxy": "127.0.0.1:5113",
+    "shards": 5,
+    "cache": {
+        "channels": true,
+        "presences": false,
+        "emojis": false,
+        "current_member": true,
+        "members": false,
+        "roles": true,
+        "stage_instances": false,
+        "stickers": false,
+        "users": false,
+        "voice_states": false
+    }
+}
+EOF
+
+podman run --rm -it -d --pod idlerpgbeta --name gateway-proxy -v $(pwd)/config.json:/config.json:Z gateway-proxy:latest
+
+podman run --rm -it -d --pod idlerpgbeta --name redis-beta redis:6-alpine
 cat <<EOF > start.sh
 createdb idlerpg
 psql idlerpg -c "CREATE ROLE jens WITH PASSWORD 'owo';"
@@ -18,7 +56,7 @@ DONE
 EOF
 
 chmod 777 start.sh
-podman run --rm -d --pod idlerpgbeta --name postgres-beta -e POSTGRES_PASSWORD="test" -v $(pwd)/start.sh:/docker-entrypoint-initdb.d/init.sh:Z postgres:14-alpine
+podman run --rm -it -d --pod idlerpgbeta --name postgres-beta -e POSTGRES_PASSWORD="test" -v $(pwd)/start.sh:/docker-entrypoint-initdb.d/init.sh:Z postgres:14-alpine
 sleep 15
 rm start.sh
-podman run --rm -d --pod idlerpgbeta --name stockfish-beta gelbpunkt/stockfish:latest
+podman run --rm -it -d --pod idlerpgbeta --name stockfish-beta gelbpunkt/stockfish:latest