sitevision-cli 1.0.0-beta.31 → 1.0.0-beta.33

package/dist/commands/setup-signing.js

@@ -1,42 +1,44 @@
 import fs from 'fs';
 import path from 'path';
 import readline from 'readline';
-function question(rl, prompt) {
-    return new Promise(resolve => {
-        rl.question(prompt, answer => {
-            resolve(answer);
-        });
-    });
+import { findDevPropertiesPath } from '../utils/project-detection.js';
+import { configProblem, getGlobalSigning, setGlobalSigning, settingsFile, } from '../utils/config.js';
+// rl.question drops lines that arrive before it is called, which is every line
+// but the first when stdin is piped. The iterator buffers them.
+function lineReader(rl) {
+    const lines = rl[Symbol.asyncIterator]();
+    return async (prompt) => {
+        process.stdout.write(prompt);
+        const { value, done } = await lines.next();
+        return done ? '' : String(value);
+    };
 }
 export const setupSigningCommand = {
     name: 'setup-signing',
     description: 'Configure signing credentials for developer.sitevision.se',
     requiresProject: true,
-    async execute({ project }) {
+    async execute({ project, flags }) {
+        const global = Boolean(flags['global']);
         const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
         });
+        const question = lineReader(rl);
         console.log('\n\x1b[36m\x1b[1mSetup Signing Credentials\x1b[0m\n');
         console.log('Configure credentials for signing apps on developer.sitevision.se');
         console.log('(Password will be prompted when running signing commands)\n');
-        // Find existing dev properties file
-        const devPropertiesPaths = [
-            path.join(project.root, '.dev_properties.json'),
-            path.join(project.root, '.dev-properties.json'),
-        ];
-        let devPropertiesPath = devPropertiesPaths[0];
+        const devPropertiesPath = findDevPropertiesPath(project.root) ??
+            path.join(project.root, '.dev_properties.json');
         let existingProperties = {};
-        for (const p of devPropertiesPaths) {
-            if (fs.existsSync(p)) {
-                devPropertiesPath = p;
-                try {
-                    existingProperties = JSON.parse(fs.readFileSync(p, 'utf-8'));
-                }
-                catch {
-                    // Invalid file, start fresh
-                }
-                break;
+        if (global) {
+            existingProperties = { ...getGlobalSigning() };
+        }
+        else {
+            try {
+                existingProperties = JSON.parse(fs.readFileSync(devPropertiesPath, 'utf8'));
+            }
+            catch {
+                // Missing or invalid file, start fresh
             }
         }
         try {
@@ -45,13 +47,14 @@ export const setupSigningCommand = {
             const usernamePrompt = defaultUsername
                 ? `Signing username [${defaultUsername}]: `
                 : 'Signing username: ';
-            let signingUsername = await question(rl, usernamePrompt);
+            let signingUsername = await question(usernamePrompt);
             if (!signingUsername && defaultUsername) {
                 signingUsername = defaultUsername;
             }
             if (!signingUsername) {
                 console.log('\x1b[31mError: Signing username is required\x1b[0m');
                 rl.close();
+                process.exitCode = 1;
                 return;
             }
             // Get certificate name (optional)
@@ -59,15 +62,26 @@ export const setupSigningCommand = {
             const certPrompt = defaultCertName
                 ? `Certificate name (blank for default) [${defaultCertName}]: `
                 : 'Certificate name (blank for default): ';
-            let certificateName = await question(rl, certPrompt);
+            let certificateName = await question(certPrompt);
             if (!certificateName && defaultCertName) {
                 certificateName = defaultCertName;
             }
             rl.close();
-            // Update dev properties (strip any plaintext passwords — they live in the keychain)
-            const { signingPassword: _signingRemoved, password: _passwordRemoved, ...cleanedProperties } = existingProperties;
+            if (global) {
+                if (configProblem()) {
+                    console.log(`\x1b[31mError: ${settingsFile()} does not parse; fix it first\x1b[0m`);
+                    process.exitCode = 1;
+                    return;
+                }
+                setGlobalSigning({
+                    signingUsername,
+                    ...(certificateName && { certificateName }),
+                });
+                console.log(`\n\x1b[32mSigning credentials saved to ${settingsFile()}\x1b[0m\n`);
+                return;
+            }
             const updatedProperties = {
-                ...cleanedProperties,
+                ...existingProperties,
                 signingUsername,
                 ...(certificateName && { certificateName }),
             };
@@ -77,6 +91,7 @@ export const setupSigningCommand = {
         catch (error) {
             rl.close();
             console.error('\x1b[31mError setting up signing credentials:\x1b[0m', error);
+            process.exitCode = 1;
         }
     },
 };

package/dist/commands/sign.js

@@ -1,94 +1,17 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-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 { 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, }) {
-    const [state, setState] = React.useState({
-        status: 'signing',
-        message: 'Signing app via developer.sitevision.se...',
-    });
-    useInput((input, key) => {
-        if (state.status !== 'signing') {
-            if (onBack && (key.escape || input === 'q')) {
-                onBack();
-            }
-            if (onRetryCredentials && state.status === 'error' && input === 'r') {
-                onRetryCredentials();
-            }
-        }
-    });
-    React.useEffect(() => {
-        async function runSign() {
-            try {
-                const zipPath = getZipPath(projectRoot, manifest);
-                const signedZipPath = getSignedZipPath(projectRoot, manifest);
-                // Validate zip exists
-                if (!zipExists(zipPath)) {
-                    setState({
-                        status: 'error',
-                        error: `Zip file not found: ${zipPath}\nRun 'build' first to create the zip file.`,
-                    });
-                    return;
-                }
-                // Sign the app
-                const result = await signApp(zipPath, {
-                    username: devProperties.signingUsername,
-                    password,
-                    certificateName: devProperties.certificateName,
-                }, signedZipPath);
-                if (!result.success) {
-                    setState({
-                        status: 'error',
-                        error: result.error || 'Signing failed',
-                    });
-                    return;
-                }
-                const signedSize = getZipSize(signedZipPath);
-                setState({
-                    status: 'success',
-                    message: 'App signed successfully',
-                    signedPath: signedZipPath,
-                    signedSize,
-                });
-            }
-            catch (error) {
-                setState({
-                    status: 'error',
-                    error: error instanceof Error ? error.message : String(error),
-                });
-            }
-        }
-        runSign();
-    }, [projectRoot, manifest, devProperties, password]);
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: state.status === 'signing' ? 'running' : state.status, label: state.status === 'signing'
-                        ? 'Signing'
-                        : state.status === 'success'
-                            ? 'Signed'
-                            : 'Failed', message: state.message }) }), state.status === 'success' && state.signedPath && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "green", children: ["Created: ", state.signedPath] }), state.signedSize !== undefined && (_jsxs(Text, { dimColor: true, children: ["Size: ", formatFileSize(state.signedSize)] }))] })), state.status === 'error' && state.error && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: "red", children: state.error }) })), state.status !== 'signing' && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [state.status === 'error' && onRetryCredentials && (_jsx(Text, { dimColor: true, children: "Press r to retry with new credentials" })), onBack && _jsx(Text, { dimColor: true, children: "Press q or Esc to return to menu" })] }))] }));
-}
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from 'ink';
+import { TaskScreen } from './TaskScreen.js';
+import { resolveSigningForCli } from './dev.js';
+import { startSign } from '../utils/tasks.js';
 export const signCommand = {
     name: 'sign',
     description: 'Sign the app for production deployment',
     requiresProject: true,
     async execute({ project }) {
-        // Check if signing credentials are configured
-        if (!project.hasSigningProperties ||
-            !project.devProperties?.signingUsername) {
-            console.log('\n\x1b[33mSigning credentials not configured.\x1b[0m');
-            console.log('Run \x1b[36msetup-signing\x1b[0m to configure credentials.\n');
+        const credentials = await resolveSigningForCli(project);
+        if (!credentials)
             return;
-        }
-        const signingUsername = project.devProperties.signingUsername;
-        const password = await resolveSigningPassword(signingUsername);
-        if (!password) {
-            console.log('\x1b[31mError: Password is required\x1b[0m');
-            return;
-        }
-        const { waitUntilExit } = render(_jsx(SignScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, password: password }));
-        await waitUntilExit();
+        const task = startSign(project, credentials);
+        await render(_jsx(TaskScreen, { task: task })).waitUntilExit();
     },
 };

package/dist/commands/use-finish.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { useApp } from 'ink';
+/**
+ * Standalone commands end themselves: once `result` is set the Ink app exits,
+ * and a failure becomes a non-zero exit code. `stay` keeps the screen up (for a
+ * retry key) while still recording the failure.
+ */
+export function useFinish(result, stay = false) {
+    const { exit } = useApp();
+    React.useEffect(() => {
+        if (!result)
+            return;
+        process.exitCode = result === 'error' ? 1 : 0;
+        if (!stay)
+            exit();
+    }, [result, stay, exit]);
+}

package/dist/commands/watch.js

@@ -5,14 +5,6 @@ export const watchCommand = {
     name: 'watch',
     description: 'Watch and rebuild (optionally signing) without deploying',
     requiresProject: true,
-    flags: {
-        signed: {
-            type: 'boolean',
-            description: 'Sign after each build',
-            alias: 's',
-            default: false,
-        },
-    },
     async execute({ project, flags }) {
         let signingCredentials;
         if (flags['signed']) {

package/dist/components/AuthLoginScreen.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { Box, Text, useInput } from 'ink';
 import Spinner from 'ink-spinner';
 import { t } from '../utils/i18n.js';
-import { beginOAuth2Login, openBrowser } from '../utils/oauth2-auth.js';
+import { beginOAuth2Login, oauth2ConfigProblem, openBrowser, } from '../utils/oauth2-auth.js';
 import { beginCookieLogin, } from '../utils/session-cookie-auth.js';
 /**
  * Ink-native interactive login for OAuth2 and session-cookie auth. Drives the
@@ -19,11 +19,13 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
     const cookieRef = React.useRef(null);
     const cancelOAuthRef = React.useRef(null);
     React.useEffect(() => {
+        // Set by the cleanup: the screen went away while a login was starting.
+        let gone = false;
         void (async () => {
             if (method === 'oauth2') {
                 const session = beginOAuth2Login(devProperties);
                 if (!session) {
-                    onError('OAuth2 is not fully configured (authorization/token endpoint or client ID missing).');
+                    onError(oauth2ConfigProblem(devProperties) ?? 'Could not start the login.');
                     return;
                 }
                 cancelOAuthRef.current = session.cancel;
@@ -32,6 +34,8 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
                 setPhase('awaiting');
                 const { token, error } = await session.complete();
                 cancelOAuthRef.current = null;
+                if (gone)
+                    return;
                 if (token) {
                     onComplete({ accessToken: token });
                 }
@@ -41,8 +45,12 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
             }
             else {
                 const session = await beginCookieLogin(devProperties);
+                if (gone) {
+                    void session?.close();
+                    return;
+                }
                 if (!session) {
-                    onError('Could not open a login browser (is Chrome installed?). Set SITEVISION_SESSION_COOKIE or pass --cookie with a cookie copied from your browser.');
+                    onError('Could not open a login browser (is Chrome installed?). Set SITEVISION_SESSION_COOKIE to a cookie copied from your browser.');
                     return;
                 }
                 cookieRef.current = session;
@@ -53,6 +61,7 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
         // Release resources if the screen unmounts before completing: close the
         // browser (cookie) and the loopback server (oauth2, frees the port).
         return () => {
+            gone = true;
             void cookieRef.current?.close();
             cookieRef.current = null;
             cancelOAuthRef.current?.();
@@ -72,16 +81,22 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
                 return;
             setPhase('capturing');
             void (async () => {
-                const result = await session.capture();
-                if (result.cookie) {
-                    cookieRef.current = null;
-                    await session.close();
-                    onComplete({ sessionCookie: result.cookie });
+                try {
+                    const result = await session.capture();
+                    if (result.cookie) {
+                        cookieRef.current = null;
+                        await session.close();
+                        onComplete({ sessionCookie: result.cookie });
+                    }
+                    else {
+                        // Keep the browser open so the user can navigate and retry.
+                        setNote(result.error ?? 'No session cookie found.');
+                        setPhase('awaiting');
+                    }
                 }
-                else {
-                    // Keep the browser open so the user can navigate and retry.
-                    setNote(result.error ?? 'No session cookie found.');
-                    setPhase('awaiting');
+                catch (error) {
+                    // The browser window was closed: nothing left to capture from.
+                    onError(`Could not read the session from the browser: ${error instanceof Error ? error.message : String(error)}`);
                 }
             })();
         }

package/dist/scaffold/inquirer-stub.js

@@ -0,0 +1,119 @@
+/**
+ * Stands in for inquirer inside the scaffolder: every question goes to svc over
+ * the socket in SVC_PROMPT_SOCKET and the reply comes back as the answer. `when`,
+ * `filter`, `validate` and function-valued fields run here, where they live.
+ * Self-contained on purpose: it is loaded by the tool's node, not by svc.
+ */
+import net from 'node:net';
+import process from 'node:process';
+import readline from 'node:readline';
+const CHOICE_TYPES = new Set(['list', 'rawlist', 'expand', 'select', 'search']);
+const evaluate = async (field, ...args) => typeof field === 'function' ? (await field(...args)) : field;
+const text = (value) => typeof value === 'string' ? value : JSON.stringify(value);
+function normalizeChoices(raw) {
+    if (!Array.isArray(raw))
+        return [];
+    const choices = [];
+    for (const entry of raw) {
+        if (entry === null || typeof entry !== 'object') {
+            choices.push({ name: text(entry), value: entry, checked: false });
+            continue;
+        }
+        const choice = entry;
+        if (choice['type'] === 'separator' || choice['disabled'])
+            continue;
+        const value = 'value' in choice ? choice['value'] : choice['name'];
+        choices.push({
+            name: text(choice['name'] ?? value),
+            value,
+            checked: Boolean(choice['checked']),
+        });
+    }
+    return choices;
+}
+/** Ask svc until the tool's own validation accepts; undefined when skipped. */
+async function askOne(question, answers, exchange) {
+    const type = text(question['type'] ?? 'input');
+    const choices = normalizeChoices(await evaluate(question['choices'], answers));
+    const fallback = await evaluate(question['default'], answers);
+    const values = choices.map(choice => choice.value);
+    const message = text(await evaluate(question['message'], answers));
+    let initial = fallback;
+    if (type === 'checkbox') {
+        const preset = Array.isArray(fallback) ? fallback : [];
+        initial = choices.flatMap((choice, i) => choice.checked || preset.includes(choice.value) ? [i] : []);
+    }
+    else if (CHOICE_TYPES.has(type)) {
+        // Inquirer takes a default as either the value or its index.
+        const at = values.indexOf(fallback);
+        initial = at === -1 && typeof fallback === 'number' ? fallback : at;
+        initial = Math.max(0, initial);
+    }
+    let error;
+    for (;;) {
+        // eslint-disable-next-line no-await-in-loop
+        const reply = await exchange({
+            name: question.name,
+            type,
+            message,
+            choices: choices.map(choice => choice.name),
+            default: initial,
+            error,
+        });
+        if (reply.skip)
+            return undefined;
+        let { value } = reply;
+        if (type === 'checkbox')
+            value = value.map(i => values[i]);
+        else if (CHOICE_TYPES.has(type))
+            value = values[value];
+        else if (type === 'number')
+            value = Number(value);
+        // eslint-disable-next-line no-await-in-loop
+        value = await evaluate(question['filter'] ?? value, value, answers);
+        // eslint-disable-next-line no-await-in-loop
+        const valid = await evaluate(question['validate'] ?? true, value, answers);
+        if (valid === true)
+            return value;
+        error = typeof valid === 'string' ? valid : 'Invalid value';
+    }
+}
+async function prompt(questions, initial = {}) {
+    const list = Array.isArray(questions)
+        ? questions
+        : typeof questions.name === 'string'
+            ? [questions]
+            : Object.entries(questions).map(([name, question]) => ({ ...question, name }));
+    const socket = net.connect(process.env['SVC_PROMPT_SOCKET']);
+    const lines = readline.createInterface({ input: socket });
+    const replies = lines[Symbol.asyncIterator]();
+    const exchange = async (message) => {
+        socket.write(JSON.stringify(message) + '\n');
+        const next = await replies.next();
+        if (next.done)
+            throw new Error('svc closed the prompt');
+        return JSON.parse(next.value);
+    };
+    // ponytail: dotted names ("a.b") stay flat keys; nest them if a question ever uses one.
+    const answers = { ...initial };
+    try {
+        for (const question of list) {
+            const wanted = question['when'] === undefined ||
+                // eslint-disable-next-line no-await-in-loop
+                Boolean(await evaluate(question['when'], answers));
+            const answered = answers[question.name] !== undefined && !question['askAnswered'];
+            if (!wanted || answered)
+                continue;
+            // eslint-disable-next-line no-await-in-loop
+            const value = await askOne(question, answers, exchange);
+            if (value !== undefined)
+                answers[question.name] = value;
+        }
+    }
+    finally {
+        socket.end();
+    }
+    return answers;
+}
+const inquirer = { prompt };
+export default inquirer;

package/dist/scaffold/register.js

@@ -0,0 +1,15 @@
+// Loaded through NODE_OPTIONS into every process the scaffolder starts: hands
+// sitevision-scripts svc's prompt bridge in place of inquirer.
+import module from 'node:module';
+import path from 'node:path';
+const stub = new URL(`inquirer-stub${path.extname(import.meta.url)}`, import.meta.url).href;
+// Missing before Node 22.15; svc then finds the run unmanaged and falls back.
+module.registerHooks?.({
+    resolve(specifier, context, nextResolve) {
+        if (specifier === 'inquirer' &&
+            context.parentURL?.includes('sitevision-scripts')) {
+            return { url: stub, shortCircuit: true };
+        }
+        return nextResolve(specifier, context);
+    },
+});