@balena/pinejs 15.1.0-build-web-resource-4-60a3313d5465335b98b5a93fdfa92d801e914f5a-4 → 15.1.0-build-update-Updatepinejs-client-core-9757808e1422074b805c57fd5b629f5b3ef6f779-1
Sign up to get free protection for your applications and to get access to all the features.
- package/.pinejs-cache.json +1 -1
- package/.versionbot/CHANGELOG.yml +70 -12
- package/CHANGELOG.md +33 -3
- package/README.md +0 -10
- package/bin/abstract-sql-compiler.js +0 -0
- package/bin/odata-compiler.js +0 -0
- package/bin/sbvr-compiler.js +0 -0
- package/docker-compose.npm-test.yml +1 -22
- package/out/config-loader/config-loader.d.ts +0 -2
- package/out/config-loader/config-loader.js +2 -13
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/migrator/sync.js +24 -1
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +0 -2
- package/out/migrator/utils.js +1 -26
- package/out/migrator/utils.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +2 -6
- package/out/sbvr-api/sbvr-utils.js +2 -11
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/server-glue/server.js +2 -0
- package/out/server-glue/server.js.map +1 -1
- package/package.json +17 -18
- package/src/config-loader/config-loader.ts +2 -27
- package/src/migrator/sync.ts +26 -1
- package/src/migrator/utils.ts +0 -28
- package/src/sbvr-api/sbvr-utils.ts +1 -10
- package/src/server-glue/server.ts +3 -0
- package/out/server-glue/webresource-handler.d.ts +0 -28
- package/out/server-glue/webresource-handler.js +0 -236
- package/out/server-glue/webresource-handler.js.map +0 -1
- package/out/server-glue/webresource-handlers/NoopHandler.d.ts +0 -5
- package/out/server-glue/webresource-handlers/NoopHandler.js +0 -17
- package/out/server-glue/webresource-handlers/NoopHandler.js.map +0 -1
- package/out/server-glue/webresource-handlers/S3Handler.d.ts +0 -12
- package/out/server-glue/webresource-handlers/S3Handler.js +0 -72
- package/out/server-glue/webresource-handlers/S3Handler.js.map +0 -1
- package/src/server-glue/webresource-handler.ts +0 -344
- package/src/server-glue/webresource-handlers/NoopHandler.ts +0 -20
- package/src/server-glue/webresource-handlers/S3Handler.ts +0 -101
@@ -1,236 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.setupUploadHooks = exports.getDefaultHandler = exports.getUploaderMiddlware = exports.FileSizeExceededError = exports.WebResourceError = void 0;
|
4
|
-
const busboy = require("busboy");
|
5
|
-
const is = require("type-is");
|
6
|
-
const uriParser = require("../sbvr-api/uri-parser");
|
7
|
-
const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
|
8
|
-
const permissions_1 = require("../sbvr-api/permissions");
|
9
|
-
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
10
|
-
const S3Handler_1 = require("./webresource-handlers/S3Handler");
|
11
|
-
const NoopHandler_1 = require("./webresource-handlers/NoopHandler");
|
12
|
-
const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
|
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;
|
31
|
-
const ifFileInValidPath = async (fieldname, req) => {
|
32
|
-
if (req.method !== 'POST' && req.method !== 'PATCH') {
|
33
|
-
return false;
|
34
|
-
}
|
35
|
-
const apiRoot = (0, sbvr_utils_1.getApiRoot)(req);
|
36
|
-
if (apiRoot == null) {
|
37
|
-
return false;
|
38
|
-
}
|
39
|
-
const model = (0, sbvr_utils_1.getModel)(apiRoot);
|
40
|
-
const { resourceName } = await uriParser.parseOData({
|
41
|
-
url: req.url,
|
42
|
-
method: req.method,
|
43
|
-
});
|
44
|
-
const permission = req.method === 'POST' ? 'create' : 'update';
|
45
|
-
const vocab = model.versions[model.versions.length - 1];
|
46
|
-
const hasPermissions = await (0, permissions_1.checkPermissions)(req, permission, resourceName, vocab);
|
47
|
-
if (!hasPermissions) {
|
48
|
-
return false;
|
49
|
-
}
|
50
|
-
const fields = model.abstractSql.tables[resourceName].fields;
|
51
|
-
const dbFieldName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(fieldname);
|
52
|
-
for (const field of fields) {
|
53
|
-
if (field.fieldName === dbFieldName && field.dataType === 'WebResource') {
|
54
|
-
return true;
|
55
|
-
}
|
56
|
-
}
|
57
|
-
return false;
|
58
|
-
};
|
59
|
-
const getUploaderMiddlware = (handler) => {
|
60
|
-
return async (req, res, next) => {
|
61
|
-
if (!is(req, ['multipart'])) {
|
62
|
-
return next();
|
63
|
-
}
|
64
|
-
const filesUploaded = [];
|
65
|
-
const completeUploads = [];
|
66
|
-
const bb = busboy({ headers: req.headers });
|
67
|
-
let isAborting = false;
|
68
|
-
const done = () => {
|
69
|
-
req.unpipe(bb);
|
70
|
-
req.on('readable', req.read.bind(req));
|
71
|
-
bb.removeAllListeners();
|
72
|
-
};
|
73
|
-
const clearFiles = () => {
|
74
|
-
isAborting = true;
|
75
|
-
const deletions = filesUploaded.map((file) => handler.removeFile(file));
|
76
|
-
return Promise.all(deletions).catch((err) => console.error('Error deleting file', err));
|
77
|
-
};
|
78
|
-
bb.on('file', async (fieldname, filestream, info) => {
|
79
|
-
if (!isAborting && (await ifFileInValidPath(fieldname, req))) {
|
80
|
-
const file = {
|
81
|
-
originalname: info.filename,
|
82
|
-
encoding: info.encoding,
|
83
|
-
mimetype: info.mimeType,
|
84
|
-
stream: filestream,
|
85
|
-
fieldname,
|
86
|
-
};
|
87
|
-
const promise = handler.handleFile(file).then((result) => {
|
88
|
-
req.body[fieldname] = {
|
89
|
-
filename: info.filename,
|
90
|
-
contentType: info.mimeType,
|
91
|
-
contentDisposition: undefined,
|
92
|
-
size: result.size,
|
93
|
-
href: result.filename,
|
94
|
-
};
|
95
|
-
filesUploaded.push(result.filename);
|
96
|
-
});
|
97
|
-
completeUploads.push(promise);
|
98
|
-
}
|
99
|
-
else {
|
100
|
-
filestream.resume();
|
101
|
-
}
|
102
|
-
});
|
103
|
-
bb.on('field', (name, val, _info) => {
|
104
|
-
req.body[name] = val;
|
105
|
-
});
|
106
|
-
bb.on('finish', async () => {
|
107
|
-
try {
|
108
|
-
await Promise.all(completeUploads);
|
109
|
-
done();
|
110
|
-
next();
|
111
|
-
}
|
112
|
-
catch (err) {
|
113
|
-
await clearFiles();
|
114
|
-
if (err instanceof FileSizeExceededError) {
|
115
|
-
return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError(err.message));
|
116
|
-
}
|
117
|
-
console.error('Error uploading file', err);
|
118
|
-
next(err);
|
119
|
-
}
|
120
|
-
});
|
121
|
-
bb.on('error', async (err) => {
|
122
|
-
await clearFiles();
|
123
|
-
done();
|
124
|
-
next(err);
|
125
|
-
});
|
126
|
-
req.pipe(bb);
|
127
|
-
};
|
128
|
-
};
|
129
|
-
exports.getUploaderMiddlware = getUploaderMiddlware;
|
130
|
-
const getWebResourceFields = (request) => {
|
131
|
-
const fields = request.abstractSqlModel?.tables[request.resourceName]?.modifyFields ??
|
132
|
-
request.abstractSqlModel?.tables[request.resourceName]?.fields;
|
133
|
-
if (fields == null) {
|
134
|
-
return [];
|
135
|
-
}
|
136
|
-
return fields
|
137
|
-
.filter((f) => f.dataType === 'WebResource')
|
138
|
-
.map((f) => (0, odata_to_abstract_sql_1.sqlNameToODataName)(f.fieldName));
|
139
|
-
};
|
140
|
-
const getModifiedFields = (request) => {
|
141
|
-
return Object.entries(request.values)
|
142
|
-
.filter(([_key, value]) => value !== undefined)
|
143
|
-
.map(([key, _value]) => key);
|
144
|
-
};
|
145
|
-
const deleteFiles = async (keysToDelete, webResourceHandler) => {
|
146
|
-
const promises = keysToDelete.map((r) => webResourceHandler.removeFile(r));
|
147
|
-
await Promise.all(promises);
|
148
|
-
};
|
149
|
-
const getCreateWebResourceHook = (webResourceHandler) => {
|
150
|
-
return {
|
151
|
-
'POSTRUN-ERROR': async ({ tx, request }) => {
|
152
|
-
tx?.on('rollback', async () => {
|
153
|
-
const fields = getWebResourceFields(request);
|
154
|
-
if (fields.length === 0) {
|
155
|
-
return;
|
156
|
-
}
|
157
|
-
const keysToDelete = fields
|
158
|
-
.filter((f) => isDefined(request.values[f]))
|
159
|
-
.map((f) => request.values[f].href);
|
160
|
-
await deleteFiles(keysToDelete, webResourceHandler);
|
161
|
-
});
|
162
|
-
},
|
163
|
-
};
|
164
|
-
};
|
165
|
-
const isDefined = (x) => x != null;
|
166
|
-
const getWebResourcesHrefs = (webResources) => {
|
167
|
-
const hrefs = Object.values(webResources ?? {})
|
168
|
-
.filter(isDefined)
|
169
|
-
.map((resourceKey) => resourceKey.href);
|
170
|
-
return hrefs;
|
171
|
-
};
|
172
|
-
const getRemoveWebResourceHook = (webResourceHandler) => {
|
173
|
-
return {
|
174
|
-
PRERUN: async (args) => {
|
175
|
-
const { api, request } = args;
|
176
|
-
let fields = getWebResourceFields(request);
|
177
|
-
if (request.method === 'PATCH') {
|
178
|
-
if (request.odataQuery?.key == null) {
|
179
|
-
throw new module_1.errors.BadRequestError('WebResources can only be updated when providing a resource key.');
|
180
|
-
}
|
181
|
-
const allFields = getModifiedFields(request);
|
182
|
-
fields = fields.filter((f) => allFields.includes(f));
|
183
|
-
}
|
184
|
-
if (fields.length === 0) {
|
185
|
-
return;
|
186
|
-
}
|
187
|
-
const [id, rest] = await sbvrUtils.getAffectedIds(args);
|
188
|
-
if (id == null) {
|
189
|
-
return;
|
190
|
-
}
|
191
|
-
if (rest != null) {
|
192
|
-
throw new module_1.errors.BadRequestError('Resources containing webresources can only be updated/deleted one at a time.');
|
193
|
-
}
|
194
|
-
const webResources = (await api.get({
|
195
|
-
resource: request.resourceName,
|
196
|
-
passthrough: {
|
197
|
-
tx: args.tx,
|
198
|
-
req: module_1.permissions.root,
|
199
|
-
},
|
200
|
-
id,
|
201
|
-
options: {
|
202
|
-
$select: fields,
|
203
|
-
},
|
204
|
-
}));
|
205
|
-
request.custom.$pineWebResourcesToDelete =
|
206
|
-
getWebResourcesHrefs(webResources);
|
207
|
-
},
|
208
|
-
POSTRUN: ({ tx, request }) => {
|
209
|
-
tx.on('end', () => {
|
210
|
-
const keysToDelete = request.custom.$pineWebResourcesToDelete || [];
|
211
|
-
deleteFiles(keysToDelete, webResourceHandler).catch((err) => {
|
212
|
-
console.error(`Failed to delete pending files`, err);
|
213
|
-
});
|
214
|
-
});
|
215
|
-
},
|
216
|
-
};
|
217
|
-
};
|
218
|
-
const getDefaultHandler = () => {
|
219
|
-
let handler;
|
220
|
-
try {
|
221
|
-
handler = new S3Handler_1.S3Handler();
|
222
|
-
}
|
223
|
-
catch (e) {
|
224
|
-
console.warn(`Failed to initialize S3 handler, using noop ${e}`);
|
225
|
-
handler = new NoopHandler_1.NoopHandler();
|
226
|
-
}
|
227
|
-
return handler;
|
228
|
-
};
|
229
|
-
exports.getDefaultHandler = getDefaultHandler;
|
230
|
-
const setupUploadHooks = (handler, apiRoot, resourceName) => {
|
231
|
-
sbvrUtils.addPureHook('DELETE', apiRoot, resourceName, getRemoveWebResourceHook(handler));
|
232
|
-
sbvrUtils.addPureHook('PATCH', apiRoot, resourceName, getRemoveWebResourceHook(handler));
|
233
|
-
sbvrUtils.addPureHook('POST', apiRoot, resourceName, getCreateWebResourceHook(handler));
|
234
|
-
};
|
235
|
-
exports.setupUploadHooks = setupUploadHooks;
|
236
|
-
//# sourceMappingURL=webresource-handler.js.map
|
@@ -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,5 +0,0 @@
|
|
1
|
-
import { IncomingFile, UploadResponse, WebResourceHandler } from '../webresource-handler';
|
2
|
-
export declare class NoopHandler implements WebResourceHandler {
|
3
|
-
handleFile(resource: IncomingFile): Promise<UploadResponse>;
|
4
|
-
removeFile(_fileReference: string): Promise<void>;
|
5
|
-
}
|
@@ -1,17 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.NoopHandler = void 0;
|
4
|
-
class NoopHandler {
|
5
|
-
async handleFile(resource) {
|
6
|
-
resource.stream.resume();
|
7
|
-
return {
|
8
|
-
filename: 'noop',
|
9
|
-
size: 0,
|
10
|
-
};
|
11
|
-
}
|
12
|
-
async removeFile(_fileReference) {
|
13
|
-
return;
|
14
|
-
}
|
15
|
-
}
|
16
|
-
exports.NoopHandler = NoopHandler;
|
17
|
-
//# sourceMappingURL=NoopHandler.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"NoopHandler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/NoopHandler.ts"],"names":[],"mappings":";;;AAMA,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;CACD;AAbD,kCAaC"}
|
@@ -1,12 +0,0 @@
|
|
1
|
-
import { IncomingFile, UploadResponse, WebResourceHandler } from '../webresource-handler';
|
2
|
-
export declare class S3Handler implements WebResourceHandler {
|
3
|
-
private readonly config;
|
4
|
-
private readonly bucket;
|
5
|
-
private readonly endpoint;
|
6
|
-
private readonly maxFileSize;
|
7
|
-
private client;
|
8
|
-
constructor();
|
9
|
-
handleFile(resource: IncomingFile): Promise<UploadResponse>;
|
10
|
-
removeFile(fileReference: string): Promise<void>;
|
11
|
-
private getS3URL;
|
12
|
-
}
|
@@ -1,72 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.S3Handler = void 0;
|
4
|
-
const env_parsing_1 = require("@balena/env-parsing");
|
5
|
-
const webresource_handler_1 = require("../webresource-handler");
|
6
|
-
const client_s3_1 = require("@aws-sdk/client-s3");
|
7
|
-
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
8
|
-
const crypto_1 = require("crypto");
|
9
|
-
class S3Handler {
|
10
|
-
constructor() {
|
11
|
-
this.maxFileSize = (0, env_parsing_1.intVar)('PINEJS_WEBRESOURCE_MAXFILESIZE', 52428800);
|
12
|
-
this.endpoint = (0, env_parsing_1.requiredVar)('S3_ENDPOINT');
|
13
|
-
this.config = {
|
14
|
-
region: (0, env_parsing_1.optionalVar)('S3_REGION', 'us-east-1'),
|
15
|
-
credentials: {
|
16
|
-
accessKeyId: (0, env_parsing_1.requiredVar)('S3_ACCESS_KEY'),
|
17
|
-
secretAccessKey: (0, env_parsing_1.requiredVar)('S3_SECRET_KEY'),
|
18
|
-
},
|
19
|
-
endpoint: this.endpoint,
|
20
|
-
forcePathStyle: true,
|
21
|
-
};
|
22
|
-
this.bucket = (0, env_parsing_1.optionalVar)('S3_STORAGE_ADAPTER_BUCKET', 'balena-pine-web-resources');
|
23
|
-
this.client = new client_s3_1.S3Client(this.config);
|
24
|
-
}
|
25
|
-
async handleFile(resource) {
|
26
|
-
let size = 0;
|
27
|
-
const key = `${resource.fieldname}_${(0, crypto_1.randomUUID)()}_${resource.originalname}`;
|
28
|
-
const params = {
|
29
|
-
Bucket: this.bucket,
|
30
|
-
ACL: 'public-read',
|
31
|
-
StorageClass: 'STANDARD',
|
32
|
-
Key: key,
|
33
|
-
Body: resource.stream,
|
34
|
-
ContentType: resource.mimetype,
|
35
|
-
};
|
36
|
-
const upload = new lib_storage_1.Upload({ client: this.client, params });
|
37
|
-
upload.on('httpUploadProgress', async (ev) => {
|
38
|
-
size = ev.total ? ev.total : ev.loaded;
|
39
|
-
if (size > this.maxFileSize) {
|
40
|
-
await upload.abort();
|
41
|
-
}
|
42
|
-
});
|
43
|
-
try {
|
44
|
-
await upload.done();
|
45
|
-
}
|
46
|
-
catch (err) {
|
47
|
-
resource.stream.resume();
|
48
|
-
if (size > this.maxFileSize) {
|
49
|
-
throw new webresource_handler_1.FileSizeExceededError(this.maxFileSize);
|
50
|
-
}
|
51
|
-
throw new webresource_handler_1.WebResourceError('Failed uploading resource', err);
|
52
|
-
}
|
53
|
-
const filename = this.getS3URL(key);
|
54
|
-
return { size, filename };
|
55
|
-
}
|
56
|
-
async removeFile(fileReference) {
|
57
|
-
const fileReferences = fileReference.split('/');
|
58
|
-
const fileKey = fileReferences[fileReferences.length - 1];
|
59
|
-
const command = new client_s3_1.DeleteObjectCommand({
|
60
|
-
Bucket: this.bucket,
|
61
|
-
Key: fileKey,
|
62
|
-
});
|
63
|
-
await this.client.send(command);
|
64
|
-
}
|
65
|
-
getS3URL(key) {
|
66
|
-
return this.endpoint.includes(this.bucket)
|
67
|
-
? `${this.endpoint}/${key}`
|
68
|
-
: `${this.endpoint}/${this.bucket}/${key}`;
|
69
|
-
}
|
70
|
-
}
|
71
|
-
exports.S3Handler = S3Handler;
|
72
|
-
//# sourceMappingURL=S3Handler.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/S3Handler.ts"],"names":[],"mappings":"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"}
|