xcraft-core-utils 4.3.9 → 4.4.0

package/lib/job-queue.js

@@ -32,18 +32,17 @@ class JobQueue {
     this.waitDelay = options.waitDelay;
     this.channel = name.toLowerCase().replace(/\.|\[|\//g, '-');
     this.runner = watt(function* (...args) {
-      this.runningSamples++;
+      this.notify(++this.runningSamples, true);
       try {
         yield* runner(...args);
       } finally {
-        this.endOfRunningSamples++;
+        this.notify(--this.runningSamples, true);
       }
     });
     this.parallelLimit = parallelLimit;
     this.waiting = new Map();
     this.running = 0;
     this.runningSamples = 0;
-    this.endOfRunningSamples = 0;
     this._mutex = new locks.Mutex();
     const busClient = require('xcraft-core-busclient').getGlobal();
     this.resp = busClient.newResponse('job-queue', 'token');
@@ -55,15 +54,14 @@ class JobQueue {
     return this.attempt >= this.maxAttempt;
   }
 
-  _notify(runningSamples) {
+  _notify(sample, hold) {
     this.resp.events.send('<job-queue.sampled>', {
       channel: this.channel,
-      sample: runningSamples,
+      sample,
       current: 0,
       total: 0,
+      hold,
     });
-    this.runningSamples -= this.endOfRunningSamples;
-    this.endOfRunningSamples = 0;
   }
 
   _log() {
@@ -109,7 +107,7 @@ class JobQueue {
   }
 
   dispose() {
-    this.notify(0);
+    this.notify(0, false);
     this.resp.events.send('<job-queue.disposed>', {
       channel: this.channel,
     });

package/lib/js.js

@@ -1,14 +1,16 @@
 'use strict';
 
+const AsyncFunction = (async () => {}).constructor;
+const GeneratorFunction = function* () {}.constructor;
+
 exports.isFunction = function (fn) {
   return typeof fn === 'function';
 };
 
 exports.isGenerator = function (fn) {
-  return (
-    fn &&
-    exports.isFunction(fn) &&
-    fn.constructor &&
-    fn.constructor.name === 'GeneratorFunction'
-  );
+  return fn && fn instanceof GeneratorFunction === true;
+};
+
+exports.isAsync = function (fn) {
+  return fn && fn instanceof AsyncFunction === true;
 };

package/lib/runnerInstance.js

@@ -76,8 +76,6 @@ class Runner {
         }
         //end callback
 
-        jobQueue.notify(jobQueue.runningSamples);
-
         //update counter
         jobQueue.running--;
         this.totalRunning--;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-utils",
-  "version": "4.3.9",
+  "version": "4.4.0",
   "description": "Xcraft utils",
   "main": "index.js",
   "engines": {