@powerhousedao/desktop 6.2.3-dev.78 → 6.2.3-dev.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/runner.d.mts +4 -2
- package/dist/runner.d.mts.map +1 -1
- package/dist/runner.mjs +5 -2
- package/dist/runner.mjs.map +1 -1
- package/package.json +3 -3
package/dist/runner.d.mts
CHANGED
|
@@ -80,11 +80,12 @@ export declare const declaredHostSchema: z.ZodObject<{
|
|
|
80
80
|
dynamic: z.ZodOptional<z.ZodBoolean>;
|
|
81
81
|
}, z.core.$strict>>;
|
|
82
82
|
remote: z.ZodOptional<z.ZodObject<{
|
|
83
|
-
url: import("@powerhousedao/host-core").TokenableSchema<z.ZodURL
|
|
83
|
+
url: import("@powerhousedao/host-core").TokenableSchema<z.ZodUnion<readonly [z.ZodURL, z.ZodString]>>;
|
|
84
84
|
}, z.core.$strict>>;
|
|
85
85
|
}, z.core.$strict>>>;
|
|
86
86
|
placement: z.ZodOptional<z.ZodObject<{
|
|
87
87
|
primary: z.ZodOptional<z.ZodString>;
|
|
88
|
+
drives: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
88
89
|
}, z.core.$strict>>;
|
|
89
90
|
protocol: z.ZodOptional<z.ZodObject<{
|
|
90
91
|
featureFlags: z.ZodOptional<z.ZodObject<{
|
|
@@ -209,11 +210,12 @@ export declare const hostSchema: z.ZodObject<{
|
|
|
209
210
|
dynamic: z.ZodOptional<z.ZodBoolean>;
|
|
210
211
|
}, z.core.$strict>>;
|
|
211
212
|
remote: z.ZodOptional<z.ZodObject<{
|
|
212
|
-
url: import("@powerhousedao/host-core").TokenableSchema<z.ZodURL
|
|
213
|
+
url: import("@powerhousedao/host-core").TokenableSchema<z.ZodUnion<readonly [z.ZodURL, z.ZodString]>>;
|
|
213
214
|
}, z.core.$strict>>;
|
|
214
215
|
}, z.core.$strict>>>;
|
|
215
216
|
placement: z.ZodOptional<z.ZodObject<{
|
|
216
217
|
primary: z.ZodOptional<z.ZodString>;
|
|
218
|
+
drives: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
217
219
|
}, z.core.$strict>>;
|
|
218
220
|
protocol: z.ZodOptional<z.ZodObject<{
|
|
219
221
|
featureFlags: z.ZodOptional<z.ZodObject<{
|
package/dist/runner.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.mts","names":[],"sources":["../src/runner.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"runner.d.mts","names":[],"sources":["../src/runner.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;qBAsDa;;qBAGA;;;qBAIA,oBAAkB,EAAA;;;;;;;;;GAY7B,EAAA,KAAA;;qBAmCW,oBAAkB,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA6B,EAAA,KAAA;;qBAE/C,YAAU,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAqB,EAAA,KAAA;;YAGhC,mBAAmB,EAAE,aAAa;;YAElC,cAAc,EAAE,cAAc;;;;qBAK7B,eAAa,EAAA,cAAA,EAAA,KAAA;YAEd,iBAAiB,EAAE,aAAa;QAEpC;YACI;IACR;MACE,MAAM;MACN,SAAS;;;;YAKH,gBAAgB,aAAa;wBA2CnB,IACpB,MAAM,aACN,KAAK,gBACJ,QAAQ;qBAWE,cAAK;iBAED,oBAAoB;;EAEnC,QAAQ;;;;;wBA0BM,UACd,MAAM,KAAK,iCACX,KAAK;wBA4Ce,IACpB,MAAM,aACN,KAAK,gBACJ,QAAQ;;wBAqFW,MACpB,MAAM,aACN,KAAK,gBACJ"}
|
package/dist/runner.mjs
CHANGED
|
@@ -4,7 +4,7 @@ import path from "node:path";
|
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { spawn, spawnSync } from "node:child_process";
|
|
6
6
|
import { compoundWiringSchema, getVerb, loadHost, refineStartOrder, resolveRunnerModule, validateHost } from "@powerhousedao/host-core";
|
|
7
|
-
import { defineHostSchemas } from "@powerhousedao/host-core/schema";
|
|
7
|
+
import { HOST_NAME_MESSAGE, defineHostSchemas, hostNameSchema } from "@powerhousedao/host-core/schema";
|
|
8
8
|
//#region src/runner.ts
|
|
9
9
|
/**
|
|
10
10
|
* @powerhousedao/desktop/runner.
|
|
@@ -86,7 +86,10 @@ async function compoundModule() {
|
|
|
86
86
|
}
|
|
87
87
|
/** hosts/<host>/ — where app.json lives and the generated shell is written. */
|
|
88
88
|
function hostDirOf(host, ctx) {
|
|
89
|
-
|
|
89
|
+
const hostsDir = path.resolve(ctx.projectRoot, "hosts");
|
|
90
|
+
const dir = path.resolve(hostsDir, host.name);
|
|
91
|
+
if (!hostNameSchema.safeParse(host.name).success || path.dirname(dir) !== hostsDir) throw new Error(`"${host.name}" can't name a host folder. ${HOST_NAME_MESSAGE}`);
|
|
92
|
+
return dir;
|
|
90
93
|
}
|
|
91
94
|
/** The connect member's port — the shell's readiness probe and window URL. */
|
|
92
95
|
async function connectPort(host, ctx) {
|
package/dist/runner.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.mjs","names":[],"sources":["../src/runner.ts"],"sourcesContent":["import { spawn, spawnSync, type ChildProcess } from \"node:child_process\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport {\n compoundWiringSchema,\n getVerb,\n loadHost,\n refineStartOrder,\n resolveRunnerModule,\n validateHost,\n type RunnerContext,\n type RunnerHandle,\n} from \"@powerhousedao/host-core\";\nimport { defineHostSchemas } from \"@powerhousedao/host-core/schema\";\nimport { z } from \"zod\";\nimport { APP_JSON_FILE, loadAppJson } from \"./app-json.js\";\nimport { bundleStack } from \"./bundle-stack.js\";\nimport { ICON_SOURCE, projectShell } from \"./shell-project.js\";\nimport {\n detectToolchain,\n fetchNodeSidecar,\n preflightOrThrow,\n runTauriIcon,\n tauriBundlesForHost,\n tauriSpawn,\n type TauriCommand,\n} from \"./shell-toolchain.js\";\nimport { launchShell, resolveShell, shellEnv } from \"./shell.js\";\n\n/**\n * @powerhousedao/desktop/runner.\n *\n * - `run`/`serve`: the headless stack — byte-identical delegation to\n * host-core's generic compound (phase-3 semantics unchanged).\n * - `dev`: the NATIVE window. Mode 1 (phase 7) is the default — a builder\n * ships under THEIR identity by editing `hosts/<host>/app.json` and never\n * writing Rust: the runner projects app.json into a generated `tauri-shell/`\n * that depends on the published `ph-desktop-shell` crate, provisions the\n * native toolchain's compile-time inputs (node sidecar + icon set), and runs\n * `cargo tauri dev`. An explicit `runner.shell.project` (or PH_DESKTOP_SHELL)\n * still selects a prebuilt/hand-maintained shell instead.\n * - `build`: the PACKAGING verb — members' builds (where exported), then the\n * shippable stack staged into the shell + `cargo tauri build` with\n * host-appropriate installer targets (nsis / app+dmg / deb+appimage).\n *\n * The native toolchain is required ONLY for dev/build; a missing cargo or\n * Tauri CLI fails with install guidance (see shell-toolchain). `ph run <host>`\n * (headless) needs none of it.\n */\n\nexport const kind = \"compound\";\n\n/** The verbs this runner exports (`shellMode` is a helper). */\nexport const verbs = [\"run\", \"serve\", \"dev\", \"build\"] as const;\n\n/** `runner.shell`: a prebuilt or hand-maintained shell (mode 2). Mirrors\n * `ShellOptions` (shell.ts); a type test pins the two together. */\nexport const shellOptionsSchema = z.strictObject({\n /** Path to a ph-win-desktop checkout (absolute or project-relative). */\n project: z.string().min(1).optional(),\n window: z\n .strictObject({\n title: z.string().optional(),\n width: z.number().int().positive().optional(),\n height: z.number().int().positive().optional(),\n })\n .optional(),\n tray: z.boolean().optional(),\n fileAssociations: z.array(z.string().min(1)).optional(),\n});\n\n/**\n * The desktop host, from one definition in two forms: DECLARED (what host.js\n * authors write) and RESOLVED (what the verbs receive). The runner adds no\n * token-able fields of its own; the forms differ in host-core's base blocks\n * (member wrappers' reactor URLs and the like).\n */\nconst schemas = defineHostSchemas((base) => {\n /** The desktop runner's own `runner` options, on top of the common base. */\n const desktopRunnerOptionsSchema = base.runnerBaseSchema\n .extend({\n shell: shellOptionsSchema.optional(),\n /** build: vendor ph-cli into the staged stack (default true). */\n vendorStack: z.boolean().optional(),\n /** build: the ph-cli version/tag to vendor (default \"dev\"). */\n phCliVersion: z.string().min(1).optional(),\n /** build: full install spec override (e.g. a pnpm-pack tarball path)\n * for a ph-cli not yet on the registry. */\n phCliSpec: z.string().min(1).optional(),\n })\n .strict();\n\n /** The generic compound's wiring config plus the shell and packaging\n * options. Extend the unrefined base, refine last (zod refuses to extend\n * a refined object). */\n return base.compoundHostSchema\n .extend({\n runner: desktopRunnerOptionsSchema,\n config: compoundWiringSchema.optional(),\n })\n .superRefine(refineStartOrder);\n});\n\n/** Declared form: what a host file may contain before resolution. */\nexport const declaredHostSchema = schemas.declaredHostSchema;\n/** Resolved form: what the verbs receive (and `validateHost` checks). */\nexport const hostSchema = schemas.hostSchema;\n\n/** What a desktop host.js author writes. */\nexport type DesktopHostInput = z.input<typeof declaredHostSchema>;\n/** What the verbs receive. */\nexport type DesktopHost = z.output<typeof hostSchema>;\n\n/** The desktop compound produces nothing of its own: what its members\n * produce stays with the members (the compound's handles, the run record's\n * `members`). */\nexport const outputsSchema = z.strictObject({});\n\nexport type DesktopOutputs = z.infer<typeof outputsSchema>;\n\ndeclare global {\n interface PHHostRunners {\n \"@powerhousedao/desktop/runner\": {\n host: DesktopHostInput;\n outputs: DesktopOutputs;\n };\n }\n}\n\nexport type DesktopHandle = RunnerHandle<DesktopOutputs>;\n\nasync function compoundModule() {\n return import(\"@powerhousedao/host-core/runners/compound\");\n}\n\n/** hosts/<host>/ — where app.json lives and the generated shell is written. */\nfunction hostDirOf(\n host: Pick<DesktopHost, \"name\">,\n ctx: RunnerContext,\n): string {\n return path.join(ctx.projectRoot, \"hosts\", host.name);\n}\n\n/** The connect member's port — the shell's readiness probe and window URL. */\nasync function connectPort(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<number> {\n for (const wrapper of Object.values(host.children)) {\n if (wrapper.host !== \"connect\") continue;\n if (wrapper.runner?.port !== undefined) return wrapper.runner.port;\n const member = await loadHost(ctx.projectRoot, wrapper.host);\n if (typeof member.host.runner.port === \"number\") {\n return member.host.runner.port;\n }\n }\n throw new Error(\n `hosts/${host.name}: no connect member with a resolvable runner.port — ` +\n `the shell needs it for its readiness probe and window URL.`,\n );\n}\n\nexport async function run(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<DesktopHandle> {\n const compound = await compoundModule();\n const started = await compound.run(host, ctx);\n return {\n outputs: outputsSchema.parse({}),\n // runCompound has already awaited every member's readiness.\n ready: Promise.resolve(),\n shutdown: started.shutdown,\n };\n}\n\nexport const serve = run;\n\nexport interface ShellHandle extends DesktopHandle {\n /** Resolves when the shell window exits — the runner's keep-alive. */\n exited: Promise<void>;\n}\n\n/** The handle for a launched shell process: `ready` once it is spawned. */\nfunction shellHandle(child: ChildProcess): ShellHandle {\n const exited = new Promise<void>((resolve) =>\n child.once(\"exit\", () => resolve()),\n );\n return {\n outputs: outputsSchema.parse({}),\n ready: Promise.resolve(),\n exited,\n shutdown: () => {\n try {\n child.kill();\n } catch {\n // already gone\n }\n return Promise.resolve();\n },\n };\n}\n\n/** Which shell backs this host's native window (D7.d source order):\n * an explicit `runner.shell.project`, else the app.json-generated shell,\n * else the PH_DESKTOP_SHELL escape hatch. */\nexport function shellMode(\n host: Pick<DesktopHost, \"name\" | \"runner\">,\n ctx: RunnerContext,\n): \"external-project\" | \"generated\" | \"external-env\" | \"none\" {\n if (host.runner.shell?.project) return \"external-project\";\n if (fs.existsSync(path.join(hostDirOf(host, ctx), APP_JSON_FILE))) {\n return \"generated\";\n }\n if (ctx.env.PH_DESKTOP_SHELL) return \"external-env\";\n return \"none\";\n}\n\n/** Fetch the node sidecar + (re)generate the icon set — both are tauri-build\n * COMPILE-TIME inputs (externalBin; icon.ico for the Windows resource),\n * confirmed against a live cargo check. Icon regen only when app-icon.png\n * changed or the set is absent. */\nfunction provisionShell(\n shellDir: string,\n tauri: TauriCommand,\n iconChanged: boolean,\n): void {\n fetchNodeSidecar(shellDir);\n const iconIco = path.join(shellDir, \"icons\", \"icon.ico\");\n if (iconChanged || !fs.existsSync(iconIco)) {\n runTauriIcon(tauri, shellDir, ICON_SOURCE);\n }\n}\n\n/** Spawn a `<tauri> <subcommand>` in the generated shell with the uniform-\n * runners env trio wired in. */\nfunction spawnTauri(\n tauri: TauriCommand,\n subcommand: string[],\n shellDir: string,\n envVars: Record<string, string>,\n) {\n const { command, args, shell } = tauriSpawn(tauri, subcommand);\n return spawn(command, args, {\n cwd: shellDir,\n env: { ...process.env, ...envVars },\n stdio: \"inherit\",\n shell,\n windowsHide: true,\n });\n}\n\nexport async function dev(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<ShellHandle> {\n const mode = shellMode(host, ctx);\n if (mode === \"none\") {\n throw new Error(\n `hosts/${host.name}: no desktop shell to run — add ${APP_JSON_FILE} ` +\n `(run \\`ph generate desktop-shell\\`) for a builder-owned identity, set ` +\n `runner.shell.project to a prebuilt shell, or export PH_DESKTOP_SHELL.`,\n );\n }\n\n const port = await connectPort(host, ctx);\n const envVars = shellEnv(ctx.projectRoot, port, ctx.env);\n\n if (mode === \"generated\") {\n const hostDir = hostDirOf(host, ctx);\n const app = loadAppJson(hostDir);\n const { shellDir, binName, changed } = projectShell({\n hostDir,\n app,\n connectPort: port,\n });\n const tauri = preflightOrThrow(detectToolchain(ctx.projectRoot), host.name);\n provisionShell(shellDir, tauri, changed);\n console.log(\n `[${host.name}] launching the generated desktop shell '${binName}' ` +\n `(${tauri.via}: cargo tauri dev) — stack via ph run ${host.name}, ` +\n `window at http://127.0.0.1:${port}/`,\n );\n return shellHandle(spawnTauri(tauri, [\"dev\"], shellDir, envVars));\n }\n\n // external-project / external-env: a prebuilt or hand-maintained shell.\n const options = host.runner;\n const shell = resolveShell(ctx.projectRoot, options.shell, ctx.env);\n console.log(\n `[${host.name}] launching the desktop shell ` +\n `(${shell.exe ? shell.exe : \"pnpm tauri dev\"}) — stack via ` +\n `ph run ${host.name}, window at http://127.0.0.1:${port}/`,\n );\n return shellHandle(launchShell(shell, envVars, options.shell));\n}\n\n/** Forward `build` to members that export it (packaging builds what is\n * buildable — unlike the generic compound's uniform fail-loud forwarding). */\nasync function buildMembers(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<void> {\n for (const [name, wrapper] of Object.entries(host.children)) {\n const member = await loadHost(ctx.projectRoot, wrapper.host);\n const specifier = member.host.runner.module;\n const runner = await resolveRunnerModule(ctx.projectRoot, specifier);\n const validated = validateHost(\n runner,\n specifier,\n member.host,\n `hosts/${wrapper.host}/host.js`,\n // build is one-shot: it needs no other member's outputs, so a declared\n // $output stays a token (as in the generic compound).\n { tokens: \"allow\" },\n );\n if (typeof runner.build !== \"function\") {\n console.log(\n `[${host.name}] build: ${name} (${wrapper.host}) exports no build — skipped (packaging builds what is buildable)`,\n );\n continue;\n }\n const fn = getVerb(runner, specifier, \"build\");\n console.log(`[${host.name}] build → ${name} (${wrapper.host})`);\n await fn(validated, {\n ...ctx,\n verb: \"build\",\n parent: { host: host.name, verb: ctx.verb },\n });\n }\n}\n\n/** PH_DESKTOP_LOCAL_PACKAGES: tarballs to vendor in place of the registry's\n * (a machine path, so an env var rather than a host-file option). */\nfunction localPackagesDir(ctx: RunnerContext): string | undefined {\n const dir = ctx.env.PH_DESKTOP_LOCAL_PACKAGES;\n return dir ? path.resolve(ctx.projectRoot, dir) : undefined;\n}\n\n/** build = members' builds + the shippable stack + the native installer. */\nexport async function build(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<void> {\n await buildMembers(host, ctx);\n\n const runnerOptions = host.runner;\n const mode = shellMode(host, ctx);\n const port = await connectPort(host, ctx);\n\n if (mode === \"generated\") {\n const hostDir = hostDirOf(host, ctx);\n const app = loadAppJson(hostDir);\n const { shellDir, binName, changed } = projectShell({\n hostDir,\n app,\n connectPort: port,\n });\n const tauri = preflightOrThrow(detectToolchain(ctx.projectRoot), host.name);\n provisionShell(shellDir, tauri, changed);\n\n console.log(`[${host.name}] staging the stack into ${shellDir}…`);\n const staged = bundleStack({\n projectRoot: ctx.projectRoot,\n shellProjectDir: shellDir,\n vendor: runnerOptions.vendorStack,\n phCliVersion: runnerOptions.phCliVersion,\n phCliSpec: runnerOptions.phCliSpec ?? ctx.env.PH_DESKTOP_PHCLI_SPEC,\n localPackagesDir: localPackagesDir(ctx),\n connectPort: port,\n // the generated shell lives under hosts/ — never stage it into itself\n excludeDirs: [shellDir],\n });\n console.log(\n `[${host.name}] stack staged at ${staged.stackDir}` +\n `${staged.vendored ? \" (ph-cli vendored)\" : \"\"}.`,\n );\n\n const bundles = tauriBundlesForHost();\n console.log(\n `[${host.name}] building '${binName}' (${tauri.via}: cargo tauri ` +\n `build --bundles ${bundles.join(\",\")})…`,\n );\n const result = spawnSyncTauri(\n tauri,\n [\"build\", \"--bundles\", bundles.join(\",\")],\n shellDir,\n );\n if (result !== 0) {\n throw new Error(\n `hosts/${host.name}: \\`cargo tauri build\\` failed (exit ${result}).`,\n );\n }\n console.log(\n `[${host.name}] desktop app built — installers under ` +\n `${path.join(shellDir, \"target\", \"release\", \"bundle\")}.`,\n );\n return;\n }\n\n // external-project / external-env: stage into the prebuilt shell (phase 6).\n if (mode === \"none\") {\n console.log(\n `[${host.name}] build: no shell configured — members built; shell ` +\n `packaging skipped (add ${APP_JSON_FILE} or set runner.shell.project).`,\n );\n return;\n }\n const shell = resolveShell(ctx.projectRoot, runnerOptions.shell, ctx.env);\n console.log(`[${host.name}] staging the stack into ${shell.projectDir}…`);\n const result = bundleStack({\n projectRoot: ctx.projectRoot,\n shellProjectDir: shell.projectDir,\n vendor: runnerOptions.vendorStack,\n phCliVersion: runnerOptions.phCliVersion,\n phCliSpec: runnerOptions.phCliSpec ?? ctx.env.PH_DESKTOP_PHCLI_SPEC,\n localPackagesDir: localPackagesDir(ctx),\n connectPort: port,\n });\n console.log(\n `[${host.name}] stack staged at ${result.stackDir}` +\n `${result.vendored ? \" (ph-cli vendored)\" : \"\"} — the shell runs it with ` +\n `no environment (resources fallback).`,\n );\n}\n\n/** Synchronous `<tauri> <subcommand>` — build blocks until the installer is\n * produced. Returns the exit code. */\nfunction spawnSyncTauri(\n tauri: TauriCommand,\n subcommand: string[],\n shellDir: string,\n): number {\n const { command, args, shell } = tauriSpawn(tauri, subcommand);\n const r = spawnSync(command, args, {\n cwd: shellDir,\n stdio: \"inherit\",\n shell,\n windowsHide: true,\n });\n return r.status ?? 1;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.mjs","names":[],"sources":["../src/runner.ts"],"sourcesContent":["import { spawn, spawnSync, type ChildProcess } from \"node:child_process\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport {\n compoundWiringSchema,\n getVerb,\n loadHost,\n refineStartOrder,\n resolveRunnerModule,\n validateHost,\n type RunnerContext,\n type RunnerHandle,\n} from \"@powerhousedao/host-core\";\nimport {\n defineHostSchemas,\n HOST_NAME_MESSAGE,\n hostNameSchema,\n} from \"@powerhousedao/host-core/schema\";\nimport { z } from \"zod\";\nimport { APP_JSON_FILE, loadAppJson } from \"./app-json.js\";\nimport { bundleStack } from \"./bundle-stack.js\";\nimport { ICON_SOURCE, projectShell } from \"./shell-project.js\";\nimport {\n detectToolchain,\n fetchNodeSidecar,\n preflightOrThrow,\n runTauriIcon,\n tauriBundlesForHost,\n tauriSpawn,\n type TauriCommand,\n} from \"./shell-toolchain.js\";\nimport { launchShell, resolveShell, shellEnv } from \"./shell.js\";\n\n/**\n * @powerhousedao/desktop/runner.\n *\n * - `run`/`serve`: the headless stack — byte-identical delegation to\n * host-core's generic compound (phase-3 semantics unchanged).\n * - `dev`: the NATIVE window. Mode 1 (phase 7) is the default — a builder\n * ships under THEIR identity by editing `hosts/<host>/app.json` and never\n * writing Rust: the runner projects app.json into a generated `tauri-shell/`\n * that depends on the published `ph-desktop-shell` crate, provisions the\n * native toolchain's compile-time inputs (node sidecar + icon set), and runs\n * `cargo tauri dev`. An explicit `runner.shell.project` (or PH_DESKTOP_SHELL)\n * still selects a prebuilt/hand-maintained shell instead.\n * - `build`: the PACKAGING verb — members' builds (where exported), then the\n * shippable stack staged into the shell + `cargo tauri build` with\n * host-appropriate installer targets (nsis / app+dmg / deb+appimage).\n *\n * The native toolchain is required ONLY for dev/build; a missing cargo or\n * Tauri CLI fails with install guidance (see shell-toolchain). `ph run <host>`\n * (headless) needs none of it.\n */\n\nexport const kind = \"compound\";\n\n/** The verbs this runner exports (`shellMode` is a helper). */\nexport const verbs = [\"run\", \"serve\", \"dev\", \"build\"] as const;\n\n/** `runner.shell`: a prebuilt or hand-maintained shell (mode 2). Mirrors\n * `ShellOptions` (shell.ts); a type test pins the two together. */\nexport const shellOptionsSchema = z.strictObject({\n /** Path to a ph-win-desktop checkout (absolute or project-relative). */\n project: z.string().min(1).optional(),\n window: z\n .strictObject({\n title: z.string().optional(),\n width: z.number().int().positive().optional(),\n height: z.number().int().positive().optional(),\n })\n .optional(),\n tray: z.boolean().optional(),\n fileAssociations: z.array(z.string().min(1)).optional(),\n});\n\n/**\n * The desktop host, from one definition in two forms: DECLARED (what host.js\n * authors write) and RESOLVED (what the verbs receive). The runner adds no\n * token-able fields of its own; the forms differ in host-core's base blocks\n * (member wrappers' reactor URLs and the like).\n */\nconst schemas = defineHostSchemas((base) => {\n /** The desktop runner's own `runner` options, on top of the common base. */\n const desktopRunnerOptionsSchema = base.runnerBaseSchema\n .extend({\n shell: shellOptionsSchema.optional(),\n /** build: vendor ph-cli into the staged stack (default true). */\n vendorStack: z.boolean().optional(),\n /** build: the ph-cli version/tag to vendor (default \"dev\"). */\n phCliVersion: z.string().min(1).optional(),\n /** build: full install spec override (e.g. a pnpm-pack tarball path)\n * for a ph-cli not yet on the registry. */\n phCliSpec: z.string().min(1).optional(),\n })\n .strict();\n\n /** The generic compound's wiring config plus the shell and packaging\n * options. Extend the unrefined base, refine last (zod refuses to extend\n * a refined object). */\n return base.compoundHostSchema\n .extend({\n runner: desktopRunnerOptionsSchema,\n config: compoundWiringSchema.optional(),\n })\n .superRefine(refineStartOrder);\n});\n\n/** Declared form: what a host file may contain before resolution. */\nexport const declaredHostSchema = schemas.declaredHostSchema;\n/** Resolved form: what the verbs receive (and `validateHost` checks). */\nexport const hostSchema = schemas.hostSchema;\n\n/** What a desktop host.js author writes. */\nexport type DesktopHostInput = z.input<typeof declaredHostSchema>;\n/** What the verbs receive. */\nexport type DesktopHost = z.output<typeof hostSchema>;\n\n/** The desktop compound produces nothing of its own: what its members\n * produce stays with the members (the compound's handles, the run record's\n * `members`). */\nexport const outputsSchema = z.strictObject({});\n\nexport type DesktopOutputs = z.infer<typeof outputsSchema>;\n\ndeclare global {\n interface PHHostRunners {\n \"@powerhousedao/desktop/runner\": {\n host: DesktopHostInput;\n outputs: DesktopOutputs;\n };\n }\n}\n\nexport type DesktopHandle = RunnerHandle<DesktopOutputs>;\n\nasync function compoundModule() {\n return import(\"@powerhousedao/host-core/runners/compound\");\n}\n\n/** hosts/<host>/ — where app.json lives and the generated shell is written. */\nfunction hostDirOf(\n host: Pick<DesktopHost, \"name\">,\n ctx: RunnerContext,\n): string {\n const hostsDir = path.resolve(ctx.projectRoot, \"hosts\");\n const dir = path.resolve(hostsDir, host.name);\n if (\n !hostNameSchema.safeParse(host.name).success ||\n path.dirname(dir) !== hostsDir\n ) {\n throw new Error(\n `\"${host.name}\" can't name a host folder. ${HOST_NAME_MESSAGE}`,\n );\n }\n return dir;\n}\n\n/** The connect member's port — the shell's readiness probe and window URL. */\nasync function connectPort(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<number> {\n for (const wrapper of Object.values(host.children)) {\n if (wrapper.host !== \"connect\") continue;\n if (wrapper.runner?.port !== undefined) return wrapper.runner.port;\n const member = await loadHost(ctx.projectRoot, wrapper.host);\n if (typeof member.host.runner.port === \"number\") {\n return member.host.runner.port;\n }\n }\n throw new Error(\n `hosts/${host.name}: no connect member with a resolvable runner.port — ` +\n `the shell needs it for its readiness probe and window URL.`,\n );\n}\n\nexport async function run(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<DesktopHandle> {\n const compound = await compoundModule();\n const started = await compound.run(host, ctx);\n return {\n outputs: outputsSchema.parse({}),\n // runCompound has already awaited every member's readiness.\n ready: Promise.resolve(),\n shutdown: started.shutdown,\n };\n}\n\nexport const serve = run;\n\nexport interface ShellHandle extends DesktopHandle {\n /** Resolves when the shell window exits — the runner's keep-alive. */\n exited: Promise<void>;\n}\n\n/** The handle for a launched shell process: `ready` once it is spawned. */\nfunction shellHandle(child: ChildProcess): ShellHandle {\n const exited = new Promise<void>((resolve) =>\n child.once(\"exit\", () => resolve()),\n );\n return {\n outputs: outputsSchema.parse({}),\n ready: Promise.resolve(),\n exited,\n shutdown: () => {\n try {\n child.kill();\n } catch {\n // already gone\n }\n return Promise.resolve();\n },\n };\n}\n\n/** Which shell backs this host's native window (D7.d source order):\n * an explicit `runner.shell.project`, else the app.json-generated shell,\n * else the PH_DESKTOP_SHELL escape hatch. */\nexport function shellMode(\n host: Pick<DesktopHost, \"name\" | \"runner\">,\n ctx: RunnerContext,\n): \"external-project\" | \"generated\" | \"external-env\" | \"none\" {\n if (host.runner.shell?.project) return \"external-project\";\n if (fs.existsSync(path.join(hostDirOf(host, ctx), APP_JSON_FILE))) {\n return \"generated\";\n }\n if (ctx.env.PH_DESKTOP_SHELL) return \"external-env\";\n return \"none\";\n}\n\n/** Fetch the node sidecar + (re)generate the icon set — both are tauri-build\n * COMPILE-TIME inputs (externalBin; icon.ico for the Windows resource),\n * confirmed against a live cargo check. Icon regen only when app-icon.png\n * changed or the set is absent. */\nfunction provisionShell(\n shellDir: string,\n tauri: TauriCommand,\n iconChanged: boolean,\n): void {\n fetchNodeSidecar(shellDir);\n const iconIco = path.join(shellDir, \"icons\", \"icon.ico\");\n if (iconChanged || !fs.existsSync(iconIco)) {\n runTauriIcon(tauri, shellDir, ICON_SOURCE);\n }\n}\n\n/** Spawn a `<tauri> <subcommand>` in the generated shell with the uniform-\n * runners env trio wired in. */\nfunction spawnTauri(\n tauri: TauriCommand,\n subcommand: string[],\n shellDir: string,\n envVars: Record<string, string>,\n) {\n const { command, args, shell } = tauriSpawn(tauri, subcommand);\n return spawn(command, args, {\n cwd: shellDir,\n env: { ...process.env, ...envVars },\n stdio: \"inherit\",\n shell,\n windowsHide: true,\n });\n}\n\nexport async function dev(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<ShellHandle> {\n const mode = shellMode(host, ctx);\n if (mode === \"none\") {\n throw new Error(\n `hosts/${host.name}: no desktop shell to run — add ${APP_JSON_FILE} ` +\n `(run \\`ph generate desktop-shell\\`) for a builder-owned identity, set ` +\n `runner.shell.project to a prebuilt shell, or export PH_DESKTOP_SHELL.`,\n );\n }\n\n const port = await connectPort(host, ctx);\n const envVars = shellEnv(ctx.projectRoot, port, ctx.env);\n\n if (mode === \"generated\") {\n const hostDir = hostDirOf(host, ctx);\n const app = loadAppJson(hostDir);\n const { shellDir, binName, changed } = projectShell({\n hostDir,\n app,\n connectPort: port,\n });\n const tauri = preflightOrThrow(detectToolchain(ctx.projectRoot), host.name);\n provisionShell(shellDir, tauri, changed);\n console.log(\n `[${host.name}] launching the generated desktop shell '${binName}' ` +\n `(${tauri.via}: cargo tauri dev) — stack via ph run ${host.name}, ` +\n `window at http://127.0.0.1:${port}/`,\n );\n return shellHandle(spawnTauri(tauri, [\"dev\"], shellDir, envVars));\n }\n\n // external-project / external-env: a prebuilt or hand-maintained shell.\n const options = host.runner;\n const shell = resolveShell(ctx.projectRoot, options.shell, ctx.env);\n console.log(\n `[${host.name}] launching the desktop shell ` +\n `(${shell.exe ? shell.exe : \"pnpm tauri dev\"}) — stack via ` +\n `ph run ${host.name}, window at http://127.0.0.1:${port}/`,\n );\n return shellHandle(launchShell(shell, envVars, options.shell));\n}\n\n/** Forward `build` to members that export it (packaging builds what is\n * buildable — unlike the generic compound's uniform fail-loud forwarding). */\nasync function buildMembers(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<void> {\n for (const [name, wrapper] of Object.entries(host.children)) {\n const member = await loadHost(ctx.projectRoot, wrapper.host);\n const specifier = member.host.runner.module;\n const runner = await resolveRunnerModule(ctx.projectRoot, specifier);\n const validated = validateHost(\n runner,\n specifier,\n member.host,\n `hosts/${wrapper.host}/host.js`,\n // build is one-shot: it needs no other member's outputs, so a declared\n // $output stays a token (as in the generic compound).\n { tokens: \"allow\" },\n );\n if (typeof runner.build !== \"function\") {\n console.log(\n `[${host.name}] build: ${name} (${wrapper.host}) exports no build — skipped (packaging builds what is buildable)`,\n );\n continue;\n }\n const fn = getVerb(runner, specifier, \"build\");\n console.log(`[${host.name}] build → ${name} (${wrapper.host})`);\n await fn(validated, {\n ...ctx,\n verb: \"build\",\n parent: { host: host.name, verb: ctx.verb },\n });\n }\n}\n\n/** PH_DESKTOP_LOCAL_PACKAGES: tarballs to vendor in place of the registry's\n * (a machine path, so an env var rather than a host-file option). */\nfunction localPackagesDir(ctx: RunnerContext): string | undefined {\n const dir = ctx.env.PH_DESKTOP_LOCAL_PACKAGES;\n return dir ? path.resolve(ctx.projectRoot, dir) : undefined;\n}\n\n/** build = members' builds + the shippable stack + the native installer. */\nexport async function build(\n host: DesktopHost,\n ctx: RunnerContext,\n): Promise<void> {\n await buildMembers(host, ctx);\n\n const runnerOptions = host.runner;\n const mode = shellMode(host, ctx);\n const port = await connectPort(host, ctx);\n\n if (mode === \"generated\") {\n const hostDir = hostDirOf(host, ctx);\n const app = loadAppJson(hostDir);\n const { shellDir, binName, changed } = projectShell({\n hostDir,\n app,\n connectPort: port,\n });\n const tauri = preflightOrThrow(detectToolchain(ctx.projectRoot), host.name);\n provisionShell(shellDir, tauri, changed);\n\n console.log(`[${host.name}] staging the stack into ${shellDir}…`);\n const staged = bundleStack({\n projectRoot: ctx.projectRoot,\n shellProjectDir: shellDir,\n vendor: runnerOptions.vendorStack,\n phCliVersion: runnerOptions.phCliVersion,\n phCliSpec: runnerOptions.phCliSpec ?? ctx.env.PH_DESKTOP_PHCLI_SPEC,\n localPackagesDir: localPackagesDir(ctx),\n connectPort: port,\n // the generated shell lives under hosts/ — never stage it into itself\n excludeDirs: [shellDir],\n });\n console.log(\n `[${host.name}] stack staged at ${staged.stackDir}` +\n `${staged.vendored ? \" (ph-cli vendored)\" : \"\"}.`,\n );\n\n const bundles = tauriBundlesForHost();\n console.log(\n `[${host.name}] building '${binName}' (${tauri.via}: cargo tauri ` +\n `build --bundles ${bundles.join(\",\")})…`,\n );\n const result = spawnSyncTauri(\n tauri,\n [\"build\", \"--bundles\", bundles.join(\",\")],\n shellDir,\n );\n if (result !== 0) {\n throw new Error(\n `hosts/${host.name}: \\`cargo tauri build\\` failed (exit ${result}).`,\n );\n }\n console.log(\n `[${host.name}] desktop app built — installers under ` +\n `${path.join(shellDir, \"target\", \"release\", \"bundle\")}.`,\n );\n return;\n }\n\n // external-project / external-env: stage into the prebuilt shell (phase 6).\n if (mode === \"none\") {\n console.log(\n `[${host.name}] build: no shell configured — members built; shell ` +\n `packaging skipped (add ${APP_JSON_FILE} or set runner.shell.project).`,\n );\n return;\n }\n const shell = resolveShell(ctx.projectRoot, runnerOptions.shell, ctx.env);\n console.log(`[${host.name}] staging the stack into ${shell.projectDir}…`);\n const result = bundleStack({\n projectRoot: ctx.projectRoot,\n shellProjectDir: shell.projectDir,\n vendor: runnerOptions.vendorStack,\n phCliVersion: runnerOptions.phCliVersion,\n phCliSpec: runnerOptions.phCliSpec ?? ctx.env.PH_DESKTOP_PHCLI_SPEC,\n localPackagesDir: localPackagesDir(ctx),\n connectPort: port,\n });\n console.log(\n `[${host.name}] stack staged at ${result.stackDir}` +\n `${result.vendored ? \" (ph-cli vendored)\" : \"\"} — the shell runs it with ` +\n `no environment (resources fallback).`,\n );\n}\n\n/** Synchronous `<tauri> <subcommand>` — build blocks until the installer is\n * produced. Returns the exit code. */\nfunction spawnSyncTauri(\n tauri: TauriCommand,\n subcommand: string[],\n shellDir: string,\n): number {\n const { command, args, shell } = tauriSpawn(tauri, subcommand);\n const r = spawnSync(command, args, {\n cwd: shellDir,\n stdio: \"inherit\",\n shell,\n windowsHide: true,\n });\n return r.status ?? 1;\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@powerhousedao/desktop",
|
|
3
|
-
"version": "6.2.3-dev.
|
|
3
|
+
"version": "6.2.3-dev.80",
|
|
4
4
|
"description": "The desktop runner for uniform-runners hosts: the generic compound stack wrapped in a native shell — dev opens the window, build stages the shippable stack.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
"./package.json": "./package.json"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@powerhousedao/host-core": "6.2.3-dev.
|
|
34
|
-
"@powerhousedao/shared": "6.2.3-dev.
|
|
33
|
+
"@powerhousedao/host-core": "6.2.3-dev.80",
|
|
34
|
+
"@powerhousedao/shared": "6.2.3-dev.80",
|
|
35
35
|
"zod": "^4.5.4"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|