portholejs 0.1.0 → 0.2.0

package/dist/recording.js

@@ -0,0 +1,132 @@
+import { writeFile } from "node:fs/promises";
+import WebSocket from "ws";
+import { decodeVideoPacket } from "./protocol.js";
+import { discoverSession } from "./control-client.js";
+import { createMp4 } from "./mp4-writer.js";
+export async function recordSession(opts) {
+    const session = await discoverSession(opts);
+    const health = await fetchHealth(session.url, session.serial);
+    const url = websocketUrl(session.url, session.serial);
+    const recorder = new H264Recorder(health.width, health.height);
+    const startedAt = Date.now();
+    await new Promise((resolve, reject) => {
+        const ws = new WebSocket(url);
+        let done = false;
+        const finish = () => {
+            if (done)
+                return;
+            done = true;
+            ws.close();
+            resolve();
+        };
+        const fail = (error) => {
+            if (done)
+                return;
+            done = true;
+            ws.close();
+            reject(error);
+        };
+        const timeout = opts.durationMs === undefined ? undefined : setTimeout(finish, opts.durationMs);
+        ws.on("message", (data) => {
+            const buffer = data instanceof Buffer ? data : Buffer.from(data);
+            recorder.addPacket(buffer);
+        });
+        ws.on("error", fail);
+        ws.on("close", () => {
+            if (timeout)
+                clearTimeout(timeout);
+            if (!done && opts.durationMs === undefined)
+                resolve();
+        });
+        process.once("SIGINT", finish);
+    });
+    const durationMs = Date.now() - startedAt;
+    const mp4 = recorder.finalize(durationMs);
+    await writeFile(opts.output, mp4);
+    return {
+        ok: true,
+        path: opts.output,
+        samples: recorder.sampleCount,
+        durationMs,
+    };
+}
+export class H264Recorder {
+    width;
+    height;
+    #config = null;
+    #samples = [];
+    #started = false;
+    constructor(width, height) {
+        this.width = width;
+        this.height = height;
+    }
+    get sampleCount() {
+        return this.#samples.length;
+    }
+    addPacket(data) {
+        const packet = decodeVideoPacket(data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength));
+        if (packet.type === "config") {
+            this.#config = packet.data;
+            return;
+        }
+        const keyframe = packet.type === "key" || hasIdrNal(packet.data);
+        if (!this.#started) {
+            if (!keyframe)
+                return;
+            this.#started = true;
+        }
+        this.#samples.push({
+            data: packet.data,
+            timestamp: packet.timestamp || this.#samples.length * 33_333,
+            keyframe,
+        });
+    }
+    finalize(durationMs) {
+        if (!this.#config)
+            throw new Error("Recording did not receive H.264 config data.");
+        if (this.#samples.length === 0)
+            throw new Error("Recording did not receive a keyframe.");
+        return createMp4({
+            width: this.width,
+            height: this.height,
+            durationMs,
+            config: this.#config,
+            samples: this.#samples,
+        });
+    }
+}
+async function fetchHealth(sessionUrl, deviceId) {
+    const url = new URL(sessionUrl);
+    url.pathname = "/health";
+    url.searchParams.set("device", deviceId);
+    const response = await fetch(url);
+    if (!response.ok)
+        throw new Error(`Unable to read session health: ${response.status}`);
+    const body = (await response.json());
+    if (!body.width || !body.height)
+        throw new Error("Session health does not include video dimensions.");
+    return { width: body.width, height: body.height };
+}
+function websocketUrl(sessionUrl, deviceId) {
+    const url = new URL(sessionUrl);
+    url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+    url.pathname = "/ws";
+    url.searchParams.set("device", deviceId);
+    return url.toString();
+}
+function hasIdrNal(data) {
+    for (let i = 0; i < data.length - 4; i++) {
+        if (data[i] === 0 && data[i + 1] === 0) {
+            let offset = i + 2;
+            if (data[offset] === 0)
+                offset++;
+            if (data[offset] === 1) {
+                const nalByte = data[offset + 1];
+                if (nalByte !== undefined && (nalByte & 0x1f) === 5)
+                    return true;
+            }
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=recording.js.map

package/dist/recording.js.map

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

package/dist/screen-diff.d.ts

@@ -0,0 +1,21 @@
+export interface DiffRegion {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
+export interface ScreenDiffOptions {
+    thresholdRatio?: number;
+    region?: DiffRegion;
+    pixelThreshold?: number;
+}
+export interface ScreenDiffResult {
+    ok: boolean;
+    mismatchRatio: number;
+    mismatchPixels: number;
+    comparedPixels: number;
+    diffPng?: Uint8Array;
+}
+export declare function comparePngScreens(baselinePng: Uint8Array, currentPng: Uint8Array, opts?: ScreenDiffOptions): ScreenDiffResult;
+export declare function parseDiffRegion(value: string): DiffRegion;
+//# sourceMappingURL=screen-diff.d.ts.map

package/dist/screen-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"screen-diff.d.ts","sourceRoot":"","sources":["../src/screen-diff.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,UAAU;IACzB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,UAAU,EACtB,IAAI,GAAE,iBAAsB,GAC3B,gBAAgB,CAiClB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAqBzD"}

package/dist/screen-diff.js

@@ -0,0 +1,70 @@
+import { PNG } from "pngjs";
+import pixelmatch from "pixelmatch";
+export function comparePngScreens(baselinePng, currentPng, opts = {}) {
+    const baseline = PNG.sync.read(Buffer.from(baselinePng));
+    const current = PNG.sync.read(Buffer.from(currentPng));
+    if (baseline.width !== current.width || baseline.height !== current.height) {
+        throw new Error(`Screenshot dimensions differ: baseline ${baseline.width}x${baseline.height}, current ${current.width}x${current.height}.`);
+    }
+    const region = normalizeRegion(opts.region, baseline.width, baseline.height);
+    const baselineData = region
+        ? cropRgba(baseline.data, baseline.width, region)
+        : baseline.data;
+    const currentData = region
+        ? cropRgba(current.data, current.width, region)
+        : current.data;
+    const width = region?.width ?? baseline.width;
+    const height = region?.height ?? baseline.height;
+    const diff = new PNG({ width, height });
+    const mismatchPixels = pixelmatch(baselineData, currentData, diff.data, width, height, {
+        threshold: opts.pixelThreshold ?? 0.1,
+    });
+    const comparedPixels = width * height;
+    const mismatchRatio = comparedPixels === 0 ? 0 : mismatchPixels / comparedPixels;
+    const thresholdRatio = opts.thresholdRatio ?? 0.02;
+    return {
+        ok: mismatchRatio <= thresholdRatio,
+        mismatchRatio,
+        mismatchPixels,
+        comparedPixels,
+        diffPng: PNG.sync.write(diff),
+    };
+}
+export function parseDiffRegion(value) {
+    const parts = value.split(",").map((part) => Number(part.trim()));
+    const [x, y, width, height] = parts;
+    if (parts.length !== 4 ||
+        x === undefined ||
+        y === undefined ||
+        width === undefined ||
+        height === undefined ||
+        parts.some((part) => !Number.isInteger(part) || part < 0) ||
+        width === 0 ||
+        height === 0) {
+        throw new Error("Region must be x,y,w,h using positive integer width/height.");
+    }
+    return {
+        x,
+        y,
+        width,
+        height,
+    };
+}
+function normalizeRegion(region, imageWidth, imageHeight) {
+    if (!region)
+        return undefined;
+    if (region.x + region.width > imageWidth || region.y + region.height > imageHeight) {
+        throw new Error(`Region ${region.x},${region.y},${region.width},${region.height} exceeds screenshot ${imageWidth}x${imageHeight}.`);
+    }
+    return region;
+}
+function cropRgba(data, sourceWidth, region) {
+    const result = new Uint8Array(region.width * region.height * 4);
+    for (let y = 0; y < region.height; y++) {
+        const sourceStart = ((region.y + y) * sourceWidth + region.x) * 4;
+        const sourceEnd = sourceStart + region.width * 4;
+        result.set(data.subarray(sourceStart, sourceEnd), y * region.width * 4);
+    }
+    return result;
+}
+//# sourceMappingURL=screen-diff.js.map

package/dist/screen-diff.js.map

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

package/dist/server/http.d.ts

@@ -6,12 +6,13 @@ export interface HttpServerOptions {
     port: number;
     host: string;
     clientDir: string;
-    getEngine: () => Engine | null;
-    getDevice?: () => DeviceInfo;
-    handleInput?: (event: InputEvent) => Promise<void>;
+    getEngine: (deviceId?: string) => Engine | null;
+    getDevice?: (deviceId?: string) => DeviceInfo | undefined;
+    getDevices?: () => DeviceInfo[];
+    handleInput?: (event: InputEvent, deviceId?: string) => Promise<void>;
     token?: string;
     forceMjpeg?: boolean;
-    getStatus?: () => "waiting" | "ok" | "reconnecting" | "dead";
+    getStatus?: (deviceId?: string) => "waiting" | "ok" | "reconnecting" | "dead";
 }
 export declare function createHttpServer(opts: HttpServerOptions): {
     server: import("node:http").Server<typeof IncomingMessage, typeof ServerResponse>;

package/dist/server/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAOpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAmBvD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,UAAU,CAAC;IAC7B,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,SAAS,GAAG,IAAI,GAAG,cAAc,GAAG,MAAM,CAAC;CAC9D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB;;;EAgavD"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAOpF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAoBvD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAChD,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,UAAU,GAAG,SAAS,CAAC;IAC1D,UAAU,CAAC,EAAE,MAAM,UAAU,EAAE,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,SAAS,GAAG,IAAI,GAAG,cAAc,GAAG,MAAM,CAAC;CAC/E;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB;;;EA0gBvD"}

package/dist/server/http.js

@@ -6,11 +6,13 @@ import { promisify } from "node:util";
 import { readFile, rm, stat, writeFile } from "node:fs/promises";
 import { adbBin, findAndroidSdk, listDevices } from "../device-manager.js";
 import { assertInputAllowed, parseInputEvent } from "../input-validation.js";
+import { sendGesture } from "../gesture.js";
 import { readState } from "../state.js";
 import { MjpegPoller } from "./mjpeg.js";
 import { clearApp, openUrl, stopApp } from "../adb-actions.js";
 import { parseCrashes } from "../crashes.js";
 import { dumpUi, findElement, getFocusedNode, waitForUiText } from "../ui-tree.js";
+import { focusOn } from "../focus-navigation.js";
 const execFileAsync = promisify(execFile);
 const MIME_TYPES = {
     ".html": "text/html",
@@ -22,11 +24,12 @@ const MIME_TYPES = {
     ".ico": "image/x-icon",
 };
 export function createHttpServer(opts) {
-    const { port, host, clientDir, getEngine, getDevice, handleInput, token, forceMjpeg, getStatus, } = opts;
-    const mjpegPoller = new MjpegPoller(getEngine);
+    const { port, host, clientDir, getEngine, getDevice, getDevices, handleInput, token, forceMjpeg, getStatus, } = opts;
+    const mjpegPollers = new Map();
     const server = createServer(async (req, res) => {
         const parsedUrl = new URL(req.url ?? "/", `http://${req.headers.host ?? host}`);
         const url = parsedUrl.pathname;
+        const deviceId = parsedUrl.searchParams.get("device") ?? undefined;
         const authorized = isAuthorized(req, parsedUrl, token);
         if (!authorized) {
             await sendJson(res, 401, { ok: false, error: "Porthole token required." });
@@ -37,12 +40,12 @@ export function createHttpServer(opts) {
             res.setHeader("Set-Cookie", `porthole_token=${token}; Path=/; SameSite=Lax`);
         }
         if (url === "/health") {
-            const engine = getEngine();
+            const engine = getEngine(deviceId);
             if (engine?.metadata) {
                 res.writeHead(200, { "Content-Type": "application/json" });
                 res.end(JSON.stringify({
-                    status: getStatus?.() ?? "ok",
-                    device: getDevice?.(),
+                    status: getStatus?.(deviceId) ?? "ok",
+                    device: getDevice?.(deviceId),
                     videoModes: ["webcodecs", "mjpeg"],
                     preferredVideoMode: forceMjpeg ? "mjpeg" : "webcodecs",
                     ...engine.metadata,
@@ -50,22 +53,28 @@ export function createHttpServer(opts) {
             }
             else {
                 res.writeHead(503, { "Content-Type": "application/json" });
-                res.end(JSON.stringify({ status: getStatus?.() ?? "waiting" }));
+                res.end(JSON.stringify({ status: getStatus?.(deviceId) ?? "waiting" }));
             }
             return;
         }
         if (url === "/stream.mjpeg" && req.method === "GET") {
-            const engine = getEngine();
+            const engine = getEngine(deviceId);
             if (!engine) {
                 res.writeHead(503, { "Content-Type": "text/plain" });
                 res.end("No engine");
                 return;
             }
-            mjpegPoller.addClient(res);
+            const pollerKey = deviceId ?? getDevice?.()?.serial ?? "default";
+            let poller = mjpegPollers.get(pollerKey);
+            if (!poller) {
+                poller = new MjpegPoller(() => getEngine(deviceId));
+                mjpegPollers.set(pollerKey, poller);
+            }
+            poller.addClient(res);
             return;
         }
         if (url === "/screenshot") {
-            const engine = getEngine();
+            const engine = getEngine(deviceId);
             if (!engine) {
                 res.writeHead(503);
                 res.end("No engine");
@@ -86,19 +95,20 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/devices" && req.method === "GET") {
-            await sendJson(res, 200, await listDevices());
+            await sendJson(res, 200, getDevices?.() ?? (await listDevices()));
             return;
         }
         if (url === "/api/state" && req.method === "GET") {
             await sendJson(res, 200, {
-                device: getDevice?.() ?? null,
-                engine: getEngine()?.metadata ?? null,
+                device: getDevice?.(deviceId) ?? null,
+                devices: getDevices?.() ?? [],
+                engine: getEngine(deviceId)?.metadata ?? null,
                 state: await readState(),
             });
             return;
         }
         if (url === "/api/input" && req.method === "POST") {
-            const device = getDevice?.();
+            const device = getDevice?.(deviceId);
             if (!device) {
                 await sendJson(res, 503, { ok: false, error: "No active device." });
                 return;
@@ -106,12 +116,17 @@ export function createHttpServer(opts) {
             try {
                 const event = parseInputEvent(await readJson(req));
                 assertInputAllowed(device.profile, event);
-                const engine = getEngine();
+                const engine = getEngine(deviceId);
                 if (!handleInput && !engine) {
                     throw new Error("No active engine.");
                 }
                 if (handleInput) {
-                    await handleInput(event);
+                    await handleInput(event, deviceId);
+                }
+                else if (event.kind === "gesture") {
+                    if (!engine)
+                        throw new Error("No active engine.");
+                    await sendGesture(event, (touch) => engine.sendInput(touch));
                 }
                 else {
                     await engine?.sendInput(event);
@@ -124,7 +139,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/logcat" && req.method === "GET") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const lines = parsedUrl.searchParams.get("lines") ?? "100";
                 const filter = parsedUrl.searchParams.get("filter");
                 const args = ["-s", serial, "logcat", "-d", "-t", lines];
@@ -138,7 +153,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/crashes" && req.method === "GET") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const { stdout } = await execFileAsync(adbBin(findAndroidSdk()), [
                     "-s",
                     serial,
@@ -152,7 +167,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/ui" && req.method === "GET") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 await sendJson(res, 200, {
                     ok: true,
                     tree: await dumpUi(serial, parsedUrl.searchParams.get("filter") ?? undefined),
@@ -161,13 +176,36 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/focused" && req.method === "GET") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 await sendJson(res, 200, { ok: true, node: await getFocusedNode(serial) });
             });
             return;
         }
+        if (url === "/api/focus_on" && req.method === "POST") {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
+                const body = (await readJson(req));
+                const text = typeof body.text === "string" ? body.text : undefined;
+                const resourceId = typeof body.resourceId === "string" ? body.resourceId : undefined;
+                const contentDesc = typeof body.contentDesc === "string" ? body.contentDesc : undefined;
+                if (!text && !resourceId && !contentDesc) {
+                    throw new Error("text, resourceId, or contentDesc is required.");
+                }
+                const maxSteps = typeof body.maxSteps === "number" && Number.isInteger(body.maxSteps)
+                    ? body.maxSteps
+                    : undefined;
+                const result = await focusOn(serial, { text, resourceId, contentDesc }, async (button) => {
+                    const event = { kind: "remote", button };
+                    if (handleInput)
+                        await handleInput(event, deviceId);
+                    else
+                        await getEngine(deviceId)?.sendInput(event);
+                }, { select: body.select === true, maxSteps });
+                await sendJson(res, 200, { ok: true, result });
+            });
+            return;
+        }
         if (url === "/api/find" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial, device) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial, device) => {
                 const body = (await readJson(req));
                 const text = typeof body.text === "string" ? body.text : undefined;
                 const resourceId = typeof body.resourceId === "string" ? body.resourceId : undefined;
@@ -179,7 +217,7 @@ export function createHttpServer(opts) {
                     if (!node.normalizedCenter) {
                         throw new Error("Could not determine display size from the UI dump.");
                     }
-                    const engine = getEngine();
+                    const engine = getEngine(deviceId);
                     await engine?.sendInput({
                         kind: "touch",
                         phase: "down",
@@ -196,7 +234,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/wait_for" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const body = (await readJson(req));
                 if (typeof body.text !== "string")
                     throw new Error("text is required.");
@@ -209,7 +247,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/open_url" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const body = (await readJson(req));
                 if (typeof body.url !== "string")
                     throw new Error("url is required.");
@@ -221,7 +259,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/stop_app" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const body = (await readJson(req));
                 if (typeof body.packageName !== "string") {
                     throw new Error("packageName is required.");
@@ -232,7 +270,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/clear_app" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const body = (await readJson(req));
                 if (typeof body.packageName !== "string") {
                     throw new Error("packageName is required.");
@@ -243,7 +281,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/apps" && req.method === "GET") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const { stdout } = await execFileAsync(adbBin(findAndroidSdk()), [
                     "-s",
                     serial,
@@ -261,7 +299,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/launch" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const body = (await readJson(req));
                 if (typeof body.packageName !== "string") {
                     throw new Error("packageName is required.");
@@ -280,7 +318,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/rotate" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial, device) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial, device) => {
                 if (device.profile === "tv") {
                     throw new Error("Rotation controls are only available for phone profiles.");
                 }
@@ -313,7 +351,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/emu" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const body = (await readJson(req));
                 if (!Array.isArray(body.args) ||
                     !body.args.every((arg) => typeof arg === "string")) {
@@ -330,7 +368,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/install" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const filename = sanitizeFilename(req.headers["x-porthole-filename"] ?? "drop.apk");
                 if (!filename.endsWith(".apk")) {
                     throw new Error("Only .apk files can be installed.");
@@ -355,7 +393,7 @@ export function createHttpServer(opts) {
             return;
         }
         if (url === "/api/push" && req.method === "POST") {
-            await withSerial(res, getDevice, async (serial) => {
+            await withSerial(res, () => getDevice?.(deviceId), async (serial) => {
                 const filename = sanitizeFilename(req.headers["x-porthole-filename"] ?? "porthole-drop");
                 const file = await readBytes(req);
                 const tmpPath = join(tmpdir(), `porthole-${process.pid}-${Date.now()}-${filename}`);