sitevision-cli 1.0.0-beta.8 → 1.0.0

package/dist/utils/session-cookie-auth.js

@@ -1,4 +1,5 @@
 import { setSessionCookie } from './keychain.js';
+import { debug } from './debug.js';
 function bareDomain(domain) {
     return domain.replace(/^\./, '');
 }
@@ -15,14 +16,15 @@ function domainRelated(a, b) {
  * browser — so it's unit-testable.
  */
 export function selectSessionCookie(all, siteDomain) {
-    const sessions = all.filter(c => c.name === 'JSESSIONID');
-    if (sessions.length === 0) {
+    // Only a session on the deploy site counts: a Java IdP sets a JSESSIONID of
+    // its own, and that one must never be sent to the site.
+    const chosen = all.find(c => c.name === 'JSESSIONID' && domainRelated(c.domain, siteDomain));
+    if (!chosen) {
         const domains = [...new Set(all.map(c => bareDomain(c.domain)))];
         return {
-            error: `No JSESSIONID among ${all.length} cookies. Domains seen: ${domains.join(', ') || 'none'}. If these are only your IdP, open a Sitevision page in the browser, then press Enter again.`,
+            error: `No JSESSIONID for ${siteDomain} among ${all.length} cookies. Domains seen: ${domains.join(', ') || 'none'}. If these are only your IdP, open a Sitevision page in the browser, then press Enter again.`,
         };
     }
-    const chosen = sessions.find(c => domainRelated(c.domain, siteDomain)) ?? sessions[0];
     const cookies = all.filter(c => domainRelated(c.domain, chosen.domain));
     return {
         cookie: cookies.map(c => `${c.name}=${c.value}`).join('; '),
@@ -56,7 +58,7 @@ async function readAllCookies(browser, page) {
  */
 export async function beginCookieLogin(dev) {
     const { domain, username } = dev;
-    if (!domain || !username)
+    if (!domain)
         return null;
     let puppeteer;
     try {
@@ -70,12 +72,14 @@ export async function beginCookieLogin(dev) {
         browser = await puppeteer.launch({ headless: false, channel: 'chrome' });
         const page = await browser.newPage();
         const loginUrl = dev.sessionLoginUrl || `https://${domain}/`;
+        debug('auth', `cookie login ${loginUrl}`);
         await page.goto(loginUrl, { waitUntil: 'domcontentloaded' }).catch(() => {
             // A SAML redirect may abort the initial navigation — that's fine.
         });
         const capture = async () => {
             const all = await readAllCookies(browser, page);
             const result = selectSessionCookie(all, domain);
+            debug('auth', `cookie capture ${domain}: ${result.cookie ? 'session found' : 'no session'} (${all.length} cookies)`);
             if (result.cookie) {
                 setSessionCookie(domain, username, result.cookie);
             }
@@ -86,7 +90,7 @@ export async function beginCookieLogin(dev) {
                 // Best-effort close.
             });
         };
-        return { capture, close };
+        return { capture, close, loginUrl };
     }
     catch {
         if (browser) {

package/dist/utils/sitevision-api.js

@@ -12,7 +12,8 @@ import fs from 'fs';
 import path from 'path';
 import https from 'https';
 import http from 'http';
-import { buildImportEndpointUrl, buildAddonEndpointUrl, } from './project-detection.js';
+import { buildImportEndpointUrl, buildAddonEndpointUrl, buildApiBaseUrl, } from './project-detection.js';
+import { debug } from './debug.js';
 // =============================================================================
 // CONSTANTS
 // =============================================================================
@@ -89,6 +90,9 @@ function createMultipartFormData(filePath, fieldName, boundary) {
 export function makeRequest(url, options) {
     return new Promise((resolve, reject) => {
         const parsedUrl = new URL(url);
+        const startedAt = Date.now();
+        const describe = `${options.method} ${parsedUrl.host}${parsedUrl.pathname}`;
+        debug('http', describe);
         const isHttps = parsedUrl.protocol === 'https:';
         const transport = isHttps ? https : http;
         const headers = {
@@ -121,18 +125,28 @@ export function makeRequest(url, options) {
                 chunks.push(chunk);
             });
             res.on('end', () => {
+                debug('http', `${describe} -> ${res.statusCode} ${res.headers['content-type'] ?? ''} ${Date.now() - startedAt}ms`);
                 resolve({
                     statusCode: res.statusCode || 0,
                     body: Buffer.concat(chunks),
                     headers: res.headers,
                 });
             });
+            // A connection cut mid-body never emits 'end'.
+            res.on('error', reject);
+            res.on('close', () => {
+                if (!res.complete)
+                    reject(new Error('Response was cut off'));
+            });
         });
         // Abort hung connections instead of blocking the CLI indefinitely.
         req.setTimeout(options.timeoutMs ?? DEFAULT_TIMEOUT_MS, () => {
             req.destroy(new Error(`Request timed out after ${options.timeoutMs ?? DEFAULT_TIMEOUT_MS}ms`));
         });
-        req.on('error', reject);
+        req.on('error', error => {
+            debug('http', `${describe} failed: ${error.message}`);
+            reject(error);
+        });
         if (options.body) {
             req.write(options.body);
         }
@@ -160,16 +174,36 @@ async function delay(ms) {
  */
 export function summarizeErrorBody(body, headers) {
     const contentType = headers['content-type'] ?? 'unknown';
-    const isText = contentType.includes('text') ||
+    const declaredText = contentType.includes('text') ||
         contentType.includes('json') ||
         contentType.includes('xml');
-    if (!isText) {
-        return `(${contentType}, ${body.length} bytes)`;
+    const text = body.toString('utf8');
+    // Show the body when the server declares it text OR the bytes decode to
+    // mostly-printable text. Sitevision sometimes returns a text/JSON error with
+    // a missing or non-text content-type, and hiding it obscures the real cause.
+    if (declaredText || isMostlyPrintable(text)) {
+        const collapsed = text.replaceAll(/\s+/g, ' ').trim();
+        const max = 300;
+        const summary = collapsed.length > max ? collapsed.slice(0, max) + '…' : collapsed;
+        if (summary.length > 0)
+            return summary;
+    }
+    return `(${contentType}, ${body.length} bytes)`;
+}
+/** Heuristic: a decoded string is text if <10% of chars are control/undecodable. */
+function isMostlyPrintable(text) {
+    if (text.length === 0)
+        return false;
+    let bad = 0;
+    for (const ch of text) {
+        const code = ch.codePointAt(0) ?? 0;
+        // Undecodable byte (replacement char), or a control char other than
+        // tab/newline/vertical-tab/form-feed/carriage-return.
+        if (code === 0xff_fd || code < 9 || (code > 13 && code < 32)) {
+            bad++;
+        }
     }
-    const text = body.toString('utf8').replaceAll(/\s+/g, ' ').trim();
-    const max = 300;
-    const summary = text.length > max ? text.slice(0, max) + '…' : text;
-    return summary.length > 0 ? summary : `(${contentType}, empty body)`;
+    return bad / text.length < 0.1;
 }
 /** ZIP local-file-header magic bytes: "PK\x03\x04". */
 const ZIP_MAGIC = Buffer.from([0x50, 0x4b, 0x03, 0x04]);
@@ -316,9 +350,11 @@ export async function deployApp(zipPath, config, appType, force = false) {
     if (force) {
         url += '?force=true';
     }
-    // Create multipart form data
+    // The import endpoints read the archive from a multipart part named "data"
+    // (per the webAppImport/restAppImport docs, and confirmed against a live
+    // server). Signing uses "file" against a different endpoint.
     const boundary = generateBoundary();
-    const { body, contentType } = createMultipartFormData(zipPath, 'file', boundary);
+    const { body, contentType } = createMultipartFormData(zipPath, 'data', boundary);
     const { auth, kind } = configAuth(config);
     try {
         const response = await makeRequest(url, {
@@ -369,6 +405,14 @@ export async function deployApp(zipPath, config, appType, force = false) {
                 error: 'Conflict. Addon already exists. Use --force to overwrite.',
             };
         }
+        if (response.statusCode === 400 &&
+            response.body.toString().includes('could not resolve context node')) {
+            return {
+                success: false,
+                error: `Deployment failed with status 400: ${summarizeErrorBody(response.body, response.headers)}`,
+                contextNodeMissing: true,
+            };
+        }
         return {
             success: false,
             error: `Deployment failed with status ${response.statusCode}: ${summarizeErrorBody(response.body, response.headers)}`,
@@ -394,23 +438,24 @@ export async function deployProduction(signedZipPath, config, appType) {
     if (!deployResult.success) {
         return deployResult;
     }
-    // If activation requested and we have an executable ID
-    if (config.activate && deployResult.executableId) {
-        const activationResult = await activateApp(deployResult.executableId, config, appType);
-        if (!activationResult.success) {
-            return {
-                success: true,
-                executableId: deployResult.executableId,
-                message: `Deployed successfully but activation failed: ${activationResult.error}`,
-            };
-        }
+    if (!config.activate)
+        return deployResult;
+    if (!deployResult.executableId) {
         return {
-            success: true,
-            executableId: deployResult.executableId,
-            message: 'Deployed and activated successfully',
+            ...deployResult,
+            activated: false,
+            message: 'Deployed, but not activated: the server did not return an executable id.',
         };
     }
-    return deployResult;
+    const activationResult = await activateApp(deployResult.executableId, config, appType);
+    return {
+        success: true,
+        executableId: deployResult.executableId,
+        activated: activationResult.success,
+        message: activationResult.success
+            ? 'Deployed and activated successfully'
+            : `Deployed successfully but activation failed: ${activationResult.error}`,
+    };
 }
 // =============================================================================
 // ADDON MANAGEMENT API
@@ -423,10 +468,11 @@ export async function deployProduction(signedZipPath, config, appType) {
  */
 export async function createAddon(config, appType) {
     const url = buildAddonEndpointUrl(config.domain, config.siteName, appType, config.useHTTP);
-    const body = JSON.stringify({
-        name: config.addonName,
-        category: 'Other',
-    });
+    const payload = { name: config.addonName };
+    // Only the custommodule endpoints take (and require) a category.
+    if (appType === 'web' || appType === 'widget')
+        payload['category'] = 'Other';
+    const body = JSON.stringify(payload);
     const { auth, kind } = configAuth(config);
     try {
         const response = await makeRequest(url, {
@@ -487,9 +533,8 @@ export async function createAddon(config, appType) {
 export async function activateApp(executableId, config, _appType) {
     const protocol = config.useHTTP ? 'http' : 'https';
     const url = `${protocol}://${config.domain}/rest-api/1/0/${encodeURIComponent(config.siteName)}/Addon%20Repository/${encodeURIComponent(config.addonName)}/activateCustomModuleExecutable`;
-    const body = JSON.stringify({
-        executableId,
-    });
+    // Property name per the ActivateCustomModuleExecutable PUT docs.
+    const body = JSON.stringify({ customModuleExecutableId: executableId });
     const { auth, kind } = configAuth(config);
     try {
         const response = await makeRequest(url, {
@@ -523,6 +568,91 @@ export async function activateApp(executableId, config, _appType) {
         };
     }
 }
+/**
+ * List the executables (uploaded versions) of the configured addon.
+ */
+export async function listExecutables(config) {
+    const protocol = config.useHTTP ? 'http' : 'https';
+    const url = `${protocol}://${config.domain}/rest-api/1/0/${encodeURIComponent(config.siteName)}/Addon%20Repository/${encodeURIComponent(config.addonName)}/activateCustomModuleExecutable`;
+    const { auth, kind } = configAuth(config);
+    try {
+        const response = await makeRequest(url, { method: 'GET', auth });
+        if (response.statusCode === 401) {
+            return {
+                success: false,
+                error: unauthorizedMessage(kind),
+                authExpired: true,
+            };
+        }
+        if (response.statusCode !== 200) {
+            return {
+                success: false,
+                error: `Listing versions failed with status ${response.statusCode}: ${summarizeErrorBody(response.body, response.headers)}`,
+            };
+        }
+        const data = JSON.parse(response.body.toString());
+        return { success: true, executables: data.executables ?? [] };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: `Listing versions failed: ${error instanceof Error ? error.message : String(error)}`,
+        };
+    }
+}
+const ADDON_TYPES = {
+    'sv:customModule': 'web',
+    'sv:marketplaceCustomModule': 'web',
+    'sv:widgetCustomModule': 'widget',
+    'sv:marketplaceWidgetCustomModule': 'widget',
+    'sv:headlessCustomModule': 'rest',
+    'sv:marketplaceHeadlessCustomModule': 'rest',
+    'sv:mcpServerCustomModule': 'mcp',
+};
+/**
+ * List the addons (custom modules) in the site's Addon Repository.
+ */
+export async function listAddons(config) {
+    const url = `${buildApiBaseUrl(config.domain, config.siteName, config.useHTTP)}/Addon%20Repository/nodes`;
+    const { auth, kind } = configAuth(config);
+    try {
+        const response = await makeRequest(url, { method: 'GET', auth });
+        if (response.statusCode === 401) {
+            return { success: false, error: unauthorizedMessage(kind) };
+        }
+        if (response.statusCode !== 200) {
+            return {
+                success: false,
+                error: `Listing addons failed with status ${response.statusCode}: ${summarizeErrorBody(response.body, response.headers)}`,
+            };
+        }
+        const nodes = JSON.parse(response.body.toString());
+        return {
+            success: true,
+            addons: nodes
+                .filter(node => Object.hasOwn(ADDON_TYPES, node.type))
+                .map(node => ({ ...node, appType: ADDON_TYPES[node.type] })),
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: `Listing addons failed: ${error instanceof Error ? error.message : String(error)}`,
+        };
+    }
+}
+/**
+ * Whether an addon exists, judged from a listAddons result. A failed or empty
+ * listing is "unknown": a dead session can look exactly like an empty site.
+ */
+export function classifyAddon(listed, name) {
+    if (!listed.success || !listed.addons?.length)
+        return 'unknown';
+    const wanted = name.toLowerCase();
+    return listed.addons.some(addon => addon.name.toLowerCase() === wanted)
+        ? 'present'
+        : 'missing';
+}
 // =============================================================================
 // HELPER EXPORTS
 // =============================================================================

package/dist/utils/sitevision-scripts-runner.js

@@ -17,14 +17,33 @@
  */
 import path from 'path';
 import fs from 'fs';
-import { spawn } from 'child_process';
+import { killChild, spawnChild } from './process-runner.js';
+import { getAppIdConfig, getFullAppId } from './project-detection.js';
 /**
- * Resolve the path to the sitevision-scripts CLI entry inside a project.
+ * Directory of an installed package, looked up the way Node does: the project's
+ * node_modules, then each parent's, since workspaces hoist to the repo root.
+ */
+export function findInstalledPackage(projectRoot, name) {
+    let dir = path.resolve(projectRoot);
+    for (;;) {
+        const candidate = path.join(dir, 'node_modules', name);
+        if (fs.existsSync(candidate))
+            return candidate;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            return null;
+        dir = parent;
+    }
+}
+const PACKAGE = '@sitevision/sitevision-scripts';
+/**
+ * Resolve the path to the sitevision-scripts CLI entry for a project.
  * Returns null if the package is not installed.
  */
 export function getSitevisionScriptsBin(projectRoot) {
-    const bin = path.join(projectRoot, 'node_modules', '@sitevision', 'sitevision-scripts', 'bin', 'sitevision-scripts.js');
-    return fs.existsSync(bin) ? bin : null;
+    const dir = findInstalledPackage(projectRoot, PACKAGE);
+    const bin = dir && path.join(dir, 'bin', 'sitevision-scripts.js');
+    return bin && fs.existsSync(bin) ? bin : null;
 }
 /**
  * Whether the sitevision-scripts package is available in the project.
@@ -35,18 +54,12 @@ export function hasSitevisionScripts(projectRoot) {
 /**
  * Path of the zip that `sitevision-scripts build` writes.
  *
- * IMPORTANT: this mirrors sitevision-scripts' own app-id convention
- * (`APP_ID_PREFIX`/`APP_ID_SUFFIX` env vars + `dist/<appId>.zip`), which differs
- * from the CLI's own `getZipPath` env vars (`SITEVISION_APP_ID_*`). For delegated
- * builds the package is the one writing the file, so its convention is the source
- * of truth — using `getZipPath` here would look for the wrong filename whenever a
- * prefix/suffix is configured.
+ * sitevision-scripts names it from `APP_ID_PREFIX`/`APP_ID_SUFFIX`; the build is
+ * started with those set from `getAppIdConfig`, so this is the same file that
+ * sign and deploy look for.
  */
 export function getDelegatedZipPath(projectRoot, manifestId) {
-    const prefix = process.env['APP_ID_PREFIX'] ?? '';
-    const suffix = process.env['APP_ID_SUFFIX'] ?? '';
-    const appId = `${prefix}${manifestId}${suffix}`;
-    return path.join(projectRoot, 'dist', `${appId}.zip`);
+    return path.join(projectRoot, 'dist', `${getFullAppId(manifestId)}.zip`);
 }
 // =============================================================================
 // VERSION COMPATIBILITY
@@ -68,9 +81,11 @@ export const SUPPORTED_SITEVISION_SCRIPTS_RANGE = `>=${SUPPORTED_SITEVISION_SCRI
  * is not installed / unreadable.
  */
 export function getSitevisionScriptsVersion(projectRoot) {
-    const packageJsonPath = path.join(projectRoot, 'node_modules', '@sitevision', 'sitevision-scripts', 'package.json');
+    const dir = findInstalledPackage(projectRoot, PACKAGE);
+    if (!dir)
+        return null;
     try {
-        const parsed = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+        const parsed = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
         return parsed.version ?? null;
     }
     catch {
@@ -145,8 +160,9 @@ const MAX_OUTPUT_CHARS = 50_000;
  *
  * @param projectRoot - Project root directory (used as cwd)
  * @param onOutput - Optional callback for streaming output chunks
+ * @param signal - Aborting kills the build and everything it started
  */
-export async function runSitevisionScriptsBuild(projectRoot, onOutput) {
+export async function runSitevisionScriptsBuild(projectRoot, onOutput, signal) {
     const bin = getSitevisionScriptsBin(projectRoot);
     if (!bin) {
         return {
@@ -157,10 +173,18 @@ export async function runSitevisionScriptsBuild(projectRoot, onOutput) {
     }
     return new Promise(resolve => {
         let output = '';
-        const child = spawn(process.execPath, [bin, 'build'], {
+        const { prefix, suffix } = getAppIdConfig();
+        const child = spawnChild(process.execPath, [bin, 'build'], {
             cwd: projectRoot,
+            env: { ...process.env, APP_ID_PREFIX: prefix, APP_ID_SUFFIX: suffix },
             stdio: ['ignore', 'pipe', 'pipe'],
         });
+        const abort = () => {
+            killChild(child);
+        };
+        signal?.addEventListener('abort', abort, { once: true });
+        if (signal?.aborted)
+            abort();
         const handleData = (data) => {
             const text = data.toString();
             output += text;
@@ -175,12 +199,16 @@ export async function runSitevisionScriptsBuild(projectRoot, onOutput) {
             resolve({ success: false, output, error: error.message });
         });
         child.on('close', code => {
+            signal?.removeEventListener('abort', abort);
+            const stopped = signal?.aborted ?? false;
             resolve({
-                success: code === 0,
+                success: code === 0 && !stopped,
                 output,
-                error: code === 0
-                    ? undefined
-                    : `sitevision-scripts build exited with code ${code}`,
+                error: stopped
+                    ? 'Build stopped.'
+                    : code === 0
+                        ? undefined
+                        : `sitevision-scripts build exited with code ${code}`,
             });
         });
     });