Skip to content
Open
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
148 changes: 0 additions & 148 deletions packages/daemon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,58 +36,6 @@
"types": "./src/index.ts",
"default": "./src/index.ts"
},
"./testing/__tests__/android-observation-fixture": {
"types": "./src/__tests__/support/android-observation-fixture.ts",
"default": "./src/__tests__/support/android-observation-fixture.ts"
},
"./testing/__tests__/application-lifecycle-runtime-fixture": {
"types": "./src/__tests__/support/application-lifecycle-runtime-fixture.ts",
"default": "./src/__tests__/support/application-lifecycle-runtime-fixture.ts"
},
"./testing/__tests__/capture-disclosure-target-activation-fact": {
"types": "./src/core/__tests__/capture-disclosure-target-activation-fact.ts",
"default": "./src/core/__tests__/capture-disclosure-target-activation-fact.ts"
},
"./testing/__tests__/interaction-get-runtime-fixture": {
"types": "./src/execution/__tests__/interaction-get-runtime-fixture.ts",
"default": "./src/execution/__tests__/interaction-get-runtime-fixture.ts"
},
"./testing/__tests__/legacy-snapshot-capture-fixture": {
"types": "./src/__tests__/support/legacy-snapshot-capture-fixture.ts",
"default": "./src/__tests__/support/legacy-snapshot-capture-fixture.ts"
},
"./testing/__tests__/request-router-dispatch-mocks": {
"types": "./src/__tests__/support/request-router-dispatch-mocks.ts",
"default": "./src/__tests__/support/request-router-dispatch-mocks.ts"
},
"./testing/__tests__/request-router-open-harness": {
"types": "./src/server/__tests__/request-router-open-harness.ts",
"default": "./src/server/__tests__/request-router-open-harness.ts"
},
"./testing/__tests__/runtime-binding-conformance": {
"types": "./src/__tests__/support/runtime-binding-conformance.ts",
"default": "./src/__tests__/support/runtime-binding-conformance.ts"
},
"./testing/__tests__/screenshot-runtime-fixture": {
"types": "./src/__tests__/support/screenshot-runtime-fixture.ts",
"default": "./src/__tests__/support/screenshot-runtime-fixture.ts"
},
"./testing/__tests__/selector-capture-fixture": {
"types": "./src/__tests__/support/selector-capture-fixture.ts",
"default": "./src/__tests__/support/selector-capture-fixture.ts"
},
"./testing/__tests__/snapshot-runtime-fixture": {
"types": "./src/__tests__/support/snapshot-runtime-fixture.ts",
"default": "./src/__tests__/support/snapshot-runtime-fixture.ts"
},
"./testing/__tests__/support/command-surface-fake": {
"types": "./src/__tests__/support/command-surface-fake.ts",
"default": "./src/__tests__/support/command-surface-fake.ts"
},
"./testing/__tests__/support/screen-recording-live-handle": {
"types": "./src/__tests__/support/screen-recording-live-handle.ts",
"default": "./src/__tests__/support/screen-recording-live-handle.ts"
},
"./testing/__tests__/support/session-factories": {
"types": "./src/__tests__/support/session-factories.ts",
"default": "./src/__tests__/support/session-factories.ts"
Expand All @@ -100,26 +48,10 @@
"types": "./src/__tests__/support/unavailable-device-runtime-gateway.ts",
"default": "./src/__tests__/support/unavailable-device-runtime-gateway.ts"
},
"./testing/__tests__/test-device-runtime-gateway": {
"types": "./src/__tests__/support/test-device-runtime-gateway.ts",
"default": "./src/__tests__/support/test-device-runtime-gateway.ts"
},
"./testing/android-system-dialog": {
"types": "./src/execution/android-system-dialog.ts",
"default": "./src/execution/android-system-dialog.ts"
},
"./testing/app-events": {
"types": "./src/execution/app-events.ts",
"default": "./src/execution/app-events.ts"
},
"./testing/artifact-tracking": {
"types": "./src/resources/artifact-tracking.ts",
"default": "./src/resources/artifact-tracking.ts"
},
"./testing/capture-disclosure": {
"types": "./src/core/capture-disclosure.ts",
"default": "./src/core/capture-disclosure.ts"
},
"./testing/context": {
"types": "./src/core/context.ts",
"default": "./src/core/context.ts"
Expand All @@ -128,42 +60,18 @@
"types": "./src/core/daemon-command-registry.ts",
"default": "./src/core/daemon-command-registry.ts"
},
"./testing/deferred-interaction-outcome": {
"types": "./src/core/deferred-interaction-outcome.ts",
"default": "./src/core/deferred-interaction-outcome.ts"
},
"./testing/device/device-claim-conflict": {
"types": "./src/resources/device/device-claim-conflict.ts",
"default": "./src/resources/device/device-claim-conflict.ts"
},
"./testing/device/device-ready": {
"types": "./src/core/device/device-ready.ts",
"default": "./src/core/device/device-ready.ts"
},
"./testing/generic-leaf-execution": {
"types": "./src/core/generic-leaf-execution.ts",
"default": "./src/core/generic-leaf-execution.ts"
},
"./testing/gesture-runtime": {
"types": "./src/core/gesture-runtime.ts",
"default": "./src/core/gesture-runtime.ts"
},
"./testing/handlers/session-app-deployment": {
"types": "./src/sessions/handlers/session-app-deployment.ts",
"default": "./src/sessions/handlers/session-app-deployment.ts"
},
"./testing/handlers/snapshot": {
"types": "./src/sessions/handlers/snapshot.ts",
"default": "./src/sessions/handlers/snapshot.ts"
},
"./testing/interaction/index": {
"types": "./src/execution/interaction/index.ts",
"default": "./src/execution/interaction/index.ts"
},
"./testing/interaction/internal/__tests__/*": {
"types": "./src/execution/interaction/internal/__tests__/*.ts",
"default": "./src/execution/interaction/internal/__tests__/*.ts"
},
"./testing/interaction/internal/interaction-touch-response": {
"types": "./src/execution/interaction/internal/interaction-touch-response.ts",
"default": "./src/execution/interaction/internal/interaction-touch-response.ts"
Expand Down Expand Up @@ -196,10 +104,6 @@
"types": "./src/server/request-binding.ts",
"default": "./src/server/request-binding.ts"
},
"./testing/request-dispatch-disclosure": {
"types": "./src/execution/request-dispatch-disclosure.ts",
"default": "./src/execution/request-dispatch-disclosure.ts"
},
"./testing/request-dispatch-ledger": {
"types": "./src/core/request-dispatch-ledger.ts",
"default": "./src/core/request-dispatch-ledger.ts"
Expand All @@ -212,18 +116,6 @@
"types": "./src/server/request-finalization.ts",
"default": "./src/server/request-finalization.ts"
},
"./testing/request-generic-dispatch": {
"types": "./src/execution/request-generic-dispatch.ts",
"default": "./src/execution/request-generic-dispatch.ts"
},
"./testing/request-handler-chain": {
"types": "./src/sessions/request-handler-chain.ts",
"default": "./src/sessions/request-handler-chain.ts"
},
"./testing/request-platform-provider-context": {
"types": "./src/server/request-platform-provider-context.ts",
"default": "./src/server/request-platform-provider-context.ts"
},
"./testing/request-router": {
"types": "./src/server/request-router.ts",
"default": "./src/server/request-router.ts"
Expand All @@ -236,30 +128,14 @@
"types": "./src/server/response-views.ts",
"default": "./src/server/response-views.ts"
},
"./testing/screenshot-runtime": {
"types": "./src/execution/screenshot-runtime.ts",
"default": "./src/execution/screenshot-runtime.ts"
},
"./testing/scroll-until": {
"types": "./src/execution/scroll-until.ts",
"default": "./src/execution/scroll-until.ts"
},
"./testing/selector-capture-binding": {
"types": "./src/execution/selector-capture-binding.ts",
"default": "./src/execution/selector-capture-binding.ts"
},
"./testing/selector-match-errors": {
"types": "./src/execution/selector-match-errors.ts",
"default": "./src/execution/selector-match-errors.ts"
},
"./testing/selector-runtime": {
"types": "./src/execution/selector-runtime.ts",
"default": "./src/execution/selector-runtime.ts"
},
"./testing/selector-runtime-backend": {
"types": "./src/execution/selector-runtime-backend.ts",
"default": "./src/execution/selector-runtime-backend.ts"
},
"./testing/server/http-server": {
"types": "./src/server/http/http-server.ts",
"default": "./src/server/http/http-server.ts"
Expand All @@ -268,10 +144,6 @@
"types": "./src/core/session-action-recorder.ts",
"default": "./src/core/session-action-recorder.ts"
},
"./testing/session-capture-binding": {
"types": "./src/core/session-capture-binding.ts",
"default": "./src/core/session-capture-binding.ts"
},
"./testing/session-observability/__tests__/*": {
"types": "./src/sessions/session-observability/__tests__/*.ts",
"default": "./src/sessions/session-observability/__tests__/*.ts"
Expand All @@ -292,26 +164,6 @@
"types": "./src/core/session-store.ts",
"default": "./src/core/session-store.ts"
},
"./testing/snapshot-diff-runtime": {
"types": "./src/sessions/snapshot-diff-runtime.ts",
"default": "./src/sessions/snapshot-diff-runtime.ts"
},
"./testing/snapshot-interactor-capture": {
"types": "./src/core/snapshot-interactor-capture.ts",
"default": "./src/core/snapshot-interactor-capture.ts"
},
"./testing/snapshot-quality-latch": {
"types": "./src/sessions/snapshot-quality-latch.ts",
"default": "./src/sessions/snapshot-quality-latch.ts"
},
"./testing/snapshot-runtime": {
"types": "./src/sessions/snapshot-runtime.ts",
"default": "./src/sessions/snapshot-runtime.ts"
},
"./testing/wait-runtime": {
"types": "./src/execution/wait-runtime.ts",
"default": "./src/execution/wait-runtime.ts"
},
"./testing/web-session-names": {
"types": "./src/sessions/web-session-names.ts",
"default": "./src/sessions/web-session-names.ts"
Expand Down
111 changes: 68 additions & 43 deletions packages/daemon/src/__tests__/support/command-surface-fake.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type {
DaemonCommandSurface,
DaemonSnapshotOptions,
} from '@agent-device/contracts/daemon-command-surface';
import { publicSnapshotCaptureAnnotations } from '@agent-device/contracts/capture';

/**
* The `CreateDaemonCommandSurface` port as the daemon-policy suites need it. Router and handler
Expand Down Expand Up @@ -74,49 +75,73 @@ export const fakeCreateCommandSurface: CreateDaemonCommandSurface = async () =>
* the result stays out of the daemon suites: a snapshot returns the backend's tree, and a diff
* returns an empty comparison whose only informative field is whether it initialized the baseline.
*/
export const forwardingCreateCommandSurface: CreateDaemonCommandSurface = async (config) => {
const captureIntoSession = async (options: DaemonSnapshotOptions) => {
const name = options.session ?? 'default';
const session = await config.sessions?.get(name);
const captured = await config.backend.captureSnapshot?.(
{ session: name, requestId: options.requestId, signal: options.signal ?? config.signal },
{
interactiveOnly: options.interactiveOnly,
depth: options.depth,
scope: options.scope,
raw: options.raw,
},
);
const stored = captured?.snapshot ?? {
nodes: [],
createdAt: Date.now(),
backend: 'android' as const,
function createForwardingCommandSurface(
options: {
includeCaptureAnnotations?: boolean;
} = {},
): CreateDaemonCommandSurface {
return async (config) => {
const captureIntoSession = async (captureOptions: DaemonSnapshotOptions) => {
const name = captureOptions.session ?? 'default';
const session = await config.sessions?.get(name);
const captured = await config.backend.captureSnapshot?.(
{
session: name,
requestId: captureOptions.requestId,
signal: captureOptions.signal ?? config.signal,
},
{
interactiveOnly: captureOptions.interactiveOnly,
depth: captureOptions.depth,
scope: captureOptions.scope,
raw: captureOptions.raw,
},
);
const stored = captured?.snapshot ?? {
nodes: [],
createdAt: Date.now(),
backend: 'android' as const,
};
await config.sessions?.set({
...(session ?? { name }),
name: session?.name ?? name,
snapshot: stored,
});
const annotations =
options.includeCaptureAnnotations && captured
? publicSnapshotCaptureAnnotations(captured)
: {};
return {
nodes: stored.nodes as never,
hadBaseline: session?.snapshot !== undefined,
annotations,
};
};
await config.sessions?.set({
...(session ?? { name }),
name: session?.name ?? name,
snapshot: stored,
});
return { nodes: stored.nodes as never, hadBaseline: session?.snapshot !== undefined };
};
return {
...fakeCommandSurface,
signal: config.signal,
capture: {
...fakeCommandSurface.capture,
snapshot: async (options) => {
const { nodes } = await captureIntoSession(options);
return { nodes };
return {
...fakeCommandSurface,
signal: config.signal,
capture: {
...fakeCommandSurface.capture,
snapshot: async (captureOptions) => {
const { nodes, annotations } = await captureIntoSession(captureOptions);
return { nodes, ...annotations };
},
diffSnapshot: async (captureOptions) => {
const { hadBaseline } = await captureIntoSession(captureOptions);
return {
mode: 'snapshot',
baselineInitialized: !hadBaseline,
summary: { additions: 0, removals: 0, unchanged: 0 },
lines: [],
};
},
},
diffSnapshot: async (options) => {
const { hadBaseline } = await captureIntoSession(options);
return {
mode: 'snapshot',
baselineInitialized: !hadBaseline,
summary: { additions: 0, removals: 0, unchanged: 0 },
lines: [],
};
},
},
};
};
};
}

export const forwardingCreateCommandSurface: CreateDaemonCommandSurface =
createForwardingCommandSurface();

export const forwardingCreateCommandSurfaceWithAnnotations: CreateDaemonCommandSurface =
createForwardingCommandSurface({ includeCaptureAnnotations: true });
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export async function captureAndStoreSnapshot(
interactiveOnly?: boolean;
includeRects?: boolean;
preferredBackend?: SnapshotPreferredBackend;
onlyStoreWhenSessionExists?: boolean;
},
): Promise<SnapshotState> {
const name = params.session ?? 'default';
Expand All @@ -62,6 +63,8 @@ export async function captureAndStoreSnapshot(
const snapshot = captured?.snapshot;
if (!snapshot) throw new Error('captureAndStoreSnapshot: the backend returned no snapshot');
const current = await config.sessions?.get(name);
await config.sessions?.set({ ...(current ?? { name }), name, snapshot });
if (current || !params.onlyStoreWhenSessionExists) {
await config.sessions?.set({ ...(current ?? { name }), name, snapshot });
}
return snapshot;
}
Loading
Loading