xcraft-core-utils 4.3.8 → 4.3.9

package/lib/runnerInstance.js

@@ -1,135 +1,135 @@
-'use strict';
-
-// create a unique, global symbol name
-// -----------------------------------
-const RUNNER_INSTANCE_KEY = Symbol.for('xcraft-core-utils.runnerInstance');
-const watt = require('gigawatts');
-
-class Runner {
-  constructor() {
-    this.totalRunning = 0;
-    this.runningsGroups = [];
-    this.runnings = {};
-    this.run = this.run.bind(this);
-    watt.wrapAll(this);
-  }
-
-  run(jobQueue) {
-    //must be postponed?
-    if (jobQueue.waitOn.length > 0) {
-      const mustWait = this.runningsGroups.some((q) =>
-        jobQueue.waitOn.includes(q)
-      );
-      if (mustWait) {
-        if (!jobQueue.maxAttemptReached) {
-          jobQueue.attempt++;
-          setTimeout(this.run, jobQueue.waitDelay, jobQueue);
-          return;
-        } else {
-          jobQueue.attempt = 0;
-        }
-      }
-    }
-
-    //queue is draining?
-    if (jobQueue.running > 0 && jobQueue.waiting.size === 0) {
-      return;
-    }
-
-    //jobqueue releasing
-    for (let x = jobQueue.running; x < jobQueue.parallelLimit; x++) {
-      const nextEntry = jobQueue.waiting.entries().next();
-      if (nextEntry.done) {
-        //we can leave, nothing is waiting us
-        break;
-      }
-
-      //remove the jobEntry from queue
-      const jobEntry = Object.assign({}, nextEntry.value);
-      jobQueue.waiting.delete(jobEntry[0]);
-
-      //log for journal inspections
-      if (this.totalRunning === 0 && jobQueue.parallelLimit > 1) {
-        jobQueue._dbg(`system are running new jobs`);
-      }
-
-      //priority tracking
-      if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
-        if (!this.runnings[jobQueue.priorityGroup]) {
-          this.runnings[jobQueue.priorityGroup] = {};
-        }
-        this.runnings[jobQueue.priorityGroup][jobQueue.name] = true;
-        //update runnings group
-        this.runningsGroups = Object.entries(this.runnings)
-          .filter((e) => Object.values(e[1]).some((r) => r === true))
-          .map((e) => e[0]);
-      }
-
-      //update counters
-      jobQueue.running++;
-      this.totalRunning++;
-
-      //trigger job start on queue runner
-      jobQueue.runner(jobEntry[1], (err) => {
-        if (err) {
-          jobQueue.err(err);
-        }
-        //end callback
-
-        jobQueue.notify(jobQueue.runningSamples);
-
-        //update counter
-        jobQueue.running--;
-        this.totalRunning--;
-
-        //priority tracking
-        if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
-          this.runnings[jobQueue.priorityGroup][jobQueue.name] = false;
-          //update runnings group
-          this.runningsGroups = Object.entries(this.runnings)
-            .filter((e) => Object.values(e[1]).some((r) => r === true))
-            .map((e) => e[0]);
-        }
-
-        //log
-        if (this.totalRunning === 0 && jobQueue.waiting.size === 0) {
-          jobQueue._dbg(`no more jobs running`);
-        }
-
-        //schedule a new run for this queue if needed
-        if (jobQueue.waiting.size > 0) {
-          setTimeout(this.run, 0, jobQueue);
-        }
-      });
-    }
-  }
-}
-
-// check if the global object has this symbol
-// add it if it does not have the symbol, yet
-// ------------------------------------------
-const globalSymbols = Object.getOwnPropertySymbols(global);
-const hasInstance = globalSymbols.indexOf(RUNNER_INSTANCE_KEY) > -1;
-if (!hasInstance) {
-  global[RUNNER_INSTANCE_KEY] = new Runner();
-}
-
-// define the singleton API
-// ------------------------
-
-const singleton = {};
-
-Object.defineProperty(singleton, 'instance', {
-  get: function () {
-    return global[RUNNER_INSTANCE_KEY];
-  },
-});
-
-// ensure the API is never changed
-// -------------------------------
-
-Object.freeze(singleton);
-
-// export the singleton API only
-// -----------------------------
-module.exports = singleton;
+'use strict';
+
+// create a unique, global symbol name
+// -----------------------------------
+const RUNNER_INSTANCE_KEY = Symbol.for('xcraft-core-utils.runnerInstance');
+const watt = require('gigawatts');
+
+class Runner {
+  constructor() {
+    this.totalRunning = 0;
+    this.runningsGroups = [];
+    this.runnings = {};
+    this.run = this.run.bind(this);
+    watt.wrapAll(this);
+  }
+
+  run(jobQueue) {
+    //must be postponed?
+    if (jobQueue.waitOn.length > 0) {
+      const mustWait = this.runningsGroups.some((q) =>
+        jobQueue.waitOn.includes(q)
+      );
+      if (mustWait) {
+        if (!jobQueue.maxAttemptReached) {
+          jobQueue.attempt++;
+          setTimeout(this.run, jobQueue.waitDelay, jobQueue);
+          return;
+        } else {
+          jobQueue.attempt = 0;
+        }
+      }
+    }
+
+    //queue is draining?
+    if (jobQueue.running > 0 && jobQueue.waiting.size === 0) {
+      return;
+    }
+
+    //jobqueue releasing
+    for (let x = jobQueue.running; x < jobQueue.parallelLimit; x++) {
+      const nextEntry = jobQueue.waiting.entries().next();
+      if (nextEntry.done) {
+        //we can leave, nothing is waiting us
+        break;
+      }
+
+      //remove the jobEntry from queue
+      const jobEntry = Object.assign({}, nextEntry.value);
+      jobQueue.waiting.delete(jobEntry[0]);
+
+      //log for journal inspections
+      if (this.totalRunning === 0 && jobQueue.parallelLimit > 1) {
+        jobQueue._dbg(`system are running new jobs`);
+      }
+
+      //priority tracking
+      if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
+        if (!this.runnings[jobQueue.priorityGroup]) {
+          this.runnings[jobQueue.priorityGroup] = {};
+        }
+        this.runnings[jobQueue.priorityGroup][jobQueue.name] = true;
+        //update runnings group
+        this.runningsGroups = Object.entries(this.runnings)
+          .filter((e) => Object.values(e[1]).some((r) => r === true))
+          .map((e) => e[0]);
+      }
+
+      //update counters
+      jobQueue.running++;
+      this.totalRunning++;
+
+      //trigger job start on queue runner
+      jobQueue.runner(jobEntry[1], (err) => {
+        if (err) {
+          jobQueue.err(err);
+        }
+        //end callback
+
+        jobQueue.notify(jobQueue.runningSamples);
+
+        //update counter
+        jobQueue.running--;
+        this.totalRunning--;
+
+        //priority tracking
+        if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
+          this.runnings[jobQueue.priorityGroup][jobQueue.name] = false;
+          //update runnings group
+          this.runningsGroups = Object.entries(this.runnings)
+            .filter((e) => Object.values(e[1]).some((r) => r === true))
+            .map((e) => e[0]);
+        }
+
+        //log
+        if (this.totalRunning === 0 && jobQueue.waiting.size === 0) {
+          jobQueue._dbg(`no more jobs running`);
+        }
+
+        //schedule a new run for this queue if needed
+        if (jobQueue.waiting.size > 0) {
+          setTimeout(this.run, 0, jobQueue);
+        }
+      });
+    }
+  }
+}
+
+// check if the global object has this symbol
+// add it if it does not have the symbol, yet
+// ------------------------------------------
+const globalSymbols = Object.getOwnPropertySymbols(global);
+const hasInstance = globalSymbols.indexOf(RUNNER_INSTANCE_KEY) > -1;
+if (!hasInstance) {
+  global[RUNNER_INSTANCE_KEY] = new Runner();
+}
+
+// define the singleton API
+// ------------------------
+
+const singleton = {};
+
+Object.defineProperty(singleton, 'instance', {
+  get: function () {
+    return global[RUNNER_INSTANCE_KEY];
+  },
+});
+
+// ensure the API is never changed
+// -------------------------------
+
+Object.freeze(singleton);
+
+// export the singleton API only
+// -----------------------------
+module.exports = singleton;

package/lib/string.js

@@ -1,15 +1,15 @@
-'use strict';
-
-exports.camelcasify = function (str) {
-  return str.replace(/(\.[a-z])/g, function (match) {
-    return match.replace('.', '').toUpperCase();
-  });
-};
-
-exports.capitalize = function (str) {
-  return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
-};
-
-exports.jsify = (str) => {
-  return str.replace(/-([a-z])/g, (m, g1) => g1.toUpperCase());
-};
+'use strict';
+
+exports.camelcasify = function (str) {
+  return str.replace(/(\.[a-z])/g, function (match) {
+    return match.replace('.', '').toUpperCase();
+  });
+};
+
+exports.capitalize = function (str) {
+  return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+};
+
+exports.jsify = (str) => {
+  return str.replace(/-([a-z])/g, (m, g1) => g1.toUpperCase());
+};

package/lib/whereIs.js

@@ -1,13 +1,13 @@
-const path = require('path');
-const fse = require('fs-extra');
-
-module.exports = function whereIs(bin) {
-  var fullLocation = null;
-
-  var exists = process.env.PATH.split(path.delimiter).some(function (location) {
-    fullLocation = path.join(location, bin);
-    return fse.existsSync(fullLocation);
-  });
-
-  return exists ? fullLocation : null;
-};
+const path = require('path');
+const fse = require('fs-extra');
+
+module.exports = function whereIs(bin) {
+  var fullLocation = null;
+
+  var exists = process.env.PATH.split(path.delimiter).some(function (location) {
+    fullLocation = path.join(location, bin);
+    return fse.existsSync(fullLocation);
+  });
+
+  return exists ? fullLocation : null;
+};

package/lib/yaml.js

@@ -1,10 +1,10 @@
-'use strict';
-
-var fs = require('fs');
-
-exports.fromFile = function (yamlFile) {
-  var yaml = require('js-yaml');
-
-  var data = fs.readFileSync(yamlFile, 'utf8');
-  return yaml.safeLoad(data);
-};
+'use strict';
+
+var fs = require('fs');
+
+exports.fromFile = function (yamlFile) {
+  var yaml = require('js-yaml');
+
+  var data = fs.readFileSync(yamlFile, 'utf8');
+  return yaml.safeLoad(data);
+};

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "xcraft-core-utils",
-  "version": "4.3.8",
-  "description": "Xcraft utils",
-  "main": "index.js",
-  "engines": {
-    "node": ">=14"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "xcraft",
-    "utils",
-    "helpers"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Xcraft-Inc/xcraft-core-utils.git"
-  },
-  "author": "Mathieu Schroeter",
-  "license": "MIT",
-  "dependencies": {
-    "ansi-regex": "^2.1.1",
-    "cli-color": "^1.2.0",
-    "escape-regexp": "0.0.1",
-    "escape-string-regexp": "^1.0.5",
-    "figlet": "^1.2.1",
-    "fs-extra": "^9.1.0",
-    "gigawatts": "^4.0.1",
-    "js-yaml": "^3.9.0",
-    "linked-list": "^1.0.4",
-    "lodash": "^4.17.20",
-    "locks": "^0.2.2",
-    "prop-types": "^15.7.2",
-    "uuid": "^8.3.2",
-    "xcraft-core-busclient": "^5.0.0",
-    "xcraft-core-fs": "^2.0.0",
-    "xcraft-core-log": "^2.0.0",
-    "xcraft-core-utils": "^4.0.0"
-  },
-  "bugs": {
-    "url": "https://github.com/Xcraft-Inc/xcraft-core-utils/issues"
-  },
-  "homepage": "https://github.com/Xcraft-Inc/xcraft-core-utils#readme",
-  "devDependencies": {
-    "should": "^11.2.1",
-    "prettier": "2.0.4",
-    "xcraft-dev-prettier": "^2.0.0",
-    "xcraft-dev-rules": "^2.0.0"
-  },
-  "prettier": "xcraft-dev-prettier"
-}
+{
+  "name": "xcraft-core-utils",
+  "version": "4.3.9",
+  "description": "Xcraft utils",
+  "main": "index.js",
+  "engines": {
+    "node": ">=14"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "xcraft",
+    "utils",
+    "helpers"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Xcraft-Inc/xcraft-core-utils.git"
+  },
+  "author": "Mathieu Schroeter",
+  "license": "MIT",
+  "dependencies": {
+    "ansi-regex": "^2.1.1",
+    "cli-color": "^1.2.0",
+    "escape-regexp": "0.0.1",
+    "escape-string-regexp": "^1.0.5",
+    "figlet": "^1.2.1",
+    "fs-extra": "^9.1.0",
+    "gigawatts": "^4.0.1",
+    "js-yaml": "^3.9.0",
+    "linked-list": "^1.0.4",
+    "lodash": "^4.17.20",
+    "locks": "^0.2.2",
+    "prop-types": "^15.7.2",
+    "uuid": "^8.3.2",
+    "xcraft-core-busclient": "^5.0.0",
+    "xcraft-core-fs": "^2.0.0",
+    "xcraft-core-log": "^2.0.0",
+    "xcraft-core-utils": "^4.0.0"
+  },
+  "bugs": {
+    "url": "https://github.com/Xcraft-Inc/xcraft-core-utils/issues"
+  },
+  "homepage": "https://github.com/Xcraft-Inc/xcraft-core-utils#readme",
+  "devDependencies": {
+    "should": "^11.2.1",
+    "prettier": "2.0.4",
+    "xcraft-dev-prettier": "^2.0.0",
+    "xcraft-dev-rules": "^2.0.0"
+  },
+  "prettier": "xcraft-dev-prettier"
+}

package/test/index.js

@@ -1,68 +1,68 @@
-'use strict';
-
-var should = require('should'); /* jshint ignore:line */
-var xUtils = require('../index.js');
-
-describe('xcraft-core-utils', function () {
-  describe('#string#camelcasify ()', function () {
-    var topics = [
-      {
-        in: '',
-        out: '',
-      },
-      {
-        in: 'foo.bar',
-        out: 'fooBar',
-      },
-      {
-        in: 'fooBar',
-        out: 'fooBar',
-      },
-      {
-        in: 'f.o.o.b.a.r',
-        out: 'fOOBAR',
-      },
-      {
-        in: 'fo.ob.ar',
-        out: 'foObAr',
-      },
-    ];
-
-    topics.forEach(function (item) {
-      it('camelcasify ' + item.in, function () {
-        xUtils.string.camelcasify(item.in).should.be.equal(item.out);
-      });
-    });
-  });
-
-  describe('#string#capitalize ()', function () {
-    var strings = [
-      {
-        in: '',
-        out: '',
-      },
-      {
-        in: 'foobar',
-        out: 'Foobar',
-      },
-      {
-        in: 'FOOBAR',
-        out: 'Foobar',
-      },
-      {
-        in: 'fOOBAR',
-        out: 'Foobar',
-      },
-      {
-        in: 'Foobar',
-        out: 'Foobar',
-      },
-    ];
-
-    strings.forEach(function (str) {
-      it('capitalize ' + str.in, function () {
-        xUtils.string.capitalize(str.in).should.be.equal(str.out);
-      });
-    });
-  });
-});
+'use strict';
+
+var should = require('should'); /* jshint ignore:line */
+var xUtils = require('../index.js');
+
+describe('xcraft-core-utils', function () {
+  describe('#string#camelcasify ()', function () {
+    var topics = [
+      {
+        in: '',
+        out: '',
+      },
+      {
+        in: 'foo.bar',
+        out: 'fooBar',
+      },
+      {
+        in: 'fooBar',
+        out: 'fooBar',
+      },
+      {
+        in: 'f.o.o.b.a.r',
+        out: 'fOOBAR',
+      },
+      {
+        in: 'fo.ob.ar',
+        out: 'foObAr',
+      },
+    ];
+
+    topics.forEach(function (item) {
+      it('camelcasify ' + item.in, function () {
+        xUtils.string.camelcasify(item.in).should.be.equal(item.out);
+      });
+    });
+  });
+
+  describe('#string#capitalize ()', function () {
+    var strings = [
+      {
+        in: '',
+        out: '',
+      },
+      {
+        in: 'foobar',
+        out: 'Foobar',
+      },
+      {
+        in: 'FOOBAR',
+        out: 'Foobar',
+      },
+      {
+        in: 'fOOBAR',
+        out: 'Foobar',
+      },
+      {
+        in: 'Foobar',
+        out: 'Foobar',
+      },
+    ];
+
+    strings.forEach(function (str) {
+      it('capitalize ' + str.in, function () {
+        xUtils.string.capitalize(str.in).should.be.equal(str.out);
+      });
+    });
+  });
+});

package/test/jobqueue.js

@@ -1,33 +1,33 @@
-const xUtils = require('../index.js');
-//const watt = require('gigawatts');
-const jobs1 = [
-  {id: 1, gen: 0},
-  {id: 1, gen: 1},
-  {id: 1, gen: 4},
-  {id: 1, gen: 5},
-  {id: 2, gen: 1},
-  {id: 2, gen: 2},
-  {id: 2, gen: 3},
-  {id: 4, gen: 0},
-  {id: 1, gen: 2},
-  {id: 1, gen: 3},
-  {id: 1, gen: 6},
-  {id: 1, gen: 7},
-  {id: 1, gen: 8},
-  {id: 1, gen: 9},
-  {id: 1, gen: 10},
-  {id: 3, gen: 0},
-];
-
-const runner = (job, done) => {
-  setTimeout(() => {
-    console.log(`[id:${job.id}] gen:${job.gen}`);
-    done();
-  }, 1000);
-};
-
-const queue = new xUtils.JobQueue('test', runner, 1);
-
-for (const j of jobs1.values()) {
-  queue.push(j);
-}
+const xUtils = require('../index.js');
+//const watt = require('gigawatts');
+const jobs1 = [
+  {id: 1, gen: 0},
+  {id: 1, gen: 1},
+  {id: 1, gen: 4},
+  {id: 1, gen: 5},
+  {id: 2, gen: 1},
+  {id: 2, gen: 2},
+  {id: 2, gen: 3},
+  {id: 4, gen: 0},
+  {id: 1, gen: 2},
+  {id: 1, gen: 3},
+  {id: 1, gen: 6},
+  {id: 1, gen: 7},
+  {id: 1, gen: 8},
+  {id: 1, gen: 9},
+  {id: 1, gen: 10},
+  {id: 3, gen: 0},
+];
+
+const runner = (job, done) => {
+  setTimeout(() => {
+    console.log(`[id:${job.id}] gen:${job.gen}`);
+    done();
+  }, 1000);
+};
+
+const queue = new xUtils.JobQueue('test', runner, 1);
+
+for (const j of jobs1.values()) {
+  queue.push(j);
+}