rig-review 2.2.0 → 2.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,6 +3,7 @@ import type { JobAct, JobDisplayPublication, JobDisplayReceipt, JobEvent, JobPen
3
3
  import {enCatalog} from './catalog-en.ts';
4
4
  import {koCatalog} from './catalog-ko.ts';
5
5
  import {t} from './i18n.ts';
6
+ import {JOB_HUB_READY, jobHubMessageMatches, type JobHubBinding} from './job-hub.ts';
6
7
 
7
8
  /** Imported runtimes may throw arbitrary prose. Only registered refusal copy reaches the window. */
8
9
  export function jobWindowRefusal(error: unknown, fallback = 'JOB_WINDOW_FAILED'): string {
@@ -440,6 +441,61 @@ export async function* jobWindowEvents(access: JobWindowAccess, after: string |
440
441
  reader.releaseLock();
441
442
  }
442
443
  }
444
+ /** One reader per window. Hub members bootstrap before visibility can suspend transport. */
445
+ export function startJobWindowEvents(options: {
446
+ access: JobWindowAccess;
447
+ signal: AbortSignal;
448
+ member: boolean;
449
+ event(value: JobEvent): void;
450
+ refused(error: unknown): void;
451
+ fetcher?: typeof fetch;
452
+ }) {
453
+ let bootstrap = options.member;
454
+ let visible = !options.member;
455
+ let cursor: string | null = null;
456
+ let reader: AbortController | null = null;
457
+ let wake: (() => void) | null = null;
458
+ const enabled = () => bootstrap || visible;
459
+ function changed() {
460
+ if (!enabled()) reader?.abort();
461
+ wake?.();
462
+ }
463
+ const stopped = () => { reader?.abort(); wake?.(); };
464
+ options.signal.addEventListener('abort', stopped, {once: true});
465
+ function wait(milliseconds?: number): Promise<void> {
466
+ return new Promise(resolve => {
467
+ const timer = milliseconds === undefined ? undefined : setTimeout(finish, milliseconds);
468
+ function finish() { clearTimeout(timer); wake = null; resolve(); }
469
+ wake = finish;
470
+ if (options.signal.aborted) finish();
471
+ });
472
+ }
473
+ const done = (async () => {
474
+ try {
475
+ while (!options.signal.aborted) {
476
+ if (!enabled()) { await wait(); continue; }
477
+ const current = new AbortController();
478
+ reader = current;
479
+ try {
480
+ for await (const event of jobWindowEvents(options.access, cursor, current.signal, options.fetcher)) {
481
+ // Only complete, delivered events advance replay, including a final event racing hide.
482
+ options.event(event);
483
+ cursor = event.cursor;
484
+ if (event.type === 'closed') return;
485
+ }
486
+ } catch (error) {
487
+ if (!current.signal.aborted && !options.signal.aborted) options.refused(error);
488
+ } finally { reader = null; }
489
+ if (!options.signal.aborted && enabled() && !current.signal.aborted) await wait(500);
490
+ }
491
+ } finally { options.signal.removeEventListener('abort', stopped); }
492
+ })();
493
+ return {
494
+ done,
495
+ visibility(value: boolean) { if (options.member) { bootstrap = false; visible = value; changed(); } },
496
+ displayed() { if (options.member) { bootstrap = false; changed(); } },
497
+ };
498
+ }
443
499
  import type { ModelAssets, RigPlayer } from '@rig-c/play';
444
500
  import type { PartInspection } from './part-selection.ts';
445
501
  import type { Checkpoint, ReviewManifest, ReviewedSource } from '../src/manifest.ts';
@@ -849,6 +905,9 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
849
905
  }
850
906
  catch { /* Capability stays in memory. */ }
851
907
  const access = jobWindowAccess(location.href, storage, href => history.replaceState(history.state, '', href));
908
+ const hubIncarnation = new URL(location.href).searchParams.get('hub');
909
+ let hubVisible = !hubIncarnation;
910
+ let events: ReturnType<typeof startJobWindowEvents> | undefined;
852
911
  const pageId = crypto.randomUUID();
853
912
  const transport = createJobWindowTransport(access);
854
913
  const abort = new AbortController();
@@ -1410,6 +1469,19 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
1410
1469
  }
1411
1470
  viewport.fitCamera();
1412
1471
  }
1472
+ function hubBinding(): JobHubBinding {
1473
+ return {incarnation: hubIncarnation!, jobId: access.jobId,
1474
+ publicationId: current?.display.publication.publicationId ?? null,
1475
+ sourceHash: current?.display.publication.source.sourceHash ?? null};
1476
+ }
1477
+ function pauseHiddenHubFrame(): void {
1478
+ if (hubVisible) return;
1479
+ current?.player?.pause();
1480
+ for (const video of workspace.querySelectorAll('video')) video.pause();
1481
+ }
1482
+ function announceHubFrame(): void {
1483
+ if (hubIncarnation) globalThis.parent.postMessage({...hubBinding(), schema: JOB_HUB_READY}, location.origin);
1484
+ }
1413
1485
  const window = createJobWindow({ jobId: access.jobId, pageId, transport, adapter: {
1414
1486
  async prepare(display, signal): Promise<PreparedWindow> {
1415
1487
  const inspection = await prepareJobInspection(display, signal);
@@ -1571,6 +1643,8 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
1571
1643
  catch { /* In-memory retained evidence remains available. */ }
1572
1644
  history.textContent = [...retained.values()].map(draft => t('job.retained', [draft.label]) + '\n' + draft.sourceHash + '\n' + JSON.stringify(draft.value, null, 2)).join('\n');
1573
1645
  }
1646
+ pauseHiddenHubFrame(); announceHubFrame();
1647
+ if (state.receipt && !state.preparing) events?.displayed();
1574
1648
  },
1575
1649
  } });
1576
1650
  const localize = i18n.onLanguageChange(() => {
@@ -1581,26 +1655,24 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
1581
1655
  viewport.renderCameraControls();
1582
1656
  window.refresh();
1583
1657
  });
1584
- let cursor: string | null = null;
1585
- void (async () => {
1586
- while (!abort.signal.aborted) {
1587
- try {
1588
- for await (const event of jobWindowEvents(access, cursor, abort.signal)) {
1589
- cursor = event.cursor;
1590
- window.event(event);
1591
- if (event.type === 'closed')
1592
- return;
1593
- }
1594
- }
1595
- catch (error) {
1596
- if (abort.signal.aborted)
1597
- return;
1598
- notice.textContent = jobWindowRefusal(error, 'JOB_STREAM_FAILED');
1599
- }
1600
- await new Promise<void>(resolve => setTimeout(resolve, 500));
1658
+ const hubVisibility = (event: MessageEvent) => {
1659
+ if (!hubIncarnation || !jobHubMessageMatches(event, location.origin, globalThis.parent, hubBinding(), 'visibility')) return;
1660
+ hubVisible = event.data.visible;
1661
+ host.dataset.hubVisible = String(hubVisible);
1662
+ events?.visibility(hubVisible);
1663
+ if (event.data.language !== i18n.getLanguage()) {
1664
+ i18n.setLinkLanguage(null); i18n.setLanguagePreference(event.data.language);
1601
1665
  }
1602
- })();
1666
+ pauseHiddenHubFrame();
1667
+ if (hubVisible) current?.player?.draw();
1668
+ };
1669
+ if (hubIncarnation) {globalThis.addEventListener('message', hubVisibility); announceHubFrame();}
1670
+ events = startJobWindowEvents({access, signal: abort.signal, member: !!hubIncarnation,
1671
+ event: event => window.event(event),
1672
+ refused: error => {notice.textContent = jobWindowRefusal(error, 'JOB_STREAM_FAILED');},
1673
+ });
1603
1674
  const stop = () => {
1675
+ globalThis.removeEventListener('message', hubVisibility);
1604
1676
  saveDraft();
1605
1677
  referenceSelection.cancel();
1606
1678
  abort.abort();
package/web/main.ts CHANGED
@@ -1127,7 +1127,7 @@ async function playPreview():Promise<void> {
1127
1127
  }
1128
1128
  function localDraft():boolean{return !!comments?.draft()||dirty||!!input('feedback-summary').value.trim()||!!input('feedback-start').value.trim()||!!input('feedback-end').value.trim()||!!select('feedback-category').value||!!input('feedback-target-name').value.trim()&&input('feedback-target-name').value!==data.manifest.id;}
1129
1129
  function controlState():ControlInspection {
1130
- const box=assets?.stage??player?.bounds(),center=box?{x:box.x+box.width/2,y:box.y+box.height/2}:null;
1130
+ const box=assets?.stage??player?.bounds(),center=viewport.paneFrame('rig')?.center??(box?{x:box.x+box.width/2,y:box.y+box.height/2}:null);
1131
1131
  return {part:parts?.value()??null,partGeneration:parts?.observation()?.generation??null,view:numericView(),theme:appearance?.get()??'system',layout:'auto',effectiveLayout:el('stage-layout').dataset.orientation==='vertical'?'column':'row',cameras:{rig:{zoom:player?viewport.state.zoom:1,pan:{x:center&&viewport.state.cameraCenter?(center.x-viewport.state.cameraCenter.x)*viewport.state.rigScale:0,y:center&&viewport.state.cameraCenter?(viewport.state.cameraCenter.y-center.y)*viewport.state.rigScale:0}},reference:{zoom:referenceSize?viewport.state.referenceZoom:1,pan:{x:referenceSize&&viewport.state.referenceCenter?(referenceSize.width/2-viewport.state.referenceCenter.x)*viewport.state.referenceScale:0,y:referenceSize&&viewport.state.referenceCenter?(referenceSize.height/2-viewport.state.referenceCenter.y)*viewport.state.referenceScale:0}}},animation:animation||null,time,playing,loop:canRepeatIdle()?'idle':'off',layers:{images:!!player&&layers.images,meshes:!!player&&layers.mesh,bones:!!player&&layers.bones},ready:!!data,seeking:seekingControl||!!video?.seeking||!!persistence?.restoring(),dirty:localDraft(),busy:saving||stripBusy||!!persistence?.restoring(),feedbackEligible:!persistence?.restoring(),comparison:controlComparison(layoutEligibility()),capabilities:{camera:!!player,referenceCamera:!!referenceSize,animation:!!player,time:duration>0,playback:duration>0,layers:{images:!!player,meshes:!!player,bones:!!player}}};
1132
1132
  }
1133
1133
  async function applyControl(command:ControlCommand,signal:AbortSignal):Promise<void> {
@@ -1,16 +1,40 @@
1
1
  /** Existing compiled rig/reference rendering for the shared inspection viewport. */
2
- import type {ModelAssets,RigPlayer,PoseBounds} from '@rig-c/play';
2
+ import type {ModelAssets,RigPlayer,PoseBounds,PosedFrame} from '@rig-c/play';
3
3
  import type {ViewportProvider,ViewportState,ViewportController} from './viewport-controller.ts';
4
4
  import {dragImpulse} from '../src/environment.ts';
5
5
  import {CLICK_SLOP_PX} from './stage-pick.ts';
6
6
  export interface RigViewportHost {
7
7
  el:ViewportProvider['el'];player:()=>RigPlayer|null;assets:()=>ModelAssets|null;
8
8
  referenceSize:()=>{width:number;height:number}|null;view:()=>string;referenceGeneration:()=>number;
9
- parts:()=>{value:()=>unknown;bounds:()=>PoseBounds|null}|null;
9
+ parts:()=>{value:()=>unknown;bounds:()=>PoseBounds|null;frame?:(side:'single')=>PosedFrame|undefined}|null;
10
10
  text:(id:string,value:string)=>void;message:ViewportProvider['message'];redrawOverlay:(fresh:boolean)=>void;
11
11
  }
12
12
  export function createRigViewportProvider(host:RigViewportHost,state:ViewportState):ViewportProvider {
13
13
  const {el,text,message,redrawOverlay}=host;const input=(id:string)=>el<HTMLInputElement>(id),button=(id:string)=>el<HTMLButtonElement>(id);
14
+ const framingBoxes=new WeakMap<RigPlayer,{assets:ModelAssets|null;box:PoseBounds}>();
15
+ function positiveBounds(box:PoseBounds|null|undefined):box is PoseBounds {
16
+ return !!box&&box.width>0&&box.height>0&&[box.x,box.y,box.width,box.height,box.x+box.width,box.y+box.height].every(Number.isFinite);
17
+ }
18
+ function rigFramingBox():PoseBounds|null {
19
+ const player=host.player(),assets=host.assets();if(!player)return null;
20
+ const declared=assets?.stage;
21
+ // A model without a positive declared stage keeps its existing live pose/filter basis.
22
+ if(!positiveBounds(declared))return player.bounds();
23
+ const cached=framingBoxes.get(player);if(cached&&cached.assets===assets)return cached.box;
24
+ const stage={...declared},frame=host.parts()?.frame?.('single');
25
+ // present() records a successful draw. A prepared pose or later player slot filter
26
+ // must not become the whole-rig framing basis merely because bounds() is positive.
27
+ if(!frame||frame.generation===undefined||frame.generation!==player.generation||player.slots!==null)return stage;
28
+ const drawn=player.bounds();
29
+ if(!positiveBounds(drawn))return stage;
30
+ const x=Math.min(stage.x,drawn.x),y=Math.min(stage.y,drawn.y);
31
+ const box={x,y,width:Math.max(stage.x+stage.width,drawn.x+drawn.width)-x,
32
+ height:Math.max(stage.y+stage.height,drawn.y+drawn.height)-y};
33
+ if(!positiveBounds(box))return null;
34
+ // bounds() follows the live pose/filter. Keep one framing basis per loaded player/assets,
35
+ // including when a semantic publication is temporarily replaced and then restored.
36
+ framingBoxes.set(player,{assets,box});return box;
37
+ }
14
38
  function referenceFit(controller:ViewportController): void {
15
39
  const referenceSize=host.referenceSize();const {paneFrame}=controller;
16
40
  if (!referenceSize || !paneFrame('reference')) return;
@@ -26,7 +50,7 @@ function render(controller:ViewportController): void {
26
50
  const player=host.player(),assets=host.assets();const {paneFrame,renderNumericView,renderCameraControls}=controller;
27
51
  referenceFit(controller);renderNumericView();renderCameraControls();
28
52
  if (!player || !assets) return;
29
- const box: PoseBounds | null = assets.stage ?? player.bounds(); if (!box || box.width <= 0 || box.height <= 0) return;
53
+ const box=rigFramingBox();if(!box||box.width<=0||box.height<=0)return;
30
54
  const viewport = el('rig-viewport');if(!paneFrame('rig'))return;
31
55
  const scale = state.rigScale = Math.max(.001,Math.min((viewport.clientWidth - 28) / box.width, (viewport.clientHeight - 58) / box.height) * state.zoom);
32
56
  const center = state.cameraCenter ?? { x: box.x + box.width / 2, y: box.y + box.height / 2 };state.displayedCenter={...center};
@@ -36,8 +60,8 @@ function render(controller:ViewportController): void {
36
60
 
37
61
  function renderControls(controller:ViewportController):void {const {availableCamera,paneCamera}=controller;input('camera-sync').checked=state.cameraSync;const target=availableCamera();text('zoom-value',`${Math.round((target?paneCamera(target).zoom:1)*100)}% · ${target==='reference'?'Reference':'Rig'}`);button('fit').textContent=state.cameraSync?'Fit views':'Fit active';text('coordinates',state.cameraSync?'Cameras synchronized · drag to pan · scroll to zoom':'Independent cameras · drag to pan · scroll to zoom');}
38
62
  return {el,message,render,renderControls,
39
- geometry:target=>{const assets=host.assets(),player=host.player(),referenceSize=host.referenceSize();const box=target==='rig'?assets?.stage??player?.bounds():referenceSize?{x:0,y:0,...referenceSize}:null;if(!box||target==='rig'&&!player)return null;return {space:target==='rig'?'world':'image',box,marginX:target==='rig'?28:24,marginY:target==='rig'?58:56};},
40
- layoutKey:()=>{const assets=host.assets(),player=host.player(),referenceSize=host.referenceSize(),view=host.view(),referenceGeneration=host.referenceGeneration();const boxKey=assets?.stage??player?.bounds();return ['rig','reference'].map(target=>{const v=el(target+'-viewport');return `${v.clientWidth}:${v.clientHeight}`;}).join('|')+view+referenceGeneration+!!player+JSON.stringify(referenceSize)+JSON.stringify(boxKey);},
63
+ geometry:target=>{const referenceSize=host.referenceSize();const box=target==='rig'?rigFramingBox():referenceSize?{x:0,y:0,...referenceSize}:null;if(!box)return null;return {space:target==='rig'?'world':'image',box,marginX:target==='rig'?28:24,marginY:target==='rig'?58:56};},
64
+ layoutKey:()=>{const player=host.player(),referenceSize=host.referenceSize(),view=host.view(),referenceGeneration=host.referenceGeneration();const boxKey=rigFramingBox();return ['rig','reference'].map(target=>{const v=el(target+'-viewport');return `${v.clientWidth}:${v.clientHeight}`;}).join('|')+view+referenceGeneration+!!player+JSON.stringify(referenceSize)+JSON.stringify(boxKey);},
41
65
  selection:target=>{const parts=host.parts(),part=parts?.value();return {selected:!!part,bounds:target==='rig'&&part?parts?.bounds()??null:null};}
42
66
  };
43
67
  }