@balena/pinejs 17.0.0-build-wip-large-file-uploads-b2029f1b1df6c60eca71dd6d8921b4a3a94b2821-1 → 17.0.0-build-v17-aefd1bd607a25f9f43dd4dc8902abad2b347e25a-1

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

@@ -6,27 +6,17 @@ import {
 	WebResourceError,
 	type WebResourceHandler,
 } from '..';
-import type {
-	BeginUploadHandlerResponse,
-	BeginUploadPayload,
-	CommitUploadHandlerPayload,
-	UploadUrl,
-} from '../multipartUpload';
 import {
 	S3Client,
 	type S3ClientConfig,
 	DeleteObjectCommand,
 	type PutObjectCommandInput,
 	GetObjectCommand,
-	CreateMultipartUploadCommand,
-	UploadPartCommand,
-	CompleteMultipartUploadCommand,
-	HeadObjectCommand,
 } from '@aws-sdk/client-s3';
 import { Upload } from '@aws-sdk/lib-storage';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from 'crypto';
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
 import memoize from 'memoizee';
 
@@ -81,7 +71,9 @@ export class S3Handler implements WebResourceHandler {
 
 	public async handleFile(resource: IncomingFile): Promise<UploadResponse> {
 		let size = 0;
-		const key = this.getFileKey(resource.fieldname, resource.originalname);
+		const key = `${resource.fieldname}_${randomUUID()}_${
+			resource.originalname
+		}`;
 		const params: PutObjectCommandInput = {
 			Bucket: this.bucket,
 			Key: key,
@@ -130,62 +122,6 @@ export class S3Handler implements WebResourceHandler {
 		return webResource;
 	}
 
-	public async beginUpload(
-		fieldName: string,
-		payload: BeginUploadPayload,
-	): Promise<BeginUploadHandlerResponse> {
-		const fileKey = this.getFileKey(fieldName, payload.filename);
-
-		const createMultiPartResponse = await this.client.send(
-			new CreateMultipartUploadCommand({
-				Bucket: this.bucket,
-				Key: fileKey,
-				ContentType: payload.content_type,
-			}),
-		);
-
-		if (createMultiPartResponse.UploadId == null) {
-			throw new WebResourceError('Failed to create multipart upload.');
-		}
-
-		const uploadUrls = await this.getPartUploadUrls(
-			fileKey,
-			createMultiPartResponse.UploadId,
-			payload,
-		);
-		return { fileKey, uploadId: createMultiPartResponse.UploadId, uploadUrls };
-	}
-
-	public async commitUpload({
-		fileKey,
-		uploadId,
-		filename,
-		multipartUploadChecksums,
-	}: CommitUploadHandlerPayload): Promise<WebResource> {
-		await this.client.send(
-			new CompleteMultipartUploadCommand({
-				Bucket: this.bucket,
-				Key: fileKey,
-				UploadId: uploadId,
-				MultipartUpload: multipartUploadChecksums,
-			}),
-		);
-
-		const headResult = await this.client.send(
-			new HeadObjectCommand({
-				Bucket: this.bucket,
-				Key: fileKey,
-			}),
-		);
-
-		return {
-			href: this.getS3URL(fileKey),
-			filename: filename,
-			size: headResult.ContentLength,
-			content_type: headResult.ContentType,
-		};
-	}
-
 	private s3SignUrl(fileKey: string): Promise<string> {
 		const command = new GetObjectCommand({
 			Bucket: this.bucket,
@@ -200,70 +136,8 @@ export class S3Handler implements WebResourceHandler {
 		return `${this.config.endpoint}/${this.bucket}/${key}`;
 	}
 
-	private getFileKey(fieldName: string, fileName: string) {
-		return `${fieldName}_${randomUUID()}_${fileName}`;
-	}
-
 	private getKeyFromHref(href: string): string {
 		const hrefWithoutParams = normalizeHref(href);
 		return hrefWithoutParams.substring(hrefWithoutParams.lastIndexOf('/') + 1);
 	}
-
-	private async getPartUploadUrls(
-		fileKey: string,
-		uploadId: string,
-		payload: BeginUploadPayload,
-	): Promise<UploadUrl[]> {
-		const chunkSizesWithParts = await this.getChunkSizesWithParts(
-			payload.size,
-			payload.chunk_size,
-		);
-		return Promise.all(
-			chunkSizesWithParts.map(async ({ chunkSize, partNumber }) => ({
-				chunkSize,
-				partNumber,
-				url: await this.getPartUploadUrl(
-					fileKey,
-					uploadId,
-					partNumber,
-					chunkSize,
-				),
-			})),
-		);
-	}
-
-	private async getPartUploadUrl(
-		fileKey: string,
-		uploadId: string,
-		partNumber: number,
-		partSize: number,
-	): Promise<string> {
-		const command = new UploadPartCommand({
-			Bucket: this.bucket,
-			Key: fileKey,
-			UploadId: uploadId,
-			PartNumber: partNumber,
-			ContentLength: partSize,
-		});
-
-		return getSignedUrl(this.client, command, {
-			expiresIn: this.signedUrlExpireTimeSeconds,
-		});
-	}
-
-	private async getChunkSizesWithParts(
-		size: number,
-		chunkSize: number,
-	): Promise<Array<Pick<UploadUrl, 'chunkSize' | 'partNumber'>>> {
-		const chunkSizesWithParts = [];
-		let partNumber = 1;
-		let remainingSize = size;
-		while (remainingSize > 0) {
-			const currentChunkSize = Math.min(remainingSize, chunkSize);
-			chunkSizesWithParts.push({ chunkSize: currentChunkSize, partNumber });
-			remainingSize -= currentChunkSize;
-			partNumber += 1;
-		}
-		return chunkSizesWithParts;
-	}
 }

package/src/webresource-handler/index.ts

@@ -1,25 +1,19 @@
+import type * as Express from 'express';
+import busboy from 'busboy';
+import type * as stream from 'node:stream';
+import * as uriParser from '../sbvr-api/uri-parser';
+import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import type { HookArgs } from '../sbvr-api/hooks';
+import { getApiRoot, getModel } from '../sbvr-api/sbvr-utils';
+import { checkPermissions } from '../sbvr-api/permissions';
+import { NoopHandler } from './handlers/NoopHandler';
 import {
 	odataNameToSqlName,
 	sqlNameToODataName,
 } from '@balena/odata-to-abstract-sql';
+import { errors, permissions } from '../server-glue/module';
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
-import busboy from 'busboy';
-import type * as Express from 'express';
-import type * as stream from 'node:stream';
 import { TypedError } from 'typed-error';
-import type { HookArgs } from '../sbvr-api/hooks';
-import { checkPermissions } from '../sbvr-api/permissions';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils';
-import { getApiRoot, getModel } from '../sbvr-api/sbvr-utils';
-import * as uriParser from '../sbvr-api/uri-parser';
-import { errors, permissions } from '../server-glue/module';
-import { NoopHandler } from './handlers/NoopHandler';
-import type {
-	BeginUploadHandlerResponse,
-	BeginUploadPayload,
-	CommitUploadHandlerPayload,
-} from './multipartUpload';
-import { multipartUploadHooks } from './multipartUpload';
 
 export * from './handlers';
 
@@ -40,14 +34,6 @@ export interface WebResourceHandler {
 	handleFile: (resource: IncomingFile) => Promise<UploadResponse>;
 	removeFile: (fileReference: string) => Promise<void>;
 	onPreRespond: (webResource: WebResource) => Promise<WebResource>;
-
-	beginUpload: (
-		fieldName: string,
-		payload: BeginUploadPayload,
-	) => Promise<BeginUploadHandlerResponse>;
-	commitUpload: (
-		commitInfo: CommitUploadHandlerPayload,
-	) => Promise<WebResource>;
 }
 
 export class WebResourceError extends TypedError {}
@@ -230,7 +216,7 @@ export const getUploaderMiddlware = (
 	};
 };
 
-export const getWebResourceFields = (
+const getWebResourceFields = (
 	request: uriParser.ODataRequest,
 	useTranslations = true,
 ): string[] => {
@@ -263,8 +249,6 @@ const throwIfWebresourceNotInMultipart = (
 	{ req, request }: HookArgs,
 ) => {
 	if (
-		request.custom.isAction !== 'beginUpload' &&
-		request.custom.isAction !== 'commitUpload' &&
 		!req.is?.('multipart') &&
 		webResourceFields.some((field) => request.values[field] != null)
 	) {
@@ -463,23 +447,4 @@ export const setupUploadHooks = (
 		resourceName,
 		getCreateWebResourceHooks(handler),
 	);
-
-	sbvrUtils.addPureHook(
-		'POST',
-		apiRoot,
-		resourceName,
-		multipartUploadHooks(handler),
-	);
-};
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const webresourceModel: string = require('./webresource.sbvr');
-export const config = {
-	models: [
-		{
-			apiRoot: 'webresource',
-			modelText: webresourceModel,
-			modelName: 'webresource',
-		},
-	] as sbvrUtils.ExecutableModel[],
 };

package/out/webresource-handler/multipartUpload.d.ts

@@ -1,39 +0,0 @@
-import type { AnyObject } from 'pinejs-client-core';
-import type { WebResourceHandler } from '.';
-import type { ODataRequest } from '../sbvr-api/uri-parser';
-import { sbvrUtils } from '../server-glue/module';
-export interface BeginUploadPayload {
-    filename: string;
-    content_type: string;
-    size: number;
-    chunk_size: number;
-}
-export interface UploadUrl {
-    url: string;
-    chunkSize: number;
-    partNumber: number;
-}
-export interface BeginUploadHandlerResponse {
-    uploadUrls: UploadUrl[];
-    fileKey: string;
-    uploadId: string;
-}
-export interface PendingUpload extends BeginUploadPayload {
-    fieldName: string;
-    fileKey: string;
-    uploadId: string;
-}
-export interface BeginUploadResponse {
-    [fieldName: string]: {
-        key: string;
-        uploadUrls: UploadUrl[];
-    };
-}
-export interface CommitUploadHandlerPayload {
-    fileKey: string;
-    uploadId: string;
-    filename: string;
-    multipartUploadChecksums?: AnyObject;
-}
-export declare const multipartUploadHooks: (webResourceHandler: WebResourceHandler) => sbvrUtils.Hooks;
-export declare const beginUpload: (webResourceHandler: WebResourceHandler, odataRequest: ODataRequest, actorId?: number) => Promise<BeginUploadResponse>;

package/out/webresource-handler/multipartUpload.js

@@ -1,187 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.beginUpload = exports.multipartUploadHooks = void 0;
-const node_crypto_1 = require("node:crypto");
-const _1 = require(".");
-const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
-const module_1 = require("../server-glue/module");
-const MB = 1024 * 1024;
-const multipartUploadHooks = (webResourceHandler) => {
-    return {
-        POSTPARSE: async ({ req, request, tx, api: vocabularyApi }) => {
-            if (request.odataQuery.property?.resource === 'beginUpload') {
-                const uploadParams = parseBeginUpload(request);
-                await vocabularyApi.post({
-                    url: request.url.substring(1).replace('beginUpload', 'canAccess'),
-                    body: { method: 'PATCH' },
-                });
-                tx = await module_1.sbvrUtils.db.transaction();
-                req.tx = tx;
-                request.tx = tx;
-                request.method = 'PATCH';
-                request.values = uploadParams;
-                request.odataQuery.resource = request.resourceName;
-                delete request.odataQuery.property;
-                request.custom.isAction = 'beginUpload';
-            }
-            else if (request.odataQuery.property?.resource === 'commitUpload') {
-                const commitPayload = await parseCommitUpload(request);
-                await vocabularyApi.post({
-                    url: request.url.substring(1).replace('commitUpload', 'canAccess'),
-                    body: { method: 'PATCH' },
-                });
-                const webresource = await webResourceHandler.commitUpload({
-                    fileKey: commitPayload.metadata.fileKey,
-                    uploadId: commitPayload.metadata.uploadId,
-                    filename: commitPayload.metadata.filename,
-                    multipartUploadChecksums: commitPayload.additionalCommitInfo,
-                });
-                await sbvr_utils_1.api.webresource.patch({
-                    resource: 'multipart_upload',
-                    body: {
-                        status: 'completed',
-                    },
-                    options: {
-                        $filter: {
-                            uuid: commitPayload.key,
-                        },
-                    },
-                    passthrough: {
-                        req: module_1.permissions.root,
-                        tx: tx,
-                    },
-                });
-                request.method = 'PATCH';
-                request.values = {
-                    [commitPayload.metadata.fieldName]: webresource,
-                };
-                request.odataQuery.resource = request.resourceName;
-                delete request.odataQuery.property;
-                request.custom.isAction = 'commitUpload';
-                request.custom.commitUploadPayload = webresource;
-            }
-        },
-        PRERESPOND: async ({ req, request, response, tx }) => {
-            if (request.custom.isAction === 'beginUpload') {
-                await tx.rollback();
-                response.statusCode = 200;
-                response.body = await (0, exports.beginUpload)(webResourceHandler, request, req.user?.actor);
-            }
-            else if (request.custom.isAction === 'commitUpload') {
-                response.body = await webResourceHandler.onPreRespond(request.custom.commitUploadPayload);
-            }
-        },
-    };
-};
-exports.multipartUploadHooks = multipartUploadHooks;
-const beginUpload = async (webResourceHandler, odataRequest, actorId) => {
-    const payload = odataRequest.values;
-    const fieldName = Object.keys(payload)[0];
-    const metadata = payload[fieldName];
-    const { fileKey, uploadId, uploadUrls } = await webResourceHandler.beginUpload(fieldName, metadata);
-    const uuid = (0, node_crypto_1.randomUUID)();
-    try {
-        await sbvr_utils_1.api.webresource.post({
-            resource: 'multipart_upload',
-            body: {
-                uuid,
-                resource_name: odataRequest.resourceName,
-                field_name: fieldName,
-                resource_id: odataRequest.affectedIds?.[0],
-                upload_id: uploadId,
-                file_key: fileKey,
-                status: 'pending',
-                filename: metadata.filename,
-                content_type: metadata.content_type,
-                size: metadata.size,
-                chunk_size: metadata.chunk_size,
-                expiry_date: Date.now() + 7 * 24 * 60 * 60 * 1000,
-                is_created_by__actor: actorId,
-            },
-            passthrough: {
-                req: module_1.permissions.root,
-            },
-        });
-    }
-    catch (err) {
-        console.error('failed to start multipart upload', err);
-        throw new module_1.errors.BadRequestError('Failed to start multipart upload');
-    }
-    return { [fieldName]: { key: uuid, uploadUrls } };
-};
-exports.beginUpload = beginUpload;
-const parseBeginUpload = (request) => {
-    if (request.odataQuery.key == null) {
-        throw new module_1.errors.BadRequestError();
-    }
-    const fieldNames = Object.keys(request.values);
-    if (fieldNames.length !== 1) {
-        throw new module_1.errors.BadRequestError('You can only get upload url for one field at a time');
-    }
-    const [fieldName] = fieldNames;
-    const webResourceFields = (0, _1.getWebResourceFields)(request, false);
-    if (!webResourceFields.includes(fieldName)) {
-        throw new module_1.errors.BadRequestError(`You must provide a valid webresource field from: ${JSON.stringify(webResourceFields)}`);
-    }
-    const beginUploadPayload = parseBeginUploadPayload(request.values[fieldName]);
-    if (beginUploadPayload == null) {
-        throw new module_1.errors.BadRequestError('Invalid file metadata');
-    }
-    const uploadMetadataCheck = {
-        ...beginUploadPayload,
-        href: 'metadata_check',
-    };
-    return { [fieldName]: uploadMetadataCheck };
-};
-const parseBeginUploadPayload = (payload) => {
-    if (typeof payload !== 'object') {
-        return null;
-    }
-    let { filename, content_type, size, chunk_size } = payload;
-    if (typeof filename !== 'string' ||
-        typeof content_type !== 'string' ||
-        typeof size !== 'number' ||
-        (chunk_size != null && typeof chunk_size !== 'number') ||
-        (chunk_size != null && chunk_size < 5 * MB)) {
-        return null;
-    }
-    if (chunk_size == null) {
-        chunk_size = 5 * MB;
-    }
-    return { filename, content_type, size, chunk_size };
-};
-const parseCommitUpload = async (request) => {
-    if (request.odataQuery.key == null) {
-        throw new module_1.errors.BadRequestError();
-    }
-    const { key, additionalCommitInfo } = request.values;
-    if (typeof key !== 'string') {
-        throw new module_1.errors.BadRequestError('Invalid key type');
-    }
-    const [multipartUpload] = (await sbvr_utils_1.api.webresource.get({
-        resource: 'multipart_upload',
-        options: {
-            $select: ['id', 'file_key', 'upload_id', 'field_name', 'filename'],
-            $filter: {
-                uuid: key,
-                status: 'pending',
-                expiry_date: { $gt: { $now: {} } },
-            },
-        },
-        passthrough: {
-            req: module_1.permissions.root,
-            tx: request.tx,
-        },
-    }));
-    if (multipartUpload == null) {
-        throw new module_1.errors.BadRequestError(`Invalid upload for key ${key}`);
-    }
-    const metadata = {
-        fileKey: multipartUpload.file_key,
-        uploadId: multipartUpload.upload_id,
-        filename: multipartUpload.filename,
-        fieldName: multipartUpload.field_name,
-    };
-    return { key, additionalCommitInfo, metadata };
-};
-//# sourceMappingURL=multipartUpload.js.map

package/out/webresource-handler/multipartUpload.js.map

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

package/out/webresource-handler/webresource.sbvr

@@ -1,62 +0,0 @@
-Vocabulary: Auth
-
-Term: actor
-Term: expiry date
-	Concept Type: Date Time (Type)
-
-Vocabulary: webresource
-
-Term: uuid
-	Concept Type: Short Text (Type)
-Term: resource name
-	Concept Type: Short Text (Type)
-Term: field name
-	Concept Type: Short Text (Type)
-Term: resource id
-	Concept Type: Integer (Type)
-Term: upload id
-	Concept Type: Short Text (Type)
-Term: file key
-	Concept Type: Short Text (Type)
-Term: status
-	Concept Type: Short Text (Type)
-Term: filename
-	Concept Type: Short Text (Type)
-Term: content type
-	Concept Type: Short Text (Type)
-Term: size
-	Concept Type: Integer (Type)
-Term: chunk size
-	Concept Type: Integer (Type)
-Term: valid until date
-	Concept Type: Date Time (Type)
-
-Term: multipart upload
-Fact type: multipart upload has uuid
-	Necessity: each multipart upload has exactly one uuid
-	Necessity: each uuid is of exactly one multipart upload
-Fact type: multipart upload has resource name
-	Necessity: each multipart upload has exactly one resource name
-Fact type: multipart upload has field name
-	Necessity: each multipart upload has exactly one field name
-Fact type: multipart upload has resource id
-	Necessity: each multipart upload has exactly one resource id
-Fact type: multipart upload has upload id
-	Necessity: each multipart upload has exactly one upload id
-Fact type: multipart upload has file key
-	Necessity: each multipart upload has exactly one file key
-Fact type: multipart upload has status
-	Necessity: each multipart upload has exactly one status
-	Definition: "pending" or "completed" or "cancelled"
-Fact type: multipart upload has filename
-	Necessity: each multipart upload has exactly one filename
-Fact type: multipart upload has content type
-	Necessity: each multipart upload has exactly one content type
-Fact type: multipart upload has size
-	Necessity: each multipart upload has exactly one size
-Fact type: multipart upload has chunk size
-	Necessity: each multipart upload has exactly one chunk size
-Fact type: multipart upload has expiry date (Auth)
-	Necessity: each multipart upload has exactly one expiry date (Auth)
-Fact type: multipart upload is created by actor (Auth)
-	Necessity: each multipart upload is created by at most one actor (Auth)