Preserve military aircraft and classification across renderer handoffs

scripts/package-boundaries.json

@@ -1353,6 +1353,7 @@
       "src/layers/flights/index.js",
       "src/layers/flights/ingestion.js",
       "src/layers/flights/lifecycle.js",
+      "src/layers/aircraft/sceneBinding.js",
       "src/layers/flights/motion.js",
       "src/layers/flights/policy.js",
       "src/layers/flights/queries.js",
@@ -1433,6 +1434,7 @@
       "src/layers/military/controller.js",
       "src/layers/military/index.js",
       "src/layers/military/ingestion.js",
+      "src/layers/aircraft/sceneBinding.js",
       "src/layers/military/lifecycle.js",
       "src/layers/military/motion.js",
       "src/layers/military/policy.js",
@@ -2868,6 +2870,7 @@
       "src/layers/flights/index.js",
       "src/layers/flights/ingestion.js",
       "src/layers/flights/lifecycle.js",
+      "src/layers/aircraft/sceneBinding.js",
       "src/layers/flights/motion.js",
       "src/layers/flights/policy.js",
       "src/layers/flights/queries.js",
@@ -3927,6 +3930,7 @@
       "src/layers/flights/index.js",
       "src/layers/flights/ingestion.js",
       "src/layers/flights/lifecycle.js",
+      "src/layers/aircraft/sceneBinding.js",
       "src/layers/flights/motion.js",
       "src/layers/flights/policy.js",
       "src/layers/flights/queries.js",

scripts/qa-layer-handoff.mjs

@@ -10,9 +10,13 @@ if (
   )
 )
   throw new Error('Supply an unreserved local keyless preview URL');
+const military = process.argv.includes('--military');
+const layerId = military ? 'military' : 'flights';
+const aircraftId = military ? 'aaa052' : '71be26';
 url.search = '?engine=navara&welcome=0';
 url.hash =
-  'v=2&lat=40.2539&lon=-125.5779&alt=21130&heading=360&pitch=-35&map=sentinel2&l=f&lo=f.e.1_f.t.71be26';
+  'v=2&lat=40.2539&lon=-125.5779&alt=21130&heading=360&pitch=-35&map=sentinel2' +
+  (military ? '&l=m&lo=f.e.1_f.u.aaa052' : '&l=f&lo=f.e.1_f.t.71be26');
 const browser = await puppeteer.launch({
   headless: true,
   args: ['--use-angle=metal', '--enable-gpu'],
@@ -23,14 +27,24 @@ try {
   const errors = [];
   page.on('pageerror', (e) => errors.push(e.message));
   await page.setViewport({ width: 1280, height: 720 });
-  await page.evaluateOnNewDocument(() => {
+  await page.evaluateOnNewDocument((layerId, aircraftId) => {
+    window.__qaAircraft = {layerId, aircraftId};
     const fetch = window.fetch.bind(window);
     window.__flightPolls = 0;
+    const interval = window.setInterval.bind(window);
+    window.setInterval = function (callback, delay, ...args) {
+      if (typeof callback !== 'function') return interval(callback, delay, ...args);
+      const id = interval(function (...values) {
+        if (window.__handoff?.timer === id) window.__handoff.ticks++;
+        return callback.apply(this, values);
+      }, delay, ...args);
+      return id;
+    };
     window.fetch = (input, options) => {
       const path = new URL(input.url ?? input, document.baseURI).pathname;
       const now = Math.floor(Date.now() / 1000);
       if (path === '/api/flights') {
-        window.__flightPolls++;
+        if (layerId === 'flights') window.__flightPolls++;
         return Promise.resolve(
           Response.json({
             time: now,
@@ -58,15 +72,21 @@ try {
           }),
         );
       }
-      if (path === '/api/military')
-        return Promise.resolve(Response.json({ now: Date.now(), ac: [] }));
+      if (path === '/api/military') {
+        if (layerId === 'military') window.__flightPolls++;
+        return Promise.resolve(Response.json({now: Date.now(), ac: [{
+          hex: 'aaa052', flight: 'GEVMIL', lon: -125.5779, lat: 40.2539,
+          alt_geom: 31825, alt_baro: 31825, gs: 389, track: 45,
+          seen: 0, seen_pos: 0, dbFlags: 1, type: 'adsb_icao',
+        }]}));
+      }
       if (path === '/api/flights/track')
         return Promise.resolve(Response.json({ path: [] }));
       if (path.startsWith('/api/flights/') || path.startsWith('/api/openai/'))
         return Promise.resolve(Response.json({}));
       return fetch(input, options);
     };
-  });
+  }, layerId, aircraftId);
   await page.goto(url.href, { waitUntil: 'domcontentloaded' });
   const ready = (kind) =>
     page.waitForFunction(
@@ -92,16 +112,16 @@ try {
     if (window.__GOOGLE_MAPS_API_KEY__ || tileset)
       throw Error('Keyless preview required');
     styleManager.cockpitView.setVisionMode('thermal');
-    const entry = dataManager.layers.get('flights');
+    const entry = dataManager.layers.get(window.__qaAircraft.layerId);
     window.__handoff = {
       dataManager,
       entry,
-      row: document.querySelector('[data-layer-id="flights"] .data-toggle-btn'),
+      row: document.querySelector(`[data-layer-id="${window.__qaAircraft.layerId}"] .data-toggle-btn`),
       timer: entry.intervalId,
+      ticks: 0,
       model: entry.module,
       pollCount: window.__flightPolls,
       timestamp: entry.module.getStats().lastUpdate,
-      started: Date.now(),
     };
   });
   // Refuse the first Cesium canvas. The application must roll back with the
@@ -127,9 +147,9 @@ try {
     const {dataManager, styleManager} = window.__godsEyeView;
     return new URL(location.href).searchParams.get('engine') === 'navara' &&
       dataManager === window.__handoff.dataManager &&
-      dataManager.layers.get('flights') === window.__handoff.entry &&
+      dataManager.layers.get(window.__qaAircraft.layerId) === window.__handoff.entry &&
       styleManager.getCockpitState().active &&
-      styleManager.getAircraftTrackingTarget()?.id === '71be26';
+      styleManager.getAircraftTrackingTarget()?.id === window.__qaAircraft.aircraftId;
   }), 'a failed scene must leave the live session usable');
   console.log('PASS failed renderer rolled back to the same flight and cockpit');
 
@@ -139,7 +159,7 @@ try {
     const result = await page.evaluate(() => {
       const { dataManager, engine, styleManager } = window.__godsEyeView;
       const before = window.__handoff;
-      const entry = dataManager.layers.get('flights');
+      const entry = dataManager.layers.get(window.__qaAircraft.layerId);
       const cockpit = styleManager.getCockpitState();
       return {
         sameOwner:
@@ -147,18 +167,18 @@ try {
           before.entry === entry &&
           before.model === entry.module,
         sameRow: Boolean(before.row) &&
-          before.row === document.querySelector('[data-layer-id="flights"] .data-toggle-btn'),
+          before.row === document.querySelector(`[data-layer-id="${window.__qaAircraft.layerId}"] .data-toggle-btn`),
         sameTimer:
           before.timer === entry.intervalId && entry.intervalId != null,
         sourcePolls: window.__flightPolls - before.pollCount,
-        elapsed: Date.now() - before.started,
+        timerTicks: before.ticks,
         stamp: entry.module.getStats().lastUpdate,
         initialStamp: before.timestamp,
         id: cockpit.subject?.id,
         active: cockpit.active,
         mode: cockpit.visionMode,
         hud: !document.querySelector('#cockpit-hud').hidden,
-        drawn: entry.module.qaDrawn().some((row) => row.id === '71be26'),
+        drawn: entry.module.qaDrawn().some((row) => row.id === window.__qaAircraft.aircraftId),
         height: engine.camera.height(),
       };
     });
@@ -171,10 +191,10 @@ try {
         result.drawn,
       JSON.stringify(result),
     );
-    assert.equal(result.id, '71be26');
+    assert.equal(result.id, aircraftId);
     assert.equal(result.mode, 'thermal');
-    if (result.elapsed < 30000) {
-      assert.equal(result.sourcePolls, 0);
+    assert.ok(result.sourcePolls <= result.timerTicks, 'switch must not add a source request');
+    if (result.timerTicks === 0) {
       assert.equal(result.stamp, result.initialStamp);
     }
     await page.waitForFunction(