@balena/pinejs-webresource-s3 2.1.49-build-commit-validate-provider-data-4173fa735fd1e982b454253cf167c93a5d1f6513-1 → 2.1.49

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.
@@ -1,21 +1,17 @@
1
1
  - commits:
2
- - subject: Validate `providerCommitData` before completing a multipart upload
3
- hash: 4173fa735fd1e982b454253cf167c93a5d1f6513
2
+ - subject: Disable the signed url cache when its expiry is 0
3
+ hash: 7759b515b77531b49e917820e8ce62d8a8efe514
4
4
  body: |
5
- `providerCommitData` comes straight from the commitUpload request body
6
- and was passed to CompleteMultipartUpload as-is, which its `any` typing
7
- allowed. A missing or malformed value still made a round trip to S3
8
- (`Parts: 'not-an-array'` was even serialized character by character)
9
- and S3's error then surfaced as a 500. It is now checked to be a list
10
- of parts with a `PartNumber` and `ETag`, rejecting anything else with a
11
- 400, and typed as `CompletedPart[]`.
5
+ memoizee only applies `maxAge` when it is truthy, so a
6
+ `signedUrlCacheExpireTimeSeconds` of 0 cached each file's signed url
7
+ forever, serving it long after it expired. 0 now skips the cache.
12
8
  footer:
13
9
  Change-type: patch
14
10
  change-type: patch
15
11
  author: Pagan Gazzard
16
12
  version: 2.1.49
17
13
  title: ""
18
- date: 2026-10-27T22:59:46.830Z
14
+ date: 2026-10-27T22:55:01.294Z
19
15
  - commits:
20
16
  - subject: Mark pinejs 25.x as compatible
21
17
  hash: c41f9e36ecdd9215735cac36b7e04652b4131702
package/CHANGELOG.md CHANGED
@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
7
7
  # v2.1.49
8
8
  ## (2026-10-27)
9
9
 
10
- * Validate `providerCommitData` before completing a multipart upload [Pagan Gazzard]
10
+ * Disable the signed url cache when its expiry is 0 [Pagan Gazzard]
11
11
 
12
12
  # v2.1.48
13
13
  ## (2026-10-27)
package/build/index.js CHANGED
@@ -1,17 +1,12 @@
1
1
  import { DeleteObjectCommand, GetObjectCommand, S3Client, CreateMultipartUploadCommand, UploadPartCommand, CompleteMultipartUploadCommand, HeadObjectCommand, AbortMultipartUploadCommand, } from '@aws-sdk/client-s3';
2
2
  import { Upload } from '@aws-sdk/lib-storage';
3
3
  import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
4
- import { errors, webResourceHandler } from '@balena/pinejs';
4
+ import { webResourceHandler } from '@balena/pinejs';
5
5
  import memoize from 'memoizee';
6
6
  import { randomUUID } from 'node:crypto';
7
7
  const normalizeHref = (href) => {
8
8
  return href.split('?')[0];
9
9
  };
10
- const isCompletedPartList = (parts) => Array.isArray(parts) &&
11
- parts.every((part) => typeof part === 'object' &&
12
- part != null &&
13
- Number.isSafeInteger(part.PartNumber) &&
14
- typeof part.ETag === 'string');
15
10
  export class S3Handler {
16
11
  config;
17
12
  bucket;
@@ -44,9 +39,12 @@ export class S3Handler {
44
39
  this.maxFileSize = config.maxSize ?? 52428800;
45
40
  this.bucket = config.bucket;
46
41
  this.client = new S3Client(this.config);
47
- this.cachedGetSignedUrl = memoize(this.s3SignUrl, {
48
- maxAge: this.signedUrlCacheExpireTimeSeconds * 1000,
49
- });
42
+ this.cachedGetSignedUrl =
43
+ this.signedUrlCacheExpireTimeSeconds > 0
44
+ ? memoize(this.s3SignUrl, {
45
+ maxAge: this.signedUrlCacheExpireTimeSeconds * 1000,
46
+ })
47
+ : this.s3SignUrl;
50
48
  this.storageClass = config.storageClass;
51
49
  }
52
50
  async handleFile(resource) {
@@ -116,15 +114,11 @@ export class S3Handler {
116
114
  };
117
115
  },
118
116
  commit: async ({ fileKey, uploadId, filename, providerCommitData, }) => {
119
- const parts = providerCommitData?.Parts;
120
- if (!isCompletedPartList(parts)) {
121
- throw new errors.BadRequestError('providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part');
122
- }
123
117
  await this.client.send(new CompleteMultipartUploadCommand({
124
118
  Bucket: this.bucket,
125
119
  Key: fileKey,
126
120
  UploadId: uploadId,
127
- MultipartUpload: { Parts: parts },
121
+ MultipartUpload: providerCommitData,
128
122
  }));
129
123
  const headResult = await this.client.send(new HeadObjectCommand({
130
124
  Bucket: this.bucket,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
package/lib/index.ts CHANGED
@@ -10,11 +10,10 @@ import {
10
10
  HeadObjectCommand,
11
11
  AbortMultipartUploadCommand,
12
12
  type StorageClass,
13
- type CompletedPart,
14
13
  } from '@aws-sdk/client-s3';
15
14
  import { Upload } from '@aws-sdk/lib-storage';
16
15
  import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
17
- import { errors, webResourceHandler } from '@balena/pinejs';
16
+ import { webResourceHandler } from '@balena/pinejs';
18
17
 
19
18
  import type { WebResourceType as WebResource } from '@balena/sbvr-types';
20
19
  import memoize from 'memoizee';
@@ -37,16 +36,6 @@ const normalizeHref = (href: string) => {
37
36
  return href.split('?')[0];
38
37
  };
39
38
 
40
- const isCompletedPartList = (parts: unknown): parts is CompletedPart[] =>
41
- Array.isArray(parts) &&
42
- parts.every(
43
- (part) =>
44
- typeof part === 'object' &&
45
- part != null &&
46
- Number.isSafeInteger(part.PartNumber) &&
47
- typeof part.ETag === 'string',
48
- );
49
-
50
39
  export class S3Handler implements webResourceHandler.WebResourceHandler {
51
40
  private readonly config: S3ClientConfig;
52
41
  private readonly bucket: string;
@@ -87,9 +76,13 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
87
76
 
88
77
  // Memoize expects maxAge in MS and s3 signing method in seconds.
89
78
  // Normalization to use only seconds and therefore convert here from seconds to MS
90
- this.cachedGetSignedUrl = memoize(this.s3SignUrl, {
91
- maxAge: this.signedUrlCacheExpireTimeSeconds * 1000,
92
- });
79
+ // memoizee treats a maxAge of 0 as never expiring, so 0 disables the cache instead
80
+ this.cachedGetSignedUrl =
81
+ this.signedUrlCacheExpireTimeSeconds > 0
82
+ ? memoize(this.s3SignUrl, {
83
+ maxAge: this.signedUrlCacheExpireTimeSeconds * 1000,
84
+ })
85
+ : this.s3SignUrl;
93
86
  this.storageClass = config.storageClass;
94
87
  }
95
88
 
@@ -187,20 +180,12 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
187
180
  filename,
188
181
  providerCommitData,
189
182
  }: webResourceHandler.CommitMultipartUploadPayload): Promise<WebResource> => {
190
- // providerCommitData comes straight from the commitUpload request body
191
- const parts = providerCommitData?.Parts;
192
- if (!isCompletedPartList(parts)) {
193
- throw new errors.BadRequestError(
194
- 'providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part',
195
- );
196
- }
197
-
198
183
  await this.client.send(
199
184
  new CompleteMultipartUploadCommand({
200
185
  Bucket: this.bucket,
201
186
  Key: fileKey,
202
187
  UploadId: uploadId,
203
- MultipartUpload: { Parts: parts },
188
+ MultipartUpload: providerCommitData,
204
189
  }),
205
190
  );
206
191
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@balena/pinejs-webresource-s3",
3
- "version": "2.1.49-build-commit-validate-provider-data-4173fa735fd1e982b454253cf167c93a5d1f6513-1",
3
+ "version": "2.1.49",
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-27T22:59:46.878Z"
53
+ "publishedAt": "2026-10-27T22:55:01.339Z"
54
54
  }
55
55
  }
@@ -14,9 +14,8 @@ import {
14
14
  import { mockClient } from 'aws-sdk-client-mock';
15
15
  import { S3Handler } from '../lib/index.js';
16
16
  import { PassThrough } from 'stream';
17
- import { inspect } from 'util';
18
17
  import { Upload } from '@aws-sdk/lib-storage';
19
- import { errors, type webResourceHandler } from '@balena/pinejs';
18
+ import type { webResourceHandler } from '@balena/pinejs';
20
19
 
21
20
  chai.use(chaiAsPromised);
22
21
  const s3Mock = mockClient(S3Client);
@@ -135,6 +134,55 @@ describe('S3Handler', function () {
135
134
  // X-Amz-Signature should be present in the signed URL
136
135
  expect(result.href).to.match(/X-Amz-Signature=/);
137
136
  });
137
+
138
+ describe('signed url cache', function () {
139
+ let signStub: SinonStub;
140
+
141
+ beforeEach(function () {
142
+ // Stubbed before constructing as the handler memoizes the method itself
143
+ signStub = sinon
144
+ .stub(S3Handler.prototype as any, 's3SignUrl')
145
+ .resolves('https://signed.test.com/file.txt');
146
+ });
147
+
148
+ afterEach(function () {
149
+ signStub.restore();
150
+ });
151
+
152
+ const handlerWithCacheTime = (signedUrlCacheExpireTimeSeconds?: number) =>
153
+ new S3Handler({
154
+ region: 'us-east-1',
155
+ accessKey: 'test-access-key',
156
+ secretKey: 'test-secret-key',
157
+ endpoint: 'https://s3.test.com',
158
+ bucket: 'test-bucket',
159
+ signedUrlCacheExpireTimeSeconds,
160
+ });
161
+ const webResource = () => ({
162
+ href: 'https://s3.test.com/test-bucket/file.txt',
163
+ filename: 'file.txt',
164
+ });
165
+
166
+ it('should reuse a signed url for the same file', async function () {
167
+ const cachingS3Handler = handlerWithCacheTime();
168
+
169
+ await cachingS3Handler.onPreRespond(webResource());
170
+ const result = await cachingS3Handler.onPreRespond(webResource());
171
+
172
+ expect(result.href).to.equal('https://signed.test.com/file.txt');
173
+ expect(signStub.callCount).to.equal(1);
174
+ });
175
+
176
+ it('should sign every time when the cache time is 0', async function () {
177
+ const uncachedS3Handler = handlerWithCacheTime(0);
178
+
179
+ await uncachedS3Handler.onPreRespond(webResource());
180
+ const result = await uncachedS3Handler.onPreRespond(webResource());
181
+
182
+ expect(result.href).to.equal('https://signed.test.com/file.txt');
183
+ expect(signStub.callCount).to.equal(2);
184
+ });
185
+ });
138
186
  });
139
187
 
140
188
  describe('multipartUpload', function () {
@@ -367,15 +415,11 @@ describe('S3Handler', function () {
367
415
  .on(HeadObjectCommand)
368
416
  .resolves({ ContentLength: 1024, ContentType: 'text/plain' });
369
417
 
370
- const parts = [
371
- { PartNumber: 1, ETag: '"etag-1"' },
372
- { PartNumber: 2, ETag: '"etag-2"' },
373
- ];
374
418
  const payload = {
375
419
  fileKey: 'test-key',
376
420
  uploadId: 'test-upload-id',
377
421
  filename: 'file.txt',
378
- providerCommitData: { Parts: parts },
422
+ providerCommitData: {},
379
423
  };
380
424
  const result = await s3Handler.multipartUpload.commit(payload);
381
425
 
@@ -392,36 +436,9 @@ describe('S3Handler', function () {
392
436
  Bucket: 'test-bucket',
393
437
  Key: 'test-key',
394
438
  UploadId: 'test-upload-id',
395
- MultipartUpload: { Parts: parts },
439
+ MultipartUpload: {},
396
440
  });
397
441
  });
398
-
399
- const invalidProviderCommitData: Array<
400
- webResourceHandler.CommitMultipartUploadPayload['providerCommitData']
401
- > = [
402
- undefined,
403
- {},
404
- { Parts: 'not-an-array' },
405
- { Parts: [{ PartNumber: '1', ETag: '"etag-1"' }] },
406
- { Parts: [{ PartNumber: 1 }] },
407
- { Parts: [null] },
408
- ];
409
- for (const providerCommitData of invalidProviderCommitData) {
410
- it(`should reject providerCommitData ${inspect(providerCommitData, { breakLength: Infinity })} without contacting S3`, async function () {
411
- await expect(
412
- s3Handler.multipartUpload.commit({
413
- fileKey: 'test-key',
414
- uploadId: 'test-upload-id',
415
- filename: 'file.txt',
416
- providerCommitData,
417
- }),
418
- ).to.be.rejectedWith(
419
- errors.BadRequestError,
420
- 'providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part',
421
- );
422
- expect(s3Mock.calls()).to.have.lengthOf(0);
423
- });
424
- }
425
442
  });
426
443
 
427
444
  describe('cancel', function () {