@ya-accelerators/web-backend-framework 0.0.127 → 0.0.129
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/.generated/policy/error-log.d.ts +6 -0
- package/dist/.generated/policy/error-log.js +7 -0
- package/dist/.generated/policy/error-log.js.map +1 -0
- package/dist/constants.d.ts +4 -0
- package/dist/constants.js +5 -0
- package/dist/constants.js.map +1 -1
- package/dist/context/audit/index.d.ts +7 -3
- package/dist/context/audit/index.js +6 -5
- package/dist/context/audit/index.js.map +1 -1
- package/dist/policy.d.ts +1 -0
- package/dist/policy.js +1 -0
- package/dist/policy.js.map +1 -1
- package/dist/server/trpc/error-log/index.d.ts +18 -0
- package/dist/server/trpc/error-log/index.js +38 -0
- package/dist/server/trpc/error-log/index.js.map +1 -0
- package/dist/server/trpc/index.d.ts +46 -0
- package/dist/server/trpc/index.js +31 -0
- package/dist/server/trpc/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-log.js","sourceRoot":"","sources":["../../../src/.generated/policy/error-log.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,EAAE;IACvB,eAAe,EAAE,CAAC,MAAM,EAAE,WAAW,CAAU;IAC/C,eAAe,EAAE,CAAC,SAAS,EAAE,OAAO,CAAU;CAC/C,CAAA"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -10,5 +10,9 @@ export declare const constants: {
|
|
|
10
10
|
UPLOAD_FILENAME_MAX_LENGTH: number;
|
|
11
11
|
UPLOAD_CONTENT_TYPE_MAX_LENGTH: number;
|
|
12
12
|
UPLOAD_STORED_CONTENT_TYPE: string;
|
|
13
|
+
ERROR_LOG_RATE_LIMIT_MAX: number;
|
|
14
|
+
ERROR_LOG_RATE_LIMIT_WINDOW_SEC: number;
|
|
15
|
+
ERROR_LOG_DROP_NOTICE_WINDOW_SEC: number;
|
|
16
|
+
ERROR_LOG_REPORTER_KEY_LENGTH: number;
|
|
13
17
|
PII_ALLOWED_AWS_REGIONS: readonly ['eu-north-1', 'eu-west-1', 'eu-west-3', 'eu-central-1', 'eu-south-1', 'eu-south-2'];
|
|
14
18
|
};
|
package/dist/constants.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { errorLogPayloadPolicy } from './.generated/policy/error-log.js';
|
|
1
2
|
import { sanitizeKeys } from './.generated/policy/sanitize.js';
|
|
2
3
|
export const constants = {
|
|
3
4
|
OAUTH_DEV_REDIRECTOR_URL: 'https://jbilvarnjxcewv7spngtoaowia0krqmu.lambda-url.eu-north-1.on.aws/',
|
|
@@ -8,6 +9,10 @@ export const constants = {
|
|
|
8
9
|
UPLOAD_FILENAME_MAX_LENGTH: 255,
|
|
9
10
|
UPLOAD_CONTENT_TYPE_MAX_LENGTH: 255,
|
|
10
11
|
UPLOAD_STORED_CONTENT_TYPE: 'application/octet-stream',
|
|
12
|
+
ERROR_LOG_RATE_LIMIT_MAX: 20,
|
|
13
|
+
ERROR_LOG_RATE_LIMIT_WINDOW_SEC: 60,
|
|
14
|
+
ERROR_LOG_DROP_NOTICE_WINDOW_SEC: 60,
|
|
15
|
+
ERROR_LOG_REPORTER_KEY_LENGTH: errorLogPayloadPolicy.REPORTER_KEY_LENGTH,
|
|
11
16
|
// The AWS regions inside the EU / EEA, which is where every resource processing or storing personal data is
|
|
12
17
|
// provisioned (infra.md § 9, GDPR Art. 44-49). Removing an entry closes a region every consumer's S3 / SES /
|
|
13
18
|
// STS clients may bind; an entry outside the EEA takes a documented Art. 46 transfer mechanism, recorded in
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,wBAAwB,EAAE,wEAAwE;IAClG,cAAc,EAAE,WAAW;IAC3B,mBAAmB,EAAE,CAAC;IACtB,mBAAmB,EAAE,EAAE;IACvB,wBAAwB,EAAE,EAAE;IAC5B,0BAA0B,EAAE,GAAG;IAC/B,8BAA8B,EAAE,GAAG;IACnC,0BAA0B,EAAE,0BAA0B;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,wBAAwB,EAAE,wEAAwE;IAClG,cAAc,EAAE,WAAW;IAC3B,mBAAmB,EAAE,CAAC;IACtB,mBAAmB,EAAE,EAAE;IACvB,wBAAwB,EAAE,EAAE;IAC5B,0BAA0B,EAAE,GAAG;IAC/B,8BAA8B,EAAE,GAAG;IACnC,0BAA0B,EAAE,0BAA0B;IACtD,wBAAwB,EAAE,EAAE;IAC5B,+BAA+B,EAAE,EAAE;IACnC,gCAAgC,EAAE,EAAE;IACpC,6BAA6B,EAAE,qBAAqB,CAAC,mBAAmB;IAExE,4GAA4G;IAC5G,6GAA6G;IAC7G,4GAA4G;IAC5G,+CAA+C;IAC/C,uBAAuB,EAAE;QACvB,YAAY;QACZ,WAAW;QACX,WAAW;QACX,cAAc;QACd,YAAY;QACZ,YAAY;KACJ;IAEV,GAAG,YAAY;CAChB,CAAA"}
|
|
@@ -7,10 +7,14 @@ export interface AuditContext {
|
|
|
7
7
|
export type AuditOperationReason = 'account-type-update' | 'contact-update' | 'document-write' | 'legal-hold-create' | 'legal-hold-release' | 'partner-termination' | 'personnel-contract-write' | 'personnel-termination' | 'profile-update' | 'processing-restriction-create' | 'processing-restriction-lift';
|
|
8
8
|
export declare const auditContextStorage: AsyncLocalStorage<AuditContext>;
|
|
9
9
|
export declare const getCurrentAuditContext: () => AuditContext | undefined;
|
|
10
|
-
export declare const
|
|
10
|
+
export declare const runWithAuditActorFor: <TReason extends string>() => <T>({ actorUserId, reason }: {
|
|
11
11
|
actorUserId?: string;
|
|
12
|
-
reason?:
|
|
12
|
+
reason?: TReason;
|
|
13
13
|
}, fn: () => Promise<T>) => Promise<T>;
|
|
14
|
-
export declare const
|
|
14
|
+
export declare const runWithAuditActor: <T>({ actorUserId, reason }: {
|
|
15
|
+
actorUserId?: string;
|
|
16
|
+
reason?: AuditOperationReason | undefined;
|
|
17
|
+
}, fn: () => Promise<T>) => Promise<T>;
|
|
18
|
+
export declare const runAsSystemAction: <T>({ reason }: {
|
|
15
19
|
reason?: string;
|
|
16
20
|
}, fn: () => Promise<T>) => Promise<T>;
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { AsyncLocalStorage } from 'async_hooks';
|
|
2
2
|
export const auditContextStorage = new AsyncLocalStorage();
|
|
3
3
|
export const getCurrentAuditContext = () => auditContextStorage.getStore();
|
|
4
|
-
export const
|
|
4
|
+
export const runWithAuditActorFor = () => ({ actorUserId, reason }, fn) => {
|
|
5
5
|
const parent = auditContextStorage.getStore();
|
|
6
6
|
return auditContextStorage.run({
|
|
7
|
-
actorUserId
|
|
8
|
-
reason
|
|
7
|
+
actorUserId,
|
|
8
|
+
reason,
|
|
9
9
|
suppress: parent?.suppress ?? false,
|
|
10
10
|
}, fn);
|
|
11
11
|
};
|
|
12
|
-
export const
|
|
13
|
-
|
|
12
|
+
export const runWithAuditActor = runWithAuditActorFor();
|
|
13
|
+
export const runAsSystemAction = ({ reason }, fn) => auditContextStorage.run({
|
|
14
|
+
reason,
|
|
14
15
|
suppress: true,
|
|
15
16
|
}, fn);
|
|
16
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/context/audit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAyB/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,iBAAiB,EAAgB,CAAA;AAExE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAA;AAE1E,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/context/audit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAyB/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,iBAAiB,EAAgB,CAAA;AAExE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAA;AAE1E,MAAM,CAAC,MAAM,oBAAoB,GAC/B,GAA2B,EAAE,CAC7B,CAAI,EAAE,WAAW,EAAE,MAAM,EAA8C,EAAE,EAAoB,EAAE,EAAE;IAC/F,MAAM,MAAM,GAAG,mBAAmB,CAAC,QAAQ,EAAE,CAAA;IAC7C,OAAO,mBAAmB,CAAC,GAAG,CAC5B;QACE,WAAW;QACX,MAAM;QACN,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,KAAK;KACpC,EACD,EAAE,CACH,CAAA;AACH,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,oBAAoB,EAAwB,CAAA;AAE7E,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAI,EAAE,MAAM,EAAuB,EAAE,EAAoB,EAAE,EAAE,CAC5F,mBAAmB,CAAC,GAAG,CACrB;IACE,MAAM;IACN,QAAQ,EAAE,IAAI;CACf,EACD,EAAE,CACH,CAAA"}
|
package/dist/policy.d.ts
CHANGED
package/dist/policy.js
CHANGED
package/dist/policy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA"}
|
|
1
|
+
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAA;AACnD,cAAc,kCAAkC,CAAA;AAChD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const errorLogInputSchema: z.ZodObject<{
|
|
3
|
+
reporterKey: z.ZodString;
|
|
4
|
+
message: z.ZodOptional<z.ZodString>;
|
|
5
|
+
path: z.ZodString;
|
|
6
|
+
stack: z.ZodOptional<z.ZodString>;
|
|
7
|
+
userAgent: z.ZodString;
|
|
8
|
+
}, z.core.$strip>;
|
|
9
|
+
export declare const report: ({ path, message, stack, userAgent, reporterKey, }: {
|
|
10
|
+
path: string;
|
|
11
|
+
message?: string;
|
|
12
|
+
stack?: string;
|
|
13
|
+
userAgent: string;
|
|
14
|
+
reporterKey: string;
|
|
15
|
+
}, limits: {
|
|
16
|
+
max: number;
|
|
17
|
+
windowSec: number;
|
|
18
|
+
}) => Promise<void>;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { constants } from '../../../constants.js';
|
|
3
|
+
import { coordination } from '../../../coordination/index.js';
|
|
4
|
+
import { defaultEnv } from '../../../env.js';
|
|
5
|
+
import { logger } from '../../../logger/index.js';
|
|
6
|
+
import { errorLogPayloadPolicy } from '../../../policy.js';
|
|
7
|
+
const boundedField = z.string().max(errorLogPayloadPolicy.MAX_FIELD_LENGTH);
|
|
8
|
+
const errorLogPayloadShape = {
|
|
9
|
+
path: boundedField,
|
|
10
|
+
userAgent: boundedField,
|
|
11
|
+
message: boundedField.optional(),
|
|
12
|
+
stack: boundedField.optional(),
|
|
13
|
+
};
|
|
14
|
+
export const errorLogInputSchema = z.object({
|
|
15
|
+
...errorLogPayloadShape,
|
|
16
|
+
reporterKey: z
|
|
17
|
+
.string()
|
|
18
|
+
.length(constants.ERROR_LOG_REPORTER_KEY_LENGTH)
|
|
19
|
+
.regex(/^[0-9a-f]+$/),
|
|
20
|
+
});
|
|
21
|
+
export const report = async ({ path, message, stack, userAgent, reporterKey, }, limits) => {
|
|
22
|
+
try {
|
|
23
|
+
const key = `error-log:${defaultEnv.SERVICE}:${reporterKey}`;
|
|
24
|
+
const result = await coordination.rateLimit.attempt({ key, ...limits });
|
|
25
|
+
if (!result.allowed) {
|
|
26
|
+
if (await coordination.throttle.tryAcquire({
|
|
27
|
+
key: `${key}:drop-notice`,
|
|
28
|
+
windowSec: constants.ERROR_LOG_DROP_NOTICE_WINDOW_SEC,
|
|
29
|
+
})) {
|
|
30
|
+
logger.warn('client-error', { op: 'dropped', count: result.count });
|
|
31
|
+
}
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
logger.error('client-error', { path, message, stack, userAgent });
|
|
35
|
+
}
|
|
36
|
+
catch { }
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/trpc/error-log/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAA;AAE3E,MAAM,oBAAoB,GAC6E;IACrG,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,YAAY;IACvB,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE;IAChC,KAAK,EAAE,YAAY,CAAC,QAAQ,EAAE;CAC/B,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,GAAG,oBAAoB;IACvB,WAAW,EAAE,CAAC;SACX,MAAM,EAAE;SACR,MAAM,CAAC,SAAS,CAAC,6BAA6B,CAAC;SAC/C,KAAK,CAAC,aAAa,CAAC;CACxB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EACzB,EACE,IAAI,EACJ,OAAO,EACP,KAAK,EACL,SAAS,EACT,WAAW,GACgF,EAC7F,MAA0C,EAC1C,EAAE;IACF,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,aAAa,UAAU,CAAC,OAAO,IAAI,WAAW,EAAE,CAAA;QAC5D,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;QACvE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,IACE,MAAM,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACrC,GAAG,EAAE,GAAG,GAAG,cAAc;gBACzB,SAAS,EAAE,SAAS,CAAC,gCAAgC;aACtD,CAAC,EACF,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;YACrE,CAAC;YACD,OAAM;QACR,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;IACnE,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;AACZ,CAAC,CAAA"}
|
|
@@ -152,8 +152,31 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
|
|
|
152
152
|
file: {
|
|
153
153
|
upload: AnyTRPCProcedure;
|
|
154
154
|
};
|
|
155
|
+
errorLog: {
|
|
156
|
+
report: import("@trpc/server").TRPCMutationProcedure<{
|
|
157
|
+
input: {
|
|
158
|
+
reporterKey: string;
|
|
159
|
+
message?: string | undefined;
|
|
160
|
+
path: string;
|
|
161
|
+
stack?: string | undefined;
|
|
162
|
+
userAgent: string;
|
|
163
|
+
};
|
|
164
|
+
output: void;
|
|
165
|
+
meta: object;
|
|
166
|
+
}>;
|
|
167
|
+
};
|
|
155
168
|
}>>;
|
|
156
169
|
uploadProcedure: (procedure: UploadProcedure, bucket: string) => void;
|
|
170
|
+
errorLogProcedure: (procedure: import("@trpc/server").TRPCProcedureBuilder<{
|
|
171
|
+
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
172
|
+
ip: string | undefined;
|
|
173
|
+
} & TContext extends infer T_1 ? T_1 extends {
|
|
174
|
+
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
175
|
+
ip: string | undefined;
|
|
176
|
+
} & TContext ? T_1 extends (...args: any[]) => object | Promise<object> ? import("@trpc/server/unstable-core-do-not-import").Unwrap<T_1> : T_1 : never : never, object, {}, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>, options?: {
|
|
177
|
+
max?: number;
|
|
178
|
+
windowSec?: number;
|
|
179
|
+
}) => void;
|
|
157
180
|
}, Omit<import("@trpc/server").TRPCRootObject<{
|
|
158
181
|
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
159
182
|
ip: string | undefined;
|
|
@@ -285,7 +308,30 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
|
|
|
285
308
|
file: {
|
|
286
309
|
upload: AnyTRPCProcedure;
|
|
287
310
|
};
|
|
311
|
+
errorLog: {
|
|
312
|
+
report: import("@trpc/server").TRPCMutationProcedure<{
|
|
313
|
+
input: {
|
|
314
|
+
reporterKey: string;
|
|
315
|
+
message?: string | undefined;
|
|
316
|
+
path: string;
|
|
317
|
+
stack?: string | undefined;
|
|
318
|
+
userAgent: string;
|
|
319
|
+
};
|
|
320
|
+
output: void;
|
|
321
|
+
meta: object;
|
|
322
|
+
}>;
|
|
323
|
+
};
|
|
288
324
|
}>>;
|
|
289
325
|
uploadProcedure: (procedure: UploadProcedure, bucket: string) => void;
|
|
326
|
+
errorLogProcedure: (procedure: import("@trpc/server").TRPCProcedureBuilder<{
|
|
327
|
+
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
328
|
+
ip: string | undefined;
|
|
329
|
+
} & TContext extends infer T_1 ? T_1 extends {
|
|
330
|
+
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
331
|
+
ip: string | undefined;
|
|
332
|
+
} & TContext ? T_1 extends (...args: any[]) => object | Promise<object> ? import("@trpc/server/unstable-core-do-not-import").Unwrap<T_1> : T_1 : never : never, object, {}, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>, options?: {
|
|
333
|
+
max?: number;
|
|
334
|
+
windowSec?: number;
|
|
335
|
+
}) => void;
|
|
290
336
|
}, AnyTRPCRouter>;
|
|
291
337
|
export {};
|
|
@@ -2,6 +2,7 @@ import { TRPCClientError } from '@trpc/client';
|
|
|
2
2
|
import { initTRPC } from '@trpc/server';
|
|
3
3
|
import * as trpcExpress from '@trpc/server/adapters/express';
|
|
4
4
|
import superjson from 'superjson';
|
|
5
|
+
import { constants } from '../../constants.js';
|
|
5
6
|
import { runWithAuditActor } from '../../context/audit/index.js';
|
|
6
7
|
import { runWithRequestPath } from '../../context/request/index.js';
|
|
7
8
|
import { defaultEnv } from '../../env.js';
|
|
@@ -10,6 +11,7 @@ import { prisma } from '../../repository/prisma/index.js';
|
|
|
10
11
|
import { createApp } from '../express/index.js';
|
|
11
12
|
import { mint } from '../uploads/index.js';
|
|
12
13
|
import { throwForbiddenError } from './error/index.js';
|
|
14
|
+
import { errorLogInputSchema, report } from './error-log/index.js';
|
|
13
15
|
const createRequestContext = (opts) => {
|
|
14
16
|
const requestHeaders = opts.req.headers;
|
|
15
17
|
return {
|
|
@@ -82,6 +84,11 @@ export function* generator(options = {}) {
|
|
|
82
84
|
};
|
|
83
85
|
let uploadProcedure;
|
|
84
86
|
let uploadBucket;
|
|
87
|
+
let errorLogProcedure;
|
|
88
|
+
let errorLogOptions = {
|
|
89
|
+
max: constants.ERROR_LOG_RATE_LIMIT_MAX,
|
|
90
|
+
windowSec: constants.ERROR_LOG_RATE_LIMIT_WINDOW_SEC,
|
|
91
|
+
};
|
|
85
92
|
let routerBuilt = false;
|
|
86
93
|
const uploadHandler = async () => {
|
|
87
94
|
const bucket = uploadBucket ?? throwForbiddenError('file upload is not configured for this service');
|
|
@@ -92,6 +99,9 @@ export function* generator(options = {}) {
|
|
|
92
99
|
if ('file' in routes) {
|
|
93
100
|
throw new Error("router namespace 'file' is reserved by the framework upload procedure");
|
|
94
101
|
}
|
|
102
|
+
if ('errorLog' in routes) {
|
|
103
|
+
throw new Error("router namespace 'errorLog' is reserved by the framework client-error procedure");
|
|
104
|
+
}
|
|
95
105
|
routerBuilt = true;
|
|
96
106
|
return baseRouter({
|
|
97
107
|
...routes,
|
|
@@ -99,6 +109,17 @@ export function* generator(options = {}) {
|
|
|
99
109
|
upload: (uploadProcedure ??
|
|
100
110
|
declarableProcedure.declare()).mutation(uploadHandler),
|
|
101
111
|
},
|
|
112
|
+
errorLog: {
|
|
113
|
+
report: (errorLogProcedure ??
|
|
114
|
+
declarableProcedure.declare())
|
|
115
|
+
.input(errorLogInputSchema)
|
|
116
|
+
.mutation(({ input }) => {
|
|
117
|
+
if (errorLogProcedure === undefined) {
|
|
118
|
+
throwForbiddenError('client-error reporting is not configured for this service');
|
|
119
|
+
}
|
|
120
|
+
return report(input, errorLogOptions);
|
|
121
|
+
}),
|
|
122
|
+
},
|
|
102
123
|
});
|
|
103
124
|
};
|
|
104
125
|
const enhancedTrpc = tprc;
|
|
@@ -111,6 +132,16 @@ export function* generator(options = {}) {
|
|
|
111
132
|
uploadProcedure = procedure;
|
|
112
133
|
uploadBucket = bucket;
|
|
113
134
|
};
|
|
135
|
+
enhancedTrpc.errorLogProcedure = (procedure, { max, windowSec } = {}) => {
|
|
136
|
+
if (routerBuilt) {
|
|
137
|
+
throw new Error('trpc.errorLogProcedure(...) must be called before trpc.router(...)');
|
|
138
|
+
}
|
|
139
|
+
errorLogProcedure = procedure;
|
|
140
|
+
errorLogOptions = {
|
|
141
|
+
max: max ?? constants.ERROR_LOG_RATE_LIMIT_MAX,
|
|
142
|
+
windowSec: windowSec ?? constants.ERROR_LOG_RATE_LIMIT_WINDOW_SEC,
|
|
143
|
+
};
|
|
144
|
+
};
|
|
114
145
|
const router = yield enhancedTrpc;
|
|
115
146
|
createApp({
|
|
116
147
|
customRoutes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/trpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAA6C,QAAQ,EAAE,MAAM,cAAc,CAAA;AAClF,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAA;AAE5D,OAAO,SAAS,MAAM,WAAW,CAAA;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/trpc/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ya-accelerators/web-backend-framework",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.129",
|
|
4
4
|
"packageRole": "library",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"description": "",
|
|
@@ -52,8 +52,8 @@
|
|
|
52
52
|
"test:integration": "jest --testPathPatterns=integration"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@aws-sdk/client-s3": "^3.
|
|
56
|
-
"@aws-sdk/credential-provider-node": "^3.972.
|
|
55
|
+
"@aws-sdk/client-s3": "^3.1129.0",
|
|
56
|
+
"@aws-sdk/credential-provider-node": "^3.972.83",
|
|
57
57
|
"@prisma/adapter-mariadb": "^7.10.0",
|
|
58
58
|
"@prisma/extension-read-replicas": "^0.5.0",
|
|
59
59
|
"@valkey/valkey-glide": "^2.5.2",
|