@akc42/server-utils 3.0.0 → 3.1.0

package/debug.js

@@ -26,7 +26,7 @@ let cachelimit = 50;
 export function Debug (topic) {
     const t = topic;
     let timestamp = new Date().getTime();
-    return function (...args) {
+    return async function (...args) {
       let enabled = false;
       if (config) {
         const topics = config.split(':');
@@ -44,16 +44,18 @@ export function Debug (topic) {
           //eslint-disable-next-line no-console
           console.log(output);
         } else {
-          fs.appendFile(process.env.LOG_FILE, output + '\n',{flush: true}, err => {
-            if (err) console.warn('Failed to write following message to log file', output);
-          });
+          try {
+            await fs.appendFile(process.env.LOG_FILE, output + '\n',{flush: true})
+          } catch(err) {
+            console.warn('Failed to write following message to log file', output);
+          }
         }    
       } 
       cache.push(output);
       if (cache.length > cachelimit) cache.splice(0,cache.length - cachelimit); //prevent it getting too big  
   }
 };
-export function dumpDebugCache() {
+export async function dumpDebugCache() {
   const output = chalk.white.bgBlue('Above are all the debug calls (most recent first) which lead up to, and then followed on from, the error above');
   cache.reverse();
   for(const line of cache) {
@@ -61,9 +63,11 @@ export function dumpDebugCache() {
       //eslint-disable-next-line no-console
       console.log(line);
     } else {
-      fs.appendFile(process.env.LOG_FILE, line + '\n',{flush: true}, err => {
-        if (err) console.warn('Failed to write following message to log file', line);
-      })
+      try {
+        await fs.appendFile(process.env.LOG_FILE, line + '\n',{flush: true});
+      } catch (err) {
+        console.warn('Failed to write following message to log file', line);
+      }
     }    
   }
   cache.reverse();
@@ -71,12 +75,14 @@ export function dumpDebugCache() {
     //eslint-disable-next-line no-console
     console.log(output);
   } else {
-    fs.appendFile(process.env.LOG_FILE, output + '\n',{flush: true}, err => {
-      if (err) console.warn('Failed to write following message to log file', output);
-    })
+    try {
+      await fs.appendFile(process.env.LOG_FILE, output + '\n',{flush: true});
+    } catch(err) {
+      console.warn('Failed to write following message to log file', output);
+    }
   }    
 };
-export function setDebugConfig(con, limit = 50) {
+export async function setDebugConfig(con, limit = 50) {
   cachelimit = limit;
   if (con !== config) {
     config = con;
@@ -85,9 +91,11 @@ export function setDebugConfig(con, limit = 50) {
       //eslint-disable-next-line no-console
       console.log(output);
     } else {
-      fs.appendFile(process.env.LOG_FILE, output + '\n',{flush: true}, err => {
-        if (err) console.warn('Failed to write following message to log file', output);
-      })
+      try {
+        await fs.appendFile(process.env.LOG_FILE, output + '\n',{flush: true})
+      } catch (err) {
+        console.warn('Failed to write following message to log file', output);
+      }
     }    
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akc42/server-utils",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "type": "module",
   "description": "A Set of Utilities to use on the Server Side of a Project",
   "main": "./utils.js",
@@ -22,8 +22,6 @@
   },
   "homepage": "https://github.com/akc42/server-utils#readme",
   "dependencies": {
-    "app-root-path": "^3.1.0",
-    "chalk": "^5.3.0",
-    "debug": "^4.3.4"
+    "chalk": "^5.3.0"
   }
 }

package/version.js

@@ -25,16 +25,16 @@ import { exec } from 'node:child_process';
 
 const debug = Debug('version');
 
-function shCmd(cmd, root) {
-  debug('About to execute Command ', cmd);
-  return new Promise((accept, reject) => {
-    exec(cmd, { cwd: root }, (err, stdout, stderr) => {
+async function shCmd(cmd, root) {
+  await debug('About to execute Command ', cmd);
+  return new Promise(async (accept, reject) => {
+    exec(cmd, { cwd: root }, async (err, stdout, stderr) => {
       if (stderr) {
-        debug('Command ', cmd, 'about to fail with ', err);
+        await debug('Command ', cmd, 'about to fail with ', err);
         reject(err);
       } else {
         const out = stdout.trim();
-        debug('Command ', cmd, 'Success with ', out);
+        await debug('Command ', cmd, 'Success with ', out);
         accept(out);
       }
     });
@@ -46,9 +46,9 @@ export default async function(root) {
   let vtime;
 
   try {
-    debug('Look for git')
+    await debug('Look for git')
     await access(resolve(root, '.git'));
-    debug('Git found, so use it to get data')
+    await debug('Git found, so use it to get data')
     //we get here if there is a git directory, so we can look up version and latest commit from them
     version = await shCmd('git describe --abbrev=0 --tags');
     //git is installed and we found a tag
@@ -60,7 +60,7 @@ export default async function(root) {
   } catch (e) {
     //no git, or no tag, so we must look for a version file
     try {
-      debug('Git approach failed, so look for release info');
+      await debug('Git approach failed, so look for release info');
       version = await readFile(resolve(root, 'release.info'), 'utf8');
       try {
         const { mtime } = await stat(resolve(root, 'release.info'));
@@ -88,7 +88,7 @@ export default async function(root) {
   } 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());
+    await debug('Resolving with Git copyright Year is ', copyrightTime.getUTCFullYear());
     return({ version: finalversion, year: copyrightTime.getUTCFullYear() });
   }
 };