@openinc/parse-server-opendash 4.0.22 → 4.0.24

package/dist/hooks/MES_Order.js

@@ -43,6 +43,8 @@ const cron_1 = require("cron");
 const index_js_1 = require("../features/openware/index.js");
 const index_js_2 = require("../features/schema/index.js");
 const index_js_3 = require("../types/index.js");
+// Tolerance for client/server clock skew when comparing `start` against `now`.
+const CLOCK_SKEW_MS = 60_000;
 const excludeFields = [
     "ACL",
     "updatedAt",
@@ -80,8 +82,6 @@ async function init() {
         const { object, original, user } = request;
         if (!object.id)
             return;
-        // Non-sync client & Server times. ALlow 1 minute difference
-        const nowThresholded = Date.now() - 60_000;
         await (0, index_js_2.defaultHandler)(request);
         await (0, index_js_2.defaultAclHandler)(request, {
             allowCustomACL: true,
@@ -106,27 +106,28 @@ async function init() {
                     : article?.get("targettime") || 0);
             }
         }
-        // If the order is started and has a source, it is running
-        if (object.get("start") &&
-            object.get("start").getTime() < Date.now() + 60_000 &&
-            object.get("source") &&
-            !object.get("status")) {
-            object.set("status", "running");
-        }
-        if (object.get("start") &&
-            object.get("start").getTime() > Date.now() &&
-            object.get("source") &&
-            !object.get("status")) {
-            object.set("status", "planned");
-        }
-        // If the order is started and has no source, it is unknown
-        if (object.get("start") &&
-            object.get("start").getTime() < nowThresholded &&
-            !object.get("source")) {
-            object.set("status", "unknown");
+        // Re-evaluate status. Terminal states (done/canceled) are preserved; any
+        // other status — including "unknown" — is recomputed so orders can heal
+        // when source/tag arrive on a later save. Clock skew is tolerated in both
+        // directions: starts up to CLOCK_SKEW_MS in the future count as "started",
+        // and a missing source only produces "unknown" once `start` has clearly
+        // passed.
+        const currentStatus = object.get("status");
+        const start = object.get("start");
+        const hasSource = !!object.get("source");
+        if (currentStatus !== "done" && currentStatus !== "canceled" && start) {
+            const startMs = start.getTime();
+            const nowMs = Date.now();
+            if (hasSource) {
+                object.set("status", startMs < nowMs + CLOCK_SKEW_MS ? "running" : "planned");
+            }
+            else if (startMs < nowMs - CLOCK_SKEW_MS) {
+                console.log("[MES] - beforeSaveHook: Setting status to unknown for order " + object.id + " due to missing source and order running for more than a minute.");
+                object.set("status", "unknown");
+            }
         }
         // If the order has been started and ended, it is done
-        if (object.get("start") &&
+        if (start &&
             object.get("duration") &&
             (object.get("status") === "running" || object.get("status") === "planned")) {
             object.set("status", "done");
@@ -182,6 +183,7 @@ async function init() {
                 runningData.name = "Order_Running";
                 console.log("-".repeat(20));
                 console.log("Publishing running order " + object.id);
+                console.log("Data:", runningData);
                 console.log("-".repeat(20));
                 await (0, index_js_1.publishDataItem)(runningData, user?.getEmail() || undefined, true);
             }
@@ -303,6 +305,7 @@ async function createValueArrayForObject(object, extraValues, fields) {
         }
         values.push(value);
     }
+    console.log("[MES] - createValueArrayForObject: Created values object for order " + object.id + ": ", values);
     return [{ date: object.get("start").getTime(), value: values }];
 }
 function scheduleOrderStartedStatusCheck(cronInterval) {
@@ -315,29 +318,26 @@ function scheduleOrderStartedStatusCheck(cronInterval) {
         query.find({ useMasterKey: true }).then((orders) => {
             orders.forEach((order) => {
                 const status = order.get("status");
-                if (!status) {
-                    if (order.get("tag")) {
-                        if (order.get("start").getTime() < Date.now()) {
-                            order.set("status", "running");
-                            order.save(null, { useMasterKey: true });
-                        }
-                        else {
-                            order.set("status", "planned");
-                            order.save(null, { useMasterKey: true });
-                        }
-                    }
-                    else {
-                        order.set("status", "unknown");
-                        order.save(null, { useMasterKey: true });
-                    }
+                if (status === "done" || status === "canceled")
+                    return;
+                const startMs = order.get("start").getTime();
+                const nowMs = Date.now();
+                const hasStarted = startMs < nowMs + CLOCK_SKEW_MS;
+                const hasTag = !!order.get("tag");
+                let next;
+                if (hasTag) {
+                    next = hasStarted ? "running" : "planned";
+                }
+                else if (startMs < nowMs - CLOCK_SKEW_MS) {
+                    next = "unknown";
+                    console.log("[MES] - orderStartedStatusCheck: Setting status to unknown for order " + order.id + " due to missing source and order running for more than a minute.");
+                }
+                else if (!status) {
+                    next = "planned";
                 }
-                else {
-                    if (status === "unknown" || status === "planned") {
-                        if (order.get("start").getTime() < Date.now()) {
-                            order.set("status", "running");
-                            order.save(null, { useMasterKey: true });
-                        }
-                    }
+                if (next && next !== status) {
+                    order.set("status", next);
+                    order.save(null, { useMasterKey: true });
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "4.0.22",
+  "version": "4.0.24",
   "description": "Parse Server Cloud Code for open.INC Stack.",
   "packageManager": "pnpm@10.33.0",
   "keywords": [
@@ -41,7 +41,7 @@
         "path": "@semantic-release/git",
         "assets": [
           "package.json",
-          "pnpm-lock.json",
+          "pnpm-lock.yaml",
           "CHANGELOG.md"
         ],
         "message": "chore(release): Release ${nextRelease.version} \n\n${nextRelease.notes}"
@@ -66,34 +66,26 @@
     "docker:rebuild": "cd ./docker-dev && powershell -NoProfile -ExecutionPolicy Bypass -File rebuild_and_restart.ps1"
   },
   "dependencies": {
-    "@openinc/parse-server-schema": "^4.1.0",
+    "@openinc/parse-server-schema": "^4.1.1",
     "amqplib": "^0.10.9",
     "cron": "^4.4.0",
     "dayjs": "^1.11.20",
     "fast-equals": "^6.0.0",
-    "i18next": "^26.0.5",
-    "i18next-fs-backend": "^2.6.3",
+    "i18next": "^26.0.6",
+    "i18next-fs-backend": "^2.6.4",
     "jsonwebtoken": "^9.0.3",
     "jwks-rsa": "^4.0.1",
     "nodemailer": "^8.0.5",
     "nunjucks": "^3.2.4",
-    "parse": "^8.5.0",
+    "parse": "^8.6.0",
     "parse-server": "9.8.0",
     "pdf-img-convert": "2.0.0",
     "rimraf": "^6.1.3",
-    "semantic-release": "^25.0.3",
     "table": "^6.9.0",
     "web-push": "^3.6.7",
     "winston": "^3.19.0"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^13.0.1",
-    "@semantic-release/exec": "^7.1.0",
-    "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^12.0.6",
-    "@semantic-release/npm": "^13.1.5",
-    "@semantic-release/release-notes-generator": "^14.1.0",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "^25.6.0",
     "@types/nodemailer": "^7.0.11",
@@ -101,10 +93,16 @@
     "@types/safe-timers": "^1.1.2",
     "@types/web-push": "^3.6.4",
     "concurrently": "^9.2.1",
-    "semantic-release-export-data": "^1.2.0",
     "ts-node": "^10.9.2",
     "typedoc": "^0.28.19",
     "typedoc-plugin-markdown": "^4.11.0",
     "typescript": "^5.9.3"
+  },
+  "pnpm": {
+    "auditConfig": {
+      "ignoreGhsas": [
+        "GHSA-w5hq-g745-h8pq"
+      ]
+    }
   }
 }