@balena/pinejs 15.3.0-build-web-resource-4-e9954d761c19f484fa794ae2c5e2b6c91c80c2d6-1 → 15.3.0-build-web-resource-4-1ee48ff167bf360ba9dc636c6b28a5c1bf25278e-1
Sign up to get free protection for your applications and to get access to all the features.
- package/.versionbot/CHANGELOG.yml +34 -6
- package/CHANGELOG.md +8 -1
- package/out/config-loader/config-loader.d.ts +1 -1
- package/out/config-loader/config-loader.js +4 -4
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/sbvr-api/hooks.d.ts +3 -0
- package/out/server-glue/module.d.ts +1 -1
- package/out/server-glue/module.js +1 -1
- package/out/server-glue/module.js.map +1 -1
- package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/NoopHandler.d.ts +1 -1
- package/out/webresource-handler/handlers/NoopHandler.js.map +1 -0
- package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/S3Handler.d.ts +1 -1
- package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/S3Handler.js +4 -4
- package/out/webresource-handler/handlers/S3Handler.js.map +1 -0
- package/out/webresource-handler/handlers/index.js.map +1 -0
- package/out/{server-glue/webresource-handler.d.ts → webresource-handler/index.d.ts} +3 -5
- package/out/{server-glue/webresource-handler.js → webresource-handler/index.js} +42 -58
- package/out/webresource-handler/index.js.map +1 -0
- package/package.json +4 -4
- package/src/config-loader/config-loader.ts +7 -9
- package/src/sbvr-api/hooks.ts +1 -1
- package/src/server-glue/module.ts +1 -1
- package/src/{server-glue/webresource-handlers → webresource-handler/handlers}/NoopHandler.ts +1 -5
- package/src/{server-glue/webresource-handlers → webresource-handler/handlers}/S3Handler.ts +2 -2
- package/src/{server-glue/webresource-handler.ts → webresource-handler/index.ts} +59 -73
- package/out/server-glue/webresource-handler.js.map +0 -1
- package/out/server-glue/webresource-handlers/NoopHandler.js.map +0 -1
- package/out/server-glue/webresource-handlers/S3Handler.js.map +0 -1
- package/out/server-glue/webresource-handlers/index.js.map +0 -1
- /package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/NoopHandler.js +0 -0
- /package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/index.d.ts +0 -0
- /package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/index.js +0 -0
- /package/src/{server-glue/webresource-handlers → webresource-handler/handlers}/index.ts +0 -0
@@ -1,6 +1,22 @@
|
|
1
1
|
- commits:
|
2
|
+
- subject: Move all deletion logic into PRERUN hook
|
3
|
+
hash: 1ee48ff167bf360ba9dc636c6b28a5c1bf25278e
|
4
|
+
body: ""
|
5
|
+
footer:
|
6
|
+
Change-type: patch
|
7
|
+
change-type: patch
|
8
|
+
author: Otávio Jacobi
|
9
|
+
nested: []
|
10
|
+
- subject: Move webresources into its own folder
|
11
|
+
hash: 9cd18fd762affea5f501fe883fc634fd5b859132
|
12
|
+
body: ""
|
13
|
+
footer:
|
14
|
+
Change-type: patch
|
15
|
+
change-type: patch
|
16
|
+
author: Otávio Jacobi
|
17
|
+
nested: []
|
2
18
|
- subject: Fix getting model with odata name instead of sql name
|
3
|
-
hash:
|
19
|
+
hash: b780b61967784a93c1d9ada61a6e82444ac68ffd
|
4
20
|
body: ""
|
5
21
|
footer:
|
6
22
|
Change-type: minor
|
@@ -8,7 +24,7 @@
|
|
8
24
|
author: Otávio Jacobi
|
9
25
|
nested: []
|
10
26
|
- subject: Add delete multiple for resources with WebResources
|
11
|
-
hash:
|
27
|
+
hash: 67d0e79bf3bc90a3e4596efa638dcc1aebcd1c2e
|
12
28
|
body: ""
|
13
29
|
footer:
|
14
30
|
Change-type: minor
|
@@ -16,7 +32,7 @@
|
|
16
32
|
author: Otávio Jacobi
|
17
33
|
nested: []
|
18
34
|
- subject: Removes ACL based webresource permissions
|
19
|
-
hash:
|
35
|
+
hash: 0be50a18999476d7f7e13d01bbd89891e8c5d1ab
|
20
36
|
body: ""
|
21
37
|
footer:
|
22
38
|
Change-type: minor
|
@@ -24,7 +40,7 @@
|
|
24
40
|
author: Otávio Jacobi
|
25
41
|
nested: []
|
26
42
|
- subject: Adds WebResource type
|
27
|
-
hash:
|
43
|
+
hash: d759365c1724e51c1cdae74fd779294a4be453ba
|
28
44
|
body: ""
|
29
45
|
footer:
|
30
46
|
Change-type: minor
|
@@ -33,7 +49,7 @@
|
|
33
49
|
nested: []
|
34
50
|
- subject: Integrate beta version of sbvr-types supporting WebResource Update to
|
35
51
|
@balena/open-multer-s3, better large files test
|
36
|
-
hash:
|
52
|
+
hash: 79dc4f5551bf4b176e50476c56d894526deb0c58
|
37
53
|
body: ""
|
38
54
|
footer:
|
39
55
|
Change-type: patch
|
@@ -44,7 +60,19 @@
|
|
44
60
|
nested: []
|
45
61
|
version: 15.3.0
|
46
62
|
title: ""
|
47
|
-
date: 2023-08-
|
63
|
+
date: 2023-08-15T21:49:03.453Z
|
64
|
+
- commits:
|
65
|
+
- subject: Mark that `tx` is always passed to `POSTRUN-ERROR` hooks
|
66
|
+
hash: 29982a40eddb816f25c61ae47b1e6a7433c2f583
|
67
|
+
body: ""
|
68
|
+
footer:
|
69
|
+
Change-type: patch
|
70
|
+
change-type: patch
|
71
|
+
author: Pagan Gazzard
|
72
|
+
nested: []
|
73
|
+
version: 15.2.1
|
74
|
+
title: ""
|
75
|
+
date: 2023-08-14T15:07:28.239Z
|
48
76
|
- commits:
|
49
77
|
- subject: Return a response even when the request resolves to an HTTP error
|
50
78
|
hash: d1d68a068778a617d7b14b12a2657fb44511ee52
|
package/CHANGELOG.md
CHANGED
@@ -5,14 +5,21 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
6
6
|
|
7
7
|
# v15.3.0
|
8
|
-
## (2023-08-
|
8
|
+
## (2023-08-15)
|
9
9
|
|
10
|
+
* Move all deletion logic into PRERUN hook [Otávio Jacobi]
|
11
|
+
* Move webresources into its own folder [Otávio Jacobi]
|
10
12
|
* Fix getting model with odata name instead of sql name [Otávio Jacobi]
|
11
13
|
* Add delete multiple for resources with WebResources [Otávio Jacobi]
|
12
14
|
* Removes ACL based webresource permissions [Otávio Jacobi]
|
13
15
|
* Adds WebResource type [Otávio Jacobi]
|
14
16
|
* Integrate beta version of sbvr-types supporting WebResource Update to @balena/open-multer-s3, better large files test [Ramiro González Maciel]
|
15
17
|
|
18
|
+
# v15.2.1
|
19
|
+
## (2023-08-14)
|
20
|
+
|
21
|
+
* Mark that `tx` is always passed to `POSTRUN-ERROR` hooks [Pagan Gazzard]
|
22
|
+
|
16
23
|
# v15.2.0
|
17
24
|
## (2023-08-02)
|
18
25
|
|
@@ -4,7 +4,7 @@ import type { Database } from '../database-layer/db';
|
|
4
4
|
import type { Dictionary, Resolvable } from '../sbvr-api/common-types';
|
5
5
|
import { Migrations } from '../migrator/utils';
|
6
6
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
7
|
-
import { WebResourceHandler } from '../
|
7
|
+
import { WebResourceHandler } from '../webresource-handler';
|
8
8
|
import { AliasValidNodeType } from '../sbvr-api/translations';
|
9
9
|
export type SetupFunction = (app: Express.Application, sbvrUtilsInstance: typeof sbvrUtils, db: Database) => Resolvable<void>;
|
10
10
|
export interface Model {
|
@@ -7,7 +7,7 @@ const _ = require("lodash");
|
|
7
7
|
const path = require("path");
|
8
8
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
9
9
|
const permissions = require("../sbvr-api/permissions");
|
10
|
-
const webresource_handler_1 = require("../
|
10
|
+
const webresource_handler_1 = require("../webresource-handler");
|
11
11
|
const getOrCreate = async (authApiTx, resource, uniqueFields, extraFields) => {
|
12
12
|
const result = (await authApiTx.get({
|
13
13
|
resource,
|
@@ -108,11 +108,11 @@ const setup = (app) => {
|
|
108
108
|
.patch(fileUploadMiddleware, sbvrUtils.handleODataRequest)
|
109
109
|
.merge(sbvrUtils.handleODataRequest)
|
110
110
|
.delete(sbvrUtils.handleODataRequest);
|
111
|
-
app.options(apiRoute, (_req, res) => res.status(200).end());
|
112
111
|
const loadedModel = sbvrUtils.getModel(model.apiRoot);
|
113
112
|
if (translateTo == null) {
|
114
|
-
const
|
115
|
-
|
113
|
+
const resourceNames = Object.values(loadedModel.abstractSql.tables)
|
114
|
+
.filter((table) => table.fields.some((f) => f.dataType === 'WebResource'))
|
115
|
+
.map((table) => table.name);
|
116
116
|
for (const resource of new Set(resourceNames)) {
|
117
117
|
(0, webresource_handler_1.setupUploadHooks)(webResourceHandler, model.apiRoot, resource);
|
118
118
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config-loader/config-loader.ts"],"names":[],"mappings":";;;AAaA,6CAO2B;AAE3B,yBAAyB;AACzB,4BAA4B;AAC5B,6BAA6B;AAE7B,oDAAoD;AAEpD,uDAAuD;AACvD,
|
1
|
+
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config-loader/config-loader.ts"],"names":[],"mappings":"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"}
|
package/out/sbvr-api/hooks.d.ts
CHANGED
@@ -39,6 +39,7 @@ export interface Hooks {
|
|
39
39
|
response: Response;
|
40
40
|
}) => HookResponse;
|
41
41
|
'POSTRUN-ERROR'?: (options: HookArgs & {
|
42
|
+
tx: Tx;
|
42
43
|
error: TypedError | any;
|
43
44
|
}) => HookResponse;
|
44
45
|
}
|
@@ -99,6 +100,7 @@ export declare const addHook: (method: keyof typeof apiHooks, vocabulary: string
|
|
99
100
|
response: Response;
|
100
101
|
}) => HookResponse> | undefined;
|
101
102
|
'POSTRUN-ERROR'?: HookBlueprint<(options: HookArgs & {
|
103
|
+
tx: Tx;
|
102
104
|
error: TypedError | any;
|
103
105
|
}) => HookResponse> | undefined;
|
104
106
|
} | ({
|
@@ -117,6 +119,7 @@ export declare const addHook: (method: keyof typeof apiHooks, vocabulary: string
|
|
117
119
|
response: Response;
|
118
120
|
}) => HookResponse) | undefined;
|
119
121
|
'POSTRUN-ERROR'?: ((options: HookArgs & {
|
122
|
+
tx: Tx;
|
120
123
|
error: TypedError | any;
|
121
124
|
}) => HookResponse) | undefined;
|
122
125
|
} & {
|
@@ -12,7 +12,7 @@ export * as errors from '../sbvr-api/errors';
|
|
12
12
|
export * as env from '../config-loader/env';
|
13
13
|
export * as types from '../sbvr-api/common-types';
|
14
14
|
export * as hooks from '../sbvr-api/hooks';
|
15
|
-
export * as webResourceHandler from '
|
15
|
+
export * as webResourceHandler from '../webresource-handler';
|
16
16
|
export type { configLoader as ConfigLoader };
|
17
17
|
export type { migratorUtils as Migrator };
|
18
18
|
declare let envDatabaseOptions: dbModule.DatabaseOptions<string>;
|
@@ -16,7 +16,7 @@ exports.errors = require("../sbvr-api/errors");
|
|
16
16
|
exports.env = require("../config-loader/env");
|
17
17
|
exports.types = require("../sbvr-api/common-types");
|
18
18
|
exports.hooks = require("../sbvr-api/hooks");
|
19
|
-
exports.webResourceHandler = require("
|
19
|
+
exports.webResourceHandler = require("../webresource-handler");
|
20
20
|
let envDatabaseOptions;
|
21
21
|
if (dbModule.engines.websql != null) {
|
22
22
|
envDatabaseOptions = {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/server-glue/module.ts"],"names":[],"mappings":";;;AAEA,yBAAuB;AAEvB,iDAAiD;AACjD,+DAA+D;AAC/D,6CAA6C;AAG7C,oDAAoD;AACpD,8CAA4D;AAE5D,mDAAiD;AACjD,qFAAkF;AAAzE,0HAAA,kBAAkB,OAAA;AAC3B,sDAAoD;AACpD,yDAAuD;AACvD,+CAA6C;AAC7C,8CAA4C;AAC5C,oDAAkD;AAClD,6CAA2C;AAC3C
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/server-glue/module.ts"],"names":[],"mappings":";;;AAEA,yBAAuB;AAEvB,iDAAiD;AACjD,+DAA+D;AAC/D,6CAA6C;AAG7C,oDAAoD;AACpD,8CAA4D;AAE5D,mDAAiD;AACjD,qFAAkF;AAAzE,0HAAA,kBAAkB,OAAA;AAC3B,sDAAoD;AACpD,yDAAuD;AACvD,+CAA6C;AAC7C,8CAA4C;AAC5C,oDAAkD;AAClD,6CAA2C;AAC3C,+DAA6D;AAI7D,IAAI,kBAAoD,CAAC;AACzD,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE;IACpC,kBAAkB,GAAG;QACpB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,YAAY;KACpB,CAAC;CACF;KAAM;IACN,IAAI,WAAmB,CAAC;IACxB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;QAC7B,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;KACvC;SAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,EAAE;QAC7C,WAAW,GAAG,+CAA+C,CAAC;KAC9D;SAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;QAC1C,WAAW,GAAG,gCAAgC,CAAC;KAC/C;SAAM;QACN,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;KAC3D;IACD,kBAAkB,GAAG;QACpB,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,EAAE,WAAW;KACnB,CAAC;CACF;AAEM,MAAM,IAAI,GAAG,KAAK,EACxB,GAAwB,EACxB,MAAqC,EACrC,kBAE+B,kBAAkB,EACA,EAAE;IACnD,IAAI;QACH,MAAM,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAE7C,QAAQ,CAAC,gCAAgC,CACxC,0BAAoB,CAAC,YAAY,EACjC,0BAAoB,CAAC,WAAW,CAChC,CAAC;QACF,MAAM,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAyB,EAAE,CAAC;QAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;YACpC,MAAM,UAAU,GAAG,2CAAa,4BAA4B,EAAC,CAAC;YAC9D,MAAM,YAAY,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAC;YAClE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YACvD,QAAQ,CAAC,IAAI,CACZ,SAAS;iBACP,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC;iBAC/B,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAChD,CAAC;SACF;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE;YACxC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;SACvD;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,SAAS,CAAC;KACjB;IAAC,OAAO,GAAQ,EAAE;QAClB,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;QAChD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;AACF,CAAC,CAAC;AAvCW,QAAA,IAAI,QAuCf"}
|
package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/NoopHandler.d.ts
RENAMED
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
2
|
-
import { IncomingFile, UploadResponse, WebResourceHandler } from '
|
2
|
+
import { IncomingFile, UploadResponse, WebResourceHandler } from '..';
|
3
3
|
export declare class NoopHandler implements WebResourceHandler {
|
4
4
|
handleFile(resource: IncomingFile): Promise<UploadResponse>;
|
5
5
|
removeFile(_fileReference: string): Promise<void>;
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"NoopHandler.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/NoopHandler.ts"],"names":[],"mappings":";;;AAGA,MAAa,WAAW;IAChB,KAAK,CAAC,UAAU,CAAC,QAAsB;QAE7C,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,OAAO;YACN,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,CAAC;SACP,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,cAAsB;QAC7C,OAAO;IACR,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,WAAwB;QACjD,OAAO,WAAW,CAAC;IACpB,CAAC;CACD;AAjBD,kCAiBC"}
|
package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/S3Handler.d.ts
RENAMED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { IncomingFile, UploadResponse, WebResourceHandler } from '
|
1
|
+
import { IncomingFile, UploadResponse, WebResourceHandler } from '..';
|
2
2
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
3
3
|
export interface S3HandlerProps {
|
4
4
|
region: string;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.S3Handler = void 0;
|
4
|
-
const
|
4
|
+
const __1 = require("..");
|
5
5
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
6
6
|
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
7
7
|
const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
|
@@ -52,9 +52,9 @@ class S3Handler {
|
|
52
52
|
catch (err) {
|
53
53
|
resource.stream.resume();
|
54
54
|
if (size > this.maxFileSize) {
|
55
|
-
throw new
|
55
|
+
throw new __1.FileSizeExceededError(this.maxFileSize);
|
56
56
|
}
|
57
|
-
throw new
|
57
|
+
throw new __1.WebResourceError(err);
|
58
58
|
}
|
59
59
|
const filename = this.getS3URL(key);
|
60
60
|
return { size, filename };
|
@@ -85,7 +85,7 @@ class S3Handler {
|
|
85
85
|
return `${this.config.endpoint}/${this.bucket}/${key}`;
|
86
86
|
}
|
87
87
|
getKeyFromHref(href) {
|
88
|
-
const hrefWithoutParams = (0,
|
88
|
+
const hrefWithoutParams = (0, __1.normalizeHref)(href);
|
89
89
|
return hrefWithoutParams.substring(hrefWithoutParams.lastIndexOf('/') + 1);
|
90
90
|
}
|
91
91
|
}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/S3Handler.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,8CAA4B"}
|
@@ -2,7 +2,8 @@
|
|
2
2
|
import type * as Express from 'express';
|
3
3
|
import * as stream from 'stream';
|
4
4
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
5
|
-
|
5
|
+
import { TypedError } from 'typed-error';
|
6
|
+
export * from './handlers';
|
6
7
|
export interface IncomingFile {
|
7
8
|
fieldname: string;
|
8
9
|
originalname: string;
|
@@ -19,10 +20,7 @@ export interface WebResourceHandler {
|
|
19
20
|
removeFile: (fileReference: string) => Promise<void>;
|
20
21
|
onPreRespond: (webResource: WebResource) => Promise<WebResource>;
|
21
22
|
}
|
22
|
-
export declare class WebResourceError extends
|
23
|
-
name: string;
|
24
|
-
constructor(message: string, originalError?: Error);
|
25
|
-
originalError?: Error;
|
23
|
+
export declare class WebResourceError extends TypedError {
|
26
24
|
}
|
27
25
|
export declare class FileSizeExceededError extends WebResourceError {
|
28
26
|
name: string;
|
@@ -21,18 +21,12 @@ const uriParser = require("../sbvr-api/uri-parser");
|
|
21
21
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
22
22
|
const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
|
23
23
|
const permissions_1 = require("../sbvr-api/permissions");
|
24
|
-
const NoopHandler_1 = require("./
|
24
|
+
const NoopHandler_1 = require("./handlers/NoopHandler");
|
25
25
|
const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
|
26
|
-
const module_1 = require("
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
super(message);
|
31
|
-
this.name = 'WebResourceError';
|
32
|
-
if (originalError) {
|
33
|
-
this.originalError = originalError;
|
34
|
-
}
|
35
|
-
}
|
26
|
+
const module_1 = require("../server-glue/module");
|
27
|
+
const typed_error_1 = require("typed-error");
|
28
|
+
__exportStar(require("./handlers"), exports);
|
29
|
+
class WebResourceError extends typed_error_1.TypedError {
|
36
30
|
}
|
37
31
|
exports.WebResourceError = WebResourceError;
|
38
32
|
class FileSizeExceededError extends WebResourceError {
|
@@ -70,12 +64,7 @@ const isFileInValidPath = async (fieldname, req) => {
|
|
70
64
|
const sqlResourceName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(resourceName);
|
71
65
|
const fields = model.abstractSql.tables[sqlResourceName].fields;
|
72
66
|
const dbFieldName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(fieldname);
|
73
|
-
|
74
|
-
if (field.fieldName === dbFieldName && field.dataType === 'WebResource') {
|
75
|
-
return true;
|
76
|
-
}
|
77
|
-
}
|
78
|
-
return false;
|
67
|
+
return fields.some((field) => field.fieldName === dbFieldName && field.dataType === 'WebResource');
|
79
68
|
};
|
80
69
|
const getUploaderMiddlware = (handler) => {
|
81
70
|
return async (req, res, next) => {
|
@@ -91,12 +80,15 @@ const getUploaderMiddlware = (handler) => {
|
|
91
80
|
req.on('readable', req.read.bind(req));
|
92
81
|
bb.removeAllListeners();
|
93
82
|
};
|
94
|
-
const clearFiles = () => {
|
83
|
+
const clearFiles = async () => {
|
95
84
|
isAborting = true;
|
96
85
|
const deletions = uploadedFilePaths.map((file) => handler.removeFile(file));
|
97
|
-
|
86
|
+
try {
|
87
|
+
return await Promise.all(deletions);
|
88
|
+
}
|
89
|
+
catch (err) {
|
98
90
|
getLogger((0, sbvr_utils_1.getApiRoot)(req)).error('Error deleting file', err);
|
99
|
-
}
|
91
|
+
}
|
100
92
|
};
|
101
93
|
bb.on('file', async (fieldname, filestream, info) => {
|
102
94
|
if (!isAborting && (await isFileInValidPath(fieldname, req))) {
|
@@ -150,15 +142,12 @@ const getUploaderMiddlware = (handler) => {
|
|
150
142
|
};
|
151
143
|
};
|
152
144
|
exports.getUploaderMiddlware = getUploaderMiddlware;
|
153
|
-
const getWebResourceFields = (
|
154
|
-
const sqlResourceName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(resourceName);
|
155
|
-
const model =
|
145
|
+
const getWebResourceFields = (request, useTranslations = true) => {
|
146
|
+
const sqlResourceName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(request.resourceName);
|
147
|
+
const model = sbvrUtils.getAbstractSqlModel(request).tables[sqlResourceName];
|
156
148
|
const fields = useTranslations
|
157
|
-
? model
|
158
|
-
: model
|
159
|
-
if (fields == null) {
|
160
|
-
return [];
|
161
|
-
}
|
149
|
+
? model.modifyFields ?? model.fields
|
150
|
+
: model.fields;
|
162
151
|
return fields
|
163
152
|
.filter((f) => f.dataType === 'WebResource')
|
164
153
|
.map((f) => (0, odata_to_abstract_sql_1.sqlNameToODataName)(f.fieldName));
|
@@ -167,7 +156,7 @@ const deleteFiles = async (keysToDelete, webResourceHandler) => {
|
|
167
156
|
const promises = keysToDelete.map((r) => webResourceHandler.removeFile(r));
|
168
157
|
await Promise.all(promises);
|
169
158
|
};
|
170
|
-
const
|
159
|
+
const getCreateWebResourceHooks = (webResourceHandler) => {
|
171
160
|
return {
|
172
161
|
'POSTRUN-ERROR': async ({ tx, request }) => {
|
173
162
|
tx?.on('rollback', () => {
|
@@ -176,7 +165,7 @@ const getCreateWebResourceHook = (webResourceHandler) => {
|
|
176
165
|
},
|
177
166
|
};
|
178
167
|
};
|
179
|
-
const
|
168
|
+
const getReadWebResourceHooks = (webResourceHandler) => {
|
180
169
|
return {
|
181
170
|
PRERESPOND: async ({ request, response }) => {
|
182
171
|
const fields = getWebResourceFields(request, false);
|
@@ -208,22 +197,27 @@ const normalizeHref = (href) => {
|
|
208
197
|
return href.split('?')[0];
|
209
198
|
};
|
210
199
|
exports.normalizeHref = normalizeHref;
|
211
|
-
const
|
200
|
+
const getRemoveWebResourceHooks = (webResourceHandler) => {
|
212
201
|
return {
|
213
202
|
PRERUN: async (args) => {
|
214
|
-
const { api, request } = args;
|
203
|
+
const { api, request, tx } = args;
|
215
204
|
let fields = getWebResourceFields(request);
|
205
|
+
tx.on('rollback', () => {
|
206
|
+
deleteRollbackPendingFields(request, webResourceHandler);
|
207
|
+
});
|
216
208
|
if (request.method === 'PATCH') {
|
217
|
-
|
218
|
-
.filter(([
|
209
|
+
fields = Object.entries(request.values)
|
210
|
+
.filter(([key, value]) => value !== undefined && fields.includes(key))
|
219
211
|
.map(([key]) => key);
|
220
|
-
fields = fields.filter((f) => allFields.includes(f));
|
221
212
|
}
|
222
213
|
if (fields.length === 0) {
|
223
214
|
return;
|
224
215
|
}
|
225
216
|
if (request.method === 'PATCH' && request.odataQuery?.key == null) {
|
226
|
-
|
217
|
+
const filesToDelete = fields.map((field) => request.values[field].href);
|
218
|
+
tx.on('end', () => {
|
219
|
+
deletePendingFiles(filesToDelete, request, webResourceHandler);
|
220
|
+
});
|
227
221
|
throw new module_1.errors.BadRequestError('WebResources can only be updated when providing a resource key.');
|
228
222
|
}
|
229
223
|
const ids = await sbvrUtils.getAffectedIds(args);
|
@@ -245,20 +239,8 @@ const getRemoveWebResourceHook = (webResourceHandler) => {
|
|
245
239
|
},
|
246
240
|
},
|
247
241
|
}));
|
248
|
-
request.custom.$pineWebResourcesToDelete =
|
249
|
-
getWebResourcesHrefs(webResources);
|
250
|
-
},
|
251
|
-
POSTRUN: ({ tx, request }) => {
|
252
242
|
tx.on('end', () => {
|
253
|
-
|
254
|
-
});
|
255
|
-
},
|
256
|
-
'POSTRUN-ERROR': ({ request, tx }) => {
|
257
|
-
tx?.on('end', () => {
|
258
|
-
deleteRequestPendingFiles(request, webResourceHandler);
|
259
|
-
});
|
260
|
-
tx?.on('rollback', () => {
|
261
|
-
deleteRollbackPendingFields(request, webResourceHandler);
|
243
|
+
deletePendingFiles(getWebResourcesHrefs(webResources), request, webResourceHandler);
|
262
244
|
});
|
263
245
|
},
|
264
246
|
};
|
@@ -273,21 +255,23 @@ const deleteRollbackPendingFields = async (request, webResourceHandler) => {
|
|
273
255
|
.filter(isDefined);
|
274
256
|
await deleteFiles(keysToDelete, webResourceHandler);
|
275
257
|
};
|
276
|
-
const
|
277
|
-
|
278
|
-
|
258
|
+
const deletePendingFiles = (keysToDelete, request, webResourceHandler) => {
|
259
|
+
try {
|
260
|
+
deleteFiles(keysToDelete, webResourceHandler);
|
261
|
+
}
|
262
|
+
catch (err) {
|
279
263
|
getLogger(request.vocabulary).error(`Failed to delete pending files`, err);
|
280
|
-
}
|
264
|
+
}
|
281
265
|
};
|
282
266
|
const getDefaultHandler = () => {
|
283
267
|
return new NoopHandler_1.NoopHandler();
|
284
268
|
};
|
285
269
|
exports.getDefaultHandler = getDefaultHandler;
|
286
270
|
const setupUploadHooks = (handler, apiRoot, resourceName) => {
|
287
|
-
sbvrUtils.addPureHook('DELETE', apiRoot, resourceName,
|
288
|
-
sbvrUtils.addPureHook('PATCH', apiRoot, resourceName,
|
289
|
-
sbvrUtils.addPureHook('POST', apiRoot, resourceName,
|
290
|
-
sbvrUtils.addPureHook('GET', apiRoot, resourceName,
|
271
|
+
sbvrUtils.addPureHook('DELETE', apiRoot, resourceName, getRemoveWebResourceHooks(handler));
|
272
|
+
sbvrUtils.addPureHook('PATCH', apiRoot, resourceName, getRemoveWebResourceHooks(handler));
|
273
|
+
sbvrUtils.addPureHook('POST', apiRoot, resourceName, getCreateWebResourceHooks(handler));
|
274
|
+
sbvrUtils.addPureHook('GET', apiRoot, resourceName, getReadWebResourceHooks(handler));
|
291
275
|
};
|
292
276
|
exports.setupUploadHooks = setupUploadHooks;
|
293
|
-
//# sourceMappingURL=
|
277
|
+
//# sourceMappingURL=index.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/webresource-handler/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@balena/pinejs",
|
3
|
-
"version": "15.3.0-build-web-resource-4-
|
3
|
+
"version": "15.3.0-build-web-resource-4-1ee48ff167bf360ba9dc636c6b28a5c1bf25278e-1",
|
4
4
|
"main": "out/server-glue/module",
|
5
5
|
"repository": "git@github.com:balena-io/pinejs.git",
|
6
6
|
"license": "Apache-2.0",
|
@@ -60,7 +60,7 @@
|
|
60
60
|
"pinejs-client-core": "^6.13.0",
|
61
61
|
"randomstring": "^1.2.3",
|
62
62
|
"type-is": "^1.6.18",
|
63
|
-
"typed-error": "^3.2.
|
63
|
+
"typed-error": "^3.2.2"
|
64
64
|
},
|
65
65
|
"devDependencies": {
|
66
66
|
"@balena/lint": "^6.2.2",
|
@@ -75,7 +75,7 @@
|
|
75
75
|
"@types/supertest": "^2.0.12",
|
76
76
|
"@types/terser-webpack-plugin": "^5.2.0",
|
77
77
|
"@types/type-is": "^1.6.3",
|
78
|
-
"@types/webpack": "^5.28.
|
78
|
+
"@types/webpack": "^5.28.1",
|
79
79
|
"chai": "^4.3.7",
|
80
80
|
"grunt": "^1.6.1",
|
81
81
|
"grunt-check-dependencies": "^1.0.0",
|
@@ -144,6 +144,6 @@
|
|
144
144
|
"recursive": true
|
145
145
|
},
|
146
146
|
"versionist": {
|
147
|
-
"publishedAt": "2023-08-
|
147
|
+
"publishedAt": "2023-08-15T21:49:04.494Z"
|
148
148
|
}
|
149
149
|
}
|
@@ -32,7 +32,7 @@ import {
|
|
32
32
|
getUploaderMiddlware,
|
33
33
|
WebResourceHandler,
|
34
34
|
setupUploadHooks,
|
35
|
-
} from '../
|
35
|
+
} from '../webresource-handler';
|
36
36
|
import { AliasValidNodeType } from '../sbvr-api/translations';
|
37
37
|
|
38
38
|
export type SetupFunction = (
|
@@ -216,19 +216,17 @@ export const setup = (app: Express.Application) => {
|
|
216
216
|
.patch(fileUploadMiddleware, sbvrUtils.handleODataRequest)
|
217
217
|
.merge(sbvrUtils.handleODataRequest)
|
218
218
|
.delete(sbvrUtils.handleODataRequest);
|
219
|
-
app.options(apiRoute, (_req, res) => res.status(200).end());
|
220
219
|
|
221
220
|
const loadedModel = sbvrUtils.getModel(model.apiRoot!);
|
222
221
|
if (translateTo == null) {
|
223
|
-
const
|
222
|
+
const resourceNames = Object.values(
|
224
223
|
loadedModel.abstractSql.tables,
|
225
|
-
)
|
226
|
-
|
227
|
-
|
224
|
+
)
|
225
|
+
.filter((table) =>
|
226
|
+
table.fields.some((f) => f.dataType === 'WebResource'),
|
227
|
+
)
|
228
|
+
.map((table) => table.name);
|
228
229
|
|
229
|
-
const resourceNames = resources.map(
|
230
|
-
([r, _table]) => loadedModel.abstractSql.tables[r].name,
|
231
|
-
);
|
232
230
|
for (const resource of new Set(resourceNames)) {
|
233
231
|
setupUploadHooks(webResourceHandler, model.apiRoot!, resource);
|
234
232
|
}
|
package/src/sbvr-api/hooks.ts
CHANGED
@@ -55,7 +55,7 @@ export interface Hooks {
|
|
55
55
|
) => HookResponse;
|
56
56
|
/** These are run in reverse translation order from newest to oldest */
|
57
57
|
'POSTRUN-ERROR'?: (
|
58
|
-
options: HookArgs & { error: TypedError | any },
|
58
|
+
options: HookArgs & { tx: Tx; error: TypedError | any },
|
59
59
|
) => HookResponse;
|
60
60
|
}
|
61
61
|
export type HookBlueprints = {
|
@@ -18,7 +18,7 @@ export * as errors from '../sbvr-api/errors';
|
|
18
18
|
export * as env from '../config-loader/env';
|
19
19
|
export * as types from '../sbvr-api/common-types';
|
20
20
|
export * as hooks from '../sbvr-api/hooks';
|
21
|
-
export * as webResourceHandler from '
|
21
|
+
export * as webResourceHandler from '../webresource-handler';
|
22
22
|
export type { configLoader as ConfigLoader };
|
23
23
|
export type { migratorUtils as Migrator };
|
24
24
|
|
package/src/{server-glue/webresource-handlers → webresource-handler/handlers}/NoopHandler.ts
RENAMED
@@ -1,9 +1,5 @@
|
|
1
1
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
2
|
-
import {
|
3
|
-
IncomingFile,
|
4
|
-
UploadResponse,
|
5
|
-
WebResourceHandler,
|
6
|
-
} from '../webresource-handler';
|
2
|
+
import { IncomingFile, UploadResponse, WebResourceHandler } from '..';
|
7
3
|
|
8
4
|
export class NoopHandler implements WebResourceHandler {
|
9
5
|
public async handleFile(resource: IncomingFile): Promise<UploadResponse> {
|
@@ -5,7 +5,7 @@ import {
|
|
5
5
|
UploadResponse,
|
6
6
|
WebResourceError,
|
7
7
|
WebResourceHandler,
|
8
|
-
} from '
|
8
|
+
} from '..';
|
9
9
|
import {
|
10
10
|
S3Client,
|
11
11
|
S3ClientConfig,
|
@@ -96,7 +96,7 @@ export class S3Handler implements WebResourceHandler {
|
|
96
96
|
if (size > this.maxFileSize) {
|
97
97
|
throw new FileSizeExceededError(this.maxFileSize);
|
98
98
|
}
|
99
|
-
throw new WebResourceError(
|
99
|
+
throw new WebResourceError(err);
|
100
100
|
}
|
101
101
|
|
102
102
|
const filename = this.getS3URL(key);
|
@@ -6,15 +6,16 @@ import * as uriParser from '../sbvr-api/uri-parser';
|
|
6
6
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
7
7
|
import { getApiRoot, getModel } from '../sbvr-api/sbvr-utils';
|
8
8
|
import { checkPermissions } from '../sbvr-api/permissions';
|
9
|
-
import { NoopHandler } from './
|
9
|
+
import { NoopHandler } from './handlers/NoopHandler';
|
10
10
|
import {
|
11
11
|
odataNameToSqlName,
|
12
12
|
sqlNameToODataName,
|
13
13
|
} from '@balena/odata-to-abstract-sql';
|
14
|
-
import { errors, permissions } from '
|
14
|
+
import { errors, permissions } from '../server-glue/module';
|
15
15
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
16
|
+
import { TypedError } from 'typed-error';
|
16
17
|
|
17
|
-
export * from './
|
18
|
+
export * from './handlers';
|
18
19
|
|
19
20
|
export interface IncomingFile {
|
20
21
|
fieldname: string;
|
@@ -35,18 +36,7 @@ export interface WebResourceHandler {
|
|
35
36
|
onPreRespond: (webResource: WebResource) => Promise<WebResource>;
|
36
37
|
}
|
37
38
|
|
38
|
-
export class WebResourceError extends
|
39
|
-
name = 'WebResourceError';
|
40
|
-
constructor(message: string, originalError?: Error) {
|
41
|
-
super(message);
|
42
|
-
|
43
|
-
if (originalError) {
|
44
|
-
this.originalError = originalError;
|
45
|
-
}
|
46
|
-
}
|
47
|
-
|
48
|
-
originalError?: Error;
|
49
|
-
}
|
39
|
+
export class WebResourceError extends TypedError {}
|
50
40
|
|
51
41
|
export class FileSizeExceededError extends WebResourceError {
|
52
42
|
name = 'FileSizeExceededError';
|
@@ -100,13 +90,10 @@ const isFileInValidPath = async (
|
|
100
90
|
const sqlResourceName = odataNameToSqlName(resourceName);
|
101
91
|
const fields = model.abstractSql.tables[sqlResourceName].fields;
|
102
92
|
const dbFieldName = odataNameToSqlName(fieldname);
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
}
|
108
|
-
|
109
|
-
return false;
|
93
|
+
return fields.some(
|
94
|
+
(field) =>
|
95
|
+
field.fieldName === dbFieldName && field.dataType === 'WebResource',
|
96
|
+
);
|
110
97
|
};
|
111
98
|
|
112
99
|
export const getUploaderMiddlware = (
|
@@ -128,15 +115,17 @@ export const getUploaderMiddlware = (
|
|
128
115
|
bb.removeAllListeners();
|
129
116
|
};
|
130
117
|
|
131
|
-
const clearFiles = () => {
|
118
|
+
const clearFiles = async () => {
|
132
119
|
isAborting = true;
|
133
120
|
const deletions = uploadedFilePaths.map((file) =>
|
134
121
|
handler.removeFile(file),
|
135
122
|
);
|
136
123
|
// Best effort: We try to remove all uploaded files, but if this fails, there is not much to do
|
137
|
-
|
124
|
+
try {
|
125
|
+
return await Promise.all(deletions);
|
126
|
+
} catch (err) {
|
138
127
|
getLogger(getApiRoot(req)).error('Error deleting file', err);
|
139
|
-
}
|
128
|
+
}
|
140
129
|
};
|
141
130
|
|
142
131
|
bb.on('file', async (fieldname, filestream, info) => {
|
@@ -202,22 +191,18 @@ export const getUploaderMiddlware = (
|
|
202
191
|
};
|
203
192
|
|
204
193
|
const getWebResourceFields = (
|
205
|
-
|
194
|
+
request: uriParser.ODataRequest,
|
206
195
|
useTranslations = true,
|
207
196
|
): string[] => {
|
208
197
|
// Translations will use modifyFields(translated) rather than fields(original) so we need to
|
209
198
|
// account for it while finding if a webresrouce field was changed
|
210
199
|
// there are cases where we need to get the original resource name (not translated)
|
211
200
|
// therefore we can use useTranslations = false
|
212
|
-
const sqlResourceName = odataNameToSqlName(resourceName);
|
213
|
-
const model =
|
201
|
+
const sqlResourceName = odataNameToSqlName(request.resourceName);
|
202
|
+
const model = sbvrUtils.getAbstractSqlModel(request).tables[sqlResourceName];
|
214
203
|
const fields = useTranslations
|
215
|
-
? model
|
216
|
-
: model
|
217
|
-
|
218
|
-
if (fields == null) {
|
219
|
-
return [];
|
220
|
-
}
|
204
|
+
? model.modifyFields ?? model.fields
|
205
|
+
: model.fields;
|
221
206
|
|
222
207
|
return fields
|
223
208
|
.filter((f) => f.dataType === 'WebResource')
|
@@ -232,17 +217,21 @@ const deleteFiles = async (
|
|
232
217
|
await Promise.all(promises);
|
233
218
|
};
|
234
219
|
|
235
|
-
const
|
220
|
+
const getCreateWebResourceHooks = (
|
221
|
+
webResourceHandler: WebResourceHandler,
|
222
|
+
): sbvrUtils.Hooks => {
|
236
223
|
return {
|
237
224
|
'POSTRUN-ERROR': async ({ tx, request }) => {
|
238
225
|
tx?.on('rollback', () => {
|
239
226
|
deleteRollbackPendingFields(request, webResourceHandler);
|
240
227
|
});
|
241
228
|
},
|
242
|
-
}
|
229
|
+
};
|
243
230
|
};
|
244
231
|
|
245
|
-
const
|
232
|
+
const getReadWebResourceHooks = (
|
233
|
+
webResourceHandler: WebResourceHandler,
|
234
|
+
): sbvrUtils.Hooks => {
|
246
235
|
return {
|
247
236
|
// Before returning a web resource we might need to do some modifications on the payload (e.g. presigning)
|
248
237
|
PRERESPOND: async ({ request, response }) => {
|
@@ -268,7 +257,7 @@ const getReadWebResourceHook = (webResourceHandler: WebResourceHandler) => {
|
|
268
257
|
response.body.d = transformedItems;
|
269
258
|
}
|
270
259
|
},
|
271
|
-
}
|
260
|
+
};
|
272
261
|
};
|
273
262
|
|
274
263
|
const isDefined = <T>(x: T | undefined | null): x is T => x != null;
|
@@ -288,19 +277,23 @@ export const normalizeHref = (href: string) => {
|
|
288
277
|
return href.split('?')[0];
|
289
278
|
};
|
290
279
|
|
291
|
-
const
|
280
|
+
const getRemoveWebResourceHooks = (
|
292
281
|
webResourceHandler: WebResourceHandler,
|
293
282
|
): sbvrUtils.Hooks => {
|
294
283
|
return {
|
295
284
|
PRERUN: async (args) => {
|
296
|
-
const { api, request } = args;
|
285
|
+
const { api, request, tx } = args;
|
297
286
|
let fields = getWebResourceFields(request);
|
298
287
|
|
288
|
+
// Request failed on DB roundtrip (e.g. DB constraint) and pending files need to be deleted
|
289
|
+
tx.on('rollback', () => {
|
290
|
+
deleteRollbackPendingFields(request, webResourceHandler);
|
291
|
+
});
|
292
|
+
|
299
293
|
if (request.method === 'PATCH') {
|
300
|
-
|
301
|
-
.filter(([
|
294
|
+
fields = Object.entries(request.values)
|
295
|
+
.filter(([key, value]) => value !== undefined && fields.includes(key))
|
302
296
|
.map(([key]) => key);
|
303
|
-
fields = fields.filter((f) => allFields.includes(f));
|
304
297
|
}
|
305
298
|
|
306
299
|
if (fields.length === 0) {
|
@@ -311,9 +304,13 @@ const getRemoveWebResourceHook = (
|
|
311
304
|
// request is actually modifying a webresource before erroring out
|
312
305
|
if (request.method === 'PATCH' && request.odataQuery?.key == null) {
|
313
306
|
// When we get here, files have already been uploaded. We need to mark them for deletion.
|
314
|
-
|
315
|
-
|
316
|
-
|
307
|
+
const filesToDelete = fields.map((field) => request.values[field].href);
|
308
|
+
|
309
|
+
// Set deletion of files on the wire as request will throw
|
310
|
+
tx.on('end', () => {
|
311
|
+
deletePendingFiles(filesToDelete, request, webResourceHandler);
|
312
|
+
});
|
313
|
+
|
317
314
|
throw new errors.BadRequestError(
|
318
315
|
'WebResources can only be updated when providing a resource key.',
|
319
316
|
);
|
@@ -341,26 +338,13 @@ const getRemoveWebResourceHook = (
|
|
341
338
|
},
|
342
339
|
})) as WebResourcesDbResponse[] | undefined | null;
|
343
340
|
|
344
|
-
//
|
345
|
-
request.custom.$pineWebResourcesToDelete =
|
346
|
-
getWebResourcesHrefs(webResources);
|
347
|
-
},
|
348
|
-
POSTRUN: ({ tx, request }) => {
|
349
|
-
// Successfully patched or deleted resources
|
341
|
+
// Deletes previous stored resources in case they were patched or the whole entity was deleted
|
350
342
|
tx.on('end', () => {
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
// Or by any API rule (e.g. allowlist)
|
357
|
-
tx?.on('end', () => {
|
358
|
-
deleteRequestPendingFiles(request, webResourceHandler);
|
359
|
-
});
|
360
|
-
|
361
|
-
// Request failed on DB roundtrip (e.g. DB constraint)
|
362
|
-
tx?.on('rollback', () => {
|
363
|
-
deleteRollbackPendingFields(request, webResourceHandler);
|
343
|
+
deletePendingFiles(
|
344
|
+
getWebResourcesHrefs(webResources),
|
345
|
+
request,
|
346
|
+
webResourceHandler,
|
347
|
+
);
|
364
348
|
});
|
365
349
|
},
|
366
350
|
};
|
@@ -383,15 +367,17 @@ const deleteRollbackPendingFields = async (
|
|
383
367
|
await deleteFiles(keysToDelete, webResourceHandler);
|
384
368
|
};
|
385
369
|
|
386
|
-
const
|
370
|
+
const deletePendingFiles = (
|
371
|
+
keysToDelete: string[],
|
387
372
|
request: uriParser.ODataRequest,
|
388
373
|
webResourceHandler: WebResourceHandler,
|
389
374
|
): void => {
|
390
|
-
const keysToDelete: string[] = request.custom.$pineWebResourcesToDelete || [];
|
391
375
|
// on purpose does not await for this promise to resolve
|
392
|
-
|
376
|
+
try {
|
377
|
+
deleteFiles(keysToDelete, webResourceHandler);
|
378
|
+
} catch (err) {
|
393
379
|
getLogger(request.vocabulary).error(`Failed to delete pending files`, err);
|
394
|
-
}
|
380
|
+
}
|
395
381
|
};
|
396
382
|
|
397
383
|
export const getDefaultHandler = (): WebResourceHandler => {
|
@@ -407,7 +393,7 @@ export const setupUploadHooks = (
|
|
407
393
|
'DELETE',
|
408
394
|
apiRoot,
|
409
395
|
resourceName,
|
410
|
-
|
396
|
+
getRemoveWebResourceHooks(handler),
|
411
397
|
);
|
412
398
|
|
413
399
|
sbvrUtils.addPureHook(
|
@@ -415,20 +401,20 @@ export const setupUploadHooks = (
|
|
415
401
|
apiRoot,
|
416
402
|
resourceName,
|
417
403
|
// PATCH also needs to remove the old resource in case a webresource was modified
|
418
|
-
|
404
|
+
getRemoveWebResourceHooks(handler),
|
419
405
|
);
|
420
406
|
|
421
407
|
sbvrUtils.addPureHook(
|
422
408
|
'POST',
|
423
409
|
apiRoot,
|
424
410
|
resourceName,
|
425
|
-
|
411
|
+
getCreateWebResourceHooks(handler),
|
426
412
|
);
|
427
413
|
|
428
414
|
sbvrUtils.addPureHook(
|
429
415
|
'GET',
|
430
416
|
apiRoot,
|
431
417
|
resourceName,
|
432
|
-
|
418
|
+
getReadWebResourceHooks(handler),
|
433
419
|
);
|
434
420
|
};
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"webresource-handler.js","sourceRoot":"","sources":["../../src/server-glue/webresource-handler.ts"],"names":[],"mappings":"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"}
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"NoopHandler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/NoopHandler.ts"],"names":[],"mappings":";;;AAOA,MAAa,WAAW;IAChB,KAAK,CAAC,UAAU,CAAC,QAAsB;QAE7C,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,OAAO;YACN,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,CAAC;SACP,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,cAAsB;QAC7C,OAAO;IACR,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,WAAwB;QACjD,OAAO,WAAW,CAAC;IACpB,CAAC;CACD;AAjBD,kCAiBC"}
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/S3Handler.ts"],"names":[],"mappings":"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"}
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,8CAA4B"}
|
/package/out/{server-glue/webresource-handlers → webresource-handler/handlers}/NoopHandler.js
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|