@balena/pinejs 21.5.1-build-renovate-minio-mc-2025-x-c6661b610b05eb00a06d9a27da4f55cca75f9b24-1 → 21.6.0-build-add-actions-example-a346f3cb25b768b2b2bbd62bcbc85fbf35eb0908-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.pinejs-cache.json +1 -1
- package/.versionbot/CHANGELOG.yml +16 -10
- package/CHANGELOG.md +3 -2
- package/VERSION +1 -1
- package/docker-compose.npm-test.yml +1 -1
- package/out/config-loader/config-loader.js +7 -6
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/config-loader/env.d.ts +3 -0
- package/out/config-loader/env.js +3 -0
- package/out/config-loader/env.js.map +1 -1
- package/out/server-glue/module.js +2 -0
- package/out/server-glue/module.js.map +1 -1
- package/out/webresource-handler/actions/beginUpload.d.ts +4 -0
- package/out/webresource-handler/actions/beginUpload.js +106 -0
- package/out/webresource-handler/actions/beginUpload.js.map +1 -0
- package/out/webresource-handler/actions/cancelUpload.d.ts +4 -0
- package/out/webresource-handler/actions/cancelUpload.js +61 -0
- package/out/webresource-handler/actions/cancelUpload.js.map +1 -0
- package/out/webresource-handler/actions/commitUpload.d.ts +4 -0
- package/out/webresource-handler/actions/commitUpload.js +88 -0
- package/out/webresource-handler/actions/commitUpload.js.map +1 -0
- package/out/webresource-handler/actions/index.d.ts +4 -0
- package/out/webresource-handler/actions/index.js +5 -0
- package/out/webresource-handler/actions/index.js.map +1 -0
- package/out/webresource-handler/index.d.ts +9 -0
- package/out/webresource-handler/index.js +29 -1
- package/out/webresource-handler/index.js.map +1 -1
- package/out/webresource-handler/multipartUpload.d.ts +4 -0
- package/out/webresource-handler/multipartUpload.js +14 -0
- package/out/webresource-handler/multipartUpload.js.map +1 -0
- package/out/webresource-handler/webresource.d.ts +42 -0
- package/out/webresource-handler/webresource.js +2 -0
- package/out/webresource-handler/webresource.js.map +1 -0
- package/out/webresource-handler/webresource.sbvr +60 -0
- package/package.json +5 -5
- package/src/config-loader/config-loader.ts +8 -8
- package/src/config-loader/env.ts +7 -0
- package/src/server-glue/module.ts +2 -0
- package/src/webresource-handler/actions/beginUpload.ts +165 -0
- package/src/webresource-handler/actions/cancelUpload.ts +95 -0
- package/src/webresource-handler/actions/commitUpload.ts +120 -0
- package/src/webresource-handler/actions/index.ts +5 -0
- package/src/webresource-handler/index.ts +46 -0
- package/src/webresource-handler/multipartUpload.ts +23 -0
- package/src/webresource-handler/webresource.sbvr +60 -0
- package/src/webresource-handler/webresource.ts +48 -0
@@ -0,0 +1,120 @@
|
|
1
|
+
import type { Tx } from '../../database-layer/db.js';
|
2
|
+
import type {
|
3
|
+
ODataActionArgs,
|
4
|
+
ODataActionRequest,
|
5
|
+
} from '../../sbvr-api/actions.js';
|
6
|
+
import {
|
7
|
+
BadRequestError,
|
8
|
+
NotImplementedError,
|
9
|
+
UnauthorizedError,
|
10
|
+
} from '../../sbvr-api/errors.js';
|
11
|
+
import type { Response } from '../../sbvr-api/sbvr-utils.js';
|
12
|
+
import { api } from '../../sbvr-api/sbvr-utils.js';
|
13
|
+
import { permissions } from '../../server-glue/module.js';
|
14
|
+
import { getMultipartUploadHandler } from '../multipartUpload.js';
|
15
|
+
|
16
|
+
const commitUploadAction = async ({
|
17
|
+
request,
|
18
|
+
tx,
|
19
|
+
id,
|
20
|
+
api: applicationApi,
|
21
|
+
}: ODataActionArgs): Promise<Response> => {
|
22
|
+
if (typeof id !== 'number') {
|
23
|
+
throw new NotImplementedError(
|
24
|
+
'multipart upload do not yet support non-numeric ids',
|
25
|
+
);
|
26
|
+
}
|
27
|
+
|
28
|
+
const multipartUpload = await getOngoingUpload(request, id, tx);
|
29
|
+
const handler = getMultipartUploadHandler();
|
30
|
+
|
31
|
+
const webresource = await handler.multipartUpload.commit({
|
32
|
+
fileKey: multipartUpload.fileKey,
|
33
|
+
uploadId: multipartUpload.uploadId,
|
34
|
+
filename: multipartUpload.filename,
|
35
|
+
providerCommitData: multipartUpload.providerCommitData,
|
36
|
+
});
|
37
|
+
|
38
|
+
await Promise.all([
|
39
|
+
api.webresource.patch({
|
40
|
+
resource: 'multipart_upload',
|
41
|
+
body: {
|
42
|
+
status: 'completed',
|
43
|
+
},
|
44
|
+
options: {
|
45
|
+
$filter: {
|
46
|
+
uuid: multipartUpload.uuid,
|
47
|
+
},
|
48
|
+
},
|
49
|
+
passthrough: {
|
50
|
+
tx: tx,
|
51
|
+
req: permissions.root,
|
52
|
+
},
|
53
|
+
}),
|
54
|
+
applicationApi.patch({
|
55
|
+
resource: request.resourceName,
|
56
|
+
id,
|
57
|
+
body: {
|
58
|
+
[multipartUpload.fieldName]: webresource,
|
59
|
+
},
|
60
|
+
passthrough: {
|
61
|
+
tx: tx,
|
62
|
+
// Root is needed as, if you are not root, you are not allowed to directly modify the actual metadata
|
63
|
+
req: permissions.root,
|
64
|
+
},
|
65
|
+
}),
|
66
|
+
]);
|
67
|
+
|
68
|
+
const body = await handler.onPreRespond(webresource);
|
69
|
+
|
70
|
+
return {
|
71
|
+
body,
|
72
|
+
statusCode: 200,
|
73
|
+
};
|
74
|
+
};
|
75
|
+
|
76
|
+
const getOngoingUpload = async (
|
77
|
+
request: ODataActionRequest,
|
78
|
+
affectedId: number,
|
79
|
+
tx: Tx,
|
80
|
+
) => {
|
81
|
+
const { uuid, providerCommitData } = request.values;
|
82
|
+
if (uuid == null || typeof uuid !== 'string') {
|
83
|
+
throw new BadRequestError('Invalid uuid type');
|
84
|
+
}
|
85
|
+
|
86
|
+
const multipartUpload = await api.webresource.get({
|
87
|
+
resource: 'multipart_upload',
|
88
|
+
id: {
|
89
|
+
uuid,
|
90
|
+
},
|
91
|
+
options: {
|
92
|
+
$select: ['id', 'file_key', 'upload_id', 'field_name', 'filename'],
|
93
|
+
$filter: {
|
94
|
+
status: 'pending',
|
95
|
+
expiry_date: { $gt: { $now: {} } },
|
96
|
+
resource_name: request.resourceName,
|
97
|
+
resource_id: affectedId,
|
98
|
+
},
|
99
|
+
},
|
100
|
+
passthrough: {
|
101
|
+
tx,
|
102
|
+
req: permissions.rootRead,
|
103
|
+
},
|
104
|
+
});
|
105
|
+
|
106
|
+
if (multipartUpload == null) {
|
107
|
+
throw new UnauthorizedError();
|
108
|
+
}
|
109
|
+
|
110
|
+
return {
|
111
|
+
uuid,
|
112
|
+
providerCommitData,
|
113
|
+
fileKey: multipartUpload.file_key,
|
114
|
+
uploadId: multipartUpload.upload_id,
|
115
|
+
filename: multipartUpload.filename,
|
116
|
+
fieldName: multipartUpload.field_name,
|
117
|
+
};
|
118
|
+
};
|
119
|
+
|
120
|
+
export default commitUploadAction;
|
@@ -11,11 +11,17 @@ import {
|
|
11
11
|
odataNameToSqlName,
|
12
12
|
sqlNameToODataName,
|
13
13
|
} from '@balena/odata-to-abstract-sql';
|
14
|
+
import type { ConfigLoader } from '../server-glue/module.js';
|
14
15
|
import { errors, permissions } from '../server-glue/module.js';
|
15
16
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
16
17
|
import { TypedError } from 'typed-error';
|
17
18
|
import type { Resolvable } from '../sbvr-api/common-types.js';
|
18
19
|
import { canExecuteTasks } from '../tasks/index.js';
|
20
|
+
import { importSBVR } from '../server-glue/sbvr-loader.js';
|
21
|
+
import type WebresourceModel from './webresource.js';
|
22
|
+
import { isMultipartUploadAvailable } from './multipartUpload.js';
|
23
|
+
import { addAction } from '../sbvr-api/actions.js';
|
24
|
+
import { beginUpload, commitUpload, cancelUpload } from './actions/index.js';
|
19
25
|
|
20
26
|
export * from './handlers/index.js';
|
21
27
|
|
@@ -352,6 +358,13 @@ const throwIfWebresourceNotInMultipart = (
|
|
352
358
|
{ req, request }: HookArgs,
|
353
359
|
) => {
|
354
360
|
if (
|
361
|
+
// root needs to be able to bypass the multipart check as
|
362
|
+
// it needs to pass the direct payload on multipart uploads (on storage provider)
|
363
|
+
req.user !== permissions.root.user &&
|
364
|
+
// This is checking for HTTP multipart form submission/request (e.g. send the actual file via the API)
|
365
|
+
// Not to confuse with multipart uploads
|
366
|
+
// See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Methods/POST#multipart_form_submission
|
367
|
+
// See: https://docs.aws.amazon.com/AmazonS3/latest/userguide/mpuoverview.html
|
355
368
|
!req.is?.('multipart') &&
|
356
369
|
webResourceFields.some((field) => request.values[field] != null)
|
357
370
|
) {
|
@@ -549,3 +562,36 @@ export const setupUploadHooks = (
|
|
549
562
|
getCreateWebResourceHooks(handler),
|
550
563
|
);
|
551
564
|
};
|
565
|
+
|
566
|
+
export const setupUploadActions = (vocab: string, resourceName: string) => {
|
567
|
+
const resource = sqlNameToODataName(resourceName);
|
568
|
+
if (isMultipartUploadAvailable(configuredWebResourceHandler)) {
|
569
|
+
addAction(vocab, resource, 'beginUpload', beginUpload);
|
570
|
+
addAction(vocab, resource, 'commitUpload', commitUpload);
|
571
|
+
addAction(vocab, resource, 'cancelUpload', cancelUpload);
|
572
|
+
}
|
573
|
+
};
|
574
|
+
|
575
|
+
const initSql = `
|
576
|
+
CREATE INDEX IF NOT EXISTS idx_multipart_upload_uuid ON "multipart upload" (uuid);
|
577
|
+
CREATE INDEX IF NOT EXISTS idx_multipart_upload_status ON "multipart upload" (status);
|
578
|
+
`;
|
579
|
+
|
580
|
+
const modelText = await importSBVR('./webresource.sbvr', import.meta);
|
581
|
+
|
582
|
+
declare module '../sbvr-api/sbvr-utils.js' {
|
583
|
+
export interface API {
|
584
|
+
webresource: PinejsClient<WebresourceModel>;
|
585
|
+
}
|
586
|
+
}
|
587
|
+
|
588
|
+
export const config: ConfigLoader.Config = {
|
589
|
+
models: [
|
590
|
+
{
|
591
|
+
modelName: 'webresource',
|
592
|
+
apiRoot: 'webresource',
|
593
|
+
modelText,
|
594
|
+
initSql,
|
595
|
+
},
|
596
|
+
],
|
597
|
+
};
|
@@ -0,0 +1,23 @@
|
|
1
|
+
import { webResource as webResourceEnv } from '../config-loader/env.js';
|
2
|
+
import { NotImplementedError } from '../sbvr-api/errors.js';
|
3
|
+
import type { WebResourceHandler } from './index.js';
|
4
|
+
import { getWebresourceHandler } from './index.js';
|
5
|
+
|
6
|
+
export type MultipartUploadHandler = WebResourceHandler &
|
7
|
+
Required<Pick<WebResourceHandler, 'multipartUpload'>>;
|
8
|
+
|
9
|
+
export const isMultipartUploadAvailable = (
|
10
|
+
handler: WebResourceHandler | undefined,
|
11
|
+
): handler is MultipartUploadHandler => {
|
12
|
+
return (
|
13
|
+
webResourceEnv.multipartUploadEnabled && handler?.multipartUpload != null
|
14
|
+
);
|
15
|
+
};
|
16
|
+
|
17
|
+
export const getMultipartUploadHandler = () => {
|
18
|
+
const handler = getWebresourceHandler();
|
19
|
+
if (!isMultipartUploadAvailable(handler)) {
|
20
|
+
throw new NotImplementedError('Multipart uploads not available');
|
21
|
+
}
|
22
|
+
return handler;
|
23
|
+
};
|
@@ -0,0 +1,60 @@
|
|
1
|
+
Vocabulary: webresource
|
2
|
+
|
3
|
+
Term: actor
|
4
|
+
Concept Type: Integer (Type)
|
5
|
+
Term: expiry date
|
6
|
+
Concept Type: Date Time (Type)
|
7
|
+
Term: uuid
|
8
|
+
Concept Type: Short Text (Type)
|
9
|
+
Term: resource name
|
10
|
+
Concept Type: Short Text (Type)
|
11
|
+
Term: field name
|
12
|
+
Concept Type: Short Text (Type)
|
13
|
+
Term: resource id
|
14
|
+
Concept Type: Integer (Type)
|
15
|
+
Term: upload id
|
16
|
+
Concept Type: Short Text (Type)
|
17
|
+
Term: file key
|
18
|
+
Concept Type: Short Text (Type)
|
19
|
+
Term: status
|
20
|
+
Concept Type: Short Text (Type)
|
21
|
+
Term: filename
|
22
|
+
Concept Type: Short Text (Type)
|
23
|
+
Term: content type
|
24
|
+
Concept Type: Short Text (Type)
|
25
|
+
Term: size
|
26
|
+
Concept Type: Big Integer (Type)
|
27
|
+
Term: chunk size
|
28
|
+
Concept Type: Integer (Type)
|
29
|
+
Term: valid until date
|
30
|
+
Concept Type: Date Time (Type)
|
31
|
+
|
32
|
+
Term: multipart upload
|
33
|
+
Fact type: multipart upload has uuid
|
34
|
+
Necessity: each multipart upload has exactly one uuid
|
35
|
+
Necessity: each uuid is of exactly one multipart upload
|
36
|
+
Fact type: multipart upload has resource name
|
37
|
+
Necessity: each multipart upload has exactly one resource name
|
38
|
+
Fact type: multipart upload has field name
|
39
|
+
Necessity: each multipart upload has exactly one field name
|
40
|
+
Fact type: multipart upload has resource id
|
41
|
+
Necessity: each multipart upload has exactly one resource id
|
42
|
+
Fact type: multipart upload has upload id
|
43
|
+
Necessity: each multipart upload has exactly one upload id
|
44
|
+
Fact type: multipart upload has file key
|
45
|
+
Necessity: each multipart upload has exactly one file key
|
46
|
+
Fact type: multipart upload has status
|
47
|
+
Necessity: each multipart upload has exactly one status
|
48
|
+
Definition: "pending" or "completed" or "cancelled"
|
49
|
+
Fact type: multipart upload has filename
|
50
|
+
Necessity: each multipart upload has exactly one filename
|
51
|
+
Fact type: multipart upload has content type
|
52
|
+
Necessity: each multipart upload has exactly one content type
|
53
|
+
Fact type: multipart upload has size
|
54
|
+
Necessity: each multipart upload has exactly one size
|
55
|
+
Fact type: multipart upload has chunk size
|
56
|
+
Necessity: each multipart upload has exactly one chunk size
|
57
|
+
Fact type: multipart upload has expiry date
|
58
|
+
Necessity: each multipart upload has exactly one expiry date
|
59
|
+
Fact type: multipart upload is created by actor
|
60
|
+
Necessity: each multipart upload is created by at most one actor
|
@@ -0,0 +1,48 @@
|
|
1
|
+
// These types were generated by @balena/abstract-sql-to-typescript v5.1.0
|
2
|
+
|
3
|
+
import type { Types } from '@balena/abstract-sql-to-typescript';
|
4
|
+
|
5
|
+
export interface MultipartUpload {
|
6
|
+
Read: {
|
7
|
+
created_at: Types['Date Time']['Read'];
|
8
|
+
modified_at: Types['Date Time']['Read'];
|
9
|
+
id: Types['Serial']['Read'];
|
10
|
+
uuid: Types['Short Text']['Read'];
|
11
|
+
resource_name: Types['Short Text']['Read'];
|
12
|
+
field_name: Types['Short Text']['Read'];
|
13
|
+
resource_id: Types['Integer']['Read'];
|
14
|
+
upload_id: Types['Short Text']['Read'];
|
15
|
+
file_key: Types['Short Text']['Read'];
|
16
|
+
status: 'pending' | 'completed' | 'cancelled';
|
17
|
+
filename: Types['Short Text']['Read'];
|
18
|
+
content_type: Types['Short Text']['Read'];
|
19
|
+
size: Types['Big Integer']['Read'];
|
20
|
+
chunk_size: Types['Integer']['Read'];
|
21
|
+
expiry_date: Types['Date Time']['Read'];
|
22
|
+
is_created_by__actor: Types['Integer']['Read'] | null;
|
23
|
+
};
|
24
|
+
Write: {
|
25
|
+
created_at: Types['Date Time']['Write'];
|
26
|
+
modified_at: Types['Date Time']['Write'];
|
27
|
+
id: Types['Serial']['Write'];
|
28
|
+
uuid: Types['Short Text']['Write'];
|
29
|
+
resource_name: Types['Short Text']['Write'];
|
30
|
+
field_name: Types['Short Text']['Write'];
|
31
|
+
resource_id: Types['Integer']['Write'];
|
32
|
+
upload_id: Types['Short Text']['Write'];
|
33
|
+
file_key: Types['Short Text']['Write'];
|
34
|
+
status: 'pending' | 'completed' | 'cancelled';
|
35
|
+
filename: Types['Short Text']['Write'];
|
36
|
+
content_type: Types['Short Text']['Write'];
|
37
|
+
size: Types['Big Integer']['Write'];
|
38
|
+
chunk_size: Types['Integer']['Write'];
|
39
|
+
expiry_date: Types['Date Time']['Write'];
|
40
|
+
is_created_by__actor: Types['Integer']['Write'] | null;
|
41
|
+
};
|
42
|
+
}
|
43
|
+
|
44
|
+
export default interface $Model {
|
45
|
+
multipart_upload: MultipartUpload;
|
46
|
+
|
47
|
+
|
48
|
+
}
|