@balena/pinejs 21.4.0-build-add-actions-example-6ac2b3e43d47ee50b22cbf3985c736f454ad73bf-1 → 21.4.0-build-add-odata-actions-8d4944e07924e5cf0a69183c18610e8fd2c41d3b-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "21.4.0-build-add-actions-example-6ac2b3e43d47ee50b22cbf3985c736f454ad73bf-1",
+  "version": "21.4.0-build-add-odata-actions-8d4944e07924e5cf0a69183c18610e8fd2c41d3b-1",
   "main": "out/server-glue/module.js",
   "type": "module",
   "repository": "git@github.com:balena-io/pinejs.git",
@@ -20,10 +20,10 @@
     "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 test build typings Gruntfile.cts && npx tsc --project tsconfig.dev.json --noEmit",
     "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 PINEJS_WEBRESOURCE_MULTIPART_ENABLED=true npx mocha",
+    "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",
     "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 && node ./bin/sbvr-compiler.js generate-types ./src/webresource-handler/webresource.sbvr ./src/webresource-handler/webresource.ts && balena-lint -t tsconfig.dev.json --fix ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts"
+    "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"
   },
   "dependencies": {
     "@balena/abstract-sql-compiler": "^10.2.3",
@@ -70,7 +70,7 @@
   "devDependencies": {
     "@balena/lint": "^9.1.6",
     "@balena/pinejs": "file:./",
-    "@balena/pinejs-webresource-s3": "2.0.0-build-new-multiparthandle-interface-946a8ca8f89769da46d151f4fc5ba9480e81a2be-3",
+    "@balena/pinejs-webresource-s3": "^1.0.4",
     "@faker-js/faker": "^9.6.0",
     "@types/busboy": "^1.5.4",
     "@types/chai": "^5.2.1",
@@ -149,6 +149,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2025-05-04T19:25:21.117Z"
+    "publishedAt": "2025-05-04T19:36:59.817Z"
   }
 }

package/src/config-loader/config-loader.ts

@@ -33,7 +33,6 @@ import {
 	type WebResourceHandler,
 	setupUploadHooks,
 	setupWebresourceHandler,
-	setupUploadActions,
 } from '../webresource-handler/index.js';
 import type { AliasValidNodeType } from '../sbvr-api/translations.js';
 
@@ -222,17 +221,18 @@ export const setup = (app: Express.Application) => {
 							.delete(sbvrUtils.handleODataRequest);
 
 						const loadedModel = sbvrUtils.getModel(model.apiRoot!);
-						const resourceNames = Object.values(loadedModel.abstractSql.tables)
-							.filter((table) =>
-								table.fields.some((f) => f.dataType === 'WebResource'),
+						if (translateTo == null) {
+							const resourceNames = Object.values(
+								loadedModel.abstractSql.tables,
 							)
-							.map((table) => table.name);
+								.filter((table) =>
+									table.fields.some((f) => f.dataType === 'WebResource'),
+								)
+								.map((table) => table.name);
 
-						for (const resource of new Set(resourceNames)) {
-							if (translateTo == null) {
-								setupUploadHooks(model.apiRoot!, resource);
+							for (const resource of new Set(resourceNames)) {
+								setupUploadHooks(webResourceHandler, model.apiRoot!, resource);
 							}
-							setupUploadActions(model.apiRoot!, resource);
 						}
 
 						console.info(

package/src/config-loader/env.ts

@@ -159,17 +159,6 @@ export const tasks = {
 	queueIntervalMS: intVar('PINEJS_QUEUE_INTERVAL_MS', 1000),
 };
 
-export const webResource = {
-	multipartUploadEnabled: boolVar(
-		'PINEJS_WEBRESOURCE_MULTIPART_ENABLED',
-		false,
-	),
-	singleUploadMaxFilesize: intVar(
-		'PINEJS_WEBRESOURCE_MAXFILESIZE',
-		299 * 1024 * 1024,
-	),
-};
-
 export const guardTestMockOnly = () => {
 	if (process.env.DEPLOYMENT !== 'TEST') {
 		throw new Error('Attempting to use TEST_MOCK_ONLY outside of tests');

package/src/sbvr-api/actions.ts

@@ -67,7 +67,7 @@ export const runAction = async (
 		throw new BadRequestError();
 	}
 
-	return sbvrUtils.db.transaction(async (tx) => {
+	return await sbvrUtils.db.transaction(async (tx) => {
 		// in practice, the parser does not currently allow actions without a key
 		// e.g. /vocab/resource(...)/action compiles but
 		// /vocab/resource/action won't even compile, so (current) reality is that if canAcccess

package/src/server-glue/module.ts

@@ -8,7 +8,6 @@ import * as migrator from '../migrator/sync.js';
 import type * as migratorUtils from '../migrator/utils.js';
 import * as tasks from '../tasks/index.js';
 export * as actions from '../sbvr-api/actions.js';
-import * as webresource from '../webresource-handler/index.js';
 
 import * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
 import { PINEJS_ADVISORY_LOCK } from '../config-loader/env.js';
@@ -68,7 +67,6 @@ export const init = async <T extends string>(
 		const cfgLoader = configLoader.setup(app);
 		await cfgLoader.loadConfig(migrator.config);
 		await cfgLoader.loadConfig(tasks.config);
-		await cfgLoader.loadConfig(webresource.config);
 
 		if (!process.env.CONFIG_LOADER_DISABLED) {
 			await cfgLoader.loadApplicationConfig(config);

package/src/tasks/index.ts

@@ -11,7 +11,6 @@ import type TasksModel from './tasks.js';
 import type { Task } from './tasks.js';
 import type { FromSchema } from 'json-schema-to-ts';
 import { importSBVR } from '../server-glue/sbvr-loader.js';
-import { addPineTaskHandlers } from './pine-tasks.js';
 
 export type * from './tasks.js';
 
@@ -45,14 +44,9 @@ export const config: ConfigLoader.Config = {
 };
 
 export let worker: Worker | null = null;
-
-export function isPineTasksAvailable() {
-	return sbvrUtils.db.engine === 'postgres';
-}
-
 export function setup(): void {
 	// Async task functionality is only supported on Postgres
-	if (!isPineTasksAvailable()) {
+	if (sbvrUtils.db.engine !== 'postgres') {
 		console.warn('Skipping task setup as database not supported');
 		return;
 	}
@@ -131,8 +125,6 @@ export function setup(): void {
 			}
 		},
 	});
-
-	addPineTaskHandlers();
 }
 
 // Register a task handler

package/src/webresource-handler/index.ts

@@ -11,20 +11,10 @@ import {
 	odataNameToSqlName,
 	sqlNameToODataName,
 } from '@balena/odata-to-abstract-sql';
-import type { ConfigLoader } from '../server-glue/module.js';
 import { errors, permissions } from '../server-glue/module.js';
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
 import { TypedError } from 'typed-error';
 import type { Resolvable } from '../sbvr-api/common-types.js';
-import type { Tx } from '../database-layer/db.js';
-import { isPineTasksAvailable } from '../tasks/index.js';
-import type WebresourceModel from './webresource.js';
-import { importSBVR } from '../server-glue/sbvr-loader.js';
-import { beginUploadAction } from './actions/beginUpload.js';
-import { isMultipartUploadAvailable } from './multipartUpload.js';
-import { commitUploadAction } from './actions/commitUpload.js';
-import { cancelUploadAction } from './actions/canceUpload.js';
-import { addAction } from '../sbvr-api/actions.js';
 
 export * from './handlers/index.js';
 
@@ -326,34 +316,12 @@ export const getWebResourceFields = (
 		.map((f) => sqlNameToODataName(f.fieldName));
 };
 
-const deleteOnStorage = async (keysToDelete: string[], tx?: Tx) => {
-	if (isPineTasksAvailable()) {
-		await Promise.all(
-			keysToDelete.map(async (fileKey) => {
-				return await sbvrUtils.api.tasks.post({
-					resource: 'task',
-					passthrough: {
-						req: permissions.root,
-						tx,
-					},
-					body: {
-						key: crypto.randomUUID(),
-						is_executed_by__handler: 'delete_webresource_file',
-						is_executed_with__parameter_set: {
-							fileKey: fileKey,
-						},
-						attempt_limit: 2 ** 31 - 1,
-					},
-				});
-			}),
-		);
-	} else {
-		await Promise.all(
-			keysToDelete.map(async (fileKey) => {
-				return await configuredWebResourceHandler?.removeFile(fileKey);
-			}),
-		);
-	}
+const deleteFiles = async (
+	keysToDelete: string[],
+	webResourceHandler: WebResourceHandler,
+) => {
+	const promises = keysToDelete.map((r) => webResourceHandler.removeFile(r));
+	await Promise.all(promises);
 };
 
 const throwIfWebresourceNotInMultipart = (
@@ -361,13 +329,6 @@ const throwIfWebresourceNotInMultipart = (
 	{ req, request }: HookArgs,
 ) => {
 	if (
-		// root needs to be able to bypass the multipart check as
-		// it needs to pass the direct payload on multipart uploads (on storage provider)
-		req.user !== permissions.root.user &&
-		// This is checking for HTTP multipart form submission/request (e.g. send the actual file via the API)
-		// Not to confuse with multipart uploads
-		// See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Methods/POST#multipart_form_submission
-		// See: https://docs.aws.amazon.com/AmazonS3/latest/userguide/mpuoverview.html
 		!req.is?.('multipart') &&
 		webResourceFields.some((field) => request.values[field] != null)
 	) {
@@ -377,22 +338,18 @@ const throwIfWebresourceNotInMultipart = (
 	}
 };
 
-const getCreateWebResourceHooks = (): sbvrUtils.Hooks => {
+const getCreateWebResourceHooks = (
+	webResourceHandler: WebResourceHandler,
+): sbvrUtils.Hooks => {
 	return {
 		PRERUN: (hookArgs) => {
 			const webResourceFields = getWebResourceFields(hookArgs.request);
 			throwIfWebresourceNotInMultipart(webResourceFields, hookArgs);
 		},
-		'POSTRUN-ERROR': async ({ request }) => {
-			const fields = getWebResourceFields(request);
-
-			if (fields.length === 0) {
-				return;
-			}
-
-			const keysToDelete = getWebResourcesKeysFromRequest(fields, request);
-			// Explicitely not passing tx as it will be rolledback as it is an error hook
-			await deleteOnStorage(keysToDelete);
+		'POSTRUN-ERROR': ({ tx, request }) => {
+			tx.on('rollback', () => {
+				void deleteRollbackPendingFields(request, webResourceHandler);
+			});
 		},
 	};
 };
@@ -421,12 +378,21 @@ const getWebResourcesKeysFromRequest = (
 		.filter((href) => href != null);
 };
 
-const getRemoveWebResourceHooks = (): sbvrUtils.Hooks => {
+const getRemoveWebResourceHooks = (
+	webResourceHandler: WebResourceHandler,
+): sbvrUtils.Hooks => {
 	return {
 		PRERUN: async (args) => {
 			const { api, request, tx } = args;
 			let webResourceFields = getWebResourceFields(request);
 
+			throwIfWebresourceNotInMultipart(webResourceFields, args);
+
+			// Request failed on DB roundtrip (e.g. DB constraint) and pending files need to be deleted
+			tx.on('rollback', () => {
+				void deleteRollbackPendingFields(request, webResourceHandler);
+			});
+
 			if (request.method === 'PATCH') {
 				webResourceFields = Object.entries(request.values)
 					.filter(
@@ -435,8 +401,6 @@ const getRemoveWebResourceHooks = (): sbvrUtils.Hooks => {
 					)
 					.map(([key]) => key);
 			}
-			request.custom.webResourceFields = webResourceFields;
-			throwIfWebresourceNotInMultipart(webResourceFields, args);
 
 			if (webResourceFields.length === 0) {
 				// No need to delete anything as no file is in the wire
@@ -447,32 +411,43 @@ const getRemoveWebResourceHooks = (): sbvrUtils.Hooks => {
 			// This can only be validated here because we need to first ensure the
 			// request is actually modifying a webresource before erroring out
 			if (request.method === 'PATCH' && request.odataQuery?.key == null) {
+				// When we get here, files have already been uploaded. We need to mark them for deletion.
+				const keysToDelete = getWebResourcesKeysFromRequest(
+					webResourceFields,
+					request,
+				);
+
+				// Set deletion of files on the wire as request will throw
+				tx.on('end', () => {
+					deletePendingFiles(keysToDelete, request, webResourceHandler);
+				});
+
 				throw new errors.BadRequestError(
 					'WebResources can only be updated when providing a resource key.',
 				);
 			}
 
+			// This can be > 1 in both DELETE requests or PATCH requests to not accessible IDs.
 			const ids = await sbvrUtils.getAffectedIds(args);
 			if (ids.length === 0) {
 				// Set deletion of files on the wire as no resource was affected
-				request.custom.onPostRunDelete = getWebResourcesKeysFromRequest(
+				// Note that for DELETE requests it should not find any request on the wire
+				const keysToDelete = getWebResourcesKeysFromRequest(
 					webResourceFields,
 					request,
 				);
+				deletePendingFiles(keysToDelete, request, webResourceHandler);
 				return;
 			}
 
-			// If it reaches here, it means that it will try to patch/delete the webresource
-			// So we need (before postrun) get what are the current keys to be deleted
-			// if post run succeeds
 			const webResources = (await api.get({
 				resource: request.resourceName,
 				passthrough: {
-					tx,
+					tx: args.tx,
 					req: permissions.root,
 				},
 				options: {
-					$select: request.custom.webResourceFields,
+					$select: webResourceFields,
 					$filter: {
 						id: {
 							$in: ids,
@@ -480,34 +455,60 @@ const getRemoveWebResourceHooks = (): sbvrUtils.Hooks => {
 					},
 				},
 			})) as WebResourcesDbResponse[] | undefined | null;
-			request.custom.onPostRunDelete = getWebResourcesHrefs(webResources);
-		},
 
-		POSTRUN: async ({ request, tx }) => {
-			// Either patch or delete worked. In either case, schedule the previous existing files to delete
-			await deleteOnStorage(request.custom.onPostRunDelete ?? [], tx);
-		},
-		'POSTRUN-ERROR': async ({ request }) => {
-			const keysToDelete = getWebResourcesKeysFromRequest(
-				request.custom.webResourceFields,
-				request,
-			);
-			// Explicitely not passing tx as it will be rolledback as it is an error hook
-			await deleteOnStorage(keysToDelete);
+			// Deletes previous stored resources in case they were patched or the whole entity was deleted
+			tx.on('end', () => {
+				deletePendingFiles(
+					getWebResourcesHrefs(webResources),
+					request,
+					webResourceHandler,
+				);
+			});
 		},
 	};
 };
 
+const deleteRollbackPendingFields = async (
+	request: uriParser.ODataRequest,
+	webResourceHandler: WebResourceHandler,
+) => {
+	const fields = getWebResourceFields(request);
+
+	if (fields.length === 0) {
+		return;
+	}
+
+	const keysToDelete = getWebResourcesKeysFromRequest(fields, request);
+	await deleteFiles(keysToDelete, webResourceHandler);
+};
+
+const deletePendingFiles = (
+	keysToDelete: string[],
+	request: uriParser.ODataRequest,
+	webResourceHandler: WebResourceHandler,
+): void => {
+	// on purpose does not await for this promise to resolve
+	try {
+		void deleteFiles(keysToDelete, webResourceHandler);
+	} catch (err) {
+		getLogger(request.vocabulary).error(`Failed to delete pending files`, err);
+	}
+};
+
 export const getDefaultHandler = (): WebResourceHandler => {
 	return new NoopHandler();
 };
 
-export const setupUploadHooks = (apiRoot: string, resourceName: string) => {
+export const setupUploadHooks = (
+	handler: WebResourceHandler,
+	apiRoot: string,
+	resourceName: string,
+) => {
 	sbvrUtils.addPureHook(
 		'DELETE',
 		apiRoot,
 		resourceName,
-		getRemoveWebResourceHooks(),
+		getRemoveWebResourceHooks(handler),
 	);
 
 	sbvrUtils.addPureHook(
@@ -515,48 +516,13 @@ export const setupUploadHooks = (apiRoot: string, resourceName: string) => {
 		apiRoot,
 		resourceName,
 		// PATCH also needs to remove the old resource in case a webresource was modified
-		getRemoveWebResourceHooks(),
+		getRemoveWebResourceHooks(handler),
 	);
 
 	sbvrUtils.addPureHook(
 		'POST',
 		apiRoot,
 		resourceName,
-		getCreateWebResourceHooks(),
+		getCreateWebResourceHooks(handler),
 	);
 };
-
-export const setupUploadActions = (apiRoot: string, resourceName: string) => {
-	const resource = sqlNameToODataName(resourceName);
-	if (isMultipartUploadAvailable(configuredWebResourceHandler)) {
-		addAction(apiRoot, resource, 'beginUpload', beginUploadAction);
-
-		addAction(apiRoot, resource, 'commitUpload', commitUploadAction);
-
-		addAction(apiRoot, resource, 'cancelUpload', cancelUploadAction);
-	}
-};
-
-const initSql = `
-CREATE INDEX IF NOT EXISTS idx_multipart_upload_uuid ON "multipart upload" (uuid);
-CREATE INDEX IF NOT EXISTS idx_multipart_upload_status ON "multipart upload" (status);
-`;
-
-const modelText = await importSBVR('./webresource.sbvr', import.meta);
-
-declare module '../sbvr-api/sbvr-utils.js' {
-	export interface API {
-		webresource: PinejsClient<WebresourceModel>;
-	}
-}
-
-export const config: ConfigLoader.Config = {
-	models: [
-		{
-			modelName: 'webresource',
-			apiRoot: 'webresource',
-			modelText,
-			initSql,
-		},
-	],
-};

package/out/tasks/pine-tasks.d.ts

@@ -1 +0,0 @@
-export declare const addPineTaskHandlers: () => void;

package/out/tasks/pine-tasks.js

@@ -1,7 +0,0 @@
-import { tasks } from '../server-glue/module.js';
-import { addDeleteFileTaskHandler } from '../webresource-handler/delete-file-task.js';
-export const addPineTaskHandlers = () => {
-    addDeleteFileTaskHandler();
-    void tasks.worker?.start();
-};
-//# sourceMappingURL=pine-tasks.js.map

package/out/tasks/pine-tasks.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pine-tasks.js","sourceRoot":"","sources":["../../src/tasks/pine-tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAEtF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACvC,wBAAwB,EAAE,CAAC;IAC3B,KAAK,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC,CAAC"}

package/out/webresource-handler/actions/beginUpload.d.ts

@@ -1,3 +0,0 @@
-import { type Response } from '../../sbvr-api/sbvr-utils.js';
-import type { ODataActionArgs } from '../../sbvr-api/actions.js';
-export declare const beginUploadAction: ({ request, tx, id, req, }: ODataActionArgs) => Promise<Response>;

package/out/webresource-handler/actions/beginUpload.js

@@ -1,105 +0,0 @@
-import { api } from '../../sbvr-api/sbvr-utils.js';
-import { getMultipartUploadHandler } from '../multipartUpload.js';
-import { getWebResourceFields } from '../index.js';
-import { BadRequestError, NotImplementedError } from '../../sbvr-api/errors.js';
-import { permissions, sbvrUtils } from '../../server-glue/module.js';
-import { randomUUID } from 'crypto';
-import { ajv } from '../../tasks/common.js';
-const beginUploadPayloadSchema = {
-    type: 'object',
-    minProperties: 1,
-    maxProperties: 1,
-    additionalProperties: {
-        type: 'object',
-        properties: {
-            filename: { type: 'string' },
-            content_type: { type: 'string' },
-            size: { type: 'number' },
-            chunk_size: { type: 'number' },
-        },
-        required: ['filename', 'content_type', 'size'],
-        additionalProperties: false,
-    },
-};
-const validateBeginUpload = ajv.compile(beginUploadPayloadSchema);
-export const beginUploadAction = async ({ request, tx, id, req, }) => {
-    if (typeof id !== 'number') {
-        throw new NotImplementedError('multipart upload do not yet support non-numeric ids');
-    }
-    const handler = getMultipartUploadHandler();
-    const { fieldName, beginUploadPayload } = parseBeginUpload(request, handler);
-    await runFakeDbPatch(request, {
-        [fieldName]: { ...beginUploadPayload, href: 'fake_patch' },
-    });
-    const { fileKey, uploadId, uploadParts } = await handler.multipartUpload.begin(fieldName, beginUploadPayload);
-    const uuid = randomUUID();
-    await api.webresource.post({
-        resource: 'multipart_upload',
-        body: {
-            uuid,
-            resource_name: request.resourceName,
-            field_name: fieldName,
-            resource_id: id,
-            upload_id: uploadId,
-            file_key: fileKey,
-            status: 'pending',
-            ...beginUploadPayload,
-            expiry_date: Date.now() + 7 * 24 * 60 * 60 * 1000,
-            is_created_by__actor: req.user?.actor,
-        },
-        passthrough: {
-            req: permissions.root,
-            tx,
-        },
-    });
-    return {
-        body: { [fieldName]: { uuid, uploadParts } },
-        statusCode: 200,
-    };
-};
-const parseBeginUpload = (request, webResourceHandler) => {
-    const { values } = request;
-    const isValid = validateBeginUpload(values);
-    if (!isValid) {
-        throw new BadRequestError('Invalid begin upload payload');
-    }
-    const fieldName = Object.keys(values)[0];
-    const webResourceFields = getWebResourceFields(request, false);
-    if (!webResourceFields.includes(fieldName)) {
-        throw new BadRequestError(`The provided field '${fieldName}' is not a valid webresource`);
-    }
-    const beginUploadPayload = {
-        ...values[fieldName],
-        chunk_size: values[fieldName].chunk_size ??
-            webResourceHandler.multipartUpload.getMinimumPartSize(),
-    };
-    if (beginUploadPayload.chunk_size <
-        webResourceHandler.multipartUpload.getMinimumPartSize()) {
-        throw new BadRequestError('Chunk size is too small');
-    }
-    return {
-        beginUploadPayload,
-        fieldName,
-    };
-};
-const runFakeDbPatch = async (request, fakeDbPatch) => {
-    const fakeTx = await sbvrUtils.db.transaction();
-    try {
-        const newUrl = request.url
-            .slice(1)
-            .split('?', 1)[0]
-            .replace(/\/beginUpload$/, '');
-        await api[request.vocabulary].request({
-            method: 'PATCH',
-            url: newUrl,
-            body: fakeDbPatch,
-            passthrough: { tx: fakeTx, req: permissions.root },
-        });
-    }
-    finally {
-        if (!fakeTx.isClosed()) {
-            await fakeTx.rollback();
-        }
-    }
-};
-//# sourceMappingURL=beginUpload.js.map

package/out/webresource-handler/actions/beginUpload.js.map

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

package/out/webresource-handler/actions/canceUpload.d.ts

@@ -1,3 +0,0 @@
-import type { ODataActionArgs } from '../../sbvr-api/actions.js';
-import { type Response } from '../../sbvr-api/sbvr-utils.js';
-export declare const cancelUploadAction: ({ request, tx, id: resourceId, }: ODataActionArgs) => Promise<Response>;

package/out/webresource-handler/actions/canceUpload.js

@@ -1,58 +0,0 @@
-import { BadRequestError, NotImplementedError, UnauthorizedError, } from '../../sbvr-api/errors.js';
-import { api } from '../../sbvr-api/sbvr-utils.js';
-import { permissions } from '../../server-glue/module.js';
-import { getMultipartUploadHandler } from '../multipartUpload.js';
-export const cancelUploadAction = async ({ request, tx, id: resourceId, }) => {
-    if (typeof resourceId !== 'number') {
-        throw new NotImplementedError('multipart upload do not yet support non-numeric ids');
-    }
-    const { id, fileKey, uploadId } = await getOngoingUpload(request, resourceId, tx);
-    const handler = getMultipartUploadHandler();
-    await api.webresource.patch({
-        resource: 'multipart_upload',
-        body: {
-            status: 'cancelled',
-        },
-        id,
-        passthrough: {
-            tx: tx,
-            req: permissions.root,
-        },
-    });
-    await handler.multipartUpload.cancel({ fileKey, uploadId });
-    return {
-        statusCode: 204,
-    };
-};
-const getOngoingUpload = async (request, affectedId, tx) => {
-    const { uuid } = request.values;
-    if (uuid == null || typeof uuid !== 'string') {
-        throw new BadRequestError('Invalid uuid type');
-    }
-    const [multipartUpload] = await api.webresource.get({
-        resource: 'multipart_upload',
-        options: {
-            $select: ['id', 'file_key', 'upload_id'],
-            $filter: {
-                uuid,
-                status: 'pending',
-                expiry_date: { $gt: { $now: {} } },
-                resource_name: request.resourceName,
-                resource_id: affectedId,
-            },
-        },
-        passthrough: {
-            tx,
-            req: permissions.rootRead,
-        },
-    });
-    if (multipartUpload == null) {
-        throw new UnauthorizedError();
-    }
-    return {
-        id: multipartUpload.id,
-        fileKey: multipartUpload.file_key,
-        uploadId: multipartUpload.upload_id,
-    };
-};
-//# sourceMappingURL=canceUpload.js.map