@akc42/server-utils 1.2.1 → 1.4.1

package/logger.js

@@ -24,7 +24,7 @@
 (function() {
   'use strict';
 
-  const chalk = require('chalk');
+  const chalkPromise = import('chalk');
   const { isIP } = require('net');
   let cyrb53;
 
@@ -43,25 +43,30 @@
       return 4294967296 * (2097151 & h2) + (h1 >>> 0);
     };
   }
-  const COLOURS = {
-    app: chalk.rgb(255, 136, 0).bold, //orange,
-    db: chalk.greenBright,
-    api: chalk.magentaBright,
-    client: chalk.redBright,
-    log: chalk.yellowBright,
-    mail:chalk.cyanBright,
-    //error like have backGround colouring
-    auth: chalk.black.bgCyan,
-    err: chalk.white.bgBlue,
-    error: chalk.white.bgRed
-  };
+  const COLOURPromise = new Promise(async accept => {
+    const {default: chalk} = await import('chalk');
+    accept({
+      app: chalk.rgb(255, 136, 0).bold, //orange,
+      db: chalk.greenBright,
+      api: chalk.magentaBright,
+      client: chalk.redBright,
+      log: chalk.yellowBright,
+      mail: chalk.cyanBright,
+      //error like have backGround colouring
+      auth: chalk.black.bgCyan,
+      err: chalk.white.bgBlue,
+      error: chalk.white.bgRed
+    });
+  });
 
-  function logger(ip,level, ...messages) {
+
+  async function logger(ip,level, ...messages) {
     if (process.env.LOG_NONE === undefined) {
+      COLOURS = await COLOURPromise;
       let logLine = '';
       if (process.env.LOG_NO_DATE === undefined) logLine += new Date().toISOString() + ': ';
       let message;
-      let logcolor
+      let logcolor;
       if (isIP(ip) === 0 ) {
         logcolor = ip;
         message = level + messages.join(' ');
@@ -73,7 +78,7 @@
       }
       logLine += COLOURS[logcolor](message);
       //eslint-disable-next-line no-console
-      console.log(logLine.trim());
+      console.log(logLine.trim());     
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akc42/server-utils",
-  "version": "1.2.1",
+  "version": "1.4.1",
   "description": "A Set of Utilities to use on the Server Side of a Project",
   "main": "utils.js",
   "scripts": {
@@ -22,8 +22,7 @@
   "homepage": "https://github.com/akc42/server-utils#readme",
   "dependencies": {
     "app-root-path": "^3.0.0",
-
-    "chalk": "^4.1.0",
-    "debug": "^4.2.0"
+    "chalk": "^5.0.0",
+    "debug": "^4.3.3"
   }
 }

package/version.js

@@ -86,9 +86,10 @@
         }
       }
     } finally {
+      const finalversion = version.replace(/\s+/g, ' ').trim(); //trim out new lines and multiple spaces just one.
       const copyrightTime = new Date(vtime);
       debug('Resolving with Git copyright Year is ', copyrightTime.getUTCFullYear());
-      resolve({ version: version, year: copyrightTime.getUTCFullYear() });
+      resolve({ version: finalversion, year: copyrightTime.getUTCFullYear() });
     }
   });
   module.exports = releaseVersion;