Improve queue consuming.

Signed-off-by: Toha <[email protected]>

Author: tohenk

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntlab/work",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Nodejs queue and promise based work queue",
   "main": "index.js",
   "scripts": {

package.json

@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Toha <[email protected]>
+ * Copyright (c) 2022-2023 Toha <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-const EventEmitter  = require('events');
+const EventEmitter = require('events');
 
 /**
  * Queue processing.
@@ -38,15 +38,12 @@ class Queue extends EventEmitter {
         this.next();
     }
 
-    applyHandler() {
-        this.once('queue', this.handler);
-    }
-
-    start() {
+    consume(queue) {
         process.nextTick(() => {
-            if (this.queues.length) {
-                this.queue = this.queues.shift();
-                this.emit('queue', this.queue);
+            if (queue) {
+                this.queue = queue;
+                this.once('queue', this.handler);
+                this.emit('queue', queue);
             }
         });
     }
@@ -57,8 +54,7 @@ class Queue extends EventEmitter {
             if (typeof this.check == 'function') {
                 if (!this.check()) return;
             }
-            this.applyHandler();
-            this.start();
+            this.consume(this.queues.shift());
         } else {
             this.done();
         }

queue.js

@@ -1,7 +1,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Toha <[email protected]>
+ * Copyright (c) 2022-2023 Toha <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in