fix(tasks): ⬆️ upgrade dependencies and add more info to scheduler health check (#12)

cjimenezsaiz · web-flow · commit 4c48525ed04a · 2024-09-08T20:41:35.000+02:00
diff --git a/package.json b/package.json
@@ -35,18 +35,18 @@
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",
-    "@stryker-mutator/core": "^8.2.5",
-    "@stryker-mutator/jest-runner": "^8.2.5",
-    "@stryker-mutator/typescript-checker": "^8.2.5",
+    "@stryker-mutator/core": "^8.5.0",
+    "@stryker-mutator/jest-runner": "^8.5.0",
+    "@stryker-mutator/typescript-checker": "^8.5.0",
     "@types/jest": "29.5.12",
-    "@types/node": "22.2.0",
-    "@typescript-eslint/eslint-plugin": "8.0.1",
-    "@typescript-eslint/parser": "8.0.1",
+    "@types/node": "22.5.4",
+    "@typescript-eslint/eslint-plugin": "8.4.0",
+    "@typescript-eslint/parser": "8.4.0",
     "cross-env": "^7.0.3",
-    "dependency-cruiser": "^16.3.9",
-    "eslint": "^9.7.0",
+    "dependency-cruiser": "^16.4.1",
+    "eslint": "^9.9.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-tsdoc": "^0.3.0",
     "glob": "^11.0.0",
@@ -68,13 +68,13 @@
     "remark-stringify": "^11.0.0",
     "remark-toc": "^9.0.0",
     "rimraf": "^6.0.1",
-    "snyk": "^1.1292.1",
+    "snyk": "^1.1293.0",
     "snyk-to-html": "^2.5.1",
-    "sort-package-json": "^2.9.0",
-    "ts-jest": "29.2.4",
+    "sort-package-json": "^2.10.1",
+    "ts-jest": "29.2.5",
     "ts-node": "10.9.2",
-    "turbo": "^2.0.7",
-    "typedoc": "0.26.5",
+    "turbo": "^2.1.1",
+    "typedoc": "0.26.6",
     "typedoc-plugin-missing-exports": "^3.0.0",
     "typescript": "5.5.4"
   },
diff --git a/packages/api/core/package.json b/packages/api/core/package.json
@@ -42,7 +42,7 @@
     "joi": "^17.13.3",
     "lodash": "^4.17.21",
     "prom-client": "^15.1.3",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/api/crash/package.json b/packages/api/crash/package.json
@@ -35,7 +35,7 @@
     "test": "jest --detectOpenHandles --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/api/doorkeeper/package.json b/packages/api/doorkeeper/package.json
@@ -39,7 +39,7 @@
     "ajv-keywords": "^5.1.0",
     "jsonpointer": "^5.0.0",
     "lodash": "^4.17.21",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/api/firehose/package.json b/packages/api/firehose/package.json
@@ -36,7 +36,7 @@
     "@mdf.js/utils": "*",
     "lodash": "^4.17.21",
     "prom-client": "^15.1.3",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/api/logger/package.json b/packages/api/logger/package.json
@@ -33,12 +33,12 @@
   "dependencies": {
     "@mdf.js/crash": "*",
     "@mdf.js/utils": "*",
-    "debug": "^4.3.5",
+    "debug": "^4.3.7",
     "fluent-logger": "^3.4.1",
     "joi": "^17.13.3",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0",
-    "winston": "^3.13.1"
+    "winston": "^3.14.2"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",
diff --git a/packages/api/middlewares/package.json b/packages/api/middlewares/package.json
@@ -46,7 +46,7 @@
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",
     "prom-client": "^15.1.3",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "@types/jsonwebtoken": "^9.0.2",
     "@types/lodash": "^4.17.7",
     "@types/morgan": "^1.9.4",
-    "@types/multer": "^1.4.11",
+    "@types/multer": "^1.4.12",
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^10.0.0",
     "supertest": "^7.0.0"
diff --git a/packages/api/openc2-core/package.json b/packages/api/openc2-core/package.json
@@ -38,7 +38,7 @@
     "@types/express": "^4.17.17",
     "express": "^4.19.2",
     "lodash": "^4.17.21",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/api/tasks/package.json b/packages/api/tasks/package.json
@@ -37,7 +37,7 @@
     "@mdf.js/utils": "*",
     "lodash": "^4.17.21",
     "ms": "^2.1.3",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/api/tasks/src/Polling/PollingManager.ts b/packages/api/tasks/src/Polling/PollingManager.ts
@@ -192,6 +192,16 @@ export class PollingManager extends EventEmitter {
   }
   /** Return the stats of the polling manager */
   public get check(): Health.Check {
-    return this.pollingStats.check;
+    const _check = {
+      ...this.pollingStats.check,
+      observedValue: {
+        ...this.pollingStats.check.observedValue,
+        inFastCycleTasks: this.fastEntries.size,
+        inSlowCycleTasks: this.slowEntries.size,
+        inOffCycleTasks: this.offEntries.size,
+        pendingTasks: this.pending.size,
+      },
+    };
+    return _check;
   }
 }
diff --git a/packages/api/tasks/src/Polling/PollingStatsManager.ts b/packages/api/tasks/src/Polling/PollingStatsManager.ts
@@ -144,6 +144,7 @@ export class PollingMetricsHandler {
         : Health.STATUS.WARN;
     const _check: Health.Check = {
       componentId: this.componentId,
+      resource: this.resource,
       pollingGroup: this.pollingGroup,
       componentType: 'pollingGroup',
       observedValue: this.pollingStats,
diff --git a/packages/api/tasks/src/Polling/types/PollingStats.i.ts b/packages/api/tasks/src/Polling/types/PollingStats.i.ts
@@ -22,8 +22,12 @@ export interface PollingStats {
   minCycleDuration: number;
   /** Last cycle duration in milliseconds */
   lastCycleDuration: number;
-  /** Number of tasks included on the cycle */
-  tasks: number;
+  /** Number of tasks included on the fast cycle (normal cycle) */
+  inFastCycleTasks: number;
+  /** Number of tasks included on the slow cycle */
+  inSlowCycleTasks: number;
   /** Number of tasks not included on the cycle */
-  tasksOffCycle: number;
+  inOffCycleTasks: number;
+  /** Number of pending tasks */
+  pendingTasks: number;
 }
diff --git a/packages/api/tasks/src/Polling/types/const.ts b/packages/api/tasks/src/Polling/types/const.ts
@@ -27,6 +27,8 @@ export const DEFAULT_POLLING_STATS: PollingStats = {
   maxCycleDuration: 0,
   minCycleDuration: Infinity,
   lastCycleDuration: 0,
-  tasks: 0,
-  tasksOffCycle: 0,
+  inFastCycleTasks: 0,
+  inSlowCycleTasks: 0,
+  inOffCycleTasks: 0,
+  pendingTasks: 0,
 };
diff --git a/packages/api/utils/package.json b/packages/api/utils/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@mdf.js/crash": "*",
     "lodash": "^4.17.21",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/components/service-registry/package.json b/packages/components/service-registry/package.json
@@ -38,14 +38,14 @@
     "@mdf.js/openc2": "*",
     "@mdf.js/service-setup-provider": "*",
     "@mdf.js/utils": "*",
-    "escalade": "^3.1.2",
+    "escalade": "^3.2.0",
     "express": "^4.19.2",
-    "http-proxy-middleware": "^3.0.0",
+    "http-proxy-middleware": "^3.0.2",
     "lodash": "^4.17.21",
     "markdown-it": "^14.1.0",
     "normalize-package-data": "^6.0.2",
     "prom-client": "^15.1.3",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/providers/amqp/package.json b/packages/providers/amqp/package.json
@@ -37,7 +37,7 @@
     "joi": "^17.13.3",
     "lodash": "^4.17.21",
     "rhea-promise": "^3.0.3",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/providers/elastic/package.json b/packages/providers/elastic/package.json
@@ -30,13 +30,13 @@
     "test": "jest --detectOpenHandles --config ./jest.config.js"
   },
   "dependencies": {
-    "@elastic/elasticsearch": "^8.14.0",
+    "@elastic/elasticsearch": "^8.15.0",
     "@mdf.js/core": "*",
     "@mdf.js/crash": "*",
     "@mdf.js/logger": "*",
     "@mdf.js/utils": "*",
     "joi": "^17.13.3",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*"
diff --git a/packages/providers/http-client/package.json b/packages/providers/http-client/package.json
@@ -35,9 +35,9 @@
     "@mdf.js/crash": "*",
     "@mdf.js/logger": "*",
     "@mdf.js/utils": "*",
-    "axios": "^1.7.2",
+    "axios": "^1.7.7",
     "joi": "^17.13.3",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",
diff --git a/packages/providers/http-server/package.json b/packages/providers/http-server/package.json
@@ -38,7 +38,7 @@
     "express": "^4.19.2",
     "http-terminator": "^3.2.0",
     "joi": "^17.13.3",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",
diff --git a/packages/providers/kafka/package.json b/packages/providers/kafka/package.json
@@ -37,7 +37,7 @@
     "joi": "^17.13.3",
     "kafkajs": "^2.2.4",
     "lodash": "^4.17.21",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
diff --git a/packages/providers/mongo/package.json b/packages/providers/mongo/package.json
@@ -38,7 +38,7 @@
     "@mdf.js/utils": "*",
     "joi": "^17.13.3",
     "mongodb": "^6.8.0",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*"
diff --git a/packages/providers/mqtt/package.json b/packages/providers/mqtt/package.json
@@ -35,8 +35,8 @@
     "@mdf.js/logger": "*",
     "@mdf.js/utils": "*",
     "joi": "^17.13.3",
-    "mqtt": "^5.8.1",
-    "tslib": "^2.6.3"
+    "mqtt": "^5.10.1",
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*"
diff --git a/packages/providers/redis/package.json b/packages/providers/redis/package.json
@@ -38,7 +38,7 @@
     "ioredis": "^5.4.1",
     "joi": "^17.13.3",
     "redis-errors": "^1.2.0",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",
diff --git a/packages/providers/s3/package.json b/packages/providers/s3/package.json
@@ -30,13 +30,13 @@
     "test": "jest --detectOpenHandles --config ./jest.config.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.614.0",
+    "@aws-sdk/client-s3": "^3.645.0",
     "@mdf.js/core": "*",
     "@mdf.js/crash": "*",
     "@mdf.js/logger": "*",
     "@mdf.js/utils": "*",
     "joi": "^17.13.1",
-    "tslib": "^2.6.0"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*"
diff --git a/packages/providers/service-setup/package.json b/packages/providers/service-setup/package.json
@@ -39,9 +39,9 @@
     "glob": "^11.0.0",
     "lodash": "^4.17.21",
     "toml": "^3.0.0",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "uuid": "^10.0.0",
-    "yaml": "^2.4.5"
+    "yaml": "^2.5.1"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",
diff --git a/packages/providers/socket-client/package.json b/packages/providers/socket-client/package.json
@@ -37,7 +37,7 @@
     "@mdf.js/utils": "*",
     "joi": "^17.13.3",
     "socket.io-client": "^4.7.5",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",
diff --git a/packages/providers/socket-server/package.json b/packages/providers/socket-server/package.json
@@ -40,7 +40,7 @@
     "express": "^4.19.2",
     "joi": "^17.13.3",
     "socket.io": "^4.7.5",
-    "tslib": "^2.6.3"
+    "tslib": "^2.7.0"
   },
   "devDependencies": {
     "@mdf.js/repo-config": "*",

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,16 @@ export class PollingManager extends EventEmitter {`
`192`	`192`	`}`
`193`	`193`	`/** Return the stats of the polling manager */`
`194`	`194`	`public get check(): Health.Check {`
`195`		`- return this.pollingStats.check;`
	`195`	`+ const _check = {`
	`196`	`+ ...this.pollingStats.check,`
	`197`	`+ observedValue: {`
	`198`	`+ ...this.pollingStats.check.observedValue,`
	`199`	`+ inFastCycleTasks: this.fastEntries.size,`
	`200`	`+ inSlowCycleTasks: this.slowEntries.size,`
	`201`	`+ inOffCycleTasks: this.offEntries.size,`
	`202`	`+ pendingTasks: this.pending.size,`
	`203`	`+ },`
	`204`	`+ };`
	`205`	`+ return _check;`
`196`	`206`	`}`
`197`	`207`	`}`