@promise-watch/core - npm Package Compare versions

Comparing version 0.0.3 to 0.0.4

dist/execute.js

@@ -25,10 +25,11 @@ "use strict";
 const glob_promise_1 = require("./utils/glob-promise");
+const time_1 = require("./utils/time");
+let alive = true;
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
-let alive = true;
-async function executeJobs({ dir, errorNotifiers = [], globPath = "runs/**/*.{js,ts}" }) {
+async function fetchRuns(globPath, dir) {
     const files = await (0, glob_promise_1.glob)(globPath);
     const imports = await Promise.all(files.map(f => Promise.resolve().then(() => __importStar(require((0, path_1.resolve)(dir, "../", f))))));
-    const runs = imports.map((r, idx) => {
+    return imports.map((r, idx) => {
         var _a;
@@ -41,21 +42,38 @@ return ({
     });
-    async function sendErrorNotifications(title, body, customNotifiers) {
-        for (const notify of customNotifiers !== null && customNotifiers !== void 0 ? customNotifiers : errorNotifiers) {
-            await notify.send({ title, body });
+}
+async function sendNotifications(title, body, notifiers) {
+    for (const notify of notifiers) {
+        await notify.send({ title, body }).catch(console.error);
+    }
+}
+const errorMap = new Map();
+async function recursiveRun(page, globalNotifiers = []) {
+    var _a;
+    const { name, run, options } = page;
+    const notifiers = (_a = options.notifiers) !== null && _a !== void 0 ? _a : globalNotifiers;
+    const errorStartTime = errorMap.get(name);
+    try {
+        await run();
+        if (errorStartTime) {
+            errorMap.delete(name);
+            const message = `Run is back online! was down for ${(0, time_1.millisecondsToStr)(errorStartTime.getTime())}`;
+            await sendNotifications(name, message, notifiers);
         }
     }
-    async function extracted({ name, run, options }) {
-        try {
-            await run();
+    catch (err) {
+        if (!errorStartTime) {
+            errorMap.set(name, new Date());
+            await sendNotifications(name, err.message, notifiers);
         }
-        catch (err) {
-            await sendErrorNotifications(name, err.message, options.errorNotifiers);
-        }
-        if (alive) {
-            await sleep(options.interval * 1000);
-            await extracted({ name, run, options });
-        }
     }
-    await Promise.allSettled(runs.map(run => extracted(run)));
+    if (alive) {
+        await sleep(options.interval * 1000);
+        await recursiveRun({ name, run, options }, notifiers);
+    }
 }
+async function executeJobs(options) {
+    const { dir, notifiers = [], globPath = "runs/**/*.{js,ts}", } = options;
+    const runs = await fetchRuns(globPath, dir);
+    await Promise.allSettled(runs.map(run => recursiveRun(run, notifiers)));
+}
 exports.executeJobs = executeJobs;
@@ -62,0 +80,0 @@ function shutdown() {

package.json

 {
   "name": "@promise-watch/core",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "main": "dist/index.js",
@@ -5,0 +5,0 @@ "author": "Jason Raimondi <[e-mail]> (https://jasonraimondi.com)",

src/execute.ts

 import { resolve } from "path";
 import { glob } from "./utils/glob-promise";
 import { Notifier } from "./notifications";
+import { millisecondsToStr } from "./utils/time";
 
@@ -12,3 +13,3 @@ export type RunPage = {
 export type RunOptions = {
-  errorNotifiers?: Notifier[];
+  notifiers?: Notifier[];
   interval: number;
@@ -20,5 +21,7 @@ };
   globPath?: string;
-  errorNotifiers?: Notifier[];
+  notifiers?: Notifier[];
 };
 
+let alive = true;
+
 function sleep(ms: number) {
@@ -28,8 +31,6 @@ return new Promise(resolve => setTimeout(resolve, ms));
 
-let alive = true;
-
-export async function executeJobs({ dir, errorNotifiers = [], globPath = "runs/**/*.{js,ts}" }: ExecuteOptions) {
+async function fetchRuns(globPath: string, dir: string) {
   const files = await glob(globPath);
   const imports = await Promise.all(files.map(f => import(resolve(dir, "../", f))));
-  const runs = imports.map((r: RunPage, idx) => ({
+  return imports.map((r: RunPage, idx) => ({
     name: r.name ?? files[idx],
@@ -39,25 +40,51 @@ run: r.run,
   }));
+}
 
-  async function sendErrorNotifications(title: string, body: string, customNotifiers?: Notifier[]) {
-    for (const notify of customNotifiers ?? errorNotifiers) {
-      await notify.send({ title, body });
-    }
+async function sendNotifications(title: string, body: string, notifiers: Notifier[]) {
+  for (const notify of notifiers) {
+    await notify.send({ title, body }).catch(console.error);
   }
+}
 
-  async function extracted({ name, run, options }: Required<RunPage>) {
-    try {
-      await run();
-    } catch (err) {
-      await sendErrorNotifications(name, err.message, options.errorNotifiers);
-    }
+const errorMap = new Map<string, Date>();
 
-    if (alive) {
-      await sleep(options.interval * 1000);
-      await extracted({ name, run, options });
+async function recursiveRun(page: Required<RunPage>, globalNotifiers: Notifier[] = []) {
+  const { name, run, options } = page;
+  const notifiers = options.notifiers ?? globalNotifiers;
+
+  const errorStartTime = errorMap.get(name);
+
+  try {
+    await run();
+
+    if (errorStartTime) {
+      errorMap.delete(name);
+      const message = `Run is back online! was down for ${millisecondsToStr(errorStartTime.getTime())}`;
+      await sendNotifications(name, message, notifiers);
     }
+  } catch (err) {
+    // if we have already notified about the error,
+    // wait until success before sending another notification
+    if (!errorStartTime) {
+      errorMap.set(name, new Date());
+      await sendNotifications(name, err.message, notifiers);
+    }
   }
 
-  await Promise.allSettled(runs.map(run => extracted(run)));
+  if (alive) {
+    await sleep(options.interval * 1000);
+    await recursiveRun({ name, run, options }, notifiers);
+  }
 }
 
+export async function executeJobs(options: ExecuteOptions) {
+  const {
+    dir,
+    notifiers = [],
+    globPath = "runs/**/*.{js,ts}",
+  } = options;
+  const runs = await fetchRuns(globPath, dir);
+  await Promise.allSettled(runs.map(run => recursiveRun(run, notifiers)));
+}
+
 function shutdown() {
@@ -64,0 +91,0 @@ alive = false;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

15742

increased by47.38%

Number of package files

17

increased by21.43%

Lines of code

287

increased by53.48%

No dependency changes