Skip to content

M
MBetterc
Commit af6f2203 authored by Stefy Lanza (nextime / spora )'s avatar Stefy Lanza (nextime / spora )
Browse files
Options

Fix infinite recursion in overlay-web-adapter.js 

- Store original console.log before templates override it
- Use originalConsoleLog throughout the adapter to prevent recursion
- Templates override console.log to call window.overlay.log, which was calling console.log again
parent 18ca7a4b
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 30 deletions
mbetterclient/web_dashboard/static/js/overlay-web-adapter.js
View file @ af6f2203
...@@ -22,21 +22,24 @@ ...@@ -22,21 +22,24 @@
*/ */
(function() { (function() {
console.log('[WebAdapter] Loading overlay web adapter...'); // Store original console.log BEFORE any overrides happen
const originalConsoleLog = console.log.bind(console);
originalConsoleLog('[WebAdapter] Loading overlay web adapter...');
// Check if we're running in Qt WebChannel environment // Check if we're running in Qt WebChannel environment
const isQtEnvironment = typeof qt !== 'undefined' && qt.webChannelTransport; const isQtEnvironment = typeof qt !== 'undefined' && qt.webChannelTransport;
console.log('[WebAdapter] Environment detected:', isQtEnvironment ? 'Qt WebChannel' : 'Web Browser'); originalConsoleLog('[WebAdapter] Environment detected:', isQtEnvironment ? 'Qt WebChannel' : 'Web Browser');
// Provide function to load Qt scripts dynamically (only works in Qt environment) // Provide function to load Qt scripts dynamically (only works in Qt environment)
window.loadQtScripts = function() { window.loadQtScripts = function() {
if (!isQtEnvironment) { if (!isQtEnvironment) {
console.log('[WebAdapter] Not loading Qt scripts - not in Qt environment'); originalConsoleLog('[WebAdapter] Not loading Qt scripts - not in Qt environment');
return false; return false;
} }
console.log('[WebAdapter] Loading Qt scripts for Qt environment'); originalConsoleLog('[WebAdapter] Loading Qt scripts for Qt environment');
// Load qwebchannel.js // Load qwebchannel.js
const qwebchannelScript = document.createElement('script'); const qwebchannelScript = document.createElement('script');
...@@ -53,7 +56,7 @@ ...@@ -53,7 +56,7 @@
// If already in Qt environment, load Qt scripts and exit // If already in Qt environment, load Qt scripts and exit
if (isQtEnvironment) { if (isQtEnvironment) {
console.log('[WebAdapter] Qt environment detected, loading Qt scripts'); originalConsoleLog('[WebAdapter] Qt environment detected, loading Qt scripts');
// Load Qt scripts when DOM is ready // Load Qt scripts when DOM is ready
if (document.readyState === 'loading') { if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', window.loadQtScripts); document.addEventListener('DOMContentLoaded', window.loadQtScripts);
...@@ -66,7 +69,7 @@ ...@@ -66,7 +69,7 @@
// Web environment - prevent Qt script loading errors // Web environment - prevent Qt script loading errors
// Create dummy QWebChannel for browsers (prevents errors from qrc:/// URLs) // Create dummy QWebChannel for browsers (prevents errors from qrc:/// URLs)
window.QWebChannel = function(transport, callback) { window.QWebChannel = function(transport, callback) {
console.log('[WebAdapter] QWebChannel called in web environment - using adapter instead'); originalConsoleLog('[WebAdapter] QWebChannel called in web environment - using adapter instead');
// The adapter already set up window.overlay, so just call callback if provided // The adapter already set up window.overlay, so just call callback if provided
if (callback && window.overlay) { if (callback && window.overlay) {
callback({ objects: { overlay: window.overlay } }); callback({ objects: { overlay: window.overlay } });
...@@ -78,7 +81,7 @@ ...@@ -78,7 +81,7 @@
if (event.target && (event.target.tagName === 'SCRIPT' || event.target.tagName === 'LINK')) { if (event.target && (event.target.tagName === 'SCRIPT' || event.target.tagName === 'LINK')) {
const src = event.target.src || event.target.href || ''; const src = event.target.src || event.target.href || '';
if (src.startsWith('qrc:///') || src.startsWith('overlay://')) { if (src.startsWith('qrc:///') || src.startsWith('overlay://')) {
console.log('[WebAdapter] Suppressed Qt URL error:', src); originalConsoleLog('[WebAdapter] Suppressed Qt URL error:', src);
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
return true; return true;
...@@ -91,7 +94,7 @@ ...@@ -91,7 +94,7 @@
if (event.reason && event.reason.message) { if (event.reason && event.reason.message) {
const msg = event.reason.message; const msg = event.reason.message;
if (msg.includes('qrc:///') || msg.includes('overlay://')) { if (msg.includes('qrc:///') || msg.includes('overlay://')) {
console.log('[WebAdapter] Suppressed Qt URL promise rejection:', msg); originalConsoleLog('[WebAdapter] Suppressed Qt URL promise rejection:', msg);
event.preventDefault(); event.preventDefault();
return true; return true;
} }
...@@ -102,7 +105,7 @@ ...@@ -102,7 +105,7 @@
const originalFetch = window.fetch; const originalFetch = window.fetch;
window.fetch = function(url, options) { window.fetch = function(url, options) {
if (typeof url === 'string' && (url.startsWith('qrc:///') || url.startsWith('overlay://'))) { if (typeof url === 'string' && (url.startsWith('qrc:///') || url.startsWith('overlay://'))) {
console.log('[WebAdapter] Blocking fetch to Qt URL:', url); originalConsoleLog('[WebAdapter] Blocking fetch to Qt URL:', url);
return Promise.resolve(new Response('', { status: 200 })); return Promise.resolve(new Response('', { status: 200 }));
} }
return originalFetch.apply(this, arguments); return originalFetch.apply(this, arguments);
...@@ -112,7 +115,7 @@ ...@@ -112,7 +115,7 @@
const originalOpen = XMLHttpRequest.prototype.open; const originalOpen = XMLHttpRequest.prototype.open;
XMLHttpRequest.prototype.open = function(method, url) { XMLHttpRequest.prototype.open = function(method, url) {
if (typeof url === 'string' && (url.startsWith('qrc:///') || url.startsWith('overlay://'))) { if (typeof url === 'string' && (url.startsWith('qrc:///') || url.startsWith('overlay://'))) {
console.log('[WebAdapter] Blocking XHR to Qt URL:', url); originalConsoleLog('[WebAdapter] Blocking XHR to Qt URL:', url);
// Return without actually opening - will fail silently // Return without actually opening - will fail silently
return; return;
} }
...@@ -123,14 +126,14 @@ ...@@ -123,14 +126,14 @@
const originalWrite = document.write; const originalWrite = document.write;
document.write = function(content) { document.write = function(content) {
if (typeof content === 'string' && (content.includes('qrc:///') || content.includes('overlay://'))) { if (typeof content === 'string' && (content.includes('qrc:///') || content.includes('overlay://'))) {
console.log('[WebAdapter] Blocking document.write with Qt URLs'); originalConsoleLog('[WebAdapter] Blocking document.write with Qt URLs');
return; return;
} }
return originalWrite.apply(this, arguments); return originalWrite.apply(this, arguments);
}; };
// Web environment - set up postMessage bridge // Web environment - set up postMessage bridge
console.log('[WebAdapter] Setting up postMessage bridge for web environment'); originalConsoleLog('[WebAdapter] Setting up postMessage bridge for web environment');
// Data storage // Data storage
let fixtureData = null; let fixtureData = null;
...@@ -173,9 +176,9 @@ ...@@ -173,9 +176,9 @@
// Signals // Signals
dataUpdated: new Signal(), dataUpdated: new Signal(),
// Log function // Log function - use original console.log to avoid recursion
log: function(message) { log: function(message) {
console.log('[Overlay]', message); originalConsoleLog('[Overlay]', message);
}, },
// Get fixture data - returns Promise (async like Qt) // Get fixture data - returns Promise (async like Qt)
...@@ -315,12 +318,12 @@ ...@@ -315,12 +318,12 @@
return; return;
} }
console.log('[WebAdapter] Received message:', message.type); originalConsoleLog('[WebAdapter] Received message:', message.type);
switch (message.type) { switch (message.type) {
case 'fixtureData': case 'fixtureData':
fixtureData = message.fixtures || []; fixtureData = message.fixtures || [];
console.log('[WebAdapter] Fixture data updated:', fixtureData.length, 'fixtures'); originalConsoleLog('[WebAdapter] Fixture data updated:', fixtureData.length, 'fixtures');
break; break;
case 'timerState': case 'timerState':
...@@ -328,7 +331,7 @@ ...@@ -328,7 +331,7 @@
running: message.running, running: message.running,
remaining_seconds: message.remaining_seconds || 0 remaining_seconds: message.remaining_seconds || 0
} : message; } : message;
console.log('[WebAdapter] Timer state updated:', timerState); originalConsoleLog('[WebAdapter] Timer state updated:', timerState);
// Emit signal for templates listening to dataUpdated // Emit signal for templates listening to dataUpdated
window.overlay.dataUpdated.emit({ timer_update: timerState }); window.overlay.dataUpdated.emit({ timer_update: timerState });
break; break;
...@@ -338,23 +341,23 @@ ...@@ -338,23 +341,23 @@
running: message.running, running: message.running,
remaining_seconds: message.remaining_seconds || 0 remaining_seconds: message.remaining_seconds || 0
} : message; } : message;
console.log('[WebAdapter] Timer update received:', timerState); originalConsoleLog('[WebAdapter] Timer update received:', timerState);
window.overlay.dataUpdated.emit({ timer_update: timerState }); window.overlay.dataUpdated.emit({ timer_update: timerState });
break; break;
case 'licenseText': case 'licenseText':
licenseText = message.licenseText || ''; licenseText = message.licenseText || '';
console.log('[WebAdapter] License text updated'); originalConsoleLog('[WebAdapter] License text updated');
break; break;
case 'completedMatches': case 'completedMatches':
completedMatches = message.matches || []; completedMatches = message.matches || [];
console.log('[WebAdapter] Completed matches updated:', completedMatches.length, 'matches'); originalConsoleLog('[WebAdapter] Completed matches updated:', completedMatches.length, 'matches');
break; break;
case 'winningOutcomes': case 'winningOutcomes':
winningOutcomes = message.outcomes || []; winningOutcomes = message.outcomes || [];
console.log('[WebAdapter] Winning outcomes updated:', winningOutcomes.length, 'outcomes'); originalConsoleLog('[WebAdapter] Winning outcomes updated:', winningOutcomes.length, 'outcomes');
break; break;
case 'initialData': case 'initialData':
...@@ -368,7 +371,7 @@ ...@@ -368,7 +371,7 @@
if (message.licenseText) { if (message.licenseText) {
licenseText = message.licenseText; licenseText = message.licenseText;
} }
console.log('[WebAdapter] Initial data received'); originalConsoleLog('[WebAdapter] Initial data received');
// Emit signal for templates // Emit signal for templates
window.overlay.dataUpdated.emit(overlayData); window.overlay.dataUpdated.emit(overlayData);
break; break;
...@@ -376,27 +379,27 @@ ...@@ -376,27 +379,27 @@
case 'dataUpdated': case 'dataUpdated':
// Overlay data update // Overlay data update
overlayData = { ...overlayData, ...message }; overlayData = { ...overlayData, ...message };
console.log('[WebAdapter] Overlay data updated:', Object.keys(message)); originalConsoleLog('[WebAdapter] Overlay data updated:', Object.keys(message));
// Emit signal for templates // Emit signal for templates
window.overlay.dataUpdated.emit(message); window.overlay.dataUpdated.emit(message);
break; break;
case 'matchUpdate': case 'matchUpdate':
console.log('[WebAdapter] Match update received'); originalConsoleLog('[WebAdapter] Match update received');
window.overlay.dataUpdated.emit({ match_update: message }); window.overlay.dataUpdated.emit({ match_update: message });
break; break;
case 'resultUpdate': case 'resultUpdate':
console.log('[WebAdapter] Result update received'); originalConsoleLog('[WebAdapter] Result update received');
window.overlay.dataUpdated.emit({ result_update: message }); window.overlay.dataUpdated.emit({ result_update: message });
break; break;
case 'videoStateChanged': case 'videoStateChanged':
console.log('[WebAdapter] Video state changed:', message.state); originalConsoleLog('[WebAdapter] Video state changed:', message.state);
break; break;
case 'streamStateChanged': case 'streamStateChanged':
console.log('[WebAdapter] Stream state changed:', message.state); originalConsoleLog('[WebAdapter] Stream state changed:', message.state);
break; break;
case 'positionChanged': case 'positionChanged':
...@@ -404,13 +407,13 @@ ...@@ -404,13 +407,13 @@
break; break;
default: default:
console.log('[WebAdapter] Unknown message type:', message.type); originalConsoleLog('[WebAdapter] Unknown message type:', message.type);
} }
}); });
// Request initial data when DOM is ready // Request initial data when DOM is ready
function requestInitialData() { function requestInitialData() {
console.log('[WebAdapter] Requesting initial data from parent'); originalConsoleLog('[WebAdapter] Requesting initial data from parent');
if (window.parent !== window) { if (window.parent !== window) {
window.parent.postMessage({ type: 'requestInitialData' }, '*'); window.parent.postMessage({ type: 'requestInitialData' }, '*');
...@@ -433,7 +436,7 @@ ...@@ -433,7 +436,7 @@
setTimeout(requestInitialData, 100); setTimeout(requestInitialData, 100);
} }
console.log('[WebAdapter] Web overlay adapter initialized'); originalConsoleLog('[WebAdapter] Web overlay adapter initialized');
// Flush any buffered console logs // Flush any buffered console logs
if (typeof window.flushConsoleBuffer === 'function') { if (typeof window.flushConsoleBuffer === 'function') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment