fix(harmonyos): invalidate viewport on keyboard back

Author: thymikee

src/core/__tests__/harmonyos-interactor.test.ts

@@ -1,12 +1,19 @@
 import { expect, test, vi } from 'vitest';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 
+const { invalidateHarmonyGestureViewport, runHarmonyHdc } = vi.hoisted(() => ({
+  invalidateHarmonyGestureViewport: vi.fn(),
+  runHarmonyHdc: vi.fn(async () => ({ stdout: '', stderr: '', exitCode: 0 })),
+}));
+
+vi.mock('../../platforms/harmonyos/hdc.ts', () => ({ runHarmonyHdc }));
 vi.mock('../../platforms/harmonyos/snapshot.ts', () => ({
   snapshotHarmony: vi.fn(async () => ({
     nodes: [{ index: 0, type: 'Button', label: 'Continue' }],
     truncated: false,
   })),
   readHarmonyGestureViewport: vi.fn(),
+  invalidateHarmonyGestureViewport,
 }));
 
 import { createHarmonyInteractor } from '../interactors/harmonyos.ts';
@@ -26,3 +33,18 @@ test('harmonyos snapshot stamps its channel and producer', async () => {
   expect(result.producer).toBe('harmonyos-uitest');
   expect(result.nodes).toEqual([{ index: 0, type: 'Button', label: 'Continue' }]);
 });
+
+test('harmonyos keyboard dismiss invalidates gesture viewport through the Back route', async () => {
+  await expect(createHarmonyInteractor(device).keyboardDismiss?.()).resolves.toEqual({
+    kind: 'acknowledged',
+  });
+
+  expect(runHarmonyHdc).toHaveBeenCalledWith(device, [
+    'shell',
+    'uitest',
+    'uiInput',
+    'keyEvent',
+    'Back',
+  ]);
+  expect(invalidateHarmonyGestureViewport).toHaveBeenCalledWith(device);
+});

src/platforms/harmonyos/__tests__/snapshot-viewport-cache.test.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
-import { beforeEach, test, vi } from 'vitest';
+import { afterEach, beforeEach, test, vi } from 'vitest';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 
 const { runHarmonyHdc } = vi.hoisted(() => ({ runHarmonyHdc: vi.fn() }));
@@ -33,6 +33,10 @@ beforeEach(() => {
   scriptHarmonyLayoutDump(TALL_LAYOUT);
 });
 
+afterEach(() => {
+  vi.useRealTimers();
+});
+
 /** Scripts `uitest dumpLayout` + `file recv` so the pulled layout is `layout`. */
 function scriptHarmonyLayoutDump(layout: unknown): void {
   runHarmonyHdc.mockImplementation(async (_device: unknown, args: string[]) => {
@@ -56,6 +60,21 @@ test('repeated viewport reads within the TTL trigger a single layout dump', asyn
   assert.equal(dumpLayoutCallCount(), 1);
 });
 
+test('viewport cache expires after two seconds without explicit invalidation', async () => {
+  vi.useFakeTimers();
+  vi.setSystemTime(0);
+
+  await readHarmonyGestureViewport(DEVICE_A);
+  assert.equal(dumpLayoutCallCount(), 1);
+
+  scriptHarmonyLayoutDump(WIDE_LAYOUT);
+  await vi.advanceTimersByTimeAsync(2_000);
+  const refreshed = await readHarmonyGestureViewport(DEVICE_A);
+
+  assert.deepEqual(refreshed, { x: 0, y: 0, width: 2340, height: 1080 });
+  assert.equal(dumpLayoutCallCount(), 2);
+});
+
 test('invalidating the viewport cache forces a fresh layout dump', async () => {
   await readHarmonyGestureViewport(DEVICE_A);
   assert.equal(dumpLayoutCallCount(), 1);

src/platforms/harmonyos/input-actions.ts

@@ -140,6 +140,10 @@ export async function pressHarmonyKeyboardKey(
   device: DeviceInfo,
   key: 'Enter' | 'Back',
 ): Promise<void> {
+  if (key === 'Back') {
+    await backHarmony(device);
+    return;
+  }
   await runHarmonyHdc(device, ['shell', 'uitest', 'uiInput', 'keyEvent', key]);
 }