@dotenvx/dotenvx 1.65.0 → 1.65.2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.65.0",
+  "version": "1.65.2",
   "name": "@dotenvx/dotenvx",
   "description": "secrets for agents–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/cli/actions/run.js

@@ -53,7 +53,14 @@ async function run () {
       readableStrings,
       readableFilepaths,
       uniqueInjectedKeys
-    } = await new Run(envs, options.overload, process.env, options.envKeysFile, noOps).run()
+    } = await new Run(envs, options.overload, process.env, options.envKeysFile, noOps, {
+      beforeOpsKeypair: () => {
+        if (spinner) spinner.stop()
+      },
+      afterOpsKeypair: () => {
+        if (spinner) spinner.start('injecting')
+      }
+    }).run()
 
     for (const processedEnv of processedEnvs) {
       if (processedEnv.type === 'envFile') {

package/src/lib/extensions/ops.js

@@ -42,7 +42,7 @@ class Ops {
     if (publicKey) args.push(publicKey)
 
     try {
-      return JSON.parse(await this._exec(binary, args))
+      return JSON.parse(await this._execInteractive(binary, args))
     } catch (_e) {
       return {}
     }
@@ -58,7 +58,7 @@ class Ops {
     if (publicKey) args.push(publicKey)
 
     try {
-      return JSON.parse(this._execSync(binary, args))
+      return JSON.parse(this._execInteractiveSync(binary, args))
     } catch (_e) {
       return {}
     }
@@ -104,6 +104,36 @@ class Ops {
     return childProcess.execFileSync(binary, args).toString().trim()
   }
 
+  _execInteractive (binary, args) {
+    return new Promise((resolve, reject) => {
+      const subprocess = childProcess.spawn(binary, args, {
+        stdio: ['inherit', 'pipe', 'inherit']
+      })
+      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
 

package/src/lib/helpers/cryptography/opsKeypair.js

@@ -1,7 +1,15 @@
 const Ops = require('../../extensions/ops')
 
-async function opsKeypair (existingPublicKey) {
-  const kp = await new Ops().keypair(existingPublicKey)
+async function opsKeypair (existingPublicKey, options = {}) {
+  if (options.beforeOpsKeypair) await options.beforeOpsKeypair()
+
+  let kp
+  try {
+    kp = await new Ops().keypair(existingPublicKey)
+  } finally {
+    if (options.afterOpsKeypair) await options.afterOpsKeypair()
+  }
+
   const publicKey = kp.public_key
   const privateKey = kp.private_key
 

package/src/lib/helpers/keyResolution/keyValues.js

@@ -72,7 +72,10 @@ async function keyValues (filepath, opts = {}) {
 
   // ops
   if (!noOps && !privateKey && publicKey && publicKey.length > 0) {
-    const kp = await opsKeypair(publicKey)
+    const kp = await opsKeypair(publicKey, {
+      beforeOpsKeypair: opts.beforeOpsKeypair,
+      afterOpsKeypair: opts.afterOpsKeypair
+    })
     privateKey = kp.privateKey
   }
 

package/src/lib/services/run.js

@@ -17,12 +17,14 @@ const {
 } = require('./../helpers/keyResolution')
 
 class Run {
-  constructor (envs = [], overload = false, processEnv = process.env, envKeysFilepath = null, noOps = false) {
+  constructor (envs = [], overload = false, processEnv = process.env, envKeysFilepath = null, noOps = false, options = {}) {
     this.envs = envs
     this.overload = overload
     this.processEnv = processEnv
     this.envKeysFilepath = envKeysFilepath
     this.noOps = noOps
+    this.beforeOpsKeypair = options.beforeOpsKeypair
+    this.afterOpsKeypair = options.afterOpsKeypair
 
     this.processedEnvs = []
     this.readableFilepaths = new Set()
@@ -179,7 +181,12 @@ class Run {
       this.readableFilepaths.add(envFilepath)
 
       const { privateKeyName } = keyNames(filepath)
-      const { privateKeyValue } = await keyValues(filepath, { keysFilepath: this.envKeysFilepath, noOps: this.noOps })
+      const { privateKeyValue } = await keyValues(filepath, {
+        keysFilepath: this.envKeysFilepath,
+        noOps: this.noOps,
+        beforeOpsKeypair: this.beforeOpsKeypair,
+        afterOpsKeypair: this.afterOpsKeypair
+      })
 
       const {
         parsed,