@oneuptime/common 12.0.14 → 12.0.15

package/build/dist/Server/Utils/Marketing/ConversionUploadProvider.js

@@ -1,5 +1,5 @@
 import { AxiosError } from "axios";
-import { MarketingConversionType } from "../../../Types/Marketing/MarketingConversion";
+import { AdUploadableMarketingConversionTypes, MarketingConversionType, } from "../../../Types/Marketing/MarketingConversion";
 export default class ConversionUploadProvider {
     constructor() {
         /*
@@ -9,6 +9,22 @@ export default class ConversionUploadProvider {
          */
         this.maxBatchSize = 500;
     }
+    /*
+     * Every provider maps a conversion onto a platform conversion action by
+     * branching on isSignUp() — so a conversion type the ad platforms have no
+     * mapping for (a booked meeting) would otherwise be silently uploaded as a
+     * purchase. Screen those out here, before any provider sees them, so no
+     * provider or call site can skip the check.
+     */
+    getSkipReason(conversion) {
+        if (!AdUploadableMarketingConversionTypes.includes(conversion.conversionType)) {
+            return {
+                reason: `Conversion type ${conversion.conversionType || "unknown"} has no ad platform conversion mapping`,
+                isPermanent: true,
+            };
+        }
+        return this.getProviderSkipReason(conversion);
+    }
     getClickId(conversion, clickIdKey) {
         const clickIds = conversion.clickIds || {};
         const value = clickIds[clickIdKey];

package/build/dist/Server/Utils/Marketing/ConversionUploadProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConversionUploadProvider.js","sourceRoot":"","sources":["../../../../../Server/Utils/Marketing/ConversionUploadProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAsCvF,MAAM,CAAC,OAAO,OAAgB,wBAAwB;IAAtD;QAKE;;;;WAIG;QACa,iBAAY,GAAW,GAAG,CAAC;IAoD7C,CAAC;IAxCW,UAAU,CAClB,UAA+B,EAC/B,UAAkB;QAElB,MAAM,QAAQ,GAAe,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvD,MAAM,KAAK,GAAY,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC5C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChE,CAAC;IAES,aAAa,CAAC,UAA+B;QACrD,IACE,UAAU,CAAC,yBAAyB,KAAK,SAAS;YAClD,UAAU,CAAC,yBAAyB,KAAK,IAAI;YAC7C,UAAU,CAAC,yBAAyB,IAAI,CAAC,EACzC,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,UAAU,CAAC,yBAAyB,GAAG,GAAG,CAAC;IACpD,CAAC;IAES,QAAQ,CAAC,UAA+B;QAChD,OAAO,UAAU,CAAC,cAAc,KAAK,uBAAuB,CAAC,MAAM,CAAC;IACtE,CAAC;IAES,eAAe,CACvB,UAA+B,EAC/B,IAAY;QAEZ,MAAM,YAAY,GAAS,UAAU,CAAC,YAAY,IAAI,IAAI,IAAI,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1E,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,GAAY;;QACxC,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;YAC9B,OAAO,QAAQ,CAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,MAAM,KAAI,GAAG,KAAK,IAAI,CAAC,SAAS,CAC3D,CAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,IAAI,KAAI,GAAG,CAAC,OAAO,CAClC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;QACpB,CAAC;QACD,OAAO,CAAC,GAAa,aAAb,GAAG,uBAAH,GAAG,CAAY,OAAO,KAAI,eAAe,CAAC;IACpD,CAAC;CACF"}
+{"version":3,"file":"ConversionUploadProvider.js","sourceRoot":"","sources":["../../../../../Server/Utils/Marketing/ConversionUploadProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,8CAA8C,CAAC;AAyCtD,MAAM,CAAC,OAAO,OAAgB,wBAAwB;IAAtD;QAKE;;;;WAIG;QACa,iBAAY,GAAW,GAAG,CAAC;IA4E7C,CAAC;IAxEC;;;;;;OAMG;IACI,aAAa,CAAC,UAA+B;QAClD,IACE,CAAC,oCAAoC,CAAC,QAAQ,CAC5C,UAAU,CAAC,cAAyC,CACrD,EACD,CAAC;YACD,OAAO;gBACL,MAAM,EAAE,mBACN,UAAU,CAAC,cAAc,IAAI,SAC/B,wCAAwC;gBACxC,WAAW,EAAE,IAAI;aAClB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;IAUS,UAAU,CAClB,UAA+B,EAC/B,UAAkB;QAElB,MAAM,QAAQ,GAAe,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvD,MAAM,KAAK,GAAY,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC5C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChE,CAAC;IAES,aAAa,CAAC,UAA+B;QACrD,IACE,UAAU,CAAC,yBAAyB,KAAK,SAAS;YAClD,UAAU,CAAC,yBAAyB,KAAK,IAAI;YAC7C,UAAU,CAAC,yBAAyB,IAAI,CAAC,EACzC,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,UAAU,CAAC,yBAAyB,GAAG,GAAG,CAAC;IACpD,CAAC;IAES,QAAQ,CAAC,UAA+B;QAChD,OAAO,UAAU,CAAC,cAAc,KAAK,uBAAuB,CAAC,MAAM,CAAC;IACtE,CAAC;IAES,eAAe,CACvB,UAA+B,EAC/B,IAAY;QAEZ,MAAM,YAAY,GAAS,UAAU,CAAC,YAAY,IAAI,IAAI,IAAI,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1E,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,GAAY;;QACxC,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;YAC9B,OAAO,QAAQ,CAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,MAAM,KAAI,GAAG,KAAK,IAAI,CAAC,SAAS,CAC3D,CAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,IAAI,KAAI,GAAG,CAAC,OAAO,CAClC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;QACpB,CAAC;QACD,OAAO,CAAC,GAAa,aAAb,GAAG,uBAAH,GAAG,CAAY,OAAO,KAAI,eAAe,CAAC;IACpD,CAAC;CACF"}

package/build/dist/Server/Utils/Marketing/Providers/GoogleAds.js

@@ -26,7 +26,7 @@ export default class GoogleAdsProvider extends ConversionUploadProvider {
             GoogleAdsOAuthRefreshToken &&
             GoogleAdsCustomerId);
     }
-    getSkipReason(conversion) {
+    getProviderSkipReason(conversion) {
         if (!this.getGoogleClickId(conversion)) {
             return {
                 reason: "No Google click id (gclid/wbraid/gbraid)",

package/build/dist/Server/Utils/Marketing/Providers/GoogleAds.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleAds.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/GoogleAds.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GoogleAds.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/GoogleAds.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js

@@ -28,7 +28,7 @@ export default class LinkedInProvider extends ConversionUploadProvider {
     isConfigured() {
         return Boolean(LinkedInConversionsAccessToken);
     }
-    getSkipReason(conversion) {
+    getProviderSkipReason(conversion) {
         if (!this.getClickId(conversion, "li_fat_id")) {
             return {
                 reason: "No LinkedIn click id (li_fat_id)",

package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"LinkedIn.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/LinkedIn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LinkedIn.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/LinkedIn.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Marketing/Providers/Meta.js

@@ -21,7 +21,7 @@ export default class MetaProvider extends ConversionUploadProvider {
     isConfigured() {
         return Boolean(MetaConversionsPixelId && MetaConversionsAccessToken);
     }
-    getSkipReason(conversion) {
+    getProviderSkipReason(conversion) {
         if (!this.getClickId(conversion, "fbclid")) {
             return {
                 reason: "No Meta click id (fbclid)",

package/build/dist/Server/Utils/Marketing/Providers/Meta.js.map

@@ -1 +1 @@
-{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Meta.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,wBAGN,MAAM,6BAA6B,CAAC;AAIrC,MAAM,kBAAkB,GAAW,KAAK,CAAC;AAEzC,gEAAgE;AAChE,MAAM,0BAA0B,GAAW,CAAC,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,wBAAwB;IAAlE;;QAC2B,QAAG,GAAW,MAAM,CAAC;QACrB,gBAAW,GAAW,MAAM,CAAC;IAuHxD,CAAC;IArHiB,YAAY;QAC1B,OAAO,OAAO,CAAC,sBAAsB,IAAI,0BAA0B,CAAC,CAAC;IACvE,CAAC;IAEe,aAAa,CAC3B,UAA+B;QAE/B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC3C,OAAO;gBACL,MAAM,EAAE,2BAA2B;gBACnC,WAAW,EAAE,IAAI;aAClB,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,0BAA0B,CAAC,EAAE,CAAC;YACjE,OAAO;gBACL,MAAM,EAAE,kDAAkD;gBAC1D,WAAW,EAAE,IAAI;aAClB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,KAAa;QAC7B,OAAO,MAAM;aACV,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;aAClC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACK,QAAQ,CAAC,MAAc,EAAE,OAAa;QAC5C,OAAO,QAAQ,OAAO,CAAC,OAAO,EAAE,IAAI,MAAM,EAAE,CAAC;IAC/C,CAAC;IAEe,KAAK,CAAC,MAAM,CAC1B,WAAuC;;QAEvC,MAAM,IAAI,GAAsB,WAAW,CAAC,GAAG,CAC7C,CAAC,UAA+B,EAAE,EAAE;YAClC,MAAM,OAAO,GAAS,UAAU,CAAC,YAAY,IAAI,IAAI,IAAI,EAAE,CAAC;YAC5D,MAAM,MAAM,GAAW,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEnE,MAAM,QAAQ,GAAe;gBAC3B,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;aACpC,CAAC;YAEF,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,QAAQ,GAAY,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAEpD,MAAM,OAAO,GAAe;gBAC1B,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU;gBAC1D,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;gBAChD,QAAQ,EAAE,UAAU,CAAC,EAAG,CAAC,QAAQ,EAAE;gBACnC;;;;mBAIG;gBACH,aAAa,EAAE,OAAO;gBACtB,SAAS,EAAE,QAAQ;aACpB,CAAC;YAEF,MAAM,UAAU,GAAuB,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAEtE;;;;eAIG;YACH,IAAI,CAAC,QAAQ,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC1C,OAAO,CAAC,aAAa,CAAC,GAAG;oBACvB,KAAK,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,CAAC;oBACtB,QAAQ,EAAE,KAAK;iBAChB,CAAC;YACJ,CAAC;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CACF,CAAC;QAEF,MAAM,GAAG,GAAW,8BAA8B,mBAAmB,IAAI,sBAAsB,SAAS,CAAC;QAEzG,MAAM,QAAQ,GAA8B,MAAM,KAAK,CAAC,IAAI,CAC1D,GAAG,EACH;YACE,IAAI,EAAE,IAAI;YACV,YAAY,EAAE,0BAA0B;SACzC,EACD;YACE,OAAO,EAAE,kBAAkB;SAC5B,CACF,CAAC;QAEF,MAAM,cAAc,GAClB,CAAC,MAAA,QAAQ,CAAC,IAAI,0CAAG,iBAAiB,CAAY,KAAI,CAAC,CAAC;QAEtD,IAAI,cAAc,KAAK,WAAW,CAAC,MAAM,EAAE,CAAC;YAC1C;;;eAGG;YACH,MAAM,IAAI,KAAK,CACb,iBAAiB,cAAc,OAAO,WAAW,CAAC,MAAM,SAAS,CAClE,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,iBAAiB,EAAE,IAAI,GAAG,EAAkB,EAAE,CAAC;IAC1D,CAAC;CACF"}
+{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Meta.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js

@@ -26,7 +26,7 @@ export default class MicrosoftAdsProvider extends ConversionUploadProvider {
             MicrosoftAdsCustomerId &&
             MicrosoftAdsAccountId);
     }
-    getSkipReason(conversion) {
+    getProviderSkipReason(conversion) {
         if (!this.getClickId(conversion, "msclkid")) {
             return {
                 reason: "No Microsoft click id (msclkid)",

package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js.map

@@ -1 +1 @@
-{"version":3,"file":"MicrosoftAds.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/MicrosoftAds.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MicrosoftAds.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/MicrosoftAds.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Marketing/Providers/Reddit.js

@@ -26,7 +26,7 @@ export default class RedditProvider extends ConversionUploadProvider {
             RedditAdsOAuthRefreshToken &&
             RedditAdsAccountId);
     }
-    getSkipReason(conversion) {
+    getProviderSkipReason(conversion) {
         if (!this.getClickId(conversion, "rdt_cid")) {
             return {
                 reason: "No Reddit click id (rdt_cid)",

package/build/dist/Server/Utils/Marketing/Providers/Reddit.js.map

@@ -1 +1 @@
-{"version":3,"file":"Reddit.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Reddit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Reddit.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Marketing/Providers/Reddit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,wBAGN,MAAM,6BAA6B,CAAC;AAIrC,MAAM,kBAAkB,GAAW,KAAK,CAAC;AAEzC,qDAAqD;AACrD,MAAM,4BAA4B,GAAW,CAAC,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,wBAAwB;IAApE;;QAC2B,QAAG,GAAW,QAAQ,CAAC;QACvB,gBAAW,GAAW,QAAQ,CAAC;QAEhD,sBAAiB,GAAkB,IAAI,CAAC;QACxC,+BAA0B,GAAW,CAAC,CAAC;IAiJjD,CAAC;IA/IiB,YAAY;QAC1B,OAAO,OAAO,CACZ,sBAAsB;YACpB,0BAA0B;YAC1B,0BAA0B;YAC1B,kBAAkB,CACrB,CAAC;IACJ,CAAC;IAEkB,qBAAqB,CACtC,UAA+B;QAE/B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC;YAC5C,OAAO;gBACL,MAAM,EAAE,8BAA8B;gBACtC,WAAW,EAAE,IAAI;aAClB,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,4BAA4B,CAAC,EAAE,CAAC;YACnE,OAAO;gBACL,MAAM,EAAE,oDAAoD;gBAC5D,WAAW,EAAE,IAAI;aAClB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,KAAa;QAC7B,OAAO,MAAM;aACV,UAAU,CAAC,QAAQ,CAAC;aACpB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;aAClC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,cAAc;;QAC1B,IACE,IAAI,CAAC,iBAAiB;YACtB,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,0BAA0B,EAC5C,CAAC;YACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAChC,CAAC;QAED,MAAM,MAAM,GAAoB,IAAI,eAAe,EAAE,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAGT,MAAM,KAAK,CAAC,IAAI,CACnB,4CAA4C,EAC5C,MAAM,CAAC,QAAQ,EAAE,EACjB;YACE,IAAI,EAAE;gBACJ,QAAQ,EAAE,sBAAsB;gBAChC,QAAQ,EAAE,0BAA0B;aACrC;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,mCAAmC;gBACnD,qEAAqE;gBACrE,YAAY,EAAE,iCAAiC;aAChD;YACD,OAAO,EAAE,kBAAkB;SAC5B,CACF,CAAC;QAEF,MAAM,WAAW,GAAuB,MAAA,QAAQ,CAAC,IAAI,0CAAE,YAAY,CAAC;QAEpE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC;QACrC,IAAI,CAAC,0BAA0B;YAC7B,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,UAAU,KAAI,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;QAEjE,OAAO,WAAW,CAAC;IACrB,CAAC;IAEe,KAAK,CAAC,MAAM,CAC1B,WAAuC;QAEvC,MAAM,WAAW,GAAW,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAExD,MAAM,MAAM,GAAsB,WAAW,CAAC,GAAG,CAC/C,CAAC,UAA+B,EAAE,EAAE;YAClC,MAAM,OAAO,GAAS,UAAU,CAAC,YAAY,IAAI,IAAI,IAAI,EAAE,CAAC;YAE5D,MAAM,aAAa,GAAe;gBAChC,8DAA8D;gBAC9D,aAAa,EAAE,UAAU,CAAC,EAAG,CAAC,QAAQ,EAAE;aACzC,CAAC;YAEF,MAAM,UAAU,GAAuB,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAEtE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,aAAa,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC;gBAC5C,aAAa,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;YACpC,CAAC;YAED,MAAM,OAAO,GAAe;gBAC1B,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE;gBAC/B,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,EAAE;gBACtD,UAAU,EAAE;oBACV,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;iBACjE;gBACD,cAAc,EAAE,aAAa;aAC9B,CAAC;YAEF,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,OAAO,CAAC,MAAM,CAAC,GAAG;oBAChB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;iBACxC,CAAC;YACJ,CAAC;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CACF,CAAC;QAEF,MAAM,KAAK,CAAC,IAAI,CACd,0DAA0D,kBAAkB,EAAE,EAC9E;YACE,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,MAAM;SACf,EACD;YACE,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,WAAW,EAAE;gBACtC,cAAc,EAAE,kBAAkB;aACnC;YACD,OAAO,EAAE,kBAAkB;SAC5B,CACF,CAAC;QAEF;;;;WAIG;QACH,OAAO,EAAE,iBAAiB,EAAE,IAAI,GAAG,EAAkB,EAAE,CAAC;IAC1D,CAAC;CACF"}

package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js

@@ -12,44 +12,48 @@ import EvaluateOverTime from "./EvaluateOverTime";
 import { CheckOn, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
 import Typeof from "../../../../Types/Typeof";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
-import logger from "../../Logger";
 export default class APIRequestCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
         // Server Monitoring Checks
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         let threshold = input.criteriaFilter.value;
-        let overTimeValue = undefined;
-        if (input.criteriaFilter.evaluateOverTime &&
-            input.criteriaFilter.evaluateOverTimeOptions) {
-            try {
-                overTimeValue = await EvaluateOverTime.getValueOverTime({
-                    projectId: input.dataToProcess.projectId,
-                    monitorId: input.dataToProcess.monitorId,
-                    evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
-                    metricType: input.criteriaFilter.checkOn,
-                    miscData: input.criteriaFilter.serverMonitorOptions,
-                });
-                if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
-                    overTimeValue = undefined;
-                }
-            }
-            catch (err) {
-                logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
-                logger.error(err);
-                overTimeValue = undefined;
-            }
+        const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
+            projectId: input.dataToProcess.projectId,
+            monitorId: input.dataToProcess.monitorId,
+            criteriaFilter: input.criteriaFilter,
+            /*
+             * Only the disk-usage series carries a diskPath attribute, so
+             * scoping any other series by it would filter against an attribute
+             * no row has - and an empty window now means "cannot judge yet"
+             * rather than "compare the live value", which would silence the
+             * filter outright.
+             */
+            miscData: input.criteriaFilter.checkOn === CheckOn.DiskUsagePercent
+                ? input.criteriaFilter.serverMonitorOptions
+                : undefined,
+            monitoringInterval: input.monitoringInterval,
+        });
+        /*
+         * The window could not back this over-time filter (nothing recorded yet,
+         * or the monitor has not been running long enough to cover it). Return
+         * the decision the no-data policy already made instead of falling
+         * through to the value that arrived with this one check - that fallback
+         * is what let "all values over the last N minutes" fire off a single
+         * bad reading.
+         */
+        if (overTime.earlyReturn) {
+            return overTime.earlyReturn.result;
         }
+        const overTimeValue = overTime.value;
         if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
-            const currentIsOnline = overTimeValue ||
-                input.dataToProcess.isOnline;
+            const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : input.dataToProcess.isOnline;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsOnline,
                 criteriaFilter: input.criteriaFilter,
             });
         }
         if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
-            const currentIsTimeout = overTimeValue ||
-                input.dataToProcess.isTimeout;
+            const currentIsTimeout = (_b = overTimeValue) !== null && _b !== void 0 ? _b : input.dataToProcess.isTimeout;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsTimeout,
                 criteriaFilter: input.criteriaFilter,
@@ -58,8 +62,7 @@ export default class APIRequestCriteria {
         // check response time filter
         if (input.criteriaFilter.checkOn === CheckOn.ResponseTime) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const value = overTimeValue ||
-                input.dataToProcess.responseTimeInMs;
+            const value = (_c = overTimeValue) !== null && _c !== void 0 ? _c : input.dataToProcess.responseTimeInMs;
             return CompareCriteria.compareCriteriaNumbers({
                 value: value,
                 threshold: threshold,
@@ -72,7 +75,7 @@ export default class APIRequestCriteria {
             const currentValue = input.criteriaFilter.checkOn === CheckOn.PortDnsLookupTime
                 ? portTimings === null || portTimings === void 0 ? void 0 : portTimings.dnsLookupInMs
                 : portTimings === null || portTimings === void 0 ? void 0 : portTimings.tcpConnectInMs;
-            const value = (_a = overTimeValue) !== null && _a !== void 0 ? _a : currentValue;
+            const value = (_d = overTimeValue) !== null && _d !== void 0 ? _d : currentValue;
             if (value === undefined) {
                 return null;
             }
@@ -85,8 +88,8 @@ export default class APIRequestCriteria {
         }
         // check packet loss (Ping/IP monitors with multi-packet checks)
         if (input.criteriaFilter.checkOn === CheckOn.PacketLossPercent) {
-            const packetLossPercent = (_b = input.dataToProcess.pingResponse) === null || _b === void 0 ? void 0 : _b.packetLossPercent;
-            const value = overTimeValue || packetLossPercent;
+            const packetLossPercent = (_e = input.dataToProcess.pingResponse) === null || _e === void 0 ? void 0 : _e.packetLossPercent;
+            const value = (_f = overTimeValue) !== null && _f !== void 0 ? _f : packetLossPercent;
             if (value === undefined) {
                 return null;
             }
@@ -99,8 +102,8 @@ export default class APIRequestCriteria {
         }
         // check jitter (Ping/IP monitors with multi-packet checks)
         if (input.criteriaFilter.checkOn === CheckOn.Jitter) {
-            const jitterInMs = (_c = input.dataToProcess.pingResponse) === null || _c === void 0 ? void 0 : _c.jitterInMs;
-            const value = overTimeValue || jitterInMs;
+            const jitterInMs = (_g = input.dataToProcess.pingResponse) === null || _g === void 0 ? void 0 : _g.jitterInMs;
+            const value = (_h = overTimeValue) !== null && _h !== void 0 ? _h : jitterInMs;
             if (value === undefined) {
                 return null;
             }
@@ -115,8 +118,7 @@ export default class APIRequestCriteria {
         if (input.criteriaFilter.checkOn === CheckOn.ResponseStatusCode &&
             input.dataToProcess.responseCode) {
             threshold = CompareCriteria.convertToNumber(threshold);
-            const value = overTimeValue ||
-                input.dataToProcess.responseCode;
+            const value = (_j = overTimeValue) !== null && _j !== void 0 ? _j : input.dataToProcess.responseCode;
             return CompareCriteria.compareCriteriaNumbers({
                 value: value,
                 threshold: threshold,

package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"APIRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/APIRequestCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"APIRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/APIRequestCriteria.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.js

@@ -11,36 +11,33 @@ import CompareCriteria from "./CompareCriteria";
 import { CheckOn, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
 import EvaluateOverTime from "./EvaluateOverTime";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
-import logger from "../../Logger";
 export default class DnsMonitorCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
+        var _a, _b;
         let threshold = input.criteriaFilter.value;
         const dataToProcess = input.dataToProcess;
         const dnsResponse = dataToProcess.dnsResponse;
-        let overTimeValue = undefined;
-        if (input.criteriaFilter.evaluateOverTime &&
-            input.criteriaFilter.evaluateOverTimeOptions) {
-            try {
-                overTimeValue = await EvaluateOverTime.getValueOverTime({
-                    projectId: input.dataToProcess.projectId,
-                    monitorId: input.dataToProcess.monitorId,
-                    evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
-                    metricType: input.criteriaFilter.checkOn,
-                });
-                if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
-                    overTimeValue = undefined;
-                }
-            }
-            catch (err) {
-                logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
-                logger.error(err);
-                overTimeValue = undefined;
-            }
+        const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
+            projectId: input.dataToProcess.projectId,
+            monitorId: input.dataToProcess.monitorId,
+            criteriaFilter: input.criteriaFilter,
+            monitoringInterval: input.monitoringInterval,
+        });
+        /*
+         * The window could not back this over-time filter (nothing recorded yet,
+         * or the monitor has not been running long enough to cover it). Return
+         * the decision the no-data policy already made instead of falling
+         * through to the value that arrived with this one check - that fallback
+         * is what let "all values over the last N minutes" fire off a single
+         * bad reading.
+         */
+        if (overTime.earlyReturn) {
+            return overTime.earlyReturn.result;
         }
+        const overTimeValue = overTime.value;
         // Check if DNS is online
         if (input.criteriaFilter.checkOn === CheckOn.DnsIsOnline) {
-            const currentIsOnline = overTimeValue ||
-                input.dataToProcess.isOnline;
+            const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : input.dataToProcess.isOnline;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsOnline,
                 criteriaFilter: input.criteriaFilter,
@@ -52,9 +49,8 @@ export default class DnsMonitorCriteria {
             if (threshold === null || threshold === undefined) {
                 return null;
             }
-            const currentResponseTime = overTimeValue ||
-                (dnsResponse === null || dnsResponse === void 0 ? void 0 : dnsResponse.responseTimeInMs) ||
-                input.dataToProcess.responseTimeInMs;
+            const currentResponseTime = (_b = overTimeValue) !== null && _b !== void 0 ? _b : ((dnsResponse === null || dnsResponse === void 0 ? void 0 : dnsResponse.responseTimeInMs) ||
+                input.dataToProcess.responseTimeInMs);
             if (currentResponseTime === null || currentResponseTime === undefined) {
                 return null;
             }

package/build/dist/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"DnsMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/DnsMonitorCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DnsMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/DnsMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,0CAA0C,CAAC;AAGlD,OAAO,gBAA2C,MAAM,oBAAoB,CAAC;AAC7E,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEjB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAUtD;;QACC,IAAI,SAAS,GACX,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAE7B,MAAM,aAAa,GACjB,KAAK,CAAC,aAAqC,CAAC;QAE9C,MAAM,WAAW,GACf,aAAa,CAAC,WAAW,CAAC;QAE5B,MAAM,QAAQ,GACZ,MAAM,gBAAgB,CAAC,iCAAiC,CAAC;YACvD,SAAS,EAAG,KAAK,CAAC,aAAsC,CAAC,SAAS;YAClE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,SAAU;YACzC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;SAC7C,CAAC,CAAC;QAEL;;;;;;;WAOG;QACH,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC;QACrC,CAAC;QAED,MAAM,aAAa,GAIH,QAAQ,CAAC,KAAK,CAAC;QAE/B,yBAAyB;QACzB,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC;YACzD,MAAM,eAAe,GACnB,MAAC,aAAgC,mCAChC,KAAK,CAAC,aAAsC,CAAC,QAAQ,CAAC;YAEzD,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,eAAe;gBACtB,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,0BAA0B;QAC1B,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7D,SAAS,GAAG,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEvD,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,mBAAmB,GACvB,MAAC,aAA+B,mCAChC,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,gBAAgB;gBAC3B,KAAK,CAAC,aAAsC,CAAC,gBAAgB,CAAC,CAAC;YAEpE,IAAI,mBAAmB,KAAK,IAAI,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;gBACtE,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,mBAAmB;gBAC1B,SAAS,EAAE,SAAmB;gBAC9B,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,6BAA6B;QAC7B,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7D,MAAM,MAAM,GAAY,OAAO,CAC7B,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,KAAI,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CACvD,CAAC;YAEF,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YACtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;gBACrB,OAAO,kCAAkC,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,MAAM,IAAI,OAAO,EAAE,CAAC;gBACvB,OAAO,qCAAqC,CAAC;YAC/C,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wBAAwB;QACxB,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3D,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YACtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa,MAAK,SAAS,EAAE,CAAC;gBAC7C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,WAAW,CAAC,aAAa,IAAI,MAAM,EAAE,CAAC;gBACxC,OAAO,kBAAkB,CAAC;YAC5B,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,OAAO,EAAE,CAAC;gBAC1C,OAAO,sBAAsB,CAAC;YAChC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAED,yBAAyB;QACzB,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5D,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAA,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9D,OAAO,IAAI,CAAC;YACd,CAAC;YAED,iDAAiD;YACjD,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACzC,MAAM,WAAW,GAAW,MAAM,CAAC,KAAK,CAAC;gBAEzC,+BAA+B;gBAC/B,IACE,OAAO,SAAS,KAAK,QAAQ;oBAC7B,CAAC,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAC5D,CAAC;oBACD,MAAM,gBAAgB,GACpB,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;oBAE7C,IAAI,gBAAgB,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;wBAC7D,MAAM,MAAM,GACV,eAAe,CAAC,sBAAsB,CAAC;4BACrC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC;4BAC1B,SAAS,EAAE,gBAAgB;4BAC3B,cAAc,EAAE,KAAK,CAAC,cAAc;yBACrC,CAAC,CAAC;wBAEL,IAAI,MAAM,EAAE,CAAC;4BACX,OAAO,eAAe,MAAM,CAAC,IAAI,MAAM,MAAM,EAAE,CAAC;wBAClD,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,oBAAoB;gBACpB,MAAM,MAAM,GAAkB,eAAe,CAAC,sBAAsB,CAAC;oBACnE,KAAK,EAAE,WAAW;oBAClB,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;oBAC5B,cAAc,EAAE,KAAK,CAAC,cAAc;iBACrC,CAAC,CAAC;gBAEH,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,eAAe,MAAM,CAAC,IAAI,MAAM,MAAM,EAAE,CAAC;gBAClD,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7KqB;IADnB,WAAW,EAAE;;;;kEA6Kb"}

package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js

@@ -11,32 +11,30 @@ import CompareCriteria from "./CompareCriteria";
 import { CheckOn, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
 import EvaluateOverTime from "./EvaluateOverTime";
-import logger from "../../Logger";
 export default class DomainMonitorCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
+        var _a, _b;
         let threshold = input.criteriaFilter.value;
         const dataToProcess = input.dataToProcess;
         const domainResponse = dataToProcess.domainResponse;
-        let overTimeValue = undefined;
-        if (input.criteriaFilter.evaluateOverTime &&
-            input.criteriaFilter.evaluateOverTimeOptions) {
-            try {
-                overTimeValue = await EvaluateOverTime.getValueOverTime({
-                    projectId: dataToProcess.projectId,
-                    monitorId: input.dataToProcess.monitorId,
-                    evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
-                    metricType: input.criteriaFilter.checkOn,
-                });
-                if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
-                    overTimeValue = undefined;
-                }
-            }
-            catch (err) {
-                logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
-                logger.error(err);
-                overTimeValue = undefined;
-            }
+        const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
+            projectId: dataToProcess.projectId,
+            monitorId: input.dataToProcess.monitorId,
+            criteriaFilter: input.criteriaFilter,
+            monitoringInterval: input.monitoringInterval,
+        });
+        /*
+         * The window could not back this over-time filter (nothing recorded yet,
+         * or the monitor has not been running long enough to cover it). Return
+         * the decision the no-data policy already made instead of falling
+         * through to the value that arrived with this one check - that fallback
+         * is what let "all values over the last N minutes" fire off a single
+         * bad reading.
+         */
+        if (overTime.earlyReturn) {
+            return overTime.earlyReturn.result;
         }
+        const overTimeValue = overTime.value;
         /*
          * Whether the registration lookup itself succeeded. Without this, a
          * domain whose TLD has no working WHOIS or RDAP service produces a
@@ -45,14 +43,14 @@ export default class DomainMonitorCriteria {
          * made an unsupported TLD look healthy.
          */
         if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
-            const currentIsOnline = overTimeValue || dataToProcess.isOnline;
+            const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : dataToProcess.isOnline;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsOnline,
                 criteriaFilter: input.criteriaFilter,
             });
         }
         if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
-            const currentIsTimeout = overTimeValue || dataToProcess.isTimeout;
+            const currentIsTimeout = (_b = overTimeValue) !== null && _b !== void 0 ? _b : dataToProcess.isTimeout;
             return CompareCriteria.compareCriteriaBoolean({
                 value: currentIsTimeout,
                 criteriaFilter: input.criteriaFilter,

package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"DomainMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/DomainMonitorCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DomainMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/DomainMonitorCriteria.ts"],"names":[],"mappings":"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"}