fix sounds; fix shadow focusing main window

lacymorrow · May 17, 2022 · d350f05 · d350f05
1 parent 553c7cb
commit d350f05
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 23 deletions.
diff --git a/src/main.js b/src/main.js
@@ -21,6 +21,7 @@
 		- Add labels or tooltips for buttons
 		- electron builder dont bundle unneeded files
 		- click tray show menu; dblclick show app
+		- SECURITY: remove unsafe-eval; turn off remote module
 
 	Todo: when updating electron to 12+:
 		- Test iohook
@@ -141,9 +142,6 @@ const ready = async () => {
 
 	}
 
-	/* SOUND */
-	sound.preload()
-
 	/* Press Play >>> */
 	await init()
 
@@ -153,6 +151,9 @@ const ready = async () => {
 	/* MENU */
 	menu.init()
 
+	/* SOUND */
+	sound.preload()
+
 	/* AUTO-UPDATE */
 	autoUpdate.update()
 

diff --git a/src/main/crossover.js b/src/main/crossover.js
@@ -56,6 +56,7 @@ const keyboardShortcuts = () => {
 			keybind: `${accelerator}+C`,
 			fn() {
 
+				sound.play( 'CENTER' )
 				windows.center()
 
 			},
@@ -184,7 +185,7 @@ const lockWindow = ( lock, targetWindow = windows.win ) => {
 
 	/* DO STUFF */
 	windows.hideSettingsWindow()
-	windows.hideChooserWindow( { focus: true } )
+	windows.hideChooserWindow()
 	targetWindow.closable = !lock
 	targetWindow.setFocusable( !lock )
 	targetWindow.webContents.send( 'lock_window', lock )

diff --git a/src/main/register.js b/src/main/register.js
@@ -20,6 +20,8 @@ const appEvents = () => {
 	// Opening 2nd instance focuses app
 	app.on( 'second-instance', async () => {
 
+		console.warn( 'Creating second app instance' )
+
 		// If locked, unlock, else create shadow window
 		if ( windows.win ) {
 

diff --git a/src/renderer/chooser.html b/src/renderer/chooser.html
@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<title>Crosshairs</title>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval';">
 		<link rel="stylesheet" href="styles/dist/index.css">
 		<script type="text/javascript" src="vendor/feather/feather-icons.min.js"></script>
 	</head>

diff --git a/src/renderer/index.html b/src/renderer/index.html
@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<title>CrossOver</title>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; media-src *;">
 		<link rel="stylesheet" href="styles/dist/index.css">
 		<script type="text/javascript" src="vendor/feather/feather-icons.min.js"></script>
 		<script type="text/javascript" src="vendor/inline-svg/inline-svg.min.js"></script>

diff --git a/src/renderer/lib/sounds.js b/src/renderer/lib/sounds.js
@@ -49,6 +49,12 @@ const sounds = {
 
 function preload( basepath = '' ) {
 
+	if ( !basepath ) {
+
+		console.warn( 'Basepath not provided, sounds may not work properly.' )
+
+	}
+
 	let audio
 	for ( const name in sounds ) {
 

diff --git a/src/renderer/preload.js b/src/renderer/preload.js
@@ -6,7 +6,7 @@ const {
 const unhandled = require( 'electron-unhandled' )
 const config = require( '../config/config.js' )
 const { debounce } = require( '../config/utils.js' )
-const { play, preload } = require( './lib/sounds.js' )
+const { play: playSound, preload: preloadSounds } = require( './lib/sounds.js' )
 
 // Console.log( 'contextBridge:', contextBridge.internalContextBridge, contextBridge.internalContextBridge.contextIsolationEnabled )
 
@@ -15,8 +15,8 @@ const api = {
 	debounce,
 	isMacOs: navigator.userAgent.indexOf( 'Mac' ) !== -1,
 	isWindows: navigator.userAgent.indexOf( 'Win' ) !== -1,
-	play,
-	preload,
+	playSound,
+	preloadSounds,
 	unhandled,
 	send( channel, ...args ) {
 
@@ -56,25 +56,23 @@ const api = {
 
 	},
 
-	invoke( channel, arg ) {
+	// invoke( channel, arg ) {
 
-		console.log( 'preload', arg )
+	// 	const validChannels = new Set( [
+	// 		'invoke_test', 'get_bounds', 'play_sound',
+	// 	] )
 
-		const validChannels = new Set( [
-			'invoke_test', 'get_bounds', 'play_sound',
-		] )
+	// 	if ( validChannels.has( channel ) ) {
 
-		if ( validChannels.has( channel ) ) {
+	// 		ipcRenderer.invoke( channel, arg )
 
-			ipcRenderer.invoke( channel, arg )
+	// 	} else {
 
-		} else {
+	// 		console.warn( `Renderer refused to invoke IPC message on ${channel}` )
 
-			console.warn( `Renderer refused to invoke IPC message on ${channel}` )
+	// 	}
 
-		}
-
-	},
+	// },
 
 }
 

diff --git a/src/renderer/renderer.js b/src/renderer/renderer.js
@@ -80,13 +80,13 @@
 	// Sounds
 	window.crossover.receive( 'preload_sounds', arg => {
 
-		window.crossover.preload( arg )
+		window.crossover.preloadSounds( arg )
 
 	} )
 
 	window.crossover.receive( 'play_sound', arg => {
 
-		window.crossover.play( arg )
+		window.crossover.playSound( arg )
 
 	} )