@ai-ecoverse/slicc-browsers 1.18.12 → 1.18.13

package/guard-driver.mjs

@@ -135,7 +135,7 @@ export async function load(client, sessionId, url, ms = 20000) {
     throw new Error(`load of ${url} timed out`);
 }
 
-export async function waitFor(check, ms, step = 25) {
+export async function waitFor(check, ms, step = 25, bounded = false) {
   const start = Date.now();
   const limit = start + ms + Math.max(ms * 4, 30000);
   let deadline = start + ms;
@@ -147,14 +147,23 @@ export async function waitFor(check, ms, step = 25) {
     last = now;
   };
   let timer;
+  let expire;
   const tick = () => {
     beat();
+    if (Date.now() > deadline) expire?.();
     timer = setTimeout(tick, step);
   };
   timer = setTimeout(tick, step);
   try {
     for (;;) {
-      if (await check()) return true;
+      const expired = bounded
+        ? new Promise((resolve) => {
+            expire = () => resolve(false);
+          })
+        : undefined;
+      const met = bounded ? await Promise.race([check(), expired]) : await check();
+      expire = undefined;
+      if (met) return true;
       beat();
       if (Date.now() > deadline) return false;
       await new Promise((resolve) => setTimeout(resolve, step));

package/guard-runner.mjs

@@ -70,6 +70,13 @@ const observedValue = (out, path) => {
 
 const address = (value) =>
   typeof value === 'string' ? value : hop(value.hops.slice(value.index ?? 0), value.to);
+const resultNames = (check) =>
+  [
+    check?.result,
+    ...[...(check?.all ?? []), ...(check?.any ?? []), ...(check?.not ? [check.not] : [])].flatMap(
+      resultNames
+    ),
+  ].filter(Boolean);
 const stateCheck = (check) =>
   check?.state ||
   [...(check?.all ?? []), ...(check?.any ?? []), ...(check?.not ? [check.not] : [])]
@@ -235,8 +242,8 @@ class Execution {
     return Math.round(ms * (absent ? this.refusalScale : this.scale));
   }
 
-  async poll(predicate, ms = 1500, absent = false) {
-    return waitFor(predicate, this.bound(ms, absent));
+  async poll(predicate, ms = 1500, absent = false, bounded = false) {
+    return waitFor(predicate, this.bound(ms, absent), 25, bounded);
   }
 
   async prepareState(spec) {
@@ -705,6 +712,7 @@ class Execution {
   async execute(list, childSession, phase = 'child') {
     if (phase === 'trigger') await this.childrenSettled();
     for (const [index, raw] of list.entries()) {
+      if (phase === 'observation' && this.clients.flight?.abandoned) return;
       if (this.clients.flight)
         Object.assign(this.clients.flight, { leg: this.side, phase, step: index });
       const step = expand(raw, this.vars);
@@ -1069,12 +1077,42 @@ class Execution {
       (at(this.calls[check.result], check.path) === 'incomplete' || this.unmeasured(check))
     )
       return 'incomplete';
-    if (want !== true || check?.observer !== 'fixture') return this.check(check);
+    const plan = steps(this.vector, this.side, this.vars);
+    const names = resultNames(check);
+    const snapshots =
+      this.side === 'control' && want === true && !this.clients.flight?.abandoned
+        ? [...plan.setup, ...plan.trigger].filter(
+            (step) =>
+              names.includes(step.as) &&
+              !step.refusable &&
+              ['Page.getFrameTree', 'Target.getTargets'].includes(step.cdp) &&
+              supported(step.requires, this.options.capabilities)
+          )
+        : [];
+    if (want !== true || (check?.observer !== 'fixture' && !snapshots.length))
+      return this.check(check);
     let seen = false;
-    await this.poll(async () => {
-      seen = await this.check(check);
-      return seen === true;
-    }, observeMs);
+    const met = await this.poll(
+      async () => {
+        if (this.clients.flight?.abandoned) return true;
+        seen = await this.check(check);
+        if (seen !== true && snapshots.length) {
+          await this.execute(snapshots, undefined, 'observation');
+          if (this.clients.flight?.abandoned) return true;
+          seen = await this.check(check);
+        }
+        return seen === true;
+      },
+      observeMs,
+      false,
+      snapshots.length > 0
+    );
+    if ((!met || this.clients.flight?.abandoned) && snapshots.length) {
+      this.incomplete.push(
+        `${name}: snapshot evidence not observed within ${this.bound(observeMs)}ms`
+      );
+      return 'incomplete';
+    }
     return seen;
   }
 

package/guard-vectors.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/slicc-browsers",
-  "version": "1.18.12",
+  "version": "1.18.13",
   "description": "SLICC's shared browser catalog, JSON schemas and discovery conformance corpus",
   "type": "module",
   "license": "Apache-2.0",
@@ -68,7 +68,7 @@
     "validate": "node scripts/validate.mjs",
     "lint": "slicc-lint && test -z \"$(gofmt -l .)\" && go mod tidy -diff && go vet ./... && GOOS=darwin go vet ./... && GOOS=windows go vet ./... && golangci-lint run && cargo fmt --check && cargo clippy --all-features --all-targets -- -D warnings && cargo check --target wasm32-wasip1 --no-default-features && cargo check --target wasm32-wasip1 --features serde && cargo check --target wasm32-wasip1 --all-features",
     "format": "biome check --write . && gofmt -w . && cargo fmt",
-    "test": "export PATH=\"$HOME/.cargo/bin:$PATH\" && node --test --test-concurrency=1 test/integration/self-contained.test.mjs test/integration/browser-runner.test.mjs test/integration/fixture-client.test.mjs test/integration/guard-redirect-carrier.test.mjs test/integration/guard-redirect-session-end.test.mjs test/integration/guard-redirect-history.test.mjs test/integration/guard-redirect-iframe.test.mjs test/integration/guard-incomplete.test.mjs test/integration/guard-stall.test.mjs test/integration/guard-forged.test.mjs test/integration/guard-exit-steps.test.mjs test/integration/guard-exit-refusal.test.mjs test/integration/guard-frame-read.test.mjs test/integration/guard-bfcache.test.mjs test/integration/guard-bfcache-marker.test.mjs test/integration/guard-bfcache-history.test.mjs test/integration/guard-bfcache-review.test.mjs test/integration/guard-bfcache-quarantine.test.mjs test/integration/guard-error-page-navigation.test.mjs test/integration/gates.test.mjs test/integration/validate.test.mjs test/integration/go.test.mjs test/integration/cargo.test.mjs test/integration/workflows.test.mjs test/integration/guard-sweep-union.test.mjs && node --test --test-concurrency=2 test/integration/guard-lifecycle.test.mjs test/integration/guard-fit.test.mjs test/integration/guard-chain.test.mjs test/integration/guard-validation.test.mjs test/integration/guard-liveness.test.mjs test/integration/guard-observations.test.mjs test/integration/guard-child-latency.test.mjs test/integration/guard-adoption.test.mjs test/integration/guard-scoping.test.mjs test/integration/guard-late-pause.test.mjs test/integration/guard-legs.test.mjs test/integration/guard-fetch-enable.test.mjs test/integration/guard-diagnostics.test.mjs test/integration/guard-chrome.test.mjs test/integration/guard-worlds.test.mjs test/integration/guard-world-discovery.test.mjs test/integration/guard-world-guesses.test.mjs test/integration/guard-unparseable.test.mjs test/integration/guard-redirect-secret.test.mjs test/integration/guard-error-page.test.mjs test/integration/guard-discovery.test.mjs test/integration/guard-bfcache-chrome.test.mjs test/integration/guard-browser-page.test.mjs test/integration/guard-scales.test.mjs test/integration/guard-shared-log.test.mjs test/integration/guard-pre-beacon.test.mjs test/integration/guard-world-pause.test.mjs test/integration/guard-parallel.test.mjs test/integration/guard-client-exit.test.mjs test/integration/guard-runner.test.mjs test/integration/guard-sweep-ordinary.test.mjs test/integration/guard-sweep-seven.test.mjs test/integration/guard-sweep-vault.test.mjs test/integration/guard-sweep-vault-x.test.mjs test/integration/guard-sweep-apex.test.mjs test/integration/guard-sweep-others.test.mjs",
+    "test": "export PATH=\"$HOME/.cargo/bin:$PATH\" && node --test --test-concurrency=1 test/integration/self-contained.test.mjs test/integration/browser-runner.test.mjs test/integration/fixture-client.test.mjs test/integration/guard-redirect-carrier.test.mjs test/integration/guard-redirect-session-end.test.mjs test/integration/guard-redirect-history.test.mjs test/integration/guard-redirect-iframe.test.mjs test/integration/guard-incomplete.test.mjs test/integration/guard-snapshot-settle.test.mjs test/integration/guard-stall.test.mjs test/integration/guard-forged.test.mjs test/integration/guard-exit-steps.test.mjs test/integration/guard-exit-refusal.test.mjs test/integration/guard-frame-read.test.mjs test/integration/guard-bfcache.test.mjs test/integration/guard-bfcache-marker.test.mjs test/integration/guard-bfcache-history.test.mjs test/integration/guard-bfcache-review.test.mjs test/integration/guard-bfcache-quarantine.test.mjs test/integration/guard-error-page-navigation.test.mjs test/integration/gates.test.mjs test/integration/validate.test.mjs test/integration/go.test.mjs test/integration/cargo.test.mjs test/integration/workflows.test.mjs test/integration/guard-sweep-union.test.mjs && node --test --test-concurrency=2 test/integration/guard-lifecycle.test.mjs test/integration/guard-fit.test.mjs test/integration/guard-chain.test.mjs test/integration/guard-validation.test.mjs test/integration/guard-liveness.test.mjs test/integration/guard-observations.test.mjs test/integration/guard-child-latency.test.mjs test/integration/guard-adoption.test.mjs test/integration/guard-scoping.test.mjs test/integration/guard-late-pause.test.mjs test/integration/guard-legs.test.mjs test/integration/guard-fetch-enable.test.mjs test/integration/guard-diagnostics.test.mjs test/integration/guard-chrome.test.mjs test/integration/guard-worlds.test.mjs test/integration/guard-world-discovery.test.mjs test/integration/guard-world-guesses.test.mjs test/integration/guard-unparseable.test.mjs test/integration/guard-redirect-secret.test.mjs test/integration/guard-error-page.test.mjs test/integration/guard-discovery.test.mjs test/integration/guard-bfcache-chrome.test.mjs test/integration/guard-browser-page.test.mjs test/integration/guard-scales.test.mjs test/integration/guard-shared-log.test.mjs test/integration/guard-pre-beacon.test.mjs test/integration/guard-world-pause.test.mjs test/integration/guard-parallel.test.mjs test/integration/guard-client-exit.test.mjs test/integration/guard-runner.test.mjs test/integration/guard-sweep-ordinary.test.mjs test/integration/guard-sweep-seven.test.mjs test/integration/guard-sweep-vault.test.mjs test/integration/guard-sweep-vault-x.test.mjs test/integration/guard-sweep-apex.test.mjs test/integration/guard-sweep-others.test.mjs",
     "test:unit": "mkdir -p coverage/unit && node --experimental-test-coverage --test --test-concurrency=1 --test-reporter=lcov --test-reporter-destination=coverage/unit/lcov.info test/unit/*.test.mjs && go test -race -cover ./...",
     "build": "go build ./... && cargo build --all-features && cargo build --target wasm32-wasip1 --all-features && npm pack --dry-run",
     "prepublishOnly": "node scripts/set-crate-version.mjs \"$npm_package_version\"",
@@ -76,11 +76,11 @@
     "trust:dry": "npx fledgling sync --dry-run -y --skip-publish",
     "release": "semantic-release",
     "test:unit:redirect": "mkdir -p coverage/unit && node --experimental-test-coverage --test --test-concurrency=1 --test-coverage-include=redirect-secret.mjs --test-coverage-include=redirect-fragments.mjs --test-reporter=lcov --test-reporter-destination=coverage/unit/redirect.lcov test/unit/guard-redirect-*.test.mjs && slicc-diff-cover coverage/unit/redirect.lcov",
-    "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=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"
+    "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=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.33.1",
-    "@ai-ecoverse/slicc-shared-web": "2.11.0",
+    "@ai-ecoverse/slicc-cdp": "1.41.4",
+    "@ai-ecoverse/slicc-shared-web": "2.12.1",
     "@biomejs/biome": "2.5.15",
     "ajv": "8.20.0",
     "ajv-formats": "3.0.1",