@synopackageland/cli 0.17.4 → 0.17.6

package/dist/runtime/runtime-budgets.js

@@ -0,0 +1,13 @@
+/**
+ * A CGI's declared request budget owns operation work. Binary and Compose Apps
+ * have no compiled CGI deadline to configure, so their existing status allowance
+ * can enlarge the shared operation budget above its 60-second default.
+ */
+export function operationBudgetSeconds(source) {
+    return source.backend?.timeoutSeconds ?? Math.max(60, source.lifecycleTimeouts?.status ?? source.daemon?.timeouts?.status ?? 5);
+}
+/** First released SDK that decodes operation/lifecycle budget config fields. */
+export function runtimeBudgetSdkSupported(sdk) {
+    const [major, minor, patch] = sdk.split('.').map(Number);
+    return major > 0 || minor > 17 || minor === 17 && patch >= 5;
+}

package/dist/standalone/background.d.ts

@@ -18,7 +18,7 @@ export declare function readBackground(value: unknown, fail: (error: StandaloneE
 export declare function renderBackgroundResource(): string;
 /** The worker's arguments: none for a Go App's own worker, `--worker` for the bridge runtime (spec/bridge/v1). */
 export declare const BRIDGE_WORKER_ARGS: readonly ["--worker"];
-export declare function renderBackgroundUnit(pkg: string, args?: readonly string[]): string;
+export declare function renderBackgroundUnit(pkg: string, args?: readonly string[], stopSeconds?: number): string;
 /** Shell function that stops the worker in lifecycle hooks; call it as `stop_background_worker`. */
 export declare function renderBackgroundWorkerStop(pkg: string): string;
 /**
@@ -32,8 +32,8 @@ export declare function renderBackgroundWorkerStop(pkg: string): string;
  * exits. Stop only such a manager, as the package user; the acquire that
  * follows then starts a fresh one.
  */
-export declare function renderUserManagerRecovery(): string;
+export declare function renderUserManagerRecovery(startSeconds?: number): string;
 /** Shell function that starts the worker and names the failed step; call it as `start_background_worker`. */
 export declare function renderBackgroundWorkerStart(pkg: string): string;
 /** Package Center's start/stop/status map straight onto the user unit. */
-export declare function renderBackgroundControl(pkg: string): string;
+export declare function renderBackgroundControl(pkg: string, startSeconds?: number): string;

package/dist/standalone/background.js

@@ -24,7 +24,7 @@ export function renderBackgroundResource() {
 }
 /** The worker's arguments: none for a Go App's own worker, `--worker` for the bridge runtime (spec/bridge/v1). */
 export const BRIDGE_WORKER_ARGS = ["--worker"];
-export function renderBackgroundUnit(pkg, args = []) {
+export function renderBackgroundUnit(pkg, args = [], stopSeconds = 30) {
     return `[Unit]
 Description=${pkg} background worker
 
@@ -33,7 +33,7 @@ Type=simple
 ExecStart=${[`/var/packages/${pkg}/target/${BACKGROUND_WORKER_PAYLOAD}`, ...args].join(" ")}
 UMask=0077
 KillMode=control-group
-TimeoutStopSec=10
+TimeoutStopSec=${stopSeconds}
 Restart=no
 `;
 }
@@ -66,13 +66,15 @@ export function renderBackgroundWorkerStop(pkg) {
  * exits. Stop only such a manager, as the package user; the acquire that
  * follows then starts a fresh one.
  */
-export function renderUserManagerRecovery() {
+export function renderUserManagerRecovery(startSeconds = 30) {
     return `recover_user_manager() {
   uid="$(id -u)" || return 1
   [ "$uid" != 0 ] || return 0
-  i=0
-  while [ "$(/usr/bin/loginctl show-user "$uid" -p State 2>/dev/null)" = State=closing ] && [ "$i" -lt 100 ]; do
-    sleep 0.1; i=$((i + 1))
+  manager_now() { awk '{print int($1)}' /proc/uptime; }
+  manager_until=$(( $(manager_now) + ${startSeconds} ))
+  while [ "$(/usr/bin/loginctl show-user "$uid" -p State 2>/dev/null)" = State=closing ]; do
+    [ "$(manager_now)" -lt "$manager_until" ] || { echo "package user manager still closing" >&2; return 1; }
+    sleep 0.1
   done
   [ -S "/run/user/$uid/systemd/private" ] && return 0
   for exe in /proc/[0-9]*/exe; do
@@ -81,12 +83,11 @@ export function renderUserManagerRecovery() {
     case " $(tr '\\0' ' ' < "/proc/$pid/cmdline" 2>/dev/null)" in *" --user "*) ;; *) continue ;; esac
     echo "package user manager $pid has no socket in /run/user/$uid; stopping it so DSM starts a fresh one" >&2
     kill -TERM "$pid" || return 1
-    i=0
     # DSM's bash logs a failed kill to syslog even with 2>/dev/null, so the
     # exit is looked up in /proc.
     while [ -d "/proc/$pid" ]; do
-      [ "$i" -lt 100 ] || { echo "package user manager $pid did not exit" >&2; return 1; }
-      sleep 0.1; i=$((i + 1))
+      [ "$(manager_now)" -lt "$manager_until" ] || { echo "package user manager $pid did not exit" >&2; return 1; }
+      sleep 0.1
     done
   done
 }
@@ -105,10 +106,10 @@ export function renderBackgroundWorkerStart(pkg) {
 `;
 }
 /** Package Center's start/stop/status map straight onto the user unit. */
-export function renderBackgroundControl(pkg) {
+export function renderBackgroundControl(pkg, startSeconds = 30) {
     const unit = backgroundUnitName(pkg);
     return `#!/bin/sh
-${renderUserManagerRecovery()}${renderBackgroundWorkerStart(pkg)}case "$1" in
+${renderUserManagerRecovery(startSeconds)}${renderBackgroundWorkerStart(pkg)}case "$1" in
   prestart) recover_user_manager ;;
   prestop) exit 0 ;;
   start) start_background_worker ;;

package/dist/standalone/compose.d.ts

@@ -1,7 +1,9 @@
+import { type ComposeAppData } from "../runtime/compose-data.js";
 import type { NativeArchFamily } from "../build-spk/dsm-arch.js";
 import { type Daemon } from "./daemon.js";
 import type { StandaloneError, StandaloneManifest } from "./manifest.js";
 export interface ComposePlan {
+    app_data?: ComposeAppData;
     startup_timeout_seconds?: number;
     ingress?: {
         address: string;
@@ -79,7 +81,7 @@ export declare function readComposeApp(value: unknown, root: string, arches: Nat
     architecture?: NativeArchFamily;
     imageProofs?: unknown;
 }): ComposeApp | undefined;
-export declare function composeDaemon(m: Pick<StandaloneManifest, "compose">): Daemon;
+export declare function composeDaemon(m: Pick<StandaloneManifest, "compose" | "lifecycleTimeouts">): Daemon;
 export declare function composeNetwork(m: Pick<StandaloneManifest, "compose" | "identityGateway" | "spkVersion">): {
     public_ports: number[];
     readiness?: {

package/dist/standalone/compose.js

@@ -1,3 +1,4 @@
+import { validComposeAppData } from "../runtime/compose-data.js";
 import { composeDiagnosisMessages, renderComposeDiagnosis } from "../build-spk/compose-diagnosis.js";
 import { COMPOSE_ERRORS } from "./compose-errors.js";
 import { spawnSync } from "node:child_process";
@@ -117,6 +118,12 @@ export function readComposeApp(value, root, arches, fail, context = {}) {
             plan.startup_timeout_seconds !== value.startup_timeout_seconds)
             throw new Error("[SDK_COMPOSE_UNSUPPORTED] This SDK does not implement the declared startup budget; use the matching SDK/CLI release.");
         const document = parse(plan.effective);
+        const volumes = Object.entries(document?.volumes ?? {});
+        if ((!validComposeAppData(plan.app_data, context.package ?? "ComposeApp")
+            || JSON.stringify(plan.app_data) !== JSON.stringify(plan.lock?.app_data)
+            || plan.app_data.project !== plan.project_name || plan.app_data.volumes.length !== volumes.length
+            || volumes.some(([key, value]) => !plan.app_data.volumes.some(v => v.key === key && v.name === value.name))))
+            throw new Error("[SDK_COMPOSE_UNSUPPORTED] This SDK does not provide the complete Compose App data contract; update the SDK and rebuild.");
         const web = value.web;
         return {
             declaration: { ...value },
@@ -150,7 +157,7 @@ export function composeDaemon(m) {
         args: ["run"],
         targets: m.compose.targets,
         env: {},
-        timeouts: { start: m.compose.plan.startup_timeout_seconds ?? 120, stop: 30, status: 5, uninstall: 60 },
+        timeouts: { stop: 30, status: 5, uninstall: 60, ...m.lifecycleTimeouts, start: m.compose.plan.startup_timeout_seconds ?? m.lifecycleTimeouts?.start ?? 120 },
     };
 }
 export function composeNetwork(m) {

package/dist/standalone/daemon.d.ts

@@ -30,3 +30,7 @@ export declare function buildDaemonControl(manifest: StandaloneManifest, arch: N
 export declare function copyDaemonPayload(manifest: StandaloneManifest, arch: NativeArchFamily, target: string, controller: string): void;
 /** Copies a bounded, link-free package-account payload tree. */
 export declare function copyPayloadTree(root: string, source: string, target: string): void;
+/** Existing lifecycle namespace; a timeout-only declaration runs no daemon. */
+export declare function readLifecycleTimeouts(value: unknown, fail: (e: StandaloneError) => void): Daemon['timeouts'] | undefined;
+/** Legacy SDKs keep their supported config and timeout bounds. */
+export declare function runtimeBudgetSource(dir: string, manifest?: StandaloneManifest): string;

package/dist/standalone/daemon.js

@@ -1,5 +1,6 @@
+import { operationBudgetSeconds, runtimeBudgetSdkSupported } from "../runtime/runtime-budgets.js";
 import { goChildEnv } from "../runtime/go-env.js";
-import { chmodSync, copyFileSync, lstatSync, mkdirSync, readdirSync, realpathSync, writeFileSync, } from "node:fs";
+import { chmodSync, existsSync, copyFileSync, lstatSync, mkdirSync, readdirSync, realpathSync, writeFileSync, } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { PINNED_GO_HINT, pinnedGoBuildEnv, pinnedGoProblem, } from "../build-spk/go-toolchain.js";
 import { sdkSource, appSdkVersion } from "../runtime/sdk-source.js";
@@ -79,23 +80,9 @@ export function readDaemon(value, root, arches, fail) {
         Object.keys(env).length > 64 ||
         Object.entries(env).some(([k, v]) => !envKey(k) || !token(v)))
         return invalid();
-    const limits = value.timeouts ?? {};
-    if (!record(limits) ||
-        Object.keys(limits).some((k) => !["start", "stop", "status", "uninstall"].includes(k)))
-        return invalid();
-    // Defaults hold under IO load on a busy NAS; DSM's package unit allows 3600 s.
-    const timeouts = {
-        start: limits.start ?? 30,
-        stop: limits.stop ?? 30,
-        status: limits.status ?? 5,
-        uninstall: limits.uninstall ?? 60,
-    };
-    for (const [key, v] of Object.entries(timeouts)) {
-        if (!Number.isInteger(v) ||
-            v < (key === "status" ? 1 : 2) ||
-            v > (key === "status" ? 10 : 120))
-            return invalid();
-    }
+    const timeouts = readLifecycleTimeouts(value.timeouts, fail);
+    if (!timeouts)
+        return undefined;
     return {
         exec: value.exec,
         targets,
@@ -107,6 +94,11 @@ export function readDaemon(value, root, arches, fail) {
         timeouts: timeouts,
     };
 }
+function daemonSdkVersion(manifest) {
+    return manifest.identityGateway?.sdk ??
+        (manifest.backend.kind === "go" ? appSdkVersion(manifest.backend) : undefined) ??
+        templateSdkVersion();
+}
 export function daemonConfig(manifest) {
     const { exec, args, uninstall_args, env, timeouts } = manifest.compose
         ? composeDaemon(manifest)
@@ -120,6 +112,8 @@ export function daemonConfig(manifest) {
         ...(uninstall_args ? { uninstall_args } : {}),
         env,
         timeouts,
+        ...(runtimeBudgetSdkSupported(daemonSdkVersion(manifest))
+            ? { operation_seconds: operationBudgetSeconds(manifest) } : {}),
         ...(manifest.compose ? { network: composeNetwork(manifest) } : {}),
     }) + "\n");
 }
@@ -137,11 +131,7 @@ export async function buildDaemonControl(manifest, arch, work, run) {
         out,
         "./daemonctl",
     ], {
-        cwd: sdkSource(manifest.identityGateway?.sdk ??
-            (manifest.backend.kind === "go"
-                ? appSdkVersion(manifest.backend)
-                : undefined) ??
-            templateSdkVersion()).goDir,
+        cwd: runtimeBudgetSource(sdkSource(daemonSdkVersion(manifest)).goDir, manifest),
         env: goChildEnv({ ...process.env, ...pinnedGoBuildEnv(arch) }),
     });
     if (result.missing || result.status !== 0)
@@ -212,3 +202,26 @@ export function copyPayloadTree(root, source, target) {
         invalid(`Cannot read the daemon payload: ${String(error)}`);
     }
 }
+/** Existing lifecycle namespace; a timeout-only declaration runs no daemon. */
+export function readLifecycleTimeouts(value, fail) {
+    const v = value ?? {};
+    const bad = () => { fail({ code: 'STANDALONE_DAEMON_INVALID', message: 'daemon.timeouts accepts start/stop/uninstall 2–3600s and status 1–3600s.' }); return undefined; };
+    if (!record(v) || Object.keys(v).some(k => !['start', 'stop', 'status', 'uninstall'].includes(k)))
+        return bad();
+    const limits = { start: v.start ?? 30, stop: v.stop ?? 30, status: v.status ?? 5, uninstall: v.uninstall ?? 60 };
+    for (const [key, n] of Object.entries(limits))
+        if (!Number.isInteger(n) || Number(n) < (key === 'status' ? 1 : 2) || Number(n) > 3600)
+            return bad();
+    return limits;
+}
+/** Legacy SDKs keep their supported config and timeout bounds. */
+export function runtimeBudgetSource(dir, manifest) {
+    if (!existsSync(join(dir, 'internal/runtimebudget/budget.go'))) {
+        const timeouts = manifest?.daemon?.timeouts ?? manifest?.lifecycleTimeouts;
+        if (!manifest || operationBudgetSeconds(manifest) > 60 || timeouts &&
+            (timeouts.start > 120 || timeouts.stop > 120 || timeouts.status > 10 || timeouts.uninstall > 120)) {
+            throw new StandaloneBuildError('STANDALONE_DAEMON_BUILD_FAILED', 'The requested timeouts need an SDK with runtime budget support; use SDK 0.17.5 or later before rebuilding.');
+        }
+    }
+    return dir;
+}

package/dist/standalone/dsm-window.js

@@ -1,3 +1,4 @@
+import { gatewayEntryPath } from './native-gateway.js';
 import { resolvedSdkLaunch, dsmLauncherType } from "../contract/app-launch.js";
 import { REOPEN_EVENTS_RUNTIME } from "./reopen-events.js";
 import { LAUNCH_PARAMS_RUNTIME } from "./launch-params.js";
@@ -120,7 +121,7 @@ export function renderUiConfig(manifest, icons = packageIcons(manifest.icon), lo
                     ...titleFields,
                     icon,
                     ...launcherAccess(manifest),
-                    url: `/webman/3rdparty/${manifest.package}/sso/open.cgi`,
+                    url: gatewayEntryPath(manifest),
                 },
             },
         }, null, 2) + "\n");

package/dist/standalone/identity-gateway.js

@@ -1,3 +1,5 @@
+import { nativeGatewaySupported } from './native-gateway.js';
+import { operationBudgetSeconds, runtimeBudgetSdkSupported } from "../runtime/runtime-budgets.js";
 import { existsSync, lstatSync } from "node:fs";
 import { join } from "node:path";
 import { PINNED_GO_HINT, pinnedGoBuildEnv, pinnedGoProblem, } from "../build-spk/go-toolchain.js";
@@ -5,7 +7,7 @@ import { goChildEnv } from "../runtime/go-env.js";
 import { sdkSource } from "../runtime/sdk-source.js";
 import { checkCgiBinary } from "./binary.js";
 import { isWebAccessMode, DSM_GROUP_NAME, } from "../contract/web-launch.js";
-import { relativeExec, token } from "./daemon.js";
+import { relativeExec, runtimeBudgetSource, token } from "./daemon.js";
 import { StandaloneBuildError } from "./spk.js";
 /** The SDK's identity gateway: the daemon wrapper and the DSM-origin authorize CGI. */
 export const GATEWAY_MAIN = "./idgateway/cmd/gateway";
@@ -309,6 +311,11 @@ export function identityGatewayConfig(m) {
     const g = m.identityGateway;
     return (JSON.stringify({
         package: m.package,
+        ...(nativeGatewaySupported(m) ? { native_ingress: true } : {}),
+        ...(runtimeBudgetSdkSupported(g.sdk) ? {
+            operation_seconds: operationBudgetSeconds(m),
+            stop_seconds: m.daemon?.timeouts.stop ?? m.lifecycleTimeouts?.stop ?? 30,
+        } : {}),
         mode: g.mode,
         access: g.access ?? "dsm-users",
         ...(g.groups ? { groups: g.groups } : {}),
@@ -385,6 +392,7 @@ export async function buildIdentityGateway(m, arch, work, run) {
     catch (error) {
         throw new StandaloneBuildError("SDK_DOWNLOAD_FAILED", error.message.replace(/^\[[A-Z_]+\] /, ""));
     }
+    runtimeBudgetSource(sdk.goDir, m);
     const out = join(work, `identity-gateway-${arch}`);
     const ldflags = `-s -w -buildid= -X main.configPath=${packageDest(m)}/${GATEWAY_CONFIG_PATH}`;
     const result = await run("go", [