@openinc/parse-server-opendash 4.0.22 → 4.0.23

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,27 @@ 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) {
+                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");
@@ -315,29 +315,25 @@ 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";
+                }
+                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.23",
   "description": "Parse Server Cloud Code for open.INC Stack.",
   "packageManager": "pnpm@10.33.0",
   "keywords": [