@balena/pinejs 16.2.0-build-joshbwlng-tasks-33d358773f8b8967b2eb6a90a6d72802e673a82e-1 → 16.2.0-build-joshbwlng-tasks-56c035f7e142216b5cf56fc7d861ce4b51157a41-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.pinejs-cache.json +1 -1
- package/.versionbot/CHANGELOG.yml +2 -10
- package/CHANGELOG.md +0 -1
- package/out/tasks/worker.js +15 -29
- package/out/tasks/worker.js.map +1 -1
- package/package.json +2 -2
- package/src/tasks/worker.ts +17 -34
|
@@ -1,14 +1,6 @@
|
|
|
1
1
|
- commits:
|
|
2
|
-
- subject: Rollback handler tx on failure
|
|
3
|
-
hash: 33d358773f8b8967b2eb6a90a6d72802e673a82e
|
|
4
|
-
body: ""
|
|
5
|
-
footer:
|
|
6
|
-
Change-type: patch
|
|
7
|
-
change-type: patch
|
|
8
|
-
author: Josh Bowling
|
|
9
|
-
nested: []
|
|
10
2
|
- subject: Add async tasks
|
|
11
|
-
hash:
|
|
3
|
+
hash: 56c035f7e142216b5cf56fc7d861ce4b51157a41
|
|
12
4
|
body: ""
|
|
13
5
|
footer:
|
|
14
6
|
Change-type: minor
|
|
@@ -17,7 +9,7 @@
|
|
|
17
9
|
nested: []
|
|
18
10
|
version: 16.2.0
|
|
19
11
|
title: ""
|
|
20
|
-
date: 2024-04-
|
|
12
|
+
date: 2024-04-25T23:07:33.307Z
|
|
21
13
|
- commits:
|
|
22
14
|
- subject: Update @balena/odata-to-abstract-sql to 6.2.7
|
|
23
15
|
hash: 76b2f842af0b49ef2956db23a22758fc0d1e50a0
|
package/CHANGELOG.md
CHANGED
package/out/tasks/worker.js
CHANGED
|
@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.Worker = void 0;
|
|
27
27
|
const env_1 = require("../config-loader/env");
|
|
28
|
-
const db_1 = require("../database-layer/db");
|
|
29
28
|
const permissions = __importStar(require("../sbvr-api/permissions"));
|
|
30
29
|
const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
|
|
31
30
|
const module_1 = require("../server-glue/module");
|
|
@@ -67,36 +66,23 @@ class Worker {
|
|
|
67
66
|
await this.finalize(tx, task, startedOnTime, 'failed', `Invalid parameter set: ${common_1.ajv.errorsText(handler.validate.errors)}`);
|
|
68
67
|
return;
|
|
69
68
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
});
|
|
83
|
-
status = result.status;
|
|
84
|
-
error = result.error;
|
|
85
|
-
if (status !== 'success') {
|
|
86
|
-
await handlerTx.rollback();
|
|
87
|
-
}
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
|
-
catch (err) {
|
|
91
|
-
if (err instanceof db_1.TransactionClosedError &&
|
|
92
|
-
err.message.includes('rolled back')) {
|
|
93
|
-
return;
|
|
94
|
-
}
|
|
95
|
-
throw err;
|
|
69
|
+
await tx.executeSql(`SAVEPOINT task_${task.id}`);
|
|
70
|
+
const result = await handler.fn({
|
|
71
|
+
api: new sbvr_utils_1.PinejsClient({
|
|
72
|
+
passthrough: {
|
|
73
|
+
tx,
|
|
74
|
+
},
|
|
75
|
+
}),
|
|
76
|
+
params: task.is_executed_with__parameter_set ?? {},
|
|
77
|
+
tx,
|
|
78
|
+
});
|
|
79
|
+
if (result.status === 'success') {
|
|
80
|
+
await tx.executeSql(`RELEASE SAVEPOINT task_${task.id}`);
|
|
96
81
|
}
|
|
97
|
-
|
|
98
|
-
await
|
|
82
|
+
else {
|
|
83
|
+
await tx.executeSql(`ROLLBACK TO SAVEPOINT task_${task.id}`);
|
|
99
84
|
}
|
|
85
|
+
await this.finalize(tx, task, startedOnTime, result.status, result.error);
|
|
100
86
|
}
|
|
101
87
|
catch (err) {
|
|
102
88
|
console.error('Task execution failed:', err);
|
package/out/tasks/worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/tasks/worker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAyD;AAEzD,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/tasks/worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs",
|
|
3
|
-
"version": "16.2.0-build-joshbwlng-tasks-
|
|
3
|
+
"version": "16.2.0-build-joshbwlng-tasks-56c035f7e142216b5cf56fc7d861ce4b51157a41-1",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
@@ -147,6 +147,6 @@
|
|
|
147
147
|
"recursive": true
|
|
148
148
|
},
|
|
149
149
|
"versionist": {
|
|
150
|
-
"publishedAt": "2024-04-
|
|
150
|
+
"publishedAt": "2024-04-25T23:07:34.017Z"
|
|
151
151
|
}
|
|
152
152
|
}
|
package/src/tasks/worker.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { AnyObject } from 'pinejs-client-core';
|
|
2
2
|
import { tasks as tasksEnv } from '../config-loader/env';
|
|
3
3
|
import type * as Db from '../database-layer/db';
|
|
4
|
-
import { TransactionClosedError } from '../database-layer/db';
|
|
5
4
|
import * as permissions from '../sbvr-api/permissions';
|
|
6
5
|
import { PinejsClient } from '../sbvr-api/sbvr-utils';
|
|
7
6
|
import { sbvrUtils } from '../server-glue/module';
|
|
@@ -81,40 +80,24 @@ export class Worker {
|
|
|
81
80
|
}
|
|
82
81
|
|
|
83
82
|
// Execute handler
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
error = result.error;
|
|
99
|
-
|
|
100
|
-
// Rollback handler tx if handler failed
|
|
101
|
-
if (status !== 'success') {
|
|
102
|
-
await handlerTx.rollback();
|
|
103
|
-
}
|
|
104
|
-
});
|
|
105
|
-
} catch (err) {
|
|
106
|
-
// Ignore rollback errors
|
|
107
|
-
if (
|
|
108
|
-
err instanceof TransactionClosedError &&
|
|
109
|
-
err.message.includes('rolled back')
|
|
110
|
-
) {
|
|
111
|
-
return;
|
|
112
|
-
}
|
|
113
|
-
throw err;
|
|
114
|
-
} finally {
|
|
115
|
-
// Update task with results
|
|
116
|
-
await this.finalize(tx, task, startedOnTime, status, error);
|
|
83
|
+
await tx.executeSql(`SAVEPOINT task_${task.id}`);
|
|
84
|
+
const result = await handler.fn({
|
|
85
|
+
api: new PinejsClient({
|
|
86
|
+
passthrough: {
|
|
87
|
+
tx,
|
|
88
|
+
},
|
|
89
|
+
}),
|
|
90
|
+
params: task.is_executed_with__parameter_set ?? {},
|
|
91
|
+
tx,
|
|
92
|
+
});
|
|
93
|
+
if (result.status === 'success') {
|
|
94
|
+
await tx.executeSql(`RELEASE SAVEPOINT task_${task.id}`);
|
|
95
|
+
} else {
|
|
96
|
+
await tx.executeSql(`ROLLBACK TO SAVEPOINT task_${task.id}`);
|
|
117
97
|
}
|
|
98
|
+
|
|
99
|
+
// Update task with results
|
|
100
|
+
await this.finalize(tx, task, startedOnTime, result.status, result.error);
|
|
118
101
|
} catch (err) {
|
|
119
102
|
// This shouldn't happen, but if it does we want to log and kill the process
|
|
120
103
|
console.error('Task execution failed:', err);
|