From e7168b0a7474329e9d92af6ec0fed863ecb2ae36 Mon Sep 17 00:00:00 2001 From: Michael Hollister Date: Fri, 13 Jun 2025 11:50:24 -0500 Subject: [PATCH] Electron: Removed unused package dependencies --- receivers/common/web/DiscoveryService.ts | 2 +- receivers/electron/package-lock.json | 13 ------------- receivers/electron/package.json | 2 -- receivers/electron/src/Main.ts | 24 ++++++++++++++---------- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/receivers/common/web/DiscoveryService.ts b/receivers/common/web/DiscoveryService.ts index c5c4816..0fd2bcb 100644 --- a/receivers/common/web/DiscoveryService.ts +++ b/receivers/common/web/DiscoveryService.ts @@ -12,7 +12,7 @@ export class DiscoveryService { return; } - const name = `FCast-${getComputerName()}`; + const name = getComputerName(); logger.info(`Discovery service started: ${name}`); // Note that txt field must be populated, otherwise certain mdns stacks have undefined behavior/issues diff --git a/receivers/electron/package-lock.json b/receivers/electron/package-lock.json index 5901ebb..e62cc6e 100644 --- a/receivers/electron/package-lock.json +++ b/receivers/electron/package-lock.json @@ -15,8 +15,6 @@ "extract-zip": "^2.0.1", "follow-redirects": "^1.15.9", "hls.js": "^1.5.15", - "http": "^0.0.1-security", - "https": "^1.0.0", "log4js": "^6.9.1", "memfs": "^4.17.2", "qrcode": "^1.5.3", @@ -6761,11 +6759,6 @@ "dev": true, "license": "MIT" }, - "node_modules/http": { - "version": "0.0.1-security", - "resolved": "https://registry.npmjs.org/http/-/http-0.0.1-security.tgz", - "integrity": "sha512-RnDvP10Ty9FxqOtPZuxtebw1j4L/WiqNMDtuc1YMH1XQm5TgDRaR1G9u8upL6KD1bXHSp9eSXo/ED+8Q7FAr+g==" - }, "node_modules/http-cache-semantics": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", @@ -6802,12 +6795,6 @@ "node": ">=10.19.0" } }, - "node_modules/https": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz", - "integrity": "sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==", - "license": "ISC" - }, "node_modules/https-proxy-agent": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", diff --git a/receivers/electron/package.json b/receivers/electron/package.json index 61df1c6..fd62600 100644 --- a/receivers/electron/package.json +++ b/receivers/electron/package.json @@ -52,8 +52,6 @@ "extract-zip": "^2.0.1", "follow-redirects": "^1.15.9", "hls.js": "^1.5.15", - "http": "^0.0.1-security", - "https": "^1.0.0", "log4js": "^6.9.1", "memfs": "^4.17.2", "qrcode": "^1.5.3", diff --git a/receivers/electron/src/Main.ts b/receivers/electron/src/Main.ts index 9d43337..607c4f2 100644 --- a/receivers/electron/src/Main.ts +++ b/receivers/electron/src/Main.ts @@ -448,9 +448,9 @@ export class Main { 'boolean-negation': false }) .options({ - 'no-main-window': { type: 'boolean', default: false, desc: "Start minimized to tray" }, - 'fullscreen': { type: 'boolean', default: false, desc: "Start application in fullscreen" }, - 'log': { chocies: ['ALL', 'TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'MARK', 'OFF'], alias: 'loglevel', default: 'INFO', desc: "Defines the verbosity level of the logger" }, + 'no-main-window': { type: 'boolean', desc: "Start minimized to tray" }, + 'fullscreen': { type: 'boolean', desc: "Start application in fullscreen" }, + 'log': { chocies: ['ALL', 'TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'MARK', 'OFF'], alias: 'loglevel', desc: "Defines the verbosity level of the logger" }, }) .parseSync(); @@ -463,7 +463,7 @@ export class Main { log: { type: fileLogType, filename: path.join(app.getPath('logs'), 'fcast-receiver.log'), flags: 'a', maxLogSize: '5M' }, }, categories: { - default: { appenders: ['out', 'log'], level: argv.log }, + default: { appenders: ['out', 'log'], level: argv.log === undefined ? Settings.json.log.level : argv.log }, }, }); logger = new Logger('Main', LoggerType.BACKEND); @@ -479,8 +479,8 @@ export class Main { await Updater.processUpdate(); } - Main.startFullscreen = argv.fullscreen; - Main.shouldOpenMainWindow = !argv.noMainWindow; + Main.startFullscreen = argv.fullscreen === undefined ? Settings.json.ui.fullscreen : argv.fullscreen; + Main.shouldOpenMainWindow = argv.noMainWindow === undefined ? !Settings.json.ui.noMainWindow : !argv.noMainWindow; const lock = Main.application.requestSingleInstanceLock() if (!lock) { @@ -519,11 +519,15 @@ export function toast(message: string, icon: ToastIcon = ToastIcon.INFO, duratio } export function getComputerName() { + if (Settings.json.network.deviceName !== '') { + return Settings.json.network.deviceName; + } + switch (process.platform) { case "win32": - return process.env.COMPUTERNAME; + return `FCast-${process.env.COMPUTERNAME}`; case "darwin": - return cp.execSync("scutil --get ComputerName").toString().trim(); + return `FCast-${cp.execSync("scutil --get ComputerName").toString().trim()}`; case "linux": { let hostname: string; @@ -546,11 +550,11 @@ export function getComputerName() { } } - return hostname; + return `FCast-${hostname}`; } default: - return os.hostname(); + return `FCast-${os.hostname()}`; } }