Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 14 additions & 1 deletion src/server/environments/browser-service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ test("reuses protected coordinates but admits every HTTP and WebSocket request",
},
} as unknown as EnvironmentRuntimeAccessService;
const runtime = {
async isEnvironmentBrowserTakeoverAvailable() {
return true;
},
async ensureEnvironmentBrowserService(
runtime: EnvironmentRuntimeRecord,
restart = false,
Expand All @@ -65,6 +68,16 @@ test("reuses protected coordinates but admits every HTTP and WebSocket request",
} as unknown as RuntimeAdapter;
const service = new EnvironmentBrowserService(runtimeAccess, runtime);

assert.deepEqual(
await service.control("user-browser", runtimeRecord.id),
{
owner: "agent",
transport: "playwright",
revision: 0,
takeoverAvailable: true,
},
);

assert.deepEqual(
await service.httpUpstream(
"user-browser",
Expand Down Expand Up @@ -101,7 +114,7 @@ test("reuses protected coordinates but admits every HTTP and WebSocket request",
headers: { "X-Sandpi-Browser-Proxy": "secret" },
},
);
assert.equal(admissions, 4);
assert.equal(admissions, 6);
assert.equal(dashboardEnsures, 1);
assert.deepEqual(dashboardRestarts, [false]);
});
Expand Down
18 changes: 15 additions & 3 deletions src/server/environments/browser-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export class EnvironmentBrowserService {
ownership.owner === "human"
? this.cacheTakeoverCapability(runtime, true)
: await this.takeoverCapabilityForRuntime(runtime);
return { ...ownership, takeoverAvailable };
return publicBrowserControl(ownership, takeoverAvailable);
},
);
this.invalidateControlState(environmentId);
Expand All @@ -220,7 +220,7 @@ export class EnvironmentBrowserService {
ownership: EnvironmentBrowserOwnership,
): Promise<EnvironmentBrowserControl> {
if (ownership.owner === "human") {
return { ...ownership, takeoverAvailable: true };
return publicBrowserControl(ownership, true);
}
const takeoverAvailable = await this.serializeServiceOperation(
environmentId,
Expand All @@ -231,7 +231,7 @@ export class EnvironmentBrowserService {
(runtime) => this.takeoverCapabilityForRuntime(runtime),
),
);
return { ...ownership, takeoverAvailable };
return publicBrowserControl(ownership, takeoverAvailable);
}

private async takeoverCapabilityForRuntime(
Expand Down Expand Up @@ -471,6 +471,18 @@ export class EnvironmentBrowserService {
}
}

function publicBrowserControl(
ownership: EnvironmentBrowserOwnership,
takeoverAvailable: boolean,
): EnvironmentBrowserControl {
return {
owner: ownership.owner,
transport: ownership.transport,
revision: ownership.revision,
takeoverAvailable,
};
}

function sameViewport(
left: BrowserDashboardViewport | undefined,
right: BrowserDashboardViewport,
Expand Down