backup

clusters/clusters.py

@@ -1,4 +1,4 @@
-import discord
+import discord
 from redbot.core import commands, Config
 import psutil, datetime, json, aiohttp
 from aiohttp import web
@@ -55,15 +55,11 @@ async def clusters(self, ctx):
         """Shows the status of all clusters using an embed."""
         await self.initialize_shard_names()
 
-        # Bot uptime (Red tracks this as bot.uptime)
         bot_start_time = getattr(self.bot, "uptime", None)
         if bot_start_time is None:
             bot_uptime_str = "Unknown"
         else:
-            if isinstance(bot_start_time, datetime.datetime):
-                td = datetime.datetime.utcnow() - bot_start_time
-            else:
-                td = bot_start_time
+            td = datetime.datetime.utcnow() - bot_start_time if isinstance(bot_start_time, datetime.datetime) else bot_start_time
             bot_uptime_str = self.format_timedelta(td)
 
         server_uptime = self.format_timedelta(self.get_server_uptime())
@@ -75,24 +71,16 @@ async def clusters(self, ctx):
         )
 
         for shard_id, name in self.shard_names.items():
-            cpu = psutil.cpu_percent(interval=None)
-            ram = psutil.virtual_memory().used / 1024**3
             latency = round(self.bot.shards[shard_id].latency * 1000)
-
             guilds = [g for g in self.bot.guilds if g.shard_id == shard_id]
-            servers = len(guilds)
-            users = sum(g.member_count or 0 for g in guilds)
-
+
             value = (
                 f"**Status:** Alive Running\n"
-                f"**CPU:** {cpu:.1f}%\n"
-                f"**RAM:** {ram:.1f} GiB\n"
                 f"**Latency:** {latency} ms\n"
-                f"**Servers:** {servers}\n"
-                f"**Users:** {users}\n"
+                f"**Servers:** {len(guilds)}\n"
+                f"**Users:** {sum(g.member_count or 0 for g in guilds)}\n"
                 f"**Shards:** [{shard_id}]"
             )
-
             embed.add_field(name=f"Cluster #{name}", value=value, inline=False)
 
         await ctx.send(embed=embed)
@@ -109,49 +97,61 @@ async def renamecluster(self, ctx, shard_id: int, *, new_name: str):
         custom_names[str(shard_id)] = new_name
         await self.config.custom_names.set(custom_names)
         self.shard_names[shard_id] = new_name
-
         await ctx.send(f"Cluster {shard_id} has been renamed to **{new_name}**.")
 
+
     async def web_clusters(self, request):
         """Return cluster data as JSON for web endpoint."""
         await self.initialize_shard_names()
+
+        virt_mem = psutil.virtual_memory()
+        swap_mem = psutil.swap_memory()
+        proc = psutil.Process()
+        bot_ram_gb = proc.memory_info().rss / 1024**3
 
-        # Bot uptime
         bot_start_time = getattr(self.bot, "uptime", None)
-        if bot_start_time is None:
-            bot_uptime_str = "Unknown"
-        else:
-            if isinstance(bot_start_time, datetime.datetime):
-                td = datetime.datetime.utcnow() - bot_start_time
-            else:
-                td = bot_start_time
-            bot_uptime_str = self.format_timedelta(td)
-
+        bot_uptime_str = self.format_timedelta(datetime.datetime.utcnow() - bot_start_time) if bot_start_time else "Unknown"
         server_uptime_str = self.format_timedelta(self.get_server_uptime())
 
         data = {
             "bot_uptime": bot_uptime_str,
             "server_uptime": server_uptime_str,
+            "system_stats": {
+                "cpu_total_percent": psutil.cpu_percent(interval=None),
+                "ram_used_gb": round(virt_mem.used / 1024**3, 2),
+                "ram_total_gb": round(virt_mem.total / 1024**3, 2),
+                "bot_ram_gb": round(bot_ram_gb, 2),
+                "bot_ram_limit_gb": 10.0,
+                "swap_used_gb": round(swap_mem.used / 1024**3, 2),
+                "swap_total_gb": round(swap_mem.total / 1024**3, 2)
+            },
             "clusters": []
         }
 
-        for shard_id, name in self.shard_names.items():
+        # Use the bot's reported shard count
+        total_shards = self.bot.shard_count or 1
+        for shard_id in range(total_shards):
+            # 1. Get name safely
+            name = self.shard_names.get(shard_id, MARVEL_NAMES[shard_id % len(MARVEL_NAMES)])
+
+            # 2. Get shard object safely
+            shard = self.bot.get_shard(shard_id)
+
+            # 3. Determine status and latency
+            # We explicitly check shard health to provide the 'status' key
+            is_online = shard is not None and not shard.is_closed()
+            latency = round(shard.latency * 1000) if (is_online and shard.latency is not None) else 0
+
+            # 4. Count guilds on this shard
             guilds = [g for g in self.bot.guilds if g.shard_id == shard_id]
-            servers = len(guilds)
-            users = sum(g.member_count or 0 for g in guilds)
-            latency = round(self.bot.shards[shard_id].latency * 1000)
-            cpu = psutil.cpu_percent(interval=None)
-            ram = psutil.virtual_memory().used / 1024**3
-
-            cluster_data = {
+
+            data["clusters"].append({
                 "shard_id": shard_id,
                 "name": name,
-                "servers": servers,
-                "users": users,
+                "servers": len(guilds),
+                "users": sum(g.member_count or 0 for g in guilds),
                 "latency_ms": latency,
-                "cpu_percent": cpu,
-                "ram_gib": ram
-            }
-            data["clusters"].append(cluster_data)
+                "status": "Online" if is_online else "Offline"
+            })
 
-        return web.Response(text=json.dumps(data, indent=2), content_type="application/json")
+        return web.json_response(data)

clusters/docs.md

@@ -43,7 +43,7 @@ for example this is my current output on my bot
 
 <shard\_id> is a number between 0 and your mac amount of shards
 
-<new\_name> what you want the cluter to be called from now on
+<new\_name> what you want the cluster to be called from now on
 
 this is how it's used 
 

clusters/info.json

@@ -1,7 +1,12 @@
 {
   "name": "Clusters",
-  "author": "bencos17",
-  "description": "Shows dynamic Marvel-themed cluster statuses for your bot.",
+  "author": [
+    "bencos17"
+  ],
+  "description": "Shows dynamic Marvel-themed cluster statuses for your bot, curreently it doesn't support physical clusters though but I do want to add support to my red instance for it so some day it will",
   "requirements": [],
-  "tags": ["clusters", "shards", "status"]
-}
+  "tags": [
+    "shards",
+    "status"
+  ]
+}

iss/__init__.py

@@ -0,0 +1,8 @@
+from redbot.core.bot import Red
+
+from .iss import ISS
+
+__red_end_user_data_statement__ = "This cog does not store any end user data."
+
+async def setup(bot: Red):
+    await bot.add_cog(ISS(bot))

iss/docs.md

@@ -0,0 +1,78 @@
+\# 🛰️ J.A.R.V.I.S. ISS-Mimic Telemetry Suite
+
+
+
+This documentation covers the setup, operation, and troubleshooting of the ISS-Mimic Discord Cog. This system bridges NASA's public Lightstreamer telemetry feed directly into your Discord server.
+
+
+
+---
+
+
+
+\## 🛠️ Core Commands
+
+
+
+| Command | Usage | Description |
+
+| :--- | :--- | :--- |
+
+| `\*iss` | `\*iss` | \*\*Interactive Console\*\*: Opens a public dropdown menu to browse telemetry by category. |
+
+| `\*iss all` | `\*iss all` | \*\*Master Snapshot\*\*: Sends two massive embeds containing every tracked sensor in the system. |
+
+| `\*iss status` | `\*iss status` | \*\*Stream Health\*\*: Checks which sensors are currently broadcasting live data (updated in the last 60s). |
+
+| `\*iss \[cat]` | `\*iss gnc` | \*\*Quick View\*\*: Direct access to specific categories (gnc, ethos, robotics, russian, etc.). |
+
+
+
+---
+
+
+
+\## 🚦 Understanding Sensor States
+
+
+
+Because NASA uses \*\*MERGE\*\* mode for data transmission, sensors will show different states based on station activity:
+
+
+
+\* \*\*🟢 Active (Green Circle)\*\*: Data has been received for this system within the last 60 seconds.
+
+\* \*\*💤 Standby (Zzz Emoji)\*\*: The system is subscribed, but the value hasn't changed recently, so NASA isn't pushing updates.
+
+\* \*\*🔹 Blue Diamond\*\*: Appears next to individual sensors that are currently streaming live data.
+
+\* \*\*--- / Connecting\*\*: The bot is connected but waiting for the very first data packet to arrive for that specific ID.
+
+
+
+
+
+
+
+---
+
+
+
+\## 📂 Configuration (`telemetry.json`)
+
+
+
+The Cog is entirely data-driven. To add or rename sensors, edit the `telemetry.json` file.
+
+
+
+\*\*Format:\*\*
+
+```json
+
+"CATEGORY\_NAME": {
+
+    "NASA\_OPCODE": "Display Label"
+
+}
+

iss/info.json

@@ -0,0 +1,12 @@
+{
+    "name": "ISS",
+    "author": [
+        "bencos17"
+    ],
+    "description": "A cog to track the International Space Station's telemetry data and provide information about its current location, speed, altitude, and other relevant data.",
+    "requirements": [],
+    "tags": [
+        "issdata",
+        "iss"
+    ]
+}