@balena/pinejs-webresource-s3 2.2.2 → 2.2.3
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 +20 -1
- package/CHANGELOG.md +5 -0
- package/build/index.d.ts +4 -4
- package/build/index.js +12 -12
- package/build/index.js.map +1 -1
- package/lib/index.ts +17 -18
- package/package.json +3 -2
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
- commits:
|
|
2
|
+
- subject: Tighten internal typings
|
|
3
|
+
hash: 3c24e16a675633616e139b0612012a66408e8d76
|
|
4
|
+
body: |
|
|
5
|
+
- Store the endpoint as a string rather than keeping the whole
|
|
6
|
+
`S3ClientConfig` around just to read its `endpoint`, which is typed
|
|
7
|
+
as a union including endpoint providers yet was interpolated into the
|
|
8
|
+
file href
|
|
9
|
+
- Make `client`, `cachedGetSignedUrl` and `multipartUpload` readonly
|
|
10
|
+
- Drop the `any` from `catch (err: any)`
|
|
11
|
+
- Fix the comment on the 10 MB default part size
|
|
12
|
+
- Declare `@types/memoizee`, which was only resolved via pinejs' deps
|
|
13
|
+
footer:
|
|
14
|
+
Change-type: patch
|
|
15
|
+
change-type: patch
|
|
16
|
+
author: Pagan Gazzard
|
|
17
|
+
version: 2.2.3
|
|
18
|
+
title: ""
|
|
19
|
+
date: 2026-10-28T16:03:42.536Z
|
|
1
20
|
- commits:
|
|
2
21
|
- subject: Remove duplicated tests and move the mocha spec to .mocharc.json
|
|
3
22
|
hash: 8256ec805818980326e5375eceb5ea7f42bebfb2
|
|
@@ -16,7 +35,7 @@
|
|
|
16
35
|
author: Pagan Gazzard
|
|
17
36
|
version: 2.2.2
|
|
18
37
|
title: ""
|
|
19
|
-
date: 2026-10-
|
|
38
|
+
date: 2026-10-28T16:02:13.050Z
|
|
20
39
|
- commits:
|
|
21
40
|
- subject: Use pinejs' exported `normalizeHref` rather than a local copy
|
|
22
41
|
hash: 7a4cf7b15d58e3cf02b1dcfed7ac2ca5692dfdd5
|
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.2.3
|
|
8
|
+
## (2026-10-28)
|
|
9
|
+
|
|
10
|
+
* Tighten internal typings [Pagan Gazzard]
|
|
11
|
+
|
|
7
12
|
# v2.2.2
|
|
8
13
|
## (2026-10-28)
|
|
9
14
|
|
package/build/index.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export interface S3HandlerProps {
|
|
|
16
16
|
storageClass?: StorageClass;
|
|
17
17
|
}
|
|
18
18
|
export declare class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
19
|
-
private readonly
|
|
19
|
+
private readonly endpoint;
|
|
20
20
|
private readonly bucket;
|
|
21
21
|
private readonly maxFileSize;
|
|
22
22
|
private readonly defaultMultipartUploadSize;
|
|
@@ -24,14 +24,14 @@ export declare class S3Handler implements webResourceHandler.WebResourceHandler
|
|
|
24
24
|
protected readonly signedUrlExpireTimeSeconds: number;
|
|
25
25
|
protected readonly signedUrlCacheExpireTimeSeconds: number;
|
|
26
26
|
protected readonly signedUrlCacheMaxEntries: number;
|
|
27
|
-
protected cachedGetSignedUrl: (fileKey: string) => Promise<string>;
|
|
27
|
+
protected readonly cachedGetSignedUrl: (fileKey: string) => Promise<string>;
|
|
28
28
|
protected readonly storageClass: StorageClass | undefined;
|
|
29
|
-
private client;
|
|
29
|
+
private readonly client;
|
|
30
30
|
constructor(config: S3HandlerProps);
|
|
31
31
|
handleFile(resource: webResourceHandler.IncomingFile): Promise<webResourceHandler.UploadResponse>;
|
|
32
32
|
removeFile(href: string): Promise<void>;
|
|
33
33
|
onPreRespond(webResource: WebResource): Promise<WebResource>;
|
|
34
|
-
multipartUpload: {
|
|
34
|
+
readonly multipartUpload: {
|
|
35
35
|
begin: (fieldName: string, payload: webResourceHandler.BeginMultipartUploadPayload) => Promise<webResourceHandler.BeginMultipartUploadHandlerResponse>;
|
|
36
36
|
commit: ({ fileKey, uploadId, filename, providerCommitData, }: webResourceHandler.CommitMultipartUploadPayload) => Promise<WebResource>;
|
|
37
37
|
cancel: ({ fileKey, uploadId, }: webResourceHandler.CancelMultipartUploadPayload) => Promise<void>;
|
package/build/index.js
CHANGED
|
@@ -19,7 +19,7 @@ const getContentDisposition = (filename) => {
|
|
|
19
19
|
return `inline; filename="${asciiFilename}"; filename*=UTF-8''${encodedFilename}`;
|
|
20
20
|
};
|
|
21
21
|
export class S3Handler {
|
|
22
|
-
|
|
22
|
+
endpoint;
|
|
23
23
|
bucket;
|
|
24
24
|
maxFileSize;
|
|
25
25
|
defaultMultipartUploadSize;
|
|
@@ -31,15 +31,7 @@ export class S3Handler {
|
|
|
31
31
|
storageClass;
|
|
32
32
|
client;
|
|
33
33
|
constructor(config) {
|
|
34
|
-
this.
|
|
35
|
-
region: config.region,
|
|
36
|
-
credentials: {
|
|
37
|
-
accessKeyId: config.accessKey,
|
|
38
|
-
secretAccessKey: config.secretKey,
|
|
39
|
-
},
|
|
40
|
-
endpoint: config.endpoint,
|
|
41
|
-
forcePathStyle: true,
|
|
42
|
-
};
|
|
34
|
+
this.endpoint = config.endpoint;
|
|
43
35
|
this.signedUrlExpireTimeSeconds =
|
|
44
36
|
config.signedUrlExpireTimeSeconds ?? 86400;
|
|
45
37
|
this.signedUrlCacheExpireTimeSeconds =
|
|
@@ -72,7 +64,15 @@ export class S3Handler {
|
|
|
72
64
|
throw new Error('maxSize must be a number of at least 0');
|
|
73
65
|
}
|
|
74
66
|
this.bucket = config.bucket;
|
|
75
|
-
this.client = new S3Client(
|
|
67
|
+
this.client = new S3Client({
|
|
68
|
+
region: config.region,
|
|
69
|
+
credentials: {
|
|
70
|
+
accessKeyId: config.accessKey,
|
|
71
|
+
secretAccessKey: config.secretKey,
|
|
72
|
+
},
|
|
73
|
+
endpoint: config.endpoint,
|
|
74
|
+
forcePathStyle: true,
|
|
75
|
+
});
|
|
76
76
|
this.cachedGetSignedUrl =
|
|
77
77
|
this.signedUrlCacheExpireTimeSeconds > 0
|
|
78
78
|
? memoize(this.s3SignUrl, {
|
|
@@ -191,7 +191,7 @@ export class S3Handler {
|
|
|
191
191
|
});
|
|
192
192
|
}
|
|
193
193
|
getS3URL(key) {
|
|
194
|
-
return `${this.
|
|
194
|
+
return `${this.endpoint}/${this.bucket}/${key}`;
|
|
195
195
|
}
|
|
196
196
|
getKeyFromHref(href) {
|
|
197
197
|
const hrefWithoutParams = webResourceHandler.normalizeHref(href);
|
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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.ts
CHANGED
|
@@ -3,7 +3,6 @@ import {
|
|
|
3
3
|
GetObjectCommand,
|
|
4
4
|
S3Client,
|
|
5
5
|
type PutObjectCommandInput,
|
|
6
|
-
type S3ClientConfig,
|
|
7
6
|
CreateMultipartUploadCommand,
|
|
8
7
|
UploadPartCommand,
|
|
9
8
|
CompleteMultipartUploadCommand,
|
|
@@ -56,7 +55,7 @@ const getContentDisposition = (filename: string) => {
|
|
|
56
55
|
};
|
|
57
56
|
|
|
58
57
|
export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
59
|
-
private readonly
|
|
58
|
+
private readonly endpoint: string;
|
|
60
59
|
private readonly bucket: string;
|
|
61
60
|
private readonly maxFileSize: number;
|
|
62
61
|
private readonly defaultMultipartUploadSize: number;
|
|
@@ -65,21 +64,13 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
65
64
|
protected readonly signedUrlExpireTimeSeconds: number;
|
|
66
65
|
protected readonly signedUrlCacheExpireTimeSeconds: number;
|
|
67
66
|
protected readonly signedUrlCacheMaxEntries: number;
|
|
68
|
-
protected cachedGetSignedUrl: (fileKey: string) => Promise<string>;
|
|
67
|
+
protected readonly cachedGetSignedUrl: (fileKey: string) => Promise<string>;
|
|
69
68
|
protected readonly storageClass: StorageClass | undefined;
|
|
70
69
|
|
|
71
|
-
private client: S3Client;
|
|
70
|
+
private readonly client: S3Client;
|
|
72
71
|
|
|
73
72
|
constructor(config: S3HandlerProps) {
|
|
74
|
-
this.
|
|
75
|
-
region: config.region,
|
|
76
|
-
credentials: {
|
|
77
|
-
accessKeyId: config.accessKey,
|
|
78
|
-
secretAccessKey: config.secretKey,
|
|
79
|
-
},
|
|
80
|
-
endpoint: config.endpoint,
|
|
81
|
-
forcePathStyle: true,
|
|
82
|
-
};
|
|
73
|
+
this.endpoint = config.endpoint;
|
|
83
74
|
|
|
84
75
|
this.signedUrlExpireTimeSeconds =
|
|
85
76
|
config.signedUrlExpireTimeSeconds ?? 86400; // 24h
|
|
@@ -91,7 +82,7 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
91
82
|
this.minimumMultipartUploadSize =
|
|
92
83
|
config.minimumMultipartUploadSize ?? 5 * 1024 * 1024; // 5 MB
|
|
93
84
|
this.defaultMultipartUploadSize =
|
|
94
|
-
config.defaultMultipartUploadSize ?? 10 * 1024 * 1024; //
|
|
85
|
+
config.defaultMultipartUploadSize ?? 10 * 1024 * 1024; // 10 MB
|
|
95
86
|
this.maxFileSize = config.maxSize ?? 52428800;
|
|
96
87
|
|
|
97
88
|
// Reject values that could never work rather than failing on every request
|
|
@@ -132,7 +123,15 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
132
123
|
}
|
|
133
124
|
|
|
134
125
|
this.bucket = config.bucket;
|
|
135
|
-
this.client = new S3Client(
|
|
126
|
+
this.client = new S3Client({
|
|
127
|
+
region: config.region,
|
|
128
|
+
credentials: {
|
|
129
|
+
accessKeyId: config.accessKey,
|
|
130
|
+
secretAccessKey: config.secretKey,
|
|
131
|
+
},
|
|
132
|
+
endpoint: config.endpoint,
|
|
133
|
+
forcePathStyle: true,
|
|
134
|
+
});
|
|
136
135
|
|
|
137
136
|
// Memoize expects maxAge in MS and s3 signing method in seconds.
|
|
138
137
|
// Normalization to use only seconds and therefore convert here from seconds to MS
|
|
@@ -172,7 +171,7 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
172
171
|
|
|
173
172
|
try {
|
|
174
173
|
await upload.done();
|
|
175
|
-
} catch (err
|
|
174
|
+
} catch (err) {
|
|
176
175
|
resource.stream.resume();
|
|
177
176
|
if (size > this.maxFileSize) {
|
|
178
177
|
throw new webResourceHandler.FileSizeExceededError(this.maxFileSize);
|
|
@@ -203,7 +202,7 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
203
202
|
return webResource;
|
|
204
203
|
}
|
|
205
204
|
|
|
206
|
-
public multipartUpload = {
|
|
205
|
+
public readonly multipartUpload = {
|
|
207
206
|
begin: async (
|
|
208
207
|
fieldName: string,
|
|
209
208
|
payload: webResourceHandler.BeginMultipartUploadPayload,
|
|
@@ -298,7 +297,7 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
298
297
|
}
|
|
299
298
|
|
|
300
299
|
private getS3URL(key: string): string {
|
|
301
|
-
return `${this.
|
|
300
|
+
return `${this.endpoint}/${this.bucket}/${key}`;
|
|
302
301
|
}
|
|
303
302
|
|
|
304
303
|
private getKeyFromHref(href: string): string {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs-webresource-s3",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.3",
|
|
4
4
|
"description": "A PineJS WebResource handler for storing & serving files on S3",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/index.js",
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
"@balena/sbvr-types": "^11.0.0",
|
|
28
28
|
"@types/chai": "5.2.3",
|
|
29
29
|
"@types/chai-as-promised": "8.0.2",
|
|
30
|
+
"@types/memoizee": "0.4.12",
|
|
30
31
|
"@types/mocha": "10.0.10",
|
|
31
32
|
"@types/node": "20.19.43",
|
|
32
33
|
"@types/sinon": "22.0.0",
|
|
@@ -50,6 +51,6 @@
|
|
|
50
51
|
"@balena/pinejs": "^21.3.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.0.0"
|
|
51
52
|
},
|
|
52
53
|
"versionist": {
|
|
53
|
-
"publishedAt": "2026-10-
|
|
54
|
+
"publishedAt": "2026-10-28T16:03:42.619Z"
|
|
54
55
|
}
|
|
55
56
|
}
|