huge compose job refactor

Author: manobi

index.js

@@ -7,11 +7,11 @@ const worker = new Worker({
 
 worker.addJob('compress', async (ctx, done) => {
     //fast exec
-    //done();
+    //done(null, {sucesso: 'muleque'});
 
     // Async exec
-    //const res = await fetch('https://dog.ceo/api/breeds/image/random');
-    //return res.json();
+    const res = await fetch('https://dog.ceo/api/breeds/image/random');
+    return res.json();
 
     // failed
     //done({deu: 'ruim'});
@@ -20,5 +20,10 @@ worker.addJob('compress', async (ctx, done) => {
     //done(null, {deu: 'certo'});
 
     //long run
-    setTimeout(() => done(null, 'acabou'), 200000000);
+    
+    // setTimeout(() => {
+    //     console.log('long exec');
+    //     done(null, 'acabou');
+    // }, 200000000);
+    
 });

lib/context.js

@@ -6,19 +6,21 @@ module.exports = class Context {
         this.duration = null;
         //Object.assign(this, task);
         this.task = task;
-        /*
-        
         this.timeout = undefined;
         this.execution = undefined;
         this.running = undefined;
-        */
-
+        
         const obs = new PerformanceObserver((items) => {
             this.duration = items.getEntries()[0].duration;
             performance.clearMarks();
             obs.disconnect();
         });
         obs.observe({ entryTypes: ['measure'] });
+
+        this.timeout = setTimeout(() => {
+            this.cancel();
+            this.done({error: 'timeout'});
+        }, task.timeout || 5000);
     }
 
     prev(){
@@ -29,16 +31,29 @@ module.exports = class Context {
 
     }
 
-    queue(){
-
-    }
-
     // private
-    start(){
+    start(job){
         performance.mark('job_start');
+        try {
+            this.execution = setTimeout(() => {
+                this.running = job(this, this.done);
+                const isPromise = this.running && typeof this.running.then == 'function';
+                if(isPromise){
+                    this.running.then(res => this.done(null, res)).catch(err => this.done(err));
+                }
+            }, 0);
+        } catch (error) {
+            console.log('Error executing job', error);
+            this.done(error);
+        }
+    }
+
+    cancel(){
+        clearTimeout(this.execution);
     }
 
     stop(){
+        clearTimeout(this.timeout);
         performance.mark('job_stop');
         performance.measure('execution_time', 'job_start', 'job_stop');
         return this.duration;

lib/worker.js

@@ -80,21 +80,7 @@ module.exports = class Worker extends Scheduler {
     composeJob(task, job){
         // Create context
         const context = this.createContext(task);
-
-        // Job composition
-        let timeout,
-            execution,
-            running;
-
-        const cancel = () => {
-            clearTimeout(execution);
-        }
-
-        const done = (err, res) => {
-            console.log('Tarefa finalizada');
-            console.log('err', err);
-            console.log('res', res);
-            clearTimeout(timeout);
+        context.done = (err, res) => {
             context.stop();
             // Enqueue the task update
             this.enqueue(task.id, _ => {
@@ -103,30 +89,8 @@ module.exports = class Worker extends Scheduler {
         }
 
         return () => {
-            /*
-            * TODO: test timeout error
-            */
-            timeout = setTimeout(() => {
-                cancel();
-                done({error: 'timeout'});
-            }, task.timeout || 5000);
-
-            context.start();
+            context.start(job);
             console.log('Running', task.id, 'date', task.date);
-            
-            try {
-                execution = setTimeout(() => {
-                    running = job(context, done);
-                }, 0);
-                const isPromise = running && typeof running.then == 'function';
-                if(isPromise){
-                    console.log('é um promessa');
-                    running.then(res => done(null, res)).catch(err => done(err));
-                }
-            } catch (error) {
-                console.log('Error executing job', error);
-                done(error);
-            }
         }
     }
 

spec/context.spec.js

@@ -68,6 +68,9 @@ describe('Context', () => {
     });
     describe('#next', () => {
         let task = {};
+        const job = (ctx, done) => {
+            done();
+        }
         beforeEach(() => {
             task = {
                 id: '101020teste2010',
@@ -88,8 +91,11 @@ describe('Context', () => {
                 executions: 1
             }
             const ctx = new Context(incrementalTask);
-            ctx.start();
-            ctx.stop();
+            ctx.done = () => {
+                ctx.stop();
+            }
+            ctx.start(job);
+            
             const next = {
                 ...task,
                 status: 'failed',
@@ -105,8 +111,10 @@ describe('Context', () => {
         describe('When error', () => {
             it('without retry the status is "failed"', () => {
                 const ctx = new Context(task);
-                ctx.start();
-                ctx.stop();
+                ctx.done = () => {
+                    ctx.stop();
+                }
+                ctx.start(job);
                 const next = {
                     ...task,
                     status: 'failed',
@@ -131,8 +139,10 @@ describe('Context', () => {
                     }
                 };
                 const ctx = new Context(retryableTask);
-                ctx.start();
-                ctx.stop();
+                ctx.done = () => {
+                    ctx.stop();
+                }
+                ctx.start(job);
                 const next = {
                     ...retryableTask,
                     date: '2019-12-20T12:14:25.864Z',
@@ -150,8 +160,10 @@ describe('Context', () => {
         describe('When success', () => {
             it('without repeat option', () => {
                 const ctx = new Context(task);
-                ctx.start();
-                ctx.stop();
+                ctx.done = () => {
+                    ctx.stop();
+                }
+                ctx.start(job);
                 const next = {
                     ...task,
                     status: 'complete',
@@ -169,8 +181,10 @@ describe('Context', () => {
                     ...task,
                     retries: 3
                 });
-                ctx.start();
-                ctx.stop();
+                ctx.done = () => {
+                    ctx.stop();
+                }
+                ctx.start(job);
                 const next = {
                     ...task,
                     status: 'complete',
@@ -196,8 +210,10 @@ describe('Context', () => {
                     }
                 };
                 const ctx = new Context(repeatableTask);
-                ctx.start();
-                ctx.stop();
+                ctx.done = () => {
+                    ctx.stop();
+                }
+                ctx.start(job);
                 const next = {
                     ...repeatableTask,
                     date: '2019-12-20T12:14:25.864Z',