@goatlab/node-backend 1.1.0 → 1.1.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/dist/Cache.d.ts +1 -1
- package/dist/Cache.js +18 -16
- package/dist/Cache.js.map +1 -1
- package/dist/container/Container.d.ts +2 -2
- package/dist/container/Container.js +16 -8
- package/dist/container/Container.js.map +1 -1
- package/dist/container/DistributedCacheInvalidator.d.ts +1 -1
- package/dist/container/DistributedCacheInvalidator.js +8 -8
- package/dist/container/DistributedCacheInvalidator.js.map +1 -1
- package/dist/container/examples/batch-operations.example.js +25 -23
- package/dist/container/examples/batch-operations.example.js.map +1 -1
- package/dist/container/helpers.js +2 -1
- package/dist/container/helpers.js.map +1 -1
- package/dist/index.d.ts +24 -24
- package/dist/index.js +41 -41
- package/dist/index.js.map +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.d.ts +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js.map +1 -1
- package/dist/server/bootstraps/getExpressTrpcApp.d.ts +1 -1
- package/dist/server/bootstraps/getExpressTrpcApp.js +7 -6
- package/dist/server/bootstraps/getExpressTrpcApp.js.map +1 -1
- package/dist/server/consts.js +8 -8
- package/dist/server/consts.js.map +1 -1
- package/dist/server/context/request.context.js +0 -1
- package/dist/server/context/request.context.js.map +1 -1
- package/dist/server/context/trpc.context.d.ts +1 -1
- package/dist/server/context/trpc.context.js +2 -2
- package/dist/server/context/trpc.context.js.map +1 -1
- package/dist/server/initOpenApiDocs.d.ts +1 -1
- package/dist/server/initOpenApiDocs.js +3 -3
- package/dist/server/initOpenApiDocs.js.map +1 -1
- package/dist/server/middleware/cloudTaskDecrypt.middleware.d.ts +2 -2
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js +7 -9
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js.map +1 -1
- package/dist/server/middleware/error.middleware.d.ts +1 -1
- package/dist/server/middleware/error.middleware.js +13 -8
- package/dist/server/middleware/error.middleware.js.map +1 -1
- package/dist/server/middleware/handleRequest.middleware.d.ts +1 -1
- package/dist/server/middleware/handleRequest.middleware.js +3 -3
- package/dist/server/middleware/handleRequest.middleware.js.map +1 -1
- package/dist/server/middleware/logger/cloudRun.logger.d.ts +2 -2
- package/dist/server/middleware/logger/cloudRun.logger.js +15 -15
- package/dist/server/middleware/logger/cloudRun.logger.js.map +1 -1
- package/dist/server/middleware/logger/logger.service.js +2 -2
- package/dist/server/middleware/logs.middleware.d.ts +1 -1
- package/dist/server/middleware/logs.middleware.js +10 -14
- package/dist/server/middleware/logs.middleware.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.example.js +13 -11
- package/dist/server/middleware/memoryMonitor.example.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.middleware.d.ts +1 -1
- package/dist/server/middleware/memoryMonitor.middleware.js.map +1 -1
- package/dist/server/middleware/productionError.middleware.d.ts +2 -2
- package/dist/server/middleware/productionError.middleware.js.map +1 -1
- package/dist/server/middleware/security.middleware.d.ts +1 -1
- package/dist/server/middleware/security.middleware.js +1 -1
- package/dist/server/middleware/security.middleware.js.map +1 -1
- package/dist/server/middleware/trpcError.middleware.d.ts +1 -1
- package/dist/server/middleware/trpcError.middleware.js +8 -5
- package/dist/server/middleware/trpcError.middleware.js.map +1 -1
- package/dist/server/schemas/user.schema.js +3 -3
- package/dist/server/sentry/getSentry.d.ts +1 -1
- package/dist/server/sentry/getSentry.js +3 -3
- package/dist/server/sentry/getSentry.js.map +1 -1
- package/dist/server/sentry/sentry.service.d.ts +1 -1
- package/dist/server/sentry/sentry.service.js +11 -11
- package/dist/server/sentry/sentry.service.js.map +1 -1
- package/dist/server/services/email/email.model.js +1 -1
- package/dist/server/services/email/email.service.d.ts +3 -3
- package/dist/server/services/email/email.service.js +14 -14
- package/dist/server/services/email/email.service.js.map +1 -1
- package/dist/server/services/secrets/examples/container-preload.example.js +36 -16
- package/dist/server/services/secrets/examples/container-preload.example.js.map +1 -1
- package/dist/server/services/secrets/index.d.ts +1 -1
- package/dist/server/services/secrets/index.js.map +1 -1
- package/dist/server/services/secrets/secret.service.js +12 -9
- package/dist/server/services/secrets/secret.service.js.map +1 -1
- package/dist/server/services/sendgrid/sendgridApi.service.d.ts +1 -1
- package/dist/server/services/sendgrid/sendgridApi.service.js +14 -16
- package/dist/server/services/sendgrid/sendgridApi.service.js.map +1 -1
- package/dist/server/services/translations/template.util.js.map +1 -1
- package/dist/server/services/translations/translation.model.d.ts +2 -2
- package/dist/server/services/translations/translation.model.js +7 -1
- package/dist/server/services/translations/translation.model.js.map +1 -1
- package/dist/server/services/translations/translation.service.d.ts +5 -5
- package/dist/server/services/translations/translation.service.js +11 -9
- package/dist/server/services/translations/translation.service.js.map +1 -1
- package/dist/server/services/util/benchmarker.js +8 -8
- package/dist/server/services/util/benchmarker.js.map +1 -1
- package/dist/server/services/util/pagination.d.ts +4 -4
- package/dist/server/services/util/pagination.js +4 -4
- package/dist/server/services/util/pagination.js.map +1 -1
- package/dist/server/services/util/url.service.d.ts +4 -4
- package/dist/server/services/util/url.service.js +7 -7
- package/dist/server/services/util/url.service.js.map +1 -1
- package/dist/server/test/express.mock.js +6 -6
- package/dist/server/test/firebase.mock.js +2 -2
- package/dist/server/test/trpc.mock.d.ts +1 -1
- package/dist/server/test/trpc.mock.js +1 -1
- package/dist/server/test/trpc.mock.js.map +1 -1
- package/dist/server/trpc.d.ts +1 -1
- package/dist/server/trpc.js +10 -10
- package/dist/server/trpc.js.map +1 -1
- package/dist/test/const.js +7 -7
- package/dist/test/const.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -9
|
@@ -10,7 +10,7 @@ const sentry_service_1 = require("./sentry.service");
|
|
|
10
10
|
// https://docs.sentry.io/platforms/node/usage/sdk-fingerprinting/
|
|
11
11
|
// https://docs.sentry.io/product/data-management-settings/event-grouping/fingerprint-rules/#variables
|
|
12
12
|
const DEFAULT = '{{ default }}';
|
|
13
|
-
const getSentry = ({ dns, appVersion, environment
|
|
13
|
+
const getSentry = ({ dns, appVersion, environment }) => {
|
|
14
14
|
const sentryService = new sentry_service_1.SentryService({
|
|
15
15
|
dsn: dns,
|
|
16
16
|
release: appVersion || consts_1.pkg.version,
|
|
@@ -34,10 +34,10 @@ const getSentry = ({ dns, appVersion, environment, }) => {
|
|
|
34
34
|
return event;
|
|
35
35
|
}
|
|
36
36
|
return event;
|
|
37
|
-
}
|
|
37
|
+
}
|
|
38
38
|
});
|
|
39
39
|
sentryService.sentry().setTags(js_utils_1.Objects.deleteNulls({
|
|
40
|
-
ver: consts_1.pkg.version
|
|
40
|
+
ver: consts_1.pkg.version
|
|
41
41
|
}));
|
|
42
42
|
return sentryService;
|
|
43
43
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSentry.js","sourceRoot":"","sources":["../../../src/server/sentry/getSentry.ts"],"names":[],"mappings":";;;AACA,gDAA2C;AAC3C,2DAA2D;AAC3D,2DAAiE;AACjE,6BAA8B;AAC9B,sCAA+B;AAC/B,qDAAgD;AAEhD,kEAAkE;AAClE,sGAAsG;AACtG,MAAM,OAAO,GAAG,eAAe,CAAA;AAExB,MAAM,SAAS,GAAG,CAAC,EACxB,GAAG,EACH,UAAU,EACV,WAAW,
|
|
1
|
+
{"version":3,"file":"getSentry.js","sourceRoot":"","sources":["../../../src/server/sentry/getSentry.ts"],"names":[],"mappings":";;;AACA,gDAA2C;AAC3C,2DAA2D;AAC3D,2DAAiE;AACjE,6BAA8B;AAC9B,sCAA+B;AAC/B,qDAAgD;AAEhD,kEAAkE;AAClE,sGAAsG;AACtG,MAAM,OAAO,GAAG,eAAe,CAAA;AAExB,MAAM,SAAS,GAAG,CAAC,EACxB,GAAG,EACH,UAAU,EACV,WAAW,EAKZ,EAAE,EAAE;IACH,MAAM,aAAa,GAAG,IAAI,8BAAa,CAAC;QACtC,GAAG,EAAE,GAAG;QACR,OAAO,EAAE,UAAU,IAAI,YAAG,CAAC,OAAO;QAClC,WAAW,EAAE,WAAW;QACxB,gBAAgB,EAAE,CAAC;QACnB,kBAAkB,EAAE,CAAC;QACrB,YAAY,EAAE,CAAC,IAAA,yCAAwB,GAAS,CAAC;QACjD,UAAU,CAAC,KAAK,EAAE,IAAI;YACpB,MAAM,KAAK,GAAQ,IAAI,EAAE,iBAAiB,CAAA;YAE1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,KAAK,CAAA;YACd,CAAC;YAED,IACE,KAAK,YAAY,cAAQ,IAAI,0BAA0B;gBACvD,KAAK,CAAC,IAAI,EACV,CAAC;gBACD,KAAK,CAAC,WAAW,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;gBAErD,OAAO,KAAK,CAAA;YACd,CAAC;YAED,MAAM,IAAI,GAAI,KAAkB,CAAC,IAA6B,CAAA;YAE9D,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;gBACtB,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;gBACpC,OAAO,KAAK,CAAA;YACd,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAC,CAAA;IAEF,aAAa,CAAC,MAAM,EAAE,CAAC,OAAO,CAC5B,kBAAO,CAAC,WAAW,CAAC;QAClB,GAAG,EAAE,YAAG,CAAC,OAAO;KACjB,CAAC,CACH,CAAA;IAED,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAlDY,QAAA,SAAS,aAkDrB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type * as SentryLib from '@sentry/node';
|
|
2
1
|
import { CommonLogger } from '@goatlab/js-utils';
|
|
2
|
+
import type * as SentryLib from '@sentry/node';
|
|
3
3
|
import { Breadcrumb, NodeOptions, SeverityLevel } from '@sentry/node';
|
|
4
4
|
export type SentryServiceConfig = Record<string, unknown> & NodeOptions & {
|
|
5
5
|
logger?: CommonLogger;
|
|
@@ -8,7 +8,7 @@ const sentrySeverityMap = {
|
|
|
8
8
|
log: 'log',
|
|
9
9
|
warning: 'warn',
|
|
10
10
|
error: 'error',
|
|
11
|
-
fatal: 'error'
|
|
11
|
+
fatal: 'error'
|
|
12
12
|
};
|
|
13
13
|
class SentryService {
|
|
14
14
|
config;
|
|
@@ -25,7 +25,7 @@ class SentryService {
|
|
|
25
25
|
console.log('SentryService init...');
|
|
26
26
|
sentry.init({
|
|
27
27
|
maxValueLength: 2000, // Default is 250 characters
|
|
28
|
-
...this.config
|
|
28
|
+
...this.config
|
|
29
29
|
});
|
|
30
30
|
return sentry;
|
|
31
31
|
}
|
|
@@ -37,7 +37,7 @@ class SentryService {
|
|
|
37
37
|
*/
|
|
38
38
|
setUserId(id) {
|
|
39
39
|
this.sentry().getCurrentScope().setUser({
|
|
40
|
-
id
|
|
40
|
+
id
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
/**
|
|
@@ -60,12 +60,12 @@ class SentryService {
|
|
|
60
60
|
this.sentry().addBreadcrumb({
|
|
61
61
|
message: js_utils_1.Inspect.any(error, {
|
|
62
62
|
includeErrorData: true,
|
|
63
|
-
colors: false
|
|
64
|
-
})
|
|
63
|
+
colors: false
|
|
64
|
+
})
|
|
65
65
|
// Data: (err as AppError).data, // included in message
|
|
66
66
|
});
|
|
67
67
|
return this.sentry().captureException(js_utils_1.Errors.anyToError(error, Error, {
|
|
68
|
-
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
68
|
+
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
69
69
|
}));
|
|
70
70
|
}
|
|
71
71
|
/**
|
|
@@ -91,18 +91,18 @@ class SentryService {
|
|
|
91
91
|
warn() { }, // Noop
|
|
92
92
|
error: (...args) => {
|
|
93
93
|
const message = args
|
|
94
|
-
.map(
|
|
94
|
+
.map(arg => js_utils_1.Inspect.any(arg, {
|
|
95
95
|
includeErrorData: true,
|
|
96
|
-
colors: false
|
|
96
|
+
colors: false
|
|
97
97
|
}))
|
|
98
98
|
.join(' ');
|
|
99
99
|
this.sentry().addBreadcrumb({
|
|
100
|
-
message
|
|
100
|
+
message
|
|
101
101
|
});
|
|
102
102
|
this.sentry().captureException(js_utils_1.Errors.anyToError(args.length === 1 ? args[0] : args, Error, {
|
|
103
|
-
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
103
|
+
stringifyFn: js_utils_1.Inspect.anyStringifyFn
|
|
104
104
|
}));
|
|
105
|
-
}
|
|
105
|
+
}
|
|
106
106
|
};
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sentry.service.js","sourceRoot":"","sources":["../../../src/server/sentry/sentry.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"sentry.service.js","sourceRoot":"","sources":["../../../src/server/sentry/sentry.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SendGridEmailResponse } from '../sendgrid/sendgrid.model';
|
|
2
|
-
import type { EmailTest, SendEmailFromTemplateParams, Theme } from './email.model';
|
|
3
2
|
import { SendgridService } from '../sendgrid/sendgridApi.service';
|
|
3
|
+
import type { EmailTest, SendEmailFromTemplateParams, Theme } from './email.model';
|
|
4
4
|
export declare class EmailService {
|
|
5
5
|
private shouldSendEmail;
|
|
6
6
|
private baseDomain;
|
|
@@ -8,7 +8,7 @@ export declare class EmailService {
|
|
|
8
8
|
private emailTransport;
|
|
9
9
|
private emailArchive;
|
|
10
10
|
private theme;
|
|
11
|
-
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme
|
|
11
|
+
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme }: {
|
|
12
12
|
fromName: string;
|
|
13
13
|
shouldSendEmail: boolean;
|
|
14
14
|
baseDomain?: string;
|
|
@@ -18,6 +18,6 @@ export declare class EmailService {
|
|
|
18
18
|
});
|
|
19
19
|
private compileTemplate;
|
|
20
20
|
private compileMjml;
|
|
21
|
-
sendEmailFromTemplate({ template, to, subject, attachments, archive
|
|
21
|
+
sendEmailFromTemplate({ template, to, subject, attachments, archive }: SendEmailFromTemplateParams): Promise<SendGridEmailResponse>;
|
|
22
22
|
sendEmailTemplateTest(email: EmailTest): Promise<SendGridEmailResponse>;
|
|
23
23
|
}
|
|
@@ -13,7 +13,7 @@ class EmailService {
|
|
|
13
13
|
emailTransport;
|
|
14
14
|
emailArchive;
|
|
15
15
|
theme;
|
|
16
|
-
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme
|
|
16
|
+
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme }) {
|
|
17
17
|
this.shouldSendEmail = shouldSendEmail;
|
|
18
18
|
this.fromName = fromName;
|
|
19
19
|
if (baseDomain) {
|
|
@@ -30,18 +30,18 @@ class EmailService {
|
|
|
30
30
|
async compileTemplate(template) {
|
|
31
31
|
const innerContent = await (0, ejs_1.renderFile)(`${consts_1.config.templateDir}/${template.content}`, {
|
|
32
32
|
...template.placeholders,
|
|
33
|
-
theme: this.theme
|
|
33
|
+
theme: this.theme
|
|
34
34
|
});
|
|
35
35
|
const html = await (0, ejs_1.renderFile)(`${consts_1.config.templateDir}/${template.layout}`, {
|
|
36
36
|
...template.placeholders,
|
|
37
37
|
theme: this.theme,
|
|
38
|
-
content: innerContent
|
|
38
|
+
content: innerContent
|
|
39
39
|
});
|
|
40
40
|
return html;
|
|
41
41
|
}
|
|
42
42
|
compileMjml(mjml) {
|
|
43
43
|
const compiledMjMl = (0, mjml_1.default)(mjml, {
|
|
44
|
-
keepComments: false
|
|
44
|
+
keepComments: false
|
|
45
45
|
});
|
|
46
46
|
if (compiledMjMl.errors.length) {
|
|
47
47
|
console.log(compiledMjMl.errors);
|
|
@@ -49,13 +49,13 @@ class EmailService {
|
|
|
49
49
|
}
|
|
50
50
|
return compiledMjMl.html;
|
|
51
51
|
}
|
|
52
|
-
async sendEmailFromTemplate({ template, to, subject, attachments, archive
|
|
52
|
+
async sendEmailFromTemplate({ template, to, subject, attachments, archive }) {
|
|
53
53
|
if (!this.shouldSendEmail) {
|
|
54
54
|
return {
|
|
55
55
|
isSuccess: true,
|
|
56
56
|
statusCode: 1,
|
|
57
57
|
body: 'Email not sent. No emails are sent in test mode',
|
|
58
|
-
headers: {}
|
|
58
|
+
headers: {}
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
const mjml = await this.compileTemplate(template);
|
|
@@ -63,7 +63,7 @@ class EmailService {
|
|
|
63
63
|
const bcc = [];
|
|
64
64
|
if (archive && this.emailArchive?.length) {
|
|
65
65
|
bcc.push({
|
|
66
|
-
email: this.emailArchive
|
|
66
|
+
email: this.emailArchive
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
// This will not work if we are running in other environments (AWS/AZURE) check before using any other env
|
|
@@ -85,15 +85,15 @@ class EmailService {
|
|
|
85
85
|
isSuccess: false,
|
|
86
86
|
statusCode: 1,
|
|
87
87
|
body: 'Email not sent. TEST_EMAIL_ADDRESS env variable is missing',
|
|
88
|
-
headers: {}
|
|
88
|
+
headers: {}
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
91
|
const recipient = shouldSendEmailToRealUser
|
|
92
92
|
? {
|
|
93
|
-
email: to
|
|
93
|
+
email: to
|
|
94
94
|
}
|
|
95
95
|
: {
|
|
96
|
-
email: process.env.TEST_EMAIL_ADDRESS || ''
|
|
96
|
+
email: process.env.TEST_EMAIL_ADDRESS || ''
|
|
97
97
|
};
|
|
98
98
|
if (!this.emailTransport) {
|
|
99
99
|
throw new Error('No email transport (Sendgrid) defined');
|
|
@@ -107,7 +107,7 @@ class EmailService {
|
|
|
107
107
|
recipients: [recipient],
|
|
108
108
|
attachments,
|
|
109
109
|
categories: template.categories,
|
|
110
|
-
bcc
|
|
110
|
+
bcc
|
|
111
111
|
});
|
|
112
112
|
}
|
|
113
113
|
async sendEmailTemplateTest(email) {
|
|
@@ -128,10 +128,10 @@ class EmailService {
|
|
|
128
128
|
replyTo: `no_reply@${this.baseDomain}`,
|
|
129
129
|
recipients: [
|
|
130
130
|
{
|
|
131
|
-
email: `${username}@${this.baseDomain}
|
|
132
|
-
}
|
|
131
|
+
email: `${username}@${this.baseDomain}`
|
|
132
|
+
}
|
|
133
133
|
],
|
|
134
|
-
categories: [email_model_1.EmailCategory.TEST_EMAIL]
|
|
134
|
+
categories: [email_model_1.EmailCategory.TEST_EMAIL]
|
|
135
135
|
});
|
|
136
136
|
}
|
|
137
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../../src/server/services/email/email.service.ts"],"names":[],"mappings":";;;AAAA,gDAA2C;AAC3C,6BAAgC;AAChC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../../src/server/services/email/email.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,12 @@ const factories = {
|
|
|
13
13
|
this.tenantId = tenantId;
|
|
14
14
|
this.config = config;
|
|
15
15
|
}
|
|
16
|
-
async connect() {
|
|
17
|
-
|
|
16
|
+
async connect() {
|
|
17
|
+
console.log('Connected to DB');
|
|
18
|
+
}
|
|
19
|
+
async query(_sql) {
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
18
22
|
},
|
|
19
23
|
api: class MockApiService {
|
|
20
24
|
tenantId;
|
|
@@ -23,8 +27,12 @@ const factories = {
|
|
|
23
27
|
this.tenantId = tenantId;
|
|
24
28
|
this.config = config;
|
|
25
29
|
}
|
|
26
|
-
async getUser(userId,
|
|
27
|
-
|
|
30
|
+
async getUser(userId, _apiKey) {
|
|
31
|
+
return { id: userId };
|
|
32
|
+
}
|
|
33
|
+
async processData(_apiKey) {
|
|
34
|
+
return { processed: true };
|
|
35
|
+
}
|
|
28
36
|
}
|
|
29
37
|
};
|
|
30
38
|
// Create container with preloading pattern
|
|
@@ -56,7 +64,7 @@ const container = new Container_1.Container(factories, async (preload, meta) =>
|
|
|
56
64
|
};
|
|
57
65
|
});
|
|
58
66
|
// Usage example
|
|
59
|
-
async function
|
|
67
|
+
async function _processRequest(tenantMeta, userId) {
|
|
60
68
|
await container.bootstrap(tenantMeta, async () => {
|
|
61
69
|
const { api, secrets } = container.context;
|
|
62
70
|
// Secrets are already preloaded, so we can use sync methods
|
|
@@ -67,15 +75,15 @@ async function processRequest(tenantMeta, userId) {
|
|
|
67
75
|
});
|
|
68
76
|
}
|
|
69
77
|
// Example with multiple providers
|
|
70
|
-
async function
|
|
78
|
+
async function _multiProviderExample() {
|
|
71
79
|
// FILE provider for development
|
|
72
|
-
const
|
|
80
|
+
const _devTenant = {
|
|
73
81
|
tenantId: 'dev-tenant',
|
|
74
82
|
secretsLocation: '/secrets/dev.json',
|
|
75
83
|
encryptionKey: 'dev-encryption-key-32chars'
|
|
76
84
|
};
|
|
77
85
|
// VAULT provider for production
|
|
78
|
-
const
|
|
86
|
+
const _prodTenant = {
|
|
79
87
|
tenantId: 'prod-tenant',
|
|
80
88
|
secretsLocation: 'production/secrets',
|
|
81
89
|
encryptionKey: 'prod-encryption-key-32chars',
|
|
@@ -85,15 +93,15 @@ async function multiProviderExample() {
|
|
|
85
93
|
}
|
|
86
94
|
};
|
|
87
95
|
// ENV provider for CI/CD
|
|
88
|
-
const
|
|
96
|
+
const _ciTenant = {
|
|
89
97
|
tenantId: 'ci-tenant',
|
|
90
98
|
secretsLocation: 'CI', // Will look for CI_API_KEY, CI_DB_CONNECTION_STRING, etc.
|
|
91
99
|
encryptionKey: 'ci-encryption-key-32chars'
|
|
92
100
|
};
|
|
93
101
|
}
|
|
94
102
|
// Example with automatic invalidation (FILE provider)
|
|
95
|
-
async function
|
|
96
|
-
const
|
|
103
|
+
async function _fileWatchingExample() {
|
|
104
|
+
const _container = new Container_1.Container(factories, async (preload, meta) => {
|
|
97
105
|
const secretService = preload.secrets(meta.tenantId, {
|
|
98
106
|
provider: 'FILE',
|
|
99
107
|
location: meta.secretsLocation,
|
|
@@ -108,11 +116,23 @@ async function fileWatchingExample() {
|
|
|
108
116
|
// The secret service will watch for file changes and reload automatically
|
|
109
117
|
}
|
|
110
118
|
// Example with batch operations
|
|
111
|
-
async function
|
|
119
|
+
async function _batchTenantProcessing() {
|
|
112
120
|
const tenants = [
|
|
113
|
-
{
|
|
114
|
-
|
|
115
|
-
|
|
121
|
+
{
|
|
122
|
+
tenantId: 'tenant1',
|
|
123
|
+
secretsLocation: '/secrets/tenant1.json',
|
|
124
|
+
encryptionKey: 'key1'
|
|
125
|
+
},
|
|
126
|
+
{
|
|
127
|
+
tenantId: 'tenant2',
|
|
128
|
+
secretsLocation: '/secrets/tenant2.json',
|
|
129
|
+
encryptionKey: 'key2'
|
|
130
|
+
},
|
|
131
|
+
{
|
|
132
|
+
tenantId: 'tenant3',
|
|
133
|
+
secretsLocation: '/secrets/tenant3.json',
|
|
134
|
+
encryptionKey: 'key3'
|
|
135
|
+
}
|
|
116
136
|
];
|
|
117
137
|
const results = await container.bootstrapBatch(tenants.map(meta => ({
|
|
118
138
|
metadata: meta,
|
|
@@ -141,7 +161,7 @@ async function batchTenantProcessing() {
|
|
|
141
161
|
}
|
|
142
162
|
}
|
|
143
163
|
// Cleanup when done
|
|
144
|
-
async function
|
|
164
|
+
async function _cleanup() {
|
|
145
165
|
// Dispose all services (including secret watchers)
|
|
146
166
|
await container.disposeAll();
|
|
147
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-preload.example.js","sourceRoot":"","sources":["../../../../../src/server/services/secrets/examples/container-preload.example.ts"],"names":[],"mappings":";AAAA,4DAA4D;;AAE5D,+DAA2D;AAC3D,sDAAiD;AAgCjD,mDAAmD;AACnD,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE,CAAA,8BAAyB,CAAA;IAClC,QAAQ,EAAE,MAAM,mBAAmB;
|
|
1
|
+
{"version":3,"file":"container-preload.example.js","sourceRoot":"","sources":["../../../../../src/server/services/secrets/examples/container-preload.example.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { SecretService, SecretServiceConfig,
|
|
1
|
+
export { SecretProvider, SecretService, SecretServiceConfig, VaultConfig } from './secret.service';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/services/secrets/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/services/secrets/index.ts"],"names":[],"mappings":";;;AAAA,mDAKyB;AAHvB,+GAAA,aAAa,OAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SecretService = void 0;
|
|
4
|
-
const fs = require("fs");
|
|
5
|
-
const
|
|
6
|
-
const undici_1 = require("undici");
|
|
4
|
+
const fs = require("node:fs");
|
|
5
|
+
const node_fs_1 = require("node:fs");
|
|
7
6
|
const node_utils_1 = require("@goatlab/node-utils");
|
|
8
7
|
const colors_1 = require("kleur/colors");
|
|
8
|
+
const undici_1 = require("undici");
|
|
9
9
|
// Enhanced cache with TTL support
|
|
10
10
|
const memoryCache = {};
|
|
11
11
|
// Default TTL in milliseconds (5 minutes)
|
|
@@ -71,8 +71,9 @@ class SecretService {
|
|
|
71
71
|
* Set up file watching for automatic invalidation
|
|
72
72
|
*/
|
|
73
73
|
setupFileWatcher() {
|
|
74
|
-
if (this.provider !== 'FILE')
|
|
74
|
+
if (this.provider !== 'FILE') {
|
|
75
75
|
return;
|
|
76
|
+
}
|
|
76
77
|
try {
|
|
77
78
|
this.fileWatcher = fs.watch(this.location, async (eventType) => {
|
|
78
79
|
if (eventType === 'change') {
|
|
@@ -119,10 +120,12 @@ class SecretService {
|
|
|
119
120
|
}
|
|
120
121
|
// Helper method to check if cache entry is valid
|
|
121
122
|
isCacheValid(entry) {
|
|
122
|
-
if (!entry)
|
|
123
|
+
if (!entry) {
|
|
123
124
|
return false;
|
|
124
|
-
|
|
125
|
+
}
|
|
126
|
+
if (!entry.expiresAt) {
|
|
125
127
|
return true; // No expiration set
|
|
128
|
+
}
|
|
126
129
|
return Date.now() < entry.expiresAt;
|
|
127
130
|
}
|
|
128
131
|
// Helper method to set cache with TTL
|
|
@@ -151,13 +154,13 @@ class SecretService {
|
|
|
151
154
|
const start = process.hrtime.bigint();
|
|
152
155
|
try {
|
|
153
156
|
// Check if file exists using async stat
|
|
154
|
-
await
|
|
157
|
+
await node_fs_1.promises.stat(this.location);
|
|
155
158
|
}
|
|
156
|
-
catch (
|
|
159
|
+
catch (_error) {
|
|
157
160
|
throw new Error(`Secret file "${this.location}" does not exist`);
|
|
158
161
|
}
|
|
159
162
|
try {
|
|
160
|
-
const fileContents = await
|
|
163
|
+
const fileContents = await node_fs_1.promises.readFile(this.location, 'utf-8');
|
|
161
164
|
const secretEncryptedObject = JSON.parse(fileContents);
|
|
162
165
|
console.log(`🔐 Secrets loaded: ${(0, colors_1.magenta)(this.location.split('/').slice(-2).join('/'))}`);
|
|
163
166
|
const decrypted = node_utils_1.Security.decryptObject(secretEncryptedObject, this.encryptionKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secret.service.js","sourceRoot":"","sources":["../../../../src/server/services/secrets/secret.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"secret.service.js","sourceRoot":"","sources":["../../../../src/server/services/secrets/secret.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export declare class SendgridService {
|
|
|
4
4
|
sendgridApi: KyInstance | undefined;
|
|
5
5
|
shouldSendEmail: boolean;
|
|
6
6
|
fromEmail: string;
|
|
7
|
-
constructor({ token, shouldSendEmail, fromEmail
|
|
7
|
+
constructor({ token, shouldSendEmail, fromEmail }: {
|
|
8
8
|
token: string;
|
|
9
9
|
shouldSendEmail?: boolean;
|
|
10
10
|
fromEmail: string;
|
|
@@ -6,17 +6,17 @@ class SendgridService {
|
|
|
6
6
|
sendgridApi = undefined;
|
|
7
7
|
shouldSendEmail = true;
|
|
8
8
|
fromEmail = 'test@example.com';
|
|
9
|
-
constructor({ token, shouldSendEmail = true, fromEmail
|
|
9
|
+
constructor({ token, shouldSendEmail = true, fromEmail }) {
|
|
10
10
|
this.sendgridApi = js_utils_1.Http.getClient({
|
|
11
11
|
prefixUrl: 'https://api.sendgrid.com/v3/',
|
|
12
12
|
headers: {
|
|
13
|
-
Authorization: `Bearer ${token}
|
|
13
|
+
Authorization: `Bearer ${token}`
|
|
14
14
|
},
|
|
15
15
|
retry: {
|
|
16
16
|
limit: 3,
|
|
17
17
|
// Sendgrid uses POST
|
|
18
|
-
methods: ['POST']
|
|
19
|
-
}
|
|
18
|
+
methods: ['POST']
|
|
19
|
+
}
|
|
20
20
|
});
|
|
21
21
|
this.shouldSendEmail = shouldSendEmail;
|
|
22
22
|
this.fromEmail = fromEmail;
|
|
@@ -29,48 +29,46 @@ class SendgridService {
|
|
|
29
29
|
isSuccess: false,
|
|
30
30
|
statusCode: 1,
|
|
31
31
|
body: {},
|
|
32
|
-
headers: {}
|
|
32
|
+
headers: {}
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
const json = {
|
|
36
36
|
personalizations: [
|
|
37
37
|
{
|
|
38
38
|
to: request.recipients,
|
|
39
|
-
bcc: request.bcc?.length ? request.bcc : undefined
|
|
40
|
-
}
|
|
39
|
+
bcc: request.bcc?.length ? request.bcc : undefined
|
|
40
|
+
}
|
|
41
41
|
],
|
|
42
42
|
subject: request.subject,
|
|
43
43
|
categories: request.categories,
|
|
44
44
|
content: [{ type: 'text/html', value: request.html }],
|
|
45
45
|
from: {
|
|
46
46
|
email: this.fromEmail,
|
|
47
|
-
name: request.fromName
|
|
47
|
+
name: request.fromName
|
|
48
48
|
},
|
|
49
49
|
reply_to: { email: request.replyTo },
|
|
50
50
|
tracking_settings: {
|
|
51
51
|
click_tracking: {
|
|
52
52
|
enable: true,
|
|
53
|
-
enable_text: true
|
|
53
|
+
enable_text: true
|
|
54
54
|
},
|
|
55
55
|
open_tracking: {
|
|
56
|
-
enable: true
|
|
57
|
-
}
|
|
56
|
+
enable: true
|
|
57
|
+
}
|
|
58
58
|
},
|
|
59
|
-
attachments: request.attachments?.length
|
|
60
|
-
? request.attachments
|
|
61
|
-
: undefined,
|
|
59
|
+
attachments: request.attachments?.length ? request.attachments : undefined
|
|
62
60
|
};
|
|
63
61
|
if (!this.sendgridApi) {
|
|
64
62
|
return {
|
|
65
63
|
isSuccess: false,
|
|
66
64
|
statusCode: 1,
|
|
67
65
|
body: {},
|
|
68
|
-
headers: {}
|
|
66
|
+
headers: {}
|
|
69
67
|
};
|
|
70
68
|
}
|
|
71
69
|
return await this.sendgridApi
|
|
72
70
|
.post('mail/send', {
|
|
73
|
-
json
|
|
71
|
+
json
|
|
74
72
|
})
|
|
75
73
|
.json();
|
|
76
74
|
}
|