@balena/pinejs 20.0.0-build-esm-78a099606f287bc0df4001425788a7ad1c708ba1-1 → 20.0.0-build-esm-8834afea86dbfce451b8d32756c87887efe80ba9-1

package/.versionbot/CHANGELOG.yml

@@ -1,6 +1,14 @@
 - commits:
+    - subject: Drop exposed S3 handler in favor of @balena/pinejs-webresource-s3 handler
+      hash: 8834afea86dbfce451b8d32756c87887efe80ba9
+      body: ""
+      footer:
+        Change-type: major
+        change-type: major
+      author: Otavio Jacobi
+      nested: []
     - subject: Update commander to 13.x
-      hash: 78a099606f287bc0df4001425788a7ad1c708ba1
+      hash: f816886183f4050542f86623445c9066ca5576ee
       body: ""
       footer:
         Change-type: major
@@ -8,7 +16,7 @@
       author: Pagan Gazzard
       nested: []
     - subject: Update chai to 5.x
-      hash: 04952e365972ca26a8734e3e9e31434ae3515902
+      hash: c5d4111f5d1c12e173240bb27f0f6db20869d965
       body: ""
       footer:
         Change-type: patch
@@ -16,7 +24,7 @@
       author: Pagan Gazzard
       nested: []
     - subject: Convert to ESM
-      hash: 03fe33f53910a935c23eb721db25c984d6c8caae
+      hash: 0d24ee717f247343394f67988f7327ce6457b387
       body: ""
       footer:
         Change-type: patch
@@ -25,7 +33,35 @@
       nested: []
   version: 20.0.0
   title: ""
-  date: 2025-01-03T18:27:56.107Z
+  date: 2025-01-06T21:58:49.000Z
+- commits:
+    - subject: "Tests: use `@balena/pinejs` for resolving to the runtime files"
+      hash: fc28f2efec230ea40150c14cbf7f062649f2fc40
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: avoid deep imports in favor of the standard module entrypoint"
+      hash: 8e26f0f37189809bfc517a580a37ff659a207ba6
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+    - subject: "Tests: run against compiled source rather than transpiling on the fly"
+      hash: cf6351dac10a89633624a5ebf3b1aad29f0ab8ec
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+  version: 19.7.3
+  title: ""
+  date: 2025-01-04T23:36:23.908Z
 - commits:
     - subject: Update dependencies
       hash: a909ee054f395de407ec4e1275fd0f5b7514fe29
@@ -2087,6 +2123,7 @@
 
 
 
+
 
 
                                                                 As balena-lint
@@ -2130,6 +2167,7 @@
 
 
 
+
 
 
                                                                 As engine and npm is
@@ -2188,6 +2226,7 @@
 
 
 
+
 
 
                                                                 Ensure that the
@@ -2309,6 +2348,7 @@
 
 
 
+
 
 
                                                                 This also deprecates
@@ -2358,6 +2398,7 @@
 
 
 
+
 
 
                                                                 It can in fact be a
@@ -2408,6 +2449,7 @@
 
 
 
+
 
 
                                                                 We know what type
@@ -2463,6 +2505,7 @@
 
 
 
+
 
 
                                                                 Update
@@ -2629,6 +2672,7 @@
 
 
 
+
 
 
                                                                 This also deprecates

package/CHANGELOG.md

@@ -5,12 +5,20 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 # v20.0.0
-## (2025-01-03)
+## (2025-01-06)
 
+* Drop exposed S3 handler in favor of @balena/pinejs-webresource-s3 handler [Otavio Jacobi]
 * Update commander to 13.x [Pagan Gazzard]
 * Update chai to 5.x [Pagan Gazzard]
 * Convert to ESM [Pagan Gazzard]
 
+# v19.7.3
+## (2025-01-04)
+
+* Tests: use `@balena/pinejs` for resolving to the runtime files [Pagan Gazzard]
+* Tests: avoid deep imports in favor of the standard module entrypoint [Pagan Gazzard]
+* Tests: run against compiled source rather than transpiling on the fly [Pagan Gazzard]
+
 # v19.7.2
 ## (2025-01-02)
 

package/out/sbvr-api/express-extension.d.ts

@@ -1,6 +1,6 @@
+import type { User as PineUser } from './sbvr-utils.js';
 declare global {
     namespace Express {
-        type PineUser = import('./sbvr-utils.js').User;
         interface User extends PineUser {
         }
         interface Request {
@@ -9,4 +9,3 @@ declare global {
         }
     }
 }
-export {};

package/out/webresource-handler/handlers/index.d.ts

@@ -1,2 +1 @@
 export * from './NoopHandler.js';
-export * from './S3Handler.js';

package/out/webresource-handler/handlers/index.js

@@ -1,3 +1,2 @@
 export * from './NoopHandler.js';
-export * from './S3Handler.js';
 //# sourceMappingURL=index.js.map

package/out/webresource-handler/handlers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "20.0.0-build-esm-78a099606f287bc0df4001425788a7ad1c708ba1-1",
+  "version": "20.0.0-build-esm-8834afea86dbfce451b8d32756c87887efe80ba9-1",
   "main": "out/server-glue/module.js",
   "type": "module",
   "repository": "git@github.com:balena-io/pinejs.git",
@@ -19,10 +19,9 @@
     "webpack-server": "grunt  --preload ts-node/register/transpile-only --gruntfile Gruntfile.cts server",
     "webpack-build": "npm run webpack-browser && npm run webpack-module && npm run webpack-server",
     "lint": "balena-lint -t tsconfig.dev.json -e js -e ts src build typings Gruntfile.cts && npx tsc --project tsconfig.dev.json --noEmit",
-    "test": "npm run lint && npm run build && npm run webpack-build && npm run test:compose && npm run test:generated-types",
-    "test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' INT; 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 S3_REGION=us-east-1 PINEJS_QUEUE_CONCURRENCY=1 TZ=UTC npm run mocha",
+    "test": "npm run build && npm run lint && npm run webpack-build && npm run test:compose && npm run test:generated-types",
+    "test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' INT; 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 S3_REGION=us-east-1 PINEJS_QUEUE_CONCURRENCY=1 TZ=UTC npx mocha",
     "test:generated-types": "npm run generate-types && git diff --exit-code ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts",
-    "mocha": "TS_NODE_FILES=true mocha",
     "lint-fix": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.cts",
     "generate-types": "node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/user.sbvr ./src/sbvr-api/user.ts && node ./bin/sbvr-compiler.js generate-types ./src/migrator/migrations.sbvr ./src/migrator/migrations.ts && node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/dev.sbvr ./src/sbvr-api/dev.ts && node ./bin/sbvr-compiler.js generate-types ./src/tasks/tasks.sbvr ./src/tasks/tasks.ts && balena-lint -t tsconfig.dev.json --fix ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts"
   },
@@ -69,6 +68,8 @@
   },
   "devDependencies": {
     "@balena/lint": "^8.2.8",
+    "@balena/pinejs": "file:./",
+    "@balena/pinejs-webresource-s3": "^1.0.2",
     "@faker-js/faker": "^9.3.0",
     "@types/busboy": "^1.5.4",
     "@types/chai": "^5.0.1",
@@ -147,6 +148,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2025-01-03T18:27:57.056Z"
+    "publishedAt": "2025-01-06T21:58:50.126Z"
   }
 }

package/src/sbvr-api/express-extension.ts

@@ -1,10 +1,9 @@
 // Augment express.js with pinejs-specific attributes via declaration merging.
+import type { User as PineUser } from './sbvr-utils.js';
 
 declare global {
 	// eslint-disable-next-line @typescript-eslint/no-namespace
 	namespace Express {
-		type PineUser = import('./sbvr-utils.js').User;
-
 		// Augment Express.User to include the props of our PineUser.
 		// eslint-disable-next-line @typescript-eslint/no-empty-interface
 		interface User extends PineUser {}

package/src/webresource-handler/handlers/index.ts

@@ -1,2 +1 @@
 export * from './NoopHandler.js';
-export * from './S3Handler.js';

package/out/webresource-handler/handlers/S3Handler.d.ts

@@ -1,28 +0,0 @@
-import { type IncomingFile, type UploadResponse, type WebResourceHandler } from '../index.js';
-import type { WebResourceType as WebResource } from '@balena/sbvr-types';
-export interface S3HandlerProps {
-    region: string;
-    accessKey: string;
-    secretKey: string;
-    endpoint: string;
-    bucket: string;
-    maxSize?: number;
-    signedUrlExpireTimeSeconds?: number;
-    signedUrlCacheExpireTimeSeconds?: number;
-}
-export declare class S3Handler implements WebResourceHandler {
-    private readonly config;
-    private readonly bucket;
-    private readonly maxFileSize;
-    protected readonly signedUrlExpireTimeSeconds: number;
-    protected readonly signedUrlCacheExpireTimeSeconds: number;
-    protected cachedGetSignedUrl: (fileKey: string) => Promise<string>;
-    private client;
-    constructor(config: S3HandlerProps);
-    handleFile(resource: IncomingFile): Promise<UploadResponse>;
-    removeFile(href: string): Promise<void>;
-    onPreRespond(webResource: WebResource): Promise<WebResource>;
-    private s3SignUrl;
-    private getS3URL;
-    private getKeyFromHref;
-}

package/out/webresource-handler/handlers/S3Handler.js

@@ -1,97 +0,0 @@
-import { FileSizeExceededError, normalizeHref, WebResourceError, } from '../index.js';
-import { S3Client, DeleteObjectCommand, GetObjectCommand, } from '@aws-sdk/client-s3';
-import { Upload } from '@aws-sdk/lib-storage';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-import { randomUUID } from 'crypto';
-import memoize from 'memoizee';
-export class S3Handler {
-    config;
-    bucket;
-    maxFileSize;
-    signedUrlExpireTimeSeconds;
-    signedUrlCacheExpireTimeSeconds;
-    cachedGetSignedUrl;
-    client;
-    constructor(config) {
-        this.config = {
-            region: config.region,
-            credentials: {
-                accessKeyId: config.accessKey,
-                secretAccessKey: config.secretKey,
-            },
-            endpoint: config.endpoint,
-            forcePathStyle: true,
-        };
-        this.signedUrlExpireTimeSeconds =
-            config.signedUrlExpireTimeSeconds ?? 86400;
-        this.signedUrlCacheExpireTimeSeconds =
-            config.signedUrlCacheExpireTimeSeconds ?? 82800;
-        this.maxFileSize = config.maxSize ?? 52428800;
-        this.bucket = config.bucket;
-        this.client = new S3Client(this.config);
-        this.cachedGetSignedUrl = memoize(this.s3SignUrl, {
-            maxAge: this.signedUrlCacheExpireTimeSeconds * 1000,
-        });
-    }
-    async handleFile(resource) {
-        let size = 0;
-        const key = `${resource.fieldname}_${randomUUID()}_${resource.originalname}`;
-        const params = {
-            Bucket: this.bucket,
-            Key: key,
-            Body: resource.stream,
-            ContentType: resource.mimetype,
-        };
-        const upload = new Upload({ client: this.client, params });
-        upload.on('httpUploadProgress', async (ev) => {
-            size = ev.total ?? ev.loaded;
-            if (size > this.maxFileSize) {
-                await upload.abort();
-            }
-        });
-        try {
-            await upload.done();
-        }
-        catch (err) {
-            resource.stream.resume();
-            if (size > this.maxFileSize) {
-                throw new FileSizeExceededError(this.maxFileSize);
-            }
-            throw new WebResourceError(err);
-        }
-        const filename = this.getS3URL(key);
-        return { size, filename };
-    }
-    async removeFile(href) {
-        const fileKey = this.getKeyFromHref(href);
-        const command = new DeleteObjectCommand({
-            Bucket: this.bucket,
-            Key: fileKey,
-        });
-        await this.client.send(command);
-    }
-    async onPreRespond(webResource) {
-        if (webResource.href != null) {
-            const fileKey = this.getKeyFromHref(webResource.href);
-            webResource.href = await this.cachedGetSignedUrl(fileKey);
-        }
-        return webResource;
-    }
-    s3SignUrl(fileKey) {
-        const command = new GetObjectCommand({
-            Bucket: this.bucket,
-            Key: fileKey,
-        });
-        return getSignedUrl(this.client, command, {
-            expiresIn: this.signedUrlExpireTimeSeconds,
-        });
-    }
-    getS3URL(key) {
-        return `${this.config.endpoint}/${this.bucket}/${key}`;
-    }
-    getKeyFromHref(href) {
-        const hrefWithoutParams = normalizeHref(href);
-        return hrefWithoutParams.substring(hrefWithoutParams.lastIndexOf('/') + 1);
-    }
-}
-//# sourceMappingURL=S3Handler.js.map

package/out/webresource-handler/handlers/S3Handler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/S3Handler.ts"],"names":[],"mappings":"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"}

package/src/webresource-handler/handlers/S3Handler.ts

@@ -1,143 +0,0 @@
-import {
-	FileSizeExceededError,
-	type IncomingFile,
-	normalizeHref,
-	type UploadResponse,
-	WebResourceError,
-	type WebResourceHandler,
-} from '../index.js';
-import {
-	S3Client,
-	type S3ClientConfig,
-	DeleteObjectCommand,
-	type PutObjectCommandInput,
-	GetObjectCommand,
-} from '@aws-sdk/client-s3';
-import { Upload } from '@aws-sdk/lib-storage';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-
-import { randomUUID } from 'crypto';
-import type { WebResourceType as WebResource } from '@balena/sbvr-types';
-import memoize from 'memoizee';
-
-export interface S3HandlerProps {
-	region: string;
-	accessKey: string;
-	secretKey: string;
-	endpoint: string;
-	bucket: string;
-	maxSize?: number;
-	signedUrlExpireTimeSeconds?: number;
-	signedUrlCacheExpireTimeSeconds?: number;
-}
-
-export class S3Handler implements WebResourceHandler {
-	private readonly config: S3ClientConfig;
-	private readonly bucket: string;
-	private readonly maxFileSize: number;
-
-	protected readonly signedUrlExpireTimeSeconds: number;
-	protected readonly signedUrlCacheExpireTimeSeconds: number;
-	protected cachedGetSignedUrl: (fileKey: string) => Promise<string>;
-
-	private client: S3Client;
-
-	constructor(config: S3HandlerProps) {
-		this.config = {
-			region: config.region,
-			credentials: {
-				accessKeyId: config.accessKey,
-				secretAccessKey: config.secretKey,
-			},
-			endpoint: config.endpoint,
-			forcePathStyle: true,
-		};
-
-		this.signedUrlExpireTimeSeconds =
-			config.signedUrlExpireTimeSeconds ?? 86400; // 24h
-		this.signedUrlCacheExpireTimeSeconds =
-			config.signedUrlCacheExpireTimeSeconds ?? 82800; // 22h
-
-		this.maxFileSize = config.maxSize ?? 52428800;
-		this.bucket = config.bucket;
-		this.client = new S3Client(this.config);
-
-		// Memoize expects maxAge in MS and s3 signing method in seconds.
-		// Normalization to use only seconds and therefore convert here from seconds to MS
-		this.cachedGetSignedUrl = memoize(this.s3SignUrl, {
-			maxAge: this.signedUrlCacheExpireTimeSeconds * 1000,
-		});
-	}
-
-	public async handleFile(resource: IncomingFile): Promise<UploadResponse> {
-		let size = 0;
-		const key = `${resource.fieldname}_${randomUUID()}_${
-			resource.originalname
-		}`;
-		const params: PutObjectCommandInput = {
-			Bucket: this.bucket,
-			Key: key,
-			Body: resource.stream,
-			ContentType: resource.mimetype,
-		};
-		const upload = new Upload({ client: this.client, params });
-
-		upload.on('httpUploadProgress', async (ev) => {
-			size = ev.total ?? ev.loaded!;
-			if (size > this.maxFileSize) {
-				await upload.abort();
-			}
-		});
-
-		try {
-			await upload.done();
-		} catch (err: any) {
-			resource.stream.resume();
-			if (size > this.maxFileSize) {
-				throw new FileSizeExceededError(this.maxFileSize);
-			}
-			throw new WebResourceError(err);
-		}
-
-		const filename = this.getS3URL(key);
-		return { size, filename };
-	}
-
-	public async removeFile(href: string): Promise<void> {
-		const fileKey = this.getKeyFromHref(href);
-
-		const command = new DeleteObjectCommand({
-			Bucket: this.bucket,
-			Key: fileKey,
-		});
-
-		await this.client.send(command);
-	}
-
-	public async onPreRespond(webResource: WebResource): Promise<WebResource> {
-		if (webResource.href != null) {
-			const fileKey = this.getKeyFromHref(webResource.href);
-			webResource.href = await this.cachedGetSignedUrl(fileKey);
-		}
-		return webResource;
-	}
-
-	private s3SignUrl(fileKey: string): Promise<string> {
-		const command = new GetObjectCommand({
-			Bucket: this.bucket,
-			Key: fileKey,
-		});
-		return getSignedUrl(this.client, command, {
-			expiresIn: this.signedUrlExpireTimeSeconds,
-		});
-	}
-
-	private getS3URL(key: string): string {
-		return `${this.config.endpoint}/${this.bucket}/${key}`;
-	}
-
-	private getKeyFromHref(href: string): string {
-		const hrefWithoutParams = normalizeHref(href);
-		return hrefWithoutParams.substring(hrefWithoutParams.lastIndexOf('/') + 1);
-	}
-}