fix(targets): cancel startup and probe PE offsets

This commit is contained in:
morluto
2026-07-12 09:05:16 +08:00
parent 15e8cf3234
commit 66b8d6ea90
5 changed files with 182 additions and 39 deletions
+35 -10
View File
@@ -4,7 +4,7 @@ import { chmod, writeFile } from "node:fs/promises";
import { basename, dirname, extname, join } from "node:path";
import { promisify } from "node:util";
import { HopperStartError } from "../domain/errors.js";
import { HopperCancelledError, HopperStartError } from "../domain/errors.js";
import { err, ok, type Result } from "../domain/result.js";
const execFileAsync = promisify(execFile);
@@ -27,7 +27,8 @@ export interface BridgeLaunch {
export interface BridgeLauncher {
launch(
session: BridgeSession,
): Promise<Result<BridgeLaunch, HopperStartError>>;
options?: { readonly signal?: AbortSignal },
): Promise<Result<BridgeLaunch, HopperStartError | HopperCancelledError>>;
}
export interface HopperApplicationLauncherOptions {
@@ -56,7 +57,8 @@ export class HopperApplicationLauncher implements BridgeLauncher {
async launch(
session: BridgeSession,
): Promise<Result<BridgeLaunch, HopperStartError>> {
options: { readonly signal?: AbortSignal } = {},
): Promise<Result<BridgeLaunch, HopperStartError | HopperCancelledError>> {
const bootstrapPath = `${session.directory}/bootstrap.py`;
const source = [
`REA_SOCKET = ${JSON.stringify(session.socketPath)}`,
@@ -82,7 +84,13 @@ export class HopperApplicationLauncher implements BridgeLauncher {
this.options.targetPath,
];
try {
await prepareHopperApplication(this.options.launcherPath);
if (options.signal?.aborted === true)
return err(new HopperCancelledError());
const prepared = await prepareHopperApplication(
this.options.launcherPath,
options.signal,
);
if (!prepared) return err(new HopperCancelledError());
const child = spawn(this.options.launcherPath, args, {
stdio: ["ignore", "ignore", "pipe"],
});
@@ -110,11 +118,12 @@ export class HopperApplicationLauncher implements BridgeLauncher {
const prepareHopperApplication = async (
launcherPath: string,
): Promise<void> => {
signal?: AbortSignal,
): Promise<boolean> => {
const appBundle = hopperApplicationBundle(launcherPath);
if (appBundle === undefined) return;
if (appBundle === undefined) return signal?.aborted !== true;
const executablePath = join(appBundle, "Contents/MacOS/Hopper Disassembler");
if (await processIsRunning(executablePath)) return;
if (await processIsRunning(executablePath)) return signal?.aborted !== true;
// This reduces activation when Hopper is cold, but the vendor launcher that
// follows may still activate its window. See HopperApplicationLauncher.
await execFileAsync("/usr/bin/open", [
@@ -123,9 +132,25 @@ const prepareHopperApplication = async (
"-a",
appBundle,
]);
await new Promise((resolve) =>
setTimeout(resolve, HOPPER_BACKGROUND_STARTUP_MS),
);
return waitForDelay(HOPPER_BACKGROUND_STARTUP_MS, signal);
};
const waitForDelay = (
milliseconds: number,
signal?: AbortSignal,
): Promise<boolean> => {
if (signal?.aborted === true) return Promise.resolve(false);
return new Promise((resolve) => {
const timer = setTimeout(() => {
signal?.removeEventListener("abort", onAbort);
resolve(true);
}, milliseconds);
const onAbort = (): void => {
clearTimeout(timer);
resolve(false);
};
signal?.addEventListener("abort", onAbort, { once: true });
});
};
const hopperApplicationBundle = (launcherPath: string): string | undefined => {
+44 -13
View File
@@ -81,12 +81,15 @@ export class HopperClient {
}
/** Launch the bridge once and complete its authenticated health handshake. */
start(): Promise<Result<HopperServerInfo, HopperError>> {
this.#startPromise ??= this.#start();
start(signal?: AbortSignal): Promise<Result<HopperServerInfo, HopperError>> {
this.#startPromise ??= this.#start(signal);
return this.#startPromise;
}
async #start(): Promise<Result<HopperServerInfo, HopperError>> {
async #start(
signal?: AbortSignal,
): Promise<Result<HopperServerInfo, HopperError>> {
if (signal?.aborted === true) return err(new HopperCancelledError());
if (this.#socket !== undefined || this.#directory !== undefined) {
return err(new HopperProtocolError("Hopper client is already started"));
}
@@ -97,18 +100,21 @@ export class HopperClient {
}
const socketPath = join(this.#directory, "bridge.sock");
this.#token = randomBytes(32).toString("hex");
const launched = await this.#options.launcher.launch({
directory: this.#directory,
socketPath,
token: this.#token,
});
const launched = await this.#options.launcher.launch(
{
directory: this.#directory,
socketPath,
token: this.#token,
},
signal === undefined ? {} : { signal },
);
if (!launched.ok) {
await this.close();
return launched;
}
this.#launch = launched.value;
this.#attachLauncher(launched.value);
const connected = await this.#connect(socketPath);
const connected = await this.#connect(socketPath, signal);
if (!connected.ok) {
await this.close();
return connected;
@@ -118,6 +124,7 @@ export class HopperClient {
{},
{
timeoutMs: this.#options.startupTimeoutMs,
...(signal === undefined ? {} : { signal }),
},
);
if (!health.ok) {
@@ -138,7 +145,7 @@ export class HopperClient {
readonly timeoutMs?: number;
} = {},
): Promise<Result<JsonValue, HopperError>> {
const started = await this.start();
const started = await this.start(options.signal);
if (!started.ok) return started;
return this.#request(name, arguments_, options);
}
@@ -177,14 +184,19 @@ export class HopperClient {
}
}
async #connect(socketPath: string): Promise<Result<undefined, HopperError>> {
async #connect(
socketPath: string,
signal?: AbortSignal,
): Promise<Result<undefined, HopperError>> {
const deadline = Date.now() + this.#options.startupTimeoutMs;
while (Date.now() < deadline) {
if (signal?.aborted === true) return err(new HopperCancelledError());
if (this.#closing) return err(new HopperProcessError(null));
try {
await access(socketPath);
} catch {
await new Promise((resolve) => setTimeout(resolve, 50));
if (!(await waitForDelay(50, signal)))
return err(new HopperCancelledError());
continue;
}
const attempt = await connectOnce(socketPath);
@@ -193,7 +205,8 @@ export class HopperClient {
this.#attachSocket(attempt.value);
return ok(undefined);
}
await new Promise((resolve) => setTimeout(resolve, 50));
if (!(await waitForDelay(50, signal)))
return err(new HopperCancelledError());
}
return err(new HopperTimeoutError(this.#options.startupTimeoutMs));
}
@@ -329,6 +342,24 @@ export class HopperClient {
}
}
const waitForDelay = (
milliseconds: number,
signal?: AbortSignal,
): Promise<boolean> => {
if (signal?.aborted === true) return Promise.resolve(false);
return new Promise((resolve) => {
const timer = setTimeout(() => {
signal?.removeEventListener("abort", onAbort);
resolve(true);
}, milliseconds);
const onAbort = (): void => {
clearTimeout(timer);
resolve(false);
};
signal?.addEventListener("abort", onAbort, { once: true });
});
};
const connectOnce = async (
socketPath: string,
): Promise<Result<Socket, HopperStartError>> =>