@leverege/build-tools 2.36.2 → 2.37.1

package/lib/server/refresh-npm-token.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable security/detect-non-literal-fs-filename */
 "use strict";
 
 var _nodeFs = _interopRequireDefault(require("node:fs"));
@@ -7,35 +8,45 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _execa = _interopRequireDefault(require("execa"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
-// the standard user npmrc token is stored here
-const npmrc = `${_nodeOs.default.homedir()}/.npmrc`;
-
 // max age in seconds of the npmrc file before refresh
 const refreshThreshold = 3600 * 24; // 1 day
 
+// eslint-disable-next-line no-console
 const log = console.log;
-
-// calculate number of seconds since last update and exit if the file
-// was recently updated
-let lastUpdated = refreshThreshold * 2; // forces refresh if npmrc file does not exist
-let oldToken;
-try {
-  if (_nodeFs.default.existsSync(npmrc)) {
-    const stat = _nodeFs.default.statSync(npmrc);
-    lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
-    // grab the old token for logging a redacted version
-    const oldNpmrc = _nodeFs.default.readFileSync(npmrc, 'utf8');
-    const found = oldNpmrc.match(/_authToken=(.*)\n/);
-    if (found) {
-      oldToken = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+const fetchToken = filename => {
+  const results = {
+    filename,
+    exists: false,
+    token: 'none',
+    lastUpdated: -1
+  };
+  try {
+    if (_nodeFs.default.existsSync(filename)) {
+      results.exists = true;
+      const stat = _nodeFs.default.statSync(filename);
+      results.lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
+      // grab the current token for logging a redacted version
+      const currentNpmrc = _nodeFs.default.readFileSync(filename, 'utf8');
+      const found = currentNpmrc.match(/_authToken=(.*)\n/);
+      if (found) {
+        results.token = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+      }
     }
+  } catch (statErr) {
+    log({
+      statErr
+    }, `<==fs.statSync failed on file ${filename}`);
   }
-} catch (statErr) {
-  log({
-    statErr
-  }, `<==fs.statSync failed on file ${npmrc}`);
-}
-if (lastUpdated < refreshThreshold) {
+  return results;
+};
+
+// fetch the tokens - note the RO token is deprecated and may not exist
+const npmrc = fetchToken(`${_nodeOs.default.homedir()}/.npmrc`);
+const npmrcRo = fetchToken(`${_nodeOs.default.homedir()}/.npmrc.ro`);
+
+// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+
+if (npmrc.exists && npmrc.lastUpdated < refreshThreshold) {
   process.exit(0);
 }
 
@@ -58,7 +69,7 @@ try {
     _nodeFs.default.copyFileSync(npmrc, `${npmrc}-BAK`); // make a backup for safety
   }
 
-  _nodeFs.default.writeFileSync(`${npmrc}`, npmrcSecret);
+  _nodeFs.default.writeFileSync(npmrc.filename, npmrcSecret);
 } catch (fileErr) {
   log(fileErr, 'fs failed');
   process.exit(1);
@@ -66,7 +77,8 @@ try {
 const now = new Date().toLocaleString();
 const slackURL = 'https://hooks.slack.com/services/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';
 const slackData = {
-  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     token [\`${oldToken}\`]`,
+  // eslint-disable-next-line max-len
+  text: `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
 fetch(slackURL, {
@@ -75,4 +87,8 @@ fetch(slackURL, {
   headers: {
     'Content-Type': 'application/json'
   }
-}).catch(err => console.log(err));
+}).catch(err => log(err));
+if (npmrcRo.exists) {
+  log(_chalk.default.red('\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove'));
+  process.exit(1);
+}

package/lib/web/refresh-npm-token.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable security/detect-non-literal-fs-filename */
 "use strict";
 
 var _nodeFs = _interopRequireDefault(require("node:fs"));
@@ -7,35 +8,45 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _execa = _interopRequireDefault(require("execa"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
-// the standard user npmrc token is stored here
-const npmrc = `${_nodeOs.default.homedir()}/.npmrc`;
-
 // max age in seconds of the npmrc file before refresh
 const refreshThreshold = 3600 * 24; // 1 day
 
+// eslint-disable-next-line no-console
 const log = console.log;
-
-// calculate number of seconds since last update and exit if the file
-// was recently updated
-let lastUpdated = refreshThreshold * 2; // forces refresh if npmrc file does not exist
-let oldToken;
-try {
-  if (_nodeFs.default.existsSync(npmrc)) {
-    const stat = _nodeFs.default.statSync(npmrc);
-    lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
-    // grab the old token for logging a redacted version
-    const oldNpmrc = _nodeFs.default.readFileSync(npmrc, 'utf8');
-    const found = oldNpmrc.match(/_authToken=(.*)\n/);
-    if (found) {
-      oldToken = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+const fetchToken = filename => {
+  const results = {
+    filename,
+    exists: false,
+    token: 'none',
+    lastUpdated: -1
+  };
+  try {
+    if (_nodeFs.default.existsSync(filename)) {
+      results.exists = true;
+      const stat = _nodeFs.default.statSync(filename);
+      results.lastUpdated = Math.trunc((Date.now() - stat.mtimeMs) / 1000);
+      // grab the current token for logging a redacted version
+      const currentNpmrc = _nodeFs.default.readFileSync(filename, 'utf8');
+      const found = currentNpmrc.match(/_authToken=(.*)\n/);
+      if (found) {
+        results.token = `${found[1].slice(0, 8)}......${found[1].slice(-4)}`;
+      }
     }
+  } catch (statErr) {
+    log({
+      statErr
+    }, `<==fs.statSync failed on file ${filename}`);
   }
-} catch (statErr) {
-  log({
-    statErr
-  }, `<==fs.statSync failed on file ${npmrc}`);
-}
-if (lastUpdated < refreshThreshold) {
+  return results;
+};
+
+// fetch the tokens - note the RO token is deprecated and may not exist
+const npmrc = fetchToken(`${_nodeOs.default.homedir()}/.npmrc`);
+const npmrcRo = fetchToken(`${_nodeOs.default.homedir()}/.npmrc.ro`);
+
+// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+
+if (npmrc.exists && npmrc.lastUpdated < refreshThreshold) {
   process.exit(0);
 }
 
@@ -58,7 +69,7 @@ try {
     _nodeFs.default.copyFileSync(npmrc, `${npmrc}-BAK`); // make a backup for safety
   }
 
-  _nodeFs.default.writeFileSync(`${npmrc}`, npmrcSecret);
+  _nodeFs.default.writeFileSync(npmrc.filename, npmrcSecret);
 } catch (fileErr) {
   log(fileErr, 'fs failed');
   process.exit(1);
@@ -66,7 +77,8 @@ try {
 const now = new Date().toLocaleString();
 const slackURL = 'https://hooks.slack.com/services/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';
 const slackData = {
-  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     token [\`${oldToken}\`]`,
+  // eslint-disable-next-line max-len
+  text: `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
 fetch(slackURL, {
@@ -75,4 +87,8 @@ fetch(slackURL, {
   headers: {
     'Content-Type': 'application/json'
   }
-}).catch(err => console.log(err));
+}).catch(err => log(err));
+if (npmrcRo.exists) {
+  log(_chalk.default.red('\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove'));
+  process.exit(1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.36.2",
+  "version": "2.37.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/refresh-npm-token.mjs

@@ -1,37 +1,51 @@
 #!/usr/bin/env node
+/* eslint-disable security/detect-non-literal-fs-filename */
 import fs from 'node:fs'
 import os from 'node:os'
 
 import chalk from 'chalk'
 import execa from 'execa' // we can't use $ until we upgrade to ESM execa
 
-// the standard user npmrc token is stored here
-const npmrc = `${os.homedir()}/.npmrc`
-
 // max age in seconds of the npmrc file before refresh
-const refreshThreshold = 3600 *24 // 1 day
+const refreshThreshold = 3600 * 24 // 1 day
 
+// eslint-disable-next-line no-console
 const log = console.log
 
-// calculate number of seconds since last update and exit if the file
-// was recently updated
-let lastUpdated = refreshThreshold * 2 // forces refresh if npmrc file does not exist
-let oldToken
-try {
-  if ( fs.existsSync( npmrc ) ) {
-    const stat = fs.statSync( npmrc )
-    lastUpdated = Math.trunc( ( Date.now() - stat.mtimeMs ) / 1000 )
-    // grab the old token for logging a redacted version
-    const oldNpmrc = fs.readFileSync( npmrc, 'utf8' )
-    const found = oldNpmrc.match( /_authToken=(.*)\n/ )
-    if( found ) {
-      oldToken = `${found[1].slice(0,8)}......${found[1].slice(-4)}`
+const fetchToken = ( filename ) => {
+  const results = {
+    filename,
+    exists : false,
+    token : 'none',
+    lastUpdated : -1
+  }
+
+  try {
+    if ( fs.existsSync( filename ) ) {
+      results.exists = true
+      const stat = fs.statSync( filename )
+      results.lastUpdated = Math.trunc( ( Date.now() - stat.mtimeMs ) / 1000 )
+      // grab the current token for logging a redacted version
+      const currentNpmrc = fs.readFileSync( filename, 'utf8' )
+      const found = currentNpmrc.match( /_authToken=(.*)\n/ )
+      if ( found ) {
+        results.token = `${found[1].slice( 0, 8 )}......${found[1].slice( -4 )}`
+      }
     }
+  } catch ( statErr ) {
+    log( { statErr }, `<==fs.statSync failed on file ${filename}` )
   }
-} catch ( statErr ) {
-  log( { statErr }, `<==fs.statSync failed on file ${npmrc}` )
+
+  return results
 }
-if ( lastUpdated < refreshThreshold ) { process.exit( 0 ) }
+
+// fetch the tokens - note the RO token is deprecated and may not exist
+const npmrc = fetchToken( `${os.homedir()}/.npmrc` )
+const npmrcRo = fetchToken( `${os.homedir()}/.npmrc.ro` )
+
+// log( { npmrc, npmrcRo }, '<==Your tokens be' )
+
+if ( npmrc.exists && npmrc.lastUpdated < refreshThreshold ) { process.exit( 0 ) }
 
 // fetch the contents of the npmrc secret stored on leverege-registry
 let npmrcSecret
@@ -45,7 +59,7 @@ try {
     '--project=leverege-registry',
   ] )
   npmrcSecret = stdout
-} catch( err ) {
+} catch ( err ) {
   log( chalk.yellow( `\nFailed Command => [${err.escapedCommand}]\n\n` ), chalk.red( err.stderr ) )
   process.exit( 1 )
 }
@@ -57,8 +71,8 @@ try {
   if ( fs.existsSync( npmrc ) ) {
     fs.copyFileSync( npmrc, `${npmrc}-BAK` ) // make a backup for safety
   }
-  fs.writeFileSync( `${npmrc}`, npmrcSecret )
-} catch( fileErr ) {
+  fs.writeFileSync( npmrc.filename, npmrcSecret )
+} catch ( fileErr ) {
   log( fileErr, 'fs failed' )
   process.exit( 1 )
 }
@@ -66,15 +80,21 @@ try {
 const now = ( new Date() ).toLocaleString()
 const slackURL = 'https://hooks.slack.com/services/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'
 const slackData = {
-  text: `--- npmrc refreshed by \`${process.env['USER']}\` at ${now}\n     token [\`${oldToken}\`]`,
-  channel: '#dev-ops-helm',
+  // eslint-disable-next-line max-len
+  text : `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
+  channel : '#dev-ops-helm',
 }
 
 fetch( slackURL, {
-  method: 'POST',
-  body: JSON.stringify( slackData ),
-  headers: {
-    'Content-Type': 'application/json',
+  method : 'POST',
+  body : JSON.stringify( slackData ),
+  headers : {
+    'Content-Type' : 'application/json',
   },
 } )
-  .catch( err => console.log( err ) )
+  .catch( err => log( err ) )
+
+if ( npmrcRo.exists ) {
+  log( chalk.red( '\nWARNING - the need for the ~/.npmrc.ro file has been eliminated - please remove' ) )
+  process.exit( 1 )
+}