@oneuptime/common 7.0.5043 → 7.0.5049
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/QueueWorker.ts +19 -1
- package/UI/Utils/API/API.ts +5 -1
- package/build/dist/Server/Infrastructure/QueueWorker.js +4 -5
- package/build/dist/Server/Infrastructure/QueueWorker.js.map +1 -1
- package/build/dist/UI/Utils/API/API.js +4 -1
- package/build/dist/UI/Utils/API/API.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,7 +14,20 @@ export default class QueueWorker {
|
|
|
14
14
|
public static getWorker(
|
|
15
15
|
queueName: QueueName,
|
|
16
16
|
onJobInQueue: (job: QueueJob) => Promise<void>,
|
|
17
|
-
options: {
|
|
17
|
+
options: {
|
|
18
|
+
concurrency: number;
|
|
19
|
+
/**
|
|
20
|
+
* How long (in ms) the worker will hold a lock on the job before it's considered stalled
|
|
21
|
+
* if the event loop is blocked and the lock cannot be extended in time.
|
|
22
|
+
* Defaults to BullMQ default (30s) if not provided.
|
|
23
|
+
*/
|
|
24
|
+
lockDuration?: number;
|
|
25
|
+
/**
|
|
26
|
+
* Maximum number of times a job can be re-processed due to stall detection
|
|
27
|
+
* before being moved to failed. Defaults to BullMQ default (1) if not provided.
|
|
28
|
+
*/
|
|
29
|
+
maxStalledCount?: number;
|
|
30
|
+
},
|
|
18
31
|
): Worker {
|
|
19
32
|
const worker: Worker = new Worker(queueName, onJobInQueue, {
|
|
20
33
|
connection: {
|
|
@@ -23,6 +36,11 @@ export default class QueueWorker {
|
|
|
23
36
|
password: RedisPassword,
|
|
24
37
|
},
|
|
25
38
|
concurrency: options.concurrency,
|
|
39
|
+
// Only set these values if provided so we do not override BullMQ defaults
|
|
40
|
+
...(options.lockDuration ? { lockDuration: options.lockDuration } : {}),
|
|
41
|
+
...(options.maxStalledCount !== undefined
|
|
42
|
+
? { maxStalledCount: options.maxStalledCount }
|
|
43
|
+
: {}),
|
|
26
44
|
});
|
|
27
45
|
|
|
28
46
|
process.on("SIGINT", async () => {
|
package/UI/Utils/API/API.ts
CHANGED
|
@@ -91,6 +91,10 @@ class BaseAPI extends API {
|
|
|
91
91
|
return defaultHeaders;
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
+
protected static logoutUser(): void {
|
|
95
|
+
return User.logout();
|
|
96
|
+
}
|
|
97
|
+
|
|
94
98
|
protected static override handleError(
|
|
95
99
|
error: HTTPErrorResponse | APIException,
|
|
96
100
|
): HTTPErrorResponse | APIException {
|
|
@@ -103,7 +107,7 @@ class BaseAPI extends API {
|
|
|
103
107
|
) {
|
|
104
108
|
const loginRoute: Route = this.getLoginRoute();
|
|
105
109
|
|
|
106
|
-
|
|
110
|
+
this.logoutUser();
|
|
107
111
|
|
|
108
112
|
if (Navigation.getQueryStringByName("token")) {
|
|
109
113
|
Navigation.navigate(loginRoute.addRouteParam("sso", "true"), {
|
|
@@ -14,14 +14,13 @@ import { Worker } from "bullmq";
|
|
|
14
14
|
import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
|
|
15
15
|
export default class QueueWorker {
|
|
16
16
|
static getWorker(queueName, onJobInQueue, options) {
|
|
17
|
-
const worker = new Worker(queueName, onJobInQueue, {
|
|
18
|
-
connection: {
|
|
17
|
+
const worker = new Worker(queueName, onJobInQueue, Object.assign(Object.assign({ connection: {
|
|
19
18
|
host: RedisHostname.toString(),
|
|
20
19
|
port: RedisPort.toNumber(),
|
|
21
20
|
password: RedisPassword,
|
|
22
|
-
},
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
}, concurrency: options.concurrency }, (options.lockDuration ? { lockDuration: options.lockDuration } : {})), (options.maxStalledCount !== undefined
|
|
22
|
+
? { maxStalledCount: options.maxStalledCount }
|
|
23
|
+
: {})));
|
|
25
24
|
process.on("SIGINT", async () => {
|
|
26
25
|
await worker.close();
|
|
27
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueueWorker.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/QueueWorker.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAY,SAAS,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAMtE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,WAAW;IAEhB,AAAP,MAAM,CAAC,SAAS,CACrB,SAAoB,EACpB,YAA8C,EAC9C,
|
|
1
|
+
{"version":3,"file":"QueueWorker.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/QueueWorker.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAY,SAAS,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAMtE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,WAAW;IAEhB,AAAP,MAAM,CAAC,SAAS,CACrB,SAAoB,EACpB,YAA8C,EAC9C,OAaC;QAED,MAAM,MAAM,GAAW,IAAI,MAAM,CAAC,SAAS,EAAE,YAAY,gCACvD,UAAU,EAAE;gBACV,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE;gBAC9B,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE;gBAC1B,QAAQ,EAAE,aAAa;aACxB,EACD,WAAW,EAAE,OAAO,CAAC,WAAW,IAE7B,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACpE,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS;YACvC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;YAC9C,CAAC,CAAC,EAAE,CAAC,EACP,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC9B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAGmB,AAAb,MAAM,CAAC,KAAK,CAAC,iBAAiB,CACnC,WAAmB,EACnB,WAAgC;QAIhC,MAAM,cAAc,GAAmB,CAAC,EAAU,EAAiB,EAAE;YACnE,OAAO,IAAI,OAAO,CAChB,CAAC,QAAsB,EAAE,MAAkC,EAAE,EAAE;gBAC7D,UAAU,CAAC,GAAG,EAAE;oBACd,OAAO,MAAM,CAAC,IAAI,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;gBACrD,CAAC,EAAE,EAAE,CAAC,CAAC;YACT,CAAC,CACF,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;CACF;AA1De;IADb,WAAW,EAAE;;;oCAkBX,MAAM;kCAoBR;AAGmB;IADnB,WAAW,EAAE;;;;0CAkBb"}
|
|
@@ -42,6 +42,9 @@ class BaseAPI extends API {
|
|
|
42
42
|
defaultHeaders = Object.assign(Object.assign({}, defaultHeaders), headers);
|
|
43
43
|
return defaultHeaders;
|
|
44
44
|
}
|
|
45
|
+
static logoutUser() {
|
|
46
|
+
return User.logout();
|
|
47
|
+
}
|
|
45
48
|
static handleError(error) {
|
|
46
49
|
// 405 Status - Tenant not found. If Project was deleted.
|
|
47
50
|
// 401 Status - User is not logged in.
|
|
@@ -49,7 +52,7 @@ class BaseAPI extends API {
|
|
|
49
52
|
if (error instanceof HTTPErrorResponse &&
|
|
50
53
|
(error.statusCode === 401 || error.statusCode === 405)) {
|
|
51
54
|
const loginRoute = this.getLoginRoute();
|
|
52
|
-
|
|
55
|
+
this.logoutUser();
|
|
53
56
|
if (Navigation.getQueryStringByName("token")) {
|
|
54
57
|
Navigation.navigate(loginRoute.addRouteParam("sso", "true"), {
|
|
55
58
|
forceNavigate: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"API.js","sourceRoot":"","sources":["../../../../../UI/Utils/API/API.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,cAAc,MAAM,eAAe,CAAC;AAC3C,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAIrE,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAK7C,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAKzD,OAAO,GAAG,MAAM,oBAAoB,CAAC;AAErC,MAAM,OAAQ,SAAQ,GAAG;IACvB,YAAmB,QAAkB,EAAE,QAAkB,EAAE,KAAa;QACtE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,GAAQ;QAC5B,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAES,MAAM,CAAU,KAAK,CAAC,wBAAwB,CACtD,OAA2B;QAE3B,IAAI,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC7C,cAAc,CAAC,oBAAoB,CACjC,aAAa,CAAC,WAAW,CACvB,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAC/B,CAChC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,yBAAyB,CAAC,EAAE,CAAC;YAClD,YAAY,CAAC,OAAO,CAClB,yBAAyB,EACzB,OAAO,CAAC,yBAAyB,CAAC,CACnC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC9C,cAAc,CAAC,qBAAqB,CAClC,aAAa,CAAC,WAAW,CACvB,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAChC,CAChC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACnD,YAAY,CAAC,OAAO,CAClB,0BAA0B,EAC1B,OAAO,CAAC,0BAA0B,CAAC,CACpC,CAAC;QACJ,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAES,MAAM,CAAU,UAAU;QAClC,IAAI,cAAc,GAAY,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEvD,MAAM,OAAO,GAAY,EAAE,CAAC;QAE5B,MAAM,qBAAqB,GAAW,YAAY,CAAC,OAAO,CACxD,yBAAyB,CAChB,CAAC;QACZ,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,CAAC,yBAAyB,CAAC,GAAG,qBAAqB,CAAC;QAC7D,CAAC;QAED,MAAM,sBAAsB,GAAW,YAAY,CAAC,OAAO,CACzD,0BAA0B,CACjB,CAAC;QAEZ,IAAI,sBAAsB,EAAE,CAAC;YAC3B,OAAO,CAAC,0BAA0B,CAAC,GAAG,sBAAsB,CAAC;QAC/D,CAAC;QAED,cAAc,mCACT,cAAc,GACd,OAAO,CACX,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;IAES,MAAM,CAAU,WAAW,CACnC,KAAuC;QAEvC,yDAAyD;QACzD,sCAAsC;QACtC,8EAA8E;QAC9E,IACE,KAAK,YAAY,iBAAiB;YAClC,CAAC,KAAK,CAAC,UAAU,KAAK,GAAG,IAAI,KAAK,CAAC,UAAU,KAAK,GAAG,CAAC,EACtD,CAAC;YACD,MAAM,UAAU,GAAU,IAAI,CAAC,aAAa,EAAE,CAAC;YAE/C,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"API.js","sourceRoot":"","sources":["../../../../../UI/Utils/API/API.ts"],"names":[],"mappings":"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"}
|