@synopackageland/cli 0.13.1 → 0.15.0

package/dist/standalone/lifecycle.js

@@ -1,8 +1,8 @@
 import { composeDaemon, renderComposeInstall } from "./compose.js";
-import { renderBackgroundControl, renderBackgroundWorkerStart, renderBackgroundWorkerStop, renderUserManagerRecovery, backgroundUnitName } from "./background.js";
+import { renderBackgroundControl, renderBackgroundWorkerStart, renderBackgroundWorkerStop, renderUserManagerRecovery, backgroundUnitName, } from "./background.js";
 import { renderPackagePostuninst } from "../build-spk/native-lifecycle.js";
 import { renderSharedFolderScript } from "./shared-folder.js";
-import { renderDelegateInstallDraft } from '../build-spk/delegate-scope.js';
+import { renderDelegateInstallDraft } from "../build-spk/delegate-scope.js";
 import { renderPortalLifecycle } from "../portal/package.js";
 import { nativePortal } from "./portal.js";
 import { renderUninstallHook } from "./uninstall-hook.js";
@@ -11,46 +11,110 @@ const UNINSTALL_ONLY = '[ "${SYNOPKG_PKG_STATUS:-}" = UPGRADE ] || synopkgland_u
 /** Package-account lifecycle hooks for CGI, daemon and background packages. */
 export function renderStandaloneScript(name, manifest) {
     if (manifest.compose) {
-        const native = { ...manifest, compose: undefined, daemon: composeDaemon(manifest) };
-        const body = name === "preinst" ? renderComposeInstall(manifest.package) : renderStandaloneScript(name, { ...native, appScripts: undefined });
-        return manifest.appScripts?.some(app => app === name) ? composeAppScript(name, body) : body;
+        const native = {
+            ...manifest,
+            compose: undefined,
+            daemon: manifest.identityGateway ? composeDaemon(manifest) : undefined,
+        };
+        const body = name === "preinst"
+            ? renderComposeInstall(manifest.package)
+            : renderStandaloneScript(name, { ...native, appScripts: undefined });
+        const control = `"/var/packages/${manifest.package}/target/daemon/control"`;
+        const paths = `"\${SYNOPKG_PKGDEST:-/var/packages/${manifest.package}/target}" "\${SYNOPKG_PKGVAR:-/var/packages/${manifest.package}/var}"`;
+        const remember = name === "postinst" &&
+            manifest.compose.plan.ingress &&
+            !manifest.compose.plan.mounts_blocked
+            ? `"/var/packages/${manifest.package}/target/compose/control" remember-ingress --project "/var/packages/${manifest.package}/target/compose" --package '${manifest.package}' || exit $?\n`
+            : "";
+        const ledger = remember +
+            (manifest.identityGateway && !manifest.compose.plan.mounts_blocked
+                ? name === "start-stop-status"
+                    ? `if [ "$1" = restart ]; then\n  "$0" stop || exit $?\n  exec "$0" start\nfi\nif [ "$1" = start ]; then\n  ${control} acquire ${paths} || exit $?\nelif [ "$1" = stop ]; then\n  ${control} release ${paths} || exit $?\nfi\n`
+                    : ["preupgrade", "preuninst"].includes(name)
+                        ? `${control} release ${paths} || exit $?\n`
+                        : ""
+                : "");
+        const withLedger = ledger
+            ? body.replace("#!/bin/sh\n", "#!/bin/sh\n" + ledger)
+            : body;
+        return manifest.appScripts?.some((app) => app === name)
+            ? composeAppScript(name, withLedger)
+            : withLedger;
     }
     const portal = nativePortal(manifest);
     const script = renderCapabilityScript(name, manifest);
-    const sdk = portal ? script.replace("#!/bin/sh\n", () => `#!/bin/sh\n${renderPortalLifecycle(name, portal)}`) : script;
-    return manifest.appScripts?.some(app => app === name) ? composeAppScript(name, sdk) : sdk;
+    const sdk = portal
+        ? script.replace("#!/bin/sh\n", () => `#!/bin/sh\n${renderPortalLifecycle(name, portal)}`)
+        : script;
+    return manifest.appScripts?.some((app) => app === name)
+        ? composeAppScript(name, sdk)
+        : sdk;
 }
 function renderCapabilityScript(name, manifest) {
-    if (name === 'preupgrade' && (manifest.capabilities.rootOps || manifest.capabilities.delegate || manifest.capabilities.webapi)) {
+    if (name === "preupgrade" &&
+        (manifest.capabilities.rootOps ||
+            manifest.capabilities.delegate ||
+            manifest.capabilities.webapi)) {
         const installed = `\${SYNOPKG_PKGDEST:-/var/packages/${manifest.package}/target}`;
         // Incoming preupgrade sees the OLD payload. Only complete absence is first
         // introduction; a partial or symlinked executor must still fail closed.
         const legacy = manifest.daemon
             ? `  if [ -e "${installed}/daemon" ] || [ -L "${installed}/daemon" ]; then\n    "${installed}/daemon/control" stop "${installed}" "\${SYNOPKG_PKGVAR:-/var/packages/${manifest.package}/var}" || exit $?\n  fi\n`
-            : '';
-        return renderStandaloneScriptBody(name, manifest).replace('#!/bin/sh\n', `#!/bin/sh\nif [ ! -e "${installed}/executor" ] && [ ! -L "${installed}/executor" ]; then\n${legacy}  exit 0\nfi\n`);
+            : "";
+        return renderStandaloneScriptBody(name, manifest).replace("#!/bin/sh\n", `#!/bin/sh\nif [ ! -e "${installed}/executor" ] && [ ! -L "${installed}/executor" ]; then\n${legacy}  exit 0\nfi\n`);
     }
     return renderStandaloneScriptBody(name, manifest);
 }
 function renderStandaloneScriptBody(name, manifest) {
-    if (manifest.capabilities?.delegate?.scope === 'install-selected' && ['preinst', 'postinst'].includes(name)) {
-        const normal = renderCapabilityScript(name, { ...manifest, capabilities: { ...manifest.capabilities, delegate: { ...manifest.capabilities.delegate, scope: 'home' } } });
-        return normal.replace('#!/bin/sh\n', () => '#!/bin/sh\n' + renderDelegateInstallDraft(manifest.package, name === 'preinst'));
+    if (manifest.capabilities?.delegate?.scope === "install-selected" &&
+        ["preinst", "postinst"].includes(name)) {
+        const normal = renderCapabilityScript(name, {
+            ...manifest,
+            capabilities: {
+                ...manifest.capabilities,
+                delegate: { ...manifest.capabilities.delegate, scope: "home" },
+            },
+        });
+        return normal.replace("#!/bin/sh\n", () => "#!/bin/sh\n" +
+            renderDelegateInstallDraft(manifest.package, name === "preinst"));
     }
-    if (manifest.daemon && manifest.capabilities?.jobs && (manifest.capabilities.delegate || manifest.capabilities.rootOps || manifest.capabilities.webapi)
-        && ['start-stop-status', 'preupgrade', 'preuninst'].includes(name))
+    if (manifest.daemon &&
+        manifest.capabilities?.jobs &&
+        (manifest.capabilities.delegate ||
+            manifest.capabilities.rootOps ||
+            manifest.capabilities.webapi) &&
+        ["start-stop-status", "preupgrade", "preuninst"].includes(name))
         return renderDelegatedDaemonScript(name, manifest);
-    if ((manifest.capabilities?.rootOps || manifest.capabilities?.delegate || manifest.capabilities?.webapi) && ["preuninst", "preupgrade", "start-stop-status"].includes(name)) {
+    if ((manifest.capabilities?.rootOps ||
+        manifest.capabilities?.delegate ||
+        manifest.capabilities?.webapi) &&
+        ["preuninst", "preupgrade", "start-stop-status"].includes(name)) {
         const helper = `"\${SYNOPKG_PKGDEST:-/var/packages/${manifest.package}/target}/executor/lifecycle"`;
         // Attempt worker stop first, but let executor shutdown drain requests and
         // close ingress even when it fails; a still-running worker fails the hook.
-        const workerStop = manifest.capabilities.jobs ? renderBackgroundWorkerStop(manifest.package) : "";
-        const stopWorker = manifest.capabilities.jobs ? "worker_result=0\nstop_background_worker || worker_result=1\n" : "";
-        const workerResult = manifest.capabilities.jobs ? 'exit "$worker_result"\n' : "exit 0\n";
+        const workerStop = manifest.capabilities.jobs
+            ? renderBackgroundWorkerStop(manifest.package)
+            : "";
+        const stopWorker = manifest.capabilities.jobs
+            ? "worker_result=0\nstop_background_worker || worker_result=1\n"
+            : "";
+        const workerResult = manifest.capabilities.jobs
+            ? 'exit "$worker_result"\n'
+            : "exit 0\n";
         const request = (action) => `${helper} ${action} --package ${manifest.package} || exit $?\n`;
         if (name === "start-stop-status") {
-            const normal = renderCapabilityScript(name, { ...manifest, capabilities: { ...manifest.capabilities, rootOps: undefined, delegate: undefined, webapi: undefined } });
-            const stopDaemon = manifest.daemon ? `"/var/packages/${manifest.package}/target/daemon/control" stop "\${SYNOPKG_PKGDEST:-/var/packages/${manifest.package}/target}" "\${SYNOPKG_PKGVAR:-/var/packages/${manifest.package}/var}" || exit $?\n` : "";
+            const normal = renderCapabilityScript(name, {
+                ...manifest,
+                capabilities: {
+                    ...manifest.capabilities,
+                    rootOps: undefined,
+                    delegate: undefined,
+                    webapi: undefined,
+                },
+            });
+            const stopDaemon = manifest.daemon
+                ? `"/var/packages/${manifest.package}/target/daemon/control" stop "\${SYNOPKG_PKGDEST:-/var/packages/${manifest.package}/target}" "\${SYNOPKG_PKGVAR:-/var/packages/${manifest.package}/var}" || exit $?\n`
+                : "";
             return normal.replace("#!/bin/sh\n", `#!/bin/sh\n${workerStop}if [ "$1" = start ]; then\n${request("start")}fi\nif [ "$1" = stop ]; then\n${stopWorker}${stopDaemon}${request("stop")}${workerResult}fi\n`);
         }
         if (name === "preuninst")
@@ -60,11 +124,24 @@ function renderStandaloneScriptBody(name, manifest) {
     if (name === "postuninst")
         return renderPackagePostuninst(manifest.package);
     if (name === "preuninst" && manifest.uninstall) {
-        const body = manifest.daemon ? renderDaemonPreuninst(manifest) : `${UNINSTALL_ONLY}exit 0\n`;
+        const body = manifest.daemon
+            ? renderDaemonPreuninst(manifest)
+            : `${UNINSTALL_ONLY}exit 0\n`;
         return `#!/bin/sh\n${renderUninstallHook(manifest)}${body}`;
     }
-    if ((manifest.capabilities?.rootOps || manifest.capabilities?.delegate || manifest.capabilities?.webapi) && ["postinst", "postupgrade"].includes(name)) {
-        const normal = renderCapabilityScript(name, { ...manifest, capabilities: { ...manifest.capabilities, rootOps: undefined, delegate: undefined, webapi: undefined } });
+    if ((manifest.capabilities?.rootOps ||
+        manifest.capabilities?.delegate ||
+        manifest.capabilities?.webapi) &&
+        ["postinst", "postupgrade"].includes(name)) {
+        const normal = renderCapabilityScript(name, {
+            ...manifest,
+            capabilities: {
+                ...manifest.capabilities,
+                rootOps: undefined,
+                delegate: undefined,
+                webapi: undefined,
+            },
+        });
         return normal.replace("#!/bin/sh\n", `#!/bin/sh\n"\${SYNOPKG_PKGDEST:-/var/packages/${manifest.package}/target}/executor/lifecycle" start --package ${manifest.package} || exit $?\n`);
     }
     if (manifest.sharedFolder && (name === "postinst" || name === "postupgrade"))
@@ -95,40 +172,39 @@ function renderDelegatedDaemonScript(name, manifest) {
     // because a producer could not stop. A partial teardown remains a failure.
     const stop = (daemonAction, executorAction, executorStop = executor(executorAction)) => `result=0\nstop_background_worker || result=1\n${daemon} ${daemonAction} ${paths} || result=1\n${executorStop} || result=1\nexit "$result"\n`;
     const workerStop = renderBackgroundWorkerStop(pkg);
-    if (name !== 'start-stop-status') {
-        if (name === 'preupgrade')
-            return `#!/bin/sh\n${renderExecutorUpgradeStop(pkg)}${workerStop}${stop('stop', 'stop', UPGRADE_STOP)}`;
+    if (name !== "start-stop-status") {
+        if (name === "preupgrade")
+            return `#!/bin/sh\n${renderExecutorUpgradeStop(pkg)}${workerStop}${stop("stop", "stop", UPGRADE_STOP)}`;
         const purge = manifest.uninstall
-            ? stop(manifest.daemon?.uninstall_args ? 'uninstall' : 'stop', 'purge $synopkgland_purge_args')
-                .replace(executor('purge $synopkgland_purge_args'), () => `synopkgland_uninstall_hook\n${executor('purge $synopkgland_purge_args')}`)
-            : stop(manifest.daemon?.uninstall_args ? 'uninstall' : 'stop', 'purge');
-        return `#!/bin/sh\n${workerStop}${renderUninstallHook(manifest)}if [ "\${SYNOPKG_PKG_STATUS:-}" = UPGRADE ]; then\n${stop('stop', 'stop')}fi\n${purge}`;
+            ? stop(manifest.daemon?.uninstall_args ? "uninstall" : "stop", "purge $synopkgland_purge_args").replace(executor("purge $synopkgland_purge_args"), () => `synopkgland_uninstall_hook\n${executor("purge $synopkgland_purge_args")}`)
+            : stop(manifest.daemon?.uninstall_args ? "uninstall" : "stop", "purge");
+        return `#!/bin/sh\n${workerStop}${renderUninstallHook(manifest)}if [ "\${SYNOPKG_PKG_STATUS:-}" = UPGRADE ]; then\n${stop("stop", "stop")}fi\n${purge}`;
     }
     return `#!/bin/sh
 ${workerStop}${renderUserManagerRecovery()}${renderBackgroundWorkerStart(pkg)}case "$1" in
   prestart) recover_user_manager ;;
   prestop) exit 0 ;;
   start)
-    ${executor('start')} || exit $?
+    ${executor("start")} || exit $?
     if ! ${daemon} start ${paths}; then
       ${daemon} stop ${paths}
-      ${executor('stop')}
+      ${executor("stop")}
       exit 1
     fi
     if ! start_background_worker; then
-      ${worker('stop')}
+      ${worker("stop")}
       ${daemon} stop ${paths}
-      ${executor('stop')}
+      ${executor("stop")}
       exit 1
     fi
     exit 0 ;;
   status)
     ${daemon} status ${paths} || exit $?
-    worker_state="$(${worker('get-active-status')})" || exit 3
+    worker_state="$(${worker("get-active-status")})" || exit 3
     [ "$worker_state" = active ] && exit 0
     exit 3 ;;
   stop)
-${stop('stop', 'stop')}    ;;
+${stop("stop", "stop")}    ;;
   restart)
     "$0" stop || exit $?
     exec "$0" start ;;
@@ -163,7 +239,9 @@ function renderDaemonScript(name, manifest) {
     // DSM also runs the outgoing preuninst hook during package upgrades.
     if (["preupgrade", "preuninst"].includes(name)) {
         const uninstall = name === "preuninst" && manifest.daemon?.uninstall_args;
-        const upgrade = uninstall ? `if [ "\${SYNOPKG_PKG_STATUS:-}" = "UPGRADE" ]; then\n  exec ${control} stop ${paths}\nfi\n` : "";
+        const upgrade = uninstall
+            ? `if [ "\${SYNOPKG_PKG_STATUS:-}" = "UPGRADE" ]; then\n  exec ${control} stop ${paths}\nfi\n`
+            : "";
         return `#!/bin/sh\n${upgrade}exec ${control} ${uninstall ? "uninstall" : "stop"} ${paths}\n`;
     }
     if (name !== "start-stop-status")
@@ -187,13 +265,17 @@ esac
 function renderExecutorPreuninst(manifest, workerStop, stopWorker, workerResult, request) {
     const pkg = manifest.package;
     const choose = 'action=purge\n[ "${SYNOPKG_PKG_STATUS:-}" != UPGRADE ] || action=stop\n';
-    const hook = manifest.uninstall ? '[ "$action" = stop ] || synopkgland_uninstall_hook\n' : "";
+    const hook = manifest.uninstall
+        ? '[ "$action" = stop ] || synopkgland_uninstall_hook\n'
+        : "";
     const purge = request(manifest.uninstall ? '"$action" $synopkgland_purge_args' : '"$action"');
     if (!manifest.daemon)
         return `#!/bin/sh\n${workerStop}${renderUninstallHook(manifest)}${stopWorker}${choose}${hook}${purge}${workerResult}`;
     const control = `"/var/packages/${pkg}/target/daemon/control"`;
     const paths = `"\${SYNOPKG_PKGDEST:-/var/packages/${pkg}/target}" "\${SYNOPKG_PKGVAR:-/var/packages/${pkg}/var}"`;
-    const daemonAction = manifest.daemon.uninstall_args ? 'daemon_action=stop\n[ "$action" = stop ] || daemon_action=uninstall\n' : "daemon_action=stop\n";
+    const daemonAction = manifest.daemon.uninstall_args
+        ? 'daemon_action=stop\n[ "$action" = stop ] || daemon_action=uninstall\n'
+        : "daemon_action=stop\n";
     return `#!/bin/sh\n${workerStop}${renderUninstallHook(manifest)}${stopWorker}${choose}${daemonAction}daemon_result=0\n${control} "$daemon_action" ${paths} || daemon_result=$?\n${hook}${purge}exit "$daemon_result"\n`;
 }
 /** The daemon stops (or uninstalls) first; the App hook follows on a real uninstall. */
@@ -201,6 +283,6 @@ function renderDaemonPreuninst(manifest) {
     const pkg = manifest.package;
     const control = `"/var/packages/${pkg}/target/daemon/control"`;
     const paths = `"\${SYNOPKG_PKGDEST:-/var/packages/${pkg}/target}" "\${SYNOPKG_PKGVAR:-/var/packages/${pkg}/var}"`;
-    return `if [ "\${SYNOPKG_PKG_STATUS:-}" = UPGRADE ]; then\n  exec ${control} stop ${paths}\nfi\n`
-        + `${control} ${manifest.daemon?.uninstall_args ? "uninstall" : "stop"} ${paths}\ndaemon_result=$?\nsynopkgland_uninstall_hook\nexit "$daemon_result"\n`;
+    return (`if [ "\${SYNOPKG_PKG_STATUS:-}" = UPGRADE ]; then\n  exec ${control} stop ${paths}\nfi\n` +
+        `${control} ${manifest.daemon?.uninstall_args ? "uninstall" : "stop"} ${paths}\ndaemon_result=$?\nsynopkgland_uninstall_hook\nexit "$daemon_result"\n`);
 }

package/dist/standalone/manifest.d.ts

@@ -1,4 +1,5 @@
-import { type WebAPIProfiles } from '../runtime/webapi-profile.js';
+import { type WebLaunchMode } from "../contract/web-launch.js";
+import { type WebAPIProfiles } from "../runtime/webapi-profile.js";
 import { type PackageMetadata } from "../package-metadata.js";
 import { type DelegateCapability } from "../runtime/executor-policy.js";
 import type { ExecutorPins, ExecutorTask } from "../runtime/executor-tasks.js";
@@ -41,6 +42,12 @@ export interface StandaloneI18n {
     info: InfoTranslations;
 }
 export interface StandaloneManifest {
+    ctl?: {
+        enabled: boolean;
+        aliases?: string[];
+        developedBy?: string;
+        commands: Record<string, import("../ctl/descriptor.js").Operation>;
+    };
     metadata?: PackageMetadata;
     root: string;
     package: string;
@@ -61,6 +68,7 @@ export interface StandaloneManifest {
     /** `ui.window`: the DSM window's size over the defaults; absent keeps 960×640, at least 700×420. */
     ui: {
         dir: string;
+        launch?: WebLaunchMode;
         build?: {
             cwd: string;
             command: string[];
@@ -102,6 +110,7 @@ export interface StandaloneManifest {
  */
 export type EntryMode = "admin-only" | "app-privilege";
 export interface Capabilities {
+    composeMounts?: true;
     webapi?: WebAPIProfiles;
     files?: "session";
     identity?: "standalone";