fix: resolve node demo launch policy before opening its player

2026-10-06 03:35:21 -04:00
parent a67cffe88d
commit 69cd4021f2
4 changed files with 105 additions and 10 deletions
@@ -6,6 +6,38 @@ const demo = () => ({ scope: 'single-node-demo', expires_at: new Date(Date.now()

 afterEach(() => { vi.unstubAllGlobals(); localStorage.clear() })
 describe('node-scoped demo catalog', () => {
+  it('resolves launch policy before a slow public storefront and deduplicates requests', async () => {
+    vi.resetModules()
+    let release!: (value: unknown) => void
+    const pending = new Promise(resolve => { release = resolve })
+    const fetcher = vi.fn((_url: string) => pending)
+    vi.stubGlobal('fetch', fetcher)
+    const { ensureNodeAppAvailable, appHasMediaBridge } = await import('../curatedApps')
+    const first = ensureNodeAppAvailable('node-demo-v4v')
+    const second = ensureNodeAppAvailable('node-demo-v4v')
+    expect(fetcher).toHaveBeenCalledTimes(1)
+    expect(fetcher.mock.calls[0]?.[0]).toBe('/api/node-app-catalog')
+    expect(appHasMediaBridge('node-demo-v4v')).toBe(false)
+    const payload = demo()
+    Object.assign(payload.apps['node-demo-v4v'].manifest.app, { metadata: { launch: { media_controls: 'archipelago-v1' } } })
+    release({ ok: true, json: async () => payload })
+    expect(await first).toBe(true)
+    expect(await second).toBe(true)
+    expect(appHasMediaBridge('node-demo-v4v')).toBe(true)
+    expect(await ensureNodeAppAvailable('node-demo-v4v')).toBe(true)
+    expect(fetcher).toHaveBeenCalledTimes(1)
+  })
+  it('fails closed for unavailable and expired launch policy', async () => {
+    vi.resetModules()
+    const fetcher = vi.fn(async () => ({ ok: true, json: async () => ({ ...demo(), expires_at: '2000-01-01T00:00:00Z' }) }))
+    vi.stubGlobal('fetch', fetcher)
+    const { ensureNodeAppAvailable, appHasMediaBridge } = await import('../curatedApps')
+    expect(await ensureNodeAppAvailable('node-demo-v4v')).toBe(false)
+    expect(appHasMediaBridge('node-demo-v4v')).toBe(false)
+    fetcher.mockRejectedValueOnce(new Error('offline'))
+    expect(await ensureNodeAppAvailable('node-demo-v4v')).toBe(false)
+  })
+
  it.each([{}, [null]])('ignores malformed optional promotions: %j', async promotions => {
    vi.resetModules()
    vi.stubGlobal('fetch', vi.fn(async (url: string) => {
@@ -105,8 +105,41 @@ export function signedCatalogToApps(catalog: SignedAppCatalog): MarketplaceApp[]
 *  after fetchAppCatalog() has run. Test-hookable. */
 let signedCatalogCache: SignedAppCatalog | null = null
 let nodeCatalogCache: SignedAppCatalog | null = null
+let nodeCatalogExpires = 0
+let nodeCatalogRequest: Promise<SignedAppCatalog | null> | null = null
+export function nodeAppIsAvailable(id: string): boolean {
+  return nodeCatalogExpires > Date.now() && Boolean(nodeCatalogCache?.apps[id])
+}
 export function appHasMediaBridge(id: string): boolean {
-  return nodeCatalogCache?.apps[id]?.manifest?.app?.metadata?.launch?.media_controls === 'archipelago-v1'
+  return nodeAppIsAvailable(id) && nodeCatalogCache?.apps[id]?.manifest?.app?.metadata?.launch?.media_controls === 'archipelago-v1'
+}
+
+/** Resolve node-owned launch policy independently of the public storefront.
+ * Home/companion launches must not depend on visiting Discover first. */
+async function fetchNodeCatalog(): Promise<SignedAppCatalog | null> {
+  if (nodeCatalogRequest) return nodeCatalogRequest
+  nodeCatalogRequest = (async () => {
+    try {
+      const response = await fetch('/api/node-app-catalog', { credentials: 'include', signal: AbortSignal.timeout(5000) })
+      const node = response.ok ? await response.json() : null
+      if (node?.scope !== 'single-node-demo' || !node.apps || Array.isArray(node.apps)
+        || !Object.keys(node.apps).every(id => id.startsWith('node-demo-'))
+        || !(Date.parse(node.expires_at) > Date.now())) throw new Error('Unavailable node catalog')
+      nodeCatalogCache = node as SignedAppCatalog
+      nodeCatalogExpires = Date.parse(node.expires_at)
+      return nodeCatalogCache
+    } catch {
+      nodeCatalogCache = null
+      nodeCatalogExpires = 0
+      return null
+    } finally { nodeCatalogRequest = null }
+  })()
+  return nodeCatalogRequest
+}
+
+export async function ensureNodeAppAvailable(id: string): Promise<boolean> {
+  if (!nodeAppIsAvailable(id)) await fetchNodeCatalog()
+  return nodeAppIsAvailable(id)
 }


@@ -197,14 +230,8 @@ const CATALOG_URLS = [
 * storage or the global release catalog. A copied catalog is rejected by the
 * daemon unless its release signature and exact node audience match. */
 export async function fetchAppCatalog(): Promise<AppCatalog | null> {
-  const nodeRequest = fetch('/api/node-app-catalog', { credentials: 'include', signal: AbortSignal.timeout(5000) })
-    .then(async response => response.ok ? await response.json() : null).catch(() => null)
-  const [base, node] = await Promise.all([fetchBaseAppCatalog(), nodeRequest])
-  nodeCatalogCache = null
-  if (!base || node?.scope !== 'single-node-demo' || !node.apps || Array.isArray(node.apps)
-      || !Object.keys(node.apps).every(id => id.startsWith('node-demo-'))
-      || !(Date.parse(node.expires_at) > Date.now())) return base
-  nodeCatalogCache = node as SignedAppCatalog
+  const [base, node] = await Promise.all([fetchBaseAppCatalog(), fetchNodeCatalog()])
+  if (!base || !node) return base
  const known = new Set(base.apps.map(app => app.id))
  const additions = signedCatalogToApps(node).filter(app => !known.has(app.id))
  const demoIds = new Set(additions.map(app => app.id))