@ai-ecoverse/slicc-browsers 1.20.1 → 1.20.3

package/extension-frame.mjs

@@ -198,12 +198,45 @@ async function sendPair(client, session, method, down, up) {
   return [first, await outcome(client.send(method, up, session))];
 }
 
-async function inputMethods(client, session, methods, point, missing, side) {
+const POINTER_METHODS = new Set([
+  'Input.dispatchMouseEvent',
+  'Input.dispatchTouchEvent',
+  'Input.dispatchDragEvent',
+  'Input.emulateTouchFromMouseEvent',
+  'Input.synthesizePinchGesture',
+  'Input.synthesizeScrollGesture',
+  'Input.synthesizeTapGesture',
+]);
+
+async function pageFocus(reader, observer) {
+  await observe(
+    reader,
+    observer,
+    '(() => { window.focus(); const i = document.getElementById("typed"); if (i) i.focus(); return true; })()'
+  );
+}
+
+async function inputMethods(
+  client,
+  session,
+  methods,
+  point,
+  missing,
+  side,
+  reader,
+  observer,
+  mode
+) {
   const results = {};
   const { x, y } = point;
   const drag = { items: [], files: [], dragOperationsMask: 1 };
-  for (const method of methods) {
+  const ordered = [
+    ...methods.filter((method) => method !== 'Input.dispatchKeyEvent'),
+    ...methods.filter((method) => method === 'Input.dispatchKeyEvent'),
+  ];
+  for (const method of ordered) {
     const name = method.slice('Input.'.length);
+    if (mode !== 'focused' && POINTER_METHODS.has(method)) await pageFocus(reader, observer);
     let outs;
     if (method === 'Input.dispatchKeyEvent')
       outs = [
@@ -833,7 +866,17 @@ async function driveInput(client, reader, page, observer, inputList, mode, frame
   await refocus();
   const typed = await key(client, reader, page, observer, refocus, mode !== 'focused');
   await refocus();
-  const inputs = await inputMethods(client, page, inputList, point, missing, side);
+  const inputs = await inputMethods(
+    client,
+    page,
+    inputList,
+    point,
+    missing,
+    side,
+    reader,
+    observer,
+    mode
+  );
   await refocus();
   const focusedKey = await outcome(
     client.send('Input.dispatchKeyEvent', { type: 'keyDown', key: 'a', code: 'KeyA' }, page)
@@ -895,7 +938,48 @@ async function driveCast(client, page, frameMs) {
   };
 }
 
-export async function driveReveal(client, reader, page, observer, frameMs, missing, side) {
+function classifyRevealOverlap(
+  captureStartedAt,
+  revealAt,
+  pendingWhenRevealAcknowledged,
+  captureSettledAt
+) {
+  if (typeof captureStartedAt !== 'number' || typeof revealAt !== 'number') return 'unknown';
+  if (revealAt <= captureStartedAt) return 'before';
+  if (pendingWhenRevealAcknowledged) return 'during';
+  if (typeof captureSettledAt === 'number' && captureSettledAt < revealAt) return 'after';
+  return 'unknown';
+}
+
+function revealRaceVerdict(overlap, side, ok, shownRefused) {
+  if (overlap === 'during' || overlap === 'before') return side === 'control' ? ok : shownRefused;
+  if (overlap === 'after') return ok || shownRefused;
+  return false;
+}
+
+async function finishReveal(
+  client,
+  reader,
+  page,
+  observer,
+  frameMs,
+  { ok, text, overlap, revealRacePass }
+) {
+  const revealedPress = await click(client, reader, page, observer);
+  await style(reader, observer, 'hidden', frameMs);
+  const rehidden = await shot(client, page);
+  return {
+    revealedShot: ok,
+    revealedRefusal: text,
+    revealOverlap: overlap,
+    revealRacePass,
+    revealedClick: revealedPress.ok,
+    revealedClickRefusal: refusal(revealedPress.out),
+    rehiddenShot: rehidden.ok,
+  };
+}
+
+async function attemptRevealCapture(client, reader, page, observer, side) {
   const captureStartedAt = await observe(reader, observer, 'performance.now()');
   let captureSettled = false;
   let captureSettledAt;
@@ -920,31 +1004,38 @@ export async function driveReveal(client, reader, page, observer, frameMs, missi
   const out = await pending;
   const ok = out.ok && typeof out.result?.data === 'string' && out.result.data.length > 0;
   const text = refusal(out);
-  let overlap = 'unknown';
-  if (typeof captureStartedAt !== 'number' || typeof revealAt !== 'number') overlap = 'unknown';
-  else if (revealAt <= captureStartedAt) overlap = 'before';
-  else if (pendingWhenRevealAcknowledged) overlap = 'during';
-  else if (typeof captureSettledAt === 'number' && captureSettledAt < revealAt) overlap = 'after';
-  if (overlap === 'unknown') missing.push('reveal/capture overlap unproven');
+  const overlap = classifyRevealOverlap(
+    captureStartedAt,
+    revealAt,
+    pendingWhenRevealAcknowledged,
+    captureSettledAt
+  );
   const shownRefused = Boolean(text && (text === SHOWN || /^slicc: refused/.test(text)));
-  let revealRacePass = false;
-  if (overlap === 'during' || overlap === 'before')
-    revealRacePass = side === 'control' ? ok : shownRefused;
-  else if (overlap === 'after') revealRacePass = ok || shownRefused;
-  const revealedPress = await click(client, reader, page, observer);
-  await style(reader, observer, 'hidden', frameMs);
-  const rehidden = await shot(client, page);
   return {
-    revealedShot: ok,
-    revealedRefusal: text,
-    revealOverlap: overlap,
-    revealRacePass,
-    revealedClick: revealedPress.ok,
-    revealedClickRefusal: refusal(revealedPress.out),
-    rehiddenShot: rehidden.ok,
+    ok,
+    text,
+    overlap,
+    revealRacePass: revealRaceVerdict(overlap, side, ok, shownRefused),
   };
 }
 
+export async function driveReveal(client, reader, page, observer, frameMs, missing, side) {
+  const maxAttempts = 3;
+  let last = null;
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    last = await attemptRevealCapture(client, reader, page, observer, side);
+    if (last.overlap !== 'unknown')
+      return finishReveal(client, reader, page, observer, frameMs, last);
+    if (attempt < maxAttempts) await style(reader, observer, 'hidden', frameMs);
+  }
+  missing.push(`reveal/capture overlap unproven (${maxAttempts} attempts)`);
+  return finishReveal(client, reader, page, observer, frameMs, {
+    ...last,
+    overlap: 'unknown',
+    revealRacePass: false,
+  });
+}
+
 function frameObservations({ pageAttached, origin, read, leaks, picture, input, captures }) {
   return {
     exists: true,

package/guard-vectors.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "setVersion": "1.20.1",
+  "setVersion": "1.20.3",
   "sources": [
     {
       "repo": "ai-ecoverse/slicc-cli",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/slicc-browsers",
-  "version": "1.20.1",
+  "version": "1.20.3",
   "description": "SLICC's shared browser catalog, JSON schemas and discovery conformance corpus",
   "type": "module",
   "license": "Apache-2.0",
@@ -84,7 +84,7 @@
     "test:unit:guard": "mkdir -p coverage/unit && node --experimental-vm-modules --no-warnings --experimental-test-coverage --test --test-concurrency=1 --test-coverage-include=guard-runner.mjs --test-coverage-include=guard-driver.mjs --test-coverage-include=extension-frame.mjs --test-coverage-include=fixture-server.mjs --test-coverage-include=fixture-client.mjs --test-coverage-include=observer-target.mjs --test-coverage-include=frame-read.mjs --test-coverage-include=bfcache-restore.mjs --test-coverage-include=protected-error-page.mjs --test-coverage-include=unparseable-url.mjs --test-coverage-include=scripts/browser-runner.mjs --test-coverage-include=scripts/validate.mjs --test-reporter=lcov --test-reporter-destination=coverage/unit/guard.lcov test/unit/guard-*.test.mjs && slicc-diff-cover coverage/unit/guard.lcov"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-cdp": "1.45.2",
+    "@ai-ecoverse/slicc-cdp": "1.46.2",
     "@ai-ecoverse/slicc-shared-web": "2.13.10",
     "@biomejs/biome": "2.6.4",
     "ajv": "8.20.0",