Merge branch 'main' into codex/update-polling-logic-for-task-handlers

Author: vkarpov15

.npmignore

@@ -0,0 +1,4 @@
+.github
+eslint.config.js
+test
+.npmrc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongoosejs/task",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": false,
   "scripts": {
     "lint": "eslint .",
@@ -19,8 +19,8 @@
   "devDependencies": {
     "@masteringjs/eslint-config": "0.1.1",
     "eslint": "9.30.0",
-    "mocha": "10.1.0",
+    "mocha": "12.0.0-beta-8",
     "mongoose": "9.x",
-    "sinon": "15.2.0"
+    "sinon": "16.x"
   }
 }

src/taskSchema.js

@@ -96,7 +96,11 @@ taskSchema.statics.cancelTask = async function cancelTask(filter) {
   if (filter != null) {
     filter = { $and: [{ status: 'pending' }, filter] };
   }
-  const task = await this.findOneAndUpdate(filter, { status: 'cancelled', cancelledAt: new Date() }, { returnDocument: 'after' });
+  const task = await this.findOneAndUpdate(
+    filter,
+    { status: 'cancelled', cancelledAt: new Date() },
+    { returnDocument: 'before' }
+  );
   return task;
 };
 
@@ -174,7 +178,7 @@ taskSchema.statics.expireTimedOutTasks = async function expireTimedOutTasks(opti
           finishedRunningAt: now
         }
       },
-      { new: true }
+      { returnDocument: 'before' }
     );
 
     if (!task) {
@@ -281,7 +285,7 @@ taskSchema.statics.poll = async function poll(opts) {
           timeoutAt: new Date(now.valueOf() + 10 * 60 * 1000), // 10 minutes from startedRunningAt
           ...additionalParams
         },
-        { new: false }
+        { returnDocument: 'before' }
       );
 
       if (task == null || task.status !== 'pending') {
@@ -322,14 +326,15 @@ taskSchema.statics.execute = async function(task, options = {}) {
   try {
     let result = null;
     if (typeof task.timeoutMS === 'number') {
+      let timeoutId;
       result = await Promise.race([
         Promise.resolve(
           this._handlers.get(task.name).call(task, task.params, task)
         ),
         new Promise((_, reject) => {
-          setTimeout(() => reject(new Error(`Task timed out after ${task.timeoutMS} ms`)), task.timeoutMS);
+          timeoutId = setTimeout(() => reject(new Error(`Task timed out after ${task.timeoutMS} ms`)), task.timeoutMS);
         })
-      ]);
+      ]).finally(() => clearTimeout(timeoutId));
     } else {
       result = await Promise.resolve(
         this._handlers.get(task.name).call(task, task.params, task)

test/task.test.js

@@ -288,8 +288,9 @@ describe('Task', function() {
       resolve = _resolve;
       reject = _reject;
     });
+    let handlerTimeout;
     Task.registerHandler('getQuestion', async () => {
-      await new Promise(resolve => setTimeout(resolve, 10000));
+      await new Promise(resolve => { handlerTimeout = setTimeout(resolve, 10000); });
     });
 
     let task = await Task.schedule('getQuestion', time.now().valueOf() + 100000, null, { timeoutMS: 50 });
@@ -301,6 +302,7 @@ describe('Task', function() {
     assert.equal(task.status, 'failed');
     assert.equal(task.error.message, 'Task timed out after 50 ms');
     assert.equal(task.finishedRunningAt.valueOf(), now.valueOf());
+    clearTimeout(handlerTimeout);
   });
 
   it('expires timed out tasks and handles repeats', async function() {