Skip to content

Commit 50191bc

Browse files
authored
fix(desktop): bundle embedded server in Electron app (anomalyco#1691)
Co-authored-by: src-opn <[email protected]>
1 parent 71c0b6e commit 50191bc

4 files changed

Lines changed: 20 additions & 10 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ _worktrees/
1919

2020
# Desktop sidecars
2121
apps/desktop/resources/sidecars/
22+
apps/desktop/server/
2223

2324
# Env
2425
.env

‎apps/desktop/electron-builder.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ directories:
1111
output: dist-electron
1212
files:
1313
- electron/**/*
14-
- from: ../server
15-
to: server
16-
filter:
17-
- dist/**/*
18-
- package.json
14+
- server/**/*
1915
- package.json
2016
extraResources:
2117
- from: ../app/dist

‎apps/desktop/electron/runtime.mjs‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,11 +1005,20 @@ export function createRuntimeManager({ app, desktopRoot, listLocalWorkspacePaths
10051005
Object.assign(process.env, serverEnv);
10061006

10071007
// One call: resolve config, spawn managed OpenCode, start HTTP server.
1008-
// Packaged: server/dist is a sibling of electron/ inside app.asar (../server/dist)
1009-
// Dev: server lives at ../../server/dist relative to apps/desktop/electron
1010-
const packagedPath = path.resolve(__runtimeDir, "..", "server", "dist", "embedded.js");
1008+
// Dev must prefer apps/server/dist; build output also stages a packaged
1009+
// copy under apps/desktop/server for electron-builder.
10111010
const devPath = path.resolve(__runtimeDir, "..", "..", "server", "dist", "embedded.js");
1012-
const embeddedPath = existsSync(packagedPath) ? packagedPath : devPath;
1011+
const packagedPaths = [
1012+
path.resolve(__runtimeDir, "..", "server", "dist", "embedded.js"),
1013+
...(process.resourcesPath ? [path.resolve(process.resourcesPath, "server", "dist", "embedded.js")] : []),
1014+
];
1015+
const candidates = process.env.OPENWORK_DEV_MODE === "1"
1016+
? [devPath, ...packagedPaths]
1017+
: [...packagedPaths, devPath];
1018+
const embeddedPath = candidates.find((candidate) => existsSync(candidate));
1019+
if (!embeddedPath) {
1020+
throw new Error(`Cannot find OpenWork embedded server bundle. Checked: ${candidates.join(", ")}`);
1021+
}
10131022
const { startEmbeddedServer } = await import(pathToFileURL(embeddedPath).href);
10141023
const handle = await startEmbeddedServer({
10151024
host,

‎apps/desktop/scripts/electron-build.mjs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { spawnSync } from "node:child_process";
2-
import { copyFileSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
2+
import { copyFileSync, cpSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
33
import { dirname, resolve } from "node:path";
44
import { fileURLToPath } from "node:url";
55

@@ -8,6 +8,7 @@ const desktopRoot = resolve(__dirname, "..");
88
const repoRoot = resolve(desktopRoot, "../..");
99
const electronSidecarDir = resolve(desktopRoot, "resources", "sidecars");
1010
const electronRoot = resolve(desktopRoot, "electron");
11+
const packagedServerRoot = resolve(desktopRoot, "server");
1112

1213
const pnpmCmd = process.platform === "win32" ? "pnpm.cmd" : "pnpm";
1314
const nodeCmd = process.execPath;
@@ -47,6 +48,9 @@ const patched = serverJsSrc.replace(
4748
if (patched !== serverJsSrc) {
4849
writeFileSync(serverJsPath, patched, "utf8");
4950
}
51+
rmSync(packagedServerRoot, { recursive: true, force: true });
52+
cpSync(serverDistDir, resolve(packagedServerRoot, "dist"), { recursive: true });
53+
copyFileSync(resolve(repoRoot, "apps", "server", "package.json"), resolve(packagedServerRoot, "package.json"));
5054
for (const fileName of readdirSync(electronRoot).filter((name) => name.endsWith(".mjs")).sort()) {
5155
run(nodeCmd, ["--check", resolve(electronRoot, fileName)], repoRoot);
5256
}

0 commit comments

Comments
 (0)