@oneuptime/common 12.0.11 → 12.0.12

package/Server/Types/Workflow/Components/Conditions/IfElse.ts

@@ -165,6 +165,15 @@ export default class IfElse extends ComponentCode {
         options.log(msg);
       });
 
+      /*
+       * runCodeInSandbox resolves with `scriptError` when the expression
+       * threw or timed out — it no longer rejects. Fail the run instead of
+       * silently taking the "No" branch.
+       */
+      if (returnResult.scriptError) {
+        throw returnResult.scriptError;
+      }
+
       if (returnResult.returnValue) {
         return {
           returnValues: {},

package/Server/Types/Workflow/Components/JavaScript.ts

@@ -81,6 +81,15 @@ export default class JavaScriptCode extends ComponentCode {
         options.log(msg);
       });
 
+      /*
+       * runCodeInSandbox resolves with `scriptError` when the user script
+       * threw or timed out — it no longer rejects. Route those runs to the
+       * error port, matching the pre-sandbox behavior.
+       */
+      if (returnResult.scriptError) {
+        throw returnResult.scriptError;
+      }
+
       const returnVal: JSONValue = returnResult.returnValue;
 
       return {

package/Server/Utils/Monitor/MonitorCriteriaEvaluator.ts

@@ -636,6 +636,18 @@ ${contextBlock}
         return null;
       }
 
+      /*
+       * runCodeInSandbox resolves with `scriptError` when the expression threw
+       * or timed out — it no longer rejects. Keep the pre-sandbox outcome
+       * (criteria not met) but retain the error log.
+       */
+      if (result.scriptError) {
+        logger.error(result.scriptError, {
+          projectId: input.monitor.projectId?.toString(),
+        });
+        return null;
+      }
+
       if (result && result.returnValue) {
         return `JavaScript Expression - ${expression} - evaluated to true.`;
       }