@balena/pinejs-webresource-s3 2.1.50 → 2.1.51
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/.versionbot/CHANGELOG.yml +23 -1
- package/CHANGELOG.md +5 -0
- package/build/index.js +22 -0
- package/build/index.js.map +1 -1
- package/lib/index.ts +41 -0
- package/package.json +2 -2
- package/test/index.test.ts +68 -0
|
@@ -1,3 +1,25 @@
|
|
|
1
|
+
- commits:
|
|
2
|
+
- subject: Reject config values that can never work at construction
|
|
3
|
+
hash: d94ba64fb48a13ab0ed585df305bb26deb4108ff
|
|
4
|
+
body: |
|
|
5
|
+
These were accepted and then failed on every request instead:
|
|
6
|
+
- `signedUrlExpireTimeSeconds` over 7 days (the SigV4 maximum) makes
|
|
7
|
+
every signing, and so every `onPreRespond`, reject
|
|
8
|
+
- `signedUrlCacheExpireTimeSeconds` not below the expiry serves urls
|
|
9
|
+
from the cache after they have expired
|
|
10
|
+
- `defaultMultipartUploadSize` below `minimumMultipartUploadSize` makes
|
|
11
|
+
every `beginUpload` without a `chunk_size` fail as too small
|
|
12
|
+
- a non-positive or fractional `minimumMultipartUploadSize` allows zero
|
|
13
|
+
or fractional chunk sizes
|
|
14
|
+
- a `NaN` `maxSize` (eg an unset env var through `parseInt`) silently
|
|
15
|
+
disables the size limit
|
|
16
|
+
footer:
|
|
17
|
+
Change-type: patch
|
|
18
|
+
change-type: patch
|
|
19
|
+
author: Pagan Gazzard
|
|
20
|
+
version: 2.1.51
|
|
21
|
+
title: ""
|
|
22
|
+
date: 2026-10-28T12:22:44.945Z
|
|
1
23
|
- commits:
|
|
2
24
|
- subject: Encode non-ASCII filenames in Content-Disposition
|
|
3
25
|
hash: 857490ea24ad1eb2917a672a31e296b56dac33bf
|
|
@@ -19,7 +41,7 @@
|
|
|
19
41
|
author: Pagan Gazzard
|
|
20
42
|
version: 2.1.50
|
|
21
43
|
title: ""
|
|
22
|
-
date: 2026-10-28T12:
|
|
44
|
+
date: 2026-10-28T12:19:23.999Z
|
|
23
45
|
- commits:
|
|
24
46
|
- subject: Disable the signed url cache when its expiry is 0
|
|
25
47
|
hash: 7759b515b77531b49e917820e8ce62d8a8efe514
|
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
|
|
|
4
4
|
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
|
+
# v2.1.51
|
|
8
|
+
## (2026-10-28)
|
|
9
|
+
|
|
10
|
+
* Reject config values that can never work at construction [Pagan Gazzard]
|
|
11
|
+
|
|
7
12
|
# v2.1.50
|
|
8
13
|
## (2026-10-28)
|
|
9
14
|
|
package/build/index.js
CHANGED
|
@@ -4,6 +4,7 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
|
|
|
4
4
|
import { webResourceHandler } from '@balena/pinejs';
|
|
5
5
|
import memoize from 'memoizee';
|
|
6
6
|
import { randomUUID } from 'node:crypto';
|
|
7
|
+
const MAX_SIGNED_URL_EXPIRE_TIME_SECONDS = 7 * 24 * 60 * 60;
|
|
7
8
|
const normalizeHref = (href) => {
|
|
8
9
|
return href.split('?')[0];
|
|
9
10
|
};
|
|
@@ -50,6 +51,27 @@ export class S3Handler {
|
|
|
50
51
|
this.defaultMultipartUploadSize =
|
|
51
52
|
config.defaultMultipartUploadSize ?? 10 * 1024 * 1024;
|
|
52
53
|
this.maxFileSize = config.maxSize ?? 52428800;
|
|
54
|
+
if (!Number.isSafeInteger(this.signedUrlExpireTimeSeconds) ||
|
|
55
|
+
this.signedUrlExpireTimeSeconds <= 0 ||
|
|
56
|
+
this.signedUrlExpireTimeSeconds > MAX_SIGNED_URL_EXPIRE_TIME_SECONDS) {
|
|
57
|
+
throw new Error(`signedUrlExpireTimeSeconds must be an integer between 1 and ${MAX_SIGNED_URL_EXPIRE_TIME_SECONDS}`);
|
|
58
|
+
}
|
|
59
|
+
if (Number.isNaN(this.signedUrlCacheExpireTimeSeconds) ||
|
|
60
|
+
this.signedUrlCacheExpireTimeSeconds < 0 ||
|
|
61
|
+
this.signedUrlCacheExpireTimeSeconds >= this.signedUrlExpireTimeSeconds) {
|
|
62
|
+
throw new Error('signedUrlCacheExpireTimeSeconds must be at least 0 and less than signedUrlExpireTimeSeconds');
|
|
63
|
+
}
|
|
64
|
+
if (!Number.isSafeInteger(this.minimumMultipartUploadSize) ||
|
|
65
|
+
this.minimumMultipartUploadSize <= 0) {
|
|
66
|
+
throw new Error('minimumMultipartUploadSize must be a positive integer');
|
|
67
|
+
}
|
|
68
|
+
if (!Number.isSafeInteger(this.defaultMultipartUploadSize) ||
|
|
69
|
+
this.defaultMultipartUploadSize < this.minimumMultipartUploadSize) {
|
|
70
|
+
throw new Error('defaultMultipartUploadSize must be an integer of at least minimumMultipartUploadSize');
|
|
71
|
+
}
|
|
72
|
+
if (Number.isNaN(this.maxFileSize) || this.maxFileSize < 0) {
|
|
73
|
+
throw new Error('maxSize must be a number of at least 0');
|
|
74
|
+
}
|
|
53
75
|
this.bucket = config.bucket;
|
|
54
76
|
this.client = new S3Client(this.config);
|
|
55
77
|
this.cachedGetSignedUrl =
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,EAGR,4BAA4B,EAC5B,iBAAiB,EACjB,8BAA8B,EAC9B,iBAAiB,EACjB,2BAA2B,GAE3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,EAGR,4BAA4B,EAC5B,iBAAiB,EACjB,8BAA8B,EAC9B,iBAAiB,EACjB,2BAA2B,GAE3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAgBzC,MAAM,kCAAkC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE5D,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;IACtC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC;AAKF,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAClD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IACnE,IAAI,aAAa,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,qBAAqB,QAAQ,GAAG,CAAC;IACzC,CAAC;IACD,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1E,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEvC,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IAC3D,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,OAAO,qBAAqB,aAAa,uBAAuB,eAAe,EAAE,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,OAAO,SAAS;IACJ,MAAM,CAAiB;IACvB,MAAM,CAAS;IACf,WAAW,CAAS;IACpB,0BAA0B,CAAS;IACnC,0BAA0B,CAAS;IAEjC,0BAA0B,CAAS;IACnC,+BAA+B,CAAS;IACjD,kBAAkB,CAAuC;IAChD,YAAY,CAA2B;IAElD,MAAM,CAAW;IAEzB,YAAY,MAAsB;QACjC,IAAI,CAAC,MAAM,GAAG;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,WAAW,EAAE;gBACZ,WAAW,EAAE,MAAM,CAAC,SAAS;gBAC7B,eAAe,EAAE,MAAM,CAAC,SAAS;aACjC;YACD,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,cAAc,EAAE,IAAI;SACpB,CAAC;QAEF,IAAI,CAAC,0BAA0B;YAC9B,MAAM,CAAC,0BAA0B,IAAI,KAAK,CAAC;QAC5C,IAAI,CAAC,+BAA+B;YACnC,MAAM,CAAC,+BAA+B,IAAI,KAAK,CAAC;QAEjD,IAAI,CAAC,0BAA0B;YAC9B,MAAM,CAAC,0BAA0B,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;QACtD,IAAI,CAAC,0BAA0B;YAC9B,MAAM,CAAC,0BAA0B,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;QACvD,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,IAAI,QAAQ,CAAC;QAG9C,IACC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC;YACtD,IAAI,CAAC,0BAA0B,IAAI,CAAC;YACpC,IAAI,CAAC,0BAA0B,GAAG,kCAAkC,EACnE,CAAC;YACF,MAAM,IAAI,KAAK,CACd,+DAA+D,kCAAkC,EAAE,CACnG,CAAC;QACH,CAAC;QACD,IACC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,+BAA+B,CAAC;YAClD,IAAI,CAAC,+BAA+B,GAAG,CAAC;YACxC,IAAI,CAAC,+BAA+B,IAAI,IAAI,CAAC,0BAA0B,EACtE,CAAC;YACF,MAAM,IAAI,KAAK,CACd,6FAA6F,CAC7F,CAAC;QACH,CAAC;QACD,IACC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC;YACtD,IAAI,CAAC,0BAA0B,IAAI,CAAC,EACnC,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC1E,CAAC;QACD,IACC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC;YACtD,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,0BAA0B,EAChE,CAAC;YACF,MAAM,IAAI,KAAK,CACd,sFAAsF,CACtF,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAKxC,IAAI,CAAC,kBAAkB;YACtB,IAAI,CAAC,+BAA+B,GAAG,CAAC;gBACvC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;oBACxB,MAAM,EAAE,IAAI,CAAC,+BAA+B,GAAG,IAAI;iBACnD,CAAC;gBACH,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,UAAU,CACtB,QAAyC;QAEzC,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,MAAM,GAA0B;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,QAAQ,CAAC,MAAM;YACrB,WAAW,EAAE,QAAQ,CAAC,QAAQ;YAC9B,kBAAkB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC;YAChE,YAAY,EAAE,IAAI,CAAC,YAAY;SAC/B,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3D,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YAC5C,IAAI,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,MAAO,CAAC;YAC9B,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC7B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC;YACJ,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YACnB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACzB,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC7B,MAAM,IAAI,kBAAkB,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACtE,CAAC;YACD,MAAM,GAAG,CAAC;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAY;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,OAAO;SACZ,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,WAAwB;QACjD,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACtD,WAAW,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,WAAW,CAAC;IACpB,CAAC;IAEM,eAAe,GAAG;QACxB,KAAK,EAAE,KAAK,EACX,SAAiB,EACjB,OAAuD,EACW,EAAE;YACpE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAE3C,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACrD,IAAI,4BAA4B,CAAC;gBAChC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,EAAE,OAAO;gBACZ,WAAW,EAAE,OAAO,CAAC,YAAY;gBACjC,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC3D,YAAY,EAAE,IAAI,CAAC,YAAY;aAC/B,CAAC,CACF,CAAC;YAEF,IAAI,uBAAuB,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;gBAC9C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACvD,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAC5C,OAAO,EACP,uBAAuB,CAAC,QAAQ,EAChC,OAAO,CACP,CAAC;YACF,OAAO;gBACN,OAAO;gBACP,QAAQ,EAAE,uBAAuB,CAAC,QAAQ;gBAC1C,WAAW;aACX,CAAC;QACH,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,EACd,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,kBAAkB,GAC+B,EAAwB,EAAE;YAC3E,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACrB,IAAI,8BAA8B,CAAC;gBAClC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,EAAE,OAAO;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,eAAe,EAAE,kBAAkB;aACnC,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACxC,IAAI,iBAAiB,CAAC;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,EAAE,OAAO;aACZ,CAAC,CACF,CAAC;YAEF,OAAO;gBACN,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC5B,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,UAAU,CAAC,aAAa;gBAC9B,YAAY,EAAE,UAAU,CAAC,WAAW;aACpC,CAAC;QACH,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,EACd,OAAO,EACP,QAAQ,GACyC,EAAiB,EAAE;YACpE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACrB,IAAI,2BAA2B,CAAC;gBAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,EAAE,OAAO;gBACZ,QAAQ,EAAE,QAAQ;aAClB,CAAC,CACF,CAAC;QACH,CAAC;QACD,kBAAkB,EAAE,GAAG,EAAE;YACxB,OAAO,IAAI,CAAC,0BAA0B,CAAC;QACxC,CAAC;QAED,kBAAkB,EAAE,GAAG,EAAE;YACxB,OAAO,IAAI,CAAC,0BAA0B,CAAC;QACxC,CAAC;KACD,CAAC;IAEM,SAAS,CAAC,OAAe;QAChC,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAAC;YACpC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,OAAO;SACZ,CAAC,CAAC;QACH,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;YACzC,SAAS,EAAE,IAAI,CAAC,0BAA0B;SAC1C,CAAC,CAAC;IACJ,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC3B,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;IACxD,CAAC;IAEO,cAAc,CAAC,IAAY;QAClC,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAC9C,OAAO,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEO,UAAU,CAAC,SAAiB;QACnC,OAAO,GAAG,SAAS,IAAI,UAAU,EAAE,EAAE,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,cAAc,CAC3B,OAAe,EACf,QAAgB,EAChB,OAAuD;QAEvD,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CACtD,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,CAClB,CAAC;QACF,OAAO,OAAO,CAAC,GAAG,CACjB,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7D,SAAS;YACT,UAAU;YACV,GAAG,EAAE,MAAM,IAAI,CAAC,gBAAgB,CAC/B,OAAO,EACP,QAAQ,EACR,UAAU,EACV,SAAS,CACT;SACD,CAAC,CAAC,CACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC7B,OAAe,EACf,QAAgB,EAChB,UAAkB,EAClB,QAAgB;QAEhB,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,OAAO;YACZ,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,UAAU;YACtB,aAAa,EAAE,QAAQ;SACvB,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;YACzC,SAAS,EAAE,IAAI,CAAC,0BAA0B;SAC1C,CAAC,CAAC;IACJ,CAAC;IAEO,sBAAsB,CAC7B,IAAY,EACZ,SAAiB;QAEjB,MAAM,mBAAmB,GAAG,EAAE,CAAC;QAC/B,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,OAAO,aAAa,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YAC5D,mBAAmB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC;YACtE,aAAa,IAAI,gBAAgB,CAAC;YAClC,UAAU,IAAI,CAAC,CAAC;QACjB,CAAC;QACD,OAAO,mBAAmB,CAAC;IAC5B,CAAC;CACD"}
|
package/lib/index.ts
CHANGED
|
@@ -32,6 +32,9 @@ export interface S3HandlerProps {
|
|
|
32
32
|
storageClass?: StorageClass;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
// The longest a SigV4 presigned url can be valid for, 7 days
|
|
36
|
+
const MAX_SIGNED_URL_EXPIRE_TIME_SECONDS = 7 * 24 * 60 * 60;
|
|
37
|
+
|
|
35
38
|
const normalizeHref = (href: string) => {
|
|
36
39
|
return href.split('?')[0];
|
|
37
40
|
};
|
|
@@ -89,6 +92,44 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
89
92
|
this.defaultMultipartUploadSize =
|
|
90
93
|
config.defaultMultipartUploadSize ?? 10 * 1024 * 1024; // 5 MB
|
|
91
94
|
this.maxFileSize = config.maxSize ?? 52428800;
|
|
95
|
+
|
|
96
|
+
// Reject values that could never work rather than failing on every request
|
|
97
|
+
if (
|
|
98
|
+
!Number.isSafeInteger(this.signedUrlExpireTimeSeconds) ||
|
|
99
|
+
this.signedUrlExpireTimeSeconds <= 0 ||
|
|
100
|
+
this.signedUrlExpireTimeSeconds > MAX_SIGNED_URL_EXPIRE_TIME_SECONDS
|
|
101
|
+
) {
|
|
102
|
+
throw new Error(
|
|
103
|
+
`signedUrlExpireTimeSeconds must be an integer between 1 and ${MAX_SIGNED_URL_EXPIRE_TIME_SECONDS}`,
|
|
104
|
+
);
|
|
105
|
+
}
|
|
106
|
+
if (
|
|
107
|
+
Number.isNaN(this.signedUrlCacheExpireTimeSeconds) ||
|
|
108
|
+
this.signedUrlCacheExpireTimeSeconds < 0 ||
|
|
109
|
+
this.signedUrlCacheExpireTimeSeconds >= this.signedUrlExpireTimeSeconds
|
|
110
|
+
) {
|
|
111
|
+
throw new Error(
|
|
112
|
+
'signedUrlCacheExpireTimeSeconds must be at least 0 and less than signedUrlExpireTimeSeconds',
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
if (
|
|
116
|
+
!Number.isSafeInteger(this.minimumMultipartUploadSize) ||
|
|
117
|
+
this.minimumMultipartUploadSize <= 0
|
|
118
|
+
) {
|
|
119
|
+
throw new Error('minimumMultipartUploadSize must be a positive integer');
|
|
120
|
+
}
|
|
121
|
+
if (
|
|
122
|
+
!Number.isSafeInteger(this.defaultMultipartUploadSize) ||
|
|
123
|
+
this.defaultMultipartUploadSize < this.minimumMultipartUploadSize
|
|
124
|
+
) {
|
|
125
|
+
throw new Error(
|
|
126
|
+
'defaultMultipartUploadSize must be an integer of at least minimumMultipartUploadSize',
|
|
127
|
+
);
|
|
128
|
+
}
|
|
129
|
+
if (Number.isNaN(this.maxFileSize) || this.maxFileSize < 0) {
|
|
130
|
+
throw new Error('maxSize must be a number of at least 0');
|
|
131
|
+
}
|
|
132
|
+
|
|
92
133
|
this.bucket = config.bucket;
|
|
93
134
|
this.client = new S3Client(this.config);
|
|
94
135
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs-webresource-s3",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.51",
|
|
4
4
|
"description": "A PineJS WebResource handler for storing & serving files on S3",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/index.js",
|
|
@@ -50,6 +50,6 @@
|
|
|
50
50
|
"@balena/pinejs": "^21.3.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.0.0"
|
|
51
51
|
},
|
|
52
52
|
"versionist": {
|
|
53
|
-
"publishedAt": "2026-10-28T12:
|
|
53
|
+
"publishedAt": "2026-10-28T12:22:44.997Z"
|
|
54
54
|
}
|
|
55
55
|
}
|
package/test/index.test.ts
CHANGED
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
import { mockClient } from 'aws-sdk-client-mock';
|
|
16
16
|
import { S3Handler } from '../lib/index.js';
|
|
17
17
|
import { PassThrough } from 'stream';
|
|
18
|
+
import { inspect } from 'util';
|
|
18
19
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
19
20
|
import type { webResourceHandler } from '@balena/pinejs';
|
|
20
21
|
|
|
@@ -39,6 +40,73 @@ describe('S3Handler', function () {
|
|
|
39
40
|
});
|
|
40
41
|
});
|
|
41
42
|
|
|
43
|
+
describe('constructor', function () {
|
|
44
|
+
const requiredProps = {
|
|
45
|
+
region: 'us-east-1',
|
|
46
|
+
accessKey: 'test-access-key',
|
|
47
|
+
secretKey: 'test-secret-key',
|
|
48
|
+
endpoint: 'https://s3.test.com',
|
|
49
|
+
bucket: 'test-bucket',
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
const invalidConfigs: Array<
|
|
53
|
+
[
|
|
54
|
+
props: Partial<ConstructorParameters<typeof S3Handler>[0]>,
|
|
55
|
+
message: string,
|
|
56
|
+
]
|
|
57
|
+
> = [
|
|
58
|
+
[
|
|
59
|
+
{ signedUrlExpireTimeSeconds: 7 * 24 * 60 * 60 + 1 },
|
|
60
|
+
'signedUrlExpireTimeSeconds must be an integer between 1 and 604800',
|
|
61
|
+
],
|
|
62
|
+
[
|
|
63
|
+
{ signedUrlExpireTimeSeconds: 0 },
|
|
64
|
+
'signedUrlExpireTimeSeconds must be an integer between 1 and 604800',
|
|
65
|
+
],
|
|
66
|
+
[
|
|
67
|
+
{
|
|
68
|
+
signedUrlExpireTimeSeconds: 3600,
|
|
69
|
+
signedUrlCacheExpireTimeSeconds: 3600,
|
|
70
|
+
},
|
|
71
|
+
'signedUrlCacheExpireTimeSeconds must be at least 0 and less than signedUrlExpireTimeSeconds',
|
|
72
|
+
],
|
|
73
|
+
[
|
|
74
|
+
{ signedUrlCacheExpireTimeSeconds: -1 },
|
|
75
|
+
'signedUrlCacheExpireTimeSeconds must be at least 0 and less than signedUrlExpireTimeSeconds',
|
|
76
|
+
],
|
|
77
|
+
[
|
|
78
|
+
{ minimumMultipartUploadSize: 0 },
|
|
79
|
+
'minimumMultipartUploadSize must be a positive integer',
|
|
80
|
+
],
|
|
81
|
+
[
|
|
82
|
+
{ defaultMultipartUploadSize: 1024 },
|
|
83
|
+
'defaultMultipartUploadSize must be an integer of at least minimumMultipartUploadSize',
|
|
84
|
+
],
|
|
85
|
+
[{ maxSize: NaN }, 'maxSize must be a number of at least 0'],
|
|
86
|
+
];
|
|
87
|
+
for (const [props, message] of invalidConfigs) {
|
|
88
|
+
it(`should reject ${inspect(props, { breakLength: Infinity })}`, function () {
|
|
89
|
+
expect(() => new S3Handler({ ...requiredProps, ...props })).to.throw(
|
|
90
|
+
message,
|
|
91
|
+
);
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
it('should accept the limits of the valid ranges', function () {
|
|
96
|
+
expect(
|
|
97
|
+
() =>
|
|
98
|
+
new S3Handler({
|
|
99
|
+
...requiredProps,
|
|
100
|
+
signedUrlExpireTimeSeconds: 7 * 24 * 60 * 60,
|
|
101
|
+
signedUrlCacheExpireTimeSeconds: 0,
|
|
102
|
+
minimumMultipartUploadSize: 1,
|
|
103
|
+
defaultMultipartUploadSize: 1,
|
|
104
|
+
maxSize: 0,
|
|
105
|
+
}),
|
|
106
|
+
).to.not.throw();
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
|
|
42
110
|
describe('handleFile', function () {
|
|
43
111
|
let uploadStub: SinonStub;
|
|
44
112
|
|