@oneuptime/common 7.0.3250 → 7.0.3263
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/API/StatusAPI.ts +1 -1
- package/Server/Infrastructure/ClickhouseDatabase.ts +1 -2
- package/Server/Infrastructure/Status.ts +12 -0
- package/Server/Middleware/ClusterKeyAuthorization.ts +12 -8
- package/build/dist/Server/API/StatusAPI.js +1 -1
- package/build/dist/Server/API/StatusAPI.js.map +1 -1
- package/build/dist/Server/Infrastructure/ClickhouseDatabase.js.map +1 -1
- package/build/dist/Server/Infrastructure/Status.js +11 -0
- package/build/dist/Server/Infrastructure/Status.js.map +1 -1
- package/build/dist/Server/Middleware/ClusterKeyAuthorization.js +10 -7
- package/build/dist/Server/Middleware/ClusterKeyAuthorization.js.map +1 -1
- package/package.json +2 -2
package/Server/API/StatusAPI.ts
CHANGED
|
@@ -107,7 +107,7 @@ export default class StatusAPI {
|
|
|
107
107
|
async (req: ExpressRequest, res: ExpressResponse) => {
|
|
108
108
|
try {
|
|
109
109
|
logger.debug("Live check");
|
|
110
|
-
await options.
|
|
110
|
+
await options.liveCheck();
|
|
111
111
|
logger.info("Live check: ok");
|
|
112
112
|
stausLiveSuccess.add(1);
|
|
113
113
|
|
|
@@ -4,8 +4,7 @@ import {
|
|
|
4
4
|
dataSourceOptions,
|
|
5
5
|
testDataSourceOptions,
|
|
6
6
|
} from "./ClickhouseConfig";
|
|
7
|
-
import { PingResult, createClient } from "@clickhouse/client";
|
|
8
|
-
import { ClickHouseClient } from "@clickhouse/client";
|
|
7
|
+
import { PingResult, createClient, ClickHouseClient } from "@clickhouse/client";
|
|
9
8
|
import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException";
|
|
10
9
|
import Sleep from "Common/Types/Sleep";
|
|
11
10
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// This class checks the status of all the datasources.
|
|
2
|
+
import logger from "../Utils/Logger";
|
|
2
3
|
import { ClickhouseAppInstance } from "./ClickhouseDatabase";
|
|
3
4
|
import PostgresAppInstance from "./PostgresDatabase";
|
|
4
5
|
import Redis from "./Redis";
|
|
@@ -10,22 +11,33 @@ export default class InfrastructureStatus {
|
|
|
10
11
|
checkPostgresStatus: boolean;
|
|
11
12
|
checkClickhouseStatus: boolean;
|
|
12
13
|
}): Promise<void> {
|
|
14
|
+
logger.debug("Checking infrastructure status");
|
|
15
|
+
|
|
13
16
|
if (data.checkRedisStatus) {
|
|
17
|
+
logger.debug("Checking Redis status");
|
|
14
18
|
if (!(await Redis.checkConnnectionStatus())) {
|
|
19
|
+
logger.debug("Redis is not connected");
|
|
15
20
|
throw new DatabaseNotConnectedException("Redis is not connected");
|
|
16
21
|
}
|
|
22
|
+
logger.debug("Redis is connected");
|
|
17
23
|
}
|
|
18
24
|
|
|
19
25
|
if (data.checkPostgresStatus) {
|
|
26
|
+
logger.debug("Checking Postgres status");
|
|
20
27
|
if (!(await PostgresAppInstance.checkConnnectionStatus())) {
|
|
28
|
+
logger.debug("Postgres is not connected");
|
|
21
29
|
throw new DatabaseNotConnectedException("Postgres is not connected");
|
|
22
30
|
}
|
|
31
|
+
logger.debug("Postgres is connected");
|
|
23
32
|
}
|
|
24
33
|
|
|
25
34
|
if (data.checkClickhouseStatus) {
|
|
35
|
+
logger.debug("Checking Clickhouse status");
|
|
26
36
|
if (!(await ClickhouseAppInstance.checkConnnectionStatus())) {
|
|
37
|
+
logger.debug("Clickhouse is not connected");
|
|
27
38
|
throw new DatabaseNotConnectedException("Clickhouse is not connected");
|
|
28
39
|
}
|
|
40
|
+
logger.debug("Clickhouse is connected");
|
|
29
41
|
}
|
|
30
42
|
}
|
|
31
43
|
}
|
|
@@ -7,31 +7,35 @@ import {
|
|
|
7
7
|
import Response from "../Utils/Response";
|
|
8
8
|
import Dictionary from "Common/Types/Dictionary";
|
|
9
9
|
import BadDataException from "Common/Types/Exception/BadDataException";
|
|
10
|
-
import ObjectID from "Common/Types/ObjectID";
|
|
11
10
|
|
|
12
11
|
export default class ClusterKeyAuthorization {
|
|
13
12
|
public static getClusterKeyHeaders(): Dictionary<string> {
|
|
14
13
|
return {
|
|
15
|
-
clusterkey:
|
|
14
|
+
clusterkey: ClusterKeyAuthorization.getClusterKey(),
|
|
16
15
|
};
|
|
17
16
|
}
|
|
18
17
|
|
|
18
|
+
public static getClusterKey(): string {
|
|
19
|
+
// we encode uri component because a lot of people use special characters in their cluster key secret
|
|
20
|
+
return encodeURIComponent(ONEUPTIME_SECRET.toString());
|
|
21
|
+
}
|
|
22
|
+
|
|
19
23
|
public static async isAuthorizedServiceMiddleware(
|
|
20
24
|
req: ExpressRequest,
|
|
21
25
|
res: ExpressResponse,
|
|
22
26
|
next: NextFunction,
|
|
23
27
|
): Promise<void> {
|
|
24
|
-
let clusterKey:
|
|
28
|
+
let clusterKey: string;
|
|
25
29
|
|
|
26
30
|
if (req.params && req.params["clusterKey"]) {
|
|
27
|
-
clusterKey =
|
|
31
|
+
clusterKey = req.params["clusterKey"];
|
|
28
32
|
} else if (req.query && req.query["clusterKey"]) {
|
|
29
|
-
clusterKey =
|
|
33
|
+
clusterKey = req.query["clusterKey"] as string;
|
|
30
34
|
} else if (req.headers && req.headers["clusterkey"]) {
|
|
31
35
|
// Header keys are automatically transformed to lowercase
|
|
32
|
-
clusterKey =
|
|
36
|
+
clusterKey = req.headers["clusterkey"] as string;
|
|
33
37
|
} else if (req.body && req.body.clusterKey) {
|
|
34
|
-
clusterKey =
|
|
38
|
+
clusterKey = req.body.clusterKey;
|
|
35
39
|
} else {
|
|
36
40
|
return Response.sendErrorResponse(
|
|
37
41
|
req,
|
|
@@ -41,7 +45,7 @@ export default class ClusterKeyAuthorization {
|
|
|
41
45
|
}
|
|
42
46
|
|
|
43
47
|
const isAuthorized: boolean =
|
|
44
|
-
clusterKey.toString() ===
|
|
48
|
+
clusterKey.toString() === ClusterKeyAuthorization.getClusterKey();
|
|
45
49
|
|
|
46
50
|
if (!isAuthorized) {
|
|
47
51
|
return Response.sendErrorResponse(
|
|
@@ -74,7 +74,7 @@ export default class StatusAPI {
|
|
|
74
74
|
router.get("/status/live", async (req, res) => {
|
|
75
75
|
try {
|
|
76
76
|
logger.debug("Live check");
|
|
77
|
-
await options.
|
|
77
|
+
await options.liveCheck();
|
|
78
78
|
logger.info("Live check: ok");
|
|
79
79
|
stausLiveSuccess.add(1);
|
|
80
80
|
Response.sendJsonObjectResponse(req, res, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StatusAPI.js","sourceRoot":"","sources":["../../../../Server/API/StatusAPI.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"StatusAPI.js","sourceRoot":"","sources":["../../../../Server/API/StatusAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClickhouseDatabase.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAEL,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAc,YAAY,
|
|
1
|
+
{"version":3,"file":"ClickhouseDatabase.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseDatabase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,35 @@
|
|
|
1
1
|
// This class checks the status of all the datasources.
|
|
2
|
+
import logger from "../Utils/Logger";
|
|
2
3
|
import { ClickhouseAppInstance } from "./ClickhouseDatabase";
|
|
3
4
|
import PostgresAppInstance from "./PostgresDatabase";
|
|
4
5
|
import Redis from "./Redis";
|
|
5
6
|
import DatabaseNotConnectedException from "Common/Types/Exception/DatabaseNotConnectedException";
|
|
6
7
|
export default class InfrastructureStatus {
|
|
7
8
|
static async checkStatus(data) {
|
|
9
|
+
logger.debug("Checking infrastructure status");
|
|
8
10
|
if (data.checkRedisStatus) {
|
|
11
|
+
logger.debug("Checking Redis status");
|
|
9
12
|
if (!(await Redis.checkConnnectionStatus())) {
|
|
13
|
+
logger.debug("Redis is not connected");
|
|
10
14
|
throw new DatabaseNotConnectedException("Redis is not connected");
|
|
11
15
|
}
|
|
16
|
+
logger.debug("Redis is connected");
|
|
12
17
|
}
|
|
13
18
|
if (data.checkPostgresStatus) {
|
|
19
|
+
logger.debug("Checking Postgres status");
|
|
14
20
|
if (!(await PostgresAppInstance.checkConnnectionStatus())) {
|
|
21
|
+
logger.debug("Postgres is not connected");
|
|
15
22
|
throw new DatabaseNotConnectedException("Postgres is not connected");
|
|
16
23
|
}
|
|
24
|
+
logger.debug("Postgres is connected");
|
|
17
25
|
}
|
|
18
26
|
if (data.checkClickhouseStatus) {
|
|
27
|
+
logger.debug("Checking Clickhouse status");
|
|
19
28
|
if (!(await ClickhouseAppInstance.checkConnnectionStatus())) {
|
|
29
|
+
logger.debug("Clickhouse is not connected");
|
|
20
30
|
throw new DatabaseNotConnectedException("Clickhouse is not connected");
|
|
21
31
|
}
|
|
32
|
+
logger.debug("Clickhouse is connected");
|
|
22
33
|
}
|
|
23
34
|
}
|
|
24
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/Status.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,mBAAmB,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,6BAA6B,MAAM,sDAAsD,CAAC;AAEjG,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAChC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAI/B;QACC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,6BAA6B,CAAC,wBAAwB,CAAC,CAAC;YACpE,CAAC;
|
|
1
|
+
{"version":3,"file":"Status.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/Status.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,mBAAmB,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,6BAA6B,MAAM,sDAAsD,CAAC;AAEjG,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAChC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAI/B;QACC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAE/C,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACtC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;gBAC5C,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBACvC,MAAM,IAAI,6BAA6B,CAAC,wBAAwB,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;YACzC,IAAI,CAAC,CAAC,MAAM,mBAAmB,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;gBAC1D,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;gBAC1C,MAAM,IAAI,6BAA6B,CAAC,2BAA2B,CAAC,CAAC;YACvE,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC3C,IAAI,CAAC,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,CAAC,EAAE,CAAC;gBAC5D,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBAC5C,MAAM,IAAI,6BAA6B,CAAC,6BAA6B,CAAC,CAAC;YACzE,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,32 +1,35 @@
|
|
|
1
1
|
import { ClusterKey as ONEUPTIME_SECRET } from "../EnvironmentConfig";
|
|
2
2
|
import Response from "../Utils/Response";
|
|
3
3
|
import BadDataException from "Common/Types/Exception/BadDataException";
|
|
4
|
-
import ObjectID from "Common/Types/ObjectID";
|
|
5
4
|
export default class ClusterKeyAuthorization {
|
|
6
5
|
static getClusterKeyHeaders() {
|
|
7
6
|
return {
|
|
8
|
-
clusterkey:
|
|
7
|
+
clusterkey: ClusterKeyAuthorization.getClusterKey(),
|
|
9
8
|
};
|
|
10
9
|
}
|
|
10
|
+
static getClusterKey() {
|
|
11
|
+
// we encode uri component because a lot of people use special characters in their cluster key secret
|
|
12
|
+
return encodeURIComponent(ONEUPTIME_SECRET.toString());
|
|
13
|
+
}
|
|
11
14
|
static async isAuthorizedServiceMiddleware(req, res, next) {
|
|
12
15
|
let clusterKey;
|
|
13
16
|
if (req.params && req.params["clusterKey"]) {
|
|
14
|
-
clusterKey =
|
|
17
|
+
clusterKey = req.params["clusterKey"];
|
|
15
18
|
}
|
|
16
19
|
else if (req.query && req.query["clusterKey"]) {
|
|
17
|
-
clusterKey =
|
|
20
|
+
clusterKey = req.query["clusterKey"];
|
|
18
21
|
}
|
|
19
22
|
else if (req.headers && req.headers["clusterkey"]) {
|
|
20
23
|
// Header keys are automatically transformed to lowercase
|
|
21
|
-
clusterKey =
|
|
24
|
+
clusterKey = req.headers["clusterkey"];
|
|
22
25
|
}
|
|
23
26
|
else if (req.body && req.body.clusterKey) {
|
|
24
|
-
clusterKey =
|
|
27
|
+
clusterKey = req.body.clusterKey;
|
|
25
28
|
}
|
|
26
29
|
else {
|
|
27
30
|
return Response.sendErrorResponse(req, res, new BadDataException("Cluster key not found."));
|
|
28
31
|
}
|
|
29
|
-
const isAuthorized = clusterKey.toString() ===
|
|
32
|
+
const isAuthorized = clusterKey.toString() === ClusterKeyAuthorization.getClusterKey();
|
|
30
33
|
if (!isAuthorized) {
|
|
31
34
|
return Response.sendErrorResponse(req, res, new BadDataException("Invalid cluster key provided"));
|
|
32
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClusterKeyAuthorization.js","sourceRoot":"","sources":["../../../../Server/Middleware/ClusterKeyAuthorization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAMtE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAEzC,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"ClusterKeyAuthorization.js","sourceRoot":"","sources":["../../../../Server/Middleware/ClusterKeyAuthorization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAMtE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAEzC,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AAEvE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IACnC,MAAM,CAAC,oBAAoB;QAChC,OAAO;YACL,UAAU,EAAE,uBAAuB,CAAC,aAAa,EAAE;SACpD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,aAAa;QACzB,qGAAqG;QACrG,OAAO,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAC/C,GAAmB,EACnB,GAAoB,EACpB,IAAkB;QAElB,IAAI,UAAkB,CAAC;QAEvB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YAChD,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAW,CAAC;QACjD,CAAC;aAAM,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACpD,yDAAyD;YACzD,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAW,CAAC;QACnD,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3C,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAC/C,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAChB,UAAU,CAAC,QAAQ,EAAE,KAAK,uBAAuB,CAAC,aAAa,EAAE,CAAC;QAEpE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,8BAA8B,CAAC,CACrD,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/common",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3263",
|
|
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.3263",
|
|
81
81
|
"cookie-parser": "^1.4.7",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|