Split web and player build artifacts
This commit is contained in:
+208
-37
@@ -30,8 +30,12 @@ async function start() {
|
||||
const MEDIA_DIR = path.join(__dirname, '..', 'media');
|
||||
const ONBOARDING_QUEUE_FILE = path.join(MEDIA_DIR, 'player-onboarding-queue.json');
|
||||
const DB_SYNC_INTERVAL_MS = Number(process.env.PLAYER_DB_SYNC_INTERVAL_MS || 15000);
|
||||
const RECONNECT_SYNC_STALE_MS = 60 * 1000;
|
||||
const onboardingStore = createOnboardingStore(ONBOARDING_QUEUE_FILE);
|
||||
let thinClientSocket = null;
|
||||
let lastDisconnectAt = 0;
|
||||
let playerPublicBaseUrl = PLAYER_PUBLIC_URL || null;
|
||||
let refreshThinClientRegistration = null;
|
||||
const playerRuntime = createPlayerRuntime({
|
||||
pool: pool,
|
||||
normalizeDeviceId: normalizeDeviceId,
|
||||
@@ -67,6 +71,35 @@ async function start() {
|
||||
|
||||
let hasLoggedPlayerStartup = false;
|
||||
|
||||
function normalizePlayerPublicBaseUrl(value) {
|
||||
const normalized = String(value || '').trim().replace(/\/$/, '');
|
||||
if (!normalized) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return new URL(normalized).origin.replace(/\/$/, '');
|
||||
} catch (_error) {
|
||||
return normalized;
|
||||
}
|
||||
}
|
||||
|
||||
function setPlayerPublicBaseUrl(value) {
|
||||
const nextBaseUrl = normalizePlayerPublicBaseUrl(value);
|
||||
if (!nextBaseUrl || nextBaseUrl === playerPublicBaseUrl) {
|
||||
return;
|
||||
}
|
||||
|
||||
playerPublicBaseUrl = nextBaseUrl;
|
||||
if (typeof refreshThinClientRegistration === 'function') {
|
||||
refreshThinClientRegistration();
|
||||
}
|
||||
}
|
||||
|
||||
function getPlayerPublicBaseUrl() {
|
||||
return playerPublicBaseUrl;
|
||||
}
|
||||
|
||||
function logPlayerStartup(connectionState) {
|
||||
if (hasLoggedPlayerStartup) {
|
||||
return;
|
||||
@@ -76,7 +109,7 @@ async function start() {
|
||||
console.info('[player] startup', {
|
||||
mode: isRemotePlayer ? 'bridge client' : 'local',
|
||||
connected: connectionState && typeof connectionState.connected === 'boolean' ? connectionState.connected : false,
|
||||
publicBaseUrl: PLAYER_PUBLIC_URL || null,
|
||||
publicBaseUrl: getPlayerPublicBaseUrl(),
|
||||
bridgeBaseUrl: PLAYER_INTERNAL_URL || null,
|
||||
bridgeWebSocketUrl: BRIDGE_PUBLIC_URL ? createThinClientWebSocketUrl() : null
|
||||
});
|
||||
@@ -104,25 +137,96 @@ async function start() {
|
||||
return false;
|
||||
}
|
||||
|
||||
const requestBody = {
|
||||
playerIdentifier: PLAYER_DEVICE_ID,
|
||||
playerPublicBaseUrl: getPlayerPublicBaseUrl(),
|
||||
playerInternalBaseUrl: PLAYER_INTERNAL_URL
|
||||
};
|
||||
|
||||
try {
|
||||
console.info('[player] Triggering startup media sync', {
|
||||
playerIdentifier: PLAYER_DEVICE_ID,
|
||||
bridgeBaseUrl: BRIDGE_PUBLIC_URL
|
||||
});
|
||||
const authHeaders = createRequestAuthHeaders({
|
||||
method: 'POST',
|
||||
pathname: '/api/internal/sync/player-media'
|
||||
pathname: '/api/internal/sync/player-media',
|
||||
body: requestBody
|
||||
});
|
||||
const response = await fetch(`${BRIDGE_PUBLIC_URL}/api/internal/sync/player-media`, {
|
||||
method: 'POST',
|
||||
headers: Object.assign({
|
||||
Accept: 'application/json'
|
||||
}, authHeaders)
|
||||
Accept: 'application/json',
|
||||
'Content-Type': 'application/json'
|
||||
}, authHeaders),
|
||||
body: JSON.stringify(requestBody)
|
||||
});
|
||||
|
||||
console.info('[player] Startup media sync response', {
|
||||
ok: Boolean(response && response.ok),
|
||||
status: response && response.status ? response.status : null
|
||||
});
|
||||
|
||||
return Boolean(response && response.ok);
|
||||
} catch (_error) {
|
||||
console.warn('[player] Startup media sync failed');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function triggerWebFontSync() {
|
||||
if (!isRemotePlayer || !BRIDGE_PUBLIC_URL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const requestBody = {
|
||||
playerIdentifier: PLAYER_DEVICE_ID,
|
||||
playerPublicBaseUrl: getPlayerPublicBaseUrl(),
|
||||
playerInternalBaseUrl: PLAYER_INTERNAL_URL
|
||||
};
|
||||
|
||||
try {
|
||||
console.info('[player] Triggering startup font sync', {
|
||||
playerIdentifier: PLAYER_DEVICE_ID,
|
||||
bridgeBaseUrl: BRIDGE_PUBLIC_URL
|
||||
});
|
||||
const authHeaders = createRequestAuthHeaders({
|
||||
method: 'POST',
|
||||
pathname: '/api/internal/sync/player-font',
|
||||
body: requestBody
|
||||
});
|
||||
const response = await fetch(`${BRIDGE_PUBLIC_URL}/api/internal/sync/player-font`, {
|
||||
method: 'POST',
|
||||
headers: Object.assign({
|
||||
Accept: 'application/json',
|
||||
'Content-Type': 'application/json'
|
||||
}, authHeaders),
|
||||
body: JSON.stringify(requestBody)
|
||||
});
|
||||
|
||||
console.info('[player] Startup font sync response', {
|
||||
ok: Boolean(response && response.ok),
|
||||
status: response && response.status ? response.status : null
|
||||
});
|
||||
|
||||
return Boolean(response && response.ok);
|
||||
} catch (_error) {
|
||||
console.warn('[player] Startup font sync failed');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
let webMediaSyncCompleted = false;
|
||||
let webFontSyncCompleted = false;
|
||||
let webFontSyncTriggered = false;
|
||||
|
||||
function shouldTriggerReconnectSync() {
|
||||
if (!lastDisconnectAt) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return Date.now() - lastDisconnectAt >= RECONNECT_SYNC_STALE_MS;
|
||||
}
|
||||
|
||||
async function handleThinClientCommand(socket, rawMessage) {
|
||||
let payload = null;
|
||||
@@ -153,9 +257,18 @@ async function start() {
|
||||
response.error = 'Invalid media payload.';
|
||||
} else {
|
||||
const bodyBuffer = Buffer.from(bodyBase64, 'base64');
|
||||
console.info('[player] Writing media file', {
|
||||
relativePath: relativePath,
|
||||
filePath: filePath,
|
||||
bytes: bodyBuffer.length
|
||||
});
|
||||
await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
|
||||
await fs.promises.writeFile(filePath, bodyBuffer);
|
||||
response.ok = true;
|
||||
console.info('[player] Media file written', {
|
||||
relativePath: relativePath,
|
||||
filePath: filePath
|
||||
});
|
||||
}
|
||||
} else if (command === 'media-delete') {
|
||||
const relativePath = String(payload.relativePath || payload.filename || '').trim();
|
||||
@@ -163,6 +276,10 @@ async function start() {
|
||||
if (!filePath) {
|
||||
response.error = 'Invalid media path.';
|
||||
} else {
|
||||
console.info('[player] Removing media file', {
|
||||
relativePath: relativePath,
|
||||
filePath: filePath
|
||||
});
|
||||
try {
|
||||
await fs.promises.unlink(filePath);
|
||||
} catch (error) {
|
||||
@@ -171,6 +288,10 @@ async function start() {
|
||||
}
|
||||
}
|
||||
response.ok = true;
|
||||
console.info('[player] Media file removed', {
|
||||
relativePath: relativePath,
|
||||
filePath: filePath
|
||||
});
|
||||
}
|
||||
} else if (['refresh', 'reload', 'redirect', 'pause', 'blackout', 'previous', 'next', 'setclientname'].indexOf(command) !== -1) {
|
||||
const screenSlug = String(payload.screenSlug || payload.slug || '').trim();
|
||||
@@ -212,7 +333,7 @@ async function start() {
|
||||
common: common,
|
||||
playerRuntime: playerRuntime,
|
||||
onboardingStore: onboardingStore,
|
||||
playerPublicBaseUrl: PLAYER_PUBLIC_URL,
|
||||
playerPublicBaseUrl: getPlayerPublicBaseUrl(),
|
||||
playerInternalBaseUrl: PLAYER_INTERNAL_URL,
|
||||
bridgeBaseUrl: BRIDGE_PUBLIC_URL,
|
||||
playerDeviceId: PLAYER_DEVICE_ID
|
||||
@@ -225,10 +346,10 @@ async function start() {
|
||||
playerRuntime: playerRuntime,
|
||||
playerPlaylistService: playerPlaylistService,
|
||||
rtmpStreamService: rtmpStreamService,
|
||||
playerPublicBaseUrl: PLAYER_PUBLIC_URL,
|
||||
playerInternalBaseUrl: PLAYER_INTERNAL_URL,
|
||||
bridgeBaseUrl: BRIDGE_PUBLIC_URL,
|
||||
playerDeviceId: PLAYER_DEVICE_ID
|
||||
playerDeviceId: PLAYER_DEVICE_ID,
|
||||
onPlayerPublicBaseUrl: setPlayerPublicBaseUrl
|
||||
});
|
||||
|
||||
function createThinClientWebSocketUrl() {
|
||||
@@ -276,6 +397,54 @@ async function start() {
|
||||
});
|
||||
thinClientSocket = socket;
|
||||
|
||||
function sendHeartbeat() {
|
||||
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
||||
return;
|
||||
}
|
||||
|
||||
socket.send(JSON.stringify({
|
||||
type: 'heartbeat',
|
||||
deviceId: PLAYER_DEVICE_ID,
|
||||
publicBaseUrl: getPlayerPublicBaseUrl(),
|
||||
internalBaseUrl: PLAYER_INTERNAL_URL
|
||||
}));
|
||||
}
|
||||
|
||||
refreshThinClientRegistration = sendHeartbeat;
|
||||
|
||||
function triggerMediaSyncIfNeeded() {
|
||||
if (webMediaSyncTriggered || webMediaSyncCompleted) {
|
||||
return;
|
||||
}
|
||||
|
||||
webMediaSyncTriggered = true;
|
||||
triggerWebMediaSync().then(function (success) {
|
||||
webMediaSyncCompleted = Boolean(success) || webMediaSyncCompleted;
|
||||
if (!success) {
|
||||
webMediaSyncTriggered = false;
|
||||
}
|
||||
}).catch(function () {
|
||||
webMediaSyncTriggered = false;
|
||||
});
|
||||
}
|
||||
|
||||
function triggerFontSyncIfNeeded() {
|
||||
if (webFontSyncTriggered || webFontSyncCompleted) {
|
||||
return;
|
||||
}
|
||||
|
||||
webFontSyncTriggered = true;
|
||||
triggerWebFontSync().then(function (success) {
|
||||
webFontSyncCompleted = Boolean(success) || webFontSyncCompleted;
|
||||
if (!success) {
|
||||
webFontSyncTriggered = false;
|
||||
}
|
||||
}).catch(function () {
|
||||
webFontSyncTriggered = false;
|
||||
webFontSyncCompleted = false;
|
||||
});
|
||||
}
|
||||
|
||||
function sendSnapshot(slug) {
|
||||
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
||||
return;
|
||||
@@ -300,7 +469,7 @@ async function start() {
|
||||
socket.send(JSON.stringify({
|
||||
type: 'register',
|
||||
deviceId: PLAYER_DEVICE_ID,
|
||||
publicBaseUrl: PLAYER_PUBLIC_URL,
|
||||
publicBaseUrl: getPlayerPublicBaseUrl(),
|
||||
internalBaseUrl: PLAYER_INTERNAL_URL
|
||||
}));
|
||||
|
||||
@@ -308,38 +477,35 @@ async function start() {
|
||||
sendSnapshot(slug);
|
||||
});
|
||||
|
||||
if (!webMediaSyncCompleted) {
|
||||
triggerWebMediaSync().then(function (success) {
|
||||
webMediaSyncTriggered = Boolean(success);
|
||||
webMediaSyncCompleted = Boolean(success) || webMediaSyncCompleted;
|
||||
}).catch(function () {
|
||||
webMediaSyncTriggered = false;
|
||||
});
|
||||
}
|
||||
|
||||
heartbeatTimer = setInterval(function () {
|
||||
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
||||
return;
|
||||
}
|
||||
socket.send(JSON.stringify({
|
||||
type: 'heartbeat',
|
||||
deviceId: PLAYER_DEVICE_ID,
|
||||
publicBaseUrl: PLAYER_PUBLIC_URL,
|
||||
internalBaseUrl: PLAYER_INTERNAL_URL
|
||||
}));
|
||||
|
||||
if (!webMediaSyncTriggered && !webMediaSyncCompleted) {
|
||||
triggerWebMediaSync().then(function (success) {
|
||||
webMediaSyncTriggered = Boolean(success);
|
||||
webMediaSyncCompleted = Boolean(success) || webMediaSyncCompleted;
|
||||
}).catch(function () {
|
||||
webMediaSyncTriggered = false;
|
||||
});
|
||||
}
|
||||
sendHeartbeat();
|
||||
}, DB_SYNC_INTERVAL_MS);
|
||||
});
|
||||
|
||||
socket.on('message', function (rawMessage) {
|
||||
let parsedMessage = null;
|
||||
try {
|
||||
parsedMessage = JSON.parse(String(rawMessage || '{}'));
|
||||
} catch (_error) {
|
||||
parsedMessage = null;
|
||||
}
|
||||
|
||||
if (parsedMessage && String(parsedMessage.type || '').trim() === 'registered') {
|
||||
console.info('[player] Bridge registration acknowledged', {
|
||||
playerIdentifier: PLAYER_DEVICE_ID
|
||||
});
|
||||
sendHeartbeat();
|
||||
return;
|
||||
}
|
||||
|
||||
if (parsedMessage && String(parsedMessage.type || '').trim() === 'heartbeat-ack') {
|
||||
if (shouldTriggerReconnectSync()) {
|
||||
triggerMediaSyncIfNeeded();
|
||||
triggerFontSyncIfNeeded();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
handleThinClientCommand(socket, rawMessage).catch(function (error) {
|
||||
try {
|
||||
socket.send(JSON.stringify({
|
||||
@@ -355,8 +521,13 @@ async function start() {
|
||||
});
|
||||
|
||||
socket.on('close', function () {
|
||||
lastDisconnectAt = Date.now();
|
||||
webFontSyncTriggered = false;
|
||||
webFontSyncCompleted = false;
|
||||
webMediaSyncCompleted = false;
|
||||
clearTimers();
|
||||
thinClientSocket = null;
|
||||
refreshThinClientRegistration = null;
|
||||
reconnectTimer = setTimeout(connect, PLAYER_AGENT_RECONNECT_DELAY_MS);
|
||||
});
|
||||
|
||||
@@ -403,7 +574,7 @@ async function start() {
|
||||
try {
|
||||
await recordPlayerHeartbeat(pool, {
|
||||
deviceId: PLAYER_DEVICE_ID,
|
||||
publicBaseUrl: PLAYER_PUBLIC_URL,
|
||||
publicBaseUrl: getPlayerPublicBaseUrl(),
|
||||
internalBaseUrl: PLAYER_INTERNAL_URL
|
||||
}).catch(function (error) {
|
||||
console.error(error);
|
||||
@@ -432,7 +603,7 @@ async function start() {
|
||||
|
||||
if (PLAYER_DEVICE_ID && !isRemotePlayer) {
|
||||
const { upsertPlayerRegistration } = require('./player/onboarding');
|
||||
await upsertPlayerRegistration(pool, PLAYER_DEVICE_ID, PLAYER_PUBLIC_URL, PLAYER_INTERNAL_URL).catch(function (error) {
|
||||
await upsertPlayerRegistration(pool, PLAYER_DEVICE_ID, getPlayerPublicBaseUrl(), PLAYER_INTERNAL_URL).catch(function (error) {
|
||||
console.error(error);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user