mynth-logger 2.0.6 → 2.0.7

package/dist/src/format.js

@@ -1,22 +1,20 @@
 import { stringify } from "@ungap/structured-clone/json";
+import { type } from "arktype";
+const ErrorType = type({
+    message: "string",
+    "stack?": "string",
+});
 const formatItem = (item) => {
-    if (typeof item === "undefined") {
+    if (typeof item === "undefined")
         return "undefined";
-    }
     // Remove colors from strings
-    if (typeof item === "string") {
+    if (typeof item === "string")
         // eslint-disable-next-line no-control-regex
         return item.replace(/\x1b\[[0-9;]*m/g, "");
-    }
     // Check if this is an Error
-    if (item &&
-        typeof item === "object" &&
-        "message" in item &&
-        typeof item.message === "string")
-        return item.message;
-    // Check if this is a string
-    if (typeof item === "string")
-        return item;
+    const error = ErrorType(item);
+    if (!(error instanceof type.errors))
+        return error.stack || error.message;
     const stringified = (() => {
         try {
             return stringify(item);

package/dist/src/logging.js

@@ -5,6 +5,9 @@ const setupLogging = () => {
     const consola = createConsola({ fancy: true, level: 5 });
     if (process.env.NODE_ENV === "production")
         consola.setReporters([DatadogReporter]);
+    // Set Discord reporter as first so it can remove
+    // Discord-related config before other reporters process the
+    // log
     consola.setReporters([DiscordReporter, ...consola.options.reporters]);
     consola.wrapConsole();
     return consola;

package/dist/src/reporters/discord.js

@@ -1,7 +1,6 @@
 import { format } from "../format.js";
 import { type } from "arktype";
-import axios from "axios";
-import axiosRetry, { exponentialDelay } from "axios-retry";
+import got from "got";
 const Discord = type({
     discord: type("boolean").narrow((v) => v),
     color: "string",
@@ -30,13 +29,8 @@ const getDiscord = (args) => {
     return [NullDiscord, args];
 };
 const sendToDiscord = async (description, options) => {
-    const axiosInstance = axios.create();
-    axiosRetry(axiosInstance, {
-        retries: 3,
-        retryDelay: exponentialDelay,
-    });
-    try {
-        await axiosInstance.post(options.webhookUrl, {
+    const data = {
+        json: {
             embeds: [
                 {
                     title: options.title,
@@ -44,7 +38,11 @@ const sendToDiscord = async (description, options) => {
                     color: options.color,
                 },
             ],
-        });
+        },
+        retry: { limit: 5 },
+    };
+    try {
+        await got.post(options.webhookUrl, data);
     }
     catch (error) {
         console.error("Unable to send message to Discord", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mynth-logger",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Package to format logs for mynth microservices.",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -28,9 +28,8 @@
   },
   "dependencies": {
     "@ungap/structured-clone": "^1.2.0",
-    "axios": "^1.7.2",
-    "axios-retry": "^4.3.0",
-    "consola": "^3.2.3"
+    "consola": "^3.2.3",
+    "got": "^13.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.12.12",

package/src/format.ts

@@ -1,27 +1,22 @@
 import { stringify } from "@ungap/structured-clone/json";
+import { type } from "arktype";
+
+const ErrorType = type({
+  message: "string",
+  "stack?": "string",
+});
 
 const formatItem = (item: unknown): string => {
-  if (typeof item === "undefined") {
-    return "undefined";
-  }
+  if (typeof item === "undefined") return "undefined";
 
   // Remove colors from strings
-  if (typeof item === "string") {
+  if (typeof item === "string")
     // eslint-disable-next-line no-control-regex
     return item.replace(/\x1b\[[0-9;]*m/g, "");
-  }
 
   // Check if this is an Error
-  if (
-    item &&
-    typeof item === "object" &&
-    "message" in item &&
-    typeof item.message === "string"
-  )
-    return item.message;
-
-  // Check if this is a string
-  if (typeof item === "string") return item;
+  const error = ErrorType(item);
+  if (!(error instanceof type.errors)) return error.stack || error.message;
 
   const stringified = (() => {
     try {

package/src/logging.ts

@@ -1,16 +1,22 @@
-import { createConsola } from "consola";
+import { createConsola, ConsolaOptions } from "consola";
 import DatadogReporter from "./reporters/datadog.js";
 import DiscordReporter from "./reporters/discord.js";
 
 const setupLogging = () => {
-  const consola = createConsola({ fancy: true, level: 5 });
+  const consola = createConsola({ fancy: true, level: 5 } as Options);
 
   if (process.env.NODE_ENV === "production")
     consola.setReporters([DatadogReporter]);
+
+  // Set Discord reporter as first so it can remove
+  // Discord-related config before other reporters process the
+  // log
   consola.setReporters([DiscordReporter, ...consola.options.reporters]);
 
   consola.wrapConsole();
   return consola;
 };
 
+type Options = ConsolaOptions & { fancy?: boolean };
+
 export { setupLogging };

package/src/reporters/discord.ts

@@ -1,8 +1,7 @@
 import { LogObject } from "consola";
 import { format } from "../format.js";
 import { type } from "arktype";
-import axios from "axios";
-import axiosRetry, { exponentialDelay } from "axios-retry";
+import got from "got";
 
 const Discord = type({
   discord: type("boolean").narrow((v) => v),
@@ -42,14 +41,8 @@ const getDiscord = (args: unknown[]): [Discord | NullDiscord, unknown[]] => {
 };
 
 const sendToDiscord = async (description: string, options: Discord) => {
-  const axiosInstance = axios.create();
-  axiosRetry(axiosInstance, {
-    retries: 3,
-    retryDelay: exponentialDelay,
-  });
-
-  try {
-    await axiosInstance.post(options.webhookUrl, {
+  const data = {
+    json: {
       embeds: [
         {
           title: options.title,
@@ -57,7 +50,12 @@ const sendToDiscord = async (description: string, options: Discord) => {
           color: options.color,
         },
       ],
-    });
+    },
+    retry: { limit: 5 },
+  };
+
+  try {
+    await got.post(options.webhookUrl, data);
   } catch (error) {
     console.error("Unable to send message to Discord", error);
   }

package/tsconfig.json

@@ -3,7 +3,7 @@
     "baseUrl": "./src",
     "target": "es2022",
     "module": "es2022",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,