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: Renamed store module and added Electron option to ignore certificate errors

Browse source
This commit is contained in:
Michael Hollister 2025-06-12 14:13:05 -05:00
parent 6b16af4b7d
commit fa246a3f08
6 changed files with 136 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
import { BrowserWindow, ipcMain, IpcMainEvent, nativeImage, Tray, Menu, dialog, shell } from 'electron';
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 { supportedPlayerTypes } from 'common/MimeTypes';
import { DiscoveryService } from 'common/DiscoveryService';
@ -9,7 +10,7 @@ import { ConnectionMonitor } from 'common/ConnectionMonitor';
import { Logger, LoggerType } from 'common/Logger';
import { fetchJSON } from 'common/UtilityBackend';
import { MediaCache } from 'common/MediaCache';
import { Store } from 'common/Store';
import { Settings } from 'common/Settings';
import { Updater } from './Updater';
import * as os from 'os';
import * as path from 'path';
@ -464,6 +465,14 @@ export class Main {
Main.cache.appName = app.name;
Main.cache.appVersion = app.getVersion();
// Using singleton classes for better compatibility running on webOS
const jsonPath = path.join(app.getPath('userData'), 'UserSettings.json');
new Settings(jsonPath);
if (Settings.json.network.ignoreCertificateErrors) {
app.commandLine.appendSwitch('ignore-certificate-errors');
}
const argv = yargs(hideBin(process.argv))
.version(app.getVersion())
.parserConfiguration({
@ -476,10 +485,6 @@ export class Main {
})
.parseSync();
// Using singleton classes for better compatibility running on webOS
const jsonPath = path.join(app.getPath('userData'), 'UserSettings.json');
new Store(jsonPath);
new Updater();
const isUpdating = Updater.isUpdating();
const fileLogType = isUpdating ? 'fileSync' : 'file';
@ -524,6 +529,11 @@ export class Main {
Main.openMainWindow();
}
})
Main.application.on('certificate-error', (_event, _webContents, url, error, certificate) => {
toast('Could not playback media (certificate error)', ToastIcon.ERROR);
logger.error('Could not playback media (certificate error):', { url: url, error: error, certificate: certificate });
});
Main.application.on('ready', Main.onReady);
Main.application.on('window-all-closed', () => { });
}
@ -534,6 +544,11 @@ export class Main {
}
}
export function toast(message: string, icon: ToastIcon = ToastIcon.INFO, duration: number = 5000) {
Main.mainWindow?.webContents?.send('toast', message, icon, duration);
Main.playerWindow?.webContents?.send('toast', message, icon, duration);
}
export function getComputerName() {
switch (process.platform) {
case "win32":

10
receivers/electron/src/Updater.ts
View file

@ -3,7 +3,7 @@ import * as path from 'path';
import * as crypto from 'crypto';
import { app } from 'electron';
import sudo from 'sudo-prompt';
import { Store } from 'common/Store';
import { Settings } from 'common/Settings';
import { Logger, LoggerType } from 'common/Logger';
import { fetchJSON, downloadFile } from 'common/UtilityBackend';
@ -50,7 +50,7 @@ interface UpdateConditions {
}
export class Updater {
private static instance: Store = null;
private static instance: Updater = null;
private static readonly supportedReleasesJsonVersion = '1';
private static appPath: string = app.getAppPath();
@ -78,7 +78,7 @@ export class Updater {
if (!Updater.instance) {
Updater.localPackageJson = JSON.parse(fs.readFileSync(path.join(Updater.appPath, './package.json'), 'utf8'));
let updaterSettings = Store.settings.updater;
let updaterSettings = Settings.json.updater;
if (updaterSettings !== null) {
Updater.updateChannel = updaterSettings.channel === undefined ? Updater.localPackageJson.channel : updaterSettings.channel;
Updater.checkForUpdatesOnStart = updaterSettings.checkForUpdatesOnStart === undefined ? true : updaterSettings.checkForUpdatesOnStart;
@ -90,8 +90,8 @@ export class Updater {
}
Updater.releaseChannel = Updater.localPackageJson.channel;
Store.settings.updater = updaterSettings;
Store.saveSettings();
Settings.json.updater = updaterSettings;
Settings.save();
Updater.instance = this;
}