Merge pull request #5 from Kf637/main

Add environment variable support and update Docker configuration

Author: ItsAlexIK

.dockerignore

@@ -0,0 +1,19 @@
+# Dependency directories
+node_modules
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-lock.yaml
+dist
+build
+
+# Env
+.env.example
+.env
+
+# VCS and editor
+.git
+.gitignore
+
+# Github files
+.github

.env.example

@@ -1,4 +1,10 @@
 DISCORD_TOKEN=your_token_here
 DISCORD_CHANNEL_ID=channel_id_here
 DISCORD_GUILD_ID=guild_id_here
-DISCORD_CLIENT_ID=client_id_here
+DISCORD_CLIENT_ID=client_id_here
+
+### htop settings
+# REPLACE WITH YOUR USER ID
+ALLOWED_USER_ID=123456789012345678
+# REPLACE WITH YOUR ROLE ID
+ALLOWED_ROLE_ID=123456789012345678

assets/htop-preview.png .github/assets/htop-preview.pngassets/htop-preview.png renamed to .github/assets/htop-preview.png

@@ -0,0 +1,45 @@
+name: Build and Publish Docker Image
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - Dockerfile
+      - package.json
+      - package-lock.json
+      - src/**
+      - assets/**
+      - '**/*.js'
+  workflow_dispatch: {}
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 1. Checkout the repository
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # 2. Log in to GitHub Container Registry (GHCR)
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GHCR_PAT }}
+
+      # 3. Build Docker image
+      - name: Build Docker image
+        run: |
+          docker build -t ghcr.io/ItsAlexIK/CoreWatch:latest .
+
+      # 4. Push Docker image to GHCR
+      - name: Push Docker image
+        run: |
+          docker push ghcr.io/ItsAlexIK/CoreWatch:latest

assets/status.png .github/assets/status.pngassets/status.png renamed to .github/assets/status.png

@@ -0,0 +1,21 @@
+# Use a slim Node.js base image
+FROM node:20-alpine
+
+# Set working directory
+WORKDIR /usr/src/app
+
+# Keep environment in production mode by default
+ENV NODE_ENV=production
+
+# Install dependencies first to leverage Docker layer caching
+COPY package*.json ./
+RUN if [ -f package-lock.json ]; then npm ci --omit=dev; else npm install --omit=dev; fi \
+    && npm cache clean --force
+
+# Copy the rest of the application code
+COPY . .
+
+# Run as the non-root node user provided by the base image
+USER node
+
+CMD ["node", "index.js"]

.github/workflows/docker-publish.yml

@@ -15,7 +15,7 @@ A lightweight Discord bot designed to monitor system stats from a Raspberry Pi 5
   - ⏱️ System uptime
   - `/htop` command to display an interactive process list directly in Discord (like the Linux `htop`)
 
- ![Status](./assets/status.png)
+ ![Status](.github/assets/status.png)
 
 ## 💻 `/htop` Command
 
@@ -29,7 +29,7 @@ Use the `/htop` command to view a live list of the most resource-intensive proce
 - Includes interactive buttons to navigate between pages
 - Output is styled to be Discord-friendly and readable
 
-![Active processes](./assets/htop-preview.png)
+![Active processes](.github/assets/htop-preview.png)
 
 ## 🛡️ Permission Restriction for `/htop` Command
 

Dockerfile

@@ -101,6 +101,9 @@ async function updateLoop() {
         .setTimestamp();
 
       if (!statusMessage) {
+        console.log(
+          `Sending initial status message to channel ${channel.id}.`
+        );
         statusMessage = await channel.send({ embeds: [embed] });
       } else {
         await statusMessage.edit({ embeds: [embed] });
@@ -133,14 +136,23 @@ function scheduleNext(startTime) {
 
 async function clearChannelMessages(channel) {
   try {
-    let fetched;
-    do {
-      fetched = await channel.messages.fetch({ limit: 100 });
+    while (true) {
+      const fetched = await channel.messages.fetch({ limit: 100 });
       const deletable = fetched.filter((msg) => msg.deletable);
+
       if (deletable.size > 0) {
+        console.log(
+          `Deleting ${deletable.size} existing message(s) before sending status.`
+        );
         await channel.bulkDelete(deletable, true);
       }
-    } while (fetched.size >= 2);
+
+      // Stop when fewer than 100 messages were fetched (end of history)
+      // or when there is nothing left the bot is allowed to delete.
+      if (fetched.size < 100 || deletable.size === 0) {
+        break;
+      }
+    }
     console.log("Channel has been cleared.");
   } catch (err) {
     console.error("Error while clearing channel:", err);
@@ -154,6 +166,9 @@ client.on("interactionCreate", async (interaction) => {
   if (!command) return;
 
   try {
+    console.log(
+      `Executing command /${interaction.commandName} by ${interaction.user.tag} (${interaction.user.id})`
+    );
     await command.execute(interaction);
   } catch (error) {
     console.error("Command error:", error);
@@ -171,7 +186,7 @@ client.on("interactionCreate", async (interaction) => {
   }
 });
 
-client.once("ready", async () => {
+client.once("clientReady", async () => {
   console.log(`Logged in as ${client.user.tag}`);
   channel = await client.channels.fetch(process.env.DISCORD_CHANNEL_ID);