mynth-logger 2.0.9 → 2.0.11

package/.github/workflows/CI.yaml

@@ -21,7 +21,7 @@ jobs:
           check-latest: true
 
       - name: Update npm
-        run: npm install -g npm@latest
+        run: npm install -g npm@"<11"
 
       - name: Install dependencies
         run: npm ci --include dev
@@ -43,7 +43,7 @@ jobs:
           check-latest: true
 
       - name: Update npm
-        run: npm install -g npm@latest
+        run: npm install -g npm@"<11"
 
       - name: Install dependencies
         run: npm ci --include dev
@@ -66,7 +66,7 @@ jobs:
           check-latest: true
 
       - name: Update npm
-        run: npm install -g npm@latest
+        run: npm install -g npm@"<11"
 
       - name: Install dependencies
         run: npm install --include dev

package/.github/workflows/publish.yml

@@ -29,7 +29,7 @@ jobs:
           check-latest: true
 
       - name: Update npm
-        run: npm install -g npm@latest
+        run: npm install -g npm@"<11"
 
       - name: Install dependencies
         run: npm install

package/dist/src/discord.d.ts

@@ -0,0 +1,13 @@
+declare enum color {
+    green = "2404635",
+    red = "11606811",
+    yellow = "11644443"
+}
+declare const discord: {
+    configure: (webhookUrl: string) => void;
+    debug: (title: string, message: string, color?: color | string) => void;
+    error: (title: string, message: string, color?: color | string) => void;
+    info: (title: string, message: string, color?: color | string) => void;
+    log: (title: string, message: string, color?: color | string) => void;
+};
+export { color, discord };

package/dist/src/discord.js

@@ -0,0 +1,33 @@
+import { type } from "arktype";
+var color;
+(function (color) {
+    color["green"] = "2404635";
+    color["red"] = "11606811";
+    color["yellow"] = "11644443";
+})(color || (color = {}));
+const green = color.green;
+const red = color.red;
+const yellow = color.yellow;
+const log = (level, color, title, message) => {
+    const settings = {
+        color,
+        discord: true,
+        title,
+    };
+    console[level](message, settings);
+};
+const discord = {
+    configure: (webhookUrl) => {
+        type("string.url").assert(webhookUrl);
+        const settings = {
+            discord: true,
+            setWebhookUrl: webhookUrl,
+        };
+        console.debug(settings);
+    },
+    debug: (title, message, color = yellow) => log("debug", color, title, message),
+    error: (title, message, color = red) => log("error", color, title, message),
+    info: (title, message, color = green) => log("info", color, title, message),
+    log: (title, message, color = green) => log("log", color, title, message),
+};
+export { color, discord };

package/dist/src/index.d.ts

@@ -1 +1,2 @@
 export * from "./logging.js";
+export * from "./discord.js";

package/dist/src/index.js

@@ -1 +1,2 @@
 export * from "./logging.js";
+export * from "./discord.js";

package/dist/src/reporters/discord.d.ts

@@ -1,5 +1,19 @@
 import { LogObject } from "consola";
+declare const Discord: import("arktype/internal/methods/object.ts").ObjectType<{
+    discord: true;
+    color: string;
+    title: string;
+    webhookUrl?: string | undefined;
+}, {}>;
+declare const ConfigureDiscord: import("arktype/internal/methods/object.ts").ObjectType<{
+    discord: true;
+    setWebhookUrl: string;
+}, {}>;
+type Discord = typeof Discord.infer;
+type ConfigureDiscord = typeof ConfigureDiscord.infer;
 declare const Reporter: {
+    webhookUrl: string;
     log: (logObj: LogObject) => void;
 };
 export default Reporter;
+export { ConfigureDiscord, Discord };

package/dist/src/reporters/discord.js

@@ -2,23 +2,47 @@ import { format } from "../format.js";
 import { type } from "arktype";
 import got from "got";
 const Discord = type({
-    discord: type("boolean").narrow((v) => v),
+    discord: "true",
     color: "string",
     title: "string",
-    webhookUrl: "string",
+    "webhookUrl?": "string.url",
+});
+const ConfigureDiscord = type({
+    discord: "true",
+    setWebhookUrl: "string.url",
 });
 const NullDiscord = { discord: false };
 const Reporter = {
+    webhookUrl: "",
     log: (logObj) => {
+        if (configureDiscord(logObj.args)) {
+            logObj.args = ["Set Discord webhook URL"];
+            return;
+        }
         const [discord, args] = getDiscord(logObj.args);
         if (!discord.discord)
             return;
-        sendToDiscord(format(args), discord);
+        const webhookUrl = discord.webhookUrl || Reporter.webhookUrl;
+        if (!webhookUrl) {
+            console.error("Discord webhook URL is missing");
+            return;
+        }
+        sendToDiscord(format(args), discord, webhookUrl);
         // Filter Discord data before the other reporters
         // process the message
         logObj.args = args;
     },
 };
+const configureDiscord = (args) => {
+    for (const arg of args) {
+        const config = ConfigureDiscord(arg);
+        if (!(config instanceof type.errors)) {
+            Reporter.webhookUrl = config.setWebhookUrl;
+            return true;
+        }
+    }
+    return false;
+};
 const getDiscord = (args) => {
     for (let i = 0; i < args.length; i++) {
         const discord = Discord(args[i]);
@@ -28,7 +52,7 @@ const getDiscord = (args) => {
     }
     return [NullDiscord, args];
 };
-const sendToDiscord = async (description, options) => {
+const sendToDiscord = async (description, options, webhookUrl) => {
     const data = {
         json: {
             embeds: [
@@ -42,10 +66,11 @@ const sendToDiscord = async (description, options) => {
         retry: { limit: 5 },
     };
     try {
-        await got.post(options.webhookUrl, data);
+        await got.post(webhookUrl, data);
     }
     catch (error) {
         console.error("Unable to send message to Discord", error);
     }
 };
 export default Reporter;
+export { ConfigureDiscord, Discord };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mynth-logger",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Package to format logs for mynth microservices.",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -22,7 +22,7 @@
     "url": "git@github.com-mynth:MynthAI/mynth-logger.git"
   },
   "peerDependencies": {
-    "arktype": "^2.0.0-rc.7"
+    "arktype": "^2.0.4"
   },
   "dependencies": {
     "@ungap/structured-clone": "^1.2.0",

package/src/discord.ts

@@ -0,0 +1,46 @@
+import { ConfigureDiscord, Discord } from "./reporters/discord.js";
+import { type } from "arktype";
+
+enum color {
+  green = "2404635",
+  red = "11606811",
+  yellow = "11644443",
+}
+const green = color.green;
+const red = color.red;
+const yellow = color.yellow;
+
+const log = (
+  level: "debug" | "info" | "log" | "error",
+  color: color | string,
+  title: string,
+  message: string
+) => {
+  const settings: Discord = {
+    color,
+    discord: true,
+    title,
+  };
+  console[level](message, settings);
+};
+
+const discord = {
+  configure: (webhookUrl: string) => {
+    type("string.url").assert(webhookUrl);
+    const settings: ConfigureDiscord = {
+      discord: true,
+      setWebhookUrl: webhookUrl,
+    };
+    console.debug(settings);
+  },
+  debug: (title: string, message: string, color: color | string = yellow) =>
+    log("debug", color, title, message),
+  error: (title: string, message: string, color: color | string = red) =>
+    log("error", color, title, message),
+  info: (title: string, message: string, color: color | string = green) =>
+    log("info", color, title, message),
+  log: (title: string, message: string, color: color | string = green) =>
+    log("log", color, title, message),
+};
+
+export { color, discord };

package/src/index.ts

@@ -1 +1,2 @@
 export * from "./logging.js";
+export * from "./discord.js";

package/src/reporters/discord.ts

@@ -4,24 +4,43 @@ import { type } from "arktype";
 import got from "got";
 
 const Discord = type({
-  discord: type("boolean").narrow((v) => v),
+  discord: "true",
   color: "string",
   title: "string",
-  webhookUrl: "string",
+  "webhookUrl?": "string.url",
+});
+
+const ConfigureDiscord = type({
+  discord: "true",
+  setWebhookUrl: "string.url",
 });
 
 type Discord = typeof Discord.infer;
+type ConfigureDiscord = typeof ConfigureDiscord.infer;
 
 const NullDiscord = { discord: false } as const;
 
 type NullDiscord = typeof NullDiscord;
 
 const Reporter = {
+  webhookUrl: "",
   log: (logObj: LogObject) => {
+    if (configureDiscord(logObj.args)) {
+      logObj.args = ["Set Discord webhook URL"];
+      return;
+    }
+
     const [discord, args] = getDiscord(logObj.args);
     if (!discord.discord) return;
 
-    sendToDiscord(format(args), discord);
+    const webhookUrl = discord.webhookUrl || Reporter.webhookUrl;
+
+    if (!webhookUrl) {
+      console.error("Discord webhook URL is missing");
+      return;
+    }
+
+    sendToDiscord(format(args), discord, webhookUrl);
 
     // Filter Discord data before the other reporters
     // process the message
@@ -29,6 +48,19 @@ const Reporter = {
   },
 };
 
+const configureDiscord = (args: unknown[]): boolean => {
+  for (const arg of args) {
+    const config = ConfigureDiscord(arg);
+
+    if (!(config instanceof type.errors)) {
+      Reporter.webhookUrl = config.setWebhookUrl;
+      return true;
+    }
+  }
+
+  return false;
+};
+
 const getDiscord = (args: unknown[]): [Discord | NullDiscord, unknown[]] => {
   for (let i = 0; i < args.length; i++) {
     const discord = Discord(args[i]);
@@ -40,7 +72,11 @@ const getDiscord = (args: unknown[]): [Discord | NullDiscord, unknown[]] => {
   return [NullDiscord, args];
 };
 
-const sendToDiscord = async (description: string, options: Discord) => {
+const sendToDiscord = async (
+  description: string,
+  options: Discord,
+  webhookUrl: string
+) => {
   const data = {
     json: {
       embeds: [
@@ -55,10 +91,11 @@ const sendToDiscord = async (description: string, options: Discord) => {
   };
 
   try {
-    await got.post(options.webhookUrl, data);
+    await got.post(webhookUrl, data);
   } catch (error) {
     console.error("Unable to send message to Discord", error);
   }
 };
 
 export default Reporter;
+export { ConfigureDiscord, Discord };

package/src/index.d.ts

@@ -1,3 +0,0 @@
-declare function setupLogging(): void;
-
-export { setupLogging };