@balena/pinejs 15.1.0-build-web-resource-4-366a6aee494d7b10ba96d42af0b39b91c57220b3-1 → 15.1.0-build-web-resource-4-60a3313d5465335b98b5a93fdfa92d801e914f5a-4
Sign up to get free protection for your applications and to get access to all the features.
- package/.versionbot/CHANGELOG.yml +15 -3
- package/CHANGELOG.md +6 -1
- package/out/migrator/utils.js +3 -2
- package/out/migrator/utils.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/server-glue/webresource-handler.d.ts +7 -0
- package/out/server-glue/webresource-handler.js +21 -7
- package/out/server-glue/webresource-handler.js.map +1 -1
- package/out/server-glue/webresource-handlers/S3Handler.js +3 -2
- package/out/server-glue/webresource-handlers/S3Handler.js.map +1 -1
- package/package.json +3 -3
- package/src/migrator/utils.ts +2 -1
- package/src/server-glue/webresource-handler.ts +25 -8
- package/src/server-glue/webresource-handlers/S3Handler.ts +4 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
- commits:
|
|
2
2
|
- subject: Adds WebResource type
|
|
3
|
-
hash:
|
|
3
|
+
hash: 60a3313d5465335b98b5a93fdfa92d801e914f5a
|
|
4
4
|
body: ""
|
|
5
5
|
footer:
|
|
6
6
|
Change-type: minor
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
nested: []
|
|
10
10
|
- subject: Integrate beta version of sbvr-types supporting WebResource Update to
|
|
11
11
|
@balena/open-multer-s3, better large files test
|
|
12
|
-
hash:
|
|
12
|
+
hash: 2d69309c358cd10c945bec2237c05125cc7fbd03
|
|
13
13
|
body: ""
|
|
14
14
|
footer:
|
|
15
15
|
Change-type: patch
|
|
@@ -20,7 +20,19 @@
|
|
|
20
20
|
nested: []
|
|
21
21
|
version: 15.1.0
|
|
22
22
|
title: ""
|
|
23
|
-
date: 2023-
|
|
23
|
+
date: 2023-06-12T12:30:12.389Z
|
|
24
|
+
- commits:
|
|
25
|
+
- subject: Update TypeScript to 5.1.3
|
|
26
|
+
hash: 67487ebc958401c7b20dc3b4052f2374b36548c4
|
|
27
|
+
body: ""
|
|
28
|
+
footer:
|
|
29
|
+
Change-type: patch
|
|
30
|
+
change-type: patch
|
|
31
|
+
author: Thodoris Greasidis
|
|
32
|
+
nested: []
|
|
33
|
+
version: 15.0.2
|
|
34
|
+
title: ""
|
|
35
|
+
date: 2023-06-02T14:43:20.273Z
|
|
24
36
|
- commits:
|
|
25
37
|
- subject: "Migrations.md: Add marking the sbvr field as optional on the 2nd deploy"
|
|
26
38
|
hash: d6d0ded8eccc6eadb2492f4697918cf0afd00215
|
package/CHANGELOG.md
CHANGED
|
@@ -5,11 +5,16 @@ 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.1.0
|
|
8
|
-
## (2023-
|
|
8
|
+
## (2023-06-12)
|
|
9
9
|
|
|
10
10
|
* Adds WebResource type [Otávio Jacobi]
|
|
11
11
|
* Integrate beta version of sbvr-types supporting WebResource Update to @balena/open-multer-s3, better large files test [Ramiro González Maciel]
|
|
12
12
|
|
|
13
|
+
# v15.0.2
|
|
14
|
+
## (2023-06-02)
|
|
15
|
+
|
|
16
|
+
* Update TypeScript to 5.1.3 [Thodoris Greasidis]
|
|
17
|
+
|
|
13
18
|
# v15.0.1
|
|
14
19
|
## (2023-05-23)
|
|
15
20
|
|
package/out/migrator/utils.js
CHANGED
|
@@ -39,7 +39,7 @@ var MigrationCategories;
|
|
|
39
39
|
(function (MigrationCategories) {
|
|
40
40
|
MigrationCategories["sync"] = "sync";
|
|
41
41
|
MigrationCategories["async"] = "async";
|
|
42
|
-
})(MigrationCategories
|
|
42
|
+
})(MigrationCategories || (exports.MigrationCategories = MigrationCategories = {}));
|
|
43
43
|
exports.defaultMigrationCategory = MigrationCategories.sync;
|
|
44
44
|
function isAsyncMigration(migration) {
|
|
45
45
|
return (((typeof migration.asyncFn === 'function' ||
|
|
@@ -97,7 +97,8 @@ const getRunnableSyncMigrations = ($migrations) => {
|
|
|
97
97
|
return $migrations;
|
|
98
98
|
};
|
|
99
99
|
exports.getRunnableSyncMigrations = getRunnableSyncMigrations;
|
|
100
|
-
const filterAndSortPendingMigrations = ($migrations, executedMigrations) => _($migrations)
|
|
100
|
+
const filterAndSortPendingMigrations = ($migrations, executedMigrations) => _($migrations)
|
|
101
|
+
.omit(executedMigrations)
|
|
101
102
|
.toPairs()
|
|
102
103
|
.sortBy(([migrationKey]) => migrationKey)
|
|
103
104
|
.value();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":";;;AAGA,mCAAoC;AAEpC,4BAA4B;AAC5B,6CAAyC;AACzC,8CAA+D;AAC/D,4CAA+D;AAAtD,kGAAA,QAAQ,OAAe;AAChC,8CAA4D;AAC5D,2DAAiD;AAGpC,QAAA,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACzC,QAAA,UAAU,GAAe;IACrC,mBAAmB,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;QACzC,QAAQ,EAAE,CAAC,MAAM,EAAE;YAClB,KAAK,OAAO;gBACX,MAAM,EAAE,CAAC,UAAU,CAAC;;iDAEyB,CAAC,CAAC;gBAC/C,MAAM,EAAE,CAAC,UAAU,CAAC;;+CAEuB,CAAC,CAAC;gBAC7C,MAAM;YACP,KAAK,UAAU;gBACd,MAAM,EAAE,CAAC,UAAU,CAAC;;gGAEwE,CAAC,CAAC;gBAC9F,MAAM,EAAE,CAAC,UAAU,CAAC;;;;sDAI8B,CAAC,CAAC;gBACpD,MAAM;SAEP;IACF,CAAC;CACD,CAAC;AAEF,oDAAoD;AACpD,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC9B,oCAAe,CAAA;IACf,sCAAiB,CAAA;AAClB,CAAC,EAHW,mBAAmB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -131,6 +131,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
|
131
131
|
});
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
|
+
exports.PinejsSessionStore = PinejsSessionStore;
|
|
134
135
|
_a = PinejsSessionStore;
|
|
135
136
|
PinejsSessionStore.config = {
|
|
136
137
|
models: [
|
|
@@ -165,5 +166,4 @@ PinejsSessionStore.config = {
|
|
|
165
166
|
},
|
|
166
167
|
],
|
|
167
168
|
};
|
|
168
|
-
exports.PinejsSessionStore = PinejsSessionStore;
|
|
169
169
|
//# sourceMappingURL=pinejs-session-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,13 @@ export interface WebResourceHandler {
|
|
|
16
16
|
handleFile: (resource: IncomingFile) => Promise<UploadResponse>;
|
|
17
17
|
removeFile: (fileReference: string) => Promise<void>;
|
|
18
18
|
}
|
|
19
|
+
export declare class WebResourceError extends Error {
|
|
20
|
+
constructor(message: string, originalError?: Error);
|
|
21
|
+
originalError?: Error;
|
|
22
|
+
}
|
|
23
|
+
export declare class FileSizeExceededError extends WebResourceError {
|
|
24
|
+
constructor(maxSize: number);
|
|
25
|
+
}
|
|
19
26
|
export declare const getUploaderMiddlware: (handler: WebResourceHandler) => Express.RequestHandler;
|
|
20
27
|
export declare const getDefaultHandler: () => WebResourceHandler;
|
|
21
28
|
export declare const setupUploadHooks: (handler: WebResourceHandler, apiRoot: string, resourceName: string) => void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setupUploadHooks = exports.getDefaultHandler = exports.getUploaderMiddlware = void 0;
|
|
3
|
+
exports.setupUploadHooks = exports.getDefaultHandler = exports.getUploaderMiddlware = exports.FileSizeExceededError = exports.WebResourceError = void 0;
|
|
4
4
|
const busboy = require("busboy");
|
|
5
5
|
const is = require("type-is");
|
|
6
6
|
const uriParser = require("../sbvr-api/uri-parser");
|
|
@@ -11,6 +11,23 @@ const S3Handler_1 = require("./webresource-handlers/S3Handler");
|
|
|
11
11
|
const NoopHandler_1 = require("./webresource-handlers/NoopHandler");
|
|
12
12
|
const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
|
|
13
13
|
const module_1 = require("./module");
|
|
14
|
+
class WebResourceError extends Error {
|
|
15
|
+
constructor(message, originalError) {
|
|
16
|
+
super(message);
|
|
17
|
+
this.name = 'WebResourceError';
|
|
18
|
+
if (originalError) {
|
|
19
|
+
this.originalError = originalError;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.WebResourceError = WebResourceError;
|
|
24
|
+
class FileSizeExceededError extends WebResourceError {
|
|
25
|
+
constructor(maxSize) {
|
|
26
|
+
super(`File size exceeded the limit of ${maxSize} bytes.`);
|
|
27
|
+
this.name = 'FileSizeExceededError';
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.FileSizeExceededError = FileSizeExceededError;
|
|
14
31
|
const ifFileInValidPath = async (fieldname, req) => {
|
|
15
32
|
if (req.method !== 'POST' && req.method !== 'PATCH') {
|
|
16
33
|
return false;
|
|
@@ -94,8 +111,8 @@ const getUploaderMiddlware = (handler) => {
|
|
|
94
111
|
}
|
|
95
112
|
catch (err) {
|
|
96
113
|
await clearFiles();
|
|
97
|
-
if (err
|
|
98
|
-
return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError(
|
|
114
|
+
if (err instanceof FileSizeExceededError) {
|
|
115
|
+
return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError(err.message));
|
|
99
116
|
}
|
|
100
117
|
console.error('Error uploading file', err);
|
|
101
118
|
next(err);
|
|
@@ -157,9 +174,6 @@ const getRemoveWebResourceHook = (webResourceHandler) => {
|
|
|
157
174
|
PRERUN: async (args) => {
|
|
158
175
|
const { api, request } = args;
|
|
159
176
|
let fields = getWebResourceFields(request);
|
|
160
|
-
if (fields.length === 0) {
|
|
161
|
-
return;
|
|
162
|
-
}
|
|
163
177
|
if (request.method === 'PATCH') {
|
|
164
178
|
if (request.odataQuery?.key == null) {
|
|
165
179
|
throw new module_1.errors.BadRequestError('WebResources can only be updated when providing a resource key.');
|
|
@@ -214,8 +228,8 @@ const getDefaultHandler = () => {
|
|
|
214
228
|
};
|
|
215
229
|
exports.getDefaultHandler = getDefaultHandler;
|
|
216
230
|
const setupUploadHooks = (handler, apiRoot, resourceName) => {
|
|
217
|
-
sbvrUtils.addPureHook('PATCH', apiRoot, resourceName, getRemoveWebResourceHook(handler));
|
|
218
231
|
sbvrUtils.addPureHook('DELETE', apiRoot, resourceName, getRemoveWebResourceHook(handler));
|
|
232
|
+
sbvrUtils.addPureHook('PATCH', apiRoot, resourceName, getRemoveWebResourceHook(handler));
|
|
219
233
|
sbvrUtils.addPureHook('POST', apiRoot, resourceName, getCreateWebResourceHook(handler));
|
|
220
234
|
};
|
|
221
235
|
exports.setupUploadHooks = setupUploadHooks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webresource-handler.js","sourceRoot":"","sources":["../../src/server-glue/webresource-handler.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AACjC,8BAA8B;AAE9B,oDAAoD;AACpD,uDAA8D;AAC9D,yDAA2D;AAC3D,oDAAoD;AACpD,gEAA6D;AAC7D,oEAAiE;AACjE,yEAGuC;AACvC,qCAA+C;
|
|
1
|
+
{"version":3,"file":"webresource-handler.js","sourceRoot":"","sources":["../../src/server-glue/webresource-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.S3Handler = void 0;
|
|
4
4
|
const env_parsing_1 = require("@balena/env-parsing");
|
|
5
|
+
const webresource_handler_1 = require("../webresource-handler");
|
|
5
6
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
6
7
|
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
7
8
|
const crypto_1 = require("crypto");
|
|
@@ -45,9 +46,9 @@ class S3Handler {
|
|
|
45
46
|
catch (err) {
|
|
46
47
|
resource.stream.resume();
|
|
47
48
|
if (size > this.maxFileSize) {
|
|
48
|
-
throw new
|
|
49
|
+
throw new webresource_handler_1.FileSizeExceededError(this.maxFileSize);
|
|
49
50
|
}
|
|
50
|
-
throw err;
|
|
51
|
+
throw new webresource_handler_1.WebResourceError('Failed uploading resource', err);
|
|
51
52
|
}
|
|
52
53
|
const filename = this.getS3URL(key);
|
|
53
54
|
return { size, filename };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/S3Handler.ts"],"names":[],"mappings":";;;AAAA,qDAAuE;
|
|
1
|
+
{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/S3Handler.ts"],"names":[],"mappings":";;;AAAA,qDAAuE;AACvE,gEAMgC;AAChC,kDAK4B;AAC5B,sDAA8C;AAE9C,mCAAoC;AAEpC,MAAa,SAAS;IAUrB;QANiB,gBAAW,GAAG,IAAA,oBAAM,EACpC,gCAAgC,EAChC,QAAQ,CACR,CAAC;QAID,IAAI,CAAC,QAAQ,GAAG,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG;YACb,MAAM,EAAE,IAAA,yBAAW,EAAC,WAAW,EAAE,WAAW,CAAC;YAC7C,WAAW,EAAE;gBACZ,WAAW,EAAE,IAAA,yBAAW,EAAC,eAAe,CAAC;gBACzC,eAAe,EAAE,IAAA,yBAAW,EAAC,eAAe,CAAC;aAC7C;YACD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc,EAAE,IAAI;SACpB,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAA,yBAAW,EACxB,2BAA2B,EAC3B,2BAA2B,CAC3B,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,oBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,QAAsB;QAC7C,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC,SAAS,IAAI,IAAA,mBAAU,GAAE,IAChD,QAAQ,CAAC,YACV,EAAE,CAAC;QACH,MAAM,MAAM,GAA0B;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,aAAa;YAClB,YAAY,EAAE,UAAU;YACxB,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,QAAQ,CAAC,MAAM;YACrB,WAAW,EAAE,QAAQ,CAAC,QAAQ;SAC9B,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3D,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YAC5C,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,MAAO,CAAC;YACxC,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE;gBAC5B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;aACrB;QACF,CAAC,CAAC,CAAC;QAEH,IAAI;YACH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;SACpB;QAAC,OAAO,GAAQ,EAAE;YAClB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACzB,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE;gBAC5B,MAAM,IAAI,2CAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAClD;YACD,MAAM,IAAI,sCAAgB,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;SAC7D;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,aAAqB;QAC5C,MAAM,cAAc,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,IAAI,+BAAmB,CAAC;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,OAAO;SACZ,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACzC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,GAAG,EAAE;YAC3B,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;IAC7C,CAAC;CACD;AAlFD,8BAkFC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs",
|
|
3
|
-
"version": "15.1.0-build-web-resource-4-
|
|
3
|
+
"version": "15.1.0-build-web-resource-4-60a3313d5465335b98b5a93fdfa92d801e914f5a-4",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
"terser-webpack-plugin": "^5.3.7",
|
|
98
98
|
"ts-loader": "^9.4.2",
|
|
99
99
|
"ts-node": "^10.9.1",
|
|
100
|
-
"typescript": "^5.
|
|
100
|
+
"typescript": "^5.1.3",
|
|
101
101
|
"webpack": "^5.81.0",
|
|
102
102
|
"webpack-dev-server": "^4.13.3"
|
|
103
103
|
},
|
|
@@ -139,6 +139,6 @@
|
|
|
139
139
|
"recursive": true
|
|
140
140
|
},
|
|
141
141
|
"versionist": {
|
|
142
|
-
"publishedAt": "2023-
|
|
142
|
+
"publishedAt": "2023-06-12T12:30:13.218Z"
|
|
143
143
|
}
|
|
144
144
|
}
|
package/src/migrator/utils.ts
CHANGED
|
@@ -184,7 +184,8 @@ export const filterAndSortPendingMigrations = (
|
|
|
184
184
|
$migrations: NonNullable<RunnableMigrations | RunnableAsyncMigrations>,
|
|
185
185
|
executedMigrations: string[],
|
|
186
186
|
): MigrationTuple[] =>
|
|
187
|
-
|
|
187
|
+
_($migrations)
|
|
188
|
+
.omit(executedMigrations)
|
|
188
189
|
.toPairs()
|
|
189
190
|
.sortBy(([migrationKey]) => migrationKey)
|
|
190
191
|
.value();
|
|
@@ -32,6 +32,26 @@ export interface WebResourceHandler {
|
|
|
32
32
|
removeFile: (fileReference: string) => Promise<void>;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
export class WebResourceError extends Error {
|
|
36
|
+
constructor(message: string, originalError?: Error) {
|
|
37
|
+
super(message);
|
|
38
|
+
this.name = 'WebResourceError';
|
|
39
|
+
|
|
40
|
+
if (originalError) {
|
|
41
|
+
this.originalError = originalError;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
originalError?: Error;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export class FileSizeExceededError extends WebResourceError {
|
|
49
|
+
constructor(maxSize: number) {
|
|
50
|
+
super(`File size exceeded the limit of ${maxSize} bytes.`);
|
|
51
|
+
this.name = 'FileSizeExceededError';
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
35
55
|
type WebResourcesDbResponse = {
|
|
36
56
|
[fieldname: string]: { href: string } | undefined | null;
|
|
37
57
|
};
|
|
@@ -147,11 +167,11 @@ export const getUploaderMiddlware = (
|
|
|
147
167
|
} catch (err: any) {
|
|
148
168
|
await clearFiles();
|
|
149
169
|
|
|
150
|
-
if (err
|
|
170
|
+
if (err instanceof FileSizeExceededError) {
|
|
151
171
|
return sbvrUtils.handleHttpErrors(
|
|
152
172
|
req,
|
|
153
173
|
res,
|
|
154
|
-
new errors.BadRequestError(
|
|
174
|
+
new errors.BadRequestError(err.message),
|
|
155
175
|
);
|
|
156
176
|
}
|
|
157
177
|
|
|
@@ -231,10 +251,6 @@ const getRemoveWebResourceHook = (webResourceHandler: WebResourceHandler) => {
|
|
|
231
251
|
const { api, request } = args;
|
|
232
252
|
let fields = getWebResourceFields(request);
|
|
233
253
|
|
|
234
|
-
if (fields.length === 0) {
|
|
235
|
-
return;
|
|
236
|
-
}
|
|
237
|
-
|
|
238
254
|
if (request.method === 'PATCH') {
|
|
239
255
|
if (request.odataQuery?.key == null) {
|
|
240
256
|
throw new errors.BadRequestError(
|
|
@@ -305,16 +321,17 @@ export const setupUploadHooks = (
|
|
|
305
321
|
resourceName: string,
|
|
306
322
|
) => {
|
|
307
323
|
sbvrUtils.addPureHook(
|
|
308
|
-
'
|
|
324
|
+
'DELETE',
|
|
309
325
|
apiRoot,
|
|
310
326
|
resourceName,
|
|
311
327
|
getRemoveWebResourceHook(handler),
|
|
312
328
|
);
|
|
313
329
|
|
|
314
330
|
sbvrUtils.addPureHook(
|
|
315
|
-
'
|
|
331
|
+
'PATCH',
|
|
316
332
|
apiRoot,
|
|
317
333
|
resourceName,
|
|
334
|
+
// PATCH also needs to remove the old resource in case a webresource was modified
|
|
318
335
|
getRemoveWebResourceHook(handler),
|
|
319
336
|
);
|
|
320
337
|
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { optionalVar, requiredVar, intVar } from '@balena/env-parsing';
|
|
2
2
|
import {
|
|
3
|
+
FileSizeExceededError,
|
|
3
4
|
IncomingFile,
|
|
4
5
|
UploadResponse,
|
|
6
|
+
WebResourceError,
|
|
5
7
|
WebResourceHandler,
|
|
6
8
|
} from '../webresource-handler';
|
|
7
9
|
import {
|
|
@@ -70,9 +72,9 @@ export class S3Handler implements WebResourceHandler {
|
|
|
70
72
|
} catch (err: any) {
|
|
71
73
|
resource.stream.resume();
|
|
72
74
|
if (size > this.maxFileSize) {
|
|
73
|
-
throw new
|
|
75
|
+
throw new FileSizeExceededError(this.maxFileSize);
|
|
74
76
|
}
|
|
75
|
-
throw err;
|
|
77
|
+
throw new WebResourceError('Failed uploading resource', err);
|
|
76
78
|
}
|
|
77
79
|
|
|
78
80
|
const filename = this.getS3URL(key);
|