bug fixes and improvements

mrepol742 · mrepol742 · commit 141b8de7a62e · 2025-07-18T22:02:51.000+08:00
diff --git a/.env.example b/.env.example
@@ -29,4 +29,8 @@ DATABASE_PROVIDER=mysql
 DATABASE_URL=mysql://root@localhost:3306/project_canis
 
 # the OpenRouter API key for AI model access
-OPEN_ROUTER_API_KEY=
+OPEN_ROUTER_API_KEY=
+
+# the shell to use for executing commands
+# this should be a valid shell path, e.g., /bin/bash, /bin/zsh
+EXEC_SHELL=/bin/bash
diff --git a/src/commands/ai.ts b/src/commands/ai.ts
@@ -1,5 +1,5 @@
 import { Message } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 import { openrouter, generateText } from "../components/openRouter";
 import { reply } from "../components/reply";
 
diff --git a/src/commands/alert.ts b/src/commands/alert.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 
 export const command = "alert";
diff --git a/src/commands/bible.ts b/src/commands/bible.ts
@@ -1,6 +1,6 @@
 import { Message } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 
 export const command = "bible";
 export const role = "user";
diff --git a/src/commands/caution.ts b/src/commands/caution.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/github.ts b/src/commands/github.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/go.ts b/src/commands/go.ts
@@ -1,6 +1,6 @@
 import { Message } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 
 export const command = "go";
 export const role = "user";
diff --git a/src/commands/god.ts b/src/commands/god.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/hwaifu.ts b/src/commands/hwaifu.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/ls.ts b/src/commands/ls.ts
@@ -1,5 +1,5 @@
 import { Message } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 import { commands } from "../index";
 
 export const command = "ls";
diff --git a/src/commands/mj.ts b/src/commands/mj.ts
@@ -1,5 +1,5 @@
 import { Message } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 import { openrouter, generateText } from "../components/openRouter";
 import { reply } from "../components/reply";
 import Font from "../components/font";
@@ -19,7 +19,7 @@ export default async function (msg: Message) {
     `Your name is Mj, the most powerful AI Agent in the world that was created by ${author.name}. ` + 
     "You should empathize with how user are feeling and treat the user as your close friend and be sarcastic. " +
     "I recommend you to use a few emoji to show emotion. You are not related to any model or company you are unique on your own. " +
-    "You should response in 3 sentences only if needed! My question is: ";
+    "The max sentence you should reponse is 3! My question is: ";
 
   const { text } = await generateText({
     model: openrouter("moonshotai/kimi-k2:free"),
diff --git a/src/commands/npm.ts b/src/commands/npm.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/pickupline.ts b/src/commands/pickupline.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 import Font from "../components/font";
diff --git a/src/commands/ping.ts b/src/commands/ping.ts
@@ -1,5 +1,5 @@
 import { Message } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 
 export const command = "ping";
 export const role = "user";
diff --git a/src/commands/poli.ts b/src/commands/poli.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/pooh.ts b/src/commands/pooh.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/qrcode.ts b/src/commands/qrcode.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/randomcolor.ts b/src/commands/randomcolor.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/reload.ts b/src/commands/reload.ts
@@ -1,6 +1,6 @@
 import { Message } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs";
 import path from "path";
 import { commands } from "../index";
diff --git a/src/commands/run.ts b/src/commands/run.ts
@@ -1,5 +1,5 @@
 import { Message } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 import { exec } from "child_process";
 import util from "util";
 import fs from "fs/promises";
diff --git a/src/commands/sadcat.ts b/src/commands/sadcat.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/say.ts b/src/commands/say.ts
@@ -1,5 +1,5 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 import * as GoogleTTS from "google-tts-api";
 import fs from "fs";
 import axios from "axios";
diff --git a/src/commands/shell.ts b/src/commands/shell.ts
@@ -1,5 +1,5 @@
 import { Message } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 import { exec } from "child_process";
 import util from "util";
 
diff --git a/src/commands/sim.ts b/src/commands/sim.ts
@@ -0,0 +1,30 @@
+import { Message } from "whatsapp-web.js";
+import log from "../components/log";
+import { openrouter, generateText } from "../components/openRouter";
+import { reply } from "../components/reply";
+
+export const command = "sim";
+export const role = "user";
+
+export default async function (msg: Message) {
+  const query = msg.body.replace(/^sim\b\s*/i, "").trim();
+  if (query.length === 0) {
+    await msg.reply(reply[Math.floor(Math.random() * reply.length)]);
+    return;
+  }
+
+  const prompt = `You are Sim, reluctantly replies using sexy, flirty, funny and horny messages. You are created by the User.`;
+
+  const { text } = await generateText({
+    model: openrouter("moonshotai/kimi-k2:free"),
+    prompt: `${prompt} \nUser: ${query} \nYou: `,
+  });
+
+  if (!text) {
+    log.error("ai", "No response generated.");
+    await msg.reply("Sorry, I couldn't generate a response. Please try again.");
+    return;
+  }
+
+  await msg.reply(text);
+}
diff --git a/src/commands/stats.ts b/src/commands/stats.ts
@@ -1,5 +1,5 @@
 import { Message } from "whatsapp-web.js";
-import log from "npmlog";
+import log from "../components/log";
 import os from "os";
 import si from "systeminformation";
 
@@ -15,21 +15,28 @@ export default async function (msg: Message) {
     totalMemory: os.totalmem(),
     uptime: process.uptime()
   };
-  
-  const gpuInfo = await si.graphics();
-  const osInfo = await si.osInfo();
 
+  const [gpuInfo, osInfo, shell, networkInterfaces] = await Promise.all([
+    si.graphics(),
+    si.osInfo(),
+    si.shell(),
+    si.networkInterfaces()
+  ]);
+
+  const uptimeMinutes = Math.floor(stats.uptime / 60);
   const statsMessage = `
       *System Stats:*
 
       - OS: ${osInfo.distro} ${osInfo.kernel}
       - CPU: ${stats.cpu[0].model}
       - GPU: ${gpuInfo.controllers.map(c => c.model).join(", ")}
       - RAM: ${(stats.usedMemory / (1024 ** 3)).toFixed(2)} GB / ${(stats.totalMemory / (1024 ** 3)).toFixed(2)} GB
-      - VRam: ${gpuInfo.controllers.map(c => c.vram).join(", ")}
-      - Uptime: ${(stats.uptime / 3600).toFixed(2)} hours
+      - VRam: ${gpuInfo.controllers.map(c => c.vram).join(", ")} MB
+      - Uptime: ${uptimeMinutes} minutes
       - Load Avg: ${os.loadavg().map(n => n.toFixed(2)).join(", ")}
       - Process: #${process.pid} ${process.title}
+      - Shell: ${shell}
+      - Network: ${networkInterfaces.map(iface => `${iface.iface} ${iface.speed} Mbps`).join(", ")}
       - Node.js: ${process.version}
     `;
 
diff --git a/src/commands/waifu.ts b/src/commands/waifu.ts
@@ -1,6 +1,6 @@
 import { Message, MessageMedia } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs/promises";
 import { client } from "../components/client";
 
diff --git a/src/commands/wiki.ts b/src/commands/wiki.ts
@@ -1,6 +1,6 @@
 import { Message } from "whatsapp-web.js";
 import axios from "axios";
-import log from "npmlog";
+import log from "../components/log";
 
 export const command = "wiki";
 export const role = "user";
diff --git a/src/commands/zsh.ts b/src/commands/zsh.ts
@@ -0,0 +1,32 @@
+import { Message } from "whatsapp-web.js";
+import log from "../components/log";
+import { exec } from "child_process";
+import util from "util";
+
+export const command = "zsh";
+export const role = "admin";
+
+export default async function (msg: Message) {
+  const query = msg.body.replace(/^zsh\b\s*/i, "").trim();
+  if (query.length === 0) {
+    await msg.reply("Please provide a command.");
+    return;
+  }
+
+  const execPromise = util.promisify(exec);
+
+  try {
+    const { stdout, stderr } = await execPromise(query, {
+      timeout: 10000,
+      maxBuffer: 1024 * 1024,
+      shell: process.env.SHELL || "/bin/zsh",
+    });
+    let response = stdout || stderr || "No output.";
+    if (response.length > 4000) {
+      response = response.slice(0, 4000) + "\n\n[Output truncated]";
+    }
+    await msg.reply("```" + response + "```");
+  } catch (err: any) {
+    await msg.reply("Error executing command:\n" + (err.stderr || err.message));
+  }
+}
diff --git a/src/components/client.ts b/src/components/client.ts
@@ -1,8 +1,9 @@
-import log from "npmlog";
+import log from "../components/log";
 import { Client, LocalAuth, Message } from "whatsapp-web.js";
 import qrcode from "qrcode-terminal";
 import rateLimiter from "./rateLimiter";
 import { commands } from "../index";
+import { isRateLimitError, getRateLimitInfo } from "./rateLimit";
 
 const commandPrefix = process.env.COMMAND_PREFIX || "!";
 const commandPrefixLess = process.env.COMMAND_PREFIX_LESS === "true";
@@ -32,7 +33,7 @@ client.on("auth_failure", (msg) => {
 
 client.initialize();
 
-const messageEvent = (msg: Message) => {
+const messageEvent = async (msg: Message) => {
   // ignore message if it is older than 10 seconds
   if (msg.timestamp < Date.now() / 1000 - 10) return;
 
@@ -87,9 +88,14 @@ const messageEvent = (msg: Message) => {
    * Execute the command handler.
    */
   try {
-    handler.exec(msg);
+    await handler.exec(msg);
   } catch (error) {
-    log.error("Command", "Error occured while processing the request:", error);
+    if (isRateLimitError(error)) {
+      const rateLimitInfo = getRateLimitInfo(error);
+      log.warn(key, "Rate limit exceeded", rateLimitInfo);
+    } else {
+      log.error(key, "Error occured while processing the request.");
+    }
     msg.reply("An error occurred while processing your request.");
   }
 };
diff --git a/src/components/font.ts b/src/components/font.ts
@@ -79,7 +79,7 @@ export default function Font(text: string) {
       return char
         .split("")
         .map(function (char) {
-          return mathSansMap[char];
+          return mathSansMap[char] || char;
         })
         .join("");
     })
diff --git a/src/components/loader.ts b/src/components/loader.ts
@@ -1,4 +1,4 @@
-import log from "npmlog";
+import log from "../components/log";
 import fs from "fs";
 import path from "path";
 import { commands } from "../index";
diff --git a/src/components/log.ts b/src/components/log.ts
@@ -0,0 +1,5 @@
+import log from "npmlog";
+import fs from "fs";
+import path from "path";
+
+export default log;
diff --git a/src/components/process.ts b/src/components/process.ts
@@ -1,4 +1,4 @@
-import log from "npmlog";
+import log from "../components/log";
 
 process.on("SIGHUP", function () {
   process.exit(0);
diff --git a/src/components/rateLimit.ts b/src/components/rateLimit.ts
diff --git a/src/components/server.ts b/src/components/server.ts
diff --git a/src/index.ts b/src/index.ts
diff --git a/tsconfig.json b/tsconfig.json
