fix: don't display any image by default, everything goes through queue
This commit is contained in:
parent
ae5820a022
commit
33491dba3e
3 changed files with 41 additions and 45 deletions
|
@ -469,6 +469,10 @@ async function processScrolls(svg: XMLDocument): Promise<VideoScrollDef[]> {
|
||||||
|
|
||||||
return Promise.all(
|
return Promise.all(
|
||||||
Array.from(svg.getElementsByTagName("image"))
|
Array.from(svg.getElementsByTagName("image"))
|
||||||
|
.map((el) => {
|
||||||
|
el.removeAttribute("xlink:href");
|
||||||
|
return el;
|
||||||
|
})
|
||||||
.filter((el) =>
|
.filter((el) =>
|
||||||
Array.from(el.children).some((el) => el.tagName == "desc")
|
Array.from(el.children).some((el) => el.tagName == "desc")
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,18 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="video-scroll" ref="root" v-if="definition.directions.length > 0">
|
<div class="video-scroll" ref="root" v-if="definition.directions.length > 0">
|
||||||
<img
|
|
||||||
class="visible displayed loaded"
|
|
||||||
:src="definition.files[0]"
|
|
||||||
:style="{
|
|
||||||
top: `${Math.round(definition.top)}px`,
|
|
||||||
left: `${Math.round(definition.left)}px`,
|
|
||||||
width: isHorizontal ? `${Math.round(definition.width)}px` : 'auto',
|
|
||||||
height: isVertical ? `${Math.round(definition.height)}px` : 'auto',
|
|
||||||
transform: `rotate(${definition.angle}deg)`,
|
|
||||||
}"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!--suppress RequiredAttributes -->
|
|
||||||
<img
|
<img
|
||||||
v-for="(file, idx) in dynamicFiles"
|
v-for="(file, idx) in dynamicFiles"
|
||||||
:key="`${idx}_${file.src}`"
|
:key="`${idx}_${file.src}`"
|
||||||
|
@ -43,7 +30,7 @@ export default defineComponent({
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
dynamicFiles(): { top: number; left: number; src: string }[] {
|
dynamicFiles(): { top: number; left: number; src: string }[] {
|
||||||
return this.definition.files.slice(1).map((src: string, idx: number) => {
|
return this.definition.files.map((src: string, idx: number) => {
|
||||||
const cy =
|
const cy =
|
||||||
this.definition.top +
|
this.definition.top +
|
||||||
(this.isVertical
|
(this.isVertical
|
||||||
|
@ -93,14 +80,14 @@ export default defineComponent({
|
||||||
// Setup image display when loaded
|
// Setup image display when loaded
|
||||||
element.classList.add("displayed");
|
element.classList.add("displayed");
|
||||||
element.classList.add("loaded");
|
element.classList.add("loaded");
|
||||||
|
|
||||||
// Adjust dimensions based on scroll direction
|
// Adjust dimensions based on scroll direction
|
||||||
if (this.isHorizontal) {
|
if (this.isHorizontal) {
|
||||||
element.style.height = "auto";
|
element.style.height = "auto";
|
||||||
} else {
|
} else {
|
||||||
element.style.width = "auto";
|
element.style.width = "auto";
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
const observer = new IntersectionObserver((entries, _) => {
|
const observer = new IntersectionObserver((entries, _) => {
|
||||||
|
@ -114,7 +101,7 @@ export default defineComponent({
|
||||||
queueImageForLoading(element, function() {
|
queueImageForLoading(element, function() {
|
||||||
self.handleImageLoad(element);
|
self.handleImageLoad(element);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add a fallback to show the image after a timeout even if not fully loaded
|
// Add a fallback to show the image after a timeout even if not fully loaded
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (!element.classList.contains("loaded")) {
|
if (!element.classList.contains("loaded")) {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Configuration
|
// Configuration
|
||||||
const MAX_CONCURRENT_LOADS = 3;
|
const MAX_CONCURRENT_LOADS = 1;
|
||||||
|
|
||||||
// State
|
// State
|
||||||
let activeLoads = 0;
|
let activeLoads = 0;
|
||||||
|
@ -35,10 +35,12 @@ export function queueAudioForLoading(
|
||||||
if (onComplete) setTimeout(() => onComplete(blobUrl), 0);
|
if (onComplete) setTimeout(() => onComplete(blobUrl), 0);
|
||||||
return Promise.resolve(blobUrl);
|
return Promise.resolve(blobUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If this source is already being loaded, add to existing promises
|
// If this source is already being loaded, add to existing promises
|
||||||
if (pendingLoads.has(src)) {
|
if (pendingLoads.has(src)) {
|
||||||
console.debug(`[AudioLoader] Already loading ${src}, adding to pending requests`);
|
console.debug(
|
||||||
|
`[AudioLoader] Already loading ${src}, adding to pending requests`
|
||||||
|
);
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
audioQueue.push({
|
audioQueue.push({
|
||||||
src,
|
src,
|
||||||
|
@ -49,14 +51,14 @@ export function queueAudioForLoading(
|
||||||
onError: (error) => {
|
onError: (error) => {
|
||||||
if (onError) onError(error);
|
if (onError) onError(error);
|
||||||
reject(error);
|
reject(error);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mark as pending
|
// Mark as pending
|
||||||
pendingLoads.add(src);
|
pendingLoads.add(src);
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
// Add to queue
|
// Add to queue
|
||||||
audioQueue.push({
|
audioQueue.push({
|
||||||
|
@ -68,7 +70,7 @@ export function queueAudioForLoading(
|
||||||
onError: (error) => {
|
onError: (error) => {
|
||||||
if (onError) onError(error);
|
if (onError) onError(error);
|
||||||
reject(error);
|
reject(error);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// Try to process queue
|
// Try to process queue
|
||||||
|
@ -81,35 +83,38 @@ export function queueAudioForLoading(
|
||||||
*/
|
*/
|
||||||
function processQueue() {
|
function processQueue() {
|
||||||
// Group queue items by src to avoid duplicate loads
|
// Group queue items by src to avoid duplicate loads
|
||||||
const nextBatch: Record<string, Array<{
|
const nextBatch: Record<
|
||||||
onComplete: (blobUrl: string) => void;
|
string,
|
||||||
onError: (error: Error) => void;
|
Array<{
|
||||||
}>> = {};
|
onComplete: (blobUrl: string) => void;
|
||||||
|
onError: (error: Error) => void;
|
||||||
|
}>
|
||||||
|
> = {};
|
||||||
|
|
||||||
// Find next items to process while respecting MAX_CONCURRENT_LOADS
|
// Find next items to process while respecting MAX_CONCURRENT_LOADS
|
||||||
while (activeLoads < MAX_CONCURRENT_LOADS && audioQueue.length > 0) {
|
while (activeLoads < MAX_CONCURRENT_LOADS && audioQueue.length > 0) {
|
||||||
const next = audioQueue.shift();
|
const next = audioQueue.shift();
|
||||||
if (!next) continue;
|
if (!next) continue;
|
||||||
|
|
||||||
// If already cached, complete immediately without consuming a slot
|
// If already cached, complete immediately without consuming a slot
|
||||||
if (loadedAudioCache[next.src]) {
|
if (loadedAudioCache[next.src]) {
|
||||||
next.onComplete(loadedAudioCache[next.src]);
|
next.onComplete(loadedAudioCache[next.src]);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Group by src
|
// Group by src
|
||||||
if (!nextBatch[next.src]) {
|
if (!nextBatch[next.src]) {
|
||||||
nextBatch[next.src] = [];
|
nextBatch[next.src] = [];
|
||||||
// Each unique src counts as one active load
|
// Each unique src counts as one active load
|
||||||
activeLoads++;
|
activeLoads++;
|
||||||
}
|
}
|
||||||
|
|
||||||
nextBatch[next.src].push({
|
nextBatch[next.src].push({
|
||||||
onComplete: next.onComplete,
|
onComplete: next.onComplete,
|
||||||
onError: next.onError
|
onError: next.onError,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start loading each unique audio file
|
// Start loading each unique audio file
|
||||||
Object.entries(nextBatch).forEach(([src, handlers]) => {
|
Object.entries(nextBatch).forEach(([src, handlers]) => {
|
||||||
loadAudio(src, handlers);
|
loadAudio(src, handlers);
|
||||||
|
@ -130,40 +135,40 @@ async function loadAudio(
|
||||||
}>
|
}>
|
||||||
) {
|
) {
|
||||||
console.debug(`[AudioLoader] Loading ${src} (${handlers.length} listeners)`);
|
console.debug(`[AudioLoader] Loading ${src} (${handlers.length} listeners)`);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Fetch the entire audio file
|
// Fetch the entire audio file
|
||||||
const response = await fetch(src);
|
const response = await fetch(src);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`Failed to load audio: ${response.statusText}`);
|
throw new Error(`Failed to load audio: ${response.statusText}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert to blob to ensure full download
|
// Convert to blob to ensure full download
|
||||||
const blob = await response.blob();
|
const blob = await response.blob();
|
||||||
|
|
||||||
// Create a blob URL to use as the audio source
|
// Create a blob URL to use as the audio source
|
||||||
const blobUrl = URL.createObjectURL(blob);
|
const blobUrl = URL.createObjectURL(blob);
|
||||||
|
|
||||||
// Store in cache
|
// Store in cache
|
||||||
loadedAudioCache[src] = blobUrl;
|
loadedAudioCache[src] = blobUrl;
|
||||||
|
|
||||||
console.debug(`[AudioLoader] Successfully loaded ${src}`);
|
console.debug(`[AudioLoader] Successfully loaded ${src}`);
|
||||||
|
|
||||||
// Call all completion handlers
|
// Call all completion handlers
|
||||||
handlers.forEach(handler => handler.onComplete(blobUrl));
|
handlers.forEach((handler) => handler.onComplete(blobUrl));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[AudioLoader] Error loading audio: ${error}`);
|
console.error(`[AudioLoader] Error loading audio: ${error}`);
|
||||||
|
|
||||||
// Call all error handlers
|
// Call all error handlers
|
||||||
handlers.forEach(handler => handler.onError(error as Error));
|
handlers.forEach((handler) => handler.onError(error as Error));
|
||||||
} finally {
|
} finally {
|
||||||
// Remove from pending loads
|
// Remove from pending loads
|
||||||
pendingLoads.delete(src);
|
pendingLoads.delete(src);
|
||||||
|
|
||||||
// Decrement counter when audio is loaded (or failed)
|
// Decrement counter when audio is loaded (or failed)
|
||||||
activeLoads--;
|
activeLoads--;
|
||||||
|
|
||||||
// Process next audio in queue if available
|
// Process next audio in queue if available
|
||||||
processQueue();
|
processQueue();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue