mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Keep an active voice session through engine switches
The page creates the voice once; each engine attachment only gives it that scene's action runner, pointer canvas and annotation events. Calls made during a switch wait for the incoming engine and are refused with ENGINE_SWITCHING when none attaches in time; results name the engine that answered, and the session hears engine-changed after a switch. The analyst's follow-up memory and layer enable times outlive one engine's runner. scripts/qa-voice-engine-switch.mjs drives a fake microphone and Realtime transport through the switches.
This commit is contained in:
1 parent
35ed499ae4
commit
05578c61b9
13 files changed
+998
-139
No files matched your search
+100
-53
@@ -17,7 +17,7 @@ import {
|
||||
installRenderGovernor,
|
||||
uninstallRenderGovernor,
|
||||
} from '../renderGovernor.js';
|
||||
import { initGevVoiceCommands } from '../voice/gevRealtime.js';
|
||||
import { attachSessionVoice } from './sessionVoice.js';
|
||||
import { initNavaraImageryBoxTool } from '../ui/imageryBoxNavara.js';
|
||||
import { createRecentImageryPanel } from '../ui/recentImagery.js';
|
||||
|
||||
@@ -38,7 +38,9 @@ export function navaraModeNotice(availability) {
|
||||
const names = availability.available().map(({ name }) => name);
|
||||
return Object.freeze({
|
||||
label: t('Experimental Navara engine'),
|
||||
detail: names.length ? `Data layers: ${names.join(', ')}` : 'No registered data layers',
|
||||
detail: names.length
|
||||
? `Data layers: ${names.join(', ')}`
|
||||
: 'No registered data layers',
|
||||
});
|
||||
}
|
||||
|
||||
@@ -112,56 +114,97 @@ export async function registerNavaraLayerRenderers() {
|
||||
bikeshare: async () =>
|
||||
(await import('../layers/bikeshare/render/navara.js'))
|
||||
.createBikeshareNavaraRenderer,
|
||||
...Object.fromEntries(['weather-radar', 'weather-satellite', 'weather-lightning'].map((id) => [
|
||||
id, async () => {
|
||||
const { createWeatherNavaraRenderer } = await import('../layers/weather/render/navara.js');
|
||||
return (engine, options) => createWeatherNavaraRenderer(engine, navaraViews.get(engine), options);
|
||||
},
|
||||
])),
|
||||
...Object.fromEntries(
|
||||
['weather-radar', 'weather-satellite', 'weather-lightning'].map((id) => [
|
||||
id,
|
||||
async () => {
|
||||
const { createWeatherNavaraRenderer } =
|
||||
await import('../layers/weather/render/navara.js');
|
||||
return (engine, options) =>
|
||||
createWeatherNavaraRenderer(
|
||||
engine,
|
||||
navaraViews.get(engine),
|
||||
options,
|
||||
);
|
||||
},
|
||||
]),
|
||||
),
|
||||
'bhote-koshi-2026': async () => {
|
||||
const { createNepalEventDisplay } = await import('../layers/bhoteKoshi/render/navara.js');
|
||||
return (engine) => createNepalEventDisplay(engine, navaraViews.get(engine));
|
||||
const { createNepalEventDisplay } =
|
||||
await import('../layers/bhoteKoshi/render/navara.js');
|
||||
return (engine) =>
|
||||
createNepalEventDisplay(engine, navaraViews.get(engine));
|
||||
},
|
||||
'bhote-koshi-locator': async () => {
|
||||
const { drawStorySource } = await import('../layers/shared/render/navaraStory.js');
|
||||
return (engine, { data }) => drawStorySource(engine, navaraViews.get(engine), data);
|
||||
const { drawStorySource } =
|
||||
await import('../layers/shared/render/navaraStory.js');
|
||||
return (engine, { data }) =>
|
||||
drawStorySource(engine, navaraViews.get(engine), data);
|
||||
},
|
||||
'street-level': async () => {
|
||||
const { createStreetMap } = await import('../layers/streetLevel/render/navara.js');
|
||||
return engine => createStreetMap(engine, navaraViews.get(engine));
|
||||
const { createStreetMap } =
|
||||
await import('../layers/streetLevel/render/navara.js');
|
||||
return (engine) => createStreetMap(engine, navaraViews.get(engine));
|
||||
},
|
||||
traffic: async () => {
|
||||
const { createTrafficNavaraRenderer } = await import('../layers/traffic/render/navara.js');
|
||||
return engine => createTrafficNavaraRenderer(engine, navaraViews.get(engine));
|
||||
const { createTrafficNavaraRenderer } =
|
||||
await import('../layers/traffic/render/navara.js');
|
||||
return (engine) =>
|
||||
createTrafficNavaraRenderer(engine, navaraViews.get(engine));
|
||||
},
|
||||
directions: async () => {
|
||||
const { createDirectionsNavaraRenderer } = await import('../layers/directions/render/navara.js');
|
||||
return (engine) => createDirectionsNavaraRenderer(engine, navaraViews.get(engine));
|
||||
const { createDirectionsNavaraRenderer } =
|
||||
await import('../layers/directions/render/navara.js');
|
||||
return (engine) =>
|
||||
createDirectionsNavaraRenderer(engine, navaraViews.get(engine));
|
||||
},
|
||||
'telegeography-submarine-cables': async () => {
|
||||
const { createNavaraCables } = await import('../layers/submarineCables/render/navara.js');
|
||||
return (engine, { overlayHost }) => createNavaraCables(engine, navaraViews.get(engine), overlayHost);
|
||||
const { createNavaraCables } =
|
||||
await import('../layers/submarineCables/render/navara.js');
|
||||
return (engine, { overlayHost }) =>
|
||||
createNavaraCables(engine, navaraViews.get(engine), overlayHost);
|
||||
},
|
||||
wind: async () => {
|
||||
const { createWindNavaraRenderer } = await import('../layers/wind/render/navara.js');
|
||||
return (engine) => createWindNavaraRenderer(engine, navaraViews.get(engine));
|
||||
const { createWindNavaraRenderer } =
|
||||
await import('../layers/wind/render/navara.js');
|
||||
return (engine) =>
|
||||
createWindNavaraRenderer(engine, navaraViews.get(engine));
|
||||
},
|
||||
'weather-cyclones': async () => {
|
||||
const {createCyclonesNavaraRenderer} = await import('../layers/cyclones/render/navara.js');
|
||||
return (engine,options) => createCyclonesNavaraRenderer(engine,navaraViews.get(engine).view,options);
|
||||
const { createCyclonesNavaraRenderer } =
|
||||
await import('../layers/cyclones/render/navara.js');
|
||||
return (engine, options) =>
|
||||
createCyclonesNavaraRenderer(
|
||||
engine,
|
||||
navaraViews.get(engine).view,
|
||||
options,
|
||||
);
|
||||
},
|
||||
...Object.fromEntries(['local-datacenters','local-dams'].map((id) => [
|
||||
id, async () => {
|
||||
const {createInfrastructureNavaraRenderer} = await import('../layers/infrastructure/render/navara.js');
|
||||
return (engine,{config,services}) => createInfrastructureNavaraRenderer(engine,navaraViews.get(engine),config,services);
|
||||
},
|
||||
])),
|
||||
...Object.fromEntries(
|
||||
['local-datacenters', 'local-dams'].map((id) => [
|
||||
id,
|
||||
async () => {
|
||||
const { createInfrastructureNavaraRenderer } =
|
||||
await import('../layers/infrastructure/render/navara.js');
|
||||
return (engine, { config, services }) =>
|
||||
createInfrastructureNavaraRenderer(
|
||||
engine,
|
||||
navaraViews.get(engine),
|
||||
config,
|
||||
services,
|
||||
);
|
||||
},
|
||||
]),
|
||||
),
|
||||
's2-ghostmaps': async () => {
|
||||
const { createGhostMapsNavaraRenderer } = await import('../layers/ghostMaps/render/navara.js');
|
||||
return (engine) => createGhostMapsNavaraRenderer(engine, navaraViews.get(engine).view);
|
||||
const { createGhostMapsNavaraRenderer } =
|
||||
await import('../layers/ghostMaps/render/navara.js');
|
||||
return (engine) =>
|
||||
createGhostMapsNavaraRenderer(engine, navaraViews.get(engine).view);
|
||||
},
|
||||
'military-awareness': async () =>
|
||||
(await import('../layers/awareness/render/navara.js')).createAwarenessNavaraRenderer,
|
||||
(await import('../layers/awareness/render/navara.js'))
|
||||
.createAwarenessNavaraRenderer,
|
||||
'military-installations': async () => {
|
||||
const { createInstallationsNavaraRenderer } =
|
||||
await import('../layers/installations/render/navara.js');
|
||||
@@ -181,17 +224,22 @@ export async function registerNavaraLayerRenderers() {
|
||||
});
|
||||
},
|
||||
'fire-perimeters': async () => {
|
||||
const { createPerimetersNavaraRenderer } = await import('../layers/perimeters/render/navara.js');
|
||||
return (engine) => createPerimetersNavaraRenderer(engine, navaraViews.get(engine));
|
||||
const { createPerimetersNavaraRenderer } =
|
||||
await import('../layers/perimeters/render/navara.js');
|
||||
return (engine) =>
|
||||
createPerimetersNavaraRenderer(engine, navaraViews.get(engine));
|
||||
},
|
||||
'gnss-integrity': async () => {
|
||||
const { createGnssNavaraRenderer } = await import('../layers/gnss/render/navara.js');
|
||||
return (engine) => createGnssNavaraRenderer(engine, navaraViews.get(engine));
|
||||
const { createGnssNavaraRenderer } =
|
||||
await import('../layers/gnss/render/navara.js');
|
||||
return (engine) =>
|
||||
createGnssNavaraRenderer(engine, navaraViews.get(engine));
|
||||
},
|
||||
'air-quality': async () => {
|
||||
const { createAirQualityNavaraRenderer } =
|
||||
await import('../layers/airQuality/render/navara.js');
|
||||
return (engine) => createAirQualityNavaraRenderer(engine, navaraViews.get(engine));
|
||||
return (engine) =>
|
||||
createAirQualityNavaraRenderer(engine, navaraViews.get(engine));
|
||||
},
|
||||
earthquakes: async () => {
|
||||
const { createEarthquakesNavaraRenderer } =
|
||||
@@ -355,6 +403,7 @@ export function createViewerlessTools({
|
||||
voice = {},
|
||||
startChrome,
|
||||
sceneDirector,
|
||||
layerSession = null,
|
||||
signal,
|
||||
defer,
|
||||
}) {
|
||||
@@ -442,23 +491,21 @@ export function createViewerlessTools({
|
||||
});
|
||||
// Voice on the engine (phase 3, Task 9): the W1 tools drive the engine;
|
||||
// the Director uses the shared session; viewer-only tools declare availability.
|
||||
const voiceCommands = initGevVoiceCommands({
|
||||
...voice,
|
||||
annotationResolver: operations.annotationResolver,
|
||||
searchNavigation: operations.searchAndFlyTo,
|
||||
signal,
|
||||
const voiceCommands = attachSessionVoice({
|
||||
layerSession,
|
||||
voice,
|
||||
operations,
|
||||
placeSearch,
|
||||
viewer: null,
|
||||
engine,
|
||||
styleManager,
|
||||
dataManager,
|
||||
sceneDirector,
|
||||
annotations: null,
|
||||
});
|
||||
defer(() => {
|
||||
voiceCommands.stop({ removeUi: true });
|
||||
if (window.__gevVoiceCommands === voiceCommands)
|
||||
delete window.__gevVoiceCommands;
|
||||
scene: {
|
||||
viewer: null,
|
||||
engine,
|
||||
styleManager,
|
||||
sceneDirector,
|
||||
annotations: null,
|
||||
},
|
||||
signal,
|
||||
defer,
|
||||
});
|
||||
debug.voiceCommands = voiceCommands;
|
||||
return { sceneDirector, annotations: null, voiceCommands };
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import { createSceneVoice } from '../voice/gevRealtime.js';
|
||||
|
||||
/**
|
||||
* Attach the page's voice to this engine's scene. With a layer session the
|
||||
* voice is created once, for the page lifetime, and every engine attachment
|
||||
* only gives it the scene (runner, pointer canvas, annotation events): an
|
||||
* active voice session keeps its microphone and transport through a switch.
|
||||
* Without one (a host that never switches) the voice lives with this
|
||||
* application. Returns the voice commands.
|
||||
*/
|
||||
export function attachSessionVoice({
|
||||
layerSession = null,
|
||||
voice = {},
|
||||
operations,
|
||||
placeSearch,
|
||||
dataManager,
|
||||
scene,
|
||||
signal,
|
||||
defer,
|
||||
}) {
|
||||
const options = {
|
||||
...voice,
|
||||
floorServices: operations.surface?.groundFloor,
|
||||
annotationResolver: operations.annotationResolver,
|
||||
searchNavigation: operations.searchAndFlyTo,
|
||||
placeSearch,
|
||||
dataManager,
|
||||
};
|
||||
let sceneVoice;
|
||||
if (layerSession) {
|
||||
sceneVoice = layerSession.voice ??= createSceneVoice({
|
||||
...options,
|
||||
signal: layerSession.lifetime.signal,
|
||||
isSwitching: () => layerSession.switching?.() === true,
|
||||
});
|
||||
} else {
|
||||
sceneVoice = createSceneVoice({ ...options, signal });
|
||||
defer(() => {
|
||||
sceneVoice.commands.stop({ removeUi: true });
|
||||
if (window.__gevVoiceCommands === sceneVoice.commands)
|
||||
delete window.__gevVoiceCommands;
|
||||
});
|
||||
}
|
||||
sceneVoice.attachScene({ ...scene, dataManager });
|
||||
defer(() => sceneVoice.detachScene());
|
||||
return sceneVoice.commands;
|
||||
}
|
||||
+18
-21
@@ -6,7 +6,7 @@ import { useDisplayStore } from '../ui/stores/display.js';
|
||||
import { applicationPinia } from '../ui/vueRuntime.js';
|
||||
import { initImageryBoxTool } from '../ui/imageryBoxTool.js';
|
||||
import { createRecentImageryPanel } from '../ui/recentImagery.js';
|
||||
import { initGevVoiceCommands } from '../voice/gevRealtime.js';
|
||||
import { attachSessionVoice } from './sessionVoice.js';
|
||||
import { installViews, isEmbeddedInline } from './embed.js';
|
||||
import { installScopeMask, destroyScopeMask } from '../scopeMask.js';
|
||||
import { installLayerReleaseTrim } from '../sceneCommandRelease.js';
|
||||
@@ -42,10 +42,15 @@ export function createApplicationTools({
|
||||
const { viewer, engine, tileset, mapStackController, operations } = scene;
|
||||
const { styleManager, weatherEffects, cockpitCloudEffects } = controls;
|
||||
const { dataManager } = data;
|
||||
const isMapStackAvailable = id => mapStackController?.isStackAvailable(id) === true;
|
||||
const sceneDirector = layerSession?.director ?? new SceneDirector(viewer, styleManager, dataManager, {
|
||||
engine, dataPacks: {...sceneDataPacks,native:scene.packRenderer}, isMapStackAvailable,
|
||||
});
|
||||
const isMapStackAvailable = (id) =>
|
||||
mapStackController?.isStackAvailable(id) === true;
|
||||
const sceneDirector =
|
||||
layerSession?.director ??
|
||||
new SceneDirector(viewer, styleManager, dataManager, {
|
||||
engine,
|
||||
dataPacks: { ...sceneDataPacks, native: scene.packRenderer },
|
||||
isMapStackAvailable,
|
||||
});
|
||||
if (layerSession?.director)
|
||||
sceneDirector.attachScene(
|
||||
viewer,
|
||||
@@ -79,6 +84,7 @@ export function createApplicationTools({
|
||||
voice,
|
||||
sceneDirector,
|
||||
startChrome,
|
||||
layerSession,
|
||||
signal,
|
||||
defer,
|
||||
}),
|
||||
@@ -239,24 +245,15 @@ export function createApplicationTools({
|
||||
defer(() => {
|
||||
if (window.__godsEyeView === debug) delete window.__godsEyeView;
|
||||
});
|
||||
const voiceCommands = initGevVoiceCommands({
|
||||
...voice,
|
||||
floorServices: operations.surface.groundFloor,
|
||||
annotationResolver: operations.annotationResolver,
|
||||
searchNavigation: operations.searchAndFlyTo,
|
||||
signal,
|
||||
const voiceCommands = attachSessionVoice({
|
||||
layerSession,
|
||||
voice,
|
||||
operations,
|
||||
placeSearch,
|
||||
viewer,
|
||||
engine,
|
||||
styleManager,
|
||||
dataManager,
|
||||
sceneDirector,
|
||||
annotations,
|
||||
});
|
||||
defer(() => {
|
||||
voiceCommands.stop({ removeUi: true });
|
||||
if (window.__gevVoiceCommands === voiceCommands)
|
||||
delete window.__gevVoiceCommands;
|
||||
scene: { viewer, engine, styleManager, sceneDirector, annotations },
|
||||
signal,
|
||||
defer,
|
||||
});
|
||||
debug.voiceCommands = voiceCommands;
|
||||
defer(
|
||||
|
||||
Reference in new issue
Block a user