jishushell 0.6.5 → 0.7.3

package/dist/services/app-common/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/services/app-common/service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,YAAY,EACZ,aAAa,EACb,0BAA0B,EAC1B,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,eAAe,EACf,UAAU,EACV,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,yBAAyB,EACzB,mCAAmC,EACnC,uBAAuB,EACvB,iBAAiB,EACjB,OAAO,EACP,mCAAmC,EACnC,yBAAyB,EACzB,yBAAyB,EACzB,mCAAmC,EACnC,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC"}

package/dist/services/app-common/spec-materializer.d.ts

@@ -0,0 +1,8 @@
+import type { AppSpec } from "../../types.js";
+export declare function normalizeAppSpec(spec: AppSpec): AppSpec;
+export declare function materializeAppSpecForInstance(spec: AppSpec, instanceId: string): AppSpec;
+export declare function resolveInstallTarget(spec: AppSpec, requestedInstanceId?: string): Promise<{
+    instanceId: string;
+    installedSpec: AppSpec;
+    installedSpecYaml: string;
+}>;

package/dist/services/app-common/spec-materializer.js

@@ -0,0 +1,295 @@
+import { existsSync, } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+import { stringify } from "yaml";
+import * as config from "../../config.js";
+import { platformTransformSpec } from "./platform-transform.js";
+import { readCanonicalManifestFromDir, readCanonicalSpecSnapshotsFromDir, } from "./instance-store.js";
+import { resolveIntegrationsFromSpec } from "./integration-refs.js";
+import { cleanupStaleInstallDir, listInstanceInstallRecords } from "./install-store.js";
+import { resolveAppDir } from "./paths.js";
+function getConfigValue(name) {
+    return name in config ? config[name] : undefined;
+}
+function resolveConfigPath(value, fallback) {
+    return typeof value === "string" && value.trim() ? value : fallback;
+}
+const JISHUSHELL_HOME = resolveConfigPath(getConfigValue("JISHUSHELL_HOME"), join(process.env.HOME ?? homedir(), ".jishushell"));
+const APPS_DIR = resolveConfigPath(getConfigValue("APPS_DIR"), join(JISHUSHELL_HOME, "apps"));
+function normalizePortVisibility(visibility) {
+    if (!visibility || visibility === "external" || visibility === "public") {
+        return "external";
+    }
+    if (visibility === "internal") {
+        return visibility;
+    }
+    throw new Error(`port visibility '${visibility}' 仅支持 external 或 internal`);
+}
+function storageClassRoot(className) {
+    return className;
+}
+function storageRootTemplate(instanceId, storageName, className) {
+    return `~/.jishushell/apps/${instanceId}/${storageClassRoot(className)}/${storageName}`;
+}
+function hasMkdirStep(steps, path) {
+    return Boolean(steps?.some((step) => "mkdir" in step && step.mkdir === path));
+}
+function normalizeIntegrations(spec) {
+    const refs = resolveIntegrationsFromSpec(spec);
+    return refs.length > 0 ? refs : undefined;
+}
+function findLegacyInstanceIdentityToken(value, path = "spec") {
+    if (typeof value === "string") {
+        if (value.includes("${app_id}"))
+            return `${path}: \${app_id}`;
+        if (value.includes("${app.id}"))
+            return `${path}: \${app.id}`;
+        return null;
+    }
+    if (Array.isArray(value)) {
+        for (let index = 0; index < value.length; index += 1) {
+            const found = findLegacyInstanceIdentityToken(value[index], `${path}[${index}]`);
+            if (found)
+                return found;
+        }
+        return null;
+    }
+    if (value && typeof value === "object") {
+        for (const [key, entry] of Object.entries(value)) {
+            const found = findLegacyInstanceIdentityToken(entry, `${path}.${key}`);
+            if (found)
+                return found;
+        }
+    }
+    return null;
+}
+function assertCurrentAppSpecIdentitySyntax(spec, boundary = "AppSpec") {
+    if (typeof spec.app_id === "string" && spec.app_id.trim()) {
+        throw new Error(`${boundary} uses legacy top-level app_id. Run upgrade/migration/import repair before normal create/start paths.`);
+    }
+    const legacyToken = findLegacyInstanceIdentityToken(spec);
+    if (legacyToken) {
+        throw new Error(`${boundary} uses legacy instance identity token at ${legacyToken}. Use \${instance.id} in current AppSpecs.`);
+    }
+}
+export function normalizeAppSpec(spec) {
+    assertCurrentAppSpecIdentitySyntax(spec);
+    const normalizedIntegrations = normalizeIntegrations(spec);
+    const storage = spec.storage && typeof spec.storage === "object" ? { ...spec.storage } : undefined;
+    const instanceScopedId = "${instance.id}";
+    const normalizedTasks = (spec.tasks ?? []).map((task) => {
+        const rawTask = { ...task };
+        if (!rawTask.role) {
+            rawTask.role = "service";
+        }
+        if (!rawTask.command && rawTask.binary) {
+            rawTask.command = rawTask.binary;
+        }
+        if (Array.isArray(rawTask.ports)) {
+            rawTask.ports = rawTask.ports.map((port) => ({
+                ...port,
+                visibility: normalizePortVisibility(port.visibility),
+            }));
+        }
+        if (Array.isArray(rawTask.mounts) && storage) {
+            const volumes = Array.isArray(rawTask.volumes) ? [...rawTask.volumes] : [];
+            for (const mount of rawTask.mounts) {
+                const storageName = typeof mount?.storage === "string" ? mount.storage.trim() : "";
+                const target = typeof mount?.target === "string" ? mount.target.trim() : "";
+                if (!storageName || !target) {
+                    throw new Error(`task '${task.name}' 的 mounts 配置无效，必须包含 storage 和 target`);
+                }
+                const storageSpec = storage[storageName];
+                const className = storageSpec?.class;
+                if (className !== "managed" && className !== "data" && className !== "cache") {
+                    throw new Error(`task '${task.name}' 引用了未知 storage '${storageName}'`);
+                }
+                volumes.push({
+                    source: storageRootTemplate(instanceScopedId, storageName, className),
+                    target,
+                    readonly: mount.readonly === true,
+                });
+            }
+            rawTask.volumes = volumes;
+        }
+        return rawTask;
+    });
+    let normalizedLifecycle = spec.lifecycle ? { ...spec.lifecycle } : undefined;
+    if (storage) {
+        const install = [...(normalizedLifecycle?.install ?? [])];
+        for (const [storageName, storageSpec] of Object.entries(storage)) {
+            const className = storageSpec?.class;
+            if (className !== "managed" && className !== "data" && className !== "cache")
+                continue;
+            const path = storageRootTemplate(instanceScopedId, storageName, className);
+            if (!hasMkdirStep(install, path)) {
+                install.push({ mkdir: path });
+            }
+        }
+        normalizedLifecycle = {
+            ...(normalizedLifecycle ?? {}),
+            install,
+        };
+    }
+    return {
+        ...spec,
+        ...(normalizedIntegrations ? { integrations: normalizedIntegrations } : {}),
+        ...(storage ? { storage } : {}),
+        tasks: normalizedTasks,
+        ...(normalizedLifecycle ? { lifecycle: normalizedLifecycle } : {}),
+    };
+}
+function replaceAppScopedPaths(value, baseId, instanceId) {
+    if (baseId === instanceId)
+        return value;
+    const homeDir = homedir();
+    const replacements = [
+        [`~/.jishushell/apps/${baseId}`, `~/.jishushell/apps/${instanceId}`],
+        [`$HOME/.jishushell/apps/${baseId}`, `$HOME/.jishushell/apps/${instanceId}`],
+        [`${homeDir}/.jishushell/apps/${baseId}`, `${homeDir}/.jishushell/apps/${instanceId}`],
+        [`\${HOME}/.jishushell/apps/${baseId}`, `\${HOME}/.jishushell/apps/${instanceId}`],
+    ];
+    let rewritten = value;
+    for (const [from, to] of replacements) {
+        rewritten = rewritten.split(from).join(to);
+    }
+    return rewritten;
+}
+function replaceInstanceIdTokens(value, instanceId) {
+    return value.replace(/\$\{instance\.id\}/g, instanceId);
+}
+function canonicalDefinitionSpecYaml(originalSpecYaml) {
+    return originalSpecYaml.endsWith("\n") ? originalSpecYaml : `${originalSpecYaml}\n`;
+}
+function rewriteInstalledSpecValue(value, baseId, instanceId) {
+    if (typeof value === "string") {
+        const hasInstanceIdToken = value.includes("${instance.id}");
+        return hasInstanceIdToken
+            ? replaceInstanceIdTokens(value, instanceId)
+            : replaceAppScopedPaths(value, baseId, instanceId);
+    }
+    if (Array.isArray(value)) {
+        return value.map((entry) => rewriteInstalledSpecValue(entry, baseId, instanceId));
+    }
+    if (value && typeof value === "object") {
+        const rewritten = {};
+        for (const [key, entry] of Object.entries(value)) {
+            rewritten[key] = rewriteInstalledSpecValue(entry, baseId, instanceId);
+        }
+        return rewritten;
+    }
+    return value;
+}
+function materializeInstalledSpec(spec, instanceId) {
+    const derivedName = deriveInstalledDisplayName(spec, instanceId);
+    const normalized = normalizeAppSpec({
+        ...spec,
+        id: spec.id,
+        ...(derivedName ? { name: derivedName } : {}),
+    });
+    // Install materialization is template shaping only: instance id/path tokens,
+    // defaults, and platform compatibility. Final hostPort allocation belongs to
+    // runtime-facts/create-pipeline and must not be written into resolved-spec.yaml.
+    const rewritten = rewriteInstalledSpecValue(normalized, spec.id, instanceId);
+    // Final step: drop spec fields that work on the spec author's Linux
+    // baseline but break on the host platform (e.g. host_network:
+    // docker_bridge / user: "host" on darwin). Identity pass-through on
+    // Linux — see platform-transform.ts for the rule list.
+    return platformTransformSpec(rewritten);
+}
+export function materializeAppSpecForInstance(spec, instanceId) {
+    return materializeInstalledSpec(spec, instanceId);
+}
+function deriveInstalledDisplayName(spec, instanceId) {
+    const baseName = typeof spec.name === "string" && spec.name.trim() ? spec.name.trim() : spec.id;
+    if (!baseName)
+        return instanceId;
+    if (instanceId === spec.id)
+        return baseName;
+    if (!instanceId.startsWith(`${spec.id}-`))
+        return baseName;
+    const suffix = instanceId.slice(spec.id.length + 1).trim();
+    return suffix ? `${baseName}-${suffix}` : baseName;
+}
+function formatGeneratedInstanceId(baseId, instancePrefix, offset) {
+    if (offset === 0)
+        return baseId;
+    return `${baseId}-${instancePrefix}${offset}`;
+}
+export async function resolveInstallTarget(spec, requestedInstanceId) {
+    const baseId = spec.id;
+    const multiInstance = spec.singleInstance === false;
+    const explicitInstanceId = requestedInstanceId?.trim();
+    if (explicitInstanceId && !JISHUSHELL_SAFE_ID_RE.test(explicitInstanceId)) {
+        throw new Error(`Instance id '${explicitInstanceId}' 格式无效，必须符合 /^[a-z0-9][a-z0-9-]{0,62}$/`);
+    }
+    const installedSameSpec = listInstanceInstallRecords().find((app) => app.spec.id === baseId);
+    const assertTargetAvailable = (instanceId) => {
+        const dir = resolveAppDir(instanceId);
+        cleanupStaleInstallDir(dir);
+        if (!existsSync(dir))
+            return;
+        if (readCanonicalSpecSnapshotsFromDir(dir) && existsSync(join(dir, "manifest.json"))) {
+            // A legacy/malformed manifest must surface its migration reason here;
+            // install must never overwrite it merely because listInstanceInstallRecords skipped it.
+            readCanonicalManifestFromDir(dir, instanceId);
+        }
+        const error = new Error(`Instance '${instanceId}' 已存在，不能覆盖现有实例目录`);
+        error.code = 409;
+        throw error;
+    };
+    if (!multiInstance) {
+        if (installedSameSpec) {
+            const err = new Error(`AppSpec '${baseId}' 已安装为实例 '${installedSameSpec.manifest.instanceId}'，如需多实例请设置 singleInstance: false`);
+            err.code = 409;
+            throw err;
+        }
+        const instanceId = explicitInstanceId ?? baseId;
+        assertTargetAvailable(instanceId);
+        const installedSpec = materializeInstalledSpec(spec, instanceId);
+        return {
+            instanceId,
+            installedSpec,
+            installedSpecYaml: stringify(installedSpec),
+        };
+    }
+    const instancePrefix = spec.instancePrefix ?? "";
+    const maxOffset = 9999;
+    if (explicitInstanceId) {
+        assertTargetAvailable(explicitInstanceId);
+        const installedSpec = materializeInstalledSpec(spec, explicitInstanceId);
+        return {
+            instanceId: explicitInstanceId,
+            installedSpec,
+            installedSpecYaml: stringify(installedSpec),
+        };
+    }
+    for (let offset = 0; offset <= maxOffset; offset++) {
+        const instanceId = formatGeneratedInstanceId(baseId, instancePrefix, offset);
+        if (!JISHUSHELL_SAFE_ID_RE.test(instanceId)) {
+            throw new Error(`自动生成的 Instance id '${instanceId}' 超出格式限制，请缩短 id 或 instancePrefix`);
+        }
+        if (existsSync(resolveAppDir(instanceId)))
+            continue;
+        const installedSpec = materializeInstalledSpec(spec, instanceId);
+        return {
+            instanceId,
+            installedSpec,
+            // Always re-serialize from `installedSpec` so the cached yaml
+            // reflects every transform `materializeInstalledSpec` ran —
+            // including the platform pass that strips host_network/user fields
+            // on darwin. Using the original input YAML for offset=0 (the previous
+            // behavior) bypassed the transformer for multi-instance apps'
+            // first install slot and re-introduced the Linux-only fields on
+            // disk; subsequent Core restarts then re-read that snapshot and
+            // broke macOS placement again.
+            installedSpecYaml: stringify(installedSpec),
+        };
+    }
+    throw new Error(`App '${baseId}' 没有可用安装槽位，目录名已全部占用`);
+}
+// Shared safe slug constraint for AppSpec ids and instance ids. This only
+// validates path/job-safe syntax; semantic identity still comes from the call
+// site (`spec.id` vs instance id).
+const JISHUSHELL_SAFE_ID_RE = /^[a-z0-9][a-z0-9-]{0,62}$/;
+//# sourceMappingURL=spec-materializer.js.map

package/dist/services/app-common/spec-materializer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spec-materializer.js","sourceRoot":"","sources":["../../../src/services/app-common/spec-materializer.ts"],"names":[],"mappings":"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"}

package/dist/services/app-common/status-refresh.d.ts

@@ -0,0 +1,33 @@
+import type { AppInstance, AppProvide, InstanceStatus } from "../../types.js";
+type RefreshReason = "api-list" | "api-detail" | "api-service-status" | "start-wait" | "stop-wait" | "restart-wait" | "manual";
+type CoreProxyProbeResult = {
+    ready: true;
+    capability?: string;
+    status?: number;
+} | {
+    ready: false;
+    reason: "route-pending" | "request-failed" | "response-not-ready";
+    capability: string;
+    status?: number;
+};
+export interface RefreshedInstanceStatus {
+    instance: AppInstance;
+    service: InstanceStatus;
+    rawService: InstanceStatus;
+}
+declare function coreProxyProbeSuffix(provide: AppProvide): string;
+declare function coreProxyProbeUrl(instanceId: string, capability: string, suffix: string): string;
+declare function observeInstanceStatus(instance: AppInstance, rawService: Record<string, any>, readinessOk: boolean, coreProxyProbe: CoreProxyProbeResult): AppInstance["status"];
+export declare function refreshInstanceStatus(instanceId: string, options?: {
+    reason?: RefreshReason;
+    force?: boolean;
+    minIntervalMs?: number;
+}): Promise<RefreshedInstanceStatus | null>;
+export declare function waitForObservedStatus(instanceId: string, target: "ready" | "stopped", options?: {
+    reason: RefreshReason;
+    timeoutMs?: number;
+}): Promise<RefreshedInstanceStatus | null>;
+export declare const __observeInstanceStatusForTests: typeof observeInstanceStatus;
+export declare const __coreProxyProbeSuffixForTests: typeof coreProxyProbeSuffix;
+export declare const __coreProxyProbeUrlForTests: typeof coreProxyProbeUrl;
+export {};