@balena/pinejs 15.1.0-build-web-resource-4-528904929ba5aa3ec2cf3e80bd7800775c7b60a3-2 → 15.1.0-build-web-resource-4-366a6aee494d7b10ba96d42af0b39b91c57220b3-1
Sign up to get free protection for your applications and to get access to all the features.
- package/.versionbot/CHANGELOG.yml +2 -2
- package/CHANGELOG.md +1 -1
- package/README.md +1 -1
- package/out/server-glue/webresource-handler.js +14 -9
- package/out/server-glue/webresource-handler.js.map +1 -1
- package/out/server-glue/webresource-handlers/S3Handler.d.ts +1 -0
- package/out/server-glue/webresource-handlers/S3Handler.js +15 -2
- package/out/server-glue/webresource-handlers/S3Handler.js.map +1 -1
- package/package.json +3 -3
- package/src/server-glue/webresource-handler.ts +21 -11
- package/src/server-glue/webresource-handlers/S3Handler.ts +21 -4
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
- commits:
|
|
2
2
|
- subject: Adds WebResource type
|
|
3
|
-
hash:
|
|
3
|
+
hash: 366a6aee494d7b10ba96d42af0b39b91c57220b3
|
|
4
4
|
body: ""
|
|
5
5
|
footer:
|
|
6
6
|
Change-type: minor
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
nested: []
|
|
21
21
|
version: 15.1.0
|
|
22
22
|
title: ""
|
|
23
|
-
date: 2023-05-
|
|
23
|
+
date: 2023-05-31T18:11:19.500Z
|
|
24
24
|
- commits:
|
|
25
25
|
- subject: "Migrations.md: Add marking the sbvr field as optional on the 2nd deploy"
|
|
26
26
|
hash: d6d0ded8eccc6eadb2492f4697918cf0afd00215
|
package/CHANGELOG.md
CHANGED
|
@@ -5,7 +5,7 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
7
|
# v15.1.0
|
|
8
|
-
## (2023-05-
|
|
8
|
+
## (2023-05-31)
|
|
9
9
|
|
|
10
10
|
* Adds WebResource type [Otávio Jacobi]
|
|
11
11
|
* Integrate beta version of sbvr-types supporting WebResource Update to @balena/open-multer-s3, better large files test [Ramiro González Maciel]
|
package/README.md
CHANGED
|
@@ -67,5 +67,5 @@ An application can choose between two types to save file content or another larg
|
|
|
67
67
|
Please note that `WebResource` is still a work in progress and as such as a few limitations. Such as (but not exclusively):
|
|
68
68
|
|
|
69
69
|
- Files stored are currently only STANDARD public-read on buckets
|
|
70
|
-
- Deletion of a file may
|
|
70
|
+
- Deletion of a file may fail and will require to manually delete the file from S3
|
|
71
71
|
|
|
@@ -40,12 +40,12 @@ const ifFileInValidPath = async (fieldname, req) => {
|
|
|
40
40
|
return false;
|
|
41
41
|
};
|
|
42
42
|
const getUploaderMiddlware = (handler) => {
|
|
43
|
-
|
|
44
|
-
const filesUploaded = [];
|
|
45
|
-
return async (req, _res, next) => {
|
|
43
|
+
return async (req, res, next) => {
|
|
46
44
|
if (!is(req, ['multipart'])) {
|
|
47
45
|
return next();
|
|
48
46
|
}
|
|
47
|
+
const filesUploaded = [];
|
|
48
|
+
const completeUploads = [];
|
|
49
49
|
const bb = busboy({ headers: req.headers });
|
|
50
50
|
let isAborting = false;
|
|
51
51
|
const done = () => {
|
|
@@ -93,8 +93,11 @@ const getUploaderMiddlware = (handler) => {
|
|
|
93
93
|
next();
|
|
94
94
|
}
|
|
95
95
|
catch (err) {
|
|
96
|
-
console.error('Error uploading file', err);
|
|
97
96
|
await clearFiles();
|
|
97
|
+
if (err?.message.includes('File size exceeded')) {
|
|
98
|
+
return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError('File size exceeded'));
|
|
99
|
+
}
|
|
100
|
+
console.error('Error uploading file', err);
|
|
98
101
|
next(err);
|
|
99
102
|
}
|
|
100
103
|
});
|
|
@@ -167,11 +170,11 @@ const getRemoveWebResourceHook = (webResourceHandler) => {
|
|
|
167
170
|
if (fields.length === 0) {
|
|
168
171
|
return;
|
|
169
172
|
}
|
|
170
|
-
const
|
|
171
|
-
if (
|
|
173
|
+
const [id, rest] = await sbvrUtils.getAffectedIds(args);
|
|
174
|
+
if (id == null) {
|
|
172
175
|
return;
|
|
173
176
|
}
|
|
174
|
-
if (
|
|
177
|
+
if (rest != null) {
|
|
175
178
|
throw new module_1.errors.BadRequestError('Resources containing webresources can only be updated/deleted one at a time.');
|
|
176
179
|
}
|
|
177
180
|
const webResources = (await api.get({
|
|
@@ -180,7 +183,7 @@ const getRemoveWebResourceHook = (webResourceHandler) => {
|
|
|
180
183
|
tx: args.tx,
|
|
181
184
|
req: module_1.permissions.root,
|
|
182
185
|
},
|
|
183
|
-
id
|
|
186
|
+
id,
|
|
184
187
|
options: {
|
|
185
188
|
$select: fields,
|
|
186
189
|
},
|
|
@@ -191,7 +194,9 @@ const getRemoveWebResourceHook = (webResourceHandler) => {
|
|
|
191
194
|
POSTRUN: ({ tx, request }) => {
|
|
192
195
|
tx.on('end', () => {
|
|
193
196
|
const keysToDelete = request.custom.$pineWebResourcesToDelete || [];
|
|
194
|
-
deleteFiles(keysToDelete, webResourceHandler)
|
|
197
|
+
deleteFiles(keysToDelete, webResourceHandler).catch((err) => {
|
|
198
|
+
console.error(`Failed to delete pending files`, err);
|
|
199
|
+
});
|
|
195
200
|
});
|
|
196
201
|
},
|
|
197
202
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webresource-handler.js","sourceRoot":"","sources":["../../src/server-glue/webresource-handler.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AACjC,8BAA8B;AAE9B,oDAAoD;AACpD,uDAA8D;AAC9D,yDAA2D;AAC3D,oDAAoD;AACpD,gEAA6D;AAC7D,oEAAiE;AACjE,yEAGuC;AACvC,qCAA+C;AAwB/C,MAAM,iBAAiB,GAAG,KAAK,EAC9B,SAAiB,EACjB,GAAoB,EACD,EAAE;IACrB,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE;QACpD,OAAO,KAAK,CAAC;KACb;IAED,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;IAChC,IAAI,OAAO,IAAI,IAAI,EAAE;QACpB,OAAO,KAAK,CAAC;KACb;IACD,MAAM,KAAK,GAAG,IAAA,qBAAQ,EAAC,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC;QACnD,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,MAAM,EAAE,GAAG,CAAC,MAAM;KAClB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAgB,EAC5C,GAAG,EACH,UAAU,EACV,YAAY,EACZ,KAAK,CACL,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACpB,OAAO,KAAK,CAAC;KACb;IAGD,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;IAC7D,MAAM,WAAW,GAAG,IAAA,0CAAkB,EAAC,SAAS,CAAC,CAAC;IAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC3B,IAAI,KAAK,CAAC,SAAS,KAAK,WAAW,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,EAAE;YACxE,OAAO,IAAI,CAAC;SACZ;KACD;IAKD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,CACnC,OAA2B,EACF,EAAE;IAC3B,
|
|
1
|
+
{"version":3,"file":"webresource-handler.js","sourceRoot":"","sources":["../../src/server-glue/webresource-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export declare class S3Handler implements WebResourceHandler {
|
|
|
3
3
|
private readonly config;
|
|
4
4
|
private readonly bucket;
|
|
5
5
|
private readonly endpoint;
|
|
6
|
+
private readonly maxFileSize;
|
|
6
7
|
private client;
|
|
7
8
|
constructor();
|
|
8
9
|
handleFile(resource: IncomingFile): Promise<UploadResponse>;
|
|
@@ -7,6 +7,7 @@ const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
|
7
7
|
const crypto_1 = require("crypto");
|
|
8
8
|
class S3Handler {
|
|
9
9
|
constructor() {
|
|
10
|
+
this.maxFileSize = (0, env_parsing_1.intVar)('PINEJS_WEBRESOURCE_MAXFILESIZE', 52428800);
|
|
10
11
|
this.endpoint = (0, env_parsing_1.requiredVar)('S3_ENDPOINT');
|
|
11
12
|
this.config = {
|
|
12
13
|
region: (0, env_parsing_1.optionalVar)('S3_REGION', 'us-east-1'),
|
|
@@ -32,10 +33,22 @@ class S3Handler {
|
|
|
32
33
|
ContentType: resource.mimetype,
|
|
33
34
|
};
|
|
34
35
|
const upload = new lib_storage_1.Upload({ client: this.client, params });
|
|
35
|
-
upload.on('httpUploadProgress', (ev) => {
|
|
36
|
+
upload.on('httpUploadProgress', async (ev) => {
|
|
36
37
|
size = ev.total ? ev.total : ev.loaded;
|
|
38
|
+
if (size > this.maxFileSize) {
|
|
39
|
+
await upload.abort();
|
|
40
|
+
}
|
|
37
41
|
});
|
|
38
|
-
|
|
42
|
+
try {
|
|
43
|
+
await upload.done();
|
|
44
|
+
}
|
|
45
|
+
catch (err) {
|
|
46
|
+
resource.stream.resume();
|
|
47
|
+
if (size > this.maxFileSize) {
|
|
48
|
+
throw new Error('File size exceeded');
|
|
49
|
+
}
|
|
50
|
+
throw err;
|
|
51
|
+
}
|
|
39
52
|
const filename = this.getS3URL(key);
|
|
40
53
|
return { size, filename };
|
|
41
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/S3Handler.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/S3Handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs",
|
|
3
|
-
"version": "15.1.0-build-web-resource-4-
|
|
3
|
+
"version": "15.1.0-build-web-resource-4-366a6aee494d7b10ba96d42af0b39b91c57220b3-1",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"webpack-build": "npm run webpack-browser && npm run webpack-module && npm run webpack-server",
|
|
20
20
|
"lint": "balena-lint -e js -e ts src build typings Gruntfile.ts && npx tsc --project tsconfig.dev.json --noEmit",
|
|
21
21
|
"test": "npm run lint & npm run build && npm run webpack-build && npm run test:compose",
|
|
22
|
-
"test:compose": "trap 'docker-compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' SIGINT; docker-compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD npm run mocha",
|
|
22
|
+
"test:compose": "trap 'docker-compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' SIGINT; docker-compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres PINEJS_WEBRESOURCE_MAXFILESIZE=1000000000 S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD S3_STORAGE_ADAPTER_BUCKET=balena-pine-web-resources npm run mocha",
|
|
23
23
|
"mocha": "TS_NODE_FILES=true mocha",
|
|
24
24
|
"prettify": "balena-lint -e js -e ts --fix src build typings Gruntfile.ts"
|
|
25
25
|
},
|
|
@@ -139,6 +139,6 @@
|
|
|
139
139
|
"recursive": true
|
|
140
140
|
},
|
|
141
141
|
"versionist": {
|
|
142
|
-
"publishedAt": "2023-05-
|
|
142
|
+
"publishedAt": "2023-05-31T18:11:20.344Z"
|
|
143
143
|
}
|
|
144
144
|
}
|
|
@@ -85,13 +85,12 @@ const ifFileInValidPath = async (
|
|
|
85
85
|
export const getUploaderMiddlware = (
|
|
86
86
|
handler: WebResourceHandler,
|
|
87
87
|
): Express.RequestHandler => {
|
|
88
|
-
|
|
89
|
-
const filesUploaded: string[] = [];
|
|
90
|
-
|
|
91
|
-
return async (req, _res, next) => {
|
|
88
|
+
return async (req, res, next) => {
|
|
92
89
|
if (!is(req, ['multipart'])) {
|
|
93
90
|
return next();
|
|
94
91
|
}
|
|
92
|
+
const filesUploaded: string[] = [];
|
|
93
|
+
const completeUploads: Array<Promise<void>> = [];
|
|
95
94
|
|
|
96
95
|
const bb = busboy({ headers: req.headers });
|
|
97
96
|
let isAborting = false;
|
|
@@ -145,9 +144,18 @@ export const getUploaderMiddlware = (
|
|
|
145
144
|
await Promise.all(completeUploads);
|
|
146
145
|
done();
|
|
147
146
|
next();
|
|
148
|
-
} catch (err) {
|
|
149
|
-
console.error('Error uploading file', err);
|
|
147
|
+
} catch (err: any) {
|
|
150
148
|
await clearFiles();
|
|
149
|
+
|
|
150
|
+
if (err?.message.includes('File size exceeded')) {
|
|
151
|
+
return sbvrUtils.handleHttpErrors(
|
|
152
|
+
req,
|
|
153
|
+
res,
|
|
154
|
+
new errors.BadRequestError('File size exceeded'),
|
|
155
|
+
);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
console.error('Error uploading file', err);
|
|
151
159
|
next(err);
|
|
152
160
|
}
|
|
153
161
|
});
|
|
@@ -241,12 +249,12 @@ const getRemoveWebResourceHook = (webResourceHandler: WebResourceHandler) => {
|
|
|
241
249
|
return;
|
|
242
250
|
}
|
|
243
251
|
|
|
244
|
-
const
|
|
245
|
-
if (
|
|
252
|
+
const [id, rest] = await sbvrUtils.getAffectedIds(args);
|
|
253
|
+
if (id == null) {
|
|
246
254
|
return;
|
|
247
255
|
}
|
|
248
256
|
|
|
249
|
-
if (
|
|
257
|
+
if (rest != null) {
|
|
250
258
|
throw new errors.BadRequestError(
|
|
251
259
|
'Resources containing webresources can only be updated/deleted one at a time.',
|
|
252
260
|
);
|
|
@@ -258,7 +266,7 @@ const getRemoveWebResourceHook = (webResourceHandler: WebResourceHandler) => {
|
|
|
258
266
|
tx: args.tx,
|
|
259
267
|
req: permissions.root,
|
|
260
268
|
},
|
|
261
|
-
id
|
|
269
|
+
id,
|
|
262
270
|
options: {
|
|
263
271
|
$select: fields,
|
|
264
272
|
},
|
|
@@ -272,7 +280,9 @@ const getRemoveWebResourceHook = (webResourceHandler: WebResourceHandler) => {
|
|
|
272
280
|
const keysToDelete: string[] =
|
|
273
281
|
request.custom.$pineWebResourcesToDelete || [];
|
|
274
282
|
// on purpose does not await for this promise to resolve
|
|
275
|
-
deleteFiles(keysToDelete, webResourceHandler)
|
|
283
|
+
deleteFiles(keysToDelete, webResourceHandler).catch((err) => {
|
|
284
|
+
console.error(`Failed to delete pending files`, err);
|
|
285
|
+
});
|
|
276
286
|
});
|
|
277
287
|
},
|
|
278
288
|
} as sbvrUtils.Hooks;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { optionalVar, requiredVar } from '@balena/env-parsing';
|
|
1
|
+
import { optionalVar, requiredVar, intVar } from '@balena/env-parsing';
|
|
2
2
|
import {
|
|
3
3
|
IncomingFile,
|
|
4
4
|
UploadResponse,
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
S3Client,
|
|
9
9
|
S3ClientConfig,
|
|
10
10
|
DeleteObjectCommand,
|
|
11
|
+
PutObjectCommandInput,
|
|
11
12
|
} from '@aws-sdk/client-s3';
|
|
12
13
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
13
14
|
|
|
@@ -17,6 +18,10 @@ export class S3Handler implements WebResourceHandler {
|
|
|
17
18
|
private readonly config: S3ClientConfig;
|
|
18
19
|
private readonly bucket: string;
|
|
19
20
|
private readonly endpoint: string;
|
|
21
|
+
private readonly maxFileSize = intVar(
|
|
22
|
+
'PINEJS_WEBRESOURCE_MAXFILESIZE',
|
|
23
|
+
52428800,
|
|
24
|
+
);
|
|
20
25
|
private client: S3Client;
|
|
21
26
|
|
|
22
27
|
constructor() {
|
|
@@ -43,7 +48,7 @@ export class S3Handler implements WebResourceHandler {
|
|
|
43
48
|
const key = `${resource.fieldname}_${randomUUID()}_${
|
|
44
49
|
resource.originalname
|
|
45
50
|
}`;
|
|
46
|
-
const params = {
|
|
51
|
+
const params: PutObjectCommandInput = {
|
|
47
52
|
Bucket: this.bucket,
|
|
48
53
|
ACL: 'public-read',
|
|
49
54
|
StorageClass: 'STANDARD',
|
|
@@ -53,11 +58,23 @@ export class S3Handler implements WebResourceHandler {
|
|
|
53
58
|
};
|
|
54
59
|
const upload = new Upload({ client: this.client, params });
|
|
55
60
|
|
|
56
|
-
upload.on('httpUploadProgress', (ev) => {
|
|
61
|
+
upload.on('httpUploadProgress', async (ev) => {
|
|
57
62
|
size = ev.total ? ev.total : ev.loaded!;
|
|
63
|
+
if (size > this.maxFileSize) {
|
|
64
|
+
await upload.abort();
|
|
65
|
+
}
|
|
58
66
|
});
|
|
59
67
|
|
|
60
|
-
|
|
68
|
+
try {
|
|
69
|
+
await upload.done();
|
|
70
|
+
} catch (err: any) {
|
|
71
|
+
resource.stream.resume();
|
|
72
|
+
if (size > this.maxFileSize) {
|
|
73
|
+
throw new Error('File size exceeded');
|
|
74
|
+
}
|
|
75
|
+
throw err;
|
|
76
|
+
}
|
|
77
|
+
|
|
61
78
|
const filename = this.getS3URL(key);
|
|
62
79
|
return { size, filename };
|
|
63
80
|
}
|