@oneuptime/common 7.0.4188 → 7.0.4194

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts +11 -0
  2. package/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts +4 -1
  3. package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +12 -0
  4. package/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts +12 -0
  5. package/Types/Monitor/CriteriaFilter.ts +5 -0
  6. package/Types/Probe/ProbeMonitorResponse.ts +1 -0
  7. package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js +8 -0
  8. package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map +1 -1
  9. package/build/dist/Server/Utils/Monitor/Criteria/EvaluateOverTime.js +2 -1
  10. package/build/dist/Server/Utils/Monitor/Criteria/EvaluateOverTime.js.map +1 -1
  11. package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js +9 -0
  12. package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map +1 -1
  13. package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js +9 -0
  14. package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js.map +1 -1
  15. package/build/dist/Types/Monitor/CriteriaFilter.js +4 -0
  16. package/build/dist/Types/Monitor/CriteriaFilter.js.map +1 -1
  17. package/package.json +2 -2
package/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts CHANGED
@@ -62,6 +62,17 @@ export default class APIRequestCriteria {
62
62
  });
63
63
  }
64
64
 
65
+ if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
66
+ const currentIsTimeout: boolean | Array<boolean> =
67
+ (overTimeValue as Array<boolean>) ||
68
+ (input.dataToProcess as ProbeMonitorResponse).isTimeout;
69
+
70
+ return CompareCriteria.compareCriteriaBoolean({
71
+ value: currentIsTimeout,
72
+ criteriaFilter: input.criteriaFilter,
73
+ });
74
+ }
75
+
65
76
  // check response time filter
66
77
  if (input.criteriaFilter.checkOn === CheckOn.ResponseTime) {
67
78
  threshold = CompareCriteria.convertToNumber(threshold);
package/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts CHANGED
@@ -58,7 +58,10 @@ export default class EvaluateOverTime {
58
58
 
59
59
  const values: Array<number | boolean> = monitorMetricsItems
60
60
  .map((item: Metric) => {
61
- if (data.metricType === CheckOn.IsOnline) {
61
+ if (
62
+ data.metricType === CheckOn.IsOnline ||
63
+ data.metricType === CheckOn.IsRequestTimeout
64
+ ) {
62
65
  return item.value === 1;
63
66
  }
64
67
 
package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts CHANGED
@@ -75,6 +75,18 @@ export default class IncomingRequestCriteria {
75
75
  });
76
76
  }
77
77
 
78
+ // timeout.
79
+ if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
80
+ const currentIsTimeout: boolean | Array<boolean> =
81
+ (overTimeValue as Array<boolean>) ||
82
+ (input.dataToProcess as ProbeMonitorResponse).isTimeout;
83
+
84
+ return CompareCriteria.compareCriteriaBoolean({
85
+ value: currentIsTimeout,
86
+ criteriaFilter: input.criteriaFilter,
87
+ });
88
+ }
89
+
78
90
  // All incoming request related checks
79
91
 
80
92
  if (input.criteriaFilter.checkOn === CheckOn.IncomingRequest) {
package/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts CHANGED
@@ -65,6 +65,18 @@ export default class ServerMonitorCriteria {
65
65
  });
66
66
  }
67
67
 
68
+ // timeout.
69
+ if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
70
+ const currentIsTimeout: boolean | Array<boolean> =
71
+ (overTimeValue as Array<boolean>) ||
72
+ (input.dataToProcess as ProbeMonitorResponse).isTimeout;
73
+
74
+ return CompareCriteria.compareCriteriaBoolean({
75
+ value: currentIsTimeout,
76
+ criteriaFilter: input.criteriaFilter,
77
+ });
78
+ }
79
+
68
80
  if (input.criteriaFilter.checkOn === CheckOn.IsValidCertificate) {
69
81
  const isValidCertificate: boolean = Boolean(
70
82
  sslResponse &&
package/Types/Monitor/CriteriaFilter.ts CHANGED
@@ -22,6 +22,7 @@ export enum CheckOn {
22
22
  IsExpiredCertificate = "Is Expired Certificate",
23
23
  IsValidCertificate = "Is Valid Certificate",
24
24
  IsNotAValidCertificate = "Is Not A Valid Certificate",
25
+ IsRequestTimeout = "Is Request Timeout",
25
26
 
26
27
  // Custom code or synthetic monitor.
27
28
  ResultValue = "Result Value",
@@ -121,6 +122,10 @@ export class CriteriaFilterUtil {
121
122
  return false;
122
123
  }
123
124
 
125
+ if (checkOn === CheckOn.IsRequestTimeout) {
126
+ return false;
127
+ }
128
+
124
129
  if (
125
130
  checkOn === CheckOn.IsValidCertificate ||
126
131
  checkOn === CheckOn.IsSelfSignedCertificate ||
package/Types/Probe/ProbeMonitorResponse.ts CHANGED
@@ -26,4 +26,5 @@ export default interface ProbeMonitorResponse {
26
26
  syntheticMonitorResponse?: Array<SyntheticMonitorResponse> | undefined;
27
27
  customCodeMonitorResponse?: CustomCodeMonitorResponse | undefined;
28
28
  monitoredAt: Date;
29
+ isTimeout?: boolean | undefined;
29
30
  }
package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js CHANGED
@@ -46,6 +46,14 @@ export default class APIRequestCriteria {
46
46
  criteriaFilter: input.criteriaFilter,
47
47
  });
48
48
  }
49
+ if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
50
+ const currentIsTimeout = overTimeValue ||
51
+ input.dataToProcess.isTimeout;
52
+ return CompareCriteria.compareCriteriaBoolean({
53
+ value: currentIsTimeout,
54
+ criteriaFilter: input.criteriaFilter,
55
+ });
56
+ }
49
57
  // check response time filter
50
58
  if (input.criteriaFilter.checkOn === CheckOn.ResponseTime) {
51
59
  threshold = CompareCriteria.convertToNumber(threshold);
package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"APIRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/APIRequestCriteria.ts"],"names":[],"mappings":"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"}
1
+ {"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/EvaluateOverTime.js CHANGED
@@ -42,7 +42,8 @@ export default class EvaluateOverTime {
42
42
  });
43
43
  const values = monitorMetricsItems
44
44
  .map((item) => {
45
- if (data.metricType === CheckOn.IsOnline) {
45
+ if (data.metricType === CheckOn.IsOnline ||
46
+ data.metricType === CheckOn.IsRequestTimeout) {
46
47
  return item.value === 1;
47
48
  }
48
49
  return item.value;
package/build/dist/Server/Utils/Monitor/Criteria/EvaluateOverTime.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EvaluateOverTime.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/EvaluateOverTime.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EvaluateOverTime.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/EvaluateOverTime.ts"],"names":[],"mappings":"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"}
package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js CHANGED
@@ -51,6 +51,15 @@ export default class IncomingRequestCriteria {
51
51
  criteriaFilter: input.criteriaFilter,
52
52
  });
53
53
  }
54
+ // timeout.
55
+ if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
56
+ const currentIsTimeout = overTimeValue ||
57
+ input.dataToProcess.isTimeout;
58
+ return CompareCriteria.compareCriteriaBoolean({
59
+ value: currentIsTimeout,
60
+ criteriaFilter: input.criteriaFilter,
61
+ });
62
+ }
54
63
  // All incoming request related checks
55
64
  if (input.criteriaFilter.checkOn === CheckOn.IncomingRequest) {
56
65
  logger.debug("Checking IncomingRequest for Monitor: " +
package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":"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"}
package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js CHANGED
@@ -46,6 +46,15 @@ export default class ServerMonitorCriteria {
46
46
  criteriaFilter: input.criteriaFilter,
47
47
  });
48
48
  }
49
+ // timeout.
50
+ if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
51
+ const currentIsTimeout = overTimeValue ||
52
+ input.dataToProcess.isTimeout;
53
+ return CompareCriteria.compareCriteriaBoolean({
54
+ value: currentIsTimeout,
55
+ criteriaFilter: input.criteriaFilter,
56
+ });
57
+ }
49
58
  if (input.criteriaFilter.checkOn === CheckOn.IsValidCertificate) {
50
59
  const isValidCertificate = Boolean(sslResponse &&
51
60
  dataToProcess.isOnline &&
package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":"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"}
package/build/dist/Types/Monitor/CriteriaFilter.js CHANGED
@@ -23,6 +23,7 @@ export var CheckOn;
23
23
  CheckOn["IsExpiredCertificate"] = "Is Expired Certificate";
24
24
  CheckOn["IsValidCertificate"] = "Is Valid Certificate";
25
25
  CheckOn["IsNotAValidCertificate"] = "Is Not A Valid Certificate";
26
+ CheckOn["IsRequestTimeout"] = "Is Request Timeout";
26
27
  // Custom code or synthetic monitor.
27
28
  CheckOn["ResultValue"] = "Result Value";
28
29
  CheckOn["Error"] = "Error";
@@ -86,6 +87,9 @@ export class CriteriaFilterUtil {
86
87
  if (checkOn === CheckOn.IsOnline) {
87
88
  return false;
88
89
  }
90
+ if (checkOn === CheckOn.IsRequestTimeout) {
91
+ return false;
92
+ }
89
93
  if (checkOn === CheckOn.IsValidCertificate ||
90
94
  checkOn === CheckOn.IsSelfSignedCertificate ||
91
95
  checkOn === CheckOn.IsExpiredCertificate ||
package/build/dist/Types/Monitor/CriteriaFilter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CriteriaFilter.js","sourceRoot":"","sources":["../../../../Types/Monitor/CriteriaFilter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CriteriaFilter.js","sourceRoot":"","sources":["../../../../Types/Monitor/CriteriaFilter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oneuptime/common",
3
- "version": "7.0.4188",
3
+ "version": "7.0.4194",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -77,7 +77,7 @@
77
77
  "airtable": "^0.12.2",
78
78
  "axios": "^1.7.2",
79
79
  "bullmq": "^5.3.3",
80
- "Common": "npm:@oneuptime/common@7.0.4188",
80
+ "Common": "npm:@oneuptime/common@7.0.4194",
81
81
  "cookie-parser": "^1.4.7",
82
82
  "cors": "^2.8.5",
83
83
  "cron-parser": "^4.8.1",