@sera4/essentia 3.0.14 → 3.1.0-rc.1
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/README.md +93 -308
- package/dist/ts/cache/index.d.ts +2 -2
- package/dist/ts/cache/index.js +13 -9
- package/dist/ts/cache/index.js.map +1 -1
- package/dist/ts/constants/index.d.ts +1 -1
- package/dist/ts/constants/index.js +4 -4
- package/dist/ts/constants/index.js.map +1 -1
- package/dist/ts/cycle/index.js +22 -20
- package/dist/ts/cycle/index.js.map +1 -1
- package/dist/ts/dns/{DnsCache.js → dns-cache.js} +17 -10
- package/dist/ts/dns/dns-cache.js.map +1 -0
- package/dist/ts/dns/index.d.ts +1 -1
- package/dist/ts/dns/index.js +1 -1
- package/dist/ts/dns/index.js.map +1 -1
- package/dist/ts/formatter/index.d.ts +19 -18
- package/dist/ts/formatter/index.js +32 -26
- package/dist/ts/formatter/index.js.map +1 -1
- package/dist/ts/hal/index.d.ts +1 -1
- package/dist/ts/hal/index.js +4 -4
- package/dist/ts/hal/index.js.map +1 -1
- package/dist/ts/health/index.d.ts +2 -3
- package/dist/ts/health/index.js +44 -39
- package/dist/ts/health/index.js.map +1 -1
- package/dist/ts/helpers/test-server-wrapper.d.ts +2 -2
- package/dist/ts/helpers/test-server-wrapper.js +17 -8
- package/dist/ts/helpers/test-server-wrapper.js.map +1 -1
- package/dist/ts/index.d.ts +14 -16
- package/dist/ts/index.js +16 -18
- package/dist/ts/index.js.map +1 -1
- package/dist/ts/last-commit/index.js +11 -11
- package/dist/ts/last-commit/index.js.map +1 -1
- package/dist/ts/logger/index.d.ts +2 -1
- package/dist/ts/logger/index.js +2 -1
- package/dist/ts/logger/index.js.map +1 -1
- package/dist/ts/logger/s4-logger.d.ts +19 -1
- package/dist/ts/logger/s4-logger.js +45 -16
- package/dist/ts/logger/s4-logger.js.map +1 -1
- package/dist/ts/paginator/s4-pagination.d.ts +13 -11
- package/dist/ts/paginator/s4-pagination.js +10 -10
- package/dist/ts/paginator/s4-pagination.js.map +1 -1
- package/dist/ts/paginator/sql-pagination.js +35 -16
- package/dist/ts/paginator/sql-pagination.js.map +1 -1
- package/dist/ts/paper-trail/helpers.js +22 -24
- package/dist/ts/paper-trail/helpers.js.map +1 -1
- package/dist/ts/paper-trail/index.d.ts +1 -1
- package/dist/ts/paper-trail/index.js +62 -63
- package/dist/ts/paper-trail/index.js.map +1 -1
- package/dist/ts/prompts/index.d.ts +2 -2
- package/dist/ts/prompts/index.js +9 -9
- package/dist/ts/prompts/index.js.map +1 -1
- package/dist/ts/queue/index.d.ts +1 -1
- package/dist/ts/queue/index.js +22 -16
- package/dist/ts/queue/index.js.map +1 -1
- package/dist/ts/queue/publisher.js +5 -2
- package/dist/ts/queue/publisher.js.map +1 -1
- package/dist/ts/queue/queue-logger.js +1 -1
- package/dist/ts/queue/subscriber.js +7 -1
- package/dist/ts/queue/subscriber.js.map +1 -1
- package/dist/ts/safe-proxy/index.d.ts +3 -14
- package/dist/ts/safe-proxy/index.js +4 -8
- package/dist/ts/safe-proxy/index.js.map +1 -1
- package/dist/ts/serializer/index.d.ts +1 -1
- package/dist/ts/serializer/index.js +4 -4
- package/dist/ts/serializer/index.js.map +1 -1
- package/dist/ts/task-scheduler/index.js +9 -7
- package/dist/ts/task-scheduler/index.js.map +1 -1
- package/dist/ts/utils/index.d.ts +2 -2
- package/dist/ts/utils/index.js +33 -28
- package/dist/ts/utils/index.js.map +1 -1
- package/last-commit.ts +12 -0
- package/package.json +28 -11
- package/dist/ts/dns/DnsCache.js.map +0 -1
- package/index.js +0 -17
- package/package.tar.gz +0 -0
- /package/dist/ts/dns/{DnsCache.d.ts → dns-cache.d.ts} +0 -0
package/dist/ts/health/index.js
CHANGED
|
@@ -1,25 +1,30 @@
|
|
|
1
|
-
import path from
|
|
2
|
-
import morgan from
|
|
3
|
-
import { S4Logger } from
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import morgan from "morgan";
|
|
3
|
+
import { S4Logger } from "../logger/index.js";
|
|
4
4
|
export class HealthCheckError extends Error {
|
|
5
5
|
constructor(message) {
|
|
6
6
|
super(message);
|
|
7
|
-
this.name =
|
|
7
|
+
this.name = "HealthCheckError";
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
export class HealthCheck {
|
|
11
|
+
logger;
|
|
12
|
+
defaultResponse;
|
|
13
|
+
defaultPathRoute;
|
|
14
|
+
lastCallId;
|
|
15
|
+
pathPrefix;
|
|
16
|
+
healthChecks;
|
|
11
17
|
constructor(appendData = {}, enableLogging = true) {
|
|
12
18
|
this.logger = new S4Logger();
|
|
13
|
-
this.logger.configure({ level: enableLogging ?
|
|
19
|
+
this.logger.configure({ level: enableLogging ? "debug" : "error" });
|
|
14
20
|
this.defaultResponse = {
|
|
15
21
|
appendData,
|
|
16
22
|
status: 200,
|
|
17
|
-
errors: {}
|
|
23
|
+
errors: {},
|
|
18
24
|
};
|
|
19
|
-
this.defaultPathRoute =
|
|
20
|
-
this.suppressLogs = false;
|
|
25
|
+
this.defaultPathRoute = "health_check(.*)?";
|
|
21
26
|
this.lastCallId = 0;
|
|
22
|
-
this.pathPrefix =
|
|
27
|
+
this.pathPrefix = "";
|
|
23
28
|
this.healthChecks = [];
|
|
24
29
|
}
|
|
25
30
|
/**
|
|
@@ -31,27 +36,27 @@ export class HealthCheck {
|
|
|
31
36
|
setPrefix(prefix) {
|
|
32
37
|
this.pathPrefix = prefix;
|
|
33
38
|
}
|
|
34
|
-
defaultPath(prefix =
|
|
35
|
-
if (prefix ===
|
|
39
|
+
defaultPath(prefix = "") {
|
|
40
|
+
if (prefix === "") {
|
|
36
41
|
prefix = this.pathPrefix;
|
|
37
42
|
}
|
|
38
43
|
return `${prefix}/${this.defaultPathRoute}`;
|
|
39
44
|
}
|
|
40
45
|
routes(router) {
|
|
41
46
|
if (!router) {
|
|
42
|
-
throw new HealthCheckError(
|
|
47
|
+
throw new HealthCheckError("missing_express_router");
|
|
43
48
|
}
|
|
44
|
-
router.get(
|
|
49
|
+
router.get("/", (req, res) => {
|
|
45
50
|
this.checkHealth(req, res);
|
|
46
51
|
});
|
|
47
52
|
return router;
|
|
48
53
|
}
|
|
49
54
|
suppressHealthCheckLog(app) {
|
|
50
|
-
app.use(morgan(
|
|
55
|
+
app.use(morgan("combined", {
|
|
51
56
|
skip: (req) => {
|
|
52
57
|
const expressReq = req;
|
|
53
58
|
return expressReq.path === this.defaultPath();
|
|
54
|
-
}
|
|
59
|
+
},
|
|
55
60
|
}));
|
|
56
61
|
}
|
|
57
62
|
setupCheck(config) {
|
|
@@ -60,43 +65,43 @@ export class HealthCheck {
|
|
|
60
65
|
async checkHealth(req, res) {
|
|
61
66
|
const checkFormat = path.extname(req.baseUrl);
|
|
62
67
|
const result = await Promise.all(this.healthChecks.map(async (hc) => {
|
|
63
|
-
if (typeof hc ===
|
|
68
|
+
if (typeof hc === "function") {
|
|
64
69
|
try {
|
|
65
70
|
return await hc();
|
|
66
71
|
}
|
|
67
72
|
catch (e) {
|
|
68
|
-
return { name:
|
|
73
|
+
return { name: "unknown", result: "fail", status: e.status };
|
|
69
74
|
}
|
|
70
75
|
}
|
|
71
76
|
else {
|
|
72
77
|
const res = {
|
|
73
78
|
name: hc.name,
|
|
74
|
-
critical: hc.critical
|
|
79
|
+
critical: hc.critical,
|
|
75
80
|
};
|
|
76
81
|
try {
|
|
77
82
|
const result = await hc.healthFunction();
|
|
78
|
-
if (typeof result ===
|
|
79
|
-
res.result = result ?
|
|
83
|
+
if (typeof result === "boolean") {
|
|
84
|
+
res.result = result ? "success" : "fail";
|
|
80
85
|
}
|
|
81
86
|
else {
|
|
82
|
-
res.result =
|
|
87
|
+
res.result = "success";
|
|
83
88
|
}
|
|
84
89
|
return res;
|
|
85
90
|
}
|
|
86
91
|
catch (e) {
|
|
87
|
-
const appendStatus = e.status ? ` (${e.status})` :
|
|
92
|
+
const appendStatus = e.status ? ` (${e.status})` : "";
|
|
88
93
|
this.logger.warn(`${hc.name} service failed${appendStatus}`);
|
|
89
94
|
return {
|
|
90
95
|
...res,
|
|
91
|
-
result:
|
|
92
|
-
status: e.status
|
|
96
|
+
result: "fail",
|
|
97
|
+
status: e.status,
|
|
93
98
|
};
|
|
94
99
|
}
|
|
95
100
|
}
|
|
96
101
|
}));
|
|
97
102
|
try {
|
|
98
103
|
let callId = ++this.lastCallId;
|
|
99
|
-
if (
|
|
104
|
+
if (callId % (1 << 30) === 0) {
|
|
100
105
|
callId = this.lastCallId = 1;
|
|
101
106
|
}
|
|
102
107
|
let status = this.defaultResponse.status;
|
|
@@ -104,7 +109,7 @@ export class HealthCheck {
|
|
|
104
109
|
let criticalFail = false;
|
|
105
110
|
result.some((e) => {
|
|
106
111
|
if (e.result.match(/fail/)) {
|
|
107
|
-
if (
|
|
112
|
+
if ("critical" in e && e.critical === false) {
|
|
108
113
|
nonCriticalFail = true;
|
|
109
114
|
}
|
|
110
115
|
else {
|
|
@@ -115,26 +120,26 @@ export class HealthCheck {
|
|
|
115
120
|
}
|
|
116
121
|
return false;
|
|
117
122
|
});
|
|
118
|
-
res.setHeader(
|
|
119
|
-
if (checkFormat ===
|
|
123
|
+
res.setHeader("check", callId);
|
|
124
|
+
if (checkFormat === ".json") {
|
|
120
125
|
const payload = {
|
|
121
126
|
check: callId,
|
|
122
127
|
healthy: true,
|
|
123
|
-
message:
|
|
128
|
+
message: "success",
|
|
124
129
|
};
|
|
125
130
|
if (criticalFail) {
|
|
126
131
|
res.status(status).json({
|
|
127
132
|
...payload,
|
|
128
133
|
healthy: false,
|
|
129
|
-
message:
|
|
130
|
-
services: result
|
|
134
|
+
message: "fail",
|
|
135
|
+
services: result,
|
|
131
136
|
});
|
|
132
137
|
}
|
|
133
138
|
else if (nonCriticalFail) {
|
|
134
139
|
res.status(status).json({
|
|
135
140
|
...payload,
|
|
136
|
-
message:
|
|
137
|
-
services: result
|
|
141
|
+
message: "fail",
|
|
142
|
+
services: result,
|
|
138
143
|
});
|
|
139
144
|
}
|
|
140
145
|
else if (status === 200) {
|
|
@@ -144,20 +149,20 @@ export class HealthCheck {
|
|
|
144
149
|
else {
|
|
145
150
|
let statusMessage;
|
|
146
151
|
if (criticalFail) {
|
|
147
|
-
statusMessage =
|
|
152
|
+
statusMessage = "fail";
|
|
148
153
|
}
|
|
149
|
-
else if (
|
|
150
|
-
statusMessage =
|
|
154
|
+
else if (status === 200 || nonCriticalFail) {
|
|
155
|
+
statusMessage = "success";
|
|
151
156
|
}
|
|
152
157
|
else {
|
|
153
|
-
statusMessage =
|
|
158
|
+
statusMessage = "unknown";
|
|
154
159
|
}
|
|
155
160
|
res.status(status).send(statusMessage);
|
|
156
161
|
}
|
|
157
162
|
}
|
|
158
163
|
catch (error) {
|
|
159
|
-
this.logger.error(
|
|
160
|
-
res.status(500).send(
|
|
164
|
+
this.logger.error("Health check error:", error);
|
|
165
|
+
res.status(500).send("Internal Server Error");
|
|
161
166
|
}
|
|
162
167
|
}
|
|
163
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/health/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/health/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,10 @@ export declare class TestServerWrapper {
|
|
|
18
18
|
private apiPrefix;
|
|
19
19
|
private routePrinter;
|
|
20
20
|
private chai;
|
|
21
|
-
private mobileDomain;
|
|
22
|
-
private webDomain;
|
|
23
21
|
private factory;
|
|
24
22
|
v1: V1API;
|
|
23
|
+
mobileDomain: string;
|
|
24
|
+
webDomain: string;
|
|
25
25
|
constructor(apiPrefix: string, expressServer: any, defaultHeaders: Record<string, string>, oldAuthToken: string, routePrinter: any, chai: any, factory: any);
|
|
26
26
|
/**
|
|
27
27
|
* Adds a leading slash to the url if missing
|
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
const s4Domain = "sera4.com";
|
|
2
|
-
const mobileDomain =
|
|
3
|
-
const webDomain =
|
|
2
|
+
const mobileDomain = `tws-mob.${s4Domain}`;
|
|
3
|
+
const webDomain = `tws-web.${s4Domain}`;
|
|
4
4
|
/**
|
|
5
5
|
* A small wrapper around an express js server
|
|
6
6
|
* meant to be used in unit tests
|
|
7
7
|
*/
|
|
8
8
|
export class TestServerWrapper {
|
|
9
|
+
server;
|
|
10
|
+
defaultHeaders;
|
|
11
|
+
apiPrefix;
|
|
12
|
+
routePrinter;
|
|
13
|
+
chai;
|
|
14
|
+
factory;
|
|
15
|
+
v1;
|
|
16
|
+
mobileDomain;
|
|
17
|
+
webDomain;
|
|
9
18
|
constructor(apiPrefix, expressServer, defaultHeaders, oldAuthToken, routePrinter, chai, factory) {
|
|
10
19
|
this.server = expressServer;
|
|
11
20
|
this.defaultHeaders = defaultHeaders;
|
|
@@ -16,12 +25,12 @@ export class TestServerWrapper {
|
|
|
16
25
|
this.webDomain = webDomain;
|
|
17
26
|
this.factory = factory;
|
|
18
27
|
// Support for older/deprecated apis
|
|
19
|
-
const oldAuthHeaders = { headers: {
|
|
28
|
+
const oldAuthHeaders = { headers: { Authorization: `Token organization_token=${oldAuthToken}` } };
|
|
20
29
|
this.v1 = {
|
|
21
30
|
get: (url) => this.getWithPrefix("/v1", url, oldAuthHeaders),
|
|
22
31
|
post: (url) => this.postWithPrefix("/v1", url, oldAuthHeaders),
|
|
23
32
|
put: (url) => this.putWithPrefix("/v1", url, oldAuthHeaders),
|
|
24
|
-
delete: (url) => this.deleteWithPrefix("/v1", url, oldAuthHeaders)
|
|
33
|
+
delete: (url) => this.deleteWithPrefix("/v1", url, oldAuthHeaders),
|
|
25
34
|
};
|
|
26
35
|
}
|
|
27
36
|
/**
|
|
@@ -32,7 +41,7 @@ export class TestServerWrapper {
|
|
|
32
41
|
sanitizeUrl(url) {
|
|
33
42
|
// add leading slash if missing
|
|
34
43
|
if (!url.startsWith("/")) {
|
|
35
|
-
return
|
|
44
|
+
return `/${url}`;
|
|
36
45
|
}
|
|
37
46
|
else {
|
|
38
47
|
return url;
|
|
@@ -44,7 +53,7 @@ export class TestServerWrapper {
|
|
|
44
53
|
* @param {Object} headers
|
|
45
54
|
*/
|
|
46
55
|
applyHeaders(request, headers) {
|
|
47
|
-
Object.keys(headers).
|
|
56
|
+
Object.keys(headers).forEach((k) => {
|
|
48
57
|
request.set(k, headers[k]);
|
|
49
58
|
});
|
|
50
59
|
}
|
|
@@ -110,7 +119,7 @@ export class TestServerWrapper {
|
|
|
110
119
|
this.applyHeaders(request, options.headers);
|
|
111
120
|
}
|
|
112
121
|
request.field(fields);
|
|
113
|
-
request.attach(
|
|
122
|
+
request.attach("file", file);
|
|
114
123
|
return request;
|
|
115
124
|
}
|
|
116
125
|
stop() {
|
|
@@ -126,7 +135,7 @@ export class TestServerWrapper {
|
|
|
126
135
|
async setMembership(membership, addlHeaders = {}) {
|
|
127
136
|
const headers = {
|
|
128
137
|
"X-Membership": membership,
|
|
129
|
-
...addlHeaders
|
|
138
|
+
...addlHeaders,
|
|
130
139
|
};
|
|
131
140
|
return new TestServerWrapper(this.apiPrefix, this.server, { ...this.defaultHeaders, ...headers }, "", // oldAuthToken
|
|
132
141
|
this.routePrinter, this.chai, this.factory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-server-wrapper.js","sourceRoot":"","sources":["../../../ts/helpers/test-server-wrapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"test-server-wrapper.js","sourceRoot":"","sources":["../../../ts/helpers/test-server-wrapper.ts"],"names":[],"mappings":"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"}
|
package/dist/ts/index.d.ts
CHANGED
|
@@ -1,22 +1,20 @@
|
|
|
1
|
-
export * from "./
|
|
2
|
-
export * from "./logger/index.js";
|
|
3
|
-
export * from "./cycle/index.js";
|
|
1
|
+
export * from "./cache/index.js";
|
|
4
2
|
export * from "./constants/index.js";
|
|
5
|
-
export * from "./
|
|
3
|
+
export * from "./cycle/index.js";
|
|
4
|
+
export { DnsCache } from "./dns/dns-cache.js";
|
|
5
|
+
export * from "./dns/index.js";
|
|
6
|
+
export { default as formatter } from "./formatter/index.js";
|
|
7
|
+
export { default as halDecorator } from "./hal/index.js";
|
|
8
|
+
export { HealthCheck as healthCheck } from "./health/index.js";
|
|
6
9
|
export * from "./helpers/index.js";
|
|
10
|
+
export { default as lastCommit } from "./last-commit/index.js";
|
|
11
|
+
export * from "./logger/index.js";
|
|
12
|
+
export { default as logger, S4Logger } from "./logger/s4-logger.js";
|
|
7
13
|
export * from "./paginator/index.js";
|
|
8
|
-
export
|
|
14
|
+
export { s4Paginator as paginator, sqlPaginator } from "./paginator/index.js";
|
|
15
|
+
export { default as paperTrail } from "./paper-trail/index.js";
|
|
9
16
|
export * from "./prompts/index.js";
|
|
10
|
-
export * from "./safe-proxy/index.js";
|
|
11
|
-
export { DnsCache } from "./dns/DnsCache.js";
|
|
12
|
-
export { S4Logger } from "./logger/s4-logger.js";
|
|
13
|
-
export { s4Paginator as paginator } from "./paginator/index.js";
|
|
14
|
-
export { sqlPaginator } from "./paginator/index.js";
|
|
15
|
-
export { HealthCheck as healthCheck } from "./health/index.js";
|
|
16
|
-
export { default as logger } from "./logger/s4-logger.js";
|
|
17
17
|
export { default as queue } from "./queue/index.js";
|
|
18
|
-
export
|
|
19
|
-
export { default as halDecorator } from "./hal/index.js";
|
|
20
|
-
export { default as formatter } from "./formatter/index.js";
|
|
18
|
+
export * from "./safe-proxy/index.js";
|
|
21
19
|
export { default as serializer } from "./serializer/index.js";
|
|
22
|
-
export
|
|
20
|
+
export * from "./utils/index.js";
|
package/dist/ts/index.js
CHANGED
|
@@ -1,27 +1,25 @@
|
|
|
1
1
|
// Export all TypeScript modules
|
|
2
|
-
export * from "./dns/index.js";
|
|
3
|
-
export * from "./logger/index.js";
|
|
4
|
-
export * from "./cycle/index.js";
|
|
5
|
-
export * from "./constants/index.js";
|
|
6
|
-
export * from "./utils/index.js";
|
|
7
|
-
export * from "./helpers/index.js";
|
|
8
|
-
export * from "./paginator/index.js";
|
|
9
2
|
export * from "./cache/index.js";
|
|
10
|
-
export * from "./
|
|
11
|
-
export * from "./
|
|
3
|
+
export * from "./constants/index.js";
|
|
4
|
+
export * from "./cycle/index.js";
|
|
12
5
|
// Re-export specific items with proper names
|
|
13
|
-
export { DnsCache } from "./dns/
|
|
14
|
-
export
|
|
15
|
-
export {
|
|
16
|
-
export {
|
|
6
|
+
export { DnsCache } from "./dns/dns-cache.js";
|
|
7
|
+
export * from "./dns/index.js";
|
|
8
|
+
export { default as formatter } from "./formatter/index.js";
|
|
9
|
+
export { default as halDecorator } from "./hal/index.js";
|
|
17
10
|
export { HealthCheck as healthCheck } from "./health/index.js";
|
|
11
|
+
export * from "./helpers/index.js";
|
|
12
|
+
export { default as lastCommit } from "./last-commit/index.js";
|
|
13
|
+
export * from "./logger/index.js";
|
|
18
14
|
// Export default logger instance
|
|
19
|
-
export { default as logger } from "./logger/s4-logger.js";
|
|
15
|
+
export { default as logger, S4Logger } from "./logger/s4-logger.js";
|
|
16
|
+
export * from "./paginator/index.js";
|
|
17
|
+
export { s4Paginator as paginator, sqlPaginator } from "./paginator/index.js";
|
|
18
|
+
export { default as paperTrail } from "./paper-trail/index.js";
|
|
19
|
+
export * from "./prompts/index.js";
|
|
20
20
|
// Export default exports
|
|
21
21
|
export { default as queue } from "./queue/index.js";
|
|
22
|
-
export
|
|
23
|
-
export { default as halDecorator } from "./hal/index.js";
|
|
24
|
-
export { default as formatter } from "./formatter/index.js";
|
|
22
|
+
export * from "./safe-proxy/index.js";
|
|
25
23
|
export { default as serializer } from "./serializer/index.js";
|
|
26
|
-
export
|
|
24
|
+
export * from "./utils/index.js";
|
|
27
25
|
//# sourceMappingURL=index.js.map
|
package/dist/ts/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,6CAA6C;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC/D,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC/D,cAAc,mBAAmB,CAAC;AAClC,iCAAiC;AACjC,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACpE,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC/D,cAAc,oBAAoB,CAAC;AACnC,yBAAyB;AACzB,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACpD,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC9D,cAAc,kBAAkB,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import { dirname } from "node:path";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
3
4
|
import async from "async";
|
|
4
|
-
import
|
|
5
|
-
import { fileURLToPath } from 'url';
|
|
5
|
+
import git from "git-rev";
|
|
6
6
|
const appDir = dirname(fileURLToPath(import.meta.url));
|
|
7
7
|
const commitFile = `${appDir}/last-commit.json`;
|
|
8
8
|
const lastCommit = {
|
|
@@ -21,7 +21,7 @@ const lastCommit = {
|
|
|
21
21
|
commit.commit = str; // Fixed typo: was "commmit"
|
|
22
22
|
next(null, commit);
|
|
23
23
|
});
|
|
24
|
-
}
|
|
24
|
+
},
|
|
25
25
|
], (err, commit) => {
|
|
26
26
|
if (err) {
|
|
27
27
|
reject(err);
|
|
@@ -34,7 +34,7 @@ const lastCommit = {
|
|
|
34
34
|
},
|
|
35
35
|
getLastCommit() {
|
|
36
36
|
return new Promise((resolve, reject) => {
|
|
37
|
-
fs.readFile(commitFile,
|
|
37
|
+
fs.readFile(commitFile, "utf8", (err, data) => {
|
|
38
38
|
if (err) {
|
|
39
39
|
reject(err);
|
|
40
40
|
}
|
|
@@ -51,7 +51,7 @@ const lastCommit = {
|
|
|
51
51
|
});
|
|
52
52
|
},
|
|
53
53
|
getLastCommitSync() {
|
|
54
|
-
const data = fs.readFileSync(commitFile,
|
|
54
|
+
const data = fs.readFileSync(commitFile, "utf8");
|
|
55
55
|
return JSON.parse(data);
|
|
56
56
|
},
|
|
57
57
|
writeLastCommit() {
|
|
@@ -60,13 +60,13 @@ const lastCommit = {
|
|
|
60
60
|
(next) => {
|
|
61
61
|
this.parseLastCommit()
|
|
62
62
|
.then((commit) => next(null, commit))
|
|
63
|
-
.catch(e => next(e));
|
|
63
|
+
.catch((e) => next(e));
|
|
64
64
|
},
|
|
65
65
|
(commit, next) => {
|
|
66
|
-
fs.writeFile(commitFile, JSON.stringify(commit, null, 2),
|
|
66
|
+
fs.writeFile(commitFile, JSON.stringify(commit, null, 2), "utf8", (err) => {
|
|
67
67
|
next(err, commit);
|
|
68
68
|
});
|
|
69
|
-
}
|
|
69
|
+
},
|
|
70
70
|
], (err, commit) => {
|
|
71
71
|
if (err) {
|
|
72
72
|
reject(err);
|
|
@@ -76,7 +76,7 @@ const lastCommit = {
|
|
|
76
76
|
}
|
|
77
77
|
});
|
|
78
78
|
});
|
|
79
|
-
}
|
|
79
|
+
},
|
|
80
80
|
};
|
|
81
81
|
export default lastCommit;
|
|
82
82
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/last-commit/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/last-commit/index.ts"],"names":[],"mappings":"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"}
|
package/dist/ts/logger/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,CAAC;AACpB,eAAe,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,CAAC;AACpB,OAAO,EAAE,UAAU,EAA8C,MAAM,gBAAgB,CAAC;AACxF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,12 +1,30 @@
|
|
|
1
1
|
import "winston-logstash";
|
|
2
|
+
export declare const LOG_LEVELS: readonly ["error", "warn", "info", "debug", "trace"];
|
|
3
|
+
export type LogLevel = (typeof LOG_LEVELS)[number];
|
|
4
|
+
export interface ResolveLogLevelOptions {
|
|
5
|
+
/** Default level used when env var is unset or invalid. */
|
|
6
|
+
defaultLevel?: string;
|
|
7
|
+
/** Whether the runtime is production. Defaults to NODE_ENV === 'production'. */
|
|
8
|
+
isProduction?: boolean;
|
|
9
|
+
/** Env var to read. Defaults to 'S4_LOG_LEVEL'. */
|
|
10
|
+
envVar?: string;
|
|
11
|
+
/** Tag used in the warning emitted when the requested level is rejected. */
|
|
12
|
+
warnTag?: string;
|
|
13
|
+
}
|
|
2
14
|
interface LoggerOptions {
|
|
3
15
|
level?: string;
|
|
4
16
|
service?: string;
|
|
5
|
-
format?:
|
|
17
|
+
format?: "logstash" | "json" | "default";
|
|
6
18
|
}
|
|
7
19
|
export declare class S4Logger {
|
|
8
20
|
configure(options?: LoggerOptions): void;
|
|
9
21
|
setLevel(level?: string): void;
|
|
22
|
+
/**
|
|
23
|
+
* Resolve a log level from the environment, applying a production floor of
|
|
24
|
+
* `info` (debug/trace are rejected with a console warning in prod). Returns
|
|
25
|
+
* the default level when the env var is unset or invalid.
|
|
26
|
+
*/
|
|
27
|
+
static resolveLogLevel(options?: ResolveLogLevelOptions): LogLevel;
|
|
10
28
|
mute(): void;
|
|
11
29
|
unmute(): void;
|
|
12
30
|
trace(...args: any[]): void;
|