Skip to content

fix: long videos resourceToken expires before video finish #2059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebiggz merged 4 commits into from
Feb 5, 2023
Merged

fix: long videos resourceToken expires before video finish #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9e20ec
fix: long videos resourceToken expires before video finish, retrieve …
dennisrijsdijk Feb 4, 2023
5c6e105
Use video overlay instance for getting duration
dennisrijsdijk Feb 4, 2023
cd5d4ea
Merge branch 'v5' into v5-video-length
zunderscore Feb 4, 2023
5927521
Merge branch 'v5' into v5-video-length
ebiggz Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion src/backend/effects/builtin/play-video.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,32 @@ const playVideo = {
return true;
}

const resourceToken = resourceTokenManager.storeResourcePath(data.filepath, effect.length);
const durationToken = resourceTokenManager.storeResourcePath(data.filepath, 5);

const durationPromise = new Promise(async (resolve, reject) => {
const listener = (event) => {
try {
if (event.name === "video-duration" && event.data.resourceToken === durationToken) {
webServer.removeListener("overlay-event", listener);
resolve(event.data.duration);
}
} catch (err) {
logger.error("Error while trying to process overlay-event for getVideoDuration: ", err);
reject(err);
}
};
webServer.on("overlay-event", listener);
});

webServer.sendToOverlay("getVideoDuration", {
resourceToken: durationToken,
overlayInstance: data.overlayInstance
});

const duration = await durationPromise;

const resourceToken = resourceTokenManager.storeResourcePath(data.filepath, duration + 5);
logger.info(`Retrieved duration for video: ${duration}`);
data.resourceToken = resourceToken;

webServer.sendToOverlay("video", data);
Expand All @@ -452,6 +477,7 @@ const playVideo = {
}
} catch (err) {
logger.error("Error while trying to process overlay-event for play-video: ", err);
reject(err);
}
};
webServer.on("overlay-event", listener);
Expand Down
15 changes: 15 additions & 0 deletions src/resources/overlay/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ function overlaySocketConnect(){
return;
}

if(event == "getVideoDuration") {
const token = encodeURIComponent(data.meta.resourceToken);
const url = `http://${window.location.hostname}:7472/resource/${token}`;
const videoElement = `
<video id="${token}" class="player" style="display:none;">
<source src="${url}">
</video>
`;
$(".wrapper").append(videoElement);
const video = document.getElementById(token);
video.oncanplay = () => {
sendWebsocketEvent("video-duration", {resourceToken: token, duration: Math.ceil(video.duration)});
video.remove();
}
}

firebotOverlay.emit(event, data.meta);
};
Expand Down