work-dispatcher 1.8.5 → 1.9.0
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/.prettierrc +1 -0
- package/dist/config/config.d.ts +2 -1
- package/dist/config/config.d.ts.map +1 -1
- package/dist/config/config.js +5 -4
- package/dist/config/config.js.map +1 -1
- package/dist/server/defaultEventHandler.d.ts +2 -0
- package/dist/server/defaultEventHandler.d.ts.map +1 -0
- package/dist/server/defaultEventHandler.js +10 -0
- package/dist/server/defaultEventHandler.js.map +1 -0
- package/dist/server/init.d.ts +1 -1
- package/dist/server/init.d.ts.map +1 -1
- package/dist/server/init.js +50 -45
- package/dist/server/init.js.map +1 -1
- package/dist/server/mqReceiver.d.ts.map +1 -1
- package/dist/server/mqReceiver.js +26 -25
- package/dist/server/mqReceiver.js.map +1 -1
- package/dist/work/workQ.d.ts +2 -2
- package/dist/work/workQ.d.ts.map +1 -1
- package/dist/work/workQ.js +34 -35
- package/dist/work/workQ.js.map +1 -1
- package/package.json +1 -1
package/.prettierrc
CHANGED
package/dist/config/config.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FeatureCatalog } from
|
|
1
|
+
import { FeatureCatalog } from "../work/featureCatalogClass.js";
|
|
2
2
|
declare const dispatcherConfig: {
|
|
3
3
|
FINE_MODE: number;
|
|
4
4
|
DEBUG_MODE: number;
|
|
@@ -8,6 +8,7 @@ declare const dispatcherConfig: {
|
|
|
8
8
|
handlers: {
|
|
9
9
|
emptyQHandler: () => Promise<void>;
|
|
10
10
|
errorHandler: (errorMessage: string, stackTrace: string | undefined) => Promise<void>;
|
|
11
|
+
eventHandler: (eventData: any) => Promise<void>;
|
|
11
12
|
};
|
|
12
13
|
featureCatalog: FeatureCatalog;
|
|
13
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,QAAA,MAAM,gBAAgB;;;;;;;;qCAQiB,MAAM,cAAc,MAAM,GAAG,SAAS;;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,QAAA,MAAM,gBAAgB;;;;;;;;qCAQiB,MAAM,cAAc,MAAM,GAAG,SAAS;kCACzC,GAAG;;oBAEf,cAAc;CACrC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
|
package/dist/config/config.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { FeatureCatalog } from
|
|
1
|
+
import { FeatureCatalog } from "../work/featureCatalogClass.js";
|
|
2
2
|
const dispatcherConfig = {
|
|
3
3
|
FINE_MODE: 1,
|
|
4
4
|
DEBUG_MODE: 1,
|
|
5
5
|
DEBUG_GET_CALLS: 0,
|
|
6
|
-
softwareVersion:
|
|
7
|
-
softwareName:
|
|
6
|
+
softwareVersion: "unknown",
|
|
7
|
+
softwareName: "unknown",
|
|
8
8
|
handlers: {
|
|
9
9
|
emptyQHandler: () => Promise.resolve(),
|
|
10
|
-
errorHandler: async (errorMessage, stackTrace) => console.log(
|
|
10
|
+
errorHandler: async (errorMessage, stackTrace) => console.log("Error handler not set!", errorMessage, stackTrace),
|
|
11
|
+
eventHandler: async (eventData) => console.log("Event handler not set!", eventData),
|
|
11
12
|
},
|
|
12
13
|
featureCatalog: {},
|
|
13
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,gBAAgB,GAAG;IACvB,SAAS,EAAE,CAAC;IACZ,UAAU,EAAE,CAAC;IACb,eAAe,EAAE,CAAC;IAClB,eAAe,EAAE,SAAS;IAC1B,YAAY,EAAE,SAAS;IACvB,QAAQ,EAAE;QACR,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACtC,YAAY,EAAE,KAAK,EAAE,YAAoB,EAAE,UAA8B,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,YAAY,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,MAAM,gBAAgB,GAAG;IACvB,SAAS,EAAE,CAAC;IACZ,UAAU,EAAE,CAAC;IACb,eAAe,EAAE,CAAC;IAClB,eAAe,EAAE,SAAS;IAC1B,YAAY,EAAE,SAAS;IACvB,QAAQ,EAAE;QACR,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACtC,YAAY,EAAE,KAAK,EAAE,YAAoB,EAAE,UAA8B,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,YAAY,EAAE,UAAU,CAAC;QAC7I,YAAY,EAAE,KAAK,EAAE,SAAc,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC;KACzF;IACD,cAAc,EAAE,EAAoB;CACrC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultEventHandler.d.ts","sourceRoot":"","sources":["../../src/server/defaultEventHandler.ts"],"names":[],"mappings":"AAGA,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,GAAG,QAMjD"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { info } from "../utils/logging.js";
|
|
2
|
+
import { addEventToList } from "../work/workQ.js";
|
|
3
|
+
export function defaultEventHandler(eventData) {
|
|
4
|
+
info("DEEH", "Receiving event with default event handler. Data", eventData);
|
|
5
|
+
const issueKey = eventData?.issue?.key + ": " + eventData?.issue?.fields?.summary;
|
|
6
|
+
let name = eventData.webhookEvent?.toUpperCase();
|
|
7
|
+
name = name.replace("JIRA:", "");
|
|
8
|
+
addEventToList(name, eventData?.issue?.key ? issueKey : eventData);
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=defaultEventHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultEventHandler.js","sourceRoot":"","sources":["../../src/server/defaultEventHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,UAAU,mBAAmB,CAAC,SAAc;IAChD,IAAI,CAAC,MAAM,EAAE,kDAAkD,EAAE,SAAS,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;IAClF,IAAI,IAAI,GAAG,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;IACjD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACjC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACrE,CAAC"}
|
package/dist/server/init.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { FeatureCatalog } from
|
|
1
|
+
import { FeatureCatalog } from "../work/featureCatalogClass.js";
|
|
2
2
|
export declare function init(handlers: any, featureCatalog: FeatureCatalog, softwareVersion: string, softwareName: string): void;
|
|
3
3
|
//# sourceMappingURL=init.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/server/init.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/server/init.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAkBhE,wBAAgB,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,QAsHhH"}
|
package/dist/server/init.js
CHANGED
|
@@ -1,56 +1,61 @@
|
|
|
1
|
-
import express from
|
|
2
|
-
import cron from
|
|
3
|
-
import cors from
|
|
4
|
-
import { error, info, warn } from
|
|
5
|
-
import { addEventToList, addFeaturesToQ, startWorking } from
|
|
6
|
-
import { getDispatcherVersion } from
|
|
7
|
-
import { dispatcherConfig } from
|
|
8
|
-
import { router } from
|
|
9
|
-
import { FeatureCatalog } from
|
|
10
|
-
import { startPolling, stopPolling } from
|
|
11
|
-
import { connectRedis, disconnectRedis } from
|
|
1
|
+
import express from "express";
|
|
2
|
+
import cron from "node-cron";
|
|
3
|
+
import cors from "cors";
|
|
4
|
+
import { error, info, warn } from "../utils/logging.js";
|
|
5
|
+
import { addEventToList, addFeaturesToQ, startWorking } from "../work/workQ.js";
|
|
6
|
+
import { getDispatcherVersion } from "../utils/version.js";
|
|
7
|
+
import { dispatcherConfig } from "../config/config.js";
|
|
8
|
+
import { router } from "./router.js";
|
|
9
|
+
import { FeatureCatalog } from "../work/featureCatalogClass.js";
|
|
10
|
+
import { startPolling, stopPolling } from "./mqReceiver.js";
|
|
11
|
+
import { connectRedis, disconnectRedis } from "./redis.js";
|
|
12
|
+
import { defaultEventHandler } from "./defaultEventHandler.js";
|
|
12
13
|
async function doNothing() {
|
|
13
14
|
// intentionally empty
|
|
14
15
|
}
|
|
15
16
|
async function cronJobStart(freq) {
|
|
16
|
-
info(
|
|
17
|
-
if (process.env[
|
|
17
|
+
info("MAIN", "CRON triggered for", freq);
|
|
18
|
+
if (process.env["DEBUG"] || process.env["ALL"])
|
|
18
19
|
return;
|
|
19
20
|
if (dispatcherConfig.featureCatalog[freq]) {
|
|
20
|
-
addEventToList(
|
|
21
|
+
addEventToList("Cron " + freq, null);
|
|
21
22
|
addFeaturesToQ(dispatcherConfig.featureCatalog[freq]);
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
export function init(handlers, featureCatalog, softwareVersion, softwareName) {
|
|
25
|
-
info(
|
|
26
|
-
info(
|
|
26
|
+
info("WORK-DISPATCHER", "Now initializing");
|
|
27
|
+
info("WORK-DISPATCHER", "Running with work-dispatcher version", getDispatcherVersion());
|
|
27
28
|
if (softwareName === undefined || softwareVersion === undefined) {
|
|
28
|
-
error(
|
|
29
|
+
error("WORK-DISPATCHER", "No softwareName or softwareVersion was provided which are needed for WORK-DISPATCHER to start. Application will now exit");
|
|
29
30
|
process.exit(1);
|
|
30
31
|
}
|
|
31
32
|
if (featureCatalog === undefined || featureCatalog.STARTUP === undefined || featureCatalog.TRIGGERED === undefined || featureCatalog.ALL === undefined) {
|
|
32
|
-
error(
|
|
33
|
+
error("WORK-DISPATCHER", "No featureCatalog with STARTUP, TRIGGERED and ALL set was provided which is needed for WORK-DISPATCHER to start. Application will now exit");
|
|
33
34
|
process.exit(1);
|
|
34
35
|
}
|
|
35
36
|
if (!handlers.errorHandler) {
|
|
36
|
-
error(
|
|
37
|
+
error("WORK-DISPATCHER", "No errorHandler was provided which is needed for WORK-DISPATCHER to start. Application will now exit");
|
|
37
38
|
process.exit(1);
|
|
38
39
|
}
|
|
39
40
|
if (!handlers.emptyQHandler) {
|
|
40
41
|
handlers.emptyQHandler = doNothing;
|
|
41
42
|
}
|
|
43
|
+
if (!handlers.eventHandler) {
|
|
44
|
+
info("WORK-DISPATCHER", "No eventHandler was provided, using default.");
|
|
45
|
+
handlers.eventHandler = defaultEventHandler;
|
|
46
|
+
}
|
|
42
47
|
dispatcherConfig.softwareVersion = softwareVersion;
|
|
43
48
|
dispatcherConfig.softwareName = softwareName;
|
|
44
49
|
dispatcherConfig.handlers = handlers;
|
|
45
50
|
dispatcherConfig.featureCatalog = featureCatalog;
|
|
46
|
-
info(
|
|
47
|
-
if (process.env[
|
|
48
|
-
info(
|
|
51
|
+
info("WORK-DISPATCHER", "Running with", softwareName, "version", softwareVersion);
|
|
52
|
+
if (process.env["DOCKER_ENV"] === "ci-test") {
|
|
53
|
+
info("WORK-DISPATCHER", "Running in CI test mode, not starting server or cron jobs.");
|
|
49
54
|
process.exit(0);
|
|
50
55
|
}
|
|
51
56
|
connectRedis();
|
|
52
57
|
const app = express();
|
|
53
|
-
app.disable(
|
|
58
|
+
app.disable("x-powered-by");
|
|
54
59
|
app.use(cors());
|
|
55
60
|
//app.use(
|
|
56
61
|
//bodyParser.json({
|
|
@@ -61,26 +66,26 @@ export function init(handlers, featureCatalog, softwareVersion, softwareName) {
|
|
|
61
66
|
//},
|
|
62
67
|
//}),
|
|
63
68
|
//);
|
|
64
|
-
app.use(express.static(import.meta.dirname +
|
|
65
|
-
app.set(
|
|
66
|
-
app.use(
|
|
67
|
-
if (process.env[
|
|
68
|
-
info(
|
|
69
|
+
app.use(express.static(import.meta.dirname + "/../../res/web"));
|
|
70
|
+
app.set("view engine", "ejs");
|
|
71
|
+
app.use("/", router);
|
|
72
|
+
if (process.env["DOCKER_ENV"] === "ci-test") {
|
|
73
|
+
info("MAIN", "Running in CI test mode, not starting server or cron jobs.");
|
|
69
74
|
process.exit(0);
|
|
70
75
|
}
|
|
71
|
-
if (process.env[
|
|
76
|
+
if (process.env["NODE_ENV"] !== "test") {
|
|
72
77
|
let pollerPromise;
|
|
73
|
-
const cronJobDaily = cron.schedule(
|
|
74
|
-
const cronJobHourly = cron.schedule(
|
|
75
|
-
const cronJobMin15 = cron.schedule(
|
|
76
|
-
const cronJobMin5 = cron.schedule(
|
|
78
|
+
const cronJobDaily = cron.schedule("0 3 * * *", () => cronJobStart("DAILY"));
|
|
79
|
+
const cronJobHourly = cron.schedule("0 * * * *", () => cronJobStart("HOURLY"));
|
|
80
|
+
const cronJobMin15 = cron.schedule("*/15 * * * *", () => cronJobStart("MIN15"));
|
|
81
|
+
const cronJobMin5 = cron.schedule("*/5 * * * *", () => cronJobStart("MIN5"));
|
|
77
82
|
const server = app.listen(8080, async function () {
|
|
78
|
-
info(
|
|
79
|
-
addEventToList(
|
|
80
|
-
if (process.env[
|
|
83
|
+
info("MAIN", "App listening at", server.address());
|
|
84
|
+
addEventToList("Startup", null);
|
|
85
|
+
if (process.env["DEBUG"]) {
|
|
81
86
|
addFeaturesToQ(dispatcherConfig.featureCatalog.DEBUG);
|
|
82
87
|
}
|
|
83
|
-
else if (process.env[
|
|
88
|
+
else if (process.env["ALL"]) {
|
|
84
89
|
addFeaturesToQ(dispatcherConfig.featureCatalog.ALL);
|
|
85
90
|
}
|
|
86
91
|
else {
|
|
@@ -91,18 +96,18 @@ export function init(handlers, featureCatalog, softwareVersion, softwareName) {
|
|
|
91
96
|
pollerPromise = startPolling();
|
|
92
97
|
}
|
|
93
98
|
catch (err) {
|
|
94
|
-
warn(
|
|
99
|
+
warn("MAIN", "Failed to start SQS poller", err);
|
|
95
100
|
}
|
|
96
101
|
});
|
|
97
102
|
const serverSockets = new Set();
|
|
98
|
-
server.on(
|
|
103
|
+
server.on("connection", (socket) => {
|
|
99
104
|
serverSockets.add(socket);
|
|
100
|
-
socket.on(
|
|
105
|
+
socket.on("close", () => {
|
|
101
106
|
serverSockets.delete(socket);
|
|
102
107
|
});
|
|
103
108
|
});
|
|
104
|
-
process.on(
|
|
105
|
-
warn(
|
|
109
|
+
process.on("SIGTERM", async () => {
|
|
110
|
+
warn("MAIN", "SIGTERM received");
|
|
106
111
|
await disconnectRedis();
|
|
107
112
|
cronJobDaily.stop();
|
|
108
113
|
cronJobHourly.stop();
|
|
@@ -112,13 +117,13 @@ export function init(handlers, featureCatalog, softwareVersion, softwareName) {
|
|
|
112
117
|
stopPolling();
|
|
113
118
|
if (pollerPromise)
|
|
114
119
|
await pollerPromise;
|
|
115
|
-
warn(
|
|
120
|
+
warn("MAIN", "SQS poller stopped");
|
|
116
121
|
}
|
|
117
122
|
catch (err) {
|
|
118
|
-
warn(
|
|
123
|
+
warn("MAIN", "Error stopping SQS poller", err);
|
|
119
124
|
}
|
|
120
125
|
server.close(() => {
|
|
121
|
-
warn(
|
|
126
|
+
warn("MAIN", "EXPRESS SERVER CLOSED");
|
|
122
127
|
});
|
|
123
128
|
for (const socket of serverSockets.values()) {
|
|
124
129
|
socket.destroy();
|
package/dist/server/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/server/init.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/server/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqReceiver.d.ts","sourceRoot":"","sources":["../../src/server/mqReceiver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mqReceiver.d.ts","sourceRoot":"","sources":["../../src/server/mqReceiver.ts"],"names":[],"mappings":"AA2DA,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAelD;AAED,wBAAgB,WAAW,IAAI,IAAI,CAElC"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
import { SQSClient, ReceiveMessageCommand, DeleteMessageCommand } from
|
|
2
|
-
import { debug, info, warn } from
|
|
3
|
-
import { sleep } from
|
|
4
|
-
import { dispatcherConfig } from
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
let SCOPE = 'uninitialized';
|
|
1
|
+
import { SQSClient, ReceiveMessageCommand, DeleteMessageCommand } from "@aws-sdk/client-sqs";
|
|
2
|
+
import { debug, info, warn } from "../utils/logging.js";
|
|
3
|
+
import { sleep } from "../utils/generalUtil.js";
|
|
4
|
+
import { dispatcherConfig } from "../config/config.js";
|
|
5
|
+
const QUEUE_URL = process.env["SQS_QUEUE_URL"] || "https://sqs.eu-central-1.amazonaws.com/112023164695/work-dispatcher-queue.fifo";
|
|
6
|
+
const REGION = process.env["AWS_REGION"] || process.env["AWS_DEFAULT_REGION"] || "eu-central-1";
|
|
7
|
+
let SCOPE = "uninitialized";
|
|
9
8
|
const client = new SQSClient({
|
|
10
9
|
region: REGION,
|
|
11
10
|
credentials: {
|
|
12
|
-
accessKeyId: process.env[
|
|
13
|
-
secretAccessKey: process.env[
|
|
11
|
+
accessKeyId: process.env["SQS_ACCESS_KEY_ID"] || "",
|
|
12
|
+
secretAccessKey: process.env["SQS_SECRET_ACCESS_KEY"] || "",
|
|
14
13
|
},
|
|
15
14
|
});
|
|
16
15
|
let running = true;
|
|
@@ -20,46 +19,48 @@ async function pollOnce() {
|
|
|
20
19
|
QueueUrl: QUEUE_URL,
|
|
21
20
|
MaxNumberOfMessages: 10,
|
|
22
21
|
WaitTimeSeconds: 20,
|
|
23
|
-
MessageAttributeNames: [
|
|
24
|
-
AttributeNames: [
|
|
22
|
+
MessageAttributeNames: ["All"],
|
|
23
|
+
AttributeNames: ["All"], // request system attributes like MessageGroupId and SequenceNumber (FIFO)
|
|
25
24
|
});
|
|
26
25
|
const res = await client.send(cmd);
|
|
27
26
|
const messages = res.Messages || [];
|
|
28
27
|
for (const m of messages) {
|
|
29
28
|
if (SCOPE == m.Attributes?.MessageGroupId) {
|
|
30
|
-
const eventData = JSON.parse(m.Body ||
|
|
31
|
-
debug(
|
|
32
|
-
|
|
33
|
-
addEventToList(eventData.webhookEvent, eventData?.issue?.key ? issueKey : eventData);
|
|
29
|
+
const eventData = JSON.parse(m.Body || "{}");
|
|
30
|
+
debug("ASQS", "Received message with scope:", m.Attributes?.MessageGroupId, "\n", eventData);
|
|
31
|
+
dispatcherConfig.handlers.eventHandler(eventData);
|
|
34
32
|
if (m.ReceiptHandle) {
|
|
35
33
|
try {
|
|
36
|
-
await client.send(new DeleteMessageCommand({
|
|
37
|
-
|
|
34
|
+
await client.send(new DeleteMessageCommand({
|
|
35
|
+
QueueUrl: QUEUE_URL,
|
|
36
|
+
ReceiptHandle: m.ReceiptHandle,
|
|
37
|
+
}));
|
|
38
|
+
debug("ASQS", "Deleted message", m.MessageId);
|
|
38
39
|
}
|
|
39
40
|
catch (delErr) {
|
|
40
|
-
warn(
|
|
41
|
+
warn("ASQS", "Failed to delete message", m.MessageId, delErr);
|
|
41
42
|
}
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
47
|
catch (err) {
|
|
47
|
-
warn(
|
|
48
|
+
warn("ASQS", "Error receiving messages:", err);
|
|
48
49
|
await new Promise((r) => setTimeout(r, 2000));
|
|
49
50
|
}
|
|
50
51
|
}
|
|
51
52
|
export async function startPolling() {
|
|
52
|
-
SCOPE = dispatcherConfig.softwareName.toLowerCase().replace(
|
|
53
|
-
info(
|
|
54
|
-
if (!process.env[
|
|
55
|
-
warn(
|
|
53
|
+
SCOPE = dispatcherConfig.softwareName.toLowerCase().replace(" ", "");
|
|
54
|
+
info("ASQS", `Starting SQS poller for queue 'work-dispatcher-queue' with scope '${SCOPE}'`);
|
|
55
|
+
if (!process.env["SQS_ACCESS_KEY_ID"] || !process.env["SQS_SECRET_ACCESS_KEY"]) {
|
|
56
|
+
warn("ASQS", "SQS_ACCESS_KEY_ID or SQS_SECRET_ACCESS_KEY environment variables are not set. Not starting SQS.");
|
|
56
57
|
return;
|
|
57
58
|
}
|
|
58
59
|
while (running) {
|
|
59
60
|
await pollOnce();
|
|
60
61
|
sleep(1);
|
|
61
62
|
}
|
|
62
|
-
info(
|
|
63
|
+
info("ASQS", "SQS poller stopped.");
|
|
63
64
|
}
|
|
64
65
|
export function stopPolling() {
|
|
65
66
|
running = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqReceiver.js","sourceRoot":"","sources":["../../src/server/mqReceiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC7F,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"mqReceiver.js","sourceRoot":"","sources":["../../src/server/mqReceiver.ts"],"names":[],"mappings":"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"}
|
package/dist/work/workQ.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Feature } from
|
|
1
|
+
import { Feature } from "./featureClass.js";
|
|
2
2
|
type Event = {
|
|
3
3
|
name: string;
|
|
4
4
|
params: any;
|
|
5
5
|
timeAdded: Date;
|
|
6
6
|
startDate: Date;
|
|
7
|
-
type:
|
|
7
|
+
type: "EVENT";
|
|
8
8
|
};
|
|
9
9
|
export declare let currentlyWorkingOn: string;
|
|
10
10
|
export declare let cancelFeatureRequested: boolean;
|
package/dist/work/workQ.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workQ.d.ts","sourceRoot":"","sources":["../../src/work/workQ.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAkB,MAAM,mBAAmB,CAAC;AAG5D,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAQF,eAAO,IAAI,kBAAkB,QAAK,CAAC;AACnC,eAAO,IAAI,sBAAsB,SAAQ,CAAC;AAE1C,wBAAgB,cAAc,CAAC,UAAU,EAAE,OAAO,EAAE,QA2BnD;AAED,iBAAe,iBAAiB,kBA+C/B;AAOD,wBAAgB,iBAAiB,SAGhC;AAED,wBAAgB,mBAAmB,SAGlC;AAED,wBAAgB,SAAS,SAKxB;AAED,wBAAsB,MAAM,kBAM3B;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"workQ.d.ts","sourceRoot":"","sources":["../../src/work/workQ.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAkB,MAAM,mBAAmB,CAAC;AAG5D,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAQF,eAAO,IAAI,kBAAkB,QAAK,CAAC;AACnC,eAAO,IAAI,sBAAsB,SAAQ,CAAC;AAE1C,wBAAgB,cAAc,CAAC,UAAU,EAAE,OAAO,EAAE,QA2BnD;AAED,iBAAe,iBAAiB,kBA+C/B;AAOD,wBAAgB,iBAAiB,SAGhC;AAED,wBAAgB,mBAAmB,SAGlC;AAED,wBAAgB,SAAS,SAKxB;AAED,wBAAsB,MAAM,kBAM3B;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAqBvD;AAED,wBAAgB,WAAW,wBAM1B;AAED,wBAAgB,QAAQ,wBAMvB;AAED,wBAAgB,iBAAiB,mBAEhC;AAED,wBAAsB,YAAY,kBAajC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,QAEjD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,QAW9C;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,QAG5C;AAED,wBAAsB,2BAA2B,kBAYhD;AAGD,eAAO,MAAM,cAAc;;;;;CAK1B,CAAC;AAEF,iBAAS,kBAAkB,SAM1B"}
|
package/dist/work/workQ.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { dispatcherConfig } from
|
|
2
|
-
import { sleep, waitSyncMS } from
|
|
3
|
-
import { debug, fine, info, warn } from
|
|
4
|
-
import { Feature, FEATURE_STATUS } from
|
|
5
|
-
import { featureError, featureSuccess } from
|
|
1
|
+
import { dispatcherConfig } from "../config/config.js";
|
|
2
|
+
import { sleep, waitSyncMS } from "../utils/generalUtil.js";
|
|
3
|
+
import { debug, fine, info, warn } from "../utils/logging.js";
|
|
4
|
+
import { Feature, FEATURE_STATUS } from "./featureClass.js";
|
|
5
|
+
import { featureError, featureSuccess } from "./health.js";
|
|
6
6
|
let Q = [];
|
|
7
7
|
let pastQ = [];
|
|
8
8
|
let eventList = [];
|
|
9
9
|
let currentFeature = null;
|
|
10
10
|
let eventCutoffDate = new Date(new Date().setHours(new Date().getHours() - 1));
|
|
11
11
|
let terminating = false;
|
|
12
|
-
export let currentlyWorkingOn =
|
|
12
|
+
export let currentlyWorkingOn = "";
|
|
13
13
|
export let cancelFeatureRequested = false;
|
|
14
14
|
export function addFeaturesToQ(featureSet) {
|
|
15
15
|
featureSet = featureSet.filter((item) => item && item.status === FEATURE_STATUS.ACTIVE);
|
|
@@ -17,14 +17,14 @@ export function addFeaturesToQ(featureSet) {
|
|
|
17
17
|
featureSet.map((item) => expandedFeatureSet.push(...item.getPrerequisitesAndFeature()));
|
|
18
18
|
// expandedFeatureSet.push(FEATURES.CLEAR_CACHES.clone());
|
|
19
19
|
if (Q.length > 50) {
|
|
20
|
-
warn(
|
|
20
|
+
warn("WORK", "Q was full. Max amount is 50. Did not add:", expandedFeatureSet.map((item) => item.name));
|
|
21
21
|
// if (Q[Q.length - 1].name !== 'CLEAR_CACHES') {
|
|
22
22
|
// Q.push(FEATURES.CLEAR_CACHES.clone());
|
|
23
23
|
// waitSyncMS(1);
|
|
24
24
|
// }
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
info(
|
|
27
|
+
info("WORK", "Adding features to Q", expandedFeatureSet.map((item) => item.name));
|
|
28
28
|
for (const item of expandedFeatureSet) {
|
|
29
29
|
item.timeAdded = new Date();
|
|
30
30
|
waitSyncMS(1);
|
|
@@ -38,13 +38,13 @@ async function workOnNextFeature() {
|
|
|
38
38
|
currentFeature.errorForFeature = null;
|
|
39
39
|
currentFeature.getDurationString = function () {
|
|
40
40
|
const runInSeconds = Math.abs(new Date().getTime() - this.startDate.getTime()) / 1000;
|
|
41
|
-
return Math.floor(runInSeconds / 60) +
|
|
41
|
+
return Math.floor(runInSeconds / 60) + "m " + Math.floor(runInSeconds % 60) + "s";
|
|
42
42
|
};
|
|
43
43
|
eventCutoffDate = currentFeature.timeAdded;
|
|
44
|
-
info(
|
|
44
|
+
info("WORK", "Now working on feature", currentFeature.name, "with params", currentFeature.params);
|
|
45
45
|
if (currentFeature.status === FEATURE_STATUS.ACTIVE) {
|
|
46
46
|
try {
|
|
47
|
-
currentlyWorkingOn =
|
|
47
|
+
currentlyWorkingOn = "";
|
|
48
48
|
cancelFeatureRequested = false;
|
|
49
49
|
await currentFeature.entry();
|
|
50
50
|
featureSuccess(currentFeature.name);
|
|
@@ -57,30 +57,30 @@ async function workOnNextFeature() {
|
|
|
57
57
|
err = e;
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
60
|
-
err = new Error(typeof e ===
|
|
60
|
+
err = new Error(typeof e === "string" ? e : "Unknown error");
|
|
61
61
|
}
|
|
62
62
|
try {
|
|
63
63
|
await dispatcherConfig.handlers.errorHandler(err.message?.length > 0 ? err.message : err.name, err.stack);
|
|
64
64
|
}
|
|
65
65
|
catch (e2) {
|
|
66
|
-
warn(
|
|
66
|
+
warn("WORK", "Unable to send mail:", e2);
|
|
67
67
|
}
|
|
68
68
|
featureError(currentFeature.name, err.message?.length > 0 ? err.message : err.name);
|
|
69
69
|
addErrorToCurrentFeature(err);
|
|
70
70
|
console.log(err.stack);
|
|
71
71
|
await resetQ();
|
|
72
|
-
info(
|
|
72
|
+
info("WORK", "Clearing cache after error");
|
|
73
73
|
}
|
|
74
74
|
// printStatistics();
|
|
75
75
|
}
|
|
76
76
|
else {
|
|
77
|
-
info(
|
|
77
|
+
info("WORK", "Feature is disabled.");
|
|
78
78
|
}
|
|
79
79
|
if (currentFeature.errorForFeature)
|
|
80
|
-
warn(
|
|
80
|
+
warn("WORK", "Feature errors:", currentFeature.errorForFeature);
|
|
81
81
|
const runInSeconds = Math.abs(new Date().getTime() - currentFeature.startDate.getTime()) / 1000;
|
|
82
|
-
const durationString = Math.floor(runInSeconds / 60) +
|
|
83
|
-
info(
|
|
82
|
+
const durationString = Math.floor(runInSeconds / 60) + "m " + Math.floor(runInSeconds % 60) + "s";
|
|
83
|
+
info("WORK", "run duration:", durationString);
|
|
84
84
|
currentFeature.durationString = durationString;
|
|
85
85
|
pastQ.unshift(currentFeature);
|
|
86
86
|
currentFeature = null;
|
|
@@ -102,42 +102,41 @@ export function increaseRedisMisses() {
|
|
|
102
102
|
currentFeature.redisMisses++;
|
|
103
103
|
}
|
|
104
104
|
export function terminate() {
|
|
105
|
-
info(
|
|
105
|
+
info("WORK", "TERMINATE INITIATED!");
|
|
106
106
|
Q = [];
|
|
107
107
|
terminating = true;
|
|
108
108
|
cancelFeatureRequested = true;
|
|
109
109
|
}
|
|
110
110
|
export async function resetQ() {
|
|
111
|
-
info(
|
|
111
|
+
info("WORK", "Reset Q!");
|
|
112
112
|
cancelFeatureRequested = true;
|
|
113
113
|
Q = [];
|
|
114
114
|
addFeaturesToQ([]);
|
|
115
115
|
await dispatcherConfig.handlers.emptyQHandler();
|
|
116
116
|
}
|
|
117
117
|
export function addEventToList(name, params) {
|
|
118
|
-
name
|
|
119
|
-
name = name.replace('JIRA:', '');
|
|
120
|
-
debug('WORK', 'Adding event to EventList', name, 'PARAMS', params);
|
|
118
|
+
debug("WORK", "Adding event to EventList", name, "PARAMS", params);
|
|
121
119
|
const eventItem = {};
|
|
122
|
-
if (name.indexOf(
|
|
123
|
-
eventItem.name =
|
|
120
|
+
if (name.indexOf("EVENT") === -1) {
|
|
121
|
+
eventItem.name = "EVENT " + name;
|
|
124
122
|
}
|
|
125
123
|
else {
|
|
126
124
|
eventItem.name = name;
|
|
127
125
|
}
|
|
128
|
-
|
|
126
|
+
if (params)
|
|
127
|
+
eventItem.params = JSON.stringify(params);
|
|
129
128
|
eventItem.timeAdded = new Date();
|
|
130
129
|
eventItem.startDate = eventItem.timeAdded;
|
|
131
|
-
eventItem.type =
|
|
130
|
+
eventItem.type = "EVENT";
|
|
132
131
|
eventList.push(eventItem);
|
|
133
132
|
waitSyncMS(1);
|
|
134
133
|
const key = name;
|
|
135
134
|
if (Object.prototype.hasOwnProperty.call(dispatcherConfig.featureCatalog, key) && dispatcherConfig.featureCatalog[key] && dispatcherConfig.featureCatalog[key].length > 0) {
|
|
136
|
-
debug(
|
|
135
|
+
debug("WORK", "Found feature set for event name", name, ", adding to Q");
|
|
137
136
|
addFeaturesToQ(dispatcherConfig.featureCatalog[key]);
|
|
138
137
|
}
|
|
139
138
|
else {
|
|
140
|
-
warn(
|
|
139
|
+
warn("WORK", "No feature set found for event name", name);
|
|
141
140
|
}
|
|
142
141
|
}
|
|
143
142
|
export function getCurrentQ() {
|
|
@@ -164,7 +163,7 @@ export async function startWorking() {
|
|
|
164
163
|
}
|
|
165
164
|
else {
|
|
166
165
|
await workOnNextFeature();
|
|
167
|
-
info(
|
|
166
|
+
info("WORK", "Q", Q.map((item) => item.name));
|
|
168
167
|
}
|
|
169
168
|
}
|
|
170
169
|
}
|
|
@@ -176,12 +175,12 @@ export function addToFeatureResult(text) {
|
|
|
176
175
|
return;
|
|
177
176
|
}
|
|
178
177
|
if (currentFeature.result && currentFeature.result.length > 0) {
|
|
179
|
-
currentFeature.result +=
|
|
178
|
+
currentFeature.result += "<br>" + text;
|
|
180
179
|
}
|
|
181
180
|
else {
|
|
182
181
|
currentFeature.result = text;
|
|
183
182
|
}
|
|
184
|
-
fine(
|
|
183
|
+
fine("WORK", "Setting result to:", currentFeature.result);
|
|
185
184
|
}
|
|
186
185
|
export function setFeatureResult(text) {
|
|
187
186
|
if (!currentFeature)
|
|
@@ -190,16 +189,16 @@ export function setFeatureResult(text) {
|
|
|
190
189
|
}
|
|
191
190
|
export async function skipCurrentlyWorkingFeature() {
|
|
192
191
|
if (!currentFeature) {
|
|
193
|
-
warn(
|
|
192
|
+
warn("WORK", "No current feature to skip");
|
|
194
193
|
return;
|
|
195
194
|
}
|
|
196
195
|
const oldFeatureName = currentFeature.name;
|
|
197
|
-
warn(
|
|
196
|
+
warn("WORK", "Skipping current feature", currentFeature.name);
|
|
198
197
|
cancelFeatureRequested = true;
|
|
199
198
|
while (currentFeature && currentFeature.name === oldFeatureName) {
|
|
200
199
|
await sleep(0.001);
|
|
201
200
|
}
|
|
202
|
-
warn(
|
|
201
|
+
warn("WORK", "Feature", oldFeatureName, "was skipped.");
|
|
203
202
|
}
|
|
204
203
|
// ****** TEST SETUP ******
|
|
205
204
|
export const _testing_workQ = {
|
package/dist/work/workQ.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workQ.js","sourceRoot":"","sources":["../../src/work/workQ.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"workQ.js","sourceRoot":"","sources":["../../src/work/workQ.ts"],"names":[],"mappings":"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"}
|