@oneuptime/common 8.0.5547 → 8.0.5551
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/Infrastructure/Queue.ts +16 -5
- package/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts +22 -3
- package/build/dist/Server/Infrastructure/Queue.js +11 -5
- package/build/dist/Server/Infrastructure/Queue.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js +14 -1
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js.map +1 -1
- package/package.json +1 -1
|
@@ -36,6 +36,11 @@ export default class Queue {
|
|
|
36
36
|
}>
|
|
37
37
|
> = {};
|
|
38
38
|
|
|
39
|
+
// BullMQ rejects custom IDs containing colons, so normalize them early.
|
|
40
|
+
private static sanitizeJobId(jobId: string): string {
|
|
41
|
+
return jobId.replace(/:/g, "-");
|
|
42
|
+
}
|
|
43
|
+
|
|
39
44
|
private static async setupReconnectListener(
|
|
40
45
|
queue: BullQueue,
|
|
41
46
|
queueName: QueueName,
|
|
@@ -131,14 +136,17 @@ export default class Queue {
|
|
|
131
136
|
return;
|
|
132
137
|
}
|
|
133
138
|
|
|
134
|
-
const
|
|
139
|
+
const sanitizedJobId: string = this.sanitizeJobId(jobId.toString());
|
|
140
|
+
|
|
141
|
+
const job: Job | undefined =
|
|
142
|
+
await this.getQueue(queueName).getJob(sanitizedJobId);
|
|
135
143
|
|
|
136
144
|
if (job) {
|
|
137
145
|
await job.remove();
|
|
138
146
|
}
|
|
139
147
|
|
|
140
148
|
// remove existing repeatable job
|
|
141
|
-
await this.getQueue(queueName).removeRepeatableByKey(
|
|
149
|
+
await this.getQueue(queueName).removeRepeatableByKey(sanitizedJobId);
|
|
142
150
|
}
|
|
143
151
|
|
|
144
152
|
@CaptureSpan()
|
|
@@ -183,8 +191,10 @@ export default class Queue {
|
|
|
183
191
|
repeatableKey?: string | undefined;
|
|
184
192
|
},
|
|
185
193
|
): Promise<Job> {
|
|
194
|
+
const sanitizedJobId: string = this.sanitizeJobId(jobId.toString());
|
|
195
|
+
|
|
186
196
|
const optionsObject: JobsOptions = {
|
|
187
|
-
jobId:
|
|
197
|
+
jobId: sanitizedJobId,
|
|
188
198
|
};
|
|
189
199
|
|
|
190
200
|
if (options && options.scheduleAt) {
|
|
@@ -193,7 +203,8 @@ export default class Queue {
|
|
|
193
203
|
};
|
|
194
204
|
}
|
|
195
205
|
|
|
196
|
-
const job: Job | undefined =
|
|
206
|
+
const job: Job | undefined =
|
|
207
|
+
await this.getQueue(queueName).getJob(sanitizedJobId);
|
|
197
208
|
|
|
198
209
|
if (job) {
|
|
199
210
|
await job.remove();
|
|
@@ -211,7 +222,7 @@ export default class Queue {
|
|
|
211
222
|
if (!this.repeatableJobs[queueName]) {
|
|
212
223
|
this.repeatableJobs[queueName] = {};
|
|
213
224
|
}
|
|
214
|
-
this.repeatableJobs[queueName]![
|
|
225
|
+
this.repeatableJobs[queueName]![sanitizedJobId] = {
|
|
215
226
|
jobName,
|
|
216
227
|
data,
|
|
217
228
|
options: optionsObject,
|
|
@@ -84,6 +84,25 @@ export default class ServerMonitorCriteria {
|
|
|
84
84
|
`Offline if not checked in minutes: ${offlineIfNotCheckedInMinutes}`,
|
|
85
85
|
);
|
|
86
86
|
|
|
87
|
+
const normalizeDiskPath: (value: string | undefined | null) => string = (
|
|
88
|
+
value: string | undefined | null,
|
|
89
|
+
): string => {
|
|
90
|
+
let normalized: string = (value || "").trim().toLowerCase();
|
|
91
|
+
|
|
92
|
+
if (normalized === "/") {
|
|
93
|
+
return normalized;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
normalized = normalized.replace(/\\/g, "/");
|
|
97
|
+
normalized = normalized.replace(/\/+$/g, "");
|
|
98
|
+
|
|
99
|
+
if (normalized === "") {
|
|
100
|
+
return "/";
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
return normalized;
|
|
104
|
+
};
|
|
105
|
+
|
|
87
106
|
if (
|
|
88
107
|
input.criteriaFilter.checkOn === CheckOn.IsOnline &&
|
|
89
108
|
differenceInMinutes >= offlineIfNotCheckedInMinutes
|
|
@@ -169,13 +188,13 @@ export default class ServerMonitorCriteria {
|
|
|
169
188
|
const diskPath: string =
|
|
170
189
|
input.criteriaFilter.serverMonitorOptions?.diskPath || "/";
|
|
171
190
|
|
|
191
|
+
const normalizedDiskPath: string = normalizeDiskPath(diskPath);
|
|
192
|
+
|
|
172
193
|
const diskMetric: BasicDiskMetrics | undefined = (
|
|
173
194
|
input.dataToProcess as ServerMonitorResponse
|
|
174
195
|
).basicInfrastructureMetrics?.diskMetrics.find(
|
|
175
196
|
(item: BasicDiskMetrics) => {
|
|
176
|
-
return (
|
|
177
|
-
item.diskPath.trim().toLowerCase() === diskPath.trim().toLowerCase()
|
|
178
|
-
);
|
|
197
|
+
return normalizeDiskPath(item.diskPath) === normalizedDiskPath;
|
|
179
198
|
},
|
|
180
199
|
);
|
|
181
200
|
|
|
@@ -26,6 +26,10 @@ export var QueueName;
|
|
|
26
26
|
QueueName["ProbeIngest"] = "ProbeIngest";
|
|
27
27
|
})(QueueName || (QueueName = {}));
|
|
28
28
|
class Queue {
|
|
29
|
+
// BullMQ rejects custom IDs containing colons, so normalize them early.
|
|
30
|
+
static sanitizeJobId(jobId) {
|
|
31
|
+
return jobId.replace(/:/g, "-");
|
|
32
|
+
}
|
|
29
33
|
static async setupReconnectListener(queue, queueName) {
|
|
30
34
|
const client = await queue.client;
|
|
31
35
|
client.on("ready", async () => {
|
|
@@ -97,12 +101,13 @@ class Queue {
|
|
|
97
101
|
if (!jobId) {
|
|
98
102
|
return;
|
|
99
103
|
}
|
|
100
|
-
const
|
|
104
|
+
const sanitizedJobId = this.sanitizeJobId(jobId.toString());
|
|
105
|
+
const job = await this.getQueue(queueName).getJob(sanitizedJobId);
|
|
101
106
|
if (job) {
|
|
102
107
|
await job.remove();
|
|
103
108
|
}
|
|
104
109
|
// remove existing repeatable job
|
|
105
|
-
await this.getQueue(queueName).removeRepeatableByKey(
|
|
110
|
+
await this.getQueue(queueName).removeRepeatableByKey(sanitizedJobId);
|
|
106
111
|
}
|
|
107
112
|
static getInspectorRoute() {
|
|
108
113
|
return "/worker/inspect/queue/:clusterKey";
|
|
@@ -121,15 +126,16 @@ class Queue {
|
|
|
121
126
|
return serverAdapter.getRouter();
|
|
122
127
|
}
|
|
123
128
|
static async addJob(queueName, jobId, jobName, data, options) {
|
|
129
|
+
const sanitizedJobId = this.sanitizeJobId(jobId.toString());
|
|
124
130
|
const optionsObject = {
|
|
125
|
-
jobId:
|
|
131
|
+
jobId: sanitizedJobId,
|
|
126
132
|
};
|
|
127
133
|
if (options && options.scheduleAt) {
|
|
128
134
|
optionsObject.repeat = {
|
|
129
135
|
pattern: options.scheduleAt,
|
|
130
136
|
};
|
|
131
137
|
}
|
|
132
|
-
const job = await this.getQueue(queueName).getJob(
|
|
138
|
+
const job = await this.getQueue(queueName).getJob(sanitizedJobId);
|
|
133
139
|
if (job) {
|
|
134
140
|
await job.remove();
|
|
135
141
|
}
|
|
@@ -142,7 +148,7 @@ class Queue {
|
|
|
142
148
|
if (!this.repeatableJobs[queueName]) {
|
|
143
149
|
this.repeatableJobs[queueName] = {};
|
|
144
150
|
}
|
|
145
|
-
this.repeatableJobs[queueName][
|
|
151
|
+
this.repeatableJobs[queueName][sanitizedJobId] = {
|
|
146
152
|
jobName,
|
|
147
153
|
data,
|
|
148
154
|
options: optionsObject,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/Queue.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,KAAK,IAAI,SAAS,EAAoB,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,MAAM,CAAN,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,kCAAqB,CAAA;IACrB,8BAAiB,CAAA;IACjB,oCAAuB,CAAA;IACvB,0CAA6B,CAAA;IAC7B,4DAA+C,CAAA;IAC/C,wDAA2C,CAAA;IAC3C,wCAA2B,CAAA;AAC7B,CAAC,EARW,SAAS,KAAT,SAAS,QAQpB;AAKD,MAAqB,KAAK;
|
|
1
|
+
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/Queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,18 @@ export default class ServerMonitorCriteria {
|
|
|
56
56
|
logger.debug(`Check On: ${input.criteriaFilter.checkOn}`);
|
|
57
57
|
logger.debug(`Difference in Minutes: ${differenceInMinutes}`);
|
|
58
58
|
logger.debug(`Offline if not checked in minutes: ${offlineIfNotCheckedInMinutes}`);
|
|
59
|
+
const normalizeDiskPath = (value) => {
|
|
60
|
+
let normalized = (value || "").trim().toLowerCase();
|
|
61
|
+
if (normalized === "/") {
|
|
62
|
+
return normalized;
|
|
63
|
+
}
|
|
64
|
+
normalized = normalized.replace(/\\/g, "/");
|
|
65
|
+
normalized = normalized.replace(/\/+$/g, "");
|
|
66
|
+
if (normalized === "") {
|
|
67
|
+
return "/";
|
|
68
|
+
}
|
|
69
|
+
return normalized;
|
|
70
|
+
};
|
|
59
71
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline &&
|
|
60
72
|
differenceInMinutes >= offlineIfNotCheckedInMinutes) {
|
|
61
73
|
const currentIsOnline = overTimeValue || false; // false because no request receieved in the last 2 minutes
|
|
@@ -108,8 +120,9 @@ export default class ServerMonitorCriteria {
|
|
|
108
120
|
!input.dataToProcess.onlyCheckRequestReceivedAt) {
|
|
109
121
|
threshold = CompareCriteria.convertToNumber(threshold);
|
|
110
122
|
const diskPath = ((_c = input.criteriaFilter.serverMonitorOptions) === null || _c === void 0 ? void 0 : _c.diskPath) || "/";
|
|
123
|
+
const normalizedDiskPath = normalizeDiskPath(diskPath);
|
|
111
124
|
const diskMetric = (_d = input.dataToProcess.basicInfrastructureMetrics) === null || _d === void 0 ? void 0 : _d.diskMetrics.find((item) => {
|
|
112
|
-
return (item.diskPath
|
|
125
|
+
return normalizeDiskPath(item.diskPath) === normalizedDiskPath;
|
|
113
126
|
});
|
|
114
127
|
const diskUsagePercent = (_f = (_e = diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentUsed) !== null && _e !== void 0 ? _e : diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentFree) !== null && _f !== void 0 ? _f : 0;
|
|
115
128
|
return CompareCriteria.compareCriteriaNumbers({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ServerMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts"],"names":[],"mappings":"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"}
|