@oneuptime/common 7.0.4081 → 7.0.4088
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.
- package/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts +21 -12
- package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +19 -11
- package/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts +21 -12
- package/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts +20 -12
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js +18 -10
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js +16 -9
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js +17 -9
- package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js +17 -10
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js.map +1 -1
- package/package.json +2 -2
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
|
|
11
11
|
import Typeof from "Common/Types/Typeof";
|
|
12
12
|
import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
13
|
+
import logger from "../../Logger";
|
|
13
14
|
|
|
14
15
|
export default class APIRequestCriteria {
|
|
15
16
|
@CaptureSpan()
|
|
@@ -29,19 +30,27 @@ export default class APIRequestCriteria {
|
|
|
29
30
|
input.criteriaFilter.eveluateOverTime &&
|
|
30
31
|
input.criteriaFilter.evaluateOverTimeOptions
|
|
31
32
|
) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
33
|
+
try {
|
|
34
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
35
|
+
monitorId: input.dataToProcess.monitorId!,
|
|
36
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
37
|
+
metricType: input.criteriaFilter.checkOn,
|
|
38
|
+
miscData: input.criteriaFilter.serverMonitorOptions as JSONObject,
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
42
44
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
+
if (overTimeValue === undefined) {
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
} catch (err) {
|
|
49
|
+
logger.error(
|
|
50
|
+
`Error in getting over time value for ${input.criteriaFilter.checkOn}`,
|
|
51
|
+
);
|
|
52
|
+
logger.error(err);
|
|
53
|
+
overTimeValue = undefined;
|
|
45
54
|
}
|
|
46
55
|
}
|
|
47
56
|
|
|
@@ -44,18 +44,26 @@ export default class IncomingRequestCriteria {
|
|
|
44
44
|
input.criteriaFilter.eveluateOverTime &&
|
|
45
45
|
input.criteriaFilter.evaluateOverTimeOptions
|
|
46
46
|
) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
47
|
+
try {
|
|
48
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
49
|
+
monitorId: input.dataToProcess.monitorId!,
|
|
50
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
51
|
+
metricType: input.criteriaFilter.checkOn,
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
56
57
|
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
if (overTimeValue === undefined) {
|
|
59
|
+
return null;
|
|
60
|
+
}
|
|
61
|
+
} catch (err) {
|
|
62
|
+
logger.error(
|
|
63
|
+
`Error in getting over time value for ${input.criteriaFilter.checkOn}`,
|
|
64
|
+
);
|
|
65
|
+
logger.error(err);
|
|
66
|
+
overTimeValue = undefined;
|
|
59
67
|
}
|
|
60
68
|
}
|
|
61
69
|
|
|
@@ -10,6 +10,7 @@ import SslMonitorResponse from "Common/Types/Monitor/SSLMonitor/SslMonitorRespon
|
|
|
10
10
|
import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
|
|
11
11
|
import EvaluateOverTime from "./EvaluateOverTime";
|
|
12
12
|
import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
13
|
+
import logger from "../../Logger";
|
|
13
14
|
|
|
14
15
|
export default class ServerMonitorCriteria {
|
|
15
16
|
@CaptureSpan()
|
|
@@ -33,18 +34,26 @@ export default class ServerMonitorCriteria {
|
|
|
33
34
|
input.criteriaFilter.eveluateOverTime &&
|
|
34
35
|
input.criteriaFilter.evaluateOverTimeOptions
|
|
35
36
|
) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
37
|
+
try {
|
|
38
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
39
|
+
monitorId: input.dataToProcess.monitorId!,
|
|
40
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
41
|
+
metricType: input.criteriaFilter.checkOn,
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
45
|
+
return null;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
if (overTimeValue === undefined) {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
} catch (err) {
|
|
52
|
+
logger.error(
|
|
53
|
+
`Error in getting over time value for ${input.criteriaFilter.checkOn}`,
|
|
54
|
+
);
|
|
55
|
+
logger.error(err);
|
|
56
|
+
overTimeValue = undefined;
|
|
48
57
|
}
|
|
49
58
|
}
|
|
50
59
|
|
|
@@ -32,19 +32,27 @@ export default class ServerMonitorCriteria {
|
|
|
32
32
|
input.criteriaFilter.eveluateOverTime &&
|
|
33
33
|
input.criteriaFilter.evaluateOverTimeOptions
|
|
34
34
|
) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
35
|
+
try {
|
|
36
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
37
|
+
monitorId: input.dataToProcess.monitorId!,
|
|
38
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
39
|
+
metricType: input.criteriaFilter.checkOn,
|
|
40
|
+
miscData: input.criteriaFilter.serverMonitorOptions as JSONObject,
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
45
46
|
|
|
46
|
-
|
|
47
|
-
|
|
47
|
+
if (overTimeValue === undefined) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
} catch (err) {
|
|
51
|
+
logger.error(
|
|
52
|
+
`Error in getting over time value for ${input.criteriaFilter.checkOn}`,
|
|
53
|
+
);
|
|
54
|
+
logger.error(err);
|
|
55
|
+
overTimeValue = undefined;
|
|
48
56
|
}
|
|
49
57
|
}
|
|
50
58
|
|
|
@@ -12,6 +12,7 @@ import EvaluateOverTime from "./EvaluateOverTime";
|
|
|
12
12
|
import { CheckOn, FilterType, } from "Common/Types/Monitor/CriteriaFilter";
|
|
13
13
|
import Typeof from "Common/Types/Typeof";
|
|
14
14
|
import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
15
|
+
import logger from "../../Logger";
|
|
15
16
|
export default class APIRequestCriteria {
|
|
16
17
|
static async isMonitorInstanceCriteriaFilterMet(input) {
|
|
17
18
|
// Server Monitoring Checks
|
|
@@ -19,17 +20,24 @@ export default class APIRequestCriteria {
|
|
|
19
20
|
let overTimeValue = undefined;
|
|
20
21
|
if (input.criteriaFilter.eveluateOverTime &&
|
|
21
22
|
input.criteriaFilter.evaluateOverTimeOptions) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
23
|
+
try {
|
|
24
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
25
|
+
monitorId: input.dataToProcess.monitorId,
|
|
26
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
27
|
+
metricType: input.criteriaFilter.checkOn,
|
|
28
|
+
miscData: input.criteriaFilter.serverMonitorOptions,
|
|
29
|
+
});
|
|
30
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
if (overTimeValue === undefined) {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
30
36
|
}
|
|
31
|
-
|
|
32
|
-
|
|
37
|
+
catch (err) {
|
|
38
|
+
logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
|
|
39
|
+
logger.error(err);
|
|
40
|
+
overTimeValue = undefined;
|
|
33
41
|
}
|
|
34
42
|
}
|
|
35
43
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/APIRequestCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,qCAAqC,CAAC;AAE7C,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,WAAW,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"APIRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/APIRequestCriteria.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,16 +25,23 @@ export default class IncomingRequestCriteria {
|
|
|
25
25
|
let overTimeValue = undefined;
|
|
26
26
|
if (input.criteriaFilter.eveluateOverTime &&
|
|
27
27
|
input.criteriaFilter.evaluateOverTimeOptions) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
try {
|
|
29
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
30
|
+
monitorId: input.dataToProcess.monitorId,
|
|
31
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
32
|
+
metricType: input.criteriaFilter.checkOn,
|
|
33
|
+
});
|
|
34
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
if (overTimeValue === undefined) {
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
35
40
|
}
|
|
36
|
-
|
|
37
|
-
|
|
41
|
+
catch (err) {
|
|
42
|
+
logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
|
|
43
|
+
logger.error(err);
|
|
44
|
+
overTimeValue = undefined;
|
|
38
45
|
}
|
|
39
46
|
}
|
|
40
47
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAE3C,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,qCAAqC,CAAC;AAE7C,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAEtB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAGtD;QACC,2BAA2B;QAE3B,MAAM,CAAC,KAAK,CACV,gDAAgD;YAC9C,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC3C,CAAC;QAEF,MAAM,CAAC,KAAK,CACV,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CACnE,CAAC;QAEF,MAAM,CAAC,KAAK,CACV,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CACpE,CAAC;QAEF,IAAI,KAAK,GAAgC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAEpE,IAAI,aAAa,GACf,SAAS,CAAC;QAEZ,IACE,KAAK,CAAC,cAAc,CAAC,gBAAgB;YACrC,KAAK,CAAC,cAAc,CAAC,uBAAuB,EAC5C,CAAC;YACD,aAAa,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import OneUptimeDate from "Common/Types/Date";
|
|
|
12
12
|
import { CheckOn, FilterType, } from "Common/Types/Monitor/CriteriaFilter";
|
|
13
13
|
import EvaluateOverTime from "./EvaluateOverTime";
|
|
14
14
|
import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
15
|
+
import logger from "../../Logger";
|
|
15
16
|
export default class ServerMonitorCriteria {
|
|
16
17
|
static async isMonitorInstanceCriteriaFilterMet(input) {
|
|
17
18
|
let threshold = input.criteriaFilter.value;
|
|
@@ -20,16 +21,23 @@ export default class ServerMonitorCriteria {
|
|
|
20
21
|
let overTimeValue = undefined;
|
|
21
22
|
if (input.criteriaFilter.eveluateOverTime &&
|
|
22
23
|
input.criteriaFilter.evaluateOverTimeOptions) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
try {
|
|
25
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
26
|
+
monitorId: input.dataToProcess.monitorId,
|
|
27
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
28
|
+
metricType: input.criteriaFilter.checkOn,
|
|
29
|
+
});
|
|
30
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
if (overTimeValue === undefined) {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
30
36
|
}
|
|
31
|
-
|
|
32
|
-
|
|
37
|
+
catch (err) {
|
|
38
|
+
logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
|
|
39
|
+
logger.error(err);
|
|
40
|
+
overTimeValue = undefined;
|
|
33
41
|
}
|
|
34
42
|
}
|
|
35
43
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,qCAAqC,CAAC;AAG7C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,WAAW,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,17 +21,24 @@ export default class ServerMonitorCriteria {
|
|
|
21
21
|
let overTimeValue = undefined;
|
|
22
22
|
if (input.criteriaFilter.eveluateOverTime &&
|
|
23
23
|
input.criteriaFilter.evaluateOverTimeOptions) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
24
|
+
try {
|
|
25
|
+
overTimeValue = await EvaluateOverTime.getValueOverTime({
|
|
26
|
+
monitorId: input.dataToProcess.monitorId,
|
|
27
|
+
evaluateOverTimeOptions: input.criteriaFilter.evaluateOverTimeOptions,
|
|
28
|
+
metricType: input.criteriaFilter.checkOn,
|
|
29
|
+
miscData: input.criteriaFilter.serverMonitorOptions,
|
|
30
|
+
});
|
|
31
|
+
if (Array.isArray(overTimeValue) && overTimeValue.length === 0) {
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
if (overTimeValue === undefined) {
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
32
37
|
}
|
|
33
|
-
|
|
34
|
-
|
|
38
|
+
catch (err) {
|
|
39
|
+
logger.error(`Error in getting over time value for ${input.criteriaFilter.checkOn}`);
|
|
40
|
+
logger.error(err);
|
|
41
|
+
overTimeValue = undefined;
|
|
35
42
|
}
|
|
36
43
|
}
|
|
37
44
|
const lastCheckTime = input.dataToProcess
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAG9C,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,qCAAqC,CAAC;AAI7C,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAEpB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAGtD;QACC,2BAA2B;;QAE3B,IAAI,SAAS,GACX,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAC7B,IAAI,aAAa,GACf,SAAS,CAAC;QAEZ,IACE,KAAK,CAAC,cAAc,CAAC,gBAAgB;YACrC,KAAK,CAAC,cAAc,CAAC,uBAAuB,EAC5C,CAAC;YACD,aAAa,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ServerMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ServerMonitorCriteria.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.
|
|
3
|
+
"version": "7.0.4088",
|
|
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.
|
|
80
|
+
"Common": "npm:@oneuptime/common@7.0.4088",
|
|
81
81
|
"cookie-parser": "^1.4.7",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|