Skip to content

Commit 715d175

Browse files
committed
fix(android): gate backspace admission to type, disclose dispatch errors, and assert delay spacing
1 parent ee076e4 commit 715d175

2 files changed

Lines changed: 50 additions & 5 deletions

File tree

‎packages/platform-android/src/__tests__/text-input.test.ts‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,17 @@ test('typeAndroid sends KEYCODE_DEL keyevents for backspace sequences', async ()
129129
});
130130

131131
test('typeAndroid respects delayMs when dispatching backspace keyevents', async () => {
132+
const timestamps: number[] = [];
132133
await withFakeAdb(
133134
(args) => {
134-
if (args.includes('KEYCODE_DEL')) return undefined;
135+
if (args.includes('KEYCODE_DEL')) {
136+
timestamps.push(Date.now());
137+
return undefined;
138+
}
135139
return { stderr: `unexpected args: ${args.join(' ')}`, exitCode: 1 };
136140
},
137141
async ({ calls, device }) => {
138-
await typeAndroid(device, '\b\b\b', 10);
142+
await typeAndroid(device, '\b\b\b', 20);
139143
assert.equal(calls.some((args) => args.includes('KEYCODE_MOVE_END')), false);
140144
const delCalls = calls.filter(
141145
(args) => args[0] === 'shell' && args[1] === 'input' && args[2] === 'keyevent',
@@ -144,6 +148,39 @@ test('typeAndroid respects delayMs when dispatching backspace keyevents', async
144148
for (const call of delCalls) {
145149
assert.deepEqual(call, ['shell', 'input', 'keyevent', 'KEYCODE_DEL']);
146150
}
151+
assert.equal(timestamps.length, 3);
152+
assert.ok(
153+
timestamps[1]! - timestamps[0]! >= 15,
154+
`expected >= 15ms spacing, got ${timestamps[1]! - timestamps[0]!}`,
155+
);
156+
assert.ok(
157+
timestamps[2]! - timestamps[1]! >= 15,
158+
`expected >= 15ms spacing, got ${timestamps[2]! - timestamps[1]!}`,
159+
);
160+
},
161+
);
162+
});
163+
164+
test('fillAndroid rejects backspace-only text without clearing field', async () => {
165+
await withFakeAdb(
166+
() => undefined,
167+
async ({ calls, device }) => {
168+
await assert.rejects(
169+
async () => await fillAndroid(device, 100, 200, '\b\b'),
170+
(error: unknown) => {
171+
assert.equal((error as any).code, 'COMMAND_FAILED');
172+
return true;
173+
},
174+
);
175+
assert.equal(
176+
calls.some(
177+
(args) =>
178+
args.includes('KEYCODE_DEL') ||
179+
args.includes('KEYCODE_MOVE_END') ||
180+
(args[1] === 'input' && args[2] === 'text'),
181+
),
182+
false,
183+
);
147184
},
148185
);
149186
});

‎packages/platform-android/src/text-input.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import type { FillUnconfirmedVerification } from '@agent-device/contracts/fill-evidence';
88
import { ANDROID_SHELL_TEXT_UNSUPPORTED_REASON } from '@agent-device/contracts/command';
99
import type { DeviceInfo } from '@agent-device/kernel/device';
10+
import type { ShellWord } from '@agent-device/kernel/device-shell';
1011
import { AppError, discloseDispatchAfterSteps } from '@agent-device/kernel/errors';
1112
import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
1213

@@ -247,7 +248,7 @@ async function admitAndroidTextChannel(
247248
if (isAndroidImeHelperPackage(packageName)) {
248249
return { backend: 'test-ime', packageName };
249250
}
250-
if (!isAndroidBackspaceSequence(text)) {
251+
if (!(action === 'type' && isAndroidBackspaceSequence(text))) {
251252
assertAndroidShellTextSupported(text);
252253
}
253254
assertAndroidShellInputIsAppOwned(inputState, action);
@@ -428,10 +429,17 @@ async function deleteAndroidCharacters(
428429
const deletes = Math.max(0, count);
429430
if (deletes === 0) return;
430431
let dispatchedSteps = 0;
432+
const dispatchKeyevent = async (words: readonly ShellWord[]) => {
433+
try {
434+
await runAndroidShell(device, words);
435+
} catch (error) {
436+
throw discloseAdbInputDispatch(error);
437+
}
438+
};
431439
try {
432440
if (delayMs > 0) {
433441
for (let i = 0; i < deletes; i++) {
434-
await runAndroidShell(device, ['input', 'keyevent', 'KEYCODE_DEL']);
442+
await dispatchKeyevent(['input', 'keyevent', 'KEYCODE_DEL']);
435443
dispatchedSteps += 1;
436444
if (i + 1 < deletes) await sleep(delayMs);
437445
}
@@ -440,7 +448,7 @@ async function deleteAndroidCharacters(
440448
const batchSize = 24;
441449
for (let i = 0; i < deletes; i += batchSize) {
442450
const size = Math.min(batchSize, deletes - i);
443-
await runAndroidShell(device, ['input', 'keyevent', ...Array(size).fill('KEYCODE_DEL')]);
451+
await dispatchKeyevent(['input', 'keyevent', ...Array(size).fill('KEYCODE_DEL')]);
444452
dispatchedSteps += 1;
445453
}
446454
} catch (error) {

0 commit comments

Comments
 (0)