mirrors/fcast
1
0
Fork 0
mirror of https://gitlab.com/futo-org/fcast.git synced 2025-06-24 21:25:23 +00:00
Code Activity

Receivers: Moved playlist message preparation to common components

Browse source
This commit is contained in:
Michael Hollister 2025-06-13 11:03:42 -05:00
parent c1e72173e0
commit 2fbfac0a04
2 changed files with 53 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

41
receivers/common/web/UtilityBackend.ts
View file

@ -3,6 +3,9 @@ import * as url from 'url';
import { http, https } from 'modules/follow-redirects'; import { http, https } from 'modules/follow-redirects';
import * as memfs from 'modules/memfs'; import * as memfs from 'modules/memfs';
import { Logger, LoggerType } from 'common/Logger'; import { Logger, LoggerType } from 'common/Logger';
import { supportedPlayerTypes } from 'common/MimeTypes';
import { NetworkService } from 'common/NetworkService';
import { ContentObject, ContentType, PlaylistContent, PlayMessage } from 'common/Packets';
const logger = new Logger('UtilityBackend', LoggerType.BACKEND); const logger = new Logger('UtilityBackend', LoggerType.BACKEND);
export function deepEqual(x, y) { export function deepEqual(x, y) {
@ -13,6 +16,44 @@ export function deepEqual(x, y) {
) : (x === y); ) : (x === y);
} }
export async function preparePlayMessage(message: PlayMessage, cachedPlayerVolume: number, mediaCacheInitializationCb: ((playMessage: PlaylistContent) => void)) {
// Protocol v2 FCast PlayMessage does not contain volume field and could result in the receiver
// getting out-of-sync with the sender when player windows are closed and re-opened. Volume
// is cached in the play message when volume is not set in v3 PlayMessage.
message.volume = message.volume === undefined ? cachedPlayerVolume : message.volume;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let rendererMessage: any = await NetworkService.proxyPlayIfRequired(message);
let rendererEvent = 'play';
let contentViewer = supportedPlayerTypes.find(v => v === message.container.toLocaleLowerCase()) ? 'player' : 'viewer';
if (message.container === 'application/json') {
const json: ContentObject = message.url ? await fetchJSON(message.url) : JSON.parse(message.content);
if (json && json.contentType !== undefined) {
switch (json.contentType) {
case ContentType.Playlist: {
rendererMessage = json as PlaylistContent;
rendererEvent = 'play-playlist';
if ((rendererMessage.forwardCache && rendererMessage.forwardCache > 0) || (rendererMessage.backwardCache && rendererMessage.backwardCache > 0)) {
mediaCacheInitializationCb(rendererMessage);
}
const offset = rendererMessage.offset ? rendererMessage.offset : 0;
contentViewer = supportedPlayerTypes.find(v => v === rendererMessage.items[offset].container.toLocaleLowerCase()) ? 'player' : 'viewer';
break;
}
default:
break;
}
}
}
return { rendererEvent: rendererEvent, rendererMessage: rendererMessage, contentViewer: contentViewer };
}
export async function fetchJSON(url: string): Promise<any> { export async function fetchJSON(url: string): Promise<any> {
const protocol = url.startsWith('https') ? https : http; const protocol = url.startsWith('https') ? https : http;

57
receivers/electron/src/Main.ts
View file

@ -1,14 +1,11 @@
import { BrowserWindow, ipcMain, IpcMainEvent, nativeImage, Tray, Menu, dialog, shell } from 'electron'; import { BrowserWindow, ipcMain, IpcMainEvent, nativeImage, Tray, Menu, dialog, shell } from 'electron';
import { ToastIcon } from 'common/components/Toast'; import { ToastIcon } from 'common/components/Toast';
import { Opcode, PlaybackErrorMessage, PlaybackUpdateMessage, VolumeUpdateMessage, PlayMessage, PlayUpdateMessage, EventMessage, EventType, ContentObject, ContentType, PlaylistContent, SeekMessage, SetVolumeMessage, SetSpeedMessage, SetPlaylistItemMessage } from 'common/Packets'; import { Opcode, PlaybackErrorMessage, PlaybackUpdateMessage, VolumeUpdateMessage, PlayMessage, PlayUpdateMessage, EventMessage, EventType, ContentObject, ContentType, PlaylistContent, SeekMessage, SetVolumeMessage, SetSpeedMessage, SetPlaylistItemMessage } from 'common/Packets';
import { supportedPlayerTypes } from 'common/MimeTypes';
import { DiscoveryService } from 'common/DiscoveryService'; import { DiscoveryService } from 'common/DiscoveryService';
import { TcpListenerService } from 'common/TcpListenerService'; import { TcpListenerService } from 'common/TcpListenerService';
import { WebSocketListenerService } from 'common/WebSocketListenerService'; import { WebSocketListenerService } from 'common/WebSocketListenerService';
import { NetworkService } from 'common/NetworkService';
import { ConnectionMonitor } from 'common/ConnectionMonitor'; import { ConnectionMonitor } from 'common/ConnectionMonitor';
import { Logger, LoggerType } from 'common/Logger'; import { Logger, LoggerType } from 'common/Logger';
import { fetchJSON } from 'common/UtilityBackend';
import { MediaCache } from 'common/MediaCache'; import { MediaCache } from 'common/MediaCache';
import { Settings } from 'common/Settings'; import { Settings } from 'common/Settings';
import { Updater } from './Updater'; import { Updater } from './Updater';
@ -16,6 +13,7 @@ import * as os from 'os';
import * as path from 'path'; import * as path from 'path';
import yargs from 'yargs'; import yargs from 'yargs';
import { hideBin } from 'yargs/helpers'; import { hideBin } from 'yargs/helpers';
import { preparePlayMessage } from 'common/UtilityBackend';
const cp = require('child_process'); const cp = require('child_process');
let logger = null; let logger = null;
@ -163,41 +161,10 @@ export class Main {
private static async play(message: PlayMessage) { private static async play(message: PlayMessage) {
Main.listeners.forEach(l => l.send(Opcode.PlayUpdate, new PlayUpdateMessage(Date.now(), message))); Main.listeners.forEach(l => l.send(Opcode.PlayUpdate, new PlayUpdateMessage(Date.now(), message)));
Main.cache.playMessage = message; Main.cache.playMessage = message;
const messageInfo = await preparePlayMessage(message, Main.cache.playerVolume, (playMessage: PlaylistContent) => {
// Protocol v2 FCast PlayMessage does not contain volume field and could result in the receiver Main.mediaCache?.destroy();
// getting out-of-sync with the sender when player windows are closed and re-opened. Volume Main.mediaCache = new MediaCache(playMessage);
// is cached in the play message when volume is not set in v3 PlayMessage. });
message.volume = message.volume === undefined ? Main.cache.playerVolume : message.volume;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let rendererMessage: any = await NetworkService.proxyPlayIfRequired(message);
let rendererEvent = 'play';
let contentViewer = supportedPlayerTypes.find(v => v === message.container.toLocaleLowerCase()) ? 'player' : 'viewer';
if (message.container === 'application/json') {
const json: ContentObject = message.url ? await fetchJSON(message.url) : JSON.parse(message.content);
if (json && json.contentType !== undefined) {
switch (json.contentType) {
case ContentType.Playlist: {
rendererMessage = json as PlaylistContent;
rendererEvent = 'play-playlist';
if ((rendererMessage.forwardCache && rendererMessage.forwardCache > 0) || (rendererMessage.backwardCache && rendererMessage.backwardCache > 0)) {
Main.mediaCache?.destroy();
Main.mediaCache = new MediaCache(rendererMessage);
}
const offset = rendererMessage.offset ? rendererMessage.offset : 0;
contentViewer = supportedPlayerTypes.find(v => v === rendererMessage.items[offset].container.toLocaleLowerCase()) ? 'player' : 'viewer';
break;
}
default:
break;
}
}
}
if (!Main.playerWindow) { if (!Main.playerWindow) {
Main.playerWindow = new BrowserWindow({ Main.playerWindow = new BrowserWindow({
@ -212,25 +179,25 @@ export class Main {
Main.playerWindow.setAlwaysOnTop(false, 'pop-up-menu'); Main.playerWindow.setAlwaysOnTop(false, 'pop-up-menu');
Main.playerWindow.show(); Main.playerWindow.show();
Main.playerWindow.loadFile(path.join(__dirname, `${contentViewer}/index.html`)); Main.playerWindow.loadFile(path.join(__dirname, `${messageInfo.contentViewer}/index.html`));
Main.playerWindow.on('ready-to-show', async () => { Main.playerWindow.on('ready-to-show', async () => {
Main.playerWindow?.webContents?.send(rendererEvent, rendererMessage); Main.playerWindow?.webContents?.send(messageInfo.rendererEvent, messageInfo.rendererMessage);
}); });
Main.playerWindow.on('closed', () => { Main.playerWindow.on('closed', () => {
Main.playerWindow = null; Main.playerWindow = null;
Main.playerWindowContentViewer = null; Main.playerWindowContentViewer = null;
}); });
} }
else if (Main.playerWindow && contentViewer !== Main.playerWindowContentViewer) { else if (Main.playerWindow && messageInfo.contentViewer !== Main.playerWindowContentViewer) {
Main.playerWindow.loadFile(path.join(__dirname, `${contentViewer}/index.html`)); Main.playerWindow.loadFile(path.join(__dirname, `${messageInfo.contentViewer}/index.html`));
Main.playerWindow.on('ready-to-show', async () => { Main.playerWindow.on('ready-to-show', async () => {
Main.playerWindow?.webContents?.send(rendererEvent, rendererMessage); Main.playerWindow?.webContents?.send(messageInfo.rendererEvent, messageInfo.rendererMessage);
}); });
} else { } else {
Main.playerWindow?.webContents?.send(rendererEvent, rendererMessage); Main.playerWindow?.webContents?.send(messageInfo.rendererEvent, messageInfo.rendererMessage);
} }
Main.playerWindowContentViewer = contentViewer; Main.playerWindowContentViewer = messageInfo.contentViewer;
} }
private static onReady() { private static onReady() {