@balena/pinejs 21.4.0-build-add-actions-example-d3a479f7c677c487d5486ddafa43ff08265b5e83-2 → 21.4.0-build-add-odata-actions-68fab419c569b6b93e17ad6d65db4650bf4e78eb-3

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,11 +44,6 @@ export const config: ConfigLoader.Config = {
 };
 
 export let worker: Worker | null = null;
-
-export function isPineTasksAvailable() {
-	return sbvrUtils.db.engine === 'postgres' && tasksEnv.queueConcurrency > 0;
-}
-
 export function setup(): void {
 	// Async task functionality is only supported on Postgres
 	if (sbvrUtils.db.engine !== 'postgres') {
@@ -131,8 +125,6 @@ export function setup(): void {
 			}
 		},
 	});
-
-	addPineTaskHandlers();
 }
 
 // Register a task handler

package/src/webresource-handler/index.ts

@@ -11,19 +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 { 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';
 
@@ -329,24 +320,7 @@ const deleteFiles = async (
 	keysToDelete: string[],
 	webResourceHandler: WebResourceHandler,
 ) => {
-	const promises = isPineTasksAvailable()
-		? keysToDelete.map((fileKey) =>
-				sbvrUtils.api.tasks.post({
-					resource: 'task',
-					passthrough: {
-						req: permissions.root,
-					},
-					body: {
-						key: crypto.randomUUID(),
-						is_executed_by__handler: 'delete_webresource_file',
-						is_executed_with__parameter_set: {
-							fileKey: fileKey,
-						},
-						attempt_limit: 2 ** 31 - 1,
-					},
-				}),
-			)
-		: keysToDelete.map((r) => webResourceHandler.removeFile(r));
+	const promises = keysToDelete.map((r) => webResourceHandler.removeFile(r));
 	await Promise.all(promises);
 };
 
@@ -355,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)
 	) {
@@ -559,38 +526,3 @@ export const setupUploadHooks = (
 		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

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,uBAAuB,CAAC;AAElE,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,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9C,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,85 +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 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,
-            },
-        }),
-    ]);
-    const body = await handler.onPreRespond(webresource);
-    return {
-        body,
-        statusCode: 200,
-    };
-};
-const getOngoingUpload = async (request, affectedId, tx) => {
-    const { uuid, providerCommitData } = 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', '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/delete-file-task.d.ts

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

package/out/webresource-handler/delete-file-task.js

@@ -1,37 +0,0 @@
-import { addTaskHandler } from '../tasks/index.js';
-import { getWebresourceHandler } from './index.js';
-const deleteFileSchema = {
-    type: 'object',
-    properties: {
-        fileKey: {
-            type: 'string',
-        },
-    },
-    required: ['fileKey'],
-    additionalProperties: false,
-};
-export const addDeleteFileTaskHandler = () => {
-    addTaskHandler('delete_webresource_file', async (task) => {
-        const handler = getWebresourceHandler();
-        if (!handler) {
-            return {
-                error: 'Webresource handler not available',
-                status: 'failed',
-            };
-        }
-        try {
-            await handler.removeFile(task.params.fileKey);
-            return {
-                status: 'succeeded',
-            };
-        }
-        catch (error) {
-            console.error('Error deleting file:', error);
-            return {
-                error: `${error}`,
-                status: 'failed',
-            };
-        }
-    }, deleteFileSchema);
-};
-//# sourceMappingURL=delete-file-task.js.map

package/out/webresource-handler/delete-file-task.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"delete-file-task.js","sourceRoot":"","sources":["../../src/webresource-handler/delete-file-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,gBAAgB,GAAG;IACxB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,OAAO,EAAE;YACR,IAAI,EAAE,QAAQ;SACd;KACD;IACD,QAAQ,EAAE,CAAC,SAAS,CAAC;IACrB,oBAAoB,EAAE,KAAK;CAClB,CAAC;AAEX,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC5C,cAAc,CACb,yBAAyB,EACzB,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO;gBACN,KAAK,EAAE,mCAAmC;gBAC1C,MAAM,EAAE,QAAQ;aAChB,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9C,OAAO;gBACN,MAAM,EAAE,WAAW;aACnB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO;gBACN,KAAK,EAAE,GAAG,KAAK,EAAE;gBACjB,MAAM,EAAE,QAAQ;aAChB,CAAC;QACH,CAAC;IACF,CAAC,EACD,gBAAgB,CAChB,CAAC;AACH,CAAC,CAAC"}

package/out/webresource-handler/multipartUpload.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/multipartUpload.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=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":"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['Big 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['Big 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: Big 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

package/src/tasks/pine-tasks.ts

@@ -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();
-};