@balena/pinejs 19.1.0-build-add-tasks-worker-stop-18a21160b0b45abc810c63a28531125fe30a2385-1 → 19.1.0-build-add-tasks-worker-stop-124e98162ce31a560995a8d0c1ec0765da6aee3f-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/.versionbot/CHANGELOG.yml +2 -2
- package/CHANGELOG.md +1 -1
- package/out/tasks/worker.d.ts +2 -2
- package/out/tasks/worker.js +5 -6
- package/out/tasks/worker.js.map +1 -1
- package/package.json +2 -2
- package/src/tasks/worker.ts +5 -6
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
- commits:
|
|
2
2
|
- subject: Add tasks worker `stop` method
|
|
3
|
-
hash:
|
|
3
|
+
hash: 124e98162ce31a560995a8d0c1ec0765da6aee3f
|
|
4
4
|
body: ""
|
|
5
5
|
footer:
|
|
6
6
|
Change-type: minor
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
nested: []
|
|
10
10
|
version: 19.1.0
|
|
11
11
|
title: ""
|
|
12
|
-
date: 2024-10-
|
|
12
|
+
date: 2024-10-17T00:52:52.282Z
|
|
13
13
|
- commits:
|
|
14
14
|
- subject: Update pinejs-client-supertest to 3.0.1
|
|
15
15
|
hash: 35cd08db371169c66dd4026ef60f708e8121ecc9
|
package/CHANGELOG.md
CHANGED
package/out/tasks/worker.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ export declare class Worker {
|
|
|
20
20
|
handlers: Record<string, TaskHandler>;
|
|
21
21
|
private readonly concurrency;
|
|
22
22
|
private readonly interval;
|
|
23
|
-
private
|
|
23
|
+
private running;
|
|
24
24
|
private executing;
|
|
25
25
|
constructor(client: PinejsClient);
|
|
26
26
|
private canExecute;
|
|
@@ -28,7 +28,7 @@ export declare class Worker {
|
|
|
28
28
|
private update;
|
|
29
29
|
private getNextAttemptTime;
|
|
30
30
|
private poll;
|
|
31
|
-
stop(): void
|
|
31
|
+
stop(): Promise<void>;
|
|
32
32
|
start(): Promise<void>;
|
|
33
33
|
}
|
|
34
34
|
export {};
|
package/out/tasks/worker.js
CHANGED
|
@@ -46,13 +46,12 @@ class Worker {
|
|
|
46
46
|
handlers = {};
|
|
47
47
|
concurrency;
|
|
48
48
|
interval;
|
|
49
|
-
|
|
49
|
+
running = false;
|
|
50
50
|
executing = 0;
|
|
51
51
|
constructor(client) {
|
|
52
52
|
this.client = client;
|
|
53
53
|
this.concurrency = env_1.tasks.queueConcurrency;
|
|
54
54
|
this.interval = env_1.tasks.queueIntervalMS;
|
|
55
|
-
this.isStopped = true;
|
|
56
55
|
}
|
|
57
56
|
canExecute() {
|
|
58
57
|
return (this.executing < this.concurrency && Object.keys(this.handlers).length > 0);
|
|
@@ -178,14 +177,14 @@ class Worker {
|
|
|
178
177
|
if (!executed) {
|
|
179
178
|
await (0, promises_1.setTimeout)(this.interval);
|
|
180
179
|
}
|
|
181
|
-
if (
|
|
180
|
+
if (this.running) {
|
|
182
181
|
this.poll();
|
|
183
182
|
}
|
|
184
183
|
}
|
|
185
184
|
})();
|
|
186
185
|
}
|
|
187
|
-
stop() {
|
|
188
|
-
this.
|
|
186
|
+
async stop() {
|
|
187
|
+
this.running = false;
|
|
189
188
|
}
|
|
190
189
|
async start() {
|
|
191
190
|
if (module_1.sbvrUtils.db.engine !== 'postgres') {
|
|
@@ -210,7 +209,7 @@ class Worker {
|
|
|
210
209
|
.map((task) => `${task.id}(${task.is_executed_by__handler})`)
|
|
211
210
|
.join(', ')}`);
|
|
212
211
|
}
|
|
213
|
-
this.
|
|
212
|
+
this.running = true;
|
|
214
213
|
for (let i = 0; i < this.concurrency; i++) {
|
|
215
214
|
this.poll();
|
|
216
215
|
}
|
package/out/tasks/worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/tasks/worker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mDAAkD;AAElD,8CAAyD;AAEzD,qEAAuD;AACvD,uDAAsD;AACtD,kDAAkD;AAClD,qCAA+B;AA+B/B,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;IACpC,EAAE,EAAE,IAAI;IACR,wBAAwB,EAAE,yBAAyB;IACnD,gCAAgC,EAAE,iCAAiC;IACnE,mCAAmC,EAAE,oCAAoC;IACzE,eAAe,EAAE,eAAe;IAChC,eAAe,EAAE,eAAe;IAChC,qBAAqB,EAAE,sBAAsB;CACA,CAAC;KAC7C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,SAAS,KAAK,GAAG,CAAC;KACjD,IAAI,CAAC,IAAI,CAAC,CAAC;AAKb,MAAa,MAAM;IAOW;IANtB,QAAQ,GAAgC,EAAE,CAAC;IACjC,WAAW,CAAS;IACpB,QAAQ,CAAS;IAC1B,
|
|
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": "19.1.0-build-add-tasks-worker-stop-
|
|
3
|
+
"version": "19.1.0-build-add-tasks-worker-stop-124e98162ce31a560995a8d0c1ec0765da6aee3f-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-10-
|
|
150
|
+
"publishedAt": "2024-10-17T00:52:53.364Z"
|
|
151
151
|
}
|
|
152
152
|
}
|
package/src/tasks/worker.ts
CHANGED
|
@@ -56,13 +56,12 @@ export class Worker {
|
|
|
56
56
|
public handlers: Record<string, TaskHandler> = {};
|
|
57
57
|
private readonly concurrency: number;
|
|
58
58
|
private readonly interval: number;
|
|
59
|
-
private
|
|
59
|
+
private running = false;
|
|
60
60
|
private executing = 0;
|
|
61
61
|
|
|
62
62
|
constructor(private readonly client: PinejsClient) {
|
|
63
63
|
this.concurrency = tasksEnv.queueConcurrency;
|
|
64
64
|
this.interval = tasksEnv.queueIntervalMS;
|
|
65
|
-
this.isStopped = true;
|
|
66
65
|
}
|
|
67
66
|
|
|
68
67
|
// Check if instance can execute more tasks
|
|
@@ -246,15 +245,15 @@ export class Worker {
|
|
|
246
245
|
if (!executed) {
|
|
247
246
|
await setTimeout(this.interval);
|
|
248
247
|
}
|
|
249
|
-
if (
|
|
248
|
+
if (this.running) {
|
|
250
249
|
this.poll();
|
|
251
250
|
}
|
|
252
251
|
}
|
|
253
252
|
})();
|
|
254
253
|
}
|
|
255
254
|
|
|
256
|
-
public stop(): void {
|
|
257
|
-
this.
|
|
255
|
+
public async stop(): Promise<void> {
|
|
256
|
+
this.running = false;
|
|
258
257
|
}
|
|
259
258
|
|
|
260
259
|
// Start polling for tasks
|
|
@@ -289,7 +288,7 @@ export class Worker {
|
|
|
289
288
|
);
|
|
290
289
|
}
|
|
291
290
|
|
|
292
|
-
this.
|
|
291
|
+
this.running = true;
|
|
293
292
|
// Spawn children to poll for and execute tasks
|
|
294
293
|
for (let i = 0; i < this.concurrency; i++) {
|
|
295
294
|
this.poll();
|