@ya-accelerators/web-backend-framework 0.0.128 → 0.0.130
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 +1 -0
- package/dist/.generated/policy/error-log.js +1 -0
- package/dist/.generated/policy/error-log.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +3 -1
- package/dist/constants.js.map +1 -1
- package/dist/context/audit/index.d.ts +7 -3
- package/dist/context/audit/index.js +7 -7
- package/dist/context/audit/index.js.map +1 -1
- package/dist/context/request/index.js +4 -2
- package/dist/context/request/index.js.map +1 -1
- package/dist/coordination/lock/index.js +1 -2
- package/dist/coordination/lock/index.js.map +1 -1
- package/dist/coordination/throttle/index.js +1 -2
- package/dist/coordination/throttle/index.js.map +1 -1
- package/dist/repository/prisma/index.js +7 -9
- package/dist/repository/prisma/index.js.map +1 -1
- package/dist/repository/prisma/lock.js +3 -6
- package/dist/repository/prisma/lock.js.map +1 -1
- package/dist/repository/redis/index.js +10 -21
- package/dist/repository/redis/index.js.map +1 -1
- package/dist/repository/s3/index.d.ts +8 -8
- package/dist/repository/s3/index.js +48 -49
- package/dist/repository/s3/index.js.map +1 -1
- package/dist/server/express/index.js +14 -18
- package/dist/server/express/index.js.map +1 -1
- package/dist/server/trpc/declaration/index.d.ts +1 -1
- package/dist/server/trpc/declaration/index.js +5 -5
- package/dist/server/trpc/declaration/index.js.map +1 -1
- package/dist/server/trpc/error-log/index.d.ts +3 -2
- package/dist/server/trpc/error-log/index.js +9 -6
- package/dist/server/trpc/error-log/index.js.map +1 -1
- package/dist/server/trpc/index.d.ts +3 -1
- package/dist/server/trpc/index.js +21 -23
- package/dist/server/trpc/index.js.map +1 -1
- package/dist/server/uploads/index.d.ts +1 -1
- package/dist/server/uploads/index.js +20 -16
- package/dist/server/uploads/index.js.map +1 -1
- package/dist/util/index.js +1 -2
- package/dist/util/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -25,9 +25,9 @@ const client = () => {
|
|
|
25
25
|
};
|
|
26
26
|
export const s3 = {
|
|
27
27
|
client,
|
|
28
|
-
getObject: async (
|
|
28
|
+
getObject: async ({ bucket, key, versionId }) => {
|
|
29
29
|
try {
|
|
30
|
-
const result = await client().send(new GetObjectCommand({ Bucket:
|
|
30
|
+
const result = await client().send(new GetObjectCommand({ Bucket: bucket, Key: key, VersionId: versionId }));
|
|
31
31
|
if (result.Body === undefined) {
|
|
32
32
|
return undefined;
|
|
33
33
|
}
|
|
@@ -41,107 +41,106 @@ export const s3 = {
|
|
|
41
41
|
if (e instanceof Error && (e.name === 'NoSuchKey' || e.name === 'NotFound')) {
|
|
42
42
|
return undefined;
|
|
43
43
|
}
|
|
44
|
-
logger.error('storage', { op: 'getObject', bucket
|
|
44
|
+
logger.error('storage', { op: 'getObject', bucket, ...keyShape(key), error: e });
|
|
45
45
|
throw e;
|
|
46
46
|
}
|
|
47
47
|
},
|
|
48
|
-
putObject: async (
|
|
48
|
+
putObject: async ({ bucket, key, body, contentType, metadata, }) => {
|
|
49
49
|
try {
|
|
50
50
|
await client().send(new PutObjectCommand({
|
|
51
|
-
Bucket:
|
|
52
|
-
Key:
|
|
53
|
-
Body:
|
|
54
|
-
ContentType:
|
|
55
|
-
Metadata:
|
|
51
|
+
Bucket: bucket,
|
|
52
|
+
Key: key,
|
|
53
|
+
Body: body,
|
|
54
|
+
ContentType: contentType,
|
|
55
|
+
Metadata: metadata,
|
|
56
56
|
}));
|
|
57
57
|
}
|
|
58
58
|
catch (e) {
|
|
59
|
-
logger.error('storage', { op: 'putObject', bucket
|
|
59
|
+
logger.error('storage', { op: 'putObject', bucket, ...keyShape(key), error: e });
|
|
60
60
|
throw e;
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
|
-
deleteObject: async (
|
|
63
|
+
deleteObject: async ({ bucket, key, versionId }) => {
|
|
64
64
|
try {
|
|
65
|
-
await client().send(new DeleteObjectCommand({ Bucket:
|
|
65
|
+
await client().send(new DeleteObjectCommand({ Bucket: bucket, Key: key, VersionId: versionId }));
|
|
66
66
|
}
|
|
67
67
|
catch (e) {
|
|
68
|
-
logger.error('storage', { op: 'deleteObject', bucket
|
|
68
|
+
logger.error('storage', { op: 'deleteObject', bucket, ...keyShape(key), error: e });
|
|
69
69
|
throw e;
|
|
70
70
|
}
|
|
71
71
|
},
|
|
72
|
-
createBucket: async (
|
|
72
|
+
createBucket: async ({ bucket, objectLock }) => {
|
|
73
73
|
try {
|
|
74
|
-
await client().send(new CreateBucketCommand({ Bucket:
|
|
74
|
+
await client().send(new CreateBucketCommand({ Bucket: bucket, ObjectLockEnabledForBucket: objectLock }));
|
|
75
75
|
}
|
|
76
76
|
catch (e) {
|
|
77
77
|
if (e instanceof Error && (e.name === 'BucketAlreadyOwnedByYou' || e.name === 'BucketAlreadyExists')) {
|
|
78
78
|
return;
|
|
79
79
|
}
|
|
80
|
-
logger.error('storage', { op: 'createBucket', bucket
|
|
80
|
+
logger.error('storage', { op: 'createBucket', bucket, error: e });
|
|
81
81
|
throw e;
|
|
82
82
|
}
|
|
83
83
|
},
|
|
84
|
-
ensureBucketLifecycleRule: async (
|
|
84
|
+
ensureBucketLifecycleRule: async ({ bucket, ruleId, prefix, expireDays, }) => {
|
|
85
85
|
try {
|
|
86
|
-
const
|
|
87
|
-
.send(new GetBucketLifecycleConfigurationCommand({ Bucket:
|
|
86
|
+
const rules = ((await client()
|
|
87
|
+
.send(new GetBucketLifecycleConfigurationCommand({ Bucket: bucket }))
|
|
88
88
|
.catch((e) => {
|
|
89
89
|
if (e instanceof Error && e.name === 'NoSuchLifecycleConfiguration') {
|
|
90
90
|
return undefined;
|
|
91
91
|
}
|
|
92
92
|
throw e;
|
|
93
|
-
});
|
|
94
|
-
const rules = (existing?.Rules ?? []).filter((rule) => rule.ID !== params.ruleId);
|
|
93
|
+
}))?.Rules ?? []).filter((rule) => rule.ID !== ruleId);
|
|
95
94
|
rules.push({
|
|
96
|
-
ID:
|
|
95
|
+
ID: ruleId,
|
|
97
96
|
Status: 'Enabled',
|
|
98
|
-
Filter: { Prefix:
|
|
99
|
-
Expiration: { Days:
|
|
97
|
+
Filter: { Prefix: prefix },
|
|
98
|
+
Expiration: { Days: expireDays },
|
|
100
99
|
});
|
|
101
100
|
await client().send(new PutBucketLifecycleConfigurationCommand({
|
|
102
|
-
Bucket:
|
|
101
|
+
Bucket: bucket,
|
|
103
102
|
LifecycleConfiguration: { Rules: rules },
|
|
104
103
|
}));
|
|
105
104
|
}
|
|
106
105
|
catch (e) {
|
|
107
|
-
logger.error('storage', { op: 'ensureBucketLifecycleRule', bucket
|
|
106
|
+
logger.error('storage', { op: 'ensureBucketLifecycleRule', bucket, error: e });
|
|
108
107
|
throw e;
|
|
109
108
|
}
|
|
110
109
|
},
|
|
111
|
-
putObjectWorm: async (
|
|
110
|
+
putObjectWorm: async ({ bucket, key, body, mode, retainUntil, contentType, }) => {
|
|
112
111
|
try {
|
|
113
112
|
const result = await client().send(new PutObjectCommand({
|
|
114
|
-
Bucket:
|
|
115
|
-
Key:
|
|
116
|
-
Body:
|
|
117
|
-
ContentType:
|
|
118
|
-
ObjectLockMode:
|
|
119
|
-
ObjectLockRetainUntilDate:
|
|
113
|
+
Bucket: bucket,
|
|
114
|
+
Key: key,
|
|
115
|
+
Body: body,
|
|
116
|
+
ContentType: contentType,
|
|
117
|
+
ObjectLockMode: mode,
|
|
118
|
+
ObjectLockRetainUntilDate: retainUntil,
|
|
120
119
|
}));
|
|
121
120
|
if (!result.VersionId) {
|
|
122
|
-
throw new Error(`putObjectWorm: no VersionId for ${
|
|
121
|
+
throw new Error(`putObjectWorm: no VersionId for ${bucket} (bucket needs versioning + Object Lock)`);
|
|
123
122
|
}
|
|
124
123
|
return { versionId: result.VersionId };
|
|
125
124
|
}
|
|
126
125
|
catch (e) {
|
|
127
|
-
logger.error('storage', { op: 'putObjectWorm', bucket
|
|
126
|
+
logger.error('storage', { op: 'putObjectWorm', bucket, ...keyShape(key), error: e });
|
|
128
127
|
throw e;
|
|
129
128
|
}
|
|
130
129
|
},
|
|
131
|
-
listObjectVersions: async (
|
|
130
|
+
listObjectVersions: async ({ bucket, key }) => {
|
|
132
131
|
try {
|
|
133
132
|
const versions = [];
|
|
134
133
|
let keyMarker;
|
|
135
134
|
let versionIdMarker;
|
|
136
135
|
do {
|
|
137
136
|
const result = await client().send(new ListObjectVersionsCommand({
|
|
138
|
-
Bucket:
|
|
139
|
-
Prefix:
|
|
137
|
+
Bucket: bucket,
|
|
138
|
+
Prefix: key,
|
|
140
139
|
KeyMarker: keyMarker,
|
|
141
140
|
VersionIdMarker: versionIdMarker,
|
|
142
141
|
}));
|
|
143
142
|
for (const version of result.Versions ?? []) {
|
|
144
|
-
if (version.Key ===
|
|
143
|
+
if (version.Key === key && version.VersionId) {
|
|
145
144
|
versions.push({
|
|
146
145
|
versionId: version.VersionId,
|
|
147
146
|
isLatest: version.IsLatest ?? false,
|
|
@@ -156,25 +155,25 @@ export const s3 = {
|
|
|
156
155
|
return versions;
|
|
157
156
|
}
|
|
158
157
|
catch (e) {
|
|
159
|
-
logger.error('storage', { op: 'listObjectVersions', bucket
|
|
158
|
+
logger.error('storage', { op: 'listObjectVersions', bucket, ...keyShape(key), error: e });
|
|
160
159
|
throw e;
|
|
161
160
|
}
|
|
162
161
|
},
|
|
163
|
-
deleteOrphanVersions: async (
|
|
162
|
+
deleteOrphanVersions: async ({ bucket, key, keepVersionIds, governanceBypass, }) => {
|
|
164
163
|
try {
|
|
165
|
-
const keep = new Set(
|
|
164
|
+
const keep = new Set(keepVersionIds);
|
|
166
165
|
const deletedVersionIds = [];
|
|
167
166
|
const skippedVersionIds = [];
|
|
168
|
-
for (const version of await s3.listObjectVersions({ bucket
|
|
167
|
+
for (const version of await s3.listObjectVersions({ bucket, key })) {
|
|
169
168
|
if (keep.has(version.versionId)) {
|
|
170
169
|
continue;
|
|
171
170
|
}
|
|
172
171
|
try {
|
|
173
172
|
await client().send(new DeleteObjectCommand({
|
|
174
|
-
Bucket:
|
|
175
|
-
Key:
|
|
173
|
+
Bucket: bucket,
|
|
174
|
+
Key: key,
|
|
176
175
|
VersionId: version.versionId,
|
|
177
|
-
BypassGovernanceRetention:
|
|
176
|
+
BypassGovernanceRetention: governanceBypass,
|
|
178
177
|
}));
|
|
179
178
|
deletedVersionIds.push(version.versionId);
|
|
180
179
|
}
|
|
@@ -183,8 +182,8 @@ export const s3 = {
|
|
|
183
182
|
if (error.name === 'AccessDenied') {
|
|
184
183
|
logger.warn('storage', {
|
|
185
184
|
op: 'deleteOrphanVersions',
|
|
186
|
-
bucket
|
|
187
|
-
...keyShape(
|
|
185
|
+
bucket,
|
|
186
|
+
...keyShape(key),
|
|
188
187
|
versionId: version.versionId,
|
|
189
188
|
error,
|
|
190
189
|
});
|
|
@@ -199,7 +198,7 @@ export const s3 = {
|
|
|
199
198
|
return { deletedVersionIds, skippedVersionIds };
|
|
200
199
|
}
|
|
201
200
|
catch (e) {
|
|
202
|
-
logger.error('storage', { op: 'deleteOrphanVersions', bucket
|
|
201
|
+
logger.error('storage', { op: 'deleteOrphanVersions', bucket, ...keyShape(key), error: e });
|
|
203
202
|
throw e;
|
|
204
203
|
}
|
|
205
204
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/s3/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,sCAAsC,EACtC,gBAAgB,EAChB,yBAAyB,EACzB,sCAAsC,EACtC,gBAAgB,EAChB,QAAQ,GACT,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAE9C,IAAI,cAAoC,CAAA;AACxC,uGAAuG;AACvG,qGAAqG;AACrG,qGAAqG;AACrG,+FAA+F;AAC/F,0FAA0F;AAC1F,wFAAwF;AACxF,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;AAEhH,MAAM,MAAM,GAAG,GAAG,EAAE;IAClB,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,cAAc;YACZ,UAAU,CAAC,iBAAiB,KAAK,SAAS;gBACxC,CAAC,CAAC,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC;gBACjD,CAAC,CAAC,IAAI,QAAQ,CAAC;oBACX,MAAM,EAAE,UAAU,CAAC,UAAU;oBAC7B,QAAQ,EAAE,UAAU,CAAC,iBAAiB;oBACtC,WAAW,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE;oBAC5E,cAAc,EAAE,IAAI;iBACrB,CAAC,CAAA;IACV,CAAC;IACD,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,EAAE,GAAG;IAChB,MAAM;IACN,SAAS,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/s3/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,19 +60,17 @@ export const createApp = (params) => {
|
|
|
60
60
|
res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
|
|
61
61
|
res.setHeader('Pragma', 'no-cache');
|
|
62
62
|
res.setHeader('Expires', '0');
|
|
63
|
-
|
|
63
|
+
res.json(await Promise.all(proxyTarget.targets.map(async ([path, url]) => {
|
|
64
64
|
const serviceName = path.replace(/^\//, '') || 'unknown';
|
|
65
65
|
try {
|
|
66
|
-
const
|
|
67
|
-
const response = await fetch(healthUrl, {
|
|
66
|
+
const response = await fetch(`${url}/health`, {
|
|
68
67
|
method: 'GET',
|
|
69
68
|
signal: AbortSignal.timeout(5000),
|
|
70
69
|
});
|
|
71
70
|
if (response.ok) {
|
|
72
|
-
const healthData = await response.json();
|
|
73
71
|
return {
|
|
74
72
|
service: serviceName,
|
|
75
|
-
...
|
|
73
|
+
...(await response.json()),
|
|
76
74
|
};
|
|
77
75
|
}
|
|
78
76
|
else {
|
|
@@ -88,8 +86,7 @@ export const createApp = (params) => {
|
|
|
88
86
|
status: 'NG',
|
|
89
87
|
};
|
|
90
88
|
}
|
|
91
|
-
}));
|
|
92
|
-
res.json(healthChecks);
|
|
89
|
+
})));
|
|
93
90
|
});
|
|
94
91
|
}
|
|
95
92
|
if (uploadsEnabled) {
|
|
@@ -234,8 +231,9 @@ export const createApp = (params) => {
|
|
|
234
231
|
logger.error('express', { method: req.method, kind: err.name });
|
|
235
232
|
next(err);
|
|
236
233
|
});
|
|
237
|
-
|
|
238
|
-
|
|
234
|
+
app
|
|
235
|
+
.listen(defaultEnv.PORT, () => logger.banner(`[${defaultEnv.SERVICE}] Listening on port ${defaultEnv.PORT} on ${defaultEnv.NODE_ENV}`))
|
|
236
|
+
.on('error', (error) => {
|
|
239
237
|
logger.error('startup', { port: defaultEnv.PORT, message: error.message, stack: error.stack });
|
|
240
238
|
process.exit(1);
|
|
241
239
|
});
|
|
@@ -244,8 +242,7 @@ export const createApp = (params) => {
|
|
|
244
242
|
// parsed — a host-bound forward scope then does NOT apply (fail-closed: no credential to an unknown host).
|
|
245
243
|
const requestHost = (input) => {
|
|
246
244
|
try {
|
|
247
|
-
|
|
248
|
-
return url.host.toLowerCase();
|
|
245
|
+
return (typeof input === 'string' ? new URL(input) : input instanceof URL ? input : new URL(input.url)).host.toLowerCase();
|
|
249
246
|
}
|
|
250
247
|
catch {
|
|
251
248
|
return undefined;
|
|
@@ -267,15 +264,14 @@ const patchFetchWithRequestHeaders = () => {
|
|
|
267
264
|
if (!store) {
|
|
268
265
|
return originalFetch(input, init);
|
|
269
266
|
}
|
|
270
|
-
const headers = resolveOutboundHeaders(store, {
|
|
271
|
-
allowList: AUTO_FORWARD_ALLOW_LIST,
|
|
272
|
-
targetHost: requestHost(input),
|
|
273
|
-
init,
|
|
274
|
-
...(input instanceof globalThis.Request ? { inputHeaders: input.headers } : {}),
|
|
275
|
-
});
|
|
276
267
|
return originalFetch(input, {
|
|
277
268
|
...init,
|
|
278
|
-
headers,
|
|
269
|
+
headers: resolveOutboundHeaders(store, {
|
|
270
|
+
allowList: AUTO_FORWARD_ALLOW_LIST,
|
|
271
|
+
targetHost: requestHost(input),
|
|
272
|
+
init,
|
|
273
|
+
...(input instanceof globalThis.Request ? { inputHeaders: input.headers } : {}),
|
|
274
|
+
}),
|
|
279
275
|
});
|
|
280
276
|
};
|
|
281
277
|
globalThis.fetch = patchedFetch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/express/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/express/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ export type ProcessingDeclaration = {
|
|
|
44
44
|
};
|
|
45
45
|
};
|
|
46
46
|
export declare const defineProcessingDeclarations: <const T extends Record<string, ProcessingDeclaration>>(declarations: T & (keyof T extends never ? never : unknown) & { [K in keyof T]: Record<Exclude<keyof T[K], keyof ProcessingDeclaration>, never>; }) => T & (keyof T extends never ? never : unknown) & { [K in keyof T]: Record<Exclude<keyof T[K], keyof ProcessingDeclaration>, never>; };
|
|
47
|
-
export declare const submitProcessingDeclarations: <T extends Record<string, ProcessingDeclaration>>(
|
|
47
|
+
export declare const submitProcessingDeclarations: <T extends Record<string, ProcessingDeclaration>>({ declarations, sourceRelease, submit, }: {
|
|
48
48
|
declarations: T;
|
|
49
49
|
sourceRelease: string;
|
|
50
50
|
submit: (input: {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { createHash } from 'node:crypto';
|
|
2
2
|
export const defineProcessingDeclarations = (declarations) => declarations;
|
|
3
|
-
export const submitProcessingDeclarations = async (
|
|
4
|
-
for (const [activityKey, content] of Object.entries(
|
|
5
|
-
await
|
|
3
|
+
export const submitProcessingDeclarations = async ({ declarations, sourceRelease, submit, }) => {
|
|
4
|
+
for (const [activityKey, content] of Object.entries(declarations)) {
|
|
5
|
+
await submit({
|
|
6
6
|
activityKey,
|
|
7
|
-
sourceRelease
|
|
7
|
+
sourceRelease,
|
|
8
8
|
content,
|
|
9
|
-
idempotencyKey: createHash('sha256').update(`${
|
|
9
|
+
idempotencyKey: createHash('sha256').update(`${sourceRelease}:${activityKey}`).digest('hex'),
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/trpc/declaration/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AA6BxC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,YAGG,EACH,EAAE,CAAC,YAAY,CAAA;AAEjB,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAmD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/trpc/declaration/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AA6BxC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,YAGG,EACH,EAAE,CAAC,YAAY,CAAA;AAEjB,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAmD,EAClG,YAAY,EACZ,aAAa,EACb,MAAM,GAUP,EAAE,EAAE;IACH,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAqC,EAAE,CAAC;QACtG,MAAM,MAAM,CAAC;YACX,WAAW;YACX,aAAa;YACb,OAAO;YACP,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,aAAa,IAAI,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC7F,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
export declare const errorLogInputSchema: z.ZodObject<{
|
|
3
|
+
reporterKey: z.ZodString;
|
|
3
4
|
message: z.ZodOptional<z.ZodString>;
|
|
4
5
|
path: z.ZodString;
|
|
5
6
|
stack: z.ZodOptional<z.ZodString>;
|
|
6
7
|
userAgent: z.ZodString;
|
|
7
8
|
}, z.core.$strip>;
|
|
8
|
-
export declare const report: ({
|
|
9
|
-
ip?: string;
|
|
9
|
+
export declare const report: ({ path, message, stack, userAgent, reporterKey, }: {
|
|
10
10
|
path: string;
|
|
11
11
|
message?: string;
|
|
12
12
|
stack?: string;
|
|
13
13
|
userAgent: string;
|
|
14
|
+
reporterKey: string;
|
|
14
15
|
}, limits: {
|
|
15
16
|
max: number;
|
|
16
17
|
windowSec: number;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { createHash } from 'node:crypto';
|
|
2
1
|
import { z } from 'zod';
|
|
3
2
|
import { constants } from '../../../constants.js';
|
|
4
3
|
import { coordination } from '../../../coordination/index.js';
|
|
@@ -12,12 +11,16 @@ const errorLogPayloadShape = {
|
|
|
12
11
|
message: boundedField.optional(),
|
|
13
12
|
stack: boundedField.optional(),
|
|
14
13
|
};
|
|
15
|
-
export const errorLogInputSchema = z.object(
|
|
16
|
-
|
|
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) => {
|
|
17
22
|
try {
|
|
18
|
-
const key = `error-log:${defaultEnv.SERVICE}:${
|
|
19
|
-
.update(ip ?? '<unresolved>')
|
|
20
|
-
.digest('hex')}`;
|
|
23
|
+
const key = `error-log:${defaultEnv.SERVICE}:${reporterKey}`;
|
|
21
24
|
const result = await coordination.rateLimit.attempt({ key, ...limits });
|
|
22
25
|
if (!result.allowed) {
|
|
23
26
|
if (await coordination.throttle.tryAcquire({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/trpc/error-log/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
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"}
|
|
@@ -3,7 +3,7 @@ import * as trpcExpress from '@trpc/server/adapters/express';
|
|
|
3
3
|
import type express from 'express';
|
|
4
4
|
import superjson from 'superjson';
|
|
5
5
|
import type { DeclarableProcedure } from './declaration/index.ts';
|
|
6
|
-
declare const createRequestContext: (
|
|
6
|
+
declare const createRequestContext: ({ req }: trpcExpress.CreateExpressContextOptions) => {
|
|
7
7
|
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
8
8
|
ip: string | undefined;
|
|
9
9
|
};
|
|
@@ -155,6 +155,7 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
|
|
|
155
155
|
errorLog: {
|
|
156
156
|
report: import("@trpc/server").TRPCMutationProcedure<{
|
|
157
157
|
input: {
|
|
158
|
+
reporterKey: string;
|
|
158
159
|
message?: string | undefined;
|
|
159
160
|
path: string;
|
|
160
161
|
stack?: string | undefined;
|
|
@@ -310,6 +311,7 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
|
|
|
310
311
|
errorLog: {
|
|
311
312
|
report: import("@trpc/server").TRPCMutationProcedure<{
|
|
312
313
|
input: {
|
|
314
|
+
reporterKey: string;
|
|
313
315
|
message?: string | undefined;
|
|
314
316
|
path: string;
|
|
315
317
|
stack?: string | undefined;
|
|
@@ -12,11 +12,10 @@ import { createApp } from '../express/index.js';
|
|
|
12
12
|
import { mint } from '../uploads/index.js';
|
|
13
13
|
import { throwForbiddenError } from './error/index.js';
|
|
14
14
|
import { errorLogInputSchema, report } from './error-log/index.js';
|
|
15
|
-
const createRequestContext = (
|
|
16
|
-
const requestHeaders = opts.req.headers;
|
|
15
|
+
const createRequestContext = ({ req }) => {
|
|
17
16
|
return {
|
|
18
|
-
requestHeaders,
|
|
19
|
-
ip:
|
|
17
|
+
requestHeaders: req.headers,
|
|
18
|
+
ip: req.ip,
|
|
20
19
|
};
|
|
21
20
|
};
|
|
22
21
|
export function* generator(options = {}) {
|
|
@@ -61,20 +60,20 @@ export function* generator(options = {}) {
|
|
|
61
60
|
};
|
|
62
61
|
},
|
|
63
62
|
});
|
|
64
|
-
const baseProcedure = tprc.procedure.use(async (
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
63
|
+
const baseProcedure = tprc.procedure.use(async ({ ctx, path, next, type }) => {
|
|
64
|
+
return runWithAuditActor({
|
|
65
|
+
actorUserId: (resolveAuditActor
|
|
66
|
+
? await resolveAuditActor(ctx)
|
|
67
|
+
: { actorUserId: undefined }).actorUserId,
|
|
68
|
+
}, async () => {
|
|
69
|
+
return await runWithRequestPath(path, async () => {
|
|
70
70
|
const startTime = Date.now();
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
const result = await opts.next();
|
|
71
|
+
ctx.startTime = startTime;
|
|
72
|
+
const result = await next();
|
|
74
73
|
if (typeof result === 'object' && result !== null && 'error' in result && result.error instanceof Error) {
|
|
75
74
|
throw result.error;
|
|
76
75
|
}
|
|
77
|
-
logger.debug('operation', { type
|
|
76
|
+
logger.debug('operation', { type, duration: Date.now() - startTime });
|
|
78
77
|
return result;
|
|
79
78
|
});
|
|
80
79
|
});
|
|
@@ -91,8 +90,7 @@ export function* generator(options = {}) {
|
|
|
91
90
|
};
|
|
92
91
|
let routerBuilt = false;
|
|
93
92
|
const uploadHandler = async () => {
|
|
94
|
-
|
|
95
|
-
return mint(bucket);
|
|
93
|
+
return mint(uploadBucket ?? throwForbiddenError('file upload is not configured for this service'));
|
|
96
94
|
};
|
|
97
95
|
const baseRouter = tprc.router.bind(tprc);
|
|
98
96
|
const wrappedRouter = (routes) => {
|
|
@@ -113,11 +111,11 @@ export function* generator(options = {}) {
|
|
|
113
111
|
report: (errorLogProcedure ??
|
|
114
112
|
declarableProcedure.declare())
|
|
115
113
|
.input(errorLogInputSchema)
|
|
116
|
-
.mutation(({
|
|
114
|
+
.mutation(({ input }) => {
|
|
117
115
|
if (errorLogProcedure === undefined) {
|
|
118
116
|
throwForbiddenError('client-error reporting is not configured for this service');
|
|
119
117
|
}
|
|
120
|
-
return report(
|
|
118
|
+
return report(input, errorLogOptions);
|
|
121
119
|
}),
|
|
122
120
|
},
|
|
123
121
|
});
|
|
@@ -152,7 +150,6 @@ export function* generator(options = {}) {
|
|
|
152
150
|
allowMethodOverride: true,
|
|
153
151
|
createContext: (opts) => prisma.run(async () => createRequestContext(opts)),
|
|
154
152
|
onError: ({ error, type, path, input, ctx }) => {
|
|
155
|
-
const cause = error.cause;
|
|
156
153
|
// Only the downstream error's `source` (name / message / stack), never the whole `shape.data`
|
|
157
154
|
// envelope — that envelope carries the downstream `input` and `headers`, so logging it would
|
|
158
155
|
// reopen through the proxy hop exactly the payload this handler stopped emitting locally.
|
|
@@ -164,12 +161,14 @@ export function* generator(options = {}) {
|
|
|
164
161
|
Object.keys(holder.source).length > 0
|
|
165
162
|
? holder.source
|
|
166
163
|
: undefined;
|
|
167
|
-
const downstreamSource = cause instanceof TRPCClientError
|
|
164
|
+
const downstreamSource = error.cause instanceof TRPCClientError
|
|
165
|
+
? (nonEmptySource(error.cause.shape?.data) ?? nonEmptySource(error.cause))
|
|
166
|
+
: undefined;
|
|
168
167
|
// `inputKeys` instead of `input`, and no `result` / `headers`: which fields were present is what
|
|
169
168
|
// diagnoses a failed call, while their values are the payload this must not emit (see the
|
|
170
169
|
// `operation` log above for why key-based redaction cannot be relied on here). A validation
|
|
171
170
|
// failure already names the offending field in `message`.
|
|
172
|
-
|
|
171
|
+
logger.error('trpc', {
|
|
173
172
|
sequence: ctx && 'sequence' in ctx ? ctx.sequence : undefined,
|
|
174
173
|
type,
|
|
175
174
|
path,
|
|
@@ -179,8 +178,7 @@ export function* generator(options = {}) {
|
|
|
179
178
|
message: error.message,
|
|
180
179
|
stack: error.stack,
|
|
181
180
|
...(downstreamSource ? { downstreamSource } : {}),
|
|
182
|
-
};
|
|
183
|
-
logger.error('trpc', obj);
|
|
181
|
+
});
|
|
184
182
|
},
|
|
185
183
|
}),
|
|
186
184
|
],
|