prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve [json-prune|trusted-replace]-fetch-response scriptlets

Browse source 
Output more information to the logger in verbose mode.
This commit is contained in:
Raymond Hill 2025-03-20 12:06:58 -04:00
parent 451e1c24a4
commit 88fa550a96
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 23 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/js/resources/scriptlets.js
View file

@ -625,34 +625,23 @@ builtinScriptlets.push({
],
});
function matchObjectProperties(propNeedles, ...objs) {
if ( matchObjectProperties.extractProperties === undefined ) {
matchObjectProperties.extractProperties = (src, des, props) => {
for ( const p of props ) {
const v = src[p];
if ( v === undefined ) { continue; }
des[p] = src[p];
}
};
}
const safe = safeSelf();
const haystack = {};
const props = safe.Array_from(propNeedles.keys());
const matched = [];
for ( const obj of objs ) {
if ( obj instanceof Object === false ) { continue; }
matchObjectProperties.extractProperties(obj, haystack, props);
}
for ( const [ prop, details ] of propNeedles ) {
let value = haystack[prop];
if ( value === undefined ) { continue; }
if ( typeof value !== 'string' ) {
try { value = safe.JSON_stringify(value); }
catch { }
if ( typeof value !== 'string' ) { continue; }
for ( const [ prop, details ] of propNeedles ) {
let value = obj[prop];
if ( value === undefined ) { continue; }
if ( typeof value !== 'string' ) {
try { value = safe.JSON_stringify(value); }
catch { }
if ( typeof value !== 'string' ) { continue; }
}
if ( safe.testPattern(details, value) === false ) { return; }
matched.push(`${prop}: ${value}`);
}
if ( safe.testPattern(details, value) ) { continue; }
return false;
}
return true;
return matched;
}
/******************************************************************************/
@ -679,7 +668,6 @@ function jsonPruneFetchResponseFn(
const logall = rawPrunePaths === '';
const applyHandler = function(target, thisArg, args) {
const fetchPromise = Reflect.apply(target, thisArg, args);
let outcome = logall ? 'nomatch' : 'match';
if ( propNeedles.size !== 0 ) {
const objs = [ args[0] instanceof Object ? args[0] : { url: args[0] } ];
if ( objs[0] instanceof Request ) {
@ -692,14 +680,12 @@ function jsonPruneFetchResponseFn(
if ( args[1] instanceof Object ) {
objs.push(args[1]);
}
if ( matchObjectProperties(propNeedles, ...objs) === false ) {
outcome = 'nomatch';
const matched = matchObjectProperties(propNeedles, ...objs);
if ( matched === undefined ) { return fetchPromise; }
if ( safe.logLevel > 1 ) {
safe.uboLog(logPrefix, `Matched "propsToMatch":\n\t${matched.join('\n\t')}`);
}
}
if ( logall === false && outcome === 'nomatch' ) { return fetchPromise; }
if ( safe.logLevel > 1 && outcome !== 'nomatch' && propNeedles.size !== 0 ) {
safe.uboLog(logPrefix, `Matched optional "propsToMatch"\n${extraArgs.propsToMatch}`);
}
return fetchPromise.then(responseBefore => {
const response = responseBefore.clone();
return response.json().then(objBefore => {
@ -772,7 +758,6 @@ function replaceFetchResponseFn(
apply: function(target, thisArg, args) {
const fetchPromise = Reflect.apply(target, thisArg, args);
if ( pattern === '' ) { return fetchPromise; }
let outcome = 'match';
if ( propNeedles.size !== 0 ) {
const objs = [ args[0] instanceof Object ? args[0] : { url: args[0] } ];
if ( objs[0] instanceof Request ) {
@ -786,14 +771,12 @@ function replaceFetchResponseFn(
if ( args[1] instanceof Object ) {
objs.push(args[1]);
}
if ( matchObjectProperties(propNeedles, ...objs) === false ) {
outcome = 'nomatch';
const matched = matchObjectProperties(propNeedles, ...objs);
if ( matched === undefined ) { return fetchPromise; }
if ( safe.logLevel > 1 ) {
safe.uboLog(logPrefix, `Matched "propsToMatch":\n\t${matched.join('\n\t')}`);
}
}
if ( outcome === 'nomatch' ) { return fetchPromise; }
if ( safe.logLevel > 1 ) {
safe.uboLog(logPrefix, `Matched "propsToMatch"\n${propsToMatch}`);
}
return fetchPromise.then(responseBefore => {
const response = responseBefore.clone();
return response.text().then(textBefore => {
@ -801,8 +784,7 @@ function replaceFetchResponseFn(
return responseBefore;
}
const textAfter = textBefore.replace(rePattern, replacement);
const outcome = textAfter !== textBefore ? 'match' : 'nomatch';
if ( outcome === 'nomatch' ) { return responseBefore; }
if ( textAfter === textBefore ) { return responseBefore; }
safe.uboLog(logPrefix, 'Replaced');
const responseAfter = new Response(textAfter, {
status: responseBefore.status,
@ -1399,7 +1381,7 @@ function jsonPruneXhrResponse(
const xhrDetails = { method, url };
let outcome = 'match';
if ( propNeedles.size !== 0 ) {
if ( matchObjectProperties(propNeedles, xhrDetails) === false ) {
if ( matchObjectProperties(propNeedles, xhrDetails) === undefined ) {
outcome = 'nomatch';
}
}
@ -2838,7 +2820,7 @@ function trustedReplaceXhrResponse(
const xhrDetails = { method, url };
let outcome = 'match';
if ( propNeedles.size !== 0 ) {
if ( matchObjectProperties(propNeedles, xhrDetails) === false ) {
if ( matchObjectProperties(propNeedles, xhrDetails) === undefined ) {
outcome = 'nomatch';
}
}