@lincyaw/addon-lecture 1.0.0-rc.10 → 1.0.0-rc.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lincyaw/addon-lecture",
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "description": "Presmium plugin: lecture tracks: recording, playback, scripted lectures with speech, and video export (presmium-lecture)",
   "license": "Apache-2.0",
   "repository": {
@@ -41,9 +41,9 @@
     "playwright-chromium": "^1.40.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "@lincyaw/compiler": "^1.0.0-rc.10",
-    "@lincyaw/host": "^1.0.0-rc.10",
-    "@lincyaw/kernel": "^1.0.0-rc.10"
+    "@lincyaw/compiler": "^1.0.0-rc.11",
+    "@lincyaw/host": "^1.0.0-rc.11",
+    "@lincyaw/kernel": "^1.0.0-rc.11"
   },
   "peerDependenciesMeta": {
     "playwright-chromium": {
@@ -57,11 +57,11 @@
     "@types/react": "18.3.28",
     "react-dom": "18.3.1",
     "@types/react-dom": "18.3.7",
-    "@lincyaw/cli": "1.0.0-rc.10",
-    "@lincyaw/host": "1.0.0-rc.10",
-    "@lincyaw/compiler": "1.0.0-rc.10",
-    "@lincyaw/viewer": "1.0.0-rc.10",
-    "@lincyaw/kernel": "1.0.0-rc.10"
+    "@lincyaw/cli": "1.0.0-rc.11",
+    "@lincyaw/compiler": "1.0.0-rc.11",
+    "@lincyaw/viewer": "1.0.0-rc.11",
+    "@lincyaw/kernel": "1.0.0-rc.11",
+    "@lincyaw/host": "1.0.0-rc.11"
   },
   "presmium": {
     "preview": {

package/src/client/playback.ts

@@ -18,14 +18,25 @@ async function createClock(track: LectureTrack, source: LectureSource, signal?:
   const length = trackDuration(track)
   const segments = audioSegments(track)
   if (!segments.length) return new SilentClock(length)
+  // Clips cut from one file (a score split per step) share one download.
+  const files = new Map<string, Promise<string>>()
+  const fileOf = (segment: typeof segments[number]) => {
+    const key = segment.sha256 ?? segment.assetId ?? segment.src
+    let url = files.get(key)
+    if (!url) {
+      url = track.binding && source.productionMedia && segment.clipId ? source.productionMedia(track.binding, segment.clipId, signal) : source.media(track.id, segment.src)
+      files.set(key, url)
+    }
+    return url
+  }
   const loaded = await Promise.allSettled(segments.map(async (segment): Promise<ClockMedia> => {
     if (track.binding && source.productionMedia && !segment.clipId) throw new Error('production-clip-unavailable')
-    const url = track.binding && source.productionMedia && segment.clipId ? await source.productionMedia(track.binding, segment.clipId, signal) : await source.media(track.id, segment.src)
+    const url = await fileOf(segment)
     return { url, start: segment.start, duration: segment.duration, sourceStartMs: segment.sourceStartMs, volume: segment.volume, muted: segment.muted }
   }))
   const media = loaded.flatMap(result => result.status === 'fulfilled' ? [result.value] : [])
   const failed = loaded.find(result => result.status === 'rejected')
-  if (failed || signal?.aborted) { for (const { url } of media) if (url.startsWith('blob:')) URL.revokeObjectURL(url); if (failed) throw failed.reason; signal?.throwIfAborted() }
+  if (failed || signal?.aborted) { for (const url of new Set(media.map(item => item.url))) if (url.startsWith('blob:')) URL.revokeObjectURL(url); if (failed) throw failed.reason; signal?.throwIfAborted() }
   return new MediaClock(length, media)
 }
 function installExportHook(player: LecturePlayer, clock: StepClock | undefined): void {

package/src/domain/track.ts

@@ -289,6 +289,9 @@ export function trackDuration(track: LectureTrack): number {
 export interface AudioSegment {
   clipId?: string
   src: string
+  /** The file a clip is cut from, when known: clips of one file share one download. */
+  sha256?: string
+  assetId?: string
   start: number
   duration: number
   sourceStartMs?: number
@@ -298,5 +301,5 @@ export interface AudioSegment {
 
 export function audioSegments(track: LectureTrack): AudioSegment[] {
   const said = track.utterances.filter(u => u.clip).map(u => ({ src: `${CLIPS_DIR}/${u.clip}`, start: u.t, duration: u.d, ...u.clipId ? { clipId: u.clipId } : {} }))
-  return [...said, ...(track.audio ?? []).map(a => ({ src: a.src, start: a.start * 1000, duration: a.duration * 1000, ...a.clipId ? { clipId: a.clipId } : {}, ...a.sourceStartMs !== undefined ? { sourceStartMs: a.sourceStartMs } : {}, ...a.volume !== undefined ? { volume: a.volume } : {}, ...a.muted !== undefined ? { muted: a.muted } : {} }))]
+  return [...said, ...(track.audio ?? []).map(a => ({ src: a.src, start: a.start * 1000, duration: a.duration * 1000, ...a.clipId ? { clipId: a.clipId } : {}, ...a.sha256 ? { sha256: a.sha256 } : {}, ...a.assetId ? { assetId: a.assetId } : {}, ...a.sourceStartMs !== undefined ? { sourceStartMs: a.sourceStartMs } : {}, ...a.volume !== undefined ? { volume: a.volume } : {}, ...a.muted !== undefined ? { muted: a.muted } : {} }))]
 }

package/src/node/routes/production.ts

@@ -1,14 +1,18 @@
+import { createHash } from 'node:crypto'
 import { errorMessage, jsonResponse } from '@lincyaw/kernel'
 import type { ProductionMediaQuery, ProductionPlanQuery, Route } from '@lincyaw/kernel'
 import { productionAsset, productionMedia, productionSnapshot } from '../production.ts'
 import { ProductionAssetRefusal } from '../production-assets.ts'
 import { canonicalSource, VoiceSourceRefusal } from '../voice-source.ts'
-import { serveFile } from './serve-file.ts'
+import { MEDIA_CACHE, notModified, serveFile } from './serve-file.ts'
 import { RouteRefusal } from './served-deck.ts'
 import type { ServedDeck } from './served-deck.ts'
 
 function audioBytes(bytes: Uint8Array<ArrayBuffer>, mediaType: string, request: Request): Response {
-  const size = bytes.byteLength, headers = { 'Content-Type': mediaType, 'Cache-Control': 'no-store', 'Accept-Ranges': 'bytes' }
+  const etag = `"${createHash('sha256').update(bytes).digest('base64url').slice(0, 22)}"`
+  const size = bytes.byteLength, headers = { 'Content-Type': mediaType, 'Cache-Control': MEDIA_CACHE, 'Accept-Ranges': 'bytes', ETag: etag }
+  const unchanged = notModified(request, etag, headers)
+  if (unchanged) return unchanged
   const range = /^bytes=(\d*)-(\d*)$/.exec(request.headers.get('range') ?? '')
   if (!range || !range[1] && !range[2]) return new Response(request.method === 'HEAD' ? null : bytes, { headers: { ...headers, 'Content-Length': String(size) } })
   const start = range[1] ? Number(range[1]) : Math.max(0, size - Number(range[2]))

package/src/node/routes/serve-file.ts

@@ -14,16 +14,29 @@ const TYPES: Record<string, string> = {
   '.mp3': 'audio/mpeg',
 }
 
+/**
+ * Media may change while the author works, so the browser keeps it but asks again each time (`no-cache`): an unchanged
+ * file answers 304 by its tag, and a reader who plays the same piece again, or several clips of one file, loads it once.
+ */
+export const MEDIA_CACHE = 'private, no-cache'
+
+export function notModified(request: Request, etag: string, headers: Record<string, string>): Response | undefined {
+  return request.headers.get('if-none-match')?.split(',').some(tag => tag.trim() === etag) ? new Response(null, { status: 304, headers: { ...headers, ETag: etag } }) : undefined
+}
+
 export function serveFile(deckDir: string, file: string | undefined, request: Request): Response {
   const fd = file === undefined ? undefined : openInDeck(deckDir, file)
   if (fd === undefined) return problemResponse(404, 'no such file')
-  const { size } = fstatSync(fd)
-  const headers = { 'Content-Type': TYPES[extname(file!)] ?? 'application/octet-stream', 'Accept-Ranges': 'bytes', 'Cache-Control': 'no-store' }
+  const { size, mtimeMs } = fstatSync(fd)
+  const etag = `"${size.toString(36)}-${Math.round(mtimeMs).toString(36)}"`
+  const headers = { 'Content-Type': TYPES[extname(file!)] ?? 'application/octet-stream', 'Accept-Ranges': 'bytes', 'Cache-Control': MEDIA_CACHE, ETag: etag }
   const body = (start: number, end: number) => Readable.toWeb(createReadStream('', { fd, start, end })) as ReadableStream<Uint8Array>
   const empty = (response: Response) => {
     closeSync(fd)
     return response
   }
+  const unchanged = notModified(request, etag, headers)
+  if (unchanged) return empty(unchanged)
   const range = /^bytes=(\d*)-(\d*)$/.exec(request.headers.get('range') ?? '')
   if (!range || (!range[1] && !range[2])) {
     if (size === 0 || request.method === 'HEAD') return empty(new Response(null, { headers: { ...headers, 'Content-Length': String(size) } }))