@balena/pinejs 18.1.0-build-joshbwlng-listener-0b0f8758d06970eeb1cc188b8a5e3301897ba8ab-1 → 18.1.0

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.
@@ -0,0 +1,212 @@
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') {
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
+ for (let i = 0; i < this.concurrency; i++) {
207
+ this.poll();
208
+ }
209
+ }
210
+ }
211
+ exports.Worker = Worker;
212
+ //# 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.1.0-build-joshbwlng-listener-0b0f8758d06970eeb1cc188b8a5e3301897ba8ab-1",
3
+ "version": "18.1.0",
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",
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-20T13:12:17.350Z"
152
+ "publishedAt": "2024-08-20T13:18:33.683Z"
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,13 +106,6 @@ 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;
116
109
  }
117
110
 
118
111
  interface EngineParams {
@@ -714,61 +707,9 @@ if (maybePg != null) {
714
707
  `);
715
708
  }
716
709
  }
717
-
718
- // Connect and listen for notifications
719
- async function listen(
720
- channel: string,
721
- fn: (...args: any[]) => Promise<void>,
722
- ) {
723
- let listenerClient: Pg.PoolClient | null = null;
724
-
725
- // Clean up and reconnect listener
726
- const reconnect = () => {
727
- try {
728
- listenerClient?.release();
729
- } catch (err) {
730
- // Ignore listener client release errors
731
- }
732
- setTimeout(() => {
733
- void listen(channel, fn);
734
- }, 1000);
735
- };
736
-
737
- try {
738
- listenerClient = await pool.connect();
739
- listenerClient.on('end', reconnect);
740
- listenerClient.on('notification', (msg) => {
741
- if (msg.channel === channel) {
742
- void fn(msg).catch((err) => {
743
- console.error(`Error handling message for '${channel}':`, err);
744
- });
745
- }
746
- });
747
- await listenerClient.query(`LISTEN "${channel}"`);
748
- } catch (err) {
749
- console.error(
750
- `Error setting up listener client for '${channel}':`,
751
- err,
752
- );
753
- reconnect();
754
- }
755
- }
756
-
757
710
  return {
758
711
  engine: Engines.postgres,
759
712
  executeSql: atomicExecuteSql,
760
- on: async (name, fn, options) => {
761
- if (name !== 'notification') {
762
- throw new Error(`Unsupported listener type: ${name}`);
763
- } else if (options?.channel == null) {
764
- throw new Error('Missing channel option for notification listener');
765
- } else if (options.channel.includes('"')) {
766
- throw new Error(
767
- `Invalid channel name for task LISTEN: ${options.channel}`,
768
- );
769
- }
770
- await listen(options.channel, fn);
771
- },
772
713
  transaction: createTransaction(async (stackTraceErr, timeoutMS) => {
773
714
  const client = await pool.connect();
774
715
  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
 
@@ -777,7 +777,7 @@ export const postExecuteModels = async (tx: Db.Tx): Promise<void> => {
777
777
  // Hence, skipped migrations from earlier models are not set as executed as the `migration` table is missing
778
778
  // Here the skipped migrations that haven't been set properly are covered
779
779
  // This is mostly an edge case when running on an empty database schema and migrations model hasn't been executed, yet.
780
- // One specifc case are tests to run tests against migrated and unmigrated database states
780
+ // One specific case are tests to run tests against migrated and unmigrated database states
781
781
 
782
782
  for (const modelKey of Object.keys(models)) {
783
783
  const pendingToSetExecutedMigrations =
@@ -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
 
@@ -6,6 +6,7 @@ import * as dbModule from '../database-layer/db';
6
6
  import * as configLoader from '../config-loader/config-loader';
7
7
  import * as migrator from '../migrator/sync';
8
8
  import type * as migratorUtils from '../migrator/utils';
9
+ import * as tasks from '../tasks';
9
10
 
10
11
  import * as sbvrUtils from '../sbvr-api/sbvr-utils';
11
12
  import { PINEJS_ADVISORY_LOCK } from '../config-loader/env';
@@ -19,6 +20,7 @@ export * as errors from '../sbvr-api/errors';
19
20
  export * as env from '../config-loader/env';
20
21
  export * as types from '../sbvr-api/common-types';
21
22
  export * as hooks from '../sbvr-api/hooks';
23
+ export * as tasks from '../tasks';
22
24
  export * as webResourceHandler from '../webresource-handler';
23
25
  export type { configLoader as ConfigLoader };
24
26
  export type { migratorUtils as Migrator };
@@ -63,6 +65,7 @@ export const init = async <T extends string>(
63
65
  await sbvrUtils.setup(app, db);
64
66
  const cfgLoader = configLoader.setup(app);
65
67
  await cfgLoader.loadConfig(migrator.config);
68
+ await cfgLoader.loadConfig(tasks.config);
66
69
 
67
70
  const promises: Array<Promise<void>> = [];
68
71
  if (process.env.SBVR_SERVER_ENABLED) {
@@ -0,0 +1,6 @@
1
+ import Ajv from 'ajv';
2
+
3
+ // Root path for the tasks API
4
+ export const apiRoot = 'tasks';
5
+
6
+ export const ajv = new Ajv();
@@ -0,0 +1,138 @@
1
+ import type { Schema } from 'ajv';
2
+ import * as cronParser from 'cron-parser';
3
+ import { tasks as tasksEnv } from '../config-loader/env';
4
+ import { addPureHook } from '../sbvr-api/hooks';
5
+ import * as sbvrUtils from '../sbvr-api/sbvr-utils';
6
+ import type { ConfigLoader } from '../server-glue/module';
7
+ import { ajv, apiRoot } from './common';
8
+ import type { TaskHandler } from './worker';
9
+ import { Worker } from './worker';
10
+
11
+ export type * from './tasks';
12
+
13
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
14
+ const modelText: string = require('./tasks.sbvr');
15
+
16
+ // Create index for polling tasks table
17
+ const initSql = `
18
+ CREATE INDEX IF NOT EXISTS idx_task_poll ON task USING btree (
19
+ "is executed by-handler",
20
+ "is scheduled to execute on-time" ASC,
21
+ "id" ASC
22
+ ) WHERE status = 'queued';
23
+ `;
24
+
25
+ export const config: ConfigLoader.Config = {
26
+ models: [
27
+ {
28
+ modelName: apiRoot,
29
+ apiRoot,
30
+ modelText,
31
+ customServerCode: exports,
32
+ initSql,
33
+ },
34
+ ],
35
+ };
36
+
37
+ export let worker: Worker | null = null;
38
+ export async function setup(): Promise<void> {
39
+ // Async task functionality is only supported on Postgres
40
+ if (sbvrUtils.db.engine !== 'postgres') {
41
+ console.warn('Skipping task setup as database not supported');
42
+ return;
43
+ }
44
+
45
+ const client = sbvrUtils.api[apiRoot];
46
+ worker = new Worker(client);
47
+
48
+ // Add resource hooks
49
+ addPureHook('POST', apiRoot, 'task', {
50
+ POSTPARSE: async ({ req, request }) => {
51
+ // Set the actor
52
+ request.values.is_created_by__actor =
53
+ req.user?.actor ?? req.apiKey?.actor;
54
+ if (request.values.is_created_by__actor == null) {
55
+ throw new Error(
56
+ 'Creating tasks with missing actor on req is not allowed',
57
+ );
58
+ }
59
+
60
+ // Set defaults
61
+ request.values.status = 'queued';
62
+ request.values.attempt_count = 0;
63
+ request.values.attempt_limit ??= 1;
64
+
65
+ // Set scheduled start time using cron expression if provided
66
+ if (
67
+ request.values.is_scheduled_with__cron_expression != null &&
68
+ request.values.is_scheduled_to_execute_on__time == null
69
+ ) {
70
+ try {
71
+ request.values.is_scheduled_to_execute_on__time = cronParser
72
+ .parseExpression(request.values.is_scheduled_with__cron_expression)
73
+ .next()
74
+ .toDate()
75
+ .toISOString();
76
+ } catch {
77
+ throw new Error(
78
+ `Invalid cron expression: ${request.values.is_scheduled_with__cron_expression}`,
79
+ );
80
+ }
81
+ }
82
+
83
+ // Assert that the provided start time is far enough in the future
84
+ if (request.values.is_scheduled_to_execute_on__time != null) {
85
+ const now = new Date(Date.now() + tasksEnv.queueIntervalMS);
86
+ const startTime = new Date(
87
+ request.values.is_scheduled_to_execute_on__time,
88
+ );
89
+ if (startTime < now) {
90
+ throw new Error(
91
+ `Task scheduled start time must be greater than ${tasksEnv.queueIntervalMS} milliseconds in the future`,
92
+ );
93
+ }
94
+ }
95
+
96
+ // Assert that the requested handler exists
97
+ const handlerName = request.values.is_executed_by__handler;
98
+ if (handlerName == null) {
99
+ throw new Error(`Must specify a task handler to execute`);
100
+ }
101
+ const handler = worker?.handlers[handlerName];
102
+ if (handler == null) {
103
+ throw new Error(
104
+ `No task handler with name '${handlerName}' registered`,
105
+ );
106
+ }
107
+
108
+ // Assert that the provided parameter set is valid
109
+ if (handler.validate != null) {
110
+ if (!handler.validate(request.values.is_executed_with__parameter_set)) {
111
+ throw new Error(
112
+ `Invalid parameter set: ${ajv.errorsText(handler.validate.errors)}`,
113
+ );
114
+ }
115
+ }
116
+ },
117
+ });
118
+ }
119
+
120
+ // Register a task handler
121
+ export function addTaskHandler(
122
+ name: string,
123
+ fn: TaskHandler['fn'],
124
+ schema?: Schema,
125
+ ): void {
126
+ if (worker == null) {
127
+ throw new Error('Database does not support tasks');
128
+ }
129
+
130
+ if (worker.handlers[name] != null) {
131
+ throw new Error(`Task handler with name '${name}' already registered`);
132
+ }
133
+ worker.handlers[name] = {
134
+ name,
135
+ fn,
136
+ validate: schema != null ? ajv.compile(schema) : undefined,
137
+ };
138
+ }
@@ -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
+