pacnpal/simpleguardhome
1
0
Fork 0
mirror of https://github.com/pacnpal/simpleguardhome.git synced 2025-12-20 20:41:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat(main.py): add endpoint to unblock a domain and improve error handling

Browse Source 
fix(userscript): update default port and restore 404 response interception
This commit is contained in:
pacnpal
2025-01-29 15:46:11 -05:00
parent 0d482fa33e
commit 99d8265235
4 changed files with 227 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
userscript/simpleguardhome-404-checker.user.js
View File

@@ -19,7 +19,7 @@
// Default configuration
const DEFAULT_CONFIG = {
host: 'http://localhost',
port: 3000
port: 8000
};
// Get current configuration
@@ -51,6 +51,52 @@
// Store check results to avoid repeated API calls
const checkedDomains = new Map();
// Check if domain is blocked by AdGuard Home
async function checkDomain(domain) {
// Skip if already checked recently
if (checkedDomains.has(domain)) {
const cachedResult = checkedDomains.get(domain);
if (Date.now() - cachedResult.timestamp < 3600000) { // Cache for 1 hour
return;
}
}
try {
const config = getConfig();
const apiUrl = `${config.host}:${config.port}/control/filtering/check_host?name=${encodeURIComponent(domain)}`;
GM_xmlhttpRequest({
method: 'GET',
url: apiUrl,
headers: {'Accept': 'application/json'},
onload: function(response) {
try {
const data = JSON.parse(response.responseText);
const isBlocked = data.reason.startsWith('Filtered');
// Cache the result
checkedDomains.set(domain, {
isBlocked,
timestamp: Date.now()
});
// If blocked, redirect to SimpleGuardHome interface
if (isBlocked) {
window.location.href = apiUrl;
}
} catch (error) {
console.error('SimpleGuardHome parsing error:', error);
}
},
onerror: function(error) {
console.error('SimpleGuardHome API error:', error);
}
});
} catch (error) {
console.error('SimpleGuardHome check error:', error);
}
}
// Intercept 404 responses using a fetch handler
const originalFetch = window.fetch;
window.fetch = async function(...args) {
@@ -82,116 +128,4 @@
};
originalXHROpen.apply(this, [method, url, ...rest]);
};
// Check if domain is blocked by AdGuard Home
async function checkDomain(domain) {
// Skip if already checked recently
if (checkedDomains.has(domain)) {
const cachedResult = checkedDomains.get(domain);
if (Date.now() - cachedResult.timestamp < 3600000) { // Cache for 1 hour
return;
}
}
try {
const config = getConfig();
const apiUrl = `${config.host}:${config.port}/control/filtering/check_host?name=${encodeURIComponent(domain)}`;
GM_xmlhttpRequest({
method: 'GET',
url: apiUrl,
headers: {
'Accept': 'application/json'
},
onload: function(response) {
try {
const data = JSON.parse(response.responseText);
const isBlocked = data.reason.startsWith('Filtered');
// Cache the result
checkedDomains.set(domain, {
isBlocked,
reason: data.reason,
rules: data.rules,
timestamp: Date.now()
});
// Show notification if blocked
if (isBlocked) {
showNotification(domain, data);
}
} catch (error) {
console.error('SimpleGuardHome parsing error:', error);
}
},
onerror: function(error) {
console.error('SimpleGuardHome API error:', error);
showNotification(domain, null, 'Unable to connect to SimpleGuardHome instance. Please check your configuration.');
},
onabort: function() {
console.error('SimpleGuardHome API request aborted');
showNotification(domain, null, 'Request to SimpleGuardHome instance was aborted. Please check your configuration.');
},
ontimeout: function() {
console.error('SimpleGuardHome API request timed out');
showNotification(domain, null, 'Request to SimpleGuardHome instance timed out. Please check your configuration.');
}
});
} catch (error) {
console.error('SimpleGuardHome check error:', error);
}
}
// Show a notification when a blocked domain is detected
function showNotification(domain, data, error = null) {
const notification = document.createElement('div');
const config = getConfig();
notification.style.cssText = `
position: fixed;
top: 20px;
right: 20px;
padding: 15px;
background: ${error ? '#fff3cd' : '#f8d7d9'};
border-left: 4px solid ${error ? '#ffc107' : '#dc3545'};
border-radius: 4px;
box-shadow: 0 2px 5px rgba(0,0,0,0.2);
z-index: 9999;
max-width: 400px;
font-family: system-ui, -apple-system, sans-serif;
`;
if (error) {
notification.innerHTML = `
<div style="font-weight: bold; margin-bottom: 5px;">SimpleGuardHome Error</div>
<div style="font-size: 14px;">${error}</div>
<button style="margin-top: 10px; background: #ffc107; color: black; border: none; padding: 5px 10px; border-radius: 3px; cursor: pointer;">Configure Instance</button>
`;
const configButton = notification.querySelector('button');
configButton.addEventListener('click', () => {
showConfigDialog();
notification.remove();
});
} else {
notification.innerHTML = `
<div style="font-weight: bold; margin-bottom: 5px;">404 Domain is Blocked</div>
<div style="font-size: 14px;"><strong>${domain}</strong></div>
<div style="font-size: 12px; margin-top: 5px;">Reason: ${data.reason}</div>
${data.rules?.length ? `<div style="font-size: 12px; margin-top: 5px; background: rgba(0,0,0,0.05); padding: 5px; border-radius: 3px;">Rule: ${data.rules[0].text}</div>` : ''}
<button style="margin-top: 10px; background: #0d6efd; color: white; border: none; padding: 5px 10px; border-radius: 3px; cursor: pointer;">Unblock Domain</button>
`;
const unblockButton = notification.querySelector('button');
unblockButton.addEventListener('click', () => {
window.open(`${config.host}:${config.port}/?domain=${encodeURIComponent(domain)}`, '_blank');
notification.remove();
});
}
// Auto-remove after 10 seconds
setTimeout(() => notification.remove(), 10000);
document.body.appendChild(notification);
}
})();