package.json

@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "0.36.3",
-    "@nhcarrigan/logger": "1.0.0",
     "discord.js": "14.18.0",
     "fastify": "5.2.1",
     "winston": "3.17.0"

pnpm-lock.yaml

@@ -11,9 +11,6 @@ importers:
       '@anthropic-ai/sdk':
         specifier: 0.36.3
         version: 0.36.3
-      '@nhcarrigan/logger':
-        specifier: 1.0.0
-        version: 1.0.0
       discord.js:
         specifier: 14.18.0
         version: 14.18.0
@@ -350,9 +347,6 @@ packages:
       typescript: '>=5'
       vitest: '>=2'
 
-  '@nhcarrigan/logger@1.0.0':
-    resolution: {integrity: sha512-2e19Bie+ZKb6yKPKjhawqsENkhHatYkvBAmFZx9eToOXdOca+CYi51tldRMtejg6e0+4hOOf2bo5zdBQKmH0dw==}
-
   '@nhcarrigan/typescript-config@4.0.0':
     resolution: {integrity: sha512-969HVha7A/Sg77fuMwOm6p14a+7C5iE6g55OD71srqwKIgksQl+Ex/hAI/pyzTQFDQ/FBJbpnHlR4Ov25QV/rw==}
     engines: {node: '20', pnpm: '9'}
@@ -2594,8 +2588,6 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  '@nhcarrigan/logger@1.0.0': {}
-
   '@nhcarrigan/typescript-config@4.0.0(typescript@5.7.3)':
     dependencies:
       typescript: 5.7.3

prod.env

@@ -1,3 +1,2 @@
 DISCORD_TOKEN="op://Environment Variables - Naomi/Cordelia Taryne/discord_token"
 AI_TOKEN="op://Environment Variables - Naomi/Cordelia Taryne/ai_token"
-LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth"

src/index.ts

@@ -12,7 +12,7 @@ import { proofread } from "./modules/proofread.js";
 import { query } from "./modules/query.js";
 import { summarise } from "./modules/summarise.js";
 import { instantiateServer } from "./server/serve.js";
-import { logger } from "./utils/logger.js";
+import { logHandler } from "./utils/logHandler.js";
 
 const commands: Record<
   string,
@@ -41,16 +41,8 @@ client.on(Events.InteractionCreate, (interaction) => {
   }
 });
 
-client.on(Events.EntitlementCreate, (entitlement) => {
-  void logger.log("info", `User ${entitlement.userId} has subscribed!`);
-});
-
-client.on(Events.EntitlementDelete, (entitlement) => {
-  void logger.log("info", `User ${entitlement.userId} has unsubscribed... :c`);
-});
-
 client.on(Events.ClientReady, () => {
-  void logger.log("debug", "Bot is ready.");
+  logHandler.info("Bot is ready.");
 });
 
 instantiateServer();

src/modules/alt.ts

@@ -6,7 +6,6 @@
 import { MessageFlags, type ChatInputCommandInteraction } from "discord.js";
 import { personality } from "../config/personality.js";
 import { ai } from "../utils/ai.js";
-import { calculateCost } from "../utils/calculateCost.js";
 import { isSubscribed } from "../utils/isSubscribed.js";
 import type { ImageBlockParam } from "@anthropic-ai/sdk/resources/index.js";
 
@@ -110,7 +109,4 @@ export const alt = async(
     response?.text
       ?? "I'm sorry, I don't have an answer for that. Please try again later.",
   );
-
-  const { usage } = messages;
-  await calculateCost(usage, interaction.user.username, "alt-text");
 };

src/modules/evaluate.ts

@@ -6,7 +6,6 @@
 import { MessageFlags, type ChatInputCommandInteraction } from "discord.js";
 import { personality } from "../config/personality.js";
 import { ai } from "../utils/ai.js";
-import { calculateCost } from "../utils/calculateCost.js";
 import { isSubscribed } from "../utils/isSubscribed.js";
 
 /**
@@ -41,7 +40,4 @@ export const evaluate = async(
     response?.text
       ?? "I'm sorry, I don't have an answer for that. Please try again later.",
   );
-
-  const { usage } = messages;
-  await calculateCost(usage, interaction.user.username, "evaluate");
 };

src/modules/mood.ts

@@ -6,7 +6,6 @@
 import { MessageFlags, type ChatInputCommandInteraction } from "discord.js";
 import { personality } from "../config/personality.js";
 import { ai } from "../utils/ai.js";
-import { calculateCost } from "../utils/calculateCost.js";
 import { isSubscribed } from "../utils/isSubscribed.js";
 
 /**
@@ -42,7 +41,4 @@ export const mood = async(
     response?.text
       ?? "I'm sorry, I don't have an answer for that. Please try again later.",
   );
-
-  const { usage } = messages;
-  await calculateCost(usage, interaction.user.username, "mood");
 };

src/modules/proofread.ts

@@ -6,7 +6,6 @@
 import { MessageFlags, type ChatInputCommandInteraction } from "discord.js";
 import { personality } from "../config/personality.js";
 import { ai } from "../utils/ai.js";
-import { calculateCost } from "../utils/calculateCost.js";
 import { isSubscribed } from "../utils/isSubscribed.js";
 
 /**
@@ -42,7 +41,4 @@ export const proofread = async(
     response?.text
       ?? "I'm sorry, I don't have an answer for that. Please try again later.",
   );
-
-  const { usage } = messages;
-  await calculateCost(usage, interaction.user.username, "proofread");
 };

src/modules/query.ts

@@ -6,7 +6,6 @@
 import { MessageFlags, type ChatInputCommandInteraction } from "discord.js";
 import { personality } from "../config/personality.js";
 import { ai } from "../utils/ai.js";
-import { calculateCost } from "../utils/calculateCost.js";
 import { isSubscribed } from "../utils/isSubscribed.js";
 
 /**
@@ -42,7 +41,4 @@ export const query = async(
     response?.text
       ?? "I'm sorry, I don't have an answer for that. Please try again later.",
   );
-
-  const { usage } = messages;
-  await calculateCost(usage, interaction.user.username, "query");
 };

src/modules/summarise.ts

@@ -6,7 +6,6 @@
 import { MessageFlags, type ChatInputCommandInteraction } from "discord.js";
 import { personality } from "../config/personality.js";
 import { ai } from "../utils/ai.js";
-import { calculateCost } from "../utils/calculateCost.js";
 import { isSubscribed } from "../utils/isSubscribed.js";
 
 /**
@@ -42,7 +41,4 @@ export const summarise = async(
     response?.text
       ?? "I'm sorry, I don't have an answer for that. Please try again later.",
   );
-
-  const { usage } = messages;
-  await calculateCost(usage, interaction.user.username, "summarise");
 };

src/server/serve.ts

@@ -5,7 +5,7 @@
  */
 
 import fastify from "fastify";
-import { logger } from "../utils/logger.js";
+import { logHandler } from "../utils/logHandler.js";
 
 const html = `<!DOCTYPE html>
 <html>
@@ -60,16 +60,12 @@ export const instantiateServer = (): void => {
 
     server.listen({ port: 5002 }, (error) => {
       if (error) {
-        void logger.error("instantiate server", error);
+        logHandler.error(error);
         return;
       }
-      void logger.log("debug", "Server listening on port 5002.");
+      logHandler.info("Server listening on port 5002.");
     });
   } catch (error) {
-    if (error instanceof Error) {
+    logHandler.error(error);
-      void logger.error("instantiate server", error);
-      return;
-    }
-    void logger.error("instantiate server", new Error("Unknown error"));
   }
 };

src/utils/calculateCost.ts

@@ -1,30 +0,0 @@
-/**
- * @copyright nhcarrigan
- * @license Naomi's Public License
- * @author Naomi Carrigan
- */
-import { logger } from "./logger.js";
-import type { Usage } from "@anthropic-ai/sdk/resources/index.js";
-
-/**
- * Calculates the cost of a command run by a user, and sends to
- * our logging service.
- * @param usage -- The usage payload from Anthropic.
- * @param uuid -- The Discord ID of the user who ran the command.
- * @param command -- The command that was run.
- */
-export const calculateCost = async(
-  usage: Usage,
-  uuid: string,
-  command: string,
-): Promise<void> => {
-  const inputCost = usage.input_tokens * (3 / 1_000_000);
-  const outputCost = usage.output_tokens * (15 / 1_000_000);
-  const totalCost = inputCost + outputCost;
-  await logger.log(
-    "info",
-    `User ${uuid} ran \`${command}\` which accepted ${usage.input_tokens.toString()} and generated ${usage.output_tokens.toString()}.
-    
-    Total cost: ${totalCost.toLocaleString("en-GB", { currency: "USD", style: "currency" })}`,
-  );
-};

src/utils/logHandler.ts

@@ -0,0 +1,31 @@
+/**
+ * @copyright nhcarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import { createLogger, format, transports, config } from "winston";
+
+const { combine, timestamp, colorize, printf } = format;
+
+/**
+ * Standard log handler, using winston to wrap and format
+ * messages. Call with `logHandler.log(level, message)`.
+ * @param {string} level - The log level to use.
+ * @param {string} message - The message to log.
+ */
+export const logHandler = createLogger({
+  exitOnError: false,
+  format:      combine(
+    timestamp({
+      format: "YYYY-MM-DD HH:mm:ss",
+    }),
+    colorize(),
+    printf((info) => {
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- Winston properties...
+      return `${info.level}: ${info.timestamp}: ${info.message}`;
+    }),
+  ),
+  level:      "silly",
+  levels:     config.npm.levels,
+  transports: [ new transports.Console() ],
+});

src/utils/logger.ts

@@ -1,12 +0,0 @@
-/**
- * @copyright nhcarrigan
- * @license Naomi's Public License
- * @author Naomi Carrigan
- */
-
-import { Logger } from "@nhcarrigan/logger";
-
-export const logger = new Logger(
-  "Cordelia Taryne",
-  process.env.LOG_TOKEN ?? "",
-);