@balena/pinejs 18.0.1-build-fisehara-reproduce-patch-translation-issue-d7aff91660b81d1683ba85c91d788c707dc81023-1 → 18.1.0-build-joshbwlng-tasks-79d39d05d88bf5f8e2ad08ed75694a2a728dc9a3-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.
Files changed (42) hide show
  1. package/.pinejs-cache.json +1 -1
  2. package/.versionbot/CHANGELOG.yml +6 -16
  3. package/CHANGELOG.md +3 -4
  4. package/VERSION +1 -1
  5. package/out/config-loader/env.d.ts +4 -0
  6. package/out/config-loader/env.js +5 -1
  7. package/out/config-loader/env.js.map +1 -1
  8. package/out/database-layer/db.d.ts +3 -0
  9. package/out/database-layer/db.js +20 -3
  10. package/out/database-layer/db.js.map +1 -1
  11. package/out/sbvr-api/permissions.js +0 -4
  12. package/out/sbvr-api/permissions.js.map +1 -1
  13. package/out/server-glue/module.d.ts +1 -0
  14. package/out/server-glue/module.js +4 -1
  15. package/out/server-glue/module.js.map +1 -1
  16. package/out/tasks/common.d.ts +4 -0
  17. package/out/tasks/common.js +11 -0
  18. package/out/tasks/common.js.map +1 -0
  19. package/out/tasks/index.d.ts +9 -0
  20. package/out/tasks/index.js +134 -0
  21. package/out/tasks/index.js.map +1 -0
  22. package/out/tasks/tasks.d.ts +40 -0
  23. package/out/tasks/tasks.js +3 -0
  24. package/out/tasks/tasks.js.map +1 -0
  25. package/out/tasks/tasks.sbvr +55 -0
  26. package/out/tasks/worker.d.ts +32 -0
  27. package/out/tasks/worker.js +224 -0
  28. package/out/tasks/worker.js.map +1 -0
  29. package/package.json +9 -6
  30. package/src/config-loader/env.ts +6 -1
  31. package/src/database-layer/db.ts +30 -3
  32. package/src/migrator/migrations.ts +1 -1
  33. package/src/sbvr-api/dev.ts +1 -1
  34. package/src/sbvr-api/permissions.ts +0 -14
  35. package/src/sbvr-api/sbvr-utils.ts +1 -1
  36. package/src/sbvr-api/user.ts +1 -1
  37. package/src/server-glue/module.ts +3 -0
  38. package/src/tasks/common.ts +9 -0
  39. package/src/tasks/index.ts +152 -0
  40. package/src/tasks/tasks.sbvr +55 -0
  41. package/src/tasks/tasks.ts +46 -0
  42. package/src/tasks/worker.ts +309 -0
@@ -0,0 +1,134 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.worker = exports.config = void 0;
27
+ exports.setup = setup;
28
+ exports.addTaskHandler = addTaskHandler;
29
+ const cronParser = __importStar(require("cron-parser"));
30
+ const env_1 = require("../config-loader/env");
31
+ const hooks_1 = require("../sbvr-api/hooks");
32
+ const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
33
+ const common_1 = require("./common");
34
+ const worker_1 = require("./worker");
35
+ const modelText = require('./tasks.sbvr');
36
+ const initSql = `
37
+ CREATE OR REPLACE FUNCTION notify_task_insert()
38
+ RETURNS TRIGGER AS $$
39
+ BEGIN
40
+ PERFORM pg_notify('${common_1.channel}', NEW.id::text);
41
+ RETURN NEW;
42
+ END;
43
+ $$ LANGUAGE plpgsql;
44
+
45
+ CREATE OR REPLACE TRIGGER task_insert_trigger
46
+ AFTER INSERT ON task
47
+ FOR EACH ROW WHEN (NEW.status = 'queued' AND NEW."is scheduled to execute on-time" IS NULL)
48
+ EXECUTE FUNCTION notify_task_insert();
49
+
50
+ CREATE INDEX IF NOT EXISTS idx_task_poll ON task USING btree (
51
+ "is executed by-handler",
52
+ "is scheduled to execute on-time" ASC,
53
+ "id" ASC
54
+ ) WHERE status = 'queued';
55
+ `;
56
+ exports.config = {
57
+ models: [
58
+ {
59
+ modelName: common_1.apiRoot,
60
+ apiRoot: common_1.apiRoot,
61
+ modelText,
62
+ customServerCode: exports,
63
+ initSql,
64
+ },
65
+ ],
66
+ };
67
+ exports.worker = null;
68
+ async function setup() {
69
+ if (sbvrUtils.db.engine !== 'postgres') {
70
+ console.warn('Skipping task setup as database not supported');
71
+ return;
72
+ }
73
+ const client = sbvrUtils.api[common_1.apiRoot];
74
+ exports.worker = new worker_1.Worker(client);
75
+ (0, hooks_1.addPureHook)('POST', common_1.apiRoot, 'task', {
76
+ POSTPARSE: async ({ req, request }) => {
77
+ request.values.is_created_by__actor =
78
+ req.user?.actor ?? req.apiKey?.actor;
79
+ if (request.values.is_created_by__actor == null) {
80
+ throw new Error('Creating tasks with missing actor on req is not allowed');
81
+ }
82
+ request.values.status = 'queued';
83
+ request.values.attempt_count = 0;
84
+ request.values.attempt_limit ??= 1;
85
+ if (request.values.is_scheduled_with__cron_expression != null &&
86
+ request.values.is_scheduled_to_execute_on__time == null) {
87
+ try {
88
+ request.values.is_scheduled_to_execute_on__time = cronParser
89
+ .parseExpression(request.values.is_scheduled_with__cron_expression)
90
+ .next()
91
+ .toDate()
92
+ .toISOString();
93
+ }
94
+ catch {
95
+ throw new Error(`Invalid cron expression: ${request.values.is_scheduled_with__cron_expression}`);
96
+ }
97
+ }
98
+ if (request.values.is_scheduled_to_execute_on__time != null) {
99
+ const now = new Date(Date.now() + env_1.tasks.queueIntervalMS);
100
+ const startTime = new Date(request.values.is_scheduled_to_execute_on__time);
101
+ if (startTime < now) {
102
+ throw new Error(`Task scheduled start time must be greater than ${env_1.tasks.queueIntervalMS} milliseconds in the future`);
103
+ }
104
+ }
105
+ const handlerName = request.values.is_executed_by__handler;
106
+ if (handlerName == null) {
107
+ throw new Error(`Must specify a task handler to execute`);
108
+ }
109
+ const handler = exports.worker?.handlers[handlerName];
110
+ if (handler == null) {
111
+ throw new Error(`No task handler with name '${handlerName}' registered`);
112
+ }
113
+ if (handler.validate != null) {
114
+ if (!handler.validate(request.values.is_executed_with__parameter_set)) {
115
+ throw new Error(`Invalid parameter set: ${common_1.ajv.errorsText(handler.validate.errors)}`);
116
+ }
117
+ }
118
+ },
119
+ });
120
+ }
121
+ function addTaskHandler(name, fn, schema) {
122
+ if (exports.worker == null) {
123
+ throw new Error('Database does not support tasks');
124
+ }
125
+ if (exports.worker.handlers[name] != null) {
126
+ throw new Error(`Task handler with name '${name}' already registered`);
127
+ }
128
+ exports.worker.handlers[name] = {
129
+ name,
130
+ fn,
131
+ validate: schema != null ? common_1.ajv.compile(schema) : undefined,
132
+ };
133
+ }
134
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tasks/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,40 @@
1
+ import type { Types } from '@balena/abstract-sql-to-typescript';
2
+ export interface Task {
3
+ Read: {
4
+ created_at: Types['Date Time']['Read'];
5
+ modified_at: Types['Date Time']['Read'];
6
+ id: Types['Big Serial']['Read'];
7
+ key: Types['Short Text']['Read'] | null;
8
+ is_created_by__actor: Types['Integer']['Read'];
9
+ is_executed_by__handler: Types['Short Text']['Read'];
10
+ is_executed_with__parameter_set: Types['JSON']['Read'] | null;
11
+ is_scheduled_with__cron_expression: Types['Short Text']['Read'] | null;
12
+ is_scheduled_to_execute_on__time: Types['Date Time']['Read'] | null;
13
+ status: 'queued' | 'cancelled' | 'succeeded' | 'failed';
14
+ started_on__time: Types['Date Time']['Read'] | null;
15
+ ended_on__time: Types['Date Time']['Read'] | null;
16
+ error_message: Types['Short Text']['Read'] | null;
17
+ attempt_count: Types['Integer']['Read'];
18
+ attempt_limit: Types['Integer']['Read'];
19
+ };
20
+ Write: {
21
+ created_at: Types['Date Time']['Write'];
22
+ modified_at: Types['Date Time']['Write'];
23
+ id: Types['Big Serial']['Write'];
24
+ key: Types['Short Text']['Write'] | null;
25
+ is_created_by__actor: Types['Integer']['Write'];
26
+ is_executed_by__handler: Types['Short Text']['Write'];
27
+ is_executed_with__parameter_set: Types['JSON']['Write'] | null;
28
+ is_scheduled_with__cron_expression: Types['Short Text']['Write'] | null;
29
+ is_scheduled_to_execute_on__time: Types['Date Time']['Write'] | null;
30
+ status: 'queued' | 'cancelled' | 'succeeded' | 'failed';
31
+ started_on__time: Types['Date Time']['Write'] | null;
32
+ ended_on__time: Types['Date Time']['Write'] | null;
33
+ error_message: Types['Short Text']['Write'] | null;
34
+ attempt_count: Types['Integer']['Write'];
35
+ attempt_limit: Types['Integer']['Write'];
36
+ };
37
+ }
38
+ export default interface $Model {
39
+ task: Task;
40
+ }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=tasks.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../src/tasks/tasks.ts"],"names":[],"mappings":""}
@@ -0,0 +1,55 @@
1
+ Vocabulary: tasks
2
+
3
+ Term: id
4
+ Concept Type: Big Serial (Type)
5
+ Term: actor
6
+ Concept Type: Integer (Type)
7
+ Term: attempt count
8
+ Concept Type: Integer (Type)
9
+ Term: attempt limit
10
+ Concept Type: Integer (Type)
11
+ Term: cron expression
12
+ Concept Type: Short Text (Type)
13
+ Term: error message
14
+ Concept Type: Short Text (Type)
15
+ Term: handler
16
+ Concept Type: Short Text (Type)
17
+ Term: key
18
+ Concept Type: Short Text (Type)
19
+ Term: parameter set
20
+ Concept Type: JSON (Type)
21
+ Term: status
22
+ Concept Type: Short Text (Type)
23
+ Term: time
24
+ Concept Type: Date Time (Type)
25
+
26
+ Term: task
27
+ Fact type: task has id
28
+ Necessity: each task has exactly one id
29
+ Fact type: task has key
30
+ Necessity: each task has at most one key
31
+ Fact type: task is created by actor
32
+ Necessity: each task is created by exactly one actor
33
+ Fact type: task is executed by handler
34
+ Necessity: each task is executed by exactly one handler
35
+ Fact type: task is executed with parameter set
36
+ Necessity: each task is executed with at most one parameter set
37
+ Fact type: task is scheduled with cron expression
38
+ Necessity: each task is scheduled with at most one cron expression
39
+ Fact type: task is scheduled to execute on time
40
+ Necessity: each task is scheduled to execute on at most one time
41
+ Fact type: task has status
42
+ Necessity: each task has exactly one status
43
+ Definition: "queued" or "cancelled" or "succeeded" or "failed"
44
+ Fact type: task started on time
45
+ Necessity: each task started on at most one time
46
+ Fact type: task ended on time
47
+ Necessity: each task ended on at most one time
48
+ Fact type: task has error message
49
+ Necessity: each task has at most one error message
50
+ Fact type: task has attempt count
51
+ Necessity: each task has exactly one attempt count
52
+ Fact type: task has attempt limit
53
+ Necessity: each task has exactly one attempt limit
54
+ Necessity: each task has an attempt limit that is greater than or equal to 1
55
+
@@ -0,0 +1,32 @@
1
+ import type { ValidateFunction } from 'ajv';
2
+ import type { AnyObject } from 'pinejs-client-core';
3
+ import { PinejsClient } from '../sbvr-api/sbvr-utils';
4
+ import type { Task } from './tasks';
5
+ interface TaskArgs {
6
+ api: PinejsClient;
7
+ params: AnyObject;
8
+ }
9
+ type TaskResponse = Promise<{
10
+ status: Task['Read']['status'];
11
+ error?: string;
12
+ }>;
13
+ export interface TaskHandler {
14
+ name: string;
15
+ fn: (options: TaskArgs) => TaskResponse;
16
+ validate?: ValidateFunction;
17
+ }
18
+ export declare class Worker {
19
+ private readonly client;
20
+ handlers: Record<string, TaskHandler>;
21
+ private readonly concurrency;
22
+ private readonly interval;
23
+ private executing;
24
+ constructor(client: PinejsClient);
25
+ private canExecute;
26
+ private execute;
27
+ private update;
28
+ private getNextAttemptTime;
29
+ private poll;
30
+ start(): Promise<void>;
31
+ }
32
+ export {};
@@ -0,0 +1,224 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.Worker = void 0;
27
+ const promises_1 = require("node:timers/promises");
28
+ const env_1 = require("../config-loader/env");
29
+ const permissions = __importStar(require("../sbvr-api/permissions"));
30
+ const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
31
+ const module_1 = require("../server-glue/module");
32
+ const common_1 = require("./common");
33
+ const selectColumns = Object.entries({
34
+ id: 'id',
35
+ 'is executed by-handler': 'is_executed_by__handler',
36
+ 'is executed with-parameter set': 'is_executed_with__parameter_set',
37
+ 'is scheduled with-cron expression': 'is_scheduled_with__cron_expression',
38
+ 'attempt count': 'attempt_count',
39
+ 'attempt limit': 'attempt_limit',
40
+ 'is created by-actor': 'is_created_by__actor',
41
+ })
42
+ .map(([key, value]) => `t."${key}" AS "${value}"`)
43
+ .join(', ');
44
+ class Worker {
45
+ client;
46
+ handlers = {};
47
+ concurrency;
48
+ interval;
49
+ executing = 0;
50
+ constructor(client) {
51
+ this.client = client;
52
+ this.concurrency = env_1.tasks.queueConcurrency;
53
+ this.interval = env_1.tasks.queueIntervalMS;
54
+ }
55
+ canExecute() {
56
+ return (this.executing < this.concurrency && Object.keys(this.handlers).length > 0);
57
+ }
58
+ async execute(task, tx) {
59
+ this.executing++;
60
+ try {
61
+ const handler = this.handlers[task.is_executed_by__handler];
62
+ const startedOnTime = new Date();
63
+ if (handler == null) {
64
+ await this.update(tx, task, startedOnTime, 'failed', 'Matching task handler not found, this should never happen!');
65
+ return;
66
+ }
67
+ if (handler.validate != null &&
68
+ !handler.validate(task.is_executed_with__parameter_set)) {
69
+ await this.update(tx, task, startedOnTime, 'failed', `Invalid parameter set: ${common_1.ajv.errorsText(handler.validate.errors)}`);
70
+ return;
71
+ }
72
+ let status = 'queued';
73
+ let error;
74
+ try {
75
+ const results = await handler.fn({
76
+ api: new sbvr_utils_1.PinejsClient({}),
77
+ params: task.is_executed_with__parameter_set ?? {},
78
+ });
79
+ status = results.status;
80
+ error = results.error;
81
+ }
82
+ finally {
83
+ await this.update(tx, task, startedOnTime, status, error);
84
+ }
85
+ }
86
+ catch (err) {
87
+ console.error(`Failed to execute task ${task.id} with handler ${task.is_executed_by__handler}:`, err);
88
+ process.exit(1);
89
+ }
90
+ finally {
91
+ this.executing--;
92
+ }
93
+ }
94
+ async update(tx, task, startedOnTime, status, errorMessage) {
95
+ const attemptCount = task.attempt_count + 1;
96
+ const body = {
97
+ started_on__time: startedOnTime,
98
+ ended_on__time: new Date(),
99
+ status,
100
+ attempt_count: attemptCount,
101
+ ...(errorMessage != null && { error_message: errorMessage }),
102
+ };
103
+ if (status === 'failed' && attemptCount < task.attempt_limit) {
104
+ body.status = 'queued';
105
+ body.is_scheduled_to_execute_on__time =
106
+ this.getNextAttemptTime(attemptCount);
107
+ }
108
+ await this.client.patch({
109
+ resource: 'task',
110
+ passthrough: {
111
+ tx,
112
+ req: permissions.root,
113
+ },
114
+ id: task.id,
115
+ body,
116
+ });
117
+ if (body.status != null &&
118
+ ['failed', 'succeeded'].includes(body.status) &&
119
+ task.is_scheduled_with__cron_expression != null) {
120
+ await this.client.post({
121
+ resource: 'task',
122
+ passthrough: {
123
+ tx,
124
+ req: permissions.root,
125
+ },
126
+ options: {
127
+ returnResource: false,
128
+ },
129
+ body: {
130
+ attempt_limit: task.attempt_limit,
131
+ is_created_by__actor: task.is_created_by__actor,
132
+ is_executed_by__handler: task.is_executed_by__handler,
133
+ is_executed_with__parameter_set: task.is_executed_with__parameter_set,
134
+ is_scheduled_with__cron_expression: task.is_scheduled_with__cron_expression,
135
+ },
136
+ });
137
+ }
138
+ }
139
+ getNextAttemptTime(attempt) {
140
+ const delay = Math.ceil(Math.exp(Math.min(10, attempt)));
141
+ return new Date(Date.now() + delay);
142
+ }
143
+ poll() {
144
+ let executed = false;
145
+ void (async () => {
146
+ try {
147
+ if (!this.canExecute()) {
148
+ return;
149
+ }
150
+ const handlerNames = Object.keys(this.handlers);
151
+ await module_1.sbvrUtils.db.transaction(async (tx) => {
152
+ const result = await module_1.sbvrUtils.db.executeSql(`SELECT ${selectColumns}
153
+ FROM task AS t
154
+ WHERE
155
+ t."is executed by-handler" IN (${handlerNames.map((_, index) => `$${index + 1}`).join(', ')}) AND
156
+ t."status" = 'queued' AND
157
+ t."attempt count" <= t."attempt limit" AND
158
+ (
159
+ t."is scheduled to execute on-time" IS NULL OR
160
+ t."is scheduled to execute on-time" <= CURRENT_TIMESTAMP + $${handlerNames.length + 1} * INTERVAL '1 SECOND'
161
+ )
162
+ ORDER BY
163
+ t."is scheduled to execute on-time" ASC,
164
+ t."id" ASC
165
+ LIMIT 1 FOR UPDATE SKIP LOCKED`, [...handlerNames, Math.ceil(this.interval / 1000)]);
166
+ if (result.rows.length > 0) {
167
+ await this.execute(result.rows[0], tx);
168
+ executed = true;
169
+ }
170
+ });
171
+ }
172
+ catch (err) {
173
+ console.error('Failed polling for tasks:', err);
174
+ }
175
+ finally {
176
+ if (!executed) {
177
+ await (0, promises_1.setTimeout)(this.interval);
178
+ }
179
+ this.poll();
180
+ }
181
+ })();
182
+ }
183
+ async start() {
184
+ if (module_1.sbvrUtils.db.engine !== 'postgres' || module_1.sbvrUtils.db.on == null) {
185
+ throw new Error('Database does not support tasks, giving up on starting worker');
186
+ }
187
+ const tasksWithUnknownHandlers = await this.client.get({
188
+ resource: 'task',
189
+ passthrough: {
190
+ req: permissions.root,
191
+ },
192
+ options: {
193
+ $filter: {
194
+ status: 'queued',
195
+ $not: {
196
+ is_executed_by__handler: { $in: Object.keys(this.handlers) },
197
+ },
198
+ },
199
+ },
200
+ });
201
+ if (tasksWithUnknownHandlers.length > 0) {
202
+ throw new Error(`Found tasks with unknown handlers: ${tasksWithUnknownHandlers
203
+ .map((task) => `${task.id}(${task.is_executed_by__handler})`)
204
+ .join(', ')}`);
205
+ }
206
+ module_1.sbvrUtils.db.on('notification', async (msg) => {
207
+ if (this.canExecute()) {
208
+ await module_1.sbvrUtils.db.transaction(async (tx) => {
209
+ const result = await module_1.sbvrUtils.db.executeSql(`SELECT ${selectColumns} FROM task AS t WHERE id = $1 FOR UPDATE SKIP LOCKED`, [msg.payload]);
210
+ if (result.rows.length > 0) {
211
+ await this.execute(result.rows[0], tx);
212
+ }
213
+ });
214
+ }
215
+ }, {
216
+ channel: common_1.channel,
217
+ });
218
+ for (let i = 0; i < this.concurrency; i++) {
219
+ this.poll();
220
+ }
221
+ }
222
+ }
223
+ exports.Worker = Worker;
224
+ //# sourceMappingURL=worker.js.map
@@ -0,0 +1 @@
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": "18.0.1-build-fisehara-reproduce-patch-translation-issue-d7aff91660b81d1683ba85c91d788c707dc81023-1",
3
+ "version": "18.1.0-build-joshbwlng-tasks-79d39d05d88bf5f8e2ad08ed75694a2a728dc9a3-1",
4
4
  "main": "out/server-glue/module",
5
5
  "type": "commonjs",
6
6
  "repository": "git@github.com:balena-io/pinejs.git",
@@ -20,15 +20,15 @@
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 && npm run test:generated-types",
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",
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 PINEJS_QUEUE_CONCURRENCY=1 npm run mocha",
24
24
  "test:generated-types": "npm run generate-types && git diff --exit-code ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts",
25
25
  "mocha": "TS_NODE_FILES=true mocha",
26
26
  "lint-fix": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts",
27
- "generate-types": "node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/user.sbvr ./src/sbvr-api/user.ts && node ./bin/sbvr-compiler.js generate-types ./src/migrator/migrations.sbvr ./src/migrator/migrations.ts && node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/dev.sbvr ./src/sbvr-api/dev.ts && balena-lint -t tsconfig.dev.json --fix ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts"
27
+ "generate-types": "node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/user.sbvr ./src/sbvr-api/user.ts && node ./bin/sbvr-compiler.js generate-types ./src/migrator/migrations.sbvr ./src/migrator/migrations.ts && node ./bin/sbvr-compiler.js generate-types ./src/sbvr-api/dev.sbvr ./src/sbvr-api/dev.ts && node ./bin/sbvr-compiler.js generate-types ./src/tasks/tasks.sbvr ./src/tasks/tasks.ts && balena-lint -t tsconfig.dev.json --fix ./src/sbvr-api/user.ts ./src/migrator/migrations.ts ./src/sbvr-api/dev.ts"
28
28
  },
29
29
  "dependencies": {
30
30
  "@balena/abstract-sql-compiler": "^9.2.0",
31
- "@balena/abstract-sql-to-typescript": "^3.3.1",
31
+ "@balena/abstract-sql-to-typescript": "^4.0.0",
32
32
  "@balena/env-parsing": "^1.1.12",
33
33
  "@balena/lf-to-abstract-sql": "^5.0.2",
34
34
  "@balena/odata-parser": "^3.0.8",
@@ -53,14 +53,16 @@
53
53
  "@types/pg": "^8.11.6",
54
54
  "@types/randomstring": "^1.3.0",
55
55
  "@types/websql": "^0.0.30",
56
+ "ajv": "^8.12.0",
56
57
  "busboy": "^1.6.0",
57
58
  "commander": "^11.1.0",
59
+ "cron-parser": "^4.9.0",
58
60
  "deep-freeze": "^0.0.1",
59
61
  "eventemitter3": "^5.0.1",
60
62
  "express-session": "^1.18.0",
61
63
  "lodash": "^4.17.21",
62
64
  "memoizee": "^0.4.17",
63
- "pinejs-client-core": "^6.15.10",
65
+ "pinejs-client-core": "7.0.0-build-joshbwlng-abstract-sql-to-typescript-v4-c0aa01207bd87a9e545811b8fac5a0174b308730-1",
64
66
  "randomstring": "^1.3.0",
65
67
  "typed-error": "^3.2.2"
66
68
  },
@@ -91,6 +93,7 @@
91
93
  "grunt-ts": "^6.0.0-beta.22",
92
94
  "grunt-webpack": "^6.0.0",
93
95
  "husky": "^9.1.4",
96
+ "json-schema-to-ts": "^3.1.0",
94
97
  "lint-staged": "^15.2.7",
95
98
  "load-grunt-tasks": "^5.1.0",
96
99
  "mocha": "^10.7.0",
@@ -146,6 +149,6 @@
146
149
  "recursive": true
147
150
  },
148
151
  "versionist": {
149
- "publishedAt": "2024-08-06T06:42:43.279Z"
152
+ "publishedAt": "2024-08-11T07:10:41.394Z"
150
153
  }
151
154
  }
@@ -49,7 +49,7 @@ export const cache = {
49
49
  apiKeyActorId: false as CacheOpts,
50
50
  };
51
51
 
52
- import { boolVar } from '@balena/env-parsing';
52
+ import { boolVar, intVar } from '@balena/env-parsing';
53
53
  import memoize from 'memoizee';
54
54
  import memoizeWeak = require('memoizee/weak');
55
55
  export const createCache = <T extends (...args: any[]) => any>(
@@ -146,3 +146,8 @@ export const migrator = {
146
146
  */
147
147
  asyncMigrationIsEnabled: boolVar('PINEJS_ASYNC_MIGRATION_ENABLED', true),
148
148
  };
149
+
150
+ export const tasks = {
151
+ queueConcurrency: intVar('PINEJS_QUEUE_CONCURRENCY', 0),
152
+ queueIntervalMS: intVar('PINEJS_QUEUE_INTERVAL_MS', 1000),
153
+ };
@@ -106,6 +106,13 @@ export interface Database extends BaseDatabase {
106
106
  ) => Promise<Result>;
107
107
  transaction: TransactionFn;
108
108
  readTransaction: TransactionFn;
109
+ on?: (
110
+ name: 'notification',
111
+ fn: (...args: any[]) => Promise<void>,
112
+ options?: {
113
+ channel?: string;
114
+ },
115
+ ) => void;
109
116
  }
110
117
 
111
118
  interface EngineParams {
@@ -340,9 +347,6 @@ export abstract class Tx {
340
347
 
341
348
  const t0 = Date.now();
342
349
  try {
343
- if (sql.startsWith('UPDATE "student"')) {
344
- console.log('=== sql:', sql);
345
- }
346
350
  return await this._executeSql(sql, bindings, ...args);
347
351
  } catch (err: any) {
348
352
  throw wrapDatabaseError(err);
@@ -713,6 +717,29 @@ if (maybePg != null) {
713
717
  return {
714
718
  engine: Engines.postgres,
715
719
  executeSql: atomicExecuteSql,
720
+ on: async (name, fn, options) => {
721
+ if (name === 'notification' && options?.channel === undefined) {
722
+ throw new Error('Missing channel option for notification listener');
723
+ }
724
+
725
+ const client = await pool.connect();
726
+ client.on(name, async (msg) => {
727
+ try {
728
+ await fn(msg);
729
+ } catch (error) {
730
+ console.error('Error handling message:', error);
731
+ }
732
+ });
733
+
734
+ if (name === 'notification' && options?.channel !== undefined) {
735
+ if (options.channel.includes('"')) {
736
+ throw new Error(
737
+ `Invalid channel name for task LISTEN: ${options.channel}`,
738
+ );
739
+ }
740
+ await client.query(`LISTEN "${options.channel}";`);
741
+ }
742
+ },
716
743
  transaction: createTransaction(async (stackTraceErr, timeoutMS) => {
717
744
  const client = await pool.connect();
718
745
  const tx = new PostgresTx(client, false, stackTraceErr, timeoutMS);
@@ -1,4 +1,4 @@
1
- // These types were generated by @balena/abstract-sql-to-typescript v3.3.1
1
+ // These types were generated by @balena/abstract-sql-to-typescript v4.0.0
2
2
 
3
3
  import type { Types } from '@balena/abstract-sql-to-typescript';
4
4
 
@@ -1,4 +1,4 @@
1
- // These types were generated by @balena/abstract-sql-to-typescript v3.3.1
1
+ // These types were generated by @balena/abstract-sql-to-typescript v4.0.0
2
2
 
3
3
  import type { Types } from '@balena/abstract-sql-to-typescript';
4
4