sitevision-cli 0.4.0-beta.0 → 0.4.0-beta.1

package/dist/commands/dev.js

@@ -5,7 +5,8 @@ import { StatusIndicator } from '../components/StatusIndicator.js';
 import { WebpackRunner } from '../utils/webpack-runner.js';
 import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
 import { signApp, deployApp } from '../utils/sitevision-api.js';
-import { getSigningPassword, setSigningPassword, setDeployPassword, } from '../utils/keychain.js';
+import { setDeployPassword } from '../utils/keychain.js';
+import { resolveSigningPassword } from '../utils/signing-password.js';
 import { copyStaticToBuild, createBuildZip, cleanBuild } from '../utils/zip.js';
 import { isBundledApp, getAppType, getFullAppId, getZipPath, getSignedZipPath, } from '../utils/project-detection.js';
 export function DevScreen({ projectRoot, manifest, devProperties, signed, signingCredentials, onBack, onRetryCredentials, }) {
@@ -268,25 +269,11 @@ export const devCommand = {
                 return;
             }
             const signingUsername = project.devProperties.signingUsername;
-            let password = getSigningPassword(signingUsername) ||
-                process.env['SITEVISION_SIGNING_PASSWORD'] ||
-                '';
-            let promptedManually = false;
-            if (!password) {
-                console.log('');
-                password = await promptPassword('Signing password (developer.sitevision.se): ');
-                promptedManually = true;
-            }
+            const password = await resolveSigningPassword(signingUsername);
             if (!password) {
                 console.log('\x1b[31mError: Password is required for signed mode\x1b[0m');
                 return;
             }
-            if (promptedManually) {
-                const remember = await promptYesNo('Save password to OS keychain? (y/N): ');
-                if (remember) {
-                    setSigningPassword(signingUsername, password);
-                }
-            }
             signingCredentials = {
                 username: signingUsername,
                 password,

package/dist/commands/sign.js

@@ -3,8 +3,7 @@ import React from 'react';
 import { render, Box, Text, useInput } from 'ink';
 import { StatusIndicator } from '../components/StatusIndicator.js';
 import { signApp } from '../utils/sitevision-api.js';
-import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
-import { getSigningPassword, setSigningPassword } from '../utils/keychain.js';
+import { resolveSigningPassword } from '../utils/signing-password.js';
 import { getZipPath, getSignedZipPath } from '../utils/project-detection.js';
 import { formatFileSize, getZipSize, zipExists } from '../utils/zip.js';
 export function SignScreen({ projectRoot, manifest, devProperties, password, onBack, onRetryCredentials, }) {
@@ -84,26 +83,11 @@ export const signCommand = {
             return;
         }
         const signingUsername = project.devProperties.signingUsername;
-        // Try keychain first, then env var, then prompt
-        let password = getSigningPassword(signingUsername) ||
-            process.env['SITEVISION_SIGNING_PASSWORD'] ||
-            '';
-        let promptedManually = false;
-        if (!password) {
-            console.log('');
-            password = await promptPassword('Signing password (developer.sitevision.se): ');
-            promptedManually = true;
-        }
+        const password = await resolveSigningPassword(signingUsername);
         if (!password) {
             console.log('\x1b[31mError: Password is required\x1b[0m');
             return;
         }
-        if (promptedManually) {
-            const remember = await promptYesNo('Save password to OS keychain? (y/N): ');
-            if (remember) {
-                setSigningPassword(signingUsername, password);
-            }
-        }
         const { waitUntilExit } = render(_jsx(SignScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, password: password }));
         await waitUntilExit();
     },

package/dist/utils/password-prompt.d.ts

@@ -1,7 +1,8 @@
 /**
- * Prompt for a yes/no answer. Returns true for y/Y, false otherwise (incl. empty / Enter).
+ * Prompt for a yes/no answer. Returns true for y/Y.
+ * Pressing Enter (empty answer) returns `defaultYes` (default: false).
  */
-export declare function promptYesNo(prompt: string): Promise<boolean>;
+export declare function promptYesNo(prompt: string, defaultYes?: boolean): Promise<boolean>;
 /**
  * Prompt for password input with masked display
  */

package/dist/utils/password-prompt.js

@@ -1,7 +1,8 @@
 /**
- * Prompt for a yes/no answer. Returns true for y/Y, false otherwise (incl. empty / Enter).
+ * Prompt for a yes/no answer. Returns true for y/Y.
+ * Pressing Enter (empty answer) returns `defaultYes` (default: false).
  */
-export function promptYesNo(prompt) {
+export function promptYesNo(prompt, defaultYes = false) {
     return new Promise(resolve => {
         process.stdout.write(prompt);
         const stdin = process.stdin;
@@ -14,9 +15,15 @@ export function promptYesNo(prompt) {
             stdin.removeListener('data', onData);
             stdin.pause();
             process.stdout.write(`${char}\n`);
-            if (char.charCodeAt(0) === 3) {
+            const charCode = char.charCodeAt(0);
+            if (charCode === 3) {
                 process.exit();
             }
+            // Enter (CR/LF) or empty input → use the default
+            if (char === '' || charCode === 13 || charCode === 10) {
+                resolve(defaultYes);
+                return;
+            }
             resolve(char === 'y' || char === 'Y');
         };
         stdin.on('data', onData);

package/dist/utils/signing-password.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Resolve the signing password for the given user.
+ *
+ * Priority:
+ * 1. `SITEVISION_SIGNING_PASSWORD` env var (non-interactive override, no prompts).
+ * 2. A password saved in the OS keychain — the user is asked whether to use it
+ * or set a new one. Choosing "new" optionally updates the saved password.
+ * 3. An interactive prompt — optionally saved to the keychain.
+ *
+ * Returns an empty string if no password could be obtained.
+ */
+export declare function resolveSigningPassword(signingUsername: string): Promise<string>;

package/dist/utils/signing-password.js

@@ -0,0 +1,36 @@
+import { getSigningPassword, setSigningPassword } from './keychain.js';
+import { promptPassword, promptYesNo } from './password-prompt.js';
+const SIGNING_PROMPT = 'Signing password (developer.sitevision.se): ';
+/**
+ * Resolve the signing password for the given user.
+ *
+ * Priority:
+ * 1. `SITEVISION_SIGNING_PASSWORD` env var (non-interactive override, no prompts).
+ * 2. A password saved in the OS keychain — the user is asked whether to use it
+ * or set a new one. Choosing "new" optionally updates the saved password.
+ * 3. An interactive prompt — optionally saved to the keychain.
+ *
+ * Returns an empty string if no password could be obtained.
+ */
+export async function resolveSigningPassword(signingUsername) {
+    const envPassword = process.env['SITEVISION_SIGNING_PASSWORD'];
+    if (envPassword)
+        return envPassword;
+    const stored = getSigningPassword(signingUsername);
+    if (stored) {
+        const useStored = await promptYesNo('Use saved signing password from keychain? (Y/n): ', true);
+        if (useStored)
+            return stored;
+    }
+    console.log('');
+    const password = await promptPassword(SIGNING_PROMPT);
+    if (!password)
+        return '';
+    const remember = await promptYesNo(stored
+        ? 'Update saved password in OS keychain? (y/N): '
+        : 'Save password to OS keychain? (y/N): ');
+    if (remember) {
+        setSigningPassword(signingUsername, password);
+    }
+    return password;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sitevision-cli",
-	"version": "0.4.0-beta.0",
+	"version": "0.4.0-beta.1",
 	"license": "MIT",
 	"bin": {
 		"svc": "dist/cli.js"