@balena/pinejs 21.4.0-build-add-actions-example-93421a6d8ec8d27b3ffe6c67f1cf656bc223317f-1 → 21.4.0-build-add-odata-actions-32c9efff1f1478325ba4c336e45468ff119ff31c-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "21.4.0-build-add-actions-example-93421a6d8ec8d27b3ffe6c67f1cf656bc223317f-1",
+  "version": "21.4.0-build-add-odata-actions-32c9efff1f1478325ba4c336e45468ff119ff31c-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-66b03581234eaa7ce15c6f389e39b5b7ed3d1bc5-1",
+    "@balena/pinejs-webresource-s3": "^1.0.4",
     "@faker-js/faker": "^9.6.0",
     "@types/busboy": "^1.5.4",
     "@types/chai": "^5.2.1",
@@ -145,10 +145,10 @@
     ],
     "loader": "ts-node/esm/transpile-only",
     "exit": true,
-    "timeout": 6000000,
+    "timeout": 60000,
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2025-04-30T22:58:50.019Z"
+    "publishedAt": "2025-05-01T00:29:47.106Z"
   }
 }

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) {
+							for (const resource of new Set(resourceNames)) {
 								setupUploadHooks(webResourceHandler, model.apiRoot!, resource);
 							}
-							setupUploadActions(webResourceHandler, 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/sbvr-utils.ts

@@ -167,7 +167,7 @@ export type ModelExecutionResult =
 			migrationExecutionResult?: MigrationExecutionResult;
 	  };
 
-export const memoizedResolvedSynonym = memoizeWeak(
+const memoizedResolvedSynonym = memoizeWeak(
 	(
 		abstractSqlModel: AbstractSQLCompiler.AbstractSqlModel,
 		resourceName: string,

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/webresource-handler/index.ts

@@ -11,18 +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 WebresourceModel from './webresource.js';
-import { importSBVR } from '../server-glue/sbvr-loader.js';
-import { beginUploadAction } from './actions/beginUpload.js';
-import { isMultipartUploadAvailable } from './multiparUpload.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';
 
@@ -337,7 +329,6 @@ const throwIfWebresourceNotInMultipart = (
 	{ req, request }: HookArgs,
 ) => {
 	if (
-		req.user !== permissions.root.user &&
 		!req.is?.('multipart') &&
 		webResourceFields.some((field) => request.values[field] != null)
 	) {
@@ -535,41 +526,3 @@ export const setupUploadHooks = (
 		getCreateWebResourceHooks(handler),
 	);
 };
-
-export const setupUploadActions = (
-	handler: WebResourceHandler,
-	apiRoot: string,
-	resourceName: string,
-) => {
-	if (isMultipartUploadAvailable(handler)) {
-		addAction(apiRoot, resourceName, 'beginUpload', beginUploadAction);
-
-		addAction(apiRoot, resourceName, 'commitUpload', commitUploadAction);
-
-		addAction(apiRoot, resourceName, '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/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,98 +0,0 @@
-import { api } from '../../sbvr-api/sbvr-utils.js';
-import { getMultipartUploadHandler } from '../multiparUpload.js';
-import { getWebResourceFields } from '../index.js';
-import { BadRequestError, NotImplementedError } from '../../sbvr-api/errors.js';
-import { permissions, sbvrUtils } from '../../server-glue/module.js';
-import { TransactionClosedError } from '../../database-layer/db.js';
-import { randomUUID } from 'crypto';
-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 fieldNames = Object.keys(request.values);
-    if (fieldNames.length !== 1) {
-        throw new BadRequestError('You can only get upload url for one field at a time');
-    }
-    const [fieldName] = fieldNames;
-    const webResourceFields = getWebResourceFields(request, false);
-    if (!webResourceFields.includes(fieldName)) {
-        throw new BadRequestError(`The provided field '${fieldName}' is not a valid webresource`);
-    }
-    const beginUploadPayload = parseBeginUploadPayload(request.values[fieldName], webResourceHandler);
-    if (beginUploadPayload == null) {
-        throw new BadRequestError('Invalid file metadata');
-    }
-    return {
-        beginUploadPayload,
-        fieldName,
-    };
-};
-const parseBeginUploadPayload = (payload, webResourceHandler) => {
-    if (payload == null || 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 < webResourceHandler.multipartUpload.getMinimumPartSize())) {
-        return null;
-    }
-    chunk_size ??= webResourceHandler.multipartUpload.getDefaultPartSize();
-    return { filename, content_type, size, chunk_size };
-};
-const runFakeDbPatch = async (request, fakeDbPatch) => {
-    try {
-        await sbvrUtils.db.transaction(async (fakeTx) => {
-            const newUrl = request.url.slice(1).replace(/\/beginUpload$/, '');
-            await api[request.vocabulary].request({
-                method: 'PATCH',
-                url: newUrl,
-                body: fakeDbPatch,
-                passthrough: { tx: fakeTx, req: permissions.root },
-            });
-            await fakeTx.rollback();
-        });
-    }
-    catch (e) {
-        if (!(e instanceof TransactionClosedError &&
-            e.message === 'Transaction has been rolled back.')) {
-            throw e;
-        }
-    }
-};
-//# 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 '../multiparUpload.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 || 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

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

@@ -1 +0,0 @@
-{"version":3,"file":"canceUpload.js","sourceRoot":"","sources":["../../../src/webresource-handler/actions/canceUpload.ts"],"names":[],"mappings":"AAKA,OAAO,EACN,eAAe,EACf,mBAAmB,EACnB,iBAAiB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,GAAG,EAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACxC,OAAO,EACP,EAAE,EACF,EAAE,EAAE,UAAU,GACG,EAAqB,EAAE;IACxC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,mBAAmB,CAC5B,qDAAqD,CACrD,CAAC;IACH,CAAC;IACD,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,CACvD,OAAO,EACP,UAAU,EACV,EAAE,CACF,CAAC;IACF,MAAM,OAAO,GAAG,yBAAyB,EAAE,CAAC;IAE5C,MAAM,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC;QAC3B,QAAQ,EAAE,kBAAkB;QAC5B,IAAI,EAAE;YACL,MAAM,EAAE,WAAW;SACnB;QACD,EAAE;QACF,WAAW,EAAE;YACZ,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,WAAW,CAAC,IAAI;SACrB;KACD,CAAC,CAAC;IAKH,MAAM,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5D,OAAO;QACN,UAAU,EAAE,GAAG;KACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAC7B,OAA2B,EAC3B,UAAkB,EAClB,EAAM,EACL,EAAE;IACH,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAChC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC;QACnD,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE;YACR,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC;YACxC,OAAO,EAAE;gBAER,IAAI;gBACJ,MAAM,EAAE,SAAS;gBACjB,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;gBAClC,aAAa,EAAE,OAAO,CAAC,YAAY;gBACnC,WAAW,EAAE,UAAU;aACvB;SACD;QACD,WAAW,EAAE;YACZ,EAAE;YACF,GAAG,EAAE,WAAW,CAAC,QAAQ;SACzB;KACD,CAAC,CAAC;IAEH,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,iBAAiB,EAAE,CAAC;IAC/B,CAAC;IAED,OAAO;QACN,EAAE,EAAE,eAAe,CAAC,EAAE;QACtB,OAAO,EAAE,eAAe,CAAC,QAAQ;QACjC,QAAQ,EAAE,eAAe,CAAC,SAAS;KACnC,CAAC;AACH,CAAC,CAAC"}

package/out/webresource-handler/actions/commitUpload.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 commitUploadAction: ({ request, tx, id, api: applicationApi, }: ODataActionArgs) => Promise<Response>;

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

@@ -1,84 +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 '../multiparUpload.js';
-export const commitUploadAction = async ({ request, tx, id, api: applicationApi, }) => {
-    if (typeof id !== 'number') {
-        throw new NotImplementedError('multipart upload do not yet support non-numeric ids');
-    }
-    const multipartUpload = await getOngoingUpload(request, id, tx);
-    const handler = getMultipartUploadHandler();
-    const webresource = await handler.multipartUpload.commit({
-        fileKey: multipartUpload.fileKey,
-        uploadId: multipartUpload.uploadId,
-        filename: multipartUpload.filename,
-        providerCommitData: multipartUpload.providerCommitData,
-    });
-    await Promise.all([
-        api.webresource.patch({
-            resource: 'multipart_upload',
-            body: {
-                status: 'completed',
-            },
-            options: {
-                $filter: {
-                    uuid: multipartUpload.uuid,
-                },
-            },
-            passthrough: {
-                tx: tx,
-                req: permissions.root,
-            },
-        }),
-        applicationApi.patch({
-            resource: request.resourceName,
-            id,
-            body: {
-                [multipartUpload.fieldName]: webresource,
-            },
-            passthrough: {
-                tx: tx,
-                req: permissions.root,
-            },
-        }),
-    ]);
-    return {
-        body: webresource,
-        statusCode: 200,
-    };
-};
-const getOngoingUpload = async (request, affectedId, tx) => {
-    const { uuid, providerCommitData } = request.values;
-    if (!uuid || 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', 'field_name', 'filename'],
-            $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 {
-        uuid,
-        providerCommitData,
-        fileKey: multipartUpload.file_key,
-        uploadId: multipartUpload.upload_id,
-        filename: multipartUpload.filename,
-        fieldName: multipartUpload.field_name,
-    };
-};
-//# sourceMappingURL=commitUpload.js.map

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

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

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

@@ -1,4 +0,0 @@
-import type { WebResourceHandler } from './index.js';
-export type MultipartUploadHandler = WebResourceHandler & Required<Pick<WebResourceHandler, 'multipartUpload'>>;
-export declare const isMultipartUploadAvailable: (handler: WebResourceHandler | undefined) => handler is MultipartUploadHandler;
-export declare const getMultipartUploadHandler: () => MultipartUploadHandler;

package/out/webresource-handler/multiparUpload.js

@@ -1,14 +0,0 @@
-import { webResource as webResourceEnv } from '../config-loader/env.js';
-import { NotImplementedError } from '../sbvr-api/errors.js';
-import { getWebresourceHandler } from './index.js';
-export const isMultipartUploadAvailable = (handler) => {
-    return (webResourceEnv.multipartUploadEnabled && handler?.multipartUpload != null);
-};
-export const getMultipartUploadHandler = () => {
-    const handler = getWebresourceHandler();
-    if (!isMultipartUploadAvailable(handler)) {
-        throw new NotImplementedError('Multipart uploads not available');
-    }
-    return handler;
-};
-//# sourceMappingURL=multiparUpload.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"multiparUpload.js","sourceRoot":"","sources":["../../src/webresource-handler/multiparUpload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAKnD,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACzC,OAAuC,EACH,EAAE;IACtC,OAAO,CACN,cAAc,CAAC,sBAAsB,IAAI,OAAO,EAAE,eAAe,IAAI,IAAI,CACzE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC7C,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;IACxC,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,mBAAmB,CAAC,iCAAiC,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC"}

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

@@ -1,42 +0,0 @@
-import type { Types } from '@balena/abstract-sql-to-typescript';
-export interface MultipartUpload {
-    Read: {
-        created_at: Types['Date Time']['Read'];
-        modified_at: Types['Date Time']['Read'];
-        id: Types['Serial']['Read'];
-        uuid: Types['Short Text']['Read'];
-        resource_name: Types['Short Text']['Read'];
-        field_name: Types['Short Text']['Read'];
-        resource_id: Types['Integer']['Read'];
-        upload_id: Types['Short Text']['Read'];
-        file_key: Types['Short Text']['Read'];
-        status: 'pending' | 'completed' | 'cancelled';
-        filename: Types['Short Text']['Read'];
-        content_type: Types['Short Text']['Read'];
-        size: Types['Integer']['Read'];
-        chunk_size: Types['Integer']['Read'];
-        expiry_date: Types['Date Time']['Read'];
-        is_created_by__actor: Types['Integer']['Read'] | null;
-    };
-    Write: {
-        created_at: Types['Date Time']['Write'];
-        modified_at: Types['Date Time']['Write'];
-        id: Types['Serial']['Write'];
-        uuid: Types['Short Text']['Write'];
-        resource_name: Types['Short Text']['Write'];
-        field_name: Types['Short Text']['Write'];
-        resource_id: Types['Integer']['Write'];
-        upload_id: Types['Short Text']['Write'];
-        file_key: Types['Short Text']['Write'];
-        status: 'pending' | 'completed' | 'cancelled';
-        filename: Types['Short Text']['Write'];
-        content_type: Types['Short Text']['Write'];
-        size: Types['Integer']['Write'];
-        chunk_size: Types['Integer']['Write'];
-        expiry_date: Types['Date Time']['Write'];
-        is_created_by__actor: Types['Integer']['Write'] | null;
-    };
-}
-export default interface $Model {
-    multipart_upload: MultipartUpload;
-}

package/out/webresource-handler/webresource.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=webresource.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"webresource.js","sourceRoot":"","sources":["../../src/webresource-handler/webresource.ts"],"names":[],"mappings":""}

package/out/webresource-handler/webresource.sbvr

@@ -1,60 +0,0 @@
-Vocabulary: webresource
-
-Term: actor
-	Concept Type: Integer (Type)
-Term: expiry date
-	Concept Type: Date Time (Type)
-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
-	Necessity: each multipart upload has exactly one expiry date
-Fact type: multipart upload is created by actor
-	Necessity: each multipart upload is created by at most one actor