@dotenvx/dotenvx 1.72.0 → 1.73.1

package/src/lib/services/sets.js

@@ -10,7 +10,7 @@ const {
 } = require('./../helpers/envResolution')
 
 const {
-  keyNames,
+  keyNamesForEnvFile,
   keyValues,
   keyValuesSync
 } = require('./../helpers/keyResolution')
@@ -131,7 +131,7 @@ class Sets {
         let publicKey
         let privateKey
 
-        const { publicKeyName, privateKeyName } = keyNames(filepath)
+        const { publicKeyName, privateKeyName } = keyNamesForEnvFile(filepath)
         const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, {
           keysFilepath: this.envKeysFilepath,
           noArmor: this.noArmor,
@@ -248,7 +248,7 @@ class Sets {
         let publicKey
         let privateKey
 
-        const { publicKeyName, privateKeyName } = keyNames(filepath)
+        const { publicKeyName, privateKeyName } = keyNamesForEnvFile(filepath)
         const { publicKeyValue, privateKeyValue } = await keyValues(filepath, {
           keysFilepath: this.envKeysFilepath,
           noArmor: this.noArmor,

package/src/lib/extensions/armor.js

@@ -1,204 +0,0 @@
-const path = require('path')
-const childProcess = require('child_process')
-const util = require('util')
-const { logger } = require('../../shared/logger')
-
-const execFile = util.promisify(childProcess.execFile)
-const BINARY_NAMES = ['dotenvx-armor', 'dotenvx-vlt', 'dotenvx-ops']
-
-class Armor {
-  async status () {
-    if (this._isForcedOff()) return 'off'
-
-    const binary = await this._resolveBinary()
-    if (!binary) return 'off'
-
-    try {
-      return await this._exec(binary, ['status'])
-    } catch (_e) {
-      return 'off'
-    }
-  }
-
-  statusSync () {
-    if (this._isForcedOff()) return 'off'
-
-    const binary = this._resolveBinarySync()
-    if (!binary) return 'off'
-
-    try {
-      return this._execSync(binary, ['status'])
-    } catch (_e) {
-      return 'off'
-    }
-  }
-
-  async keypair (publicKey, options = {}) {
-    if (this._isForcedOff()) return {}
-
-    const binary = await this._resolveBinary()
-    if (!binary) return {}
-
-    const args = ['keypair']
-    if (options.noSpinner) args.push('--no-spinner')
-    if (options.token) args.push('--token', options.token)
-    if (options.envFilepath) args.push('-f', options.envFilepath)
-    if (options.command) args.push('--metadata', this._serializeMetadata(options))
-    if (publicKey) args.push(publicKey)
-
-    try {
-      return JSON.parse(await this._execInteractive(binary, args))
-    } catch (_e) {
-      return {}
-    }
-  }
-
-  keypairSync (publicKey, options = {}) {
-    if (this._isForcedOff()) return {}
-
-    const binary = this._resolveBinarySync()
-    if (!binary) return {}
-
-    const args = ['keypair']
-    if (options.noSpinner) args.push('--no-spinner')
-    if (options.token) args.push('--token', options.token)
-    if (options.envFilepath) args.push('-f', options.envFilepath)
-    if (options.command) args.push('--metadata', this._serializeMetadata(options))
-    if (publicKey) args.push(publicKey)
-
-    try {
-      return JSON.parse(this._execInteractiveSync(binary, args))
-    } catch (_e) {
-      return {}
-    }
-  }
-
-  observe (payload) {
-    if (this._isForcedOff()) return
-
-    const binary = this._resolveBinarySync()
-    if (!binary) return
-
-    let status = 'off'
-    try {
-      status = this._execSync(binary, ['status'])
-    } catch (_e) {
-      return
-    }
-    if (status === 'off') return
-
-    const encoded = Buffer.from(JSON.stringify(payload)).toString('base64')
-    try {
-      const subprocess = childProcess.spawn(binary, ['observe', encoded], {
-        stdio: 'ignore',
-        detached: true
-      })
-      subprocess.unref()
-    } catch (_e) {
-      // noop
-    }
-  }
-
-  _serializeMetadata (options) {
-    return JSON.stringify({
-      command: this._serializeCommand(options.command)
-    })
-  }
-
-  _serializeCommand (command) {
-    if (Array.isArray(command)) return command.map((arg) => `${arg}`).join(' ')
-    return `${command}`
-  }
-
-  async _exec (binary, args) {
-    const { stdout, stderr } = await execFile(binary, args)
-    if (stderr && stderr.length > 0) {
-      process.stderr.write(stderr.toString())
-    }
-    return stdout.toString().trim()
-  }
-
-  _execSync (binary, args) {
-    logger.debug(binary)
-    logger.debug(args)
-    return childProcess.execFileSync(binary, args).toString().trim()
-  }
-
-  _execInteractive (binary, args) {
-    return new Promise((resolve, reject) => {
-      const spawnOptions = {
-        stdio: ['inherit', 'pipe', 'inherit']
-      }
-      const subprocess = childProcess.spawn(binary, args, spawnOptions)
-      let stdout = ''
-
-      subprocess.stdout.on('data', (data) => {
-        stdout += data.toString()
-      })
-      subprocess.on('error', reject)
-      subprocess.on('close', (code) => {
-        if (code !== 0) {
-          reject(new Error(`${binary} ${args.join(' ')} exited with code ${code}`))
-          return
-        }
-
-        resolve(stdout.trim())
-      })
-    })
-  }
-
-  _execInteractiveSync (binary, args) {
-    logger.debug(binary)
-    logger.debug(args)
-    return childProcess.execFileSync(binary, args, {
-      stdio: ['inherit', 'pipe', 'inherit']
-    }).toString().trim()
-  }
-
-  async _resolveBinary () {
-    if (this._binaryPromise) return this._binaryPromise
-
-    this._binaryPromise = (async () => {
-      for (const binary of this._binaryCandidates()) {
-        try {
-          await this._exec(binary, ['--version'])
-          return binary
-        } catch (_e) {}
-      }
-
-      return null
-    })()
-
-    return this._binaryPromise
-  }
-
-  _resolveBinarySync () {
-    if (this._binarySync !== undefined) return this._binarySync
-
-    for (const binary of this._binaryCandidates()) {
-      try {
-        this._execSync(binary, ['--version'])
-        this._binarySync = binary
-        return this._binarySync
-      } catch (err) {
-        logger.debug(err.message)
-      }
-    }
-
-    this._binarySync = null
-    return null
-  }
-
-  _binaryCandidates () {
-    return BINARY_NAMES.flatMap((binary) => [
-      path.resolve(process.cwd(), `node_modules/.bin/${binary}`),
-      binary
-    ])
-  }
-
-  _isForcedOff () {
-    return process.env.DOTENVX_NO_ARMOR === 'true' || process.env.DOTENVX_NO_VLT === 'true' || process.env.DOTENVX_NO_OPS === 'true'
-  }
-}
-
-module.exports = Armor