@balena/pinejs 17.0.0-build-large-file-uploads-293e65ee371a69130834c50fef2f7f42cc18133f-1 → 17.0.0-build-17-x-0447fb6e94bafa136206d060acda2f2df4c00ad2-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 +2295 -17
- package/CHANGELOG.md +860 -5
- package/out/bin/abstract-sql-compiler.js +1 -1
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/sbvr-compiler.js +1 -1
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/database-layer/db.js +30 -19
- package/out/database-layer/db.js.map +1 -1
- package/out/http-transactions/transactions.js +2 -2
- package/out/http-transactions/transactions.js.map +1 -1
- package/out/migrator/async.js +8 -9
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/sync.js +6 -6
- package/out/migrator/sync.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js +103 -108
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.js +1 -1
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/errors.js +3 -0
- package/out/sbvr-api/errors.js.map +1 -1
- package/out/sbvr-api/hooks.js +4 -5
- package/out/sbvr-api/hooks.js.map +1 -1
- package/out/sbvr-api/permissions.js +3 -3
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +5 -6
- package/out/sbvr-api/sbvr-utils.js +16 -15
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/uri-parser.js +1 -1
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/out/server-glue/module.js +0 -2
- package/out/server-glue/module.js.map +1 -1
- package/out/webresource-handler/handlers/NoopHandler.d.ts +1 -3
- package/out/webresource-handler/handlers/NoopHandler.js +0 -6
- package/out/webresource-handler/handlers/NoopHandler.js.map +1 -1
- package/out/webresource-handler/handlers/S3Handler.d.ts +28 -0
- package/out/webresource-handler/handlers/S3Handler.js +104 -0
- package/out/webresource-handler/handlers/S3Handler.js.map +1 -0
- package/out/webresource-handler/handlers/index.d.ts +1 -0
- package/out/webresource-handler/handlers/index.js +1 -0
- package/out/webresource-handler/handlers/index.js.map +1 -1
- package/out/webresource-handler/index.d.ts +7 -31
- package/out/webresource-handler/index.js +22 -23
- package/out/webresource-handler/index.js.map +1 -1
- package/package.json +40 -39
- package/src/bin/abstract-sql-compiler.ts +1 -1
- package/src/bin/sbvr-compiler.ts +1 -1
- package/src/http-transactions/transactions.js +2 -2
- package/src/migrator/async.ts +10 -11
- package/src/migrator/sync.ts +6 -6
- package/src/sbvr-api/abstract-sql.ts +1 -1
- package/src/sbvr-api/permissions.ts +3 -3
- package/src/sbvr-api/sbvr-utils.ts +24 -23
- package/src/sbvr-api/uri-parser.ts +1 -1
- package/src/server-glue/module.ts +0 -2
- package/src/webresource-handler/handlers/NoopHandler.ts +1 -14
- package/src/webresource-handler/handlers/S3Handler.ts +143 -0
- package/src/webresource-handler/handlers/index.ts +1 -0
- package/src/webresource-handler/index.ts +22 -64
- package/tsconfig.json +1 -1
- package/out/webresource-handler/multipartUpload.d.ts +0 -16
- package/out/webresource-handler/multipartUpload.js +0 -182
- package/out/webresource-handler/multipartUpload.js.map +0 -1
- package/out/webresource-handler/webresource.sbvr +0 -63
- package/src/webresource-handler/multipartUpload.ts +0 -275
- package/src/webresource-handler/webresource.sbvr +0 -63
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
15
15
|
};
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
17
17
|
__exportStar(require("./NoopHandler"), exports);
|
18
|
+
__exportStar(require("./S3Handler"), exports);
|
18
19
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/webresource-handler/handlers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,8CAA4B"}
|
@@ -1,10 +1,8 @@
|
|
1
1
|
/// <reference types="node" />
|
2
2
|
import type * as Express from 'express';
|
3
3
|
import type * as stream from 'node:stream';
|
4
|
-
import * as uriParser from '../sbvr-api/uri-parser';
|
5
|
-
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
6
4
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
7
|
-
import
|
5
|
+
import { TypedError } from 'typed-error';
|
8
6
|
export * from './handlers';
|
9
7
|
export interface IncomingFile {
|
10
8
|
fieldname: string;
|
@@ -17,42 +15,20 @@ export interface UploadResponse {
|
|
17
15
|
size: number;
|
18
16
|
filename: string;
|
19
17
|
}
|
20
|
-
export interface BeginMultipartUploadPayload {
|
21
|
-
filename: string;
|
22
|
-
content_type: string;
|
23
|
-
size: number;
|
24
|
-
chunk_size: number;
|
25
|
-
}
|
26
|
-
export interface UploadPart {
|
27
|
-
url: string;
|
28
|
-
chunkSize: number;
|
29
|
-
partNumber: number;
|
30
|
-
}
|
31
|
-
export interface BeginMultipartUploadHandlerResponse {
|
32
|
-
uploadParts: UploadPart[];
|
33
|
-
fileKey: string;
|
34
|
-
uploadId: string;
|
35
|
-
}
|
36
|
-
export interface CommitMultipartUploadPayload {
|
37
|
-
fileKey: string;
|
38
|
-
uploadId: string;
|
39
|
-
filename: string;
|
40
|
-
providerCommitData?: AnyObject;
|
41
|
-
}
|
42
18
|
export interface WebResourceHandler {
|
43
19
|
handleFile: (resource: IncomingFile) => Promise<UploadResponse>;
|
44
20
|
removeFile: (fileReference: string) => Promise<void>;
|
45
21
|
onPreRespond: (webResource: WebResource) => Promise<WebResource>;
|
46
|
-
|
47
|
-
|
22
|
+
}
|
23
|
+
export declare class WebResourceError extends TypedError {
|
24
|
+
}
|
25
|
+
export declare class FileSizeExceededError extends WebResourceError {
|
26
|
+
name: string;
|
27
|
+
constructor(maxSize: number);
|
48
28
|
}
|
49
29
|
export declare const setupWebresourceHandler: (handler: WebResourceHandler) => void;
|
50
30
|
export declare const getWebresourceHandler: () => WebResourceHandler | undefined;
|
51
31
|
export declare const getUploaderMiddlware: (handler: WebResourceHandler) => Express.RequestHandler;
|
52
|
-
export declare const getWebResourceFields: (request: uriParser.ODataRequest, useTranslations?: boolean) => string[];
|
53
32
|
export declare const normalizeHref: (href: string) => string;
|
54
33
|
export declare const getDefaultHandler: () => WebResourceHandler;
|
55
34
|
export declare const setupUploadHooks: (handler: WebResourceHandler, apiRoot: string, resourceName: string) => void;
|
56
|
-
export declare const config: {
|
57
|
-
models: sbvrUtils.ExecutableModel[];
|
58
|
-
};
|
@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
29
29
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
30
30
|
};
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
32
|
-
exports.
|
32
|
+
exports.setupUploadHooks = exports.getDefaultHandler = exports.normalizeHref = exports.getUploaderMiddlware = exports.getWebresourceHandler = exports.setupWebresourceHandler = exports.FileSizeExceededError = exports.WebResourceError = void 0;
|
33
33
|
const busboy_1 = __importDefault(require("busboy"));
|
34
34
|
const uriParser = __importStar(require("../sbvr-api/uri-parser"));
|
35
35
|
const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
|
@@ -38,11 +38,21 @@ const permissions_1 = require("../sbvr-api/permissions");
|
|
38
38
|
const NoopHandler_1 = require("./handlers/NoopHandler");
|
39
39
|
const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
|
40
40
|
const module_1 = require("../server-glue/module");
|
41
|
-
const
|
41
|
+
const typed_error_1 = require("typed-error");
|
42
42
|
__exportStar(require("./handlers"), exports);
|
43
|
+
class WebResourceError extends typed_error_1.TypedError {
|
44
|
+
}
|
45
|
+
exports.WebResourceError = WebResourceError;
|
46
|
+
class FileSizeExceededError extends WebResourceError {
|
47
|
+
name = 'FileSizeExceededError';
|
48
|
+
constructor(maxSize) {
|
49
|
+
super(`File size exceeded the limit of ${maxSize} bytes.`);
|
50
|
+
}
|
51
|
+
}
|
52
|
+
exports.FileSizeExceededError = FileSizeExceededError;
|
43
53
|
const getLogger = (vocab) => {
|
44
54
|
if (vocab) {
|
45
|
-
return sbvrUtils.
|
55
|
+
return sbvrUtils.logger[vocab] ?? console;
|
46
56
|
}
|
47
57
|
return console;
|
48
58
|
};
|
@@ -151,8 +161,11 @@ const getUploaderMiddlware = (handler) => {
|
|
151
161
|
}
|
152
162
|
catch (err) {
|
153
163
|
await clearFiles();
|
154
|
-
|
155
|
-
|
164
|
+
if (err instanceof FileSizeExceededError) {
|
165
|
+
return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError(err.message));
|
166
|
+
}
|
167
|
+
getLogger((0, sbvr_utils_1.getApiRoot)(req)).error('Error uploading file', err);
|
168
|
+
next(err);
|
156
169
|
}
|
157
170
|
});
|
158
171
|
bb.on('error', async (err) => {
|
@@ -175,15 +188,12 @@ const getWebResourceFields = (request, useTranslations = true) => {
|
|
175
188
|
.filter((f) => f.dataType === 'WebResource')
|
176
189
|
.map((f) => (0, odata_to_abstract_sql_1.sqlNameToODataName)(f.fieldName));
|
177
190
|
};
|
178
|
-
exports.getWebResourceFields = getWebResourceFields;
|
179
191
|
const deleteFiles = async (keysToDelete, webResourceHandler) => {
|
180
192
|
const promises = keysToDelete.map((r) => webResourceHandler.removeFile(r));
|
181
193
|
await Promise.all(promises);
|
182
194
|
};
|
183
195
|
const throwIfWebresourceNotInMultipart = (webResourceFields, { req, request }) => {
|
184
|
-
if (
|
185
|
-
request.custom.isAction !== 'commitUpload' &&
|
186
|
-
!req.is?.('multipart') &&
|
196
|
+
if (!req.is?.('multipart') &&
|
187
197
|
webResourceFields.some((field) => request.values[field] != null)) {
|
188
198
|
throw new module_1.errors.BadRequestError('Use multipart requests to upload a file.');
|
189
199
|
}
|
@@ -191,7 +201,7 @@ const throwIfWebresourceNotInMultipart = (webResourceFields, { req, request }) =
|
|
191
201
|
const getCreateWebResourceHooks = (webResourceHandler) => {
|
192
202
|
return {
|
193
203
|
PRERUN: (hookArgs) => {
|
194
|
-
const webResourceFields =
|
204
|
+
const webResourceFields = getWebResourceFields(hookArgs.request);
|
195
205
|
throwIfWebresourceNotInMultipart(webResourceFields, hookArgs);
|
196
206
|
},
|
197
207
|
'POSTRUN-ERROR': async ({ tx, request }) => {
|
@@ -221,7 +231,7 @@ const getRemoveWebResourceHooks = (webResourceHandler) => {
|
|
221
231
|
return {
|
222
232
|
PRERUN: async (args) => {
|
223
233
|
const { api, request, tx } = args;
|
224
|
-
let webResourceFields =
|
234
|
+
let webResourceFields = getWebResourceFields(request);
|
225
235
|
throwIfWebresourceNotInMultipart(webResourceFields, args);
|
226
236
|
tx.on('rollback', () => {
|
227
237
|
void deleteRollbackPendingFields(request, webResourceHandler);
|
@@ -269,7 +279,7 @@ const getRemoveWebResourceHooks = (webResourceHandler) => {
|
|
269
279
|
};
|
270
280
|
};
|
271
281
|
const deleteRollbackPendingFields = async (request, webResourceHandler) => {
|
272
|
-
const fields =
|
282
|
+
const fields = getWebResourceFields(request);
|
273
283
|
if (fields.length === 0) {
|
274
284
|
return;
|
275
285
|
}
|
@@ -292,17 +302,6 @@ const setupUploadHooks = (handler, apiRoot, resourceName) => {
|
|
292
302
|
sbvrUtils.addPureHook('DELETE', apiRoot, resourceName, getRemoveWebResourceHooks(handler));
|
293
303
|
sbvrUtils.addPureHook('PATCH', apiRoot, resourceName, getRemoveWebResourceHooks(handler));
|
294
304
|
sbvrUtils.addPureHook('POST', apiRoot, resourceName, getCreateWebResourceHooks(handler));
|
295
|
-
sbvrUtils.addPureHook('POST', apiRoot, resourceName, (0, multipartUpload_1.multipartUploadHooks)(handler));
|
296
305
|
};
|
297
306
|
exports.setupUploadHooks = setupUploadHooks;
|
298
|
-
const webresourceModel = require('./webresource.sbvr');
|
299
|
-
exports.config = {
|
300
|
-
models: [
|
301
|
-
{
|
302
|
-
apiRoot: 'webresource',
|
303
|
-
modelText: webresourceModel,
|
304
|
-
modelName: 'webresource',
|
305
|
-
},
|
306
|
-
],
|
307
|
-
};
|
308
307
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/webresource-handler/index.ts"],"names":[],"mappings":"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"}
|
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": "17.0.0-build-
|
3
|
+
"version": "17.0.0-build-17-x-0447fb6e94bafa136206d060acda2f2df4c00ad2-1",
|
4
4
|
"main": "out/server-glue/module",
|
5
5
|
"type": "commonjs",
|
6
6
|
"repository": "git@github.com:balena-io/pinejs.git",
|
@@ -20,55 +20,53 @@
|
|
20
20
|
"webpack-build": "npm run webpack-browser && npm run webpack-module && npm run webpack-server",
|
21
21
|
"lint": "balena-lint -t tsconfig.dev.json -e js -e ts src build typings Gruntfile.ts && npx tsc --project tsconfig.dev.json --noEmit",
|
22
22
|
"test": "npm run lint && npm run build && npm run webpack-build && npm run test:compose",
|
23
|
-
"test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0'
|
23
|
+
"test:compose": "trap 'docker compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' INT; docker compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres PINEJS_WEBRESOURCE_MAXFILESIZE=1000000000 S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD S3_STORAGE_ADAPTER_BUCKET=balena-pine-web-resources S3_REGION=us-east-1 npm run mocha",
|
24
24
|
"mocha": "TS_NODE_FILES=true mocha",
|
25
25
|
"prettify": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts"
|
26
26
|
},
|
27
27
|
"dependencies": {
|
28
|
-
"@balena/abstract-sql-compiler": "^9.1.
|
29
|
-
"@balena/abstract-sql-to-typescript": "^
|
30
|
-
"@balena/env-parsing": "^1.1.
|
31
|
-
"@balena/lf-to-abstract-sql": "^5.0.
|
32
|
-
"@balena/odata-parser": "^3.0.
|
33
|
-
"@balena/odata-to-abstract-sql": "^6.2.
|
34
|
-
"@balena/sbvr-parser": "^1.4.
|
35
|
-
"@balena/sbvr-types": "^7.0
|
28
|
+
"@balena/abstract-sql-compiler": "^9.1.4",
|
29
|
+
"@balena/abstract-sql-to-typescript": "^3.0.2",
|
30
|
+
"@balena/env-parsing": "^1.1.12",
|
31
|
+
"@balena/lf-to-abstract-sql": "^5.0.2",
|
32
|
+
"@balena/odata-parser": "^3.0.7",
|
33
|
+
"@balena/odata-to-abstract-sql": "^6.2.7",
|
34
|
+
"@balena/sbvr-parser": "^1.4.4",
|
35
|
+
"@balena/sbvr-types": "^7.1.0",
|
36
36
|
"@types/body-parser": "^1.19.5",
|
37
37
|
"@types/compression": "^1.7.5",
|
38
|
-
"@types/cookie-parser": "^1.4.
|
38
|
+
"@types/cookie-parser": "^1.4.7",
|
39
39
|
"@types/deep-freeze": "^0.1.5",
|
40
40
|
"@types/express": "^4.17.21",
|
41
|
-
"@types/express-session": "^1.
|
42
|
-
"@types/lodash": "^4.
|
41
|
+
"@types/express-session": "^1.18.0",
|
42
|
+
"@types/lodash": "^4.17.1",
|
43
43
|
"@types/memoizee": "^0.4.11",
|
44
44
|
"@types/method-override": "^0.0.35",
|
45
45
|
"@types/multer": "^1.4.11",
|
46
|
-
"@types/mysql": "^2.15.
|
47
|
-
"@types/node": "^20.
|
46
|
+
"@types/mysql": "^2.15.26",
|
47
|
+
"@types/node": "^20.12.10",
|
48
48
|
"@types/passport": "^1.0.16",
|
49
49
|
"@types/passport-local": "^1.0.38",
|
50
50
|
"@types/passport-strategy": "^0.2.38",
|
51
|
-
"@types/pg": "^8.
|
52
|
-
"@types/randomstring": "^1.
|
51
|
+
"@types/pg": "^8.11.6",
|
52
|
+
"@types/randomstring": "^1.3.0",
|
53
53
|
"@types/websql": "^0.0.30",
|
54
54
|
"busboy": "^1.6.0",
|
55
55
|
"commander": "^11.1.0",
|
56
56
|
"deep-freeze": "^0.0.1",
|
57
57
|
"eventemitter3": "^5.0.1",
|
58
|
-
"express-session": "^1.
|
58
|
+
"express-session": "^1.18.0",
|
59
59
|
"lodash": "^4.17.21",
|
60
60
|
"memoizee": "^0.4.15",
|
61
|
-
"pinejs-client-core": "^6.14.
|
61
|
+
"pinejs-client-core": "^6.14.4",
|
62
62
|
"randomstring": "^1.3.0",
|
63
63
|
"typed-error": "^3.2.2"
|
64
64
|
},
|
65
65
|
"devDependencies": {
|
66
|
-
"@
|
67
|
-
"@
|
68
|
-
"@
|
69
|
-
"@
|
70
|
-
"@types/busboy": "^1.5.3",
|
71
|
-
"@types/chai": "^4.3.11",
|
66
|
+
"@balena/lint": "^8.0.2",
|
67
|
+
"@faker-js/faker": "^8.4.1",
|
68
|
+
"@types/busboy": "^1.5.4",
|
69
|
+
"@types/chai": "^4.3.16",
|
72
70
|
"@types/chai-as-promised": "^7.1.8",
|
73
71
|
"@types/grunt": "^0.4.31",
|
74
72
|
"@types/mocha": "^10.0.6",
|
@@ -90,40 +88,43 @@
|
|
90
88
|
"grunt-text-replace": "^0.4.0",
|
91
89
|
"grunt-ts": "^6.0.0-beta.22",
|
92
90
|
"grunt-webpack": "^6.0.0",
|
93
|
-
"husky": "^9.0.
|
94
|
-
"lint-staged": "^15.2.
|
91
|
+
"husky": "^9.0.11",
|
92
|
+
"lint-staged": "^15.2.2",
|
95
93
|
"load-grunt-tasks": "^5.1.0",
|
96
|
-
"mocha": "^10.
|
94
|
+
"mocha": "^10.4.0",
|
97
95
|
"on-finished": "^2.4.1",
|
98
|
-
"pinejs-client-supertest": "^2.0.
|
96
|
+
"pinejs-client-supertest": "^2.0.3",
|
99
97
|
"raw-loader": "^4.0.2",
|
100
98
|
"request": "^2.88.2",
|
101
99
|
"require-npm4-to-publish": "^1.0.0",
|
102
|
-
"supertest": "^
|
100
|
+
"supertest": "^7.0.0",
|
103
101
|
"terser-webpack-plugin": "^5.3.10",
|
104
102
|
"ts-loader": "^9.5.1",
|
105
103
|
"ts-node": "^10.9.2",
|
106
|
-
"typescript": "^5.
|
107
|
-
"webpack": "^5.
|
108
|
-
"webpack-dev-server": "^4.15.
|
104
|
+
"typescript": "^5.4.5",
|
105
|
+
"webpack": "^5.91.0",
|
106
|
+
"webpack-dev-server": "^4.15.2"
|
109
107
|
},
|
110
108
|
"optionalDependencies": {
|
109
|
+
"@aws-sdk/client-s3": "^3.569.0",
|
110
|
+
"@aws-sdk/lib-storage": "^3.569.0",
|
111
|
+
"@aws-sdk/s3-request-presigner": "^3.569.0",
|
111
112
|
"bcrypt": "^5.1.1",
|
112
113
|
"body-parser": "^1.20.2",
|
113
114
|
"compression": "^1.7.4",
|
114
115
|
"cookie-parser": "^1.4.6",
|
115
|
-
"express": "^4.
|
116
|
+
"express": "^4.19.2",
|
116
117
|
"method-override": "^3.0.0",
|
117
118
|
"mysql": "^2.18.1",
|
118
119
|
"passport": "^0.7.0",
|
119
120
|
"passport-local": "^1.0.0",
|
120
|
-
"pg": "^8.11.
|
121
|
-
"pg-connection-string": "^2.6.
|
121
|
+
"pg": "^8.11.5",
|
122
|
+
"pg-connection-string": "^2.6.4",
|
122
123
|
"serve-static": "^1.15.0"
|
123
124
|
},
|
124
125
|
"engines": {
|
125
|
-
"node": ">=
|
126
|
-
"npm": ">=
|
126
|
+
"node": ">=20.14.0",
|
127
|
+
"npm": ">=10.7.0"
|
127
128
|
},
|
128
129
|
"lint-staged": {
|
129
130
|
"*.js": [
|
@@ -143,6 +144,6 @@
|
|
143
144
|
"recursive": true
|
144
145
|
},
|
145
146
|
"versionist": {
|
146
|
-
"publishedAt": "2024-
|
147
|
+
"publishedAt": "2024-06-04T15:38:06.595Z"
|
147
148
|
}
|
148
149
|
}
|
@@ -17,7 +17,7 @@ const runCompile = async (inputFile: string, outputFile?: string) => {
|
|
17
17
|
|
18
18
|
const generateTypes = async (inputFile: string, outputFile?: string) => {
|
19
19
|
const { abstractSqlToTypescriptTypes } = await import(
|
20
|
-
'@balena/abstract-sql-to-typescript'
|
20
|
+
'@balena/abstract-sql-to-typescript/generate'
|
21
21
|
);
|
22
22
|
const abstractSql = getAbstractSqlModelFromFile(inputFile);
|
23
23
|
const types = abstractSqlToTypescriptTypes(abstractSql);
|
package/src/bin/sbvr-compiler.ts
CHANGED
@@ -42,7 +42,7 @@ const generateTypes = async (inputFile: string, outputFile?: string) => {
|
|
42
42
|
program.opts().engine,
|
43
43
|
);
|
44
44
|
const { abstractSqlToTypescriptTypes } = await import(
|
45
|
-
'@balena/abstract-sql-to-typescript'
|
45
|
+
'@balena/abstract-sql-to-typescript/generate'
|
46
46
|
);
|
47
47
|
const types = abstractSqlToTypescriptTypes(models.abstractSql);
|
48
48
|
|
@@ -61,7 +61,7 @@ export function setup(app, sbvrUtils) {
|
|
61
61
|
sbvrUtils.addPureHook('PUT', modelName, 'all', {
|
62
62
|
async PRERUN({ tx, request }) {
|
63
63
|
const vocab = request.vocabulary;
|
64
|
-
const
|
64
|
+
const log = sbvrUtils.logger[vocab];
|
65
65
|
const id = sbvrUtils.getID(vocab, request);
|
66
66
|
let result;
|
67
67
|
try {
|
@@ -77,7 +77,7 @@ SELECT NOT EXISTS(
|
|
77
77
|
[request.resourceName, id],
|
78
78
|
);
|
79
79
|
} catch (/** @type any */ err) {
|
80
|
-
|
80
|
+
log.error('Unable to check resource locks', err);
|
81
81
|
throw new Error('Unable to check resource locks');
|
82
82
|
}
|
83
83
|
if ([false, 0, '0'].includes(result.rows[0].result)) {
|
package/src/migrator/async.ts
CHANGED
@@ -28,7 +28,7 @@ import {
|
|
28
28
|
import { booleanToEnabledString } from '../config-loader/env';
|
29
29
|
|
30
30
|
// log the startup condition of the async migration
|
31
|
-
(sbvrUtils.
|
31
|
+
(sbvrUtils.logger?.migrations?.info ?? console.info)(
|
32
32
|
`Async migration execution is ${booleanToEnabledString(
|
33
33
|
migratorEnv.asyncMigrationIsEnabled,
|
34
34
|
)}`,
|
@@ -153,7 +153,7 @@ const $run = async (
|
|
153
153
|
(await tx.executeSql(asyncMigrationSqlStatement)).rowsAffected;
|
154
154
|
} else {
|
155
155
|
// don't break the async migration b/c of one migration fails
|
156
|
-
(sbvrUtils.
|
156
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
157
157
|
`Invalid migration object: ${JSON.stringify(migration, null, 2)}`,
|
158
158
|
);
|
159
159
|
continue;
|
@@ -170,7 +170,7 @@ const $run = async (
|
|
170
170
|
asyncRunnerMigratorFn = async (tx: Tx) =>
|
171
171
|
(await tx.executeSql(migration)).rowsAffected;
|
172
172
|
} else {
|
173
|
-
(sbvrUtils.
|
173
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
174
174
|
`Invalid async migration object: ${JSON.stringify(migration, null, 2)}`,
|
175
175
|
);
|
176
176
|
continue;
|
@@ -210,7 +210,7 @@ const $run = async (
|
|
210
210
|
if (!migrationState) {
|
211
211
|
// migration status is unclear stop the migrator
|
212
212
|
// or migration should stop
|
213
|
-
(sbvrUtils.
|
213
|
+
(sbvrUtils.logger.migrations?.info ?? console.info)(
|
214
214
|
`stopping async migration due to missing migration status: ${key}`,
|
215
215
|
);
|
216
216
|
return false;
|
@@ -246,7 +246,7 @@ const $run = async (
|
|
246
246
|
}
|
247
247
|
} catch (err) {
|
248
248
|
(
|
249
|
-
sbvrUtils.
|
249
|
+
sbvrUtils.logger.migrations?.error ??
|
250
250
|
console.error
|
251
251
|
)(
|
252
252
|
`error rolling back pending async migration tx on mgmt tx end/rollback: ${key}: ${err}`,
|
@@ -280,14 +280,13 @@ const $run = async (
|
|
280
280
|
initMigrationState.errorThreshold ===
|
281
281
|
0
|
282
282
|
) {
|
283
|
-
(
|
284
|
-
|
285
|
-
|
286
|
-
)(`${key}: ${err.name} ${err.message}`);
|
283
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
284
|
+
`${key}: ${err.name} ${err.message}`,
|
285
|
+
);
|
287
286
|
migrationState.is_backing_off = true;
|
288
287
|
}
|
289
288
|
} else {
|
290
|
-
(sbvrUtils.
|
289
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
291
290
|
`async migration error unknown: ${key}: ${err}`,
|
292
291
|
);
|
293
292
|
}
|
@@ -312,7 +311,7 @@ const $run = async (
|
|
312
311
|
setTimeout(asyncRunner, initMigrationState.delayMS);
|
313
312
|
}
|
314
313
|
} catch (err) {
|
315
|
-
(sbvrUtils.
|
314
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
316
315
|
`error running async migration: ${key}: ${err}`,
|
317
316
|
);
|
318
317
|
setTimeout(asyncRunner, initMigrationState.backoffDelayMS);
|
package/src/migrator/sync.ts
CHANGED
@@ -29,7 +29,7 @@ export const postRun = async (tx: Tx, model: ApiRootModel): Promise<void> => {
|
|
29
29
|
const modelName = model.apiRoot;
|
30
30
|
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
31
31
|
if (modelIsNew) {
|
32
|
-
(sbvrUtils.
|
32
|
+
(sbvrUtils.logger.migrations?.info ?? console.info)(
|
33
33
|
`First time executing '${modelName}', running init script`,
|
34
34
|
);
|
35
35
|
|
@@ -37,7 +37,7 @@ export const postRun = async (tx: Tx, model: ApiRootModel): Promise<void> => {
|
|
37
37
|
try {
|
38
38
|
await tx.executeSql(initSql);
|
39
39
|
} catch (err: any) {
|
40
|
-
(sbvrUtils.
|
40
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
41
41
|
`initSql execution error ${err} `,
|
42
42
|
);
|
43
43
|
throw new MigrationError(err);
|
@@ -69,7 +69,7 @@ const $run = async (
|
|
69
69
|
// to make changes that can't be automatically applied
|
70
70
|
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
71
71
|
if (modelIsNew) {
|
72
|
-
(sbvrUtils.
|
72
|
+
(sbvrUtils.logger.migrations?.info ?? console.info)(
|
73
73
|
`First time model '${modelName}' has executed, skipping migrations`,
|
74
74
|
);
|
75
75
|
return await setExecutedMigrations(tx, modelName, Object.keys(migrations));
|
@@ -94,7 +94,7 @@ const $run = async (
|
|
94
94
|
...newlyExecutedMigrations,
|
95
95
|
]);
|
96
96
|
} catch (err: any) {
|
97
|
-
(sbvrUtils.
|
97
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
98
98
|
`Failed to executed synchronous migrations from api root model ${err}`,
|
99
99
|
);
|
100
100
|
throw new MigrationError(err);
|
@@ -111,7 +111,7 @@ const executeMigrations = async (
|
|
111
111
|
await executeMigration(tx, migration);
|
112
112
|
}
|
113
113
|
} catch (err: any) {
|
114
|
-
(sbvrUtils.
|
114
|
+
(sbvrUtils.logger.migrations?.error ?? console.error)(
|
115
115
|
'Error while executing migrations, rolled back',
|
116
116
|
);
|
117
117
|
throw new MigrationError(err);
|
@@ -123,7 +123,7 @@ const executeMigration = async (
|
|
123
123
|
tx: Tx,
|
124
124
|
[key, migration]: MigrationTuple,
|
125
125
|
): Promise<void> => {
|
126
|
-
(sbvrUtils.
|
126
|
+
(sbvrUtils.logger.migrations?.info ?? console.info)(
|
127
127
|
`Running migration ${JSON.stringify(key)}`,
|
128
128
|
);
|
129
129
|
|
@@ -49,7 +49,7 @@ export const compileRequest = (request: ODataRequest) => {
|
|
49
49
|
request.sqlQuery = sqlQuery;
|
50
50
|
request.modifiedFields = modifiedFields;
|
51
51
|
} catch (err: any) {
|
52
|
-
sbvrUtils.
|
52
|
+
sbvrUtils.logger[request.vocabulary].error(
|
53
53
|
'Failed to compile abstract sql: ',
|
54
54
|
request.abstractSqlQuery,
|
55
55
|
err,
|
@@ -1268,7 +1268,7 @@ export const getUserPermissions = async (
|
|
1268
1268
|
try {
|
1269
1269
|
return await $getUserPermissions(userId, tx);
|
1270
1270
|
} catch (err: any) {
|
1271
|
-
sbvrUtils.
|
1271
|
+
sbvrUtils.logger.Auth.error('Error loading user permissions', err);
|
1272
1272
|
throw err;
|
1273
1273
|
}
|
1274
1274
|
};
|
@@ -1396,7 +1396,7 @@ export const getApiKeyPermissions = async (
|
|
1396
1396
|
try {
|
1397
1397
|
return await $getApiKeyPermissions(apiKey, tx);
|
1398
1398
|
} catch (err: any) {
|
1399
|
-
sbvrUtils.
|
1399
|
+
sbvrUtils.logger.Auth.error('Error loading api key permissions', err);
|
1400
1400
|
throw err;
|
1401
1401
|
}
|
1402
1402
|
};
|
@@ -1577,7 +1577,7 @@ export const checkPermissionsMiddleware =
|
|
1577
1577
|
);
|
1578
1578
|
}
|
1579
1579
|
} catch (err: any) {
|
1580
|
-
sbvrUtils.
|
1580
|
+
sbvrUtils.logger.Auth.error('Error checking permissions', err);
|
1581
1581
|
res.status(503).end();
|
1582
1582
|
}
|
1583
1583
|
};
|