@chriscode/hush 3.0.1 → 3.1.0

package/dist/commands/set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set.d.ts","sourceRoot":"","sources":["../../src/commands/set.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAyF9C,wBAAsB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA0CnE"}
+{"version":3,"file":"set.d.ts","sourceRoot":"","sources":["../../src/commands/set.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAwK9C,wBAAsB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA0CnE"}

package/dist/commands/set.js

@@ -18,6 +18,79 @@ function promptViaMacOSDialog(key) {
         return null;
     }
 }
+function promptViaWindowsDialog(key) {
+    try {
+        const psScript = `
+      Add-Type -AssemblyName System.Windows.Forms
+      Add-Type -AssemblyName System.Drawing
+      
+      $form = New-Object System.Windows.Forms.Form
+      $form.Text = 'Hush - Set Secret'
+      $form.Size = New-Object System.Drawing.Size(300,150)
+      $form.StartPosition = 'CenterScreen'
+      
+      $label = New-Object System.Windows.Forms.Label
+      $label.Location = New-Object System.Drawing.Point(10,20)
+      $label.Size = New-Object System.Drawing.Size(280,20)
+      $label.Text = 'Enter value for ${key}:'
+      $form.Controls.Add($label)
+      
+      $textBox = New-Object System.Windows.Forms.TextBox
+      $textBox.Location = New-Object System.Drawing.Point(10,50)
+      $textBox.Size = New-Object System.Drawing.Size(260,20)
+      $textBox.PasswordChar = '*'
+      $form.Controls.Add($textBox)
+      
+      $okButton = New-Object System.Windows.Forms.Button
+      $okButton.Location = New-Object System.Drawing.Point(10,80)
+      $okButton.Size = New-Object System.Drawing.Size(75,23)
+      $okButton.Text = 'OK'
+      $okButton.DialogResult = [System.Windows.Forms.DialogResult]::OK
+      $form.AcceptButton = $okButton
+      $form.Controls.Add($okButton)
+      
+      $form.TopMost = $true
+      
+      $result = $form.ShowDialog()
+      
+      if ($result -eq [System.Windows.Forms.DialogResult]::OK) {
+        Write-Output $textBox.Text
+      } else {
+        exit 1
+      }
+    `;
+        const encodedCommand = Buffer.from(psScript, 'utf16le').toString('base64');
+        const result = execSync(`powershell -EncodedCommand "${encodedCommand}"`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return result.trim();
+    }
+    catch {
+        return null;
+    }
+}
+function promptViaLinuxDialog(key) {
+    try {
+        const result = execSync(`zenity --password --title="Hush - Set Secret" --text="Enter value for ${key}:"`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return result.trim();
+    }
+    catch {
+        try {
+            const result = execSync(`kdialog --password "Enter value for ${key}:" --title "Hush - Set Secret"`, {
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return result.trim();
+        }
+        catch {
+            return null;
+        }
+    }
+}
 function promptViaTTY(key) {
     return new Promise((resolve, reject) => {
         process.stdout.write(`Enter value for ${pc.cyan(key)}: `);
@@ -60,26 +133,29 @@ function promptViaTTY(key) {
     });
 }
 async function promptForValue(key, forceGui) {
-    if (forceGui && platform() === 'darwin') {
-        console.log(pc.dim('Opening dialog for secret input...'));
-        const value = promptViaMacOSDialog(key);
-        if (value !== null) {
-            return value;
-        }
-        throw new Error('Dialog cancelled or failed');
-    }
-    if (process.stdin.isTTY) {
+    if (process.stdin.isTTY && !forceGui) {
         return promptViaTTY(key);
     }
-    if (platform() === 'darwin') {
-        console.log(pc.dim('Opening dialog for secret input...'));
-        const value = promptViaMacOSDialog(key);
-        if (value !== null) {
-            return value;
-        }
-        throw new Error('Dialog cancelled or failed');
+    console.log(pc.dim('Opening dialog for secret input...'));
+    let value = null;
+    switch (platform()) {
+        case 'darwin':
+            value = promptViaMacOSDialog(key);
+            break;
+        case 'win32':
+            value = promptViaWindowsDialog(key);
+            break;
+        case 'linux':
+            value = promptViaLinuxDialog(key);
+            break;
+    }
+    if (value !== null) {
+        return value;
+    }
+    if (platform() === 'linux') {
+        throw new Error('GUI prompt failed. Please install "zenity" or "kdialog".');
     }
-    throw new Error('Interactive input requires a terminal (TTY) or macOS');
+    throw new Error('Dialog cancelled or failed. Interactive input requires a terminal (TTY) or a supported GUI environment.');
 }
 export async function setCommand(options) {
     const { root, file, key, gui } = options;

package/dist/core/sops.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sops.d.ts","sourceRoot":"","sources":["../../src/core/sops.ts"],"names":[],"mappings":"AA0BA,wBAAgB,eAAe,IAAI,OAAO,CAOzC;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA6BhD;AAED,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAuBnE;AAED,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAqB3C;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAqDzE"}
+{"version":3,"file":"sops.d.ts","sourceRoot":"","sources":["../../src/core/sops.ts"],"names":[],"mappings":"AA0BA,wBAAgB,eAAe,IAAI,OAAO,CAUzC;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA6BhD;AAED,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAsBnE;AAED,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAsB3C;AAED;;;GAGG;AACH,wBAAgB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CA+CzE"}

package/dist/core/sops.js

@@ -1,12 +1,12 @@
 import { execSync, spawnSync } from 'node:child_process';
 import { existsSync, writeFileSync, unlinkSync } from 'node:fs';
 import { join } from 'node:path';
-import { tmpdir } from 'node:os';
+import { tmpdir, homedir } from 'node:os';
 function getAgeKeyFile() {
     if (process.env.SOPS_AGE_KEY_FILE) {
         return process.env.SOPS_AGE_KEY_FILE;
     }
-    const defaultPath = join(process.env.HOME || '~', '.config/sops/age/key.txt');
+    const defaultPath = join(homedir(), '.config', 'sops', 'age', 'key.txt');
     if (existsSync(defaultPath)) {
         return defaultPath;
     }
@@ -21,8 +21,11 @@ function getSopsEnv() {
 }
 export function isSopsInstalled() {
     try {
-        execSync('which sops', { stdio: 'ignore' });
-        return true;
+        const result = spawnSync('sops', ['--version'], {
+            stdio: 'ignore',
+            shell: true
+        });
+        return result.status === 0;
     }
     catch {
         return false;
@@ -36,7 +39,7 @@ export function decrypt(filePath) {
         throw new Error(`Encrypted file not found: ${filePath}`);
     }
     if (!isSopsInstalled()) {
-        throw new Error('SOPS is not installed. Install with: brew install sops');
+        throw new Error('SOPS is not installed. Install with: brew install sops (Mac) or scoop install sops (Windows)');
     }
     try {
         const result = execSync(`sops --input-type dotenv --output-type dotenv --decrypt "${filePath}"`, {
@@ -60,12 +63,11 @@ export function encrypt(inputPath, outputPath) {
         throw new Error(`Input file not found: ${inputPath}`);
     }
     if (!isSopsInstalled()) {
-        throw new Error('SOPS is not installed. Install with: brew install sops');
+        throw new Error('SOPS is not installed. Install with: brew install sops (Mac) or scoop install sops (Windows)');
     }
     try {
         execSync(`sops --input-type dotenv --output-type dotenv --encrypt "${inputPath}" > "${outputPath}"`, {
             encoding: 'utf-8',
-            shell: '/bin/bash',
             stdio: ['pipe', 'pipe', 'pipe'],
             env: getSopsEnv(),
         });
@@ -85,6 +87,7 @@ export function edit(filePath) {
     const result = spawnSync('sops', ['--input-type', 'dotenv', '--output-type', 'dotenv', filePath], {
         stdio: 'inherit',
         env: getSopsEnv(),
+        shell: true // Required to find executable on Windows
     });
     if (result.status !== 0) {
         throw new Error(`SOPS edit failed with exit code ${result.status}`);
@@ -99,13 +102,10 @@ export function setKey(filePath, key, value) {
         throw new Error('SOPS is not installed. Install with: brew install sops');
     }
     let content = '';
-    // If file exists, decrypt it first
     if (existsSync(filePath)) {
         content = decrypt(filePath);
     }
-    // Parse existing content into lines
     const lines = content.split('\n').filter(line => line.trim() !== '');
-    // Find and update or add the key
     let found = false;
     const updatedLines = lines.map(line => {
         const match = line.match(/^([^=]+)=/);
@@ -122,16 +122,13 @@ export function setKey(filePath, key, value) {
     const tempFile = join(tmpdir(), `hush-temp-${Date.now()}.env`);
     try {
         writeFileSync(tempFile, newContent, 'utf-8');
-        // Encrypt temp file to the target
         execSync(`sops --input-type dotenv --output-type dotenv --encrypt "${tempFile}" > "${filePath}"`, {
             encoding: 'utf-8',
-            shell: '/bin/bash',
             stdio: ['pipe', 'pipe', 'pipe'],
             env: getSopsEnv(),
         });
     }
     finally {
-        // Always clean up temp file
         if (existsSync(tempFile)) {
             unlinkSync(tempFile);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chriscode/hush",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "SOPS-based secrets management for monorepos. Encrypt once, decrypt everywhere.",
   "type": "module",
   "bin": {