@antelopejs/interface-redis-scheduler 0.0.10 → 0.0.12

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/README.md CHANGED
@@ -9,6 +9,8 @@
9
9
 
10
10
  Task scheduling on Redis for AntelopeJS. You schedule a task for a given time, and a listener in your application runs it when it is due, with up to three retries on failure.
11
11
 
12
+ Part of [AntelopeJS](https://github.com/AntelopeJS/antelopejs), the TypeScript framework where modules depend on contracts and the application chooses the provider. Built by the team behind [AntelopeJS DMS](https://github.com/AntelopeJS/dms).
13
+
12
14
  ## What it offers
13
15
 
14
16
  - `setHandler` registers the function that runs one kind of task.
@@ -84,7 +86,7 @@ The module declares these peer dependencies:
84
86
 
85
87
  | Package | Supported | Tested with |
86
88
  | ----------------------------- | ---------------- | ----------- |
87
- | `@antelopejs/interface-core` | `>=0.2.4 <1.0.0` | `0.2.4` |
89
+ | `@antelopejs/interface-core` | `>=0.2.4 <1.0.0` | `0.4.0` |
88
90
  | `@antelopejs/interface-redis` | `>=0.0.9 <1.0.0` | `0.0.9` |
89
91
 
90
92
  <!-- antelopejs-docs-compat:end -->
package/dist/index.d.ts CHANGED
@@ -119,12 +119,17 @@ export declare function removeTask(handlerName: string, taskInfo: string): Promi
119
119
  /**
120
120
  * Updates the timer for the next task execution
121
121
  * This is called internally whenever the task schedule changes
122
+ * The timer does not keep the process alive on its own; the task stays
123
+ * queued in Redis when the process exits first.
122
124
  */
123
125
  export declare function updateTimer(): Promise<void>;
124
126
  /**
125
127
  * Executes all due tasks
126
128
  * This is called internally by the timer when tasks are due for execution
127
129
  * It includes automatic retry logic for failed tasks
130
+ * While a batch runs in this process, it returns at once, so one listener runs
131
+ * one handler at a time; a batch that resolves ends with updateTimer, which
132
+ * runs the tasks that fell due meanwhile, and one that rejects arms no timer
128
133
  */
129
134
  export declare function runTasks(): Promise<void>;
130
135
  export {};
package/dist/index.js CHANGED
@@ -57,6 +57,14 @@ function setHandler(handlerName, handler) {
57
57
  }
58
58
  /** Redis subscriber client for receiving task updates */
59
59
  let subscriber;
60
+ const AddTaskScript = `
61
+ redis.call("ZADD", KEYS[1], ARGV[1], ARGV[2])
62
+ local first = redis.call("ZRANGE", KEYS[1], 0, 0, "WITHSCORES")
63
+ if first[1] == ARGV[2] or tonumber(first[2]) <= tonumber(ARGV[3]) then
64
+ return 1
65
+ end
66
+ return 0
67
+ `;
60
68
  function createTaskMember(handlerName, taskInfo) {
61
69
  return `${handlerName}:${taskInfo}`;
62
70
  }
@@ -145,8 +153,8 @@ async function addTask(handlerName, dueTime, taskInfo) {
145
153
  throw new Error(`Unknown SchedulerUtil handler: ${handlerName}`);
146
154
  }
147
155
  const client = await (0, interface_redis_1.GetClient)();
148
- await client.zadd(RedisKey, dueTime, createTaskMember(handlerName, taskInfo));
149
- if (!locked) {
156
+ const firstTaskChangedOrDue = await client.eval(AddTaskScript, 1, RedisKey, dueTime, createTaskMember(handlerName, taskInfo), Date.now());
157
+ if (firstTaskChangedOrDue === 1 && !locked) {
150
158
  void client.publish(SchedulerChannel, SchedulerUpdateMessage);
151
159
  }
152
160
  }
@@ -188,28 +196,27 @@ let timer;
188
196
  /**
189
197
  * Updates the timer for the next task execution
190
198
  * This is called internally whenever the task schedule changes
199
+ * The timer does not keep the process alive on its own; the task stays
200
+ * queued in Redis when the process exits first.
191
201
  */
192
202
  async function updateTimer() {
193
203
  if (locked) {
194
204
  return;
195
205
  }
196
206
  const client = await (0, interface_redis_1.GetClient)();
197
- const taskInfo = (await client.zrange(RedisKey, 0, 0))[0];
198
- if (taskInfo) {
199
- const scoreValue = await client.zscore(RedisKey, taskInfo);
200
- if (!scoreValue) {
201
- return;
202
- }
203
- const score = Number(scoreValue);
204
- if (score < Date.now()) {
205
- await runTasks();
206
- }
207
- else {
208
- if (timer) {
209
- clearTimeout(timer);
210
- }
211
- timer = setTimeout(() => void runTasks(), Math.min(score - Date.now(), MaxTimerDelayMs));
207
+ const [, scoreValue] = await client.zrange(RedisKey, 0, 0, "WITHSCORES");
208
+ if (scoreValue === undefined) {
209
+ return;
210
+ }
211
+ const score = Number(scoreValue);
212
+ if (score < Date.now()) {
213
+ await runTasks();
214
+ }
215
+ else {
216
+ if (timer) {
217
+ clearTimeout(timer);
212
218
  }
219
+ timer = setTimeout(() => void runTasks(), Math.min(score - Date.now(), MaxTimerDelayMs)).unref();
213
220
  }
214
221
  }
215
222
  const TakeDueTasksScript = `
@@ -225,9 +232,24 @@ async function takeDueTasks(client) {
225
232
  * Executes all due tasks
226
233
  * This is called internally by the timer when tasks are due for execution
227
234
  * It includes automatic retry logic for failed tasks
235
+ * While a batch runs in this process, it returns at once, so one listener runs
236
+ * one handler at a time; a batch that resolves ends with updateTimer, which
237
+ * runs the tasks that fell due meanwhile, and one that rejects arms no timer
228
238
  */
229
239
  async function runTasks() {
240
+ if (locked) {
241
+ return;
242
+ }
230
243
  locked = true;
244
+ try {
245
+ await runDueTasks();
246
+ }
247
+ finally {
248
+ locked = false;
249
+ }
250
+ await updateTimer();
251
+ }
252
+ async function runDueTasks() {
231
253
  const client = await (0, interface_redis_1.GetClient)();
232
254
  const tasks = await takeDueTasks(client);
233
255
  for (const task of tasks) {
@@ -242,12 +264,12 @@ async function runTasks() {
242
264
  if (m) {
243
265
  const retryCount = m[1] ? parseInt(m[1], 10) : 0;
244
266
  if (retryCount < MaxRetries) {
245
- await client.zadd(RedisKey, Date.now() + RetryDelayMs, `RETRY-${retryCount + 1}:${m[2]}:${m[3]}`);
267
+ await client
268
+ .zadd(RedisKey, Date.now() + RetryDelayMs, `RETRY-${retryCount + 1}:${m[2]}:${m[3]}`)
269
+ .catch((writeErr) => logging_1.Logging.Error(writeErr));
246
270
  }
247
271
  }
248
272
  }
249
273
  }
250
- locked = false;
251
- await updateTimer();
252
274
  }
253
275
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -31,6 +31,45 @@ describe("Redis Scheduler - addTask", () => {
31
31
  (0, chai_1.expect)(members).to.include("test-add:task-data");
32
32
  await cleanupRedis();
33
33
  });
34
+ it("should publish an update only when the task becomes the first in the queue", async () => {
35
+ await cleanupRedis();
36
+ (0, index_1.setHandler)("test-publish", () => { });
37
+ const subscriber = (await (0, interface_redis_1.GetClient)()).duplicate({ lazyConnect: true });
38
+ await subscriber.connect();
39
+ await subscriber.subscribe("SchedulerUtil");
40
+ const messages = new Array();
41
+ subscriber.on("message", (_channel, message) => {
42
+ messages.push(message);
43
+ });
44
+ try {
45
+ await (0, index_1.addTask)("test-publish", Date.now() + 60000, "first");
46
+ await (0, index_1.addTask)("test-publish", Date.now() + 120000, "later");
47
+ await (0, index_1.addTask)("test-publish", Date.now() + 30000, "earlier");
48
+ await delay(50);
49
+ (0, chai_1.expect)(messages).to.deep.equal(["update", "update"]);
50
+ }
51
+ finally {
52
+ await subscriber.quit();
53
+ }
54
+ await cleanupRedis();
55
+ });
56
+ it("should publish an update for a later task while the first task is overdue", async () => {
57
+ await cleanupRedis();
58
+ const executed = new Promise((resolve) => {
59
+ (0, index_1.setHandler)("test-overdue", resolve);
60
+ });
61
+ await (0, index_1.enableListener)();
62
+ try {
63
+ const client = await (0, interface_redis_1.GetClient)();
64
+ await client.zadd(RedisKey, Date.now() - 1000, "test-overdue:stalled");
65
+ await (0, index_1.addTask)("test-overdue", Date.now() + 60000, "later");
66
+ (0, chai_1.expect)(await executed).to.equal("stalled");
67
+ }
68
+ finally {
69
+ await (0, index_1.disableListener)();
70
+ }
71
+ await cleanupRedis();
72
+ });
34
73
  it("should throw for unknown handler", async () => {
35
74
  (0, chai_1.expect)(await rejectionMessage((0, index_1.addTask)("nonexistent-handler", Date.now(), "data"))).to.include("Unknown SchedulerUtil handler");
36
75
  });
@@ -84,6 +123,58 @@ describe("Redis Scheduler - enableListener / disableListener", () => {
84
123
  }
85
124
  });
86
125
  });
126
+ describe("Redis Scheduler - one batch at a time", () => {
127
+ it("should not start an armed timer's batch while another batch runs", async () => {
128
+ await cleanupRedis();
129
+ const handler = overlapHandler("test-overlap-timer", { slow: 600 });
130
+ await (0, index_1.addTask)("test-overlap-timer", Date.now() + 200, "timed");
131
+ await (0, index_1.updateTimer)();
132
+ await (0, index_1.addTask)("test-overlap-timer", Date.now() - 1, "slow");
133
+ await (0, index_1.updateTimer)();
134
+ (0, chai_1.expect)(handler.started).to.deep.equal(["slow", "timed"]);
135
+ (0, chai_1.expect)(handler.most).to.equal(1);
136
+ await cleanupRedis();
137
+ });
138
+ it("should not start a batch from a direct runTasks call while another batch runs", async () => {
139
+ await cleanupRedis();
140
+ const handler = overlapHandler("test-overlap-direct", { first: 100 });
141
+ const client = await (0, interface_redis_1.GetClient)();
142
+ await client.zadd(RedisKey, Date.now() - 1, "test-overlap-direct:first");
143
+ const first = (0, index_1.runTasks)();
144
+ await handler.firstStart;
145
+ await client.zadd(RedisKey, Date.now() - 1, "test-overlap-direct:second");
146
+ await (0, index_1.runTasks)();
147
+ await first;
148
+ (0, chai_1.expect)(handler.started).to.deep.equal(["first", "second"]);
149
+ (0, chai_1.expect)(handler.most).to.equal(1);
150
+ await cleanupRedis();
151
+ });
152
+ });
153
+ /**
154
+ * Registers a handler that records the order tasks start in and the most
155
+ * handlers running at once; `firstStart` resolves when a handler first starts.
156
+ * @param delays - how long the task with each info runs, in milliseconds
157
+ */
158
+ function overlapHandler(name, delays) {
159
+ let running = 0;
160
+ let markStarted = () => { };
161
+ const seen = {
162
+ started: new Array(),
163
+ most: 0,
164
+ firstStart: new Promise((resolve) => {
165
+ markStarted = resolve;
166
+ }),
167
+ };
168
+ (0, index_1.setHandler)(name, async (taskInfo) => {
169
+ running++;
170
+ seen.most = Math.max(seen.most, running);
171
+ seen.started.push(taskInfo);
172
+ markStarted();
173
+ await delay(Object.hasOwn(delays, taskInfo) ? delays[taskInfo] : 0);
174
+ running--;
175
+ });
176
+ return seen;
177
+ }
87
178
  describe("Redis Scheduler - runTasks", () => {
88
179
  it("should execute due tasks", async () => {
89
180
  await cleanupRedis();
@@ -141,39 +232,60 @@ describe("Redis Scheduler - runTasks", () => {
141
232
  const client = await (0, interface_redis_1.GetClient)();
142
233
  const due = Date.now() - 1000;
143
234
  await client.zadd(RedisKey, due, "test-read-failure:renewal");
144
- if (!isMockClient(client))
145
- throw new Error("The test project must use the Redis mock");
146
- const mock = client;
147
- const store = mock.data;
148
- let failed = false;
149
- const failFirstRead = (key) => {
150
- if (!failed && key === RedisKey) {
151
- failed = true;
152
- throw new Error("ERR injected read failure");
153
- }
154
- };
155
- mock.data = {
156
- ...store,
157
- get: (key) => (failFirstRead(key), store.get(key)),
158
- has: (key) => (failFirstRead(key), store.has(key)),
159
- };
160
- let rejected = false;
161
- try {
162
- await (0, index_1.runTasks)();
163
- }
164
- catch {
165
- rejected = true;
166
- }
167
- finally {
168
- mock.data = store;
169
- }
170
- (0, chai_1.expect)(failed).to.equal(true);
171
- (0, chai_1.expect)(rejected).to.equal(true);
235
+ (0, chai_1.expect)(await runTasksWithFailedRead()).to.equal(true);
172
236
  (0, chai_1.expect)(results).to.deep.equal([]);
173
237
  (0, chai_1.expect)(await client.zscore(RedisKey, "test-read-failure:renewal")).to.equal(String(due));
174
238
  await cleanupRedis();
175
239
  });
176
240
  });
241
+ describe("Redis Scheduler - runTasks failure", () => {
242
+ it("should run due tasks on the next timer refresh after a failed batch", async () => {
243
+ await cleanupRedis();
244
+ const results = [];
245
+ (0, index_1.setHandler)("test-unlock", (taskInfo) => {
246
+ results.push(taskInfo);
247
+ });
248
+ const client = await (0, interface_redis_1.GetClient)();
249
+ await client.zadd(RedisKey, Date.now() - 1000, "test-unlock:after-failure");
250
+ (0, chai_1.expect)(await runTasksWithFailedRead()).to.equal(true);
251
+ await (0, index_1.updateTimer)();
252
+ (0, chai_1.expect)(results).to.deep.equal(["after-failure"]);
253
+ (0, chai_1.expect)(await client.zrange(RedisKey, 0, -1)).to.deep.equal([]);
254
+ await cleanupRedis();
255
+ });
256
+ });
257
+ /**
258
+ * Runs `runTasks()` while the mock fails its first read of the task set.
259
+ * @returns whether the read failed and `runTasks()` rejected
260
+ */
261
+ async function runTasksWithFailedRead() {
262
+ const client = await (0, interface_redis_1.GetClient)();
263
+ if (!isMockClient(client))
264
+ throw new Error("The test project must use the Redis mock");
265
+ const store = client.data;
266
+ let failed = false;
267
+ const failFirstRead = (key) => {
268
+ if (!failed && key === RedisKey) {
269
+ failed = true;
270
+ throw new Error("ERR injected read failure");
271
+ }
272
+ };
273
+ client.data = {
274
+ ...store,
275
+ get: (key) => (failFirstRead(key), store.get(key)),
276
+ has: (key) => (failFirstRead(key), store.has(key)),
277
+ };
278
+ try {
279
+ await (0, index_1.runTasks)();
280
+ return false;
281
+ }
282
+ catch {
283
+ return failed;
284
+ }
285
+ finally {
286
+ client.data = store;
287
+ }
288
+ }
177
289
  function isMockClient(client) {
178
290
  if (!("data" in client)) {
179
291
  return false;
@@ -186,6 +298,66 @@ function isMockClient(client) {
186
298
  "has" in data &&
187
299
  typeof data.has === "function");
188
300
  }
301
+ describe("Redis Scheduler - timer", () => {
302
+ it("should not keep the process alive while waiting for the next task", async () => {
303
+ await cleanupRedis();
304
+ const fired = new Promise((resolve) => {
305
+ (0, index_1.setHandler)("test-timer-handle", () => resolve());
306
+ });
307
+ const client = await (0, interface_redis_1.GetClient)();
308
+ await client.zadd(RedisKey, Date.now() + 50, "test-timer-handle:soon");
309
+ await (0, index_1.runTasks)();
310
+ await fired;
311
+ const timeoutsBefore = liveTimeouts();
312
+ await client.zadd(RedisKey, Date.now() + 60_000, "test-timer-handle:later");
313
+ await (0, index_1.updateTimer)();
314
+ (0, chai_1.expect)(liveTimeouts()).to.equal(timeoutsBefore);
315
+ await cleanupRedis();
316
+ });
317
+ it("should still run the next task when the first is removed while the timer refreshes", async () => {
318
+ await cleanupRedis();
319
+ const ran = new Promise((resolve) => {
320
+ (0, index_1.setHandler)("test-remove-race", resolve);
321
+ });
322
+ const client = await (0, interface_redis_1.GetClient)();
323
+ await client.zadd(RedisKey, Date.now() + 50, "test-remove-race:first");
324
+ await client.zadd(RedisKey, Date.now() + 100, "test-remove-race:second");
325
+ const zrange = client.zrange.bind(client);
326
+ let removed = false;
327
+ client.zrange = async (key, start, stop, withScores) => {
328
+ if (withScores !== "WITHSCORES") {
329
+ throw new Error("the zrange stub serves only WITHSCORES reads");
330
+ }
331
+ const reply = await zrange(key, start, stop, withScores);
332
+ if (!removed && key === RedisKey) {
333
+ removed = true;
334
+ await (0, index_1.removeTask)("test-remove-race", "first");
335
+ }
336
+ return reply;
337
+ };
338
+ try {
339
+ await (0, index_1.updateTimer)();
340
+ }
341
+ finally {
342
+ client.zrange = zrange;
343
+ }
344
+ (0, chai_1.expect)(removed).to.equal(true);
345
+ (0, chai_1.expect)(await withinMs(ran, 1000)).to.equal("second");
346
+ await cleanupRedis();
347
+ });
348
+ });
349
+ async function withinMs(promise, ms) {
350
+ let timeout;
351
+ const expired = new Promise((resolve) => {
352
+ timeout = setTimeout(() => resolve("timed out"), ms);
353
+ });
354
+ try {
355
+ return await Promise.race([promise, expired]);
356
+ }
357
+ finally {
358
+ clearTimeout(timeout);
359
+ }
360
+ }
189
361
  describe("Redis Scheduler - retry logic", () => {
190
362
  it("should retry failed tasks up to 3 times", async () => {
191
363
  await cleanupRedis();
@@ -203,6 +375,38 @@ describe("Redis Scheduler - retry logic", () => {
203
375
  (0, chai_1.expect)(retryMembers[0]).to.match(/^RETRY-1:test-retry:retry-data$/);
204
376
  await cleanupRedis();
205
377
  });
378
+ it("should run the rest of the batch when a retry write fails", async () => {
379
+ await cleanupRedis();
380
+ const calls = [];
381
+ (0, index_1.setHandler)("test-retry-write", (taskInfo) => {
382
+ calls.push(taskInfo);
383
+ throw new Error("intentional failure");
384
+ });
385
+ const client = await (0, interface_redis_1.GetClient)();
386
+ await client.zadd(RedisKey, Date.now() - 2000, "test-retry-write:p");
387
+ await client.zadd(RedisKey, Date.now() - 1000, "test-retry-write:q");
388
+ const zadd = client.zadd.bind(client);
389
+ let writeFailures = 0;
390
+ Reflect.set(client, "zadd", (key, score, member) => {
391
+ if (writeFailures === 0) {
392
+ writeFailures++;
393
+ return Promise.reject(new Error("READONLY injected write failure"));
394
+ }
395
+ return zadd(key, score, member);
396
+ });
397
+ try {
398
+ await (0, index_1.runTasks)();
399
+ }
400
+ finally {
401
+ Reflect.set(client, "zadd", zadd);
402
+ }
403
+ (0, chai_1.expect)(writeFailures).to.equal(1);
404
+ (0, chai_1.expect)(calls).to.deep.equal(["p", "q"]);
405
+ (0, chai_1.expect)(await client.zrange(RedisKey, 0, -1)).to.deep.equal([
406
+ "RETRY-1:test-retry-write:q",
407
+ ]);
408
+ await cleanupRedis();
409
+ });
206
410
  });
207
411
  async function rejectionMessage(promise) {
208
412
  try {
@@ -213,4 +417,12 @@ async function rejectionMessage(promise) {
213
417
  }
214
418
  return undefined;
215
419
  }
420
+ async function delay(ms) {
421
+ await new Promise((resolve) => setTimeout(resolve, ms));
422
+ }
423
+ function liveTimeouts() {
424
+ return process
425
+ .getActiveResourcesInfo()
426
+ .filter((resource) => resource === "Timeout").length;
427
+ }
216
428
  //# sourceMappingURL=index.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/tests/index.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/tests/index.test.ts"],"names":[],"mappings":"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"}
@@ -137,7 +137,7 @@ async function stopApp() {
137
137
 
138
138
  ## `addTask`
139
139
 
140
- `addTask` schedules a task for a given time. It adds the task to the Redis sorted set with the due time as its score, then publishes an update message so listeners refresh their timers. While this process runs a batch of tasks, `addTask` does not publish. That process picks up the new task when its batch ends.
140
+ `addTask` schedules a task for a given time. It adds the task to the Redis sorted set with the due time as its score. When the task becomes the first in the queue, or the first queued task is already past due, it then publishes an update message so listeners refresh their timers. A task due later than a first task that is not yet due needs no message, because the timer armed for the first task leads to it. A first task that is past due may have no timer leading to it, for example after a batch that rejected or a lost message, so `addTask` publishes then too. While this process runs a batch of tasks, `addTask` does not publish. That process picks up the new task when its batch ends.
141
141
 
142
142
  ```typescript
143
143
  import { addTask } from "@antelopejs/interface-redis-scheduler";
@@ -202,6 +202,7 @@ The scheduler retries failed tasks with no extra code. When a handler throws or
202
202
  - **Maximum retries.** 3 retries after the first attempt, so 4 attempts in total.
203
203
  - **Retry delay.** Each retry is due 5 seconds after the attempt that failed.
204
204
  - **Exhaustion.** After the third retry fails, the scheduler logs the error and discards the task.
205
+ - **Failed retry write.** When Redis rejects the write that queues a retry, the scheduler logs that error, the task gets no retry, and the batch goes on with its next task.
205
206
 
206
207
  ```typescript
207
208
  import { setHandler } from "@antelopejs/interface-redis-scheduler";
@@ -224,11 +225,11 @@ The scheduler uses one Redis sorted set with the key `SchedulerUtil.Tasks`. Each
224
225
 
225
226
  A retried task has the form `RETRY-{count}:handlerName:taskInfo`, where `{count}` is the number of the retry, from 1 to 3.
226
227
 
227
- The scheduler also uses a Redis pub/sub channel named `SchedulerUtil`. `addTask` publishes the message `update` on it, and each listener that receives it refreshes its timer. The messages do not assign tasks to a listener. The Lua script that takes due tasks does that.
228
+ The scheduler also uses a Redis pub/sub channel named `SchedulerUtil`. `addTask` publishes the message `update` on it when the task it adds becomes the first in the queue or the first queued task is past due, and each listener that receives it refreshes its timer. The messages do not assign tasks to a listener. The Lua script that takes due tasks does that.
228
229
 
229
230
  ## `updateTimer`
230
231
 
231
- `updateTimer` reads the first queued task. If that task is already due, `updateTimer` runs the due tasks. Otherwise it arms a timer for the task's due time, capped at 24 hours. A listener calls `updateTimer` when it starts, when it receives an update message, and after each batch of tasks. While this process runs a batch, `updateTimer` returns without doing anything. You do not need to call it in normal usage.
232
+ `updateTimer` reads the first queued task. If that task is already due, `updateTimer` runs the due tasks. Otherwise it arms a timer for the task's due time, capped at 24 hours. The timer does not keep the process alive on its own. A process with nothing else pending exits, and the task stays queued in Redis for the next listener. A listener calls `updateTimer` when it starts, when it receives an update message, and after each batch of tasks. While this process runs a batch, `updateTimer` returns without doing anything. You do not need to call it in normal usage.
232
233
 
233
234
  ```typescript
234
235
  import { updateTimer } from "@antelopejs/interface-redis-scheduler";
@@ -239,7 +240,7 @@ await updateTimer();
239
240
 
240
241
  ## `runTasks`
241
242
 
242
- `runTasks` takes every task that is due and runs it. It removes the due tasks from Redis in one step, then calls their handlers one after another, earliest due time first. A task whose handler is not registered in this process is dropped. The retry logic applies to each handler that fails. When the batch ends, `runTasks` calls `updateTimer`. The timer calls `runTasks` when it fires, so you do not need to call it in normal usage.
243
+ `runTasks` takes every task that is due and runs it. It removes the due tasks from Redis in one step, then calls their handlers one after another, earliest due time first. A task whose handler is not registered in this process is dropped. The retry logic applies to each handler that fails. When the batch ends, `runTasks` calls `updateTimer`. One process runs one batch at a time: a call to `runTasks` while a batch runs, from the timer, an update message or your code, returns at once, so the handlers of one listener never overlap. When the running batch resolves, its closing `updateTimer` runs the tasks that fell due meanwhile. When the batch rejects, for example because Redis fails while it takes due tasks, `runTasks` releases its lock and rejects without arming a timer, and a timer that fired during that batch is spent, so the due tasks run on the next update message or the next `updateTimer` call. The timer calls `runTasks` when it fires, so you do not need to call it in normal usage.
243
244
 
244
245
  ```typescript
245
246
  import { runTasks } from "@antelopejs/interface-redis-scheduler";
@@ -315,7 +316,4 @@ async function shutdown() {
315
316
 
316
317
  These behaviours are tracked as open issues:
317
318
 
318
- - Two batches can run at the same time on one listener, so two handlers of one process can overlap ([#39](https://github.com/AntelopeJS/interface-redis-scheduler/issues/39)).
319
- - When `runTasks` rejects, for example because Redis fails while it takes due tasks or writes a retry, the process keeps its internal lock. That listener's `updateTimer` then returns without arming a timer ([#27](https://github.com/AntelopeJS/interface-redis-scheduler/issues/27)).
320
- - When writing a retry fails in the middle of a batch, the batch's remaining tasks are lost. They were already removed from Redis ([#29](https://github.com/AntelopeJS/interface-redis-scheduler/issues/29)).
321
319
  - When `removeTask` deletes the first queued task while `updateTimer` reads it, no timer is armed, and the remaining tasks wait for the next update message ([#38](https://github.com/AntelopeJS/interface-redis-scheduler/issues/38)).
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antelopejs/interface-redis-scheduler",
3
- "version": "0.0.10",
3
+ "version": "0.0.12",
4
4
  "description": "AntelopeJS interface for scheduling tasks on Redis, with retries on failure",
5
5
  "keywords": [
6
6
  "antelopejs",
@@ -42,11 +42,11 @@
42
42
  "lint:fix": "oxlint --fix",
43
43
  "lint": "oxlint",
44
44
  "prepack": "pnpm run build",
45
- "release": "pnpm run lint && pnpm run prepack && release-it",
45
+ "release": "pnpm run typecheck && pnpm run lint && pnpm run prepack && release-it",
46
46
  "test": "pnpm run build && ajs module test .",
47
47
  "format:check": "oxfmt --check .",
48
48
  "knip": "knip",
49
- "prepare": "if git rev-parse --is-inside-work-tree >/dev/null 2>&1 && command -v lefthook >/dev/null 2>&1; then lefthook install; fi",
49
+ "prepare": "if [ -e .git ] && command -v git >/dev/null 2>&1 && command -v lefthook >/dev/null 2>&1 && GIT_DIR=.git GIT_WORK_TREE=. git rev-parse --git-dir >/dev/null 2>&1; then GIT_DIR=.git GIT_WORK_TREE=. lefthook install; fi",
50
50
  "checks": "antelopejs-checks",
51
51
  "size": "antelopejs-check-size",
52
52
  "sync": "antelopejs-sync",
@@ -59,10 +59,10 @@
59
59
  "ioredis": "^5.10.1"
60
60
  },
61
61
  "devDependencies": {
62
- "@antelopejs/core": "^1.16.0",
63
- "@antelopejs/interface-core": "^0.2.4",
62
+ "@antelopejs/core": "^1.21.0",
63
+ "@antelopejs/interface-core": ">=0.2.4 <1.0.0",
64
64
  "@antelopejs/interface-redis": "^0.0.9",
65
- "@antelopejs/tooling-configs": "^0.2.18",
65
+ "@antelopejs/tooling-configs": "^0.5.1",
66
66
  "@types/chai": "^4.3.20",
67
67
  "@types/mocha": "^10.0.10",
68
68
  "@types/node": "^22.19.15",
@@ -12,8 +12,9 @@ Distributed task scheduler on top of Redis. Tasks live in one sorted set
12
12
  due tasks with one Lua script that reads and removes them in a single step, so
13
13
  each due entry goes to exactly one listener, and several listeners can share
14
14
  the queue. The `SchedulerUtil` pub/sub channel only carries an `update`
15
- message that tells listeners to re-arm their timers; it does not decide who
16
- runs a task.
15
+ message that tells listeners to re-arm their timers; `addTask` sends it only
16
+ when the new task becomes the first in the queue or the first task is past due,
17
+ and it does not decide who runs a task.
17
18
 
18
19
  Mental model: this is a consumer-side utility, not a proxied service. All
19
20
  exported functions run in your own module. Redis access goes through
@@ -85,6 +86,10 @@ await disableListener();
85
86
  process stops during the run, the task is lost. There is no exactly-once
86
87
  execution.
87
88
  - A batch runs its handlers one after another, earliest due time first.
89
+ - One process runs one batch at a time, so its handlers never overlap. A
90
+ `runTasks()` call while a batch runs returns at once; that batch picks up
91
+ the tasks that fell due meanwhile when it resolves. A batch that rejects
92
+ arms no timer, so those tasks wait for the next update message.
88
93
  - `taskInfo` is a plain string. Serialize and parse it (typically JSON)
89
94
  yourself.
90
95
  - `removeTask` needs the exact original `taskInfo` string. A JSON payload with
@@ -92,8 +97,12 @@ await disableListener();
92
97
  - A handler that throws or rejects is retried up to 3 times. Each retry is due
93
98
  5 seconds after the attempt that failed, and its member becomes
94
99
  `RETRY-{n}:handlerName:taskInfo`. After the third retry fails, the task is
95
- discarded. Every failure is logged through interface-core `Logging.Error`.
96
- - The listener's timer waits at most 24 hours before it checks again.
100
+ discarded. When Redis rejects the retry write, that task gets no retry and
101
+ the batch runs its next task. Every failure is logged through
102
+ interface-core `Logging.Error`.
103
+ - The listener's timer waits at most 24 hours before it checks again. It does
104
+ not keep the process alive on its own: a process with nothing else pending
105
+ exits, and its queued tasks stay in Redis for the next listener.
97
106
  - `enableListener` duplicates the shared Redis client into a dedicated
98
107
  subscriber connection. `disableListener` quits that subscriber.
99
108
  - `disableListener` only quits the subscriber connection. It does not clear