Release v2.10.3
This commit is contained in:
@@ -7,6 +7,7 @@ function getCurrentViewport() {
|
||||
}
|
||||
|
||||
var slideOutroTimers = [];
|
||||
var commandHeartbeatTimer = null;
|
||||
|
||||
// Command websocket and player-state helpers.
|
||||
// Send the current playback state to the command websocket.
|
||||
@@ -166,19 +167,11 @@ function getPlayerRegionModules() {
|
||||
return window.pulsePlayerRegionTypes.list();
|
||||
}
|
||||
|
||||
function isThumbnailPreview() {
|
||||
return Boolean(window.__pulseThumbnailPreview);
|
||||
}
|
||||
|
||||
function runRegionLifecycle(root, lifecycleName) {
|
||||
if (!root) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isThumbnailPreview() && lifecycleName === 'initRegion') {
|
||||
return;
|
||||
}
|
||||
|
||||
getPlayerRegionModules().forEach(function (entry) {
|
||||
var module = entry && entry.definition ? entry.definition : null;
|
||||
if (!module || typeof module[lifecycleName] !== 'function') {
|
||||
@@ -276,9 +269,7 @@ function renderSlideMarkup(markup, shouldFade) {
|
||||
syncRtmpRegions(root);
|
||||
}
|
||||
|
||||
if (!isThumbnailPreview()) {
|
||||
initializeRegionInstances(root);
|
||||
}
|
||||
initializeRegionInstances(root);
|
||||
|
||||
initializeRenderedVideoPlayback(root, delayMs);
|
||||
|
||||
@@ -330,13 +321,16 @@ function renderSlideMarkup(markup, shouldFade) {
|
||||
}
|
||||
|
||||
var nextShell = document.createElement('div');
|
||||
nextShell.className = 'slide-shell';
|
||||
nextShell.className = 'slide-shell slide-shell-entering';
|
||||
nextShell.style.zIndex = '0';
|
||||
nextShell.style.opacity = '0';
|
||||
nextShell.innerHTML = markup;
|
||||
|
||||
if (!previousShell || (previousShell.classList && previousShell.classList.contains('empty'))) {
|
||||
app.innerHTML = '';
|
||||
nextShell.style.opacity = '1';
|
||||
nextShell.classList.remove('slide-shell-entering');
|
||||
nextShell.classList.add('is-visible');
|
||||
app.appendChild(nextShell);
|
||||
schedulePostRenderSetup(nextShell, slideFadeDurationMs / 2);
|
||||
return nextShell;
|
||||
@@ -345,6 +339,9 @@ function renderSlideMarkup(markup, shouldFade) {
|
||||
if (!previousShell.classList.contains('slide-shell')) {
|
||||
previousShell.classList.add('slide-shell');
|
||||
}
|
||||
previousShell.classList.remove('is-visible');
|
||||
previousShell.classList.add('is-exiting');
|
||||
previousShell.style.zIndex = '1';
|
||||
previousShell.style.opacity = '1';
|
||||
pauseRenderedVideoPlayback(previousShell, slideFadeDurationMs / 2);
|
||||
|
||||
@@ -352,6 +349,8 @@ function renderSlideMarkup(markup, shouldFade) {
|
||||
window.requestAnimationFrame(function () {
|
||||
nextShell.style.opacity = '1';
|
||||
previousShell.style.opacity = '0';
|
||||
nextShell.classList.remove('slide-shell-entering');
|
||||
nextShell.classList.add('is-visible');
|
||||
schedulePostRenderSetup(nextShell, slideFadeDurationMs / 2);
|
||||
});
|
||||
|
||||
@@ -360,7 +359,10 @@ function renderSlideMarkup(markup, shouldFade) {
|
||||
previousShell.parentNode.removeChild(previousShell);
|
||||
}
|
||||
if (nextShell) {
|
||||
nextShell.style.zIndex = '1';
|
||||
nextShell.style.opacity = '1';
|
||||
nextShell.classList.remove('slide-shell-entering');
|
||||
nextShell.classList.add('is-visible');
|
||||
}
|
||||
slideTransitionTimer = null;
|
||||
}, slideFadeDurationMs);
|
||||
@@ -537,14 +539,28 @@ function handleCommandMessage(rawMessage) {
|
||||
handleClientIdConflict();
|
||||
return;
|
||||
}
|
||||
if (payload && payload.type === 'client-name-updated') {
|
||||
if (payload.clientName) {
|
||||
applyOnboardingClientName(payload.clientName, commandSocket);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!payload || payload.type !== 'command') {
|
||||
return;
|
||||
}
|
||||
|
||||
if (payload.requestId && commandSocket && commandSocket.readyState === WebSocket.OPEN) {
|
||||
commandSocket.send(JSON.stringify({
|
||||
type: 'command-ack',
|
||||
requestId: payload.requestId,
|
||||
ok: true
|
||||
}));
|
||||
}
|
||||
|
||||
switch (payload.command) {
|
||||
case 'refresh':
|
||||
refresh();
|
||||
refresh(true);
|
||||
return;
|
||||
case 'setclientname':
|
||||
if (payload.clientName) {
|
||||
@@ -602,7 +618,6 @@ function handleCommandMessage(rawMessage) {
|
||||
function handleClientIdConflict() {
|
||||
var replacementClientId = regenerateCommandClientId();
|
||||
var onboardingUrl = new URL('/', window.location.origin);
|
||||
onboardingUrl.searchParams.set('clientId', replacementClientId);
|
||||
window.location.replace(onboardingUrl.toString());
|
||||
}
|
||||
|
||||
@@ -629,6 +644,12 @@ function connectCommandSocket() {
|
||||
commandSocket = socket;
|
||||
|
||||
socket.onopen = function () {
|
||||
if (commandHeartbeatTimer) {
|
||||
window.clearInterval(commandHeartbeatTimer);
|
||||
}
|
||||
commandHeartbeatTimer = window.setInterval(function () {
|
||||
sendCommandState(lastRenderedSlide);
|
||||
}, 60 * 1000);
|
||||
if (typeof syncOnboardingClientNameFromServer === 'function') {
|
||||
syncOnboardingClientNameFromServer(socket).then(function () {
|
||||
sendCommandState(socket);
|
||||
@@ -643,6 +664,13 @@ function connectCommandSocket() {
|
||||
};
|
||||
|
||||
socket.onclose = function (event) {
|
||||
if (typeof logDebug === 'function') {
|
||||
logDebug('Command websocket closed.', 'code=' + String(event && event.code || '') + ' reason=' + String(event && event.reason || ''), 'warn');
|
||||
}
|
||||
if (commandHeartbeatTimer) {
|
||||
window.clearInterval(commandHeartbeatTimer);
|
||||
commandHeartbeatTimer = null;
|
||||
}
|
||||
commandSocket = null;
|
||||
if (event && event.code === 4009) {
|
||||
handleClientIdConflict();
|
||||
@@ -651,7 +679,10 @@ function connectCommandSocket() {
|
||||
scheduleCommandReconnect();
|
||||
};
|
||||
|
||||
socket.onerror = function () {
|
||||
socket.onerror = function (error) {
|
||||
if (typeof logDebug === 'function') {
|
||||
logDebug('Command websocket error.', error && error.message ? String(error.message) : 'Websocket transport error.', 'error');
|
||||
}
|
||||
try {
|
||||
socket.close();
|
||||
} catch (_error) {
|
||||
|
||||
Reference in New Issue
Block a user