Skip to content

Resolve the plugin root from sim-host.mjs, not by counting ../ from the bundle #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhiyaancnirmal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolve the plugin root from sim-host.mjs, not by counting ../ from the bundle #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/sim/wire.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* `safely`, and every fire-and-forget through `detach`.
*/
import type { BbPluginApi } from "@get-bb/plugin-sdk";
import { isAbsolute, join, relative, resolve, sep } from "node:path";
import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
import { tmpdir } from "node:os";

import { rpcContract } from "./contract.js";
Expand Down Expand Up @@ -167,9 +167,15 @@ export async function installSimulators(bb: BbPluginApi, host: SimulatorHost): P
// Probed on first use, not at load: the probes cost a few seconds of child
// processes and nothing needs them until someone opens the doctor. Memoized
// on the in-flight promise so two panels mounting together share one sweep.
// Two above `src/sim/`, so this is the plugin root either way — bundled at
// `dist/server.js` or evaluated from source.
const preflightDeps = defaultDeps(new URL("../../", import.meta.url).pathname);
//
// The plugin root is wherever `sim-host.mjs` lives: `resolveSimHostPath`
// already knows both layouts. Counting `../` from `import.meta.url` does not
// — two above `src/sim/wire.ts` is the root, but two above `dist/server.js`
// is the directory *containing* a git install, where there is no
// `node_modules`, and the doctor then reports serve-sim as not installed on
// a machine where it is.
const simHost = resolveSimHostPath(import.meta.url);
const preflightDeps = defaultDeps(dirname(simHost.path));
let preflight: Promise<Preflight> | null = null;
const getPreflight = (): Promise<Preflight> => {
preflight ??= runPreflight(preflightDeps);
Expand Down Expand Up @@ -203,7 +209,6 @@ export async function installSimulators(bb: BbPluginApi, host: SimulatorHost): P
// ---------------------------------------------------------------------------

const driver = new DeviceDriver();
const simHost = resolveSimHostPath(import.meta.url);
log("info", `capture host at ${simHost.path}`);
const live = new LiveService({
driver,
Expand Down