Skip to content

Guard against Chrome moving Gamepad to HTTPS secure origin #20890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Guard against Chrome moving Gamepad to HTTPS secure origin #20890

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ef201c
Chrome has (apparently?) moved to requiring a secure HTTPS origin in …
juj Dec 11, 2023
e7dd75d
Add Closure annotation
juj Dec 11, 2023
d3f43d6
Use err()
juj Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/library_html5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2144,24 +2144,38 @@ var LibraryHTML5 = {
return JSEvents.registerOrRemoveHandler(eventHandler);
},

$disableGamepadApiIfItThrows__docs: '/** @suppress {checkTypes} */',
$disableGamepadApiIfItThrows: () => {
try {
navigator.getGamepads();
} catch(e) {
#if ASSERTIONS
err(`navigator.getGamepads() exists, but failed to execute with exception ${e}. Disabling Gamepad access.`);
#endif
navigator.getGamepads = null; // Disable getGamepads() so that other functions will not attempt to use it.
return 1;
}
},

emscripten_set_gamepadconnected_callback_on_thread__proxy: 'sync',
emscripten_set_gamepadconnected_callback_on_thread__deps: ['$registerGamepadEventCallback'],
emscripten_set_gamepadconnected_callback_on_thread__deps: ['$registerGamepadEventCallback', '$disableGamepadApiIfItThrows'],
emscripten_set_gamepadconnected_callback_on_thread: (userData, useCapture, callbackfunc, targetThread) => {
if (!navigator.getGamepads && !navigator.webkitGetGamepads) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
if (!navigator.getGamepads || disableGamepadApiIfItThrows()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
return registerGamepadEventCallback({{{ cDefs.EMSCRIPTEN_EVENT_TARGET_WINDOW }}}, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_GAMEPADCONNECTED }}}, "gamepadconnected", targetThread);
},

emscripten_set_gamepaddisconnected_callback_on_thread__proxy: 'sync',
emscripten_set_gamepaddisconnected_callback_on_thread__deps: ['$registerGamepadEventCallback'],
emscripten_set_gamepaddisconnected_callback_on_thread__deps: ['$registerGamepadEventCallback', '$disableGamepadApiIfItThrows'],
emscripten_set_gamepaddisconnected_callback_on_thread: (userData, useCapture, callbackfunc, targetThread) => {
if (!navigator.getGamepads && !navigator.webkitGetGamepads) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
if (!navigator.getGamepads || disableGamepadApiIfItThrows()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
return registerGamepadEventCallback({{{ cDefs.EMSCRIPTEN_EVENT_TARGET_WINDOW }}}, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_GAMEPADDISCONNECTED }}}, "gamepaddisconnected", targetThread);
},

emscripten_sample_gamepad_data__proxy: 'sync',
emscripten_sample_gamepad_data__deps: ['$JSEvents'],
emscripten_sample_gamepad_data__deps: ['$JSEvents', '$disableGamepadApiIfItThrows'],
emscripten_sample_gamepad_data: () => {
return (JSEvents.lastGamepadState = (navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : null)))
if (!navigator.getGamepads || disableGamepadApiIfItThrows()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
return (JSEvents.lastGamepadState = navigator.getGamepads())
? {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}} : {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
},

Expand All @@ -2182,7 +2196,6 @@ var LibraryHTML5 = {
#if ASSERTIONS
if (!JSEvents.lastGamepadState) throw 'emscripten_get_gamepad_status() can only be called after having first called emscripten_sample_gamepad_data() and that function has returned EMSCRIPTEN_RESULT_SUCCESS!';
#endif

// INVALID_PARAM is returned on a Gamepad index that never was there.
if (index < 0 || index >= JSEvents.lastGamepadState.length) return {{{ cDefs.EMSCRIPTEN_RESULT_INVALID_PARAM }}};

Expand Down