Merge branch 'edge'

Author: FoxxMD

Dockerfile

@@ -51,4 +51,7 @@ RUN yarn install --omit=dev \
     && chown abc:abc node_modules \
     && rm -rf node_modules/tsx \
     && rm -rf node_modules/typescript \
-    && rm -rf node_modules/patch-package
+    && rm -rf node_modules/patch-package \
+    && rm -rf node_modules/@types \
+    && rm -rf node_modules/@esbuild \
+    && rm -rf /usr/local/share/.cache \

package.json

@@ -36,7 +36,7 @@
     "body-parser": "^1.19.0",
     "common-tags": "^1.8.2",
     "concat-stream": "^2.0.0",
-    "croner": "^6.0.7",
+    "croner": "^7.0.5",
     "dayjs": "^1.11.8",
     "deepmerge": "^4.3.1",
     "discord.js": "^14.14.1",

src/common/funcs/processPendingDigests.ts

@@ -6,8 +6,7 @@ import {TautulliRequest} from "../db/models/TautulliRequest.js";
 import {buildMessages} from "../../discord/builder.js";
 import {ErrorWithCause} from "pony-cause";
 
-export const processPendingDigests = async (digest: DigestData, parentLogger: Logger, id?: string) => {
-    const digestLogger = childLogger(parentLogger, `Digest ${id ?? digest.slug}`);
+export const processPendingDigests = async (digest: DigestData, parentLogger: Logger) => {
 
     const {
         slug,
@@ -16,7 +15,7 @@ export const processPendingDigests = async (digest: DigestData, parentLogger: Lo
         }
     } = digest;
 
-    const logger = childLogger(digestLogger, slug);
+    const logger = childLogger(parentLogger, slug);
 
     let sentEvents = 0;
     let sentMessages = 0;

src/scheduler/scheduler.ts

@@ -1,9 +1,10 @@
 import { childLogger, Logger } from "@foxxmd/logging";
+import dayjs from "dayjs";
 import {CronJob, SimpleIntervalJob, ToadScheduler} from "toad-scheduler";
 import {createHeartbeatTask} from "./tasks/heartbeatTask.js";
 import {OperatorConfig} from "../common/infrastructure/OperatorConfig.js";
 import {createProcessPendingDigestsTask} from "./tasks/createProcessPendingDigestsTask.js";
-import {mergeArr} from "../utils/index.js";
+import {Cron} from 'croner';
 
 export const initScheduler = (config: OperatorConfig, parentLogger: Logger) => {
     const scheduler = new ToadScheduler()
@@ -17,11 +18,16 @@ export const initScheduler = (config: OperatorConfig, parentLogger: Logger) => {
     for (const digest of config.digests) {
         const crons = Array.isArray(digest.cron) ? digest.cron : [digest.cron];
         for(const cron of crons) {
-            scheduler.addCronJob(new CronJob({
-                    cronExpression: cron,
-                },
-                createProcessPendingDigestsTask(`${digest.name !== undefined ? `${digest.name} ` : ''}${cron}`, digest, parentLogger)));
-            logger.info(`Added Digest ${digest.slug} to run ${digest.cron}`);
+            try {
+                const nextCron = Cron(cron).nextRun();
+                scheduler.addCronJob(new CronJob({
+                        cronExpression: cron,
+                    },
+                    createProcessPendingDigestsTask(`${digest.name !== undefined ? `${digest.name} ` : ''}${cron}`, digest, parentLogger, cron)));
+                logger.info(`Digest ${digest.slug} started with CRON ${cron.padEnd(16, ' ')} -> Next run at ${dayjs(nextCron).format()}`);
+            } catch (e) {
+                logger.error(new Error(`Failed to create digest for cron ${cron}`, {cause: e}))
+            }
         }
     }
 

src/scheduler/tasks/createProcessPendingDigestsTask.ts

@@ -1,27 +1,30 @@
 import { childLogger, Logger } from "@foxxmd/logging";
+import dayjs from "dayjs";
 import {AsyncTask} from "toad-scheduler";
 import {PromisePool} from "@supercharge/promise-pool";
+import {Cron} from 'croner';
 import {DigestData} from "../../common/infrastructure/OperatorConfig.js";
 import {processPendingDigests} from "../../common/funcs/processPendingDigests.js";
 
-export const createProcessPendingDigestsTask = (id: string, digest: DigestData, parentLogger: Logger) => {
-    const digestLogger = childLogger(parentLogger, `Digest ${id}`);
+export const createProcessPendingDigestsTask = (id: string, digest: DigestData, parentLogger: Logger, cron?: string) => {
+    const digestLogger = childLogger(parentLogger, `Cron ${id}`);
     return new AsyncTask(
-        `Digest - ${id}`,
+        `Digest - ${id} ${digest.slug}`,
         (): Promise<any> => {
             return PromisePool
                 .withConcurrency(1)
                 .for([digest])
                 .process(async (digest: DigestData) => {
-                    await processPendingDigests(digest, parentLogger, id);
+                    await processPendingDigests(digest, digestLogger);
                 }).then(({results, errors}) => {
                     if (errors.length > 0) {
                         digestLogger.error(`Encountered errors!`);
                         for (const err of errors) {
                             digestLogger.error(err);
                         }
-                    } else {
-                        //digestLogger.info(`TOTAL: Sent ${results.reduce((acc, curr) => acc += curr.sentEmbeds, 0)} embeds in ${results.reduce((acc, curr) => acc += curr.sentMessages, 0)} messages`);
+                    }
+                    if(cron !== undefined) {
+                        digestLogger.info(`Next Run at ${dayjs(Cron(cron).nextRun()).format()}`);
                     }
                 });
         },

tsconfig.json

@@ -4,7 +4,7 @@
     "resolveJsonModule": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es2020", "dom"],
+    "lib": ["ESNext", "dom"],
     "module": "commonjs",
     "target": "es2020",
     "esModuleInterop": true,